From b4c84fac9deac7820af9c20c3fe5ae82d3b727ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Thu, 26 Feb 2015 14:15:33 +0100 Subject: [PATCH 001/264] NEW: [ task #977 ] New option to manage product unit Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements --- htdocs/admin/dict.php | 22 ++++- htdocs/comm/propal.php | 14 ++- htdocs/comm/propal/class/propal.class.php | 25 ++++- htdocs/commande/card.php | 14 ++- htdocs/commande/class/commande.class.php | 31 ++++-- htdocs/compta/facture.php | 20 +++- .../facture/class/facture-rec.class.php | 14 ++- htdocs/compta/facture/class/facture.class.php | 34 +++++-- htdocs/compta/facture/fiche-rec.php | 22 ++++- htdocs/contrat/card.php | 38 ++++++- htdocs/contrat/class/contrat.class.php | 26 +++-- htdocs/core/class/commonobject.class.php | 15 ++- htdocs/core/class/commonobjectline.class.php | 50 ++++++++++ htdocs/core/class/commonorder.class.php | 3 +- htdocs/core/class/html.form.class.php | 48 +++++++++ htdocs/core/lib/pdf.lib.php | 37 +++++++ .../commande/doc/pdf_einstein.modules.php | 69 ++++++++++--- .../modules/facture/doc/pdf_crabe.modules.php | 54 ++++++++-- .../modules/propale/doc/pdf_azur.modules.php | 56 +++++++++-- htdocs/core/tpl/objectline_create.tpl.php | 23 +++++ htdocs/core/tpl/objectline_edit.tpl.php | 9 ++ htdocs/core/tpl/objectline_view.tpl.php | 12 +++ htdocs/core/tpl/originproductline.tpl.php | 5 +- htdocs/install/mysql/data/llx_c_units.sql | 31 ++++++ .../install/mysql/migration/3.7.0-3.8.0.sql | 43 +++++++- .../install/mysql/tables/llx_c_units.key.sql | 21 ++++ htdocs/install/mysql/tables/llx_c_units.sql | 27 +++++ .../mysql/tables/llx_commandedet.key.sql | 2 + .../install/mysql/tables/llx_commandedet.sql | 2 + .../mysql/tables/llx_contratdet.key.sql | 2 + .../install/mysql/tables/llx_contratdet.sql | 3 +- .../mysql/tables/llx_facturedet.key.sql | 2 + .../install/mysql/tables/llx_facturedet.sql | 3 +- .../mysql/tables/llx_facturedet_rec.key.sql | 21 ++++ .../mysql/tables/llx_facturedet_rec.sql | 4 +- .../install/mysql/tables/llx_product.key.sql | 3 +- htdocs/install/mysql/tables/llx_product.sql | 7 +- .../mysql/tables/llx_propaldet.key.sql | 2 + htdocs/install/mysql/tables/llx_propaldet.sql | 4 +- htdocs/langs/en_US/admin.lang | 1 + htdocs/langs/en_US/products.lang | 26 +++++ htdocs/product/admin/product.php | 24 ++++- htdocs/product/card.php | 99 +++++++++++++++++-- htdocs/product/class/product.class.php | 55 ++++++++++- 44 files changed, 931 insertions(+), 92 deletions(-) create mode 100644 htdocs/install/mysql/data/llx_c_units.sql create mode 100644 htdocs/install/mysql/tables/llx_c_units.key.sql create mode 100644 htdocs/install/mysql/tables/llx_c_units.sql create mode 100644 htdocs/install/mysql/tables/llx_facturedet_rec.key.sql diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 05402898ee6bb..4f193ed76f2c2 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -70,7 +70,7 @@ // Put here declaration of dictionaries properties // Sort order to show dictionary (0 is space). All other dictionaries (added by modules) will be at end of this. -$taborder=array(9,0,4,3,2,0,1,8,19,16,0,5,11,0,6,0,10,23,12,13,0,14,0,7,17,0,22,20,18,21,0,15,0,24,0,25); +$taborder=array(9,0,4,3,2,0,1,8,19,16,0,5,11,0,6,0,10,23,12,13,0,14,0,7,17,0,22,20,18,21,0,15,0,24,0,25,0,26); // Name of SQL tables of dictionaries $tabname=array(); @@ -99,6 +99,7 @@ $tabname[23]= MAIN_DB_PREFIX."c_revenuestamp"; $tabname[24]= MAIN_DB_PREFIX."c_type_resource"; $tabname[25]= MAIN_DB_PREFIX."c_email_templates"; +$tabname[26]= MAIN_DB_PREFIX."c_units"; // Dictionary labels $tablib=array(); @@ -127,6 +128,7 @@ $tablib[23]= "DictionaryRevenueStamp"; $tablib[24]= "DictionaryResourceType"; $tablib[25]= "DictionaryEMailTemplates"; +$tablib[26]= "DictionnaryUnits"; // Requests to extract data $tabsql=array(); @@ -155,6 +157,7 @@ $tabsql[23]= "SELECT t.rowid, t.taux, c.label as country, c.code as country_code, t.fk_pays as country_id, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_revenuestamp as t, ".MAIN_DB_PREFIX."c_country as c WHERE t.fk_pays=c.rowid"; $tabsql[24]= "SELECT rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_type_resource"; $tabsql[25]= "SELECT rowid as rowid, label, type_template, private, position, topic, content, active FROM ".MAIN_DB_PREFIX."c_email_templates"; +$tabsql[26]= "SELECT rowid as rowid, code, label, short_label, active FROM ".MAIN_DB_PREFIX."c_units"; // Criteria to sort dictionaries $tabsqlsort=array(); @@ -183,6 +186,7 @@ $tabsqlsort[23]="country ASC, taux ASC"; $tabsqlsort[24]="code ASC,label ASC"; $tabsqlsort[25]="label ASC"; +$tabsqlsort[26]="code ASC"; // Nom des champs en resultat de select pour affichage du dictionnaire $tabfield=array(); @@ -211,6 +215,7 @@ $tabfield[23]= "country_id,country,taux,accountancy_code_sell,accountancy_code_buy,note"; $tabfield[24]= "code,label"; $tabfield[25]= "label,type_template,private,position,topic,content"; +$tabfield[26]= "code,label,short_label"; // Nom des champs d'edition pour modification d'un enregistrement $tabfieldvalue=array(); @@ -239,6 +244,7 @@ $tabfieldvalue[23]= "country,taux,accountancy_code_sell,accountancy_code_buy,note"; $tabfieldvalue[24]= "code,label"; $tabfieldvalue[25]= "label,type_template,private,position,topic,content"; +$tabfieldvalue[26]= "code,label,short_label"; // Nom des champs dans la table pour insertion d'un enregistrement $tabfieldinsert=array(); @@ -267,6 +273,7 @@ $tabfieldinsert[23]= "fk_pays,taux,accountancy_code_sell,accountancy_code_buy,note"; $tabfieldinsert[24]= "code,label"; $tabfieldinsert[25]= "label,type_template,private,position,topic,content"; +$tabfieldinsert[26]= "code,label,short_label"; // Nom du rowid si le champ n'est pas de type autoincrement // Example: "" if id field is "rowid" and has autoincrement on @@ -297,6 +304,7 @@ $tabrowid[23]= ""; $tabrowid[24]= ""; $tabrowid[25]= ""; +$tabrowid[26]= ""; // Condition to show dictionary in setup page $tabcond=array(); @@ -325,6 +333,7 @@ $tabcond[23]= true; $tabcond[24]= ! empty($conf->resource->enabled); $tabcond[25]= true; // && ! empty($conf->global->MAIN_EMAIL_EDIT_TEMPLATE_FROM_DIC); +$tabcond[26]= $conf->product->enabled; // List of help for fields $tabhelp=array(); @@ -858,6 +867,7 @@ if ($fieldlist[$field]=='pcg_type') { $valuetoshow=$langs->trans("Pcg_type"); } if ($fieldlist[$field]=='pcg_subtype') { $valuetoshow=$langs->trans("Pcg_subtype"); } if ($fieldlist[$field]=='sortorder') { $valuetoshow=$langs->trans("SortOrder"); } + if ($fieldlist[$field]=='short_label') { $valuetoshow=$langs->trans("ShortLabel"); } if ($id == 2) // Special cas for state page { @@ -995,6 +1005,7 @@ if ($fieldlist[$field]=='pcg_type') { $valuetoshow=$langs->trans("Pcg_type"); } if ($fieldlist[$field]=='pcg_subtype') { $valuetoshow=$langs->trans("Pcg_subtype"); } if ($fieldlist[$field]=='sortorder') { $valuetoshow=$langs->trans("SortOrder"); } + if ($fieldlist[$field]=='short_label') { $valuetoshow=$langs->trans("ShortLabel"); } // Affiche nom du champ if ($showfield) @@ -1159,7 +1170,14 @@ else if ($fieldlist[$field]=='unicode') { $valuetoshow = $langs->getCurrencySymbol($obj->code,1); } - + else if ($fieldlist[$field]=='label' && $tabname[$_GET["id"]]==MAIN_DB_PREFIX.'c_units') { + $langs->load("products"); + $valuetoshow=$langs->trans($obj->$fieldlist[$field]); + } + else if ($fieldlist[$field]=='short_label' && $tabname[$_GET["id"]]==MAIN_DB_PREFIX.'c_units') { + $langs->load("products"); + $valuetoshow = $langs->trans($obj->$fieldlist[$field]); + } else if (($fieldlist[$field] == 'unit') && ($tabname[$id] == MAIN_DB_PREFIX.'c_paper_format')) { $key = $langs->trans('SizeUnit'.strtolower($obj->unit)); diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 302b49fbdb723..a2c578fcaa957 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -8,6 +8,7 @@ * Copyright (C) 2010-2014 Juanjo Menent * Copyright (C) 2010-2011 Philippe Grand * Copyright (C) 2012-2013 Christophe Battarel + * Copyright (C) 2012 Cedric Salvador * Copyright (C) 2013-2014 Florian Henry * Copyright (C) 2014 Ferran Marcet * @@ -687,6 +688,7 @@ // Ecrase $pu par celui du produit // Ecrase $desc par celui du produit // Ecrase $txtva par celui du produit + // Replaces $fk_unit with the product unit if (! empty($idprod)) { $prod = new Product($db); $prod->fetch($idprod); @@ -782,6 +784,7 @@ } $type = $prod->type; + $fk_unit = $prod->fk_unit; } else { $pu_ht = price2num($price_ht, 'MU'); $pu_ttc = price2num(GETPOST('price_ttc'), 'MU'); @@ -790,6 +793,12 @@ $label = (GETPOST('product_label') ? GETPOST('product_label') : ''); $desc = $product_desc; $type = GETPOST('type'); + + $fk_unit = GETPOST('units', 'int'); + + if ($fk_unit <= 0) { + $fk_unit = null; + } } // Margin @@ -812,7 +821,7 @@ setEventMessage($mesg, 'errors'); } else { // Insert line - $result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $price_base_type, $pu_ttc, $info_bits, $type, - 1, 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $date_start, $date_end, $array_option); + $result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $price_base_type, $pu_ttc, $info_bits, $type, - 1, 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $date_start, $date_end, $array_option, $fk_unit); if ($result > 0) { $db->commit(); @@ -846,6 +855,7 @@ unset($_POST['np_markRate']); unset($_POST['dp_desc']); unset($_POST['idprod']); + unset($_POST['units']); unset($_POST['date_starthour']); unset($_POST['date_startmin']); @@ -940,7 +950,7 @@ if (! $error) { $db->begin(); - $result = $object->updateline(GETPOST('lineid'), $pu_ht, GETPOST('qty'), GETPOST('remise_percent'), $vat_rate, $localtax1_rate, $localtax2_rate, $description, 'HT', $info_bits, $special_code, GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, $type, $date_start, $date_end, $array_option); + $result = $object->updateline(GETPOST('lineid'), $pu_ht, GETPOST('qty'), GETPOST('remise_percent'), $vat_rate, $localtax1_rate, $localtax2_rate, $description, 'HT', $info_bits, $special_code, GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, $type, $date_start, $date_end, $array_option, $_POST["units"]); if ($result >= 0) { $db->commit(); diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index dc1184b7490e5..306df93052348 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -9,6 +9,7 @@ * Copyright (C) 2010-2014 Juanjo Menent * Copyright (C) 2010-2011 Philippe Grand * Copyright (C) 2012-2014 Christophe Battarel + * Copyright (C) 2012 Cedric Salvador * Copyright (C) 2013 Florian Henry * Copyright (C) 2014-2015 Marcos García * @@ -32,6 +33,7 @@ */ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php'; +require_once DOL_DOCUMENT_ROOT ."/core/class/commonobjectline.class.php"; require_once DOL_DOCUMENT_ROOT .'/product/class/product.class.php'; require_once DOL_DOCUMENT_ROOT .'/contact/class/contact.class.php'; require_once DOL_DOCUMENT_ROOT .'/margin/lib/margins.lib.php'; @@ -203,6 +205,7 @@ function add_product($idproduct, $qty, $remise_percent=0) $line->subprice=$price; $line->remise_percent=$remise_percent; $line->tva_tx=$tva_tx; + $line->fk_unit=$prod->fk_unit; $this->lines[]=$line; } @@ -315,11 +318,12 @@ function insert_discount($idremise) * @param int $date_start Start date of the line * @param int $date_end End date of the line * @param array $array_option extrafields array + * @param int $fk_unit Id of the unit to use. Null to use the default one * @return int >0 if OK, <0 if KO * * @see add_product */ - function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0, $fk_product=0, $remise_percent=0.0, $price_base_type='HT', $pu_ttc=0.0, $info_bits=0, $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=0, $pa_ht=0, $label='',$date_start='', $date_end='',$array_option=0) + function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0, $fk_product=0, $remise_percent=0.0, $price_base_type='HT', $pu_ttc=0.0, $info_bits=0, $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=0, $pa_ht=0, $label='',$date_start='', $date_end='',$array_option=0, $fk_unit = null) { global $mysoc; @@ -416,6 +420,7 @@ function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0 $this->line->product_type=$type; $this->line->special_code=$special_code; $this->line->fk_parent_line=$fk_parent_line; + $this->line->fk_unit=$fk_unit; $this->line->date_start=$date_start; $this->line->date_end=$date_end; @@ -497,9 +502,10 @@ function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0 * @param int $date_start Start date of the line * @param int $date_end End date of the line * @param array $array_option extrafields array + * @param int $fk_unit Id of the unit to use. Null to use the default one * @return int 0 if OK, <0 if KO */ - function updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0, $desc='', $price_base_type='HT', $info_bits=0, $special_code=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=0, $pa_ht=0, $label='', $type=0, $date_start='', $date_end='', $array_option=0) + function updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0, $desc='', $price_base_type='HT', $info_bits=0, $special_code=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=0, $pa_ht=0, $label='', $type=0, $date_start='', $date_end='', $array_option=0, $fk_unit = null) { global $mysoc; @@ -581,6 +587,7 @@ function updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0.0 $this->line->special_code = $special_code; $this->line->fk_parent_line = $fk_parent_line; $this->line->skip_update_total = $skip_update_total; + $this->line->fk_unit = $fk_unit; // infos marge if (!empty($fk_product) && empty($fk_fournprice) && empty($pa_ht)) { @@ -829,7 +836,8 @@ function create($user, $notrigger=0) $this->lines[$i]->label, $this->lines[$i]->date_start, $this->lines[$i]->date_end, - $this->lines[$i]->array_options + $this->lines[$i]->array_options, + $this->lines[$i]->fk_unit ); if ($result < 0) @@ -1193,6 +1201,7 @@ function fetch($rowid,$ref='') */ $sql = "SELECT d.rowid, d.fk_propal, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,"; $sql.= " d.info_bits, d.total_ht, d.total_tva, d.total_localtax1, d.total_localtax2, d.total_ttc, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht, d.special_code, d.rang, d.product_type,"; + $sql.= " d.fk_unit,"; $sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label,'; $sql.= ' d.date_start, d.date_end'; $sql.= " FROM ".MAIN_DB_PREFIX."propaldet as d"; @@ -1249,6 +1258,7 @@ function fetch($rowid,$ref='') $line->product_label = $objp->product_label; $line->product_desc = $objp->product_desc; // Description produit $line->fk_product_type = $objp->fk_product_type; + $line->fk_unit = $objp->fk_unit; $line->date_start = $objp->date_start; $line->date_end = $objp->date_end; @@ -2674,6 +2684,7 @@ function getLinesArray() $sql.= ' pt.qty, pt.tva_tx, pt.remise_percent, pt.subprice, pt.info_bits,'; $sql.= ' pt.total_ht, pt.total_tva, pt.total_ttc, pt.fk_product_fournisseur_price as fk_fournprice, pt.buy_price_ht as pa_ht, pt.special_code, pt.localtax1_tx, pt.localtax2_tx,'; $sql.= ' pt.date_start, pt.date_end, pt.product_type, pt.rang, pt.fk_parent_line,'; + $sql.= ' pt.fk_unit,'; $sql.= ' p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid,'; $sql.= ' p.description as product_desc,'; $sql.= ' p.entity'; @@ -2724,6 +2735,7 @@ function getLinesArray() $this->lines[$i]->rang = $obj->rang; $this->lines[$i]->date_start = $this->db->jdate($obj->date_start); $this->lines[$i]->date_end = $this->db->jdate($obj->date_end); + $this->lines[$i]->fk_unit = $obj->fk_unit; $i++; } @@ -2780,7 +2792,7 @@ public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedes * \class PropaleLigne * \brief Class to manage commercial proposal lines */ -class PropaleLigne extends CommonObject +class PropaleLigne extends CommonObjectLine { var $db; var $error; @@ -2866,6 +2878,7 @@ function fetch($rowid) $sql = 'SELECT pd.rowid, pd.fk_propal, pd.fk_parent_line, pd.fk_product, pd.label as custom_label, pd.description, pd.price, pd.qty, pd.tva_tx,'; $sql.= ' pd.remise, pd.remise_percent, pd.fk_remise_except, pd.subprice,'; $sql.= ' pd.info_bits, pd.total_ht, pd.total_tva, pd.total_ttc, pd.fk_product_fournisseur_price as fk_fournprice, pd.buy_price_ht as pa_ht, pd.special_code, pd.rang,'; + $sql.= ' pd.fk_unit,'; $sql.= ' pd.localtax1_tx, pd.localtax2_tx, pd.total_localtax1, pd.total_localtax2,'; $sql.= ' p.ref as product_ref, p.label as product_label, p.description as product_desc,'; $sql.= ' pd.date_start, pd.date_end, pd.product_type'; @@ -2913,6 +2926,7 @@ function fetch($rowid) $this->libelle = $objp->product_label; // deprecated $this->product_label = $objp->product_label; $this->product_desc = $objp->product_desc; + $this->fk_unit = $objp->fk_unit; $this->date_start = $this->db->jdate($objp->date_start); $this->date_end = $this->db->jdate($objp->date_end); @@ -2975,6 +2989,7 @@ function insert($notrigger=0) $sql.= ' subprice, remise_percent, '; $sql.= ' info_bits, '; $sql.= ' total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, fk_product_fournisseur_price, buy_price_ht, special_code, rang,'; + $sql.= ' fk_unit,'; $sql.= ' date_start, date_end)'; $sql.= " VALUES (".$this->fk_propal.","; $sql.= " ".($this->fk_parent_line>0?"'".$this->fk_parent_line."'":"null").","; @@ -3001,6 +3016,7 @@ function insert($notrigger=0) $sql.= " ".(isset($this->pa_ht)?"'".price2num($this->pa_ht)."'":"null").","; $sql.= ' '.$this->special_code.','; $sql.= ' '.$this->rang.','; + $sql.= ' '.(!$this->fk_unit ? 'NULL' : $this->fk_unit).','; $sql.= " ".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null").','; $sql.= " ".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null"); $sql.= ')'; @@ -3166,6 +3182,7 @@ function update($notrigger=0) if (! empty($this->rang)) $sql.= ", rang=".$this->rang; $sql.= " , date_start=".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null"); $sql.= " , date_end=".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null"); + $sql.= " , fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit); $sql.= " WHERE rowid = ".$this->rowid; dol_syslog(get_class($this)."::update", LOG_DEBUG); diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index bda67f809fa7a..a11ea9cf1549d 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -8,6 +8,7 @@ * Copyright (C) 2011 Philippe Grand * Copyright (C) 2012-2013 Christophe Battarel * Copyright (C) 2012 Marcos García + * Copyright (C) 2012 Cedric Salvador * Copyright (C) 2013 Florian Henry * Copyright (C) 2014 Ferran Marcet * @@ -341,7 +342,7 @@ $array_option = $lines[$i]->array_options; } - $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, $lines[$i]->info_bits, $lines[$i]->fk_remise_except, 'HT', 0, $date_start, $date_end, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $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, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, $lines[$i]->info_bits, $lines[$i]->fk_remise_except, 'HT', 0, $date_start, $date_end, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $array_option, $lines[$i]->fk_unit); if ($result < 0) { $error ++; @@ -700,6 +701,7 @@ } $type = $prod->type; + $fk_unit = $prod->fk_unit; } else { $pu_ht = price2num($price_ht, 'MU'); $pu_ttc = price2num(GETPOST('price_ttc'), 'MU'); @@ -708,6 +710,11 @@ $label = (GETPOST('product_label') ? GETPOST('product_label') : ''); $desc = $product_desc; $type = GETPOST('type'); + $fk_unit=GETPOST('units', 'int'); + + if ($fk_unit <= 0) { + $fk_unit = null; + } } // Margin @@ -729,7 +736,7 @@ setEventMessage($mesg, 'errors'); } else { // Insert line - $result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $info_bits, 0, $price_base_type, $pu_ttc, $date_start, $date_end, $type, - 1, 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $array_option); + $result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $info_bits, 0, $price_base_type, $pu_ttc, $date_start, $date_end, $type, - 1, 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $array_option, $fk_unit); if ($result > 0) { $ret = $object->fetch($object->id); // Reload to get new records @@ -765,6 +772,7 @@ unset($_POST['np_markRate']); unset($_POST['dp_desc']); unset($_POST['idprod']); + unset($_POST['units']); unset($_POST['date_starthour']); unset($_POST['date_startmin']); @@ -853,7 +861,7 @@ } if (! $error) { - $result = $object->updateline(GETPOST('lineid'), $description, $pu_ht, GETPOST('qty'), GETPOST('remise_percent'), $vat_rate, $localtax1_rate, $localtax2_rate, 'HT', $info_bits, $date_start, $date_end, $type, GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, 0, $array_option); + $result = $object->updateline(GETPOST('lineid'), $description, $pu_ht, GETPOST('qty'), GETPOST('remise_percent'), $vat_rate, $localtax1_rate, $localtax2_rate, 'HT', $info_bits, $date_start, $date_end, $type, GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, 0, $array_option, GETPOST('units')); if ($result >= 0) { if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index dd0d3163bba11..d0c7e14fc9c98 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -6,6 +6,7 @@ * Copyright (C) 2010-2014 Juanjo Menent * Copyright (C) 2011 Jean Heimburger * Copyright (C) 2012-2014 Christophe Battarel + * Copyright (C) 2012 Cedric Salvador * Copyright (C) 2013 Florian Henry * Copyright (C) 2014-2015 Marcos García * @@ -29,6 +30,7 @@ * \brief Fichier des classes de commandes */ include_once DOL_DOCUMENT_ROOT.'/core/class/commonorder.class.php'; +require_once DOL_DOCUMENT_ROOT ."/core/class/commonobjectline.class.php"; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; require_once DOL_DOCUMENT_ROOT .'/margin/lib/margins.lib.php'; @@ -740,7 +742,8 @@ function create($user, $notrigger=0) $this->lines[$i]->fk_fournprice, $this->lines[$i]->pa_ht, $this->lines[$i]->label, - $this->lines[$i]->array_options + $this->lines[$i]->array_options, + $this->lines[$i]->fk_unit ); if ($result < 0) { @@ -999,6 +1002,7 @@ function createFromProposal($object) $line->rang = $object->lines[$i]->rang; $line->special_code = $object->lines[$i]->special_code; $line->fk_parent_line = $object->lines[$i]->fk_parent_line; + $line->fk_unit = $object->lines[$i]->fk_unit; $line->date_start = $object->lines[$i]->date_start; $line->date_end = $object->lines[$i]->date_end; @@ -1102,6 +1106,7 @@ function createFromProposal($object) * @param int $pa_ht Buying price (without tax) * @param string $label Label * @param array $array_option extrafields array + * @param int $fk_unit Id of the unit to use. Null to use the default one * @return int >0 if OK, <0 if KO * * @see add_product @@ -1111,11 +1116,11 @@ function createFromProposal($object) * par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,produit) * et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue) */ - function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $info_bits=0, $fk_remise_except=0, $price_base_type='HT', $pu_ttc=0, $date_start='', $date_end='', $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0, $label='',$array_option=0) + function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $info_bits=0, $fk_remise_except=0, $price_base_type='HT', $pu_ttc=0, $date_start='', $date_end='', $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0, $label='',$array_option=0, $fk_unit = null) { global $mysoc, $conf, $langs; - dol_syslog(get_class($this)."::addline commandeid=$this->id, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_percent=$remise_percent, info_bits=$info_bits, fk_remise_except=$fk_remise_except, price_base_type=$price_base_type, pu_ttc=$pu_ttc, date_start=$date_start, date_end=$date_end, type=$type", LOG_DEBUG); + dol_syslog(get_class($this)."::addline commandeid=$this->id, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_percent=$remise_percent, info_bits=$info_bits, fk_remise_except=$fk_remise_except, price_base_type=$price_base_type, pu_ttc=$pu_ttc, date_start=$date_start, date_end=$date_end, type=$type, fk_unit=$fk_unit", LOG_DEBUG); include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; @@ -1230,6 +1235,7 @@ function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $f $this->line->product_type=$type; $this->line->special_code=$special_code; $this->line->fk_parent_line=$fk_parent_line; + $this->line->fk_unit=$fk_unit; $this->line->date_start=$date_start; $this->line->date_end=$date_end; @@ -1333,6 +1339,7 @@ function add_product($idproduct, $qty, $remise_percent=0.0, $date_start='', $dat $line->ref=$prod->ref; $line->libelle=$prod->libelle; $line->product_desc=$prod->description; + $line->fk_unit=$prod->fk_unit; // Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html) // Save the start and end date of the line in the object @@ -1581,6 +1588,7 @@ function fetch_lines($only_product=0) $sql = 'SELECT l.rowid, l.fk_product, l.fk_parent_line, l.product_type, l.fk_commande, l.label as custom_label, l.description, l.price, l.qty, l.tva_tx,'; $sql.= ' l.localtax1_tx, l.localtax2_tx, l.fk_remise_except, l.remise_percent, l.subprice, l.fk_product_fournisseur_price as fk_fournprice, l.buy_price_ht as pa_ht, l.rang, l.info_bits, l.special_code,'; $sql.= ' l.total_ht, l.total_ttc, l.total_tva, l.total_localtax1, l.total_localtax2, l.date_start, l.date_end,'; + $sql.= ' l.fk_unit,'; $sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label as product_label'; $sql.= ' FROM '.MAIN_DB_PREFIX.'commandedet as l'; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON (p.rowid = l.fk_product)'; @@ -1638,6 +1646,7 @@ function fetch_lines($only_product=0) $line->product_label = $objp->product_label; $line->product_desc = $objp->product_desc; // Description produit $line->fk_product_type = $objp->fk_product_type; // Produit ou service + $line->fk_unit = $objp->fk_unit; $line->date_start = $this->db->jdate($objp->date_start); $line->date_end = $this->db->jdate($objp->date_end); @@ -2347,9 +2356,10 @@ function classer_facturee() * @param string $label Label * @param int $special_code Special code (also used by externals modules!) * @param array $array_option extrafields array + * @param int $fk_unit Id of the unit to use. Null to use the default one * @return int < 0 if KO, > 0 if OK */ - function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0.0,$txlocaltax2=0.0, $price_base_type='HT', $info_bits=0, $date_start='', $date_end='', $type=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $special_code=0, $array_option=0) + function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0.0,$txlocaltax2=0.0, $price_base_type='HT', $info_bits=0, $date_start='', $date_end='', $type=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $special_code=0, $array_option=0, $fk_unit = null) { global $conf, $mysoc; @@ -2369,6 +2379,7 @@ function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocalt if (empty($remise)) $remise=0; if (empty($remise_percent)) $remise_percent=0; if (empty($special_code) || $special_code == 3) $special_code=0; + $remise_percent=price2num($remise_percent); $qty=price2num($qty); $pu = price2num($pu); @@ -2441,6 +2452,7 @@ function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocalt $this->line->product_type=$type; $this->line->fk_parent_line=$fk_parent_line; $this->line->skip_update_total=$skip_update_total; + $this->line->fk_unit=$fk_unit; // infos marge if (!empty($fk_product) && empty($fk_fournprice) && empty($pa_ht)) { @@ -3121,6 +3133,7 @@ function getLinesArray() $sql.= ' l.fk_remise_except, l.remise_percent, l.subprice, l.info_bits, l.rang, l.special_code, l.fk_parent_line,'; $sql.= ' l.total_ht, l.total_tva, l.total_ttc, l.fk_product_fournisseur_price as fk_fournprice, l.buy_price_ht as pa_ht, l.localtax1_tx, l.localtax2_tx,'; $sql.= ' l.date_start, l.date_end,'; + $sql.= ' l.fk_unit,'; $sql.= ' p.label as product_label, p.ref, p.fk_product_type, p.rowid as prodid, '; $sql.= ' p.description as product_desc, p.stock as stock_reel,'; $sql.= ' p.entity'; @@ -3170,6 +3183,7 @@ function getLinesArray() $this->lines[$i]->pa_ht = $marginInfos[0]; $this->lines[$i]->marge_tx = $marginInfos[1]; $this->lines[$i]->marque_tx = $marginInfos[2]; + $this->lines[$i]->fk_unit = $obj->fk_unit; $i++; } @@ -3307,6 +3321,7 @@ function fetch($rowid) $sql = 'SELECT cd.rowid, cd.fk_commande, cd.fk_parent_line, cd.fk_product, cd.product_type, cd.label as custom_label, cd.description, cd.price, cd.qty, cd.tva_tx, cd.localtax1_tx, cd.localtax2_tx,'; $sql.= ' cd.remise, cd.remise_percent, cd.fk_remise_except, cd.subprice,'; $sql.= ' cd.info_bits, cd.total_ht, cd.total_tva, cd.total_localtax1, cd.total_localtax2, cd.total_ttc, cd.fk_product_fournisseur_price as fk_fournprice, cd.buy_price_ht as pa_ht, cd.rang, cd.special_code,'; + $sql.= ' cd.fk_unit,'; $sql.= ' p.ref as product_ref, p.label as product_libelle, p.description as product_desc,'; $sql.= ' cd.date_start, cd.date_end'; $sql.= ' FROM '.MAIN_DB_PREFIX.'commandedet as cd'; @@ -3352,6 +3367,7 @@ function fetch($rowid) $this->libelle = $objp->product_libelle; // deprecated $this->product_label = $objp->product_libelle; $this->product_desc = $objp->product_desc; + $this->fk_unit = $objp->fk_unit; $this->date_start = $this->db->jdate($objp->date_start); $this->date_end = $this->db->jdate($objp->date_end); @@ -3468,7 +3484,8 @@ function insert($notrigger=0) $sql.= ' tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,'; $sql.= ' fk_product, product_type, remise_percent, subprice, price, remise, fk_remise_except,'; $sql.= ' special_code, rang, fk_product_fournisseur_price, buy_price_ht,'; - $sql.= ' info_bits, total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, date_start, date_end)'; + $sql.= ' info_bits, total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, date_start, date_end,'; + $sql.= ' fk_unit)'; $sql.= " VALUES (".$this->fk_commande.","; $sql.= " ".($this->fk_parent_line>0?"'".$this->fk_parent_line."'":"null").","; $sql.= " ".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null").","; @@ -3497,7 +3514,8 @@ function insert($notrigger=0) $sql.= " '".price2num($this->total_localtax2)."',"; $sql.= " '".price2num($this->total_ttc)."',"; $sql.= " ".(! empty($this->date_start)?"'".$this->db->idate($this->date_start)."'":"null").','; - $sql.= " ".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null"); + $sql.= " ".(! empty($this->date_end)?"'".$this->db->idate($this->date_end)."'":"null").','; + $sql.= ' '.(!$this->fk_unit ? 'NULL' : $this->fk_unit); $sql.= ')'; dol_syslog(get_class($this)."::insert", LOG_DEBUG); @@ -3615,6 +3633,7 @@ function update($notrigger=0) $sql.= " , product_type=".$this->product_type; $sql.= " , fk_parent_line=".(! empty($this->fk_parent_line)?$this->fk_parent_line:"null"); if (! empty($this->rang)) $sql.= ", rang=".$this->rang; + $sql.= " , fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit); $sql.= " WHERE rowid = ".$this->rowid; dol_syslog(get_class($this)."::update", LOG_DEBUG); diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 3c194a522d380..1804763760d3c 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1064,7 +1064,7 @@ $array_option = $lines[$i]->array_options; } - $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, $lines[$i]->situation_percent, $lines[$i]->fk_prev_id); + $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, $lines[$i]->situation_percent, $lines[$i]->fk_prev_id, $lines[$i]->fk_unit); if ($result > 0) { $lineid = $result; @@ -1106,7 +1106,7 @@ $product->fetch($_POST['idprod' . $i]); $startday = dol_mktime(12, 0, 0, $_POST['date_start' . $i . 'month'], $_POST['date_start' . $i . 'day'], $_POST['date_start' . $i . 'year']); $endday = dol_mktime(12, 0, 0, $_POST['date_end' . $i . 'month'], $_POST['date_end' . $i . 'day'], $_POST['date_end' . $i . 'year']); - $result = $object->addline($product->description, $product->price, $_POST['qty' . $i], $product->tva_tx, $product->localtax1_tx, $product->localtax2_tx, $_POST['idprod' . $i], $_POST['remise_percent' . $i], $startday, $endday, 0, 0, '', $product->price_base_type, $product->price_ttc, $product->type); + $result = $object->addline($product->description, $product->price, $_POST['qty' . $i], $product->tva_tx, $product->localtax1_tx, $product->localtax2_tx, $_POST['idprod' . $i], $_POST['remise_percent' . $i], $startday, $endday, 0, 0, '', $product->price_base_type, $product->price_ttc, $product->type, -1, 0, '', 0, 0, null, 0, '', 0, 100, '', $product->fk_unit); } } } @@ -1252,6 +1252,7 @@ // Ecrase $desc par celui du produit // Ecrase $txtva par celui du produit // Ecrase $base_price_type par celui du produit + // Replaces $fk_unit with the product's if (! empty($idprod)) { $prod = new Product($db); $prod->fetch($idprod); @@ -1347,6 +1348,7 @@ } $type = $prod->type; + $fk_unit = $prod->fk_unit; } else { $pu_ht = price2num($price_ht, 'MU'); $pu_ttc = price2num(GETPOST('price_ttc'), 'MU'); @@ -1355,6 +1357,11 @@ $label = (GETPOST('product_label') ? GETPOST('product_label') : ''); $desc = $product_desc; $type = GETPOST('type'); + $fk_unit= GETPOST('units', 'int'); + + if ($fk_unit <= 0) { + $fk_unit = null; + } } // Margin @@ -1374,7 +1381,7 @@ setEventMessage($mesg, 'errors'); } else { // Insert line - $result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $date_start, $date_end, 0, $info_bits, '', $price_base_type, $pu_ttc, $type, - 1, $special_code, '', 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $array_option, $_POST['progress']); + $result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $date_start, $date_end, 0, $info_bits, '', $price_base_type, $pu_ttc, $type, - 1, $special_code, '', 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $array_option, $_POST['progress'], '', $fk_unit); if ($result > 0) { @@ -1412,6 +1419,7 @@ unset($_POST['np_markRate']); unset($_POST['dp_desc']); unset($_POST['idprod']); + unset($_POST['units']); unset($_POST['date_starthour']); unset($_POST['date_startmin']); @@ -1528,7 +1536,10 @@ // Update line if (! $error) { - $result = $object->updateline(GETPOST('lineid'), $description, $pu_ht, $qty, GETPOST('remise_percent'), $date_start, $date_end, $vat_rate, $localtax1_rate, $localtax2_rate, 'HT', $info_bits, $type, GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, 0, $array_option, GETPOST('progress')); + $result = $object->updateline(GETPOST('lineid'), $description, $pu_ht, $qty, GETPOST('remise_percent'), + $date_start, $date_end, $vat_rate, $localtax1_rate, $localtax2_rate, 'HT', $info_bits, $type, + GETPOST('fk_parent_line'), 0, $fournprice, $buyingprice, $label, 0, $array_option, GETPOST('progress'), + $_POST['units']); if ($result >= 0) { if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { @@ -1565,6 +1576,7 @@ unset($_POST['dp_desc']); unset($_POST['idprod']); + unset($_POST['units']); unset($_POST['date_starthour']); unset($_POST['date_startmin']); diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php index 40ab91199980b..111fcf2b684ae 100644 --- a/htdocs/compta/facture/class/facture-rec.class.php +++ b/htdocs/compta/facture/class/facture-rec.class.php @@ -3,6 +3,7 @@ * Copyright (C) 2004-2012 Laurent Destailleur * Copyright (C) 2009-2012 Regis Houssin * Copyright (C) 2010-2011 Juanjo Menent + * Copyright (C) 2012 Cedric Salvador * Copyright (C) 2013 Florian Henry * * This program is free software; you can redistribute it and/or modify @@ -161,7 +162,8 @@ function create($user, $facid) $facsrc->lines[$i]->product_type, $facsrc->lines[$i]->rang, $facsrc->lines[$i]->special_code, - $facsrc->lines[$i]->label + $facsrc->lines[$i]->label, + $facsrc->lines[$i]->fk_unit ); if ($result_insert < 0) @@ -299,6 +301,7 @@ function fetch_lines() $sql.= ' l.remise, l.remise_percent, l.subprice,'; $sql.= ' l.total_ht, l.total_tva, l.total_ttc,'; $sql.= ' l.rang, l.special_code,'; + $sql.= ' l.fk_unit,'; $sql.= ' p.ref as product_ref, p.fk_product_type as fk_product_type, p.label as product_label, p.description as product_desc'; $sql.= ' FROM '.MAIN_DB_PREFIX.'facturedet_rec as l'; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid'; @@ -341,6 +344,7 @@ function fetch_lines() $line->code_ventilation = $objp->fk_code_ventilation; $line->rang = $objp->rang; $line->special_code = $objp->special_code; + $line->fk_unit = $objp->fk_unit; // Ne plus utiliser $line->price = $objp->price; @@ -412,11 +416,11 @@ function delete() * @param string $label Label of the line * @return int <0 if KO, Id of line if OK */ - function addline($desc, $pu_ht, $qty, $txtva, $fk_product=0, $remise_percent=0, $price_base_type='HT', $info_bits=0, $fk_remise_except='', $pu_ttc=0, $type=0, $rang=-1, $special_code=0, $label='') + function addline($desc, $pu_ht, $qty, $txtva, $fk_product=0, $remise_percent=0, $price_base_type='HT', $info_bits=0, $fk_remise_except='', $pu_ttc=0, $type=0, $rang=-1, $special_code=0, $label='', $fk_unit= null) { $facid=$this->id; - dol_syslog("FactureRec::addline facid=$facid,desc=$desc,pu_ht=$pu_ht,qty=$qty,txtva=$txtva,fk_product=$fk_product,remise_percent=$remise_percent,date_start=$date_start,date_end=$date_end,ventil=$ventil,info_bits=$info_bits,fk_remise_except=$fk_remise_except,price_base_type=$price_base_type,pu_ttc=$pu_ttc,type=$type", LOG_DEBUG); + dol_syslog("FactureRec::addline facid=$facid,desc=$desc,pu_ht=$pu_ht,qty=$qty,txtva=$txtva,fk_product=$fk_product,remise_percent=$remise_percent,date_start=$date_start,date_end=$date_end,ventil=$ventil,info_bits=$info_bits,fk_remise_except=$fk_remise_except,price_base_type=$price_base_type,pu_ttc=$pu_ttc,type=$type,fk_unit=$fk_unit", LOG_DEBUG); include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; // Check parameters @@ -476,6 +480,7 @@ function addline($desc, $pu_ht, $qty, $txtva, $fk_product=0, $remise_percent=0, $sql.= ", total_ttc"; $sql.= ", rang"; $sql.= ", special_code"; + $sql.= ", fk_unit"; $sql.= ") VALUES ("; $sql.= "'".$facid."'"; $sql.= ", ".(! empty($label)?"'".$this->db->escape($label)."'":"null"); @@ -492,7 +497,8 @@ function addline($desc, $pu_ht, $qty, $txtva, $fk_product=0, $remise_percent=0, $sql.= ", '".price2num($total_tva)."'"; $sql.= ", '".price2num($total_ttc)."'"; $sql.= ", ".$rang; - $sql.= ", ".$special_code.")"; + $sql.= ", ".$special_code; + $sql.= ", ".$fk_unit.")"; dol_syslog(get_class($this)."::addline", LOG_DEBUG); if ($this->db->query($sql)) diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 0c277014a64bf..25c7039264761 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -36,6 +36,7 @@ */ include_once DOL_DOCUMENT_ROOT.'/core/class/commoninvoice.class.php'; +require_once DOL_DOCUMENT_ROOT ."/core/class/commonobjectline.class.php"; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php'; require_once DOL_DOCUMENT_ROOT.'/margin/lib/margins.lib.php'; @@ -436,7 +437,8 @@ function create($user,$notrigger=0,$forceduedate=0) $this->lines[$i]->label, $this->lines[$i]->array_options, $this->lines[$i]->situation_percent, - $this->lines[$i]->fk_prev_id + $this->lines[$i]->fk_prev_id, + $this->lines[$i]->fk_unit ); if ($result < 0) { @@ -490,7 +492,9 @@ function create($user,$notrigger=0,$forceduedate=0) 0, $_facrec->lines[$i]->label, null, - $_facrec->lines[$i]->situation_percent + $_facrec->lines[$i]->situation_percent, + '', + $_facrec->lines[$i]->fk_unit ); if ( $result_insert < 0) @@ -782,6 +786,7 @@ function createFromOrder($object) $line->rang = $object->lines[$i]->rang; $line->special_code = $object->lines[$i]->special_code; $line->fk_parent_line = $object->lines[$i]->fk_parent_line; + $line->fk_unit = $object->lines[$i]->fk_unit; $line->fk_fournprice = $object->lines[$i]->fk_fournprice; $marginInfos = getMarginInfos($object->lines[$i]->subprice, $object->lines[$i]->remise_percent, $object->lines[$i]->tva_tx, $object->lines[$i]->localtax1_tx, $object->lines[$i]->localtax2_tx, $object->lines[$i]->fk_fournprice, $object->lines[$i]->pa_ht); @@ -1040,6 +1045,7 @@ function fetch_lines() $sql.= ' l.rang, l.special_code,'; $sql.= ' l.date_start as date_start, l.date_end as date_end,'; $sql.= ' l.info_bits, l.total_ht, l.total_tva, l.total_localtax1, l.total_localtax2, l.total_ttc, l.fk_code_ventilation, l.fk_product_fournisseur_price as fk_fournprice, l.buy_price_ht as pa_ht,'; + $sql.= ' l.fk_unit,'; $sql.= ' p.ref as product_ref, p.fk_product_type as fk_product_type, p.label as product_label, p.description as product_desc'; $sql.= ' FROM '.MAIN_DB_PREFIX.'facturedet as l'; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid'; @@ -1097,6 +1103,7 @@ function fetch_lines() $line->fk_parent_line = $objp->fk_parent_line; $line->situation_percent= $objp->situation_percent; $line->fk_prev_id = $objp->fk_prev_id; + $line->fk_unit = $objp->fk_unit; $this->lines[$i] = $line; @@ -2037,13 +2044,14 @@ function set_draft($user,$idwarehouse=-1) * @param array $array_option extrafields array * @param int $situation_percent Situation advance percentage * @param int $fk_prev_id Previous situation line id reference + * @param int $fk_unit Id of the unit to use. Null to use the default one * @return int <0 if KO, Id of line if OK */ - function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits=0, $fk_remise_except='', $price_base_type='HT', $pu_ttc=0, $type=self::TYPE_STANDARD, $rang=-1, $special_code=0, $origin='', $origin_id=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0, $label='', $array_option=0, $situation_percent=100, $fk_prev_id='') + function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits=0, $fk_remise_except='', $price_base_type='HT', $pu_ttc=0, $type=self::TYPE_STANDARD, $rang=-1, $special_code=0, $origin='', $origin_id=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0, $label='', $array_option=0, $situation_percent=100, $fk_prev_id='', $fk_unit = null) { global $mysoc, $conf, $langs; - dol_syslog(get_class($this)."::addline facid=$this->id,desc=$desc,pu_ht=$pu_ht,qty=$qty,txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, fk_product=$fk_product,remise_percent=$remise_percent,date_start=$date_start,date_end=$date_end,ventil=$ventil,info_bits=$info_bits,fk_remise_except=$fk_remise_except,price_base_type=$price_base_type,pu_ttc=$pu_ttc,type=$type", LOG_DEBUG); + dol_syslog(get_class($this)."::addline facid=$this->id,desc=$desc,pu_ht=$pu_ht,qty=$qty,txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, fk_product=$fk_product,remise_percent=$remise_percent,date_start=$date_start,date_end=$date_end,ventil=$ventil,info_bits=$info_bits,fk_remise_except=$fk_remise_except,price_base_type=$price_base_type,pu_ttc=$pu_ttc,type=$type, fk_unit=$fk_unit", LOG_DEBUG); include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; // Clean parameters @@ -2157,6 +2165,7 @@ function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $f $this->line->origin_id=$origin_id; $this->line->situation_percent = $situation_percent; $this->line->fk_prev_id = $fk_prev_id; + $this->line->fk_unit=$fk_unit; // infos marge $this->line->fk_fournprice = $fk_fournprice; @@ -2219,15 +2228,16 @@ function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $f * @param int $special_code Special code (also used by externals modules!) * @param array $array_option extrafields array * @param int $situation_percent Situation advance percentage + * @param int $fk_unit Id of the unit to use. Null to use the default one * @return int < 0 if KO, > 0 if OK */ - function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type= self::TYPE_STANDARD, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $special_code=0, $array_option=0, $situation_percent=0) + function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type= self::TYPE_STANDARD, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $special_code=0, $array_option=0, $situation_percent=0, $fk_unit = null) { include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; global $mysoc; - dol_syslog(get_class($this)."::updateline $rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1, $txlocaltax2, $price_base_type, $info_bits, $type, $fk_parent_line", LOG_DEBUG); + dol_syslog(get_class($this)."::updateline $rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1, $txlocaltax2, $price_base_type, $info_bits, $type, $fk_parent_line, $fk_unit", LOG_DEBUG); if ($this->brouillon) { @@ -2239,7 +2249,6 @@ function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $dat if (empty($special_code) || $special_code == 3) $special_code=0; if ($situation_percent > 100 || is_null($situation_percent) || $situation_percent == "") $situation_percent = 100; - $remise_percent = price2num($remise_percent); $qty = price2num($qty); $pu = price2num($pu); @@ -2308,7 +2317,7 @@ function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $dat $this->line->fk_parent_line = $fk_parent_line; $this->line->skip_update_total = $skip_update_total; $this->line->situation_percent = $situation_percent; - + $this->line->fk_unit = $fk_unit; // infos marge if (!empty($fk_product) && empty($fk_fournprice) && empty($pa_ht)) { @@ -3367,6 +3376,7 @@ function getLinesArray() $sql.= ' l.remise_percent, l.subprice, l.info_bits, l.rang, l.special_code, l.fk_parent_line,'; $sql.= ' l.total_ht, l.total_tva, l.total_ttc, l.fk_product_fournisseur_price as fk_fournprice, l.buy_price_ht as pa_ht,'; $sql.= ' l.date_start, l.date_end,'; + $sql.= ' l.fk_unit,'; $sql.= ' p.ref as product_ref, p.fk_product_type, p.label as product_label,'; $sql.= ' p.description as product_desc,'; $sql.= ' p.entity'; @@ -3418,6 +3428,7 @@ function getLinesArray() $this->lines[$i]->pa_ht = $marginInfos[0]; $this->lines[$i]->marge_tx = $marginInfos[1]; $this->lines[$i]->marque_tx = $marginInfos[2]; + $this->lines[$i]->fk_unit = $obj->fk_unit; $i++; } @@ -3694,6 +3705,7 @@ function fetch($rowid) $sql.= ' fd.date_start as date_start, fd.date_end as date_end, fd.fk_product_fournisseur_price as fk_fournprice, fd.buy_price_ht as pa_ht,'; $sql.= ' fd.info_bits, fd.special_code, fd.total_ht, fd.total_tva, fd.total_ttc, fd.total_localtax1, fd.total_localtax2, fd.rang,'; $sql.= ' fd.fk_code_ventilation,'; + $sql.= ' fd.fk_unit,'; $sql.= ' fd.situation_percent, fd.fk_prev_id,'; $sql.= ' p.ref as product_ref, p.label as product_libelle, p.description as product_desc'; $sql.= ' FROM '.MAIN_DB_PREFIX.'facturedet as fd'; @@ -3741,6 +3753,7 @@ function fetch($rowid) $this->libelle = $objp->product_libelle; // deprecated $this->product_label = $objp->product_libelle; $this->product_desc = $objp->product_desc; + $this->fk_unit = $objp->fk_unit; $this->situation_percent = $objp->situation_percent; $this->fk_prev_id = $objp->fk_prev_id; @@ -3828,7 +3841,8 @@ function insert($notrigger=0) $sql.= ' date_start, date_end, fk_code_ventilation, '; $sql.= ' rang, special_code, fk_product_fournisseur_price, buy_price_ht,'; $sql.= ' info_bits, total_ht, total_tva, total_ttc, total_localtax1, total_localtax2,'; - $sql.= ' situation_percent, fk_prev_id)'; + $sql.= ' situation_percent, fk_prev_id,'; + $sql.= ' fk_unit)'; $sql.= " VALUES (".$this->fk_facture.","; $sql.= " ".($this->fk_parent_line>0?"'".$this->fk_parent_line."'":"null").","; $sql.= " ".(! empty($this->label)?"'".$this->db->escape($this->label)."'":"null").","; @@ -3859,6 +3873,7 @@ function insert($notrigger=0) $sql.= " ".price2num($this->total_localtax2); $sql .= ", " . $this->situation_percent; $sql .= ", " . $this->fk_prev_id; + $sql .= ", ".(!$this->fk_unit ? 'NULL' : $this->fk_unit); $sql.= ')'; dol_syslog(get_class($this)."::insert", LOG_DEBUG); @@ -4023,6 +4038,7 @@ function update($user='',$notrigger=0) $sql.= ",fk_parent_line=".($this->fk_parent_line>0?$this->fk_parent_line:"null"); if (! empty($this->rang)) $sql.= ", rang=".$this->rang; $sql .= ", situation_percent=" . $this->situation_percent; + $sql .= ", fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit); $sql.= " WHERE rowid = ".$this->rowid; dol_syslog(get_class($this)."::update", LOG_DEBUG); diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index 1fd4d2c80fcbd..95fd712199840 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -2,6 +2,7 @@ /* Copyright (C) 2002-2003 Rodolphe Quiedeville * Copyright (C) 2004-2014 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2012 Cedric Salvador * Copyright (C) 2013 Florian Henry * Copyright (C) 2013 Juanjo Menent * @@ -201,6 +202,7 @@ $sql.= ' l.date_start,'; $sql.= ' l.date_end,'; $sql.= ' l.product_type,'; + $sql.= ' l.fk_unit,'; $sql.= ' p.ref, p.fk_product_type, p.label as product_label,'; $sql.= ' p.description as product_desc'; $sql.= " FROM ".MAIN_DB_PREFIX."facturedet as l"; @@ -221,6 +223,9 @@ print ''.$langs->trans("Description").''; print ''.$langs->trans("VAT").''; print ''.$langs->trans("Qty").''; + if ($conf->global->PRODUCT_USE_UNITS) { + print ''.$langs->trans("Unit").''; + } print ''.$langs->trans("ReductionShort").''; print ''.$langs->trans("TotalHT").''; print ''.$langs->trans("TotalVAT").''; @@ -245,6 +250,7 @@ // Show product and description $type=(isset($objp->product_type)?$objp->product_type:$objp->fk_product_type); + $product_static->fk_unit=$objp->fk_unit; if ($objp->fk_product > 0) { @@ -298,6 +304,10 @@ // Qty print ''.$objp->qty.''; + if ($conf->global->PRODUCT_USE_UNITS) { + print ''.$product_static->get_unit_label().''; + } + // Percent if ($objp->remise_percent > 0) { @@ -444,7 +454,11 @@ print ''.$langs->trans("Description").''; print ''.$langs->trans("Price").''; print ''.$langs->trans("ReductionShort").''; - print ''.$langs->trans("Qty").''; + print ''.$langs->trans("Qty").''; + if ($conf->global->PRODUCT_USE_UNITS) { + print ''.$langs->trans("Unit").''; + } + print ''; $num = count($object->lines); $i = 0; @@ -511,7 +525,11 @@ } print ''.price($object->lines[$i]->price).''; print ''.$object->lines[$i]->remise_percent.' %'; - print ''.$object->lines[$i]->qty.''."\n"; + print ''.$object->lines[$i]->qty.''; + if ($conf->global->PRODUCT_USE_UNITS) { + print "".$object->lines[$i]->get_unit_label().""; + } + print "\n"; $i++; } print ''; diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index 731ad1c6cc14c..3a38c8e4ffbe0 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -490,6 +490,7 @@ $desc=$prod->description; $desc=dol_concatdesc($desc,$product_desc); + $fk_unit = $prod->fk_unit; } else { @@ -498,6 +499,11 @@ $tva_tx=GETPOST('tva_tx')?str_replace('*','',GETPOST('tva_tx')):0; // tva_tx field may be disabled, so we use vat rate 0 $tva_npr=preg_match('/\*/',GETPOST('tva_tx'))?1:0; $desc=$product_desc; + $fk_unit= GETPOST('units', 'int'); + + if ($fk_unit <= 0) { + $fk_unit = null; + } } $localtax1_tx=get_localtax($tva_tx,1,$object->thirdparty); @@ -537,7 +543,8 @@ $info_bits, $fk_fournprice, $pa_ht, - $array_option + $array_option, + $fk_unit ); } @@ -618,6 +625,8 @@ else $pa_ht = null; + $fk_unit = GETPOST('unit', 'int'); + $objectline->description=GETPOST('product_desc'); $objectline->price_ht=GETPOST('elprice'); $objectline->subprice=GETPOST('elprice'); @@ -634,6 +643,12 @@ $objectline->fk_fournprice=$fk_fournprice; $objectline->pa_ht=$pa_ht; + if ($fk_unit > 0) { + $objectline->fk_unit = $_POST['unit']; + } else { + $objectline->fk_unit = null; + } + // Extrafields $extrafieldsline = new ExtraFields($db); $extralabelsline = $extrafieldsline->fetch_name_optionals_label($objectline->table_element); @@ -1286,6 +1301,7 @@ $sql.= " cd.date_ouverture_prevue as date_debut, cd.date_ouverture as date_debut_reelle,"; $sql.= " cd.date_fin_validite as date_fin, cd.date_cloture as date_fin_reelle,"; $sql.= " cd.commentaire as comment, cd.fk_product_fournisseur_price as fk_fournprice, cd.buy_price_ht as pa_ht,"; + $sql.= " cd.fk_unit,"; $sql.= " p.rowid as pid, p.ref as pref, p.label as label, p.fk_product_type as ptype"; $sql.= " FROM ".MAIN_DB_PREFIX."contratdet as cd"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid"; @@ -1301,6 +1317,7 @@ print ''.$langs->trans("VAT").''; print ''.$langs->trans("PriceUHT").''; print ''.$langs->trans("Qty").''; + if($conf->global->PRODUCT_USE_UNITS) print ''.$langs->trans("Unit").''; print ''.$langs->trans("ReductionShort").''; if (! empty($conf->margin->enabled) && ! empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) print ''.$langs->trans("BuyingPrice").''; print ' '; @@ -1343,6 +1360,8 @@ print ''.price($objp->subprice)."\n"; // Quantite print ''.$objp->qty.''; + //Unit + if($conf->global->PRODUCT_USE_UNITS) print ''.$langs->trans($object->lines[$cursorline-1]->get_unit_label()).''; // Remise if ($objp->remise_percent > 0) { @@ -1390,8 +1409,16 @@ // Dates de en service prevues et effectives if ($objp->subprice >= 0) { + $colspan = 6; + + if ($conf->margin->enabled && $conf->global->PRODUCT_USE_UNITS) { + $colspan = 8; + } elseif ($conf->margin->enabled || $conf->global->PRODUCT_USE_UNITS) { + $colspan = 7; + } + print ''; - print ''; + print ''; // Date planned print $langs->trans("DateStartPlanned").': '; @@ -1459,6 +1486,12 @@ print ''; print ''; print ''; + if($conf->global->PRODUCT_USE_UNITS) + { + print ''; + $form->select_units($objp->fk_unit, "unit"); + print ''; + } print '%'; if (! empty($usemargins)) { @@ -1472,6 +1505,7 @@ $colspan=5; if (! empty($conf->margin->enabled) && ! empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) $colspan++; + if($conf->global->PRODUCT_USE_UNITS) $colspan++; // Ligne dates prevues print ""; diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index bb00a5d983861..8031ca85ebecb 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -30,6 +30,7 @@ */ require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php'; +require_once DOL_DOCUMENT_ROOT."/core/class/commonobjectline.class.php"; require_once DOL_DOCUMENT_ROOT . '/core/lib/price.lib.php'; require_once DOL_DOCUMENT_ROOT . '/margin/lib/margins.lib.php'; @@ -655,7 +656,8 @@ function fetch_lines() $sql.= " d.date_fin_validite, d.date_cloture,"; $sql.= " d.fk_user_author,"; $sql.= " d.fk_user_ouverture,"; - $sql.= " d.fk_user_cloture"; + $sql.= " d.fk_user_cloture,"; + $sql.= " d.fk_unit"; $sql.= " FROM ".MAIN_DB_PREFIX."contratdet as d, ".MAIN_DB_PREFIX."product as p"; $sql.= " WHERE d.fk_contrat = ".$this->id ." AND d.fk_product = p.rowid"; $sql.= " ORDER by d.rowid ASC"; @@ -700,6 +702,7 @@ function fetch_lines() $line->fk_user_author = $objp->fk_user_author; $line->fk_user_ouverture= $objp->fk_user_ouverture; $line->fk_user_cloture = $objp->fk_user_cloture; + $line->fk_unit = $objp->fk_unit; $line->ref = $objp->ref; $line->libelle = $objp->label; // Label produit @@ -754,7 +757,8 @@ function fetch_lines() $sql.= " d.date_fin_validite, d.date_cloture,"; $sql.= " d.fk_user_author,"; $sql.= " d.fk_user_ouverture,"; - $sql.= " d.fk_user_cloture"; + $sql.= " d.fk_user_cloture,"; + $sql.= " d.fk_unit"; $sql.= " FROM ".MAIN_DB_PREFIX."contratdet as d"; $sql.= " WHERE d.fk_contrat = ".$this->id; $sql.= " AND (d.fk_product IS NULL OR d.fk_product = 0)"; // fk_product = 0 gardee pour compatibilitee @@ -807,6 +811,7 @@ function fetch_lines() $line->date_debut_reel = $this->db->jdate($objp->date_ouverture); $line->date_fin_prevue = $this->db->jdate($objp->date_fin_validite); $line->date_fin_reel = $this->db->jdate($objp->date_cloture); + $line->fk_unit = $objp->fk_unit; if ($line->statut == 0) $this->nbofserviceswait++; if ($line->statut == 4 && (empty($line->date_fin_prevue) || $line->date_fin_prevue >= $now)) $this->nbofservicesopened++; @@ -1240,9 +1245,10 @@ function update($user=null, $notrigger=0) * @param int $fk_fournprice Fourn price id * @param int $pa_ht Buying price HT * @param array $array_option extrafields array + * @param int $fk_unit Id of the unit to use. Null to use the default one * @return int <0 si erreur, >0 si ok */ - function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $date_start, $date_end, $price_base_type='HT', $pu_ttc=0.0, $info_bits=0, $fk_fournprice=null, $pa_ht = 0,$array_option=0) + function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $date_start, $date_end, $price_base_type='HT', $pu_ttc=0.0, $info_bits=0, $fk_fournprice=null, $pa_ht = 0,$array_option=0, $fk_unit = null) { global $user, $langs, $conf, $mysoc; @@ -1259,6 +1265,7 @@ function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_pr if (! $info_bits) $info_bits=0; if (! $pu_ht) $pu_ht=0; if (! $pu_ttc) $pu_ttc=0; + $pu_ht=price2num($pu_ht); $pu_ttc=price2num($pu_ttc); $pa_ht=price2num($pa_ht); @@ -1322,6 +1329,7 @@ function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_pr $sql.= " price_ht, remise, fk_product_fournisseur_price, buy_price_ht"; if ($date_start > 0) { $sql.= ",date_ouverture_prevue"; } if ($date_end > 0) { $sql.= ",date_fin_validite"; } + $sql.= ", fk_unit"; $sql.= ") VALUES ($this->id, '', '" . $this->db->escape($desc) . "',"; $sql.= ($fk_product>0 ? $fk_product : "null").","; $sql.= " '".$qty."',"; @@ -1340,6 +1348,7 @@ function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_pr else $sql.= ' null'; if ($date_start > 0) { $sql.= ",'".$this->db->idate($date_start)."'"; } if ($date_end > 0) { $sql.= ",'".$this->db->idate($date_end)."'"; } + $sql.= ", ".$fk_unit; $sql.= ")"; dol_syslog(get_class($this)."::addline", LOG_DEBUG); @@ -1418,9 +1427,10 @@ function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_pr * @param int $fk_fournprice Fourn price id * @param int $pa_ht Buying price HT * @param array $array_option extrafields array + * @param int $fk_unit Id of the unit to use. Null to use the default one * @return int < 0 si erreur, > 0 si ok */ - function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $tvatx, $localtax1tx=0.0, $localtax2tx=0.0, $date_debut_reel='', $date_fin_reel='', $price_base_type='HT', $info_bits=0, $fk_fournprice=null, $pa_ht = 0,$array_option=0) + function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $tvatx, $localtax1tx=0.0, $localtax2tx=0.0, $date_debut_reel='', $date_fin_reel='', $price_base_type='HT', $info_bits=0, $fk_fournprice=null, $pa_ht = 0,$array_option=0, $fk_unit = null) { global $user, $conf, $langs, $mysoc; @@ -1511,6 +1521,7 @@ function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $dat else { $sql.=",date_ouverture=null"; } if ($date_fin_reel > 0) { $sql.= ",date_cloture='".$this->db->idate($date_fin_reel)."'"; } else { $sql.=",date_cloture=null"; } + $sql .= ", fk_unit=".$fk_unit; $sql .= " WHERE rowid = ".$rowid; dol_syslog(get_class($this)."::updateline", LOG_DEBUG); @@ -2127,7 +2138,7 @@ public function generateDocument($modele, $outputlangs, $hidedetails=0, $hidedes /** * Classe permettant la gestion des lignes de contrats */ -class ContratLigne extends CommonObject +class ContratLigne extends CommonObjectLine { var $id; @@ -2347,7 +2358,8 @@ function fetch($id, $ref='') $sql.= " t.fk_user_author,"; $sql.= " t.fk_user_ouverture,"; $sql.= " t.fk_user_cloture,"; - $sql.= " t.commentaire"; + $sql.= " t.commentaire,"; + $sql.= " t.fk_unit"; $sql.= " FROM ".MAIN_DB_PREFIX."contratdet as t"; if ($id) $sql.= " WHERE t.rowid = ".$id; if ($ref) $sql.= " WHERE t.rowid = '".$this->db->escape($ref)."'"; @@ -2396,6 +2408,7 @@ function fetch($id, $ref='') $this->fk_fournprice = $obj->fk_fournprice; $marginInfos = getMarginInfos($obj->subprice, $obj->remise_percent, $obj->tva_tx, $obj->localtax1_tx, $obj->localtax2_tx, $this->fk_fournprice, $obj->pa_ht); $this->pa_ht = $marginInfos[0]; + $this->fk_unit = $obj->fk_unit; } $this->db->free($resql); @@ -2506,6 +2519,7 @@ function update($user, $notrigger=0) $sql.= " fk_user_ouverture=".($this->fk_user_ouverture > 0?$this->fk_user_ouverture:"NULL").","; $sql.= " fk_user_cloture=".($this->fk_user_cloture > 0?$this->fk_user_cloture:"NULL").","; $sql.= " commentaire='".$this->db->escape($this->commentaire)."'"; + $sql.= ", fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit); $sql.= " WHERE rowid=".$this->id; dol_syslog(get_class($this)."::update", LOG_DEBUG); diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index da9971b1b4e4c..51dbbbe9c6e3c 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -8,6 +8,7 @@ * Copyright (C) 2011-2014 Philippe Grand * Copyright (C) 2012-2014 Marcos García * Copyright (C) 2012-2014 Raphaël Doursenaud + * Copyright (C) 2012 Cedric 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 @@ -2592,6 +2593,11 @@ function printObjectLines($action, $seller, $buyer, $selected=0, $dateSelector=0 // Qty print ''; + if($conf->global->PRODUCT_USE_UNITS) + { + print ''.$langs->trans('Unit').''; + } + // Reduction short print ''; @@ -2794,7 +2800,7 @@ function printObjectLine($action,$line,$var,$num,$i,$dateSelector,$seller,$buyer */ function printOriginLinesList() { - global $langs, $hookmanager; + global $langs, $hookmanager, $conf; print ''; print ''.$langs->trans('Ref').''; @@ -2802,6 +2808,10 @@ function printOriginLinesList() print ''.$langs->trans('VAT').''; print ''.$langs->trans('PriceUHT').''; print ''.$langs->trans('Qty').''; + if($conf->global->PRODUCT_USE_UNITS) + { + print ''.$langs->trans('Unit').''; + } print ''.$langs->trans('ReductionShort').''; $num = count($this->lines); @@ -2842,7 +2852,7 @@ function printOriginLinesList() */ function printOriginLine($line,$var) { - global $conf,$langs,$bc; + global $conf,$langs,$bc, $conf; //var_dump($line); if (!empty($line->date_start)) @@ -2929,6 +2939,7 @@ function printOriginLine($line,$var) $this->tpl['vat_rate'] = vatrate($line->tva_tx, true); $this->tpl['price'] = price($line->subprice); $this->tpl['qty'] = (($line->info_bits & 2) != 2) ? $line->qty : ' '; + if($conf->global->PRODUCT_USE_UNITS) $this->tpl['unit'] = $line->get_unit_label('long'); $this->tpl['remise_percent'] = (($line->info_bits & 2) != 2) ? vatrate($line->remise_percent, true) : ' '; // Output template part (modules that overwrite templates must declare this into descriptor) diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php index c3c8d823a340e..b72a2d2868184 100644 --- a/htdocs/core/class/commonobjectline.class.php +++ b/htdocs/core/class/commonobjectline.class.php @@ -1,5 +1,6 @@ + * Copyright (C) 2012 Cedric 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 @@ -28,8 +29,57 @@ */ abstract class CommonObjectLine extends CommonObject { + //! Database handler + public $db; + + /** + * Product/service unit + * @var int + */ + public $fk_unit; // TODO + /** + * Returns the text label from units dictionnary + * + * @param string $type Label type (long or short) + * @return string|int <0 if ko, label if ok + */ + public function get_unit_label($type='long') + { + global $langs; + + if (!$this->fk_unit) { + return ''; + } + + $langs->load('products'); + + $this->db->begin(); + + $label_type = 'label'; + + if ($type == 'short') + { + $label_type = 'short_label'; + } + + $sql = 'select '.$label_type.' from '.MAIN_DB_PREFIX.'c_units where rowid='.$this->fk_unit; + $resql = $this->db->query($sql); + if($resql && $this->db->num_rows($resql) > 0) + { + $res = $this->db->fetch_array($resql); + $label = $res[$label_type]; + $this->db->free($resql); + return $label; + } + else + { + $this->error=$this->db->error().' sql='.$sql; + dol_syslog(get_class($this)."::get_unit_label Error ".$this->error, LOG_ERR); + return -1; + } + } // Currently we need function at end of file CommonObject for all object lines. Should find a way to avoid duplicate code. // For the moment we use the extends on CommonObject until PHP min is 5.4 so use Traits. diff --git a/htdocs/core/class/commonorder.class.php b/htdocs/core/class/commonorder.class.php index 469e1676a5383..3e30b0a9ca6d2 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/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 6a6474c83064d..13035b145e810 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -2728,6 +2728,54 @@ function load_situation_invoices($selected = '', $socid = '') return $opt; } + /** + * Prints units selector + * + * @param string $selected Preselected ID + * @param string $htmlname Select name + * @return void + */ + function select_units($selected = '', $htmlname = 'units') + { + print $this->load_units($selected, $htmlname); + } + + /** + * Creates HTML units selector + * + * @param string $selected Preselected ID + * @param string $htmlname Select name + * @return string HTML select + */ + function load_units($selected = '', $htmlname = 'units') + { + global $langs; + + $langs->load('products'); + + $return= ''; + } + return $return; + } + /** * Return a HTML select list of bank accounts * diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index 1c5ae62d01492..ca1be2c7604b5 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -1420,6 +1420,43 @@ function pdf_getlineqty_keeptoship($object,$i,$outputlangs,$hidedetails=0) } } +/** + * Return line unit + * + * @param Object $object Object + * @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) + * @param HookManager $hookmanager Hook manager instance + * @return void + */ +function pdf_getlineunit($object, $i, $outputlangs, $hidedetails = 0, $hookmanager = false) +{ + global $langs; + if ($object->lines[$i]->special_code != 3) { + if (is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line))) { + $special_code = $object->lines[$i]->special_code; + if (!empty($object->lines[$i]->fk_parent_line)) { + $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line); + } + $parameters = array( + 'i' => $i, + 'outputlangs' => $outputlangs, + 'hidedetails' => $hidedetails, + 'special_code' => $special_code + ); + $action = ''; + return $hookmanager->executeHooks('pdf_getlineunit', $parameters, $object, + $action); // Note that $action and $object may have been modified by some hooks + } else { + if (empty($hidedetails) || $hidedetails > 1) { + return $langs->transnoentitiesnoconv($object->lines[$i]->get_unit_label('short')); + } + } + } +} + + /** * Return line remise percent * diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php index f6d28a4f13509..70b8c8f2dfe8c 100644 --- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php @@ -4,6 +4,7 @@ * Copyright (C) 2008 Raphael Bertrand * Copyright (C) 2010-2013 Juanjo Menent * Copyright (C) 2012 Christophe Battarel + * Copyright (C) 2012 Cedric 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 @@ -68,6 +69,7 @@ function __construct($db) $langs->load("main"); $langs->load("bills"); + $langs->load("products"); $this->db = $db; $this->name = "einstein"; @@ -103,9 +105,19 @@ function __construct($db) // Define position of columns $this->posxdesc=$this->marge_gauche+1; - $this->posxtva=112; - $this->posxup=126; - $this->posxqty=145; + if($conf->global->PRODUCT_USE_UNITS) + { + $this->posxtva=99; + $this->posxup=114; + $this->posxqty=133; + $this->posxunit=150; + } + else + { + $this->posxtva=112; + $this->posxup=126; + $this->posxqty=145; + } $this->posxdiscount=162; $this->postotalht=174; if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) $this->posxtva=$this->posxup; @@ -239,7 +251,7 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid $this->atleastonediscount++; } } - if (empty($this->atleastonediscount)) + if (empty($this->atleastonediscount) && empty($conf->global->PRODUCT_USE_UNITS)) { $this->posxpicture+=($this->postotalht - $this->posxdiscount); $this->posxtva+=($this->postotalht - $this->posxdiscount); @@ -380,9 +392,26 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid // Quantity $qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails); $pdf->SetXY($this->posxqty, $curY); - $pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 3, $qty, 0, 'R'); // Enough for 6 chars + // Enough for 6 chars + if($conf->global->PRODUCT_USE_UNITS) + { + $pdf->MultiCell($this->posxunit-$this->posxqty-0.8, 4, $qty, 0, 'R'); + } + else + { + $pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 4, $qty, 0, 'R'); + } + + // Unit + if($conf->global->PRODUCT_USE_UNITS) + { + $unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager); + $pdf->SetXY($this->posxunit, $curY); + $pdf->MultiCell($this->posxdiscount-$this->posxunit-0.8, 4, $unit, 0, 'L'); + } // Discount on line + $pdf->SetXY($this->posxdiscount, $curY); if ($object->lines[$i]->remise_percent) { $pdf->SetXY($this->posxdiscount-2, $curY); @@ -540,7 +569,7 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid /** * Show payments table * - * @param PDF $pdf Object PDF + * @param TCPDF $pdf Object PDF * @param Object $object Object order * @param int $posy Position y in PDF * @param Translate $outputlangs Object langs for output @@ -555,7 +584,7 @@ function _tableau_versements(&$pdf, $object, $posy, $outputlangs) /** * Show miscellaneous information (payment mode, payment term, ...) * - * @param PDF $pdf Object PDF + * @param TCPDF $pdf Object PDF * @param Object $object Object to show * @param int $posy Y * @param Translate $outputlangs Langs object @@ -739,7 +768,7 @@ function _tableau_info(&$pdf, $object, $posy, $outputlangs) /** * Show total to pay * - * @param PDF $pdf Object PDF + * @param TCPDF $pdf Object PDF * @param Facture $object Object invoice * @param int $deja_regle Montant deja regle * @param int $posy Position depart @@ -996,7 +1025,7 @@ function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs) /** * Show table for lines * - * @param PDF $pdf Object PDF + * @param TCPDF $pdf Object PDF * @param string $tab_top Top position of table * @param string $tab_height Height of table (rectangle) * @param int $nexY Y (not used) @@ -1064,7 +1093,23 @@ function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, if (empty($hidetop)) { $pdf->SetXY($this->posxqty-1, $tab_top+1); - $pdf->MultiCell($this->posxdiscount-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C'); + if($conf->global->PRODUCT_USE_UNITS) + { + $pdf->MultiCell($this->posxunit-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C'); + } + else + { + $pdf->MultiCell($this->posxdiscount-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C'); + } + } + + if($conf->global->PRODUCT_USE_UNITS) { + $pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height); + if (empty($hidetop)) { + $pdf->SetXY($this->posxunit - 1, $tab_top + 1); + $pdf->MultiCell($this->posxdiscount - $this->posxunit - 1, 2, $outputlangs->transnoentities("Unit"), '', + 'C'); + } } $pdf->line($this->posxdiscount-1, $tab_top, $this->posxdiscount-1, $tab_top + $tab_height); @@ -1091,7 +1136,7 @@ function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, /** * Show top header of page. * - * @param PDF $pdf Object PDF + * @param TCPDF $pdf Object PDF * @param Object $object Object to show * @param int $showaddress 0=no, 1=yes * @param Translate $outputlangs Object lang for output @@ -1270,7 +1315,7 @@ function _pagehead(&$pdf, $object, $showaddress, $outputlangs) /** * Show footer of page. Need this->emetteur object * - * @param PDF $pdf PDF + * @param TCPDF $pdf PDF * @param Object $object Object to show * @param Translate $outputlangs Object lang for output * @param int $hidefreetext 1=Hide free text diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index 4c340a12cfa36..1c0fa822bb93f 100644 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -115,9 +115,19 @@ function __construct($db) // Define position of columns $this->posxdesc=$this->marge_gauche+1; - $this->posxtva=112; - $this->posxup=126; - $this->posxqty=145; + if($conf->global->PRODUCT_USE_UNITS) + { + $this->posxtva=99; + $this->posxup=114; + $this->posxqty=133; + $this->posxunit=150; + } + else + { + $this->posxtva=112; + $this->posxup=126; + $this->posxqty=145; + } $this->posxdiscount=162; $this->posxprogress=174; // Only displayed for situation invoices $this->postotalht=174; @@ -282,7 +292,7 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid $this->atleastonediscount++; } } - if (empty($this->atleastonediscount)) + if (empty($this->atleastonediscount) && empty($conf->global->PRODUCT_USE_UNITS)) { $this->posxpicture+=($this->postotalht - $this->posxdiscount); $this->posxtva+=($this->postotalht - $this->posxdiscount); @@ -463,7 +473,23 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid // Quantity $qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails); $pdf->SetXY($this->posxqty, $curY); - $pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 3, $qty, 0, 'R'); // Enough for 6 chars + // Enough for 6 chars + if($conf->global->PRODUCT_USE_UNITS) + { + $pdf->MultiCell($this->posxunit-$this->posxqty-0.8, 4, $qty, 0, 'R'); + } + else + { + $pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 4, $qty, 0, 'R'); + } + + // Unit + if($conf->global->PRODUCT_USE_UNITS) + { + $unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager); + $pdf->SetXY($this->posxunit, $curY); + $pdf->MultiCell($this->posxdiscount-$this->posxunit-0.8, 4, $unit, 0, 'L'); + } // Discount on line if ($object->lines[$i]->remise_percent) @@ -1303,7 +1329,23 @@ function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, if (empty($hidetop)) { $pdf->SetXY($this->posxqty-1, $tab_top+1); - $pdf->MultiCell($this->posxdiscount-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C'); + if($conf->global->PRODUCT_USE_UNITS) + { + $pdf->MultiCell($this->posxunit-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C'); + } + else + { + $pdf->MultiCell($this->posxdiscount-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C'); + } + } + + if($conf->global->PRODUCT_USE_UNITS) { + $pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height); + if (empty($hidetop)) { + $pdf->SetXY($this->posxunit - 1, $tab_top + 1); + $pdf->MultiCell($this->posxdiscount - $this->posxunit - 1, 2, $outputlangs->transnoentities("Unit"), '', + 'C'); + } } $pdf->line($this->posxdiscount-1, $tab_top, $this->posxdiscount-1, $tab_top + $tab_height); diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php index 35953b8521f00..402cfcae8fcd1 100644 --- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php +++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php @@ -4,6 +4,7 @@ * Copyright (C) 2008 Raphael Bertrand * Copyright (C) 2010-2014 Juanjo Menent * Copyright (C) 2012 Christophe Battarel + * Copyright (C) 2012 Cedric 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 @@ -102,9 +103,19 @@ function __construct($db) // Define position of columns $this->posxdesc=$this->marge_gauche+1; - $this->posxtva=112; - $this->posxup=126; - $this->posxqty=145; + if($conf->global->PRODUCT_USE_UNITS) + { + $this->posxtva=99; + $this->posxup=114; + $this->posxqty=133; + $this->posxunit=150; + } + else + { + $this->posxtva=112; + $this->posxup=126; + $this->posxqty=145; + } $this->posxdiscount=162; $this->postotalht=174; if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) $this->posxtva=$this->posxup; @@ -265,7 +276,7 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid $this->atleastonediscount++; } } - if (empty($this->atleastonediscount)) + if (empty($this->atleastonediscount) && empty($conf->global->PRODUCT_USE_UNITS)) { $this->posxpicture+=($this->postotalht - $this->posxdiscount); $this->posxtva+=($this->postotalht - $this->posxdiscount); @@ -436,9 +447,26 @@ function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hid // Quantity $qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails); $pdf->SetXY($this->posxqty, $curY); - $pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 3, $qty, 0, 'R'); // Enough for 6 chars + // Enough for 6 chars + if($conf->global->PRODUCT_USE_UNITS) + { + $pdf->MultiCell($this->posxunit-$this->posxqty-0.8, 4, $qty, 0, 'R'); + } + else + { + $pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 4, $qty, 0, 'R'); + } + + // Unit + if($conf->global->PRODUCT_USE_UNITS) + { + $unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager); + $pdf->SetXY($this->posxunit, $curY); + $pdf->MultiCell($this->posxdiscount-$this->posxunit-0.8, 4, $unit, 0, 'L'); + } // Discount on line + $pdf->SetXY($this->posxdiscount, $curY); if ($object->lines[$i]->remise_percent) { $pdf->SetXY($this->posxdiscount-2, $curY); @@ -1143,7 +1171,23 @@ function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, if (empty($hidetop)) { $pdf->SetXY($this->posxqty-1, $tab_top+1); - $pdf->MultiCell($this->posxdiscount-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C'); + if($conf->global->PRODUCT_USE_UNITS) + { + $pdf->MultiCell($this->posxunit-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C'); + } + else + { + $pdf->MultiCell($this->posxdiscount-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C'); + } + } + + if($conf->global->PRODUCT_USE_UNITS) { + $pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height); + if (empty($hidetop)) { + $pdf->SetXY($this->posxunit - 1, $tab_top + 1); + $pdf->MultiCell($this->posxdiscount - $this->posxunit - 1, 2, $outputlangs->transnoentities("Unit"), '', + 'C'); + } } $pdf->line($this->posxdiscount-1, $tab_top, $this->posxdiscount-1, $tab_top + $tab_height); diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php index bce94c70a575b..ede2b522ecdd1 100644 --- a/htdocs/core/tpl/objectline_create.tpl.php +++ b/htdocs/core/tpl/objectline_create.tpl.php @@ -58,6 +58,15 @@ trans('PriceUTTC'); ?> trans('Qty'); ?> + global->PRODUCT_USE_UNITS) + { + print ''; + print ''; + print $langs->trans('Unit'); + print ''; + } + ?> trans('ReductionShort'); ?> situation_cycle_ref) { @@ -218,6 +227,14 @@ "> + global->PRODUCT_USE_UNITS) + { + print ''; + print $form->select_units($line->fk_unit, "units"); + print ''; + } + ?> remise_percent); ?>">% situation_cycle_ref) { @@ -291,6 +308,9 @@ if($this->situation_cycle_ref) $colspan++; if (! empty($inputalsopricewithtax)) $colspan++; // We add 1 if col total ttc if (in_array($object->element,array('propal','facture','invoice','commande','order'))) $colspan++; // With this, there is a column move button + if ($conf->global->PRODUCT_USE_UNITS) { + $colspan++; + } if (! empty($usemargins)) { @@ -560,6 +580,7 @@ function setforfree() { jQuery("#np_markRate").show(); // May no exists jQuery(".np_marginRate").show(); // May no exists jQuery(".np_markRate").show(); // May no exists + jQuery("#units, #title_units").show(); } function setforpredef() { jQuery("#select_type").val(-1); @@ -576,6 +597,8 @@ function setforpredef() { jQuery("#np_markRate").hide(); // May no exists jQuery(".np_marginRate").hide(); // May no exists jQuery(".np_markRate").hide(); // May no exists + jQuery(".np_markRate").hide(); // May no exists + jQuery("#units, #title_units").hide(); } diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php index ae2238e06f2c7..81af7385efc27 100644 --- a/htdocs/core/tpl/objectline_edit.tpl.php +++ b/htdocs/core/tpl/objectline_edit.tpl.php @@ -140,6 +140,15 @@ + global->PRODUCT_USE_UNITS) + { + print ''; + $form->select_units($line->fk_unit, "units"); + print ''; + } + ?> + info_bits & 2) != 2) { print ' + global->PRODUCT_USE_UNITS) + { + print ''; + $label = $line->get_unit_label('short'); + if ($label !== '') { + print $langs->trans($label); + } + print ''; + } + ?> + remise_percent) && $line->special_code != 3) { ?> remise_percent,$langs); ?> diff --git a/htdocs/core/tpl/originproductline.tpl.php b/htdocs/core/tpl/originproductline.tpl.php index 878166bb40db3..7919668ae5314 100644 --- a/htdocs/core/tpl/originproductline.tpl.php +++ b/htdocs/core/tpl/originproductline.tpl.php @@ -24,6 +24,9 @@ tpl['vat_rate']; ?> tpl['price']; ?> tpl['qty']; ?> + global->PRODUCT_USE_UNITS) echo ''.$langs->trans($this->tpl['unit']).''; + ?> tpl['remise_percent']; ?> - \ No newline at end of file + diff --git a/htdocs/install/mysql/data/llx_c_units.sql b/htdocs/install/mysql/data/llx_c_units.sql new file mode 100644 index 0000000000000..835c0ab06ebf3 --- /dev/null +++ b/htdocs/install/mysql/data/llx_c_units.sql @@ -0,0 +1,31 @@ +-- ======================================================================== +-- Copyright (C) 2001-2002,2004 Rodolphe Quiedeville +-- Copyright (C) 2004 Laurent Destailleur +-- Copyright (C) 2012 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 2 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 . +-- +-- ======================================================================== + +INSERT INTO llx_c_units ( code, label, short_label, active) VALUES ('P','piece','p', 1); +INSERT INTO llx_c_units ( code, label, short_label, active) VALUES ('SET','set','se', 1); +INSERT INTO llx_c_units ( code, label, short_label, active) VALUES ('S','second','s', 1); +INSERT INTO llx_c_units ( code, label, short_label, active) VALUES ('H','hour','h', 1); +INSERT INTO llx_c_units ( code, label, short_label, active) VALUES ('D','day','d', 1); +INSERT INTO llx_c_units ( code, label, short_label, active) VALUES ('KG','kilogram','kg', 1); +INSERT INTO llx_c_units ( code, label, short_label, active) VALUES ('G','gram','g', 1); +INSERT INTO llx_c_units ( code, label, short_label, active) VALUES ('M','meter','m', 1); +INSERT INTO llx_c_units ( code, label, short_label, active) VALUES ('LM','linear meter','lm', 1); +INSERT INTO llx_c_units ( code, label, short_label, active) VALUES ('M2','square meter','m2', 1); +INSERT INTO llx_c_units ( code, label, short_label, active) VALUES ('M3','cubic meter','m3', 1); +INSERT INTO llx_c_units ( code, label, short_label, active) VALUES ('L','liter','l', 1); 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 c09c434d27ea9..e8d4f77d5f821 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 @@ -1,4 +1,4 @@ --- +NULL- -- 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. @@ -209,3 +209,44 @@ create table llx_commande_fournisseurdet_extrafields ALTER TABLE llx_commande_fournisseurdet_extrafields ADD INDEX idx_commande_fournisseurdet_extrafields (fk_object); +-- Units +create table llx_c_units( + rowid integer AUTO_INCREMENT PRIMARY KEY, + code varchar(3), + label varchar(50), + short_label varchar(5), + active tinyint DEFAULT 1 NOT NULL +)ENGINE=innodb; +ALTER TABLE llx_c_units ADD UNIQUE uk_c_units_code(code); + +INSERT INTO llx_c_units ( code, label, short_label, active) VALUES ('NA','aucune','', 1); +INSERT INTO llx_c_units ( code, label, short_label, active) VALUES ('P','piece','p', 1); +INSERT INTO llx_c_units ( code, label, short_label, active) VALUES ('SET','set','se', 1); +INSERT INTO llx_c_units ( code, label, short_label, active) VALUES ('S','second','s', 1); +INSERT INTO llx_c_units ( code, label, short_label, active) VALUES ('H','hour','h', 1); +INSERT INTO llx_c_units ( code, label, short_label, active) VALUES ('D','day','d', 1); +INSERT INTO llx_c_units ( code, label, short_label, active) VALUES ('KG','kilogram','kg', 1); +INSERT INTO llx_c_units ( code, label, short_label, active) VALUES ('G','gram','g', 1); +INSERT INTO llx_c_units ( code, label, short_label, active) VALUES ('M','meter','m', 1); +INSERT INTO llx_c_units ( code, label, short_label, active) VALUES ('LM','linear meter','lm', 1); +INSERT INTO llx_c_units ( code, label, short_label, active) VALUES ('M2','square meter','m2', 1); +INSERT INTO llx_c_units ( code, label, short_label, active) VALUES ('M3','cubic meter','m3', 1); +INSERT INTO llx_c_units ( code, label, short_label, active) VALUES ('L','liter','l', 1); + +alter table llx_product add fk_unit integer default NULL; +ALTER TABLE llx_product ADD CONSTRAINT fk_product_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid); + +alter table llx_facturedet_rec add fk_unit integer default NULL; +ALTER TABLE llx_facturedet_rec ADD CONSTRAINT fk_facturedet_rec_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid); + +alter table llx_facturedet add fk_unit integer default NULL; +ALTER TABLE llx_facturedet ADD CONSTRAINT fk_facturedet_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid); + +alter table llx_propaldet add fk_unit integer default NULL; +ALTER TABLE llx_propaldet ADD CONSTRAINT fk_propaldet_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid); + +alter table llx_commandedet add fk_unit integer default NULL; +ALTER TABLE llx_commandedet ADD CONSTRAINT fk_commandedet_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid); + +alter table llx_contratdet add fk_unit integer default NULL; +ALTER TABLE llx_contratdet ADD CONSTRAINT fk_contratdet_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid); \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_c_units.key.sql b/htdocs/install/mysql/tables/llx_c_units.key.sql new file mode 100644 index 0000000000000..f97ea9f709f4d --- /dev/null +++ b/htdocs/install/mysql/tables/llx_c_units.key.sql @@ -0,0 +1,21 @@ +-- ======================================================================== +-- Copyright (C) 2005 Laurent Destailleur +-- Copyright (C) 2012 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 2 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 . +-- +-- ======================================================================== + + +ALTER TABLE llx_c_units ADD UNIQUE uk_c_units_code(code); diff --git a/htdocs/install/mysql/tables/llx_c_units.sql b/htdocs/install/mysql/tables/llx_c_units.sql new file mode 100644 index 0000000000000..44c5b81248324 --- /dev/null +++ b/htdocs/install/mysql/tables/llx_c_units.sql @@ -0,0 +1,27 @@ +-- ======================================================================== +-- Copyright (C) 2001-2002,2004 Rodolphe Quiedeville +-- Copyright (C) 2004 Laurent Destailleur +-- Copyright (C) 2012 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 2 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_units( + rowid integer AUTO_INCREMENT PRIMARY KEY, + code varchar(3), + label varchar(50), + short_label varchar(5), + active tinyint DEFAULT 1 NOT NULL +)ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_commandedet.key.sql b/htdocs/install/mysql/tables/llx_commandedet.key.sql index 4d3f8223f7928..21765a6ad1b71 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.key.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.key.sql @@ -1,6 +1,7 @@ -- =================================================================== -- Copyright (C) 2006 Laurent Destailleur -- Copyright (C) 2011 Regis Houssin +-- Copyright (C) 2012 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 @@ -22,4 +23,5 @@ ALTER TABLE llx_commandedet ADD INDEX idx_commandedet_fk_commande (fk_commande); ALTER TABLE llx_commandedet ADD INDEX idx_commandedet_fk_product (fk_product); +ALTER TABLE llx_commandedet ADD CONSTRAINT fk_commandedet_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid); ALTER TABLE llx_commandedet ADD CONSTRAINT fk_commandedet_fk_commande FOREIGN KEY (fk_commande) REFERENCES llx_commande (rowid); diff --git a/htdocs/install/mysql/tables/llx_commandedet.sql b/htdocs/install/mysql/tables/llx_commandedet.sql index 7562b694b996b..76bd75f17c8e3 100644 --- a/htdocs/install/mysql/tables/llx_commandedet.sql +++ b/htdocs/install/mysql/tables/llx_commandedet.sql @@ -3,6 +3,7 @@ -- Copyright (C) 2005-2012 Regis Houssin -- Copyright (C) 2006-2009 Laurent Destailleur -- Copyright (C) 2010 Juanjo Menent +-- Copyright (C) 2012 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 @@ -53,6 +54,7 @@ create table llx_commandedet special_code integer UNSIGNED DEFAULT 0, -- code pour les lignes speciales rang integer DEFAULT 0, + fk_unit integer DEFAULT NULL, -- lien vers table des unités import_key varchar(14) )ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_contratdet.key.sql b/htdocs/install/mysql/tables/llx_contratdet.key.sql index e749c09df51cc..6f65271ebb7ef 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.key.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.key.sql @@ -27,3 +27,5 @@ ALTER TABLE llx_contratdet ADD INDEX idx_contratdet_date_fin_validite (date_fin_ ALTER TABLE llx_contratdet ADD CONSTRAINT fk_contratdet_fk_contrat FOREIGN KEY (fk_contrat) REFERENCES llx_contrat (rowid); ALTER TABLE llx_contratdet ADD CONSTRAINT fk_contratdet_fk_product FOREIGN KEY (fk_product) REFERENCES llx_product (rowid); + +ALTER TABLE llx_contratdet ADD CONSTRAINT fk_contratdet_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid); diff --git a/htdocs/install/mysql/tables/llx_contratdet.sql b/htdocs/install/mysql/tables/llx_contratdet.sql index 78091d3a3d9c2..b4e13fb99c2f2 100644 --- a/htdocs/install/mysql/tables/llx_contratdet.sql +++ b/htdocs/install/mysql/tables/llx_contratdet.sql @@ -61,6 +61,7 @@ create table llx_contratdet fk_user_author integer NOT NULL DEFAULT 0, fk_user_ouverture integer, fk_user_cloture integer, - commentaire text + commentaire text, + fk_unit integer DEFAULT NULL )ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_facturedet.key.sql b/htdocs/install/mysql/tables/llx_facturedet.key.sql index 52c7ec7668d40..8a8ecf1da9cea 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.key.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.key.sql @@ -1,6 +1,7 @@ -- =================================================================== -- Copyright (C) 2005 Laurent Destailleur -- Copyright (C) 2011 Regis Houssin +-- Copyright (C) 2012 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 @@ -25,3 +26,4 @@ ALTER TABLE llx_facturedet ADD INDEX idx_facturedet_fk_facture (fk_facture); ALTER TABLE llx_facturedet ADD INDEX idx_facturedet_fk_product (fk_product); ALTER TABLE llx_facturedet ADD UNIQUE INDEX uk_fk_remise_except (fk_remise_except, fk_facture); ALTER TABLE llx_facturedet ADD CONSTRAINT fk_facturedet_fk_facture FOREIGN KEY (fk_facture) REFERENCES llx_facture (rowid); +ALTER TABLE llx_facturedet ADD CONSTRAINT fk_facturedet_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid); diff --git a/htdocs/install/mysql/tables/llx_facturedet.sql b/htdocs/install/mysql/tables/llx_facturedet.sql index d663adf4e1cbf..63cd9ab3bc1b7 100644 --- a/htdocs/install/mysql/tables/llx_facturedet.sql +++ b/htdocs/install/mysql/tables/llx_facturedet.sql @@ -60,7 +60,8 @@ create table llx_facturedet import_key varchar(14), situation_percent real, -- % progression of lines invoicing - fk_prev_id integer -- id of the line in the previous situation + fk_prev_id integer, -- id of the line in the previous situation, + fk_unit integer DEFAULT NULL -- id of the unit code¡ )ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec.key.sql b/htdocs/install/mysql/tables/llx_facturedet_rec.key.sql new file mode 100644 index 0000000000000..45619e9472776 --- /dev/null +++ b/htdocs/install/mysql/tables/llx_facturedet_rec.key.sql @@ -0,0 +1,21 @@ +-- =================================================================== +-- Copyright (C) 2005 Laurent Destailleur +-- Copyright (C) 2011 Regis Houssin +-- Copyright (C) 2012 Cedric 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 2 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 . +-- +-- =================================================================== + +ALTER TABLE llx_facturedet_rec ADD CONSTRAINT fk_facturedet_rec_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid); diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec.sql b/htdocs/install/mysql/tables/llx_facturedet_rec.sql index 05bfa71ec2e4e..164dc2f94d507 100644 --- a/htdocs/install/mysql/tables/llx_facturedet_rec.sql +++ b/htdocs/install/mysql/tables/llx_facturedet_rec.sql @@ -3,6 +3,7 @@ -- Copyright (C) 2009-2014 Laurent Destailleur -- Copyright (C) 2010 Juanjo Menent -- Copyright (C) 2010-2012 Regis Houssin +-- Copyright (C) 2012 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 @@ -46,5 +47,6 @@ create table llx_facturedet_rec info_bits integer DEFAULT 0, -- TVA NPR ou non special_code integer UNSIGNED DEFAULT 0, -- code pour les lignes speciales rang integer DEFAULT 0, -- ordre d'affichage - fk_contract_line integer NULL -- id of contract line when predefined invoice comes from contract lines + fk_contract_line integer NULL, -- id of contract line when predefined invoice comes from contract lines + fk_unit integer DEFAULT NULL )ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_product.key.sql b/htdocs/install/mysql/tables/llx_product.key.sql index fb471910230de..5157861ba4b29 100644 --- a/htdocs/install/mysql/tables/llx_product.key.sql +++ b/htdocs/install/mysql/tables/llx_product.key.sql @@ -2,6 +2,7 @@ -- Copyright (C) 2002-2004 Rodolphe Quiedeville -- Copyright (C) 2004-2013 Laurent Destailleur -- Copyright (C) 2005-2009 Regis Houssin +-- Copyright (C) 2012 Cédric Salvador -- Copyright (C) 2014 Marcos García -- -- This program is free software; you can redistribute it and/or modify @@ -30,7 +31,7 @@ ALTER TABLE llx_product ADD INDEX idx_product_fk_country (fk_country); ALTER TABLE llx_product ADD INDEX idx_product_fk_user_author (fk_user_author); ALTER TABLE llx_product ADD INDEX idx_product_fk_barcode_type (fk_barcode_type); ALTER TABLE llx_product ADD UNIQUE INDEX uk_product_barcode (barcode, fk_barcode_type, entity); - +ALTER TABLE llx_product ADD CONSTRAINT fk_product_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid); ALTER TABLE llx_product ADD CONSTRAINT fk_product_fk_country FOREIGN KEY (fk_country) REFERENCES llx_c_country (rowid); ALTER TABLE llx_product ADD CONSTRAINT fk_product_barcode_type FOREIGN KEY (fk_barcode_type) REFERENCES llx_c_barcode_type (rowid); diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql index 03c5c5edd3cd1..5abbdcdde97bd 100755 --- a/htdocs/install/mysql/tables/llx_product.sql +++ b/htdocs/install/mysql/tables/llx_product.sql @@ -2,8 +2,8 @@ -- Copyright (C) 2002-2006 Rodolphe Quiedeville -- Copyright (C) 2008-2010 Laurent Destailleur -- Copyright (C) 2005-2010 Regis Houssin --- Copyright (C) 2010 juanjo Menent --- Copyright (C) 2013 Cédric Salvador +-- Copyright (C) 2010 Juanjo Menent +-- Copyright (C) 2012-2013 Cédric Salvador -- Copyright (C) 2014 Marcos García -- -- This program is free software; you can redistribute it and/or modify @@ -77,5 +77,6 @@ create table llx_product hidden tinyint DEFAULT 0, -- Not used. Deprecated. import_key varchar(14), -- Import key fk_price_expression integer, -- Link to the rule for dynamic price calculation - desiredstock integer DEFAULT 0 + desiredstock integer DEFAULT 0, + fk_unit integer DEFAULT NULL )ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_propaldet.key.sql b/htdocs/install/mysql/tables/llx_propaldet.key.sql index eb56554a60f3d..3d3467ea88819 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.key.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.key.sql @@ -1,5 +1,6 @@ -- =================================================================== -- Copyright (C) 2009-2011 Regis Houssin +-- Copyright (C) 2012 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 @@ -21,4 +22,5 @@ ALTER TABLE llx_propaldet ADD INDEX idx_propaldet_fk_propal (fk_propal); ALTER TABLE llx_propaldet ADD INDEX idx_propaldet_fk_product (fk_product); +ALTER TABLE llx_propaldet ADD CONSTRAINT fk_propaldet_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid); ALTER TABLE llx_propaldet ADD CONSTRAINT fk_propaldet_fk_propal FOREIGN KEY (fk_propal) REFERENCES llx_propal (rowid); diff --git a/htdocs/install/mysql/tables/llx_propaldet.sql b/htdocs/install/mysql/tables/llx_propaldet.sql index 624292decd6a3..299767ae2ed17 100644 --- a/htdocs/install/mysql/tables/llx_propaldet.sql +++ b/htdocs/install/mysql/tables/llx_propaldet.sql @@ -2,6 +2,7 @@ -- Copyright (C) 2002-2003 Rodolphe Quiedeville -- Copyright (C) 2005-2012 Regis Houssin -- Copyright (C) 2010 Juanjo Menent +-- Copyright (C) 2012 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 @@ -51,7 +52,8 @@ create table llx_propaldet fk_product_fournisseur_price integer DEFAULT NULL, -- reference of supplier price when line was added (may be used to update buy_price_ht current price when future invoice will be created) special_code integer DEFAULT 0, -- code pour les lignes speciales - rang integer DEFAULT 0 -- ordre affichage sur la propal + rang integer DEFAULT 0, -- ordre affichage sur la propal + fk_unit integer DEFAULT NULL -- lien vers table des unités )ENGINE=innodb; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 017c819d85e76..33842e1ed8eb6 100755 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1371,6 +1371,7 @@ UseSearchToSelectProduct=Use a search form to choose a product (rather than a dr UseEcoTaxeAbility=Support Eco-Taxe (WEEE) SetDefaultBarcodeTypeProducts=Default barcode type to use for products SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties +UseUnits=Support units ProductCodeChecker= Module for product code generation and checking (product or service) ProductOtherConf= Product / Service configuration ##### Syslog ##### diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang index eb7261ab613c7..793fd40a2ce1d 100755 --- a/htdocs/langs/en_US/products.lang +++ b/htdocs/langs/en_US/products.lang @@ -189,6 +189,32 @@ CustomCode=Customs code CountryOrigin=Origin country HiddenIntoCombo=Hidden into select lists Nature=Nature +DictionnaryUnits=Units +ShortLabel=Short label +Unit=Unit +p=u. +set=set +se=set +second=second +s=s +hour=hour +h=h +day=day +d=d +kilogram=kilogram +kg=Kg +gram=gram +g=g +meter=meter +m=m +linear meter=linear meter +lm=lm +square meter=square meter +m2=m² +cubic meter=cubic meter +m3=m³ +liter=liter +l=L ProductCodeModel=Product ref template ServiceCodeModel=Service ref template AddThisProductCard=Create product card diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php index 2d0c1cca4682f..fa7dc78092c49 100644 --- a/htdocs/product/admin/product.php +++ b/htdocs/product/admin/product.php @@ -6,7 +6,8 @@ * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2011-2012 Juanjo Menent * Copyright (C) 2012 Christophe Battarel -** + * Copyright (C) 2012 Cedric 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 @@ -172,6 +173,12 @@ $res = dolibarr_set_const($db, "PRODUIT_USE_ECOTAXE", $ecotaxe,'chaine',0,'',$conf->entity); }*/ +else if ($action == 'useUnits') +{ + $useUnits = GETPOST('activate_units', 'alpha'); + $res = dolibarr_set_const($db, "PRODUCT_USE_UNITS", $useUnits, 'chaine', 0, '', $conf->entity); +} + if($action) { if (! $res > 0) $error++; @@ -424,6 +431,21 @@ print ''; print ''; +// Use units +$var=!$var; +print '
'; +print ''; +print ''; +print ''; +print ''.$langs->trans("UseUnits").''; +print ''; +print $form->selectyesno("activate_units",$conf->global->PRODUCT_USE_UNITS,1); +print ''; +print ''; +print ''; +print ''; +print '
'; + // View product description in thirdparty language if (! empty($conf->global->MAIN_MULTILANGS)) { diff --git a/htdocs/product/card.php b/htdocs/product/card.php index 50ed04a29df2f..03f62221c0503 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -7,7 +7,7 @@ * Copyright (C) 2006 Auguria SARL * Copyright (C) 2010-2014 Juanjo Menent * Copyright (C) 2013-2014 Marcos García - * Copyright (C) 2013 Cédric Salvador + * Copyright (C) 2012-2013 Cédric Salvador * Copyright (C) 2011-2014 Alexandre Spangaro * Copyright (C) 2014 Cédric Gross * Copyright (C) 2014 Ferran Marcet @@ -179,6 +179,8 @@ if (! $error) { + $units = GETPOST('units', 'int'); + $object->ref = $ref; $object->libelle = GETPOST('libelle'); $object->price_base_type = GETPOST('price_base_type'); @@ -240,6 +242,9 @@ $object->volume_units = GETPOST('volume_units'); $object->finished = GETPOST('finished'); $object->hidden = GETPOST('hidden')=='yes'?1:0; + if ($fk_unit > 0) { + $object->fk_unit = $fk_unit; + } $object->accountancy_code_sell = GETPOST('accountancy_code_sell'); $object->accountancy_code_buy = GETPOST('accountancy_code_buy'); @@ -318,6 +323,14 @@ $object->finished = GETPOST('finished'); $object->hidden = GETPOST('hidden')=='yes'?1:0; + $units = GETPOST('units', 'int'); + + if ($units > 0) { + $object->fk_unit = $units; + } else { + $object->fk_unit = null; + } + $object->barcode_type = GETPOST('fk_barcode_type'); $object->barcode = GETPOST('barcode'); // Set barcode_type_xxx from barcode_type id @@ -554,7 +567,19 @@ $object->id, GETPOST('remise_percent'), $price_base_type, - $pu_ttc + $pu_ttc, + 0, + 0, + -1, + 0, + 0, + 0, + 0, + '', + '', + '', + 0, + $object->fk_unit ); if ($result > 0) { @@ -646,7 +671,18 @@ '', '', $price_base_type, - $pu_ttc + $pu_ttc, + '', + '', + 0, + -1, + 0, + 0, + null, + 0, + '', + 0, + $object->fk_unit ); if ($result > 0) @@ -739,7 +775,20 @@ '', '', $price_base_type, - $pu_ttc + $pu_ttc, + Facture::TYPE_STANDARD, + -1, + 0, + '', + 0, + 0, + null, + 0, + '', + 0, + 100, + '', + $object->fk_unit ); if ($result > 0) @@ -993,10 +1042,20 @@ // We use dolibarr_details as type of DolEditor here, because we must not accept images as description is included into PDF and not accepted by TCPDF. $doleditor = new DolEditor('note', GETPOST('note'), '', 140, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, 8, 70); - $doleditor->Create(); + $doleditor->Create(); - print ""; - print ''; + print ""; + + // Units + if($conf->global->PRODUCT_USE_UNITS) + { + print ''.$langs->trans('Unit').''; + print ''; + $form->select_units("units"); + print ''; print '
'; @@ -1261,8 +1320,18 @@ $doleditor = new DolEditor('note', $object->note, '', 140, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, 4, 80); $doleditor->Create(); - print ""; - print ''; + print ""; + + // Units + if($conf->global->PRODUCT_USE_UNITS) + { + print ''.$langs->trans('Unit').''; + print ''; + $form->select_units($object->fk_unit); + print ''; + } + + print ''; print '
'; @@ -1529,6 +1598,18 @@ print "\n"; } + // Unit + if($conf->global->PRODUCT_USE_UNITS) + { + $unit = $object->get_unit_label(); + + print ''.$langs->trans('Unit').''; + if ($unit !== '') { + print $langs->trans($unit); + } + print ''; + } + // Custom code if (empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO)) { diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 43da5af3cea06..10b0599e37196 100755 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -5,6 +5,7 @@ * Copyright (C) 2006 Andre Cianfarani * Copyright (C) 2007-2011 Jean Heimburger * Copyright (C) 2010-2013 Juanjo Menent + * Copyright (C) 2012 Cedric Salvador * Copyright (C) 2013-2014 Cedric GROSS * Copyright (C) 2013-2014 Marcos García * Copyright (C) 2011-2014 Alexandre Spangaro @@ -169,6 +170,12 @@ class Product extends CommonObject var $fk_price_expression; + /** + * Unit + * @var int + */ + public $fk_unit; + /** * Constructor * @@ -360,6 +367,7 @@ function create($user,$notrigger=0) $sql.= ", canvas"; $sql.= ", finished"; $sql.= ", tobatch"; + $sql.= ", fk_unit"; $sql.= ") VALUES ("; $sql.= "'".$this->db->idate($now)."'"; $sql.= ", ".$conf->entity; @@ -380,6 +388,7 @@ function create($user,$notrigger=0) $sql.= ", '".$this->canvas."'"; $sql.= ", ".((! isset($this->finished) || $this->finished < 0 || $this->finished == '') ? 'null' : (int) $this->finished); $sql.= ", ".((empty($this->status_batch) || $this->status_batch < 0)? '0':$this->status_batch); + $sql.= ", ".(!$this->fk_unit ? 'NULL' : $this->fk_unit); $sql.= ")"; dol_syslog(get_class($this)."::Create", LOG_DEBUG); @@ -669,6 +678,7 @@ function update($id, $user, $notrigger=false, $action='update') $sql.= ", accountancy_code_buy = '" . $this->accountancy_code_buy."'"; $sql.= ", accountancy_code_sell= '" . $this->accountancy_code_sell."'"; $sql.= ", desiredstock = " . ((isset($this->desiredstock) && $this->desiredstock != '') ? $this->desiredstock : "null"); + $sql.= ", fk_unit= " . (!$this->fk_unit ? 'NULL' : $this->fk_unit); $sql.= " WHERE rowid = " . $id; dol_syslog(get_class($this)."update", LOG_DEBUG); @@ -1467,7 +1477,7 @@ function fetch($id='', $ref='', $ref_ext='', $ignore_expression = 0) $sql.= " tobuy, fk_product_type, duration, seuil_stock_alerte, canvas,"; $sql.= " weight, weight_units, length, length_units, surface, surface_units, volume, volume_units, barcode, fk_barcode_type, finished,"; $sql.= " accountancy_code_buy, accountancy_code_sell, stock, pmp,"; - $sql.= " datec, tms, import_key, entity, desiredstock, tobatch"; + $sql.= " datec, tms, import_key, entity, desiredstock, tobatch, fk_unit"; $sql.= " ,ref_ext, fk_price_expression"; $sql.= " FROM ".MAIN_DB_PREFIX."product"; if ($id) $sql.= " WHERE rowid = ".$this->db->escape($id); @@ -1546,6 +1556,7 @@ function fetch($id='', $ref='', $ref_ext='', $ignore_expression = 0) $this->ref_ext = $obj->ref_ext; $this->fk_price_expression = $obj->fk_price_expression; + $this->fk_unit = $obj->fk_unit; $this->db->free($resql); @@ -3727,6 +3738,48 @@ function initAsSpecimen() $this->barcode=-1; // Create barcode automatically } + /** + * Returns the text label from units dictionnary + * + * @param string $type Label type (long or short) + * @return string|int <0 if ko, label if ok + */ + function get_unit_label($type='long') + { + global $langs; + + if (!$this->fk_unit) { + return ''; + } + + $langs->load('products'); + + $this->db->begin(); + + $label_type = 'label'; + + if ($type == 'short') + { + $label_type = 'short_label'; + } + + $sql = 'select '.$label_type.' from '.MAIN_DB_PREFIX.'c_units where rowid='.$this->fk_unit; + $resql = $this->db->query($sql); + if($resql && $this->db->num_rows($resql) > 0) + { + $res = $this->db->fetch_array($resql); + $label = $res[$label_type]; + $this->db->free($resql); + return $label; + } + else + { + $this->error=$this->db->error().' sql='.$sql; + dol_syslog(get_class($this)."::get_unit_label Error ".$this->error, LOG_ERR); + return -1; + } + } + /** * Return if object has a sell-by date or eat-by date * From eb99202dc22cb568b7019f9ea4839f78355101f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Mon, 2 Mar 2015 01:10:31 +0100 Subject: [PATCH 002/264] Little changes --- htdocs/install/mysql/migration/3.7.0-3.8.0.sql | 3 +-- 1 file changed, 1 insertion(+), 2 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 e8d4f77d5f821..1b780fc8469c8 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 @@ -1,4 +1,4 @@ -NULL- +-- -- 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. @@ -219,7 +219,6 @@ create table llx_c_units( )ENGINE=innodb; ALTER TABLE llx_c_units ADD UNIQUE uk_c_units_code(code); -INSERT INTO llx_c_units ( code, label, short_label, active) VALUES ('NA','aucune','', 1); INSERT INTO llx_c_units ( code, label, short_label, active) VALUES ('P','piece','p', 1); INSERT INTO llx_c_units ( code, label, short_label, active) VALUES ('SET','set','se', 1); INSERT INTO llx_c_units ( code, label, short_label, active) VALUES ('S','second','s', 1); From 728b64e334dc999fa965d61e2cfe1c4e65bd8747 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Sun, 12 Apr 2015 20:24:22 +0200 Subject: [PATCH 003/264] Fix Bug #2583: Unable to create a bank transfer with localized numbers --- ChangeLog | 1 + htdocs/compta/bank/virement.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 31e0bad5a1692..e299da9a8e6cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ Fix: [ bug #1757 ] Sorting breaks product/service statistics Fix: [ bug #1797 ] Tulip supplier invoice module takes creation date instead of invoice date Fix: [ bug #1792 ] Users are not allowed to see margins module index page when no product view permission is enabled Fix: [ bug #1846 ] Browser IE11 not detected +Fix: [ bug #2583 ] Unable to create a bank transfer with localized numbers ***** ChangeLog for 3.5.6 compared to 3.5.5 ***** Fix: Avoid missing class error for fetch_thirdparty method #1973 diff --git a/htdocs/compta/bank/virement.php b/htdocs/compta/bank/virement.php index bea66e6a47d4d..07541732bb081 100644 --- a/htdocs/compta/bank/virement.php +++ b/htdocs/compta/bank/virement.php @@ -3,6 +3,7 @@ * Copyright (C) 2004-2008 Laurent Destailleur * Copytight (C) 2005-2009 Regis Houssin * Copytight (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 @@ -48,7 +49,7 @@ $mesg=''; $dateo = dol_mktime(12,0,0,GETPOST('remonth','int'),GETPOST('reday','int'),GETPOST('reyear','int')); $label = GETPOST('label','alpha'); - $amount= GETPOST('amount','int'); + $amount= GETPOST('amount'); if (! $label) { From bbd01c0c8d0f238a642e26b5078d593571670879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Sun, 12 Apr 2015 20:59:58 +0200 Subject: [PATCH 004/264] Fix: Bug #2577 Incorrect invoice status in "Linked objects" page of a project --- ChangeLog | 1 + htdocs/projet/element.php | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 31e0bad5a1692..4681b1bbd41d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ Fix: [ bug #1757 ] Sorting breaks product/service statistics Fix: [ bug #1797 ] Tulip supplier invoice module takes creation date instead of invoice date Fix: [ bug #1792 ] Users are not allowed to see margins module index page when no product view permission is enabled Fix: [ bug #1846 ] Browser IE11 not detected +Fix: [ bug #2577 ] Incorrect invoice status in "Linked objects" page of a project ***** ChangeLog for 3.5.6 compared to 3.5.5 ***** Fix: Avoid missing class error for fetch_thirdparty method #1973 diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 62bbf9ae642ec..4d54123ae4a53 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 @@ -281,7 +282,14 @@ if (empty($value['disableamount'])) print ''.(isset($element->total_ttc)?price($element->total_ttc):' ').''; // Status - print ''.$element->getLibStatut(5).''; + print ''; + if ($element instanceof CommonInvoice) { + //This applies for Facture and FactureFournisseur + print $element->getLibStatut(5, $element->getSommePaiement()); + } else { + print $element->getLibStatut(5); + } + print ''; print ''; From 9cfb295675bebb049bbc367e902c571f1b9a27c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Sun, 12 Apr 2015 21:05:26 +0200 Subject: [PATCH 005/264] Fix: Bug #2576 Unable to edit a dictionary entry that has # in its ref --- ChangeLog | 1 + htdocs/admin/dict.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 31e0bad5a1692..b59da631ee6d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ Fix: [ bug #1757 ] Sorting breaks product/service statistics Fix: [ bug #1797 ] Tulip supplier invoice module takes creation date instead of invoice date Fix: [ bug #1792 ] Users are not allowed to see margins module index page when no product view permission is enabled Fix: [ bug #1846 ] Browser IE11 not detected +Fix: [ bug #2576 ] Unable to edit a dictionary entry that has # in its ref ***** ChangeLog for 3.5.6 compared to 3.5.5 ***** Fix: Avoid missing class error for fetch_thirdparty method #1973 diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 62e78ae95e2af..391782199e724 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -6,7 +6,7 @@ * Copyright (C) 2010-2013 Juanjo Menent * Copyright (C) 2011 Philippe Grand * Copyright (C) 2011 Remy Younes - * Copyright (C) 2012-2013 Marcos García + * Copyright (C) 2012-2015 Marcos García * Copyright (C) 2012 Christophe Battarel * Copyright (C) 2011-2012 Alexandre Spangaro * @@ -1104,7 +1104,7 @@ if (isset($obj->type) && in_array($obj->type, array('system', 'systemauto'))) $iserasable=0; - $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&code='.(! empty($obj->code)?$obj->code:'').'&id='.$id.'&'; + $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&code='.(! empty($obj->code)?urlencode($obj->code):'').'&id='.$id.'&'; // Active print ''; From 6173706531ac4a19e0c5b66d3f066e6b98cc2c8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Sun, 12 Apr 2015 21:55:20 +0200 Subject: [PATCH 006/264] Fix: [ bug #1906 ] Deplacement does not allow translated decimal format --- ChangeLog | 1 + htdocs/compta/deplacement/fiche.php | 27 +++++++++++++++++---------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 31e0bad5a1692..89e358f1fcf9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ Fix: [ bug #1757 ] Sorting breaks product/service statistics Fix: [ bug #1797 ] Tulip supplier invoice module takes creation date instead of invoice date Fix: [ bug #1792 ] Users are not allowed to see margins module index page when no product view permission is enabled Fix: [ bug #1846 ] Browser IE11 not detected +Fix: [ bug #1906 ] Deplacement does not allow translated decimal format ***** ChangeLog for 3.5.6 compared to 3.5.5 ***** Fix: Avoid missing class error for fetch_thirdparty method #1973 diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php index 808d9163222b9..65328ff6bfb8f 100644 --- a/htdocs/compta/deplacement/fiche.php +++ b/htdocs/compta/deplacement/fiche.php @@ -4,6 +4,7 @@ * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2012 Juanjo Menent * 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 @@ -123,8 +124,14 @@ { $error=0; + $km = GETPOST('km'); + + if ($km) { + $km = price2num($km); + } + $object->date = dol_mktime(12, 0, 0, GETPOST('remonth','int'), GETPOST('reday','int'), GETPOST('reyear','int')); - $object->km = GETPOST('km','int'); + $object->km = $km; $object->type = GETPOST('type','alpha'); $object->socid = GETPOST('socid','int'); $object->fk_user = GETPOST('fk_user','int'); @@ -182,8 +189,14 @@ { $result = $object->fetch($id); + $km = GETPOST('km'); + + if ($km) { + $km = price2num($km); + } + $object->date = dol_mktime(12, 0, 0, GETPOST('remonth','int'), GETPOST('reday','int'), GETPOST('reyear','int')); - $object->km = GETPOST('km','int'); + $object->km = $km; $object->type = GETPOST('type','alpha'); $object->socid = GETPOST('socid','int'); $object->fk_user = GETPOST('fk_user','int'); @@ -225,12 +238,6 @@ $result=$object->setValueFrom('dated',$dated,'','','date'); if ($result < 0) dol_print_error($db, $object->error); } -else if ($action == 'setkm' && $user->rights->deplacement->creer) -{ - $object->fetch($id); - $result=$object->setValueFrom('km',GETPOST('km','int')); - if ($result < 0) dol_print_error($db, $object->error); -} else if ($action == 'setnote_public' && $user->rights->deplacement->creer) { $object->fetch($id); @@ -385,7 +392,7 @@ // Km print ''.$langs->trans("FeesKilometersOrAmout").''; - print ''; + print ''; print ''; // Where @@ -477,7 +484,7 @@ print ''; print $form->editfieldkey("FeesKilometersOrAmout",'km',$object->km,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'numeric:6'); print ''; - print $form->editfieldval("FeesKilometersOrAmout",'km',$object->km,$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'numeric:6'); + print $form->editfieldval("FeesKilometersOrAmout",'km',price($object->km),$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'numeric:6'); print ""; // Where From 8f0c41dbd21e48fa61164a6794958a7ad6c1e752 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Sun, 12 Apr 2015 22:02:25 +0200 Subject: [PATCH 007/264] Fix: [ bug #1905 ] Custom deplacement types do not get translated in deplacement card --- ChangeLog | 1 + htdocs/compta/deplacement/fiche.php | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 89e358f1fcf9c..c80a9ecc08be1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ Fix: [ bug #1797 ] Tulip supplier invoice module takes creation date instead of Fix: [ bug #1792 ] Users are not allowed to see margins module index page when no product view permission is enabled Fix: [ bug #1846 ] Browser IE11 not detected Fix: [ bug #1906 ] Deplacement does not allow translated decimal format +Fix: [ bug #1905 ] Custom deplacement types do not get translated in deplacement card ***** ChangeLog for 3.5.6 compared to 3.5.5 ***** Fix: Avoid missing class error for fetch_thirdparty method #1973 diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php index 65328ff6bfb8f..752ffafa3579e 100644 --- a/htdocs/compta/deplacement/fiche.php +++ b/htdocs/compta/deplacement/fiche.php @@ -460,10 +460,12 @@ print ''; // Type + $form->load_cache_types_fees(); + print ''; print $form->editfieldkey("Type",'type',$langs->trans($object->type),$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'select:types_fees'); print ''; - print $form->editfieldval("Type",'type',$langs->trans($object->type),$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'select:types_fees'); + print $form->editfieldval("Type",'type', $form->cache_types_fees[$object->type],$object,$conf->global->MAIN_EDIT_ALSO_INLINE && $user->rights->deplacement->creer,'select:types_fees'); print ''; // Who From 54b8aa8a0b79528aaf45e11e495d4dfef45002f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Tue, 14 Apr 2015 18:45:43 +0200 Subject: [PATCH 008/264] Fixed typo in task export Closes #2607, #2609 --- htdocs/core/modules/modProjet.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php index 0d8a09aa7e5aa..db0b0d765c388 100644 --- a/htdocs/core/modules/modProjet.class.php +++ b/htdocs/core/modules/modProjet.class.php @@ -182,7 +182,7 @@ function __construct($db) $this->export_code[$r]=$this->rights_class.'_'.$r; $this->export_label[$r]='ProjectsAndTasksLines'; // Translation key (used only if key ExportDataset_xxx_z not found) $this->export_permission[$r]=array(array("projet","export")); - $this->export_dependencies_array[$r]=array('task_time'=>'ppt.rowid'); + $this->export_dependencies_array[$r]=array('task_time'=>'pt.rowid'); $this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','s.fk_pays'=>'List:c_pays:libelle', 's.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text', From 3073aab48bbb26a4080696deb1105c12caa8d3c5 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Fri, 17 Apr 2015 23:31:51 +0200 Subject: [PATCH 009/264] Fix : discount were not working anymore on supplier order and bill --- htdocs/core/tpl/objectline_create.tpl.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php index a51a650541612..7262a3b3bd909 100644 --- a/htdocs/core/tpl/objectline_create.tpl.php +++ b/htdocs/core/tpl/objectline_create.tpl.php @@ -201,9 +201,9 @@ - "> + "> - remise_percent); ?>" name="remise_percent">% + remise_percent); ?>">% Date: Sat, 18 Apr 2015 04:21:16 +0200 Subject: [PATCH 010/264] Fix : date_delivery was not a datetime --- htdocs/install/mysql/migration/3.6.0-3.7.0.sql | 2 ++ htdocs/install/mysql/tables/llx_livraison.sql | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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 b17a190f826b8..0c055fc5aeae2 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 @@ -1173,3 +1173,5 @@ ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN fk_commandefourndet INT -- IVORY COST (id country=21) insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values (211, 21, '0','0',0,0,0,0,'IVA Rate 0',1); insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values (212, 21, '18','0',7.5,2,0,0,'IVA standard rate',1); + +ALTER TABLE llx_livraison MODIFY COLUMN date_delivery DATETIME NULL DEFAULT NULL; \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_livraison.sql b/htdocs/install/mysql/tables/llx_livraison.sql index 486212158aa17..4cf0431a39a0a 100644 --- a/htdocs/install/mysql/tables/llx_livraison.sql +++ b/htdocs/install/mysql/tables/llx_livraison.sql @@ -33,7 +33,7 @@ create table llx_livraison fk_user_author integer, -- createur du bon de livraison date_valid datetime, -- date de validation fk_user_valid integer, -- valideur du bon de livraison - date_delivery date DEFAULT NULL, -- delivery date + date_delivery datetime DEFAULT NULL, -- delivery date fk_address integer, -- delivery address (deprecated) fk_statut smallint DEFAULT 0, total_ht double(24,8) DEFAULT 0, From 9fee7a9827bbd4dcd54750f515739fc0f083b6c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Sat, 18 Apr 2015 10:30:58 +0200 Subject: [PATCH 011/264] Fix: [ bug #2601 ] Supplier orderstoinvoice does not work with PostgreSQL --- htdocs/fourn/commande/orderstoinvoice.php | 27 +++++------------------ 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php index 3397b18a30b3a..083ea05bc6433 100644 --- a/htdocs/fourn/commande/orderstoinvoice.php +++ b/htdocs/fourn/commande/orderstoinvoice.php @@ -7,6 +7,7 @@ * Copyright (C) 2012 David Rodriguez Martinez * Copyright (C) 2012 Juanjo Menent * Copyright (C) 2014 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 @@ -160,32 +161,14 @@ $object->date_echeance = $object->calculate_date_lim_reglement(); if ($_POST['origin'] && $_POST['originid']) { - $object->origin = $_POST['origin']; - $object->origin_id = $orders_id[$ii]; $object->linked_objects = $orders_id; $id = $object->create($user); if ($id > 0) { foreach ( $orders_id as $origin => $origin_id ) { - $origin_id = (! empty($origin_id) ? $origin_id : $object->origin_id); - $db->begin(); - $sql = "INSERT INTO " . MAIN_DB_PREFIX . "element_element ("; - $sql .= "fk_source"; - $sql .= ", sourcetype"; - $sql .= ", fk_target"; - $sql .= ", targettype"; - $sql .= ") VALUES ("; - $sql .= $origin_id; - $sql .= ", '" . $object->origin . "'"; - $sql .= ", " . $id; - $sql .= ", '" . $object->element . "'"; - $sql .= ")"; - - if ($db->query($sql)) { - $db->commit(); - } else { - $db->rollback(); - } + $origin_id = (! empty($origin_id) ? $origin_id : $orders_id[$ii]); + + $object->add_object_linked($_POST['origin'], $origin_id); } while ( $ii < $nn ) { @@ -577,7 +560,7 @@ print '
'; print ''; print ''; - print '
'; + print '
'; // print ''.$langs->trans("GoBack").''; print ''; print '
'; From b5ed65f838b7accd61731518dcb41c95fb7d241c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Sat, 18 Apr 2015 10:50:07 +0200 Subject: [PATCH 012/264] Fix: [ bug #2598 ] Untranslated "Supplier" tab name and some tax inputs in /fourn/card.php --- htdocs/fourn/card.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php index 5dfd3b62dc57d..db3dedc515ea0 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 @@ -33,11 +34,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; if (! empty($conf->adherent->enabled)) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; +$langs->load('companies'); $langs->load('suppliers'); $langs->load('products'); $langs->load('bills'); $langs->load('orders'); -$langs->load('companies'); $langs->load('commercial'); $action = GETPOST('action'); @@ -184,13 +185,13 @@ // Local Taxes if ($mysoc->useLocalTax(1)) { - print ''.$langs->trans("LocalTax1IsUsed").''; + print ''.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).''; print yn($object->localtax1_assuj); print ''; } if ($mysoc->useLocalTax(2)) { - print ''.$langs->trans("LocalTax2IsUsed").''; + print ''.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).''; print yn($object->localtax2_assuj); print ''; } From 2b8efc302a173e57138e5be6c9de2af57b9838c8 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Sat, 18 Apr 2015 11:24:55 +0200 Subject: [PATCH 013/264] Fix : shipment model selection --- htdocs/expedition/class/expedition.class.php | 2 -- htdocs/expedition/fiche.php | 9 +++++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index e5dbb540b85f2..fa25c48366d85 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -164,8 +164,6 @@ function create($user) $now=dol_now(); - if (empty($this->model_pdf)) $this->model_pdf=$conf->global->EXPEDITION_ADDON_PDF; - require_once DOL_DOCUMENT_ROOT .'/product/stock/class/mouvementstock.class.php'; $error = 0; diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php index 4743ad5f25ba4..6200f2c3c5f6a 100644 --- a/htdocs/expedition/fiche.php +++ b/htdocs/expedition/fiche.php @@ -113,6 +113,7 @@ $object->socid = $objectsrc->socid; $object->ref_customer = $objectsrc->ref_client; + $object->model_pdf = GETPOST('model'); $object->date_delivery = $date_delivery; // Date delivery planed $object->fk_delivery_address = $objectsrc->fk_delivery_address; $object->shipping_method_id = GETPOST('shipping_method_id','int'); @@ -662,6 +663,14 @@ print ''; print ''; print "\n"; + + // Document model + print "".$langs->trans("Model").""; + print ''; + include_once DOL_DOCUMENT_ROOT . '/core/modules/expedition/modules_expedition.php'; + $liste = ModelePdfExpedition::liste_modeles($db); + print $form->selectarray('model', $liste, $conf->global->EXPEDITION_ADDON_PDF); + print "\n"; // Other attributes $parameters=array('colspan' => ' colspan="3"'); From de494b2904bcfecdbaa10bc40c8e44df513c2411 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Sat, 18 Apr 2015 11:25:15 +0200 Subject: [PATCH 014/264] Fix Bug #2579: Bad display duration enter data on intervention --- htdocs/fichinter/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index ed4ceeb1cf133..f5fcd07670997 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -1550,7 +1550,7 @@ print ''; $selectmode='select'; if (! empty($conf->global->INTERVENTION_ADDLINE_FREEDUREATION)) $selectmode='text'; - $form->select_duration('duration', (!GETPOST('durationhour','int') && !GETPOST('durationmin','int'))?3600:(60*60*GETPOST('durationhour','int')+60*GETPOST('durationmin','int')), 0, $selectmode, 1); + $form->select_duration('duration', (!GETPOST('durationhour','int') && !GETPOST('durationmin','int'))?3600:(60*60*GETPOST('durationhour','int')+60*GETPOST('durationmin','int')), 0, $selectmode); print ''; print ''; From 8006edc27811f6d70ba210092e01a8f2ba183030 Mon Sep 17 00:00:00 2001 From: jean Date: Sat, 18 Apr 2015 16:39:53 +0200 Subject: [PATCH 015/264] correct issue 2589 getting user signature in script, when user is sended through a script parameter --- htdocs/comm/mailing/card.php | 2 +- scripts/emailings/mailing-send.php | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php index 32a0bb78dbc4b..f8aa86428af7f 100644 --- a/htdocs/comm/mailing/card.php +++ b/htdocs/comm/mailing/card.php @@ -778,7 +778,7 @@ if ($conf->file->mailing_limit_sendbyweb == 0) { $text.=$langs->trans("MailingNeedCommand"); - $text.='
'; + $text.='
'; $text.='

'; } $text.=$langs->trans('ConfirmSendingEmailing').'
'; diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php index 1de66b491edf5..f243d62922304 100755 --- a/scripts/emailings/mailing-send.php +++ b/scripts/emailings/mailing-send.php @@ -40,6 +40,8 @@ exit(-1); } $id=$argv[1]; +if (! isset($argv[2]) || !empty($argv[2])) $login = $argv[2]; +else $login = ''; require_once ($path."../../htdocs/master.inc.php"); require_once (DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"); @@ -58,7 +60,9 @@ @set_time_limit(0); print "***** ".$script_file." (".$version.") pid=".dol_getmypid()." *****\n"; - +$user = new User($db); +// for signature, we use user send as parameter +if (! empty($login)) $user->fetch('',$login); // We get list of emailing to process $sql = "SELECT m.rowid, m.titre, m.sujet, m.body,"; @@ -144,6 +148,8 @@ $other4=$other[3]; $other5=$other[4]; // Array of possible substitutions (See also fie mailing-send.php that should manage same substitutions) + $signature = (!empty($user->signature))?$user->signature:''; + $substitutionarray=array( '__ID__' => $obj->source_id, '__EMAIL__' => $obj->email, @@ -155,7 +161,7 @@ '__OTHER3__' => $other3, '__OTHER4__' => $other4, '__OTHER5__' => $other5, - '__SIGNATURE__' => '', // Signature is empty when ran from command line (user is a bot) + '__SIGNATURE__' => $signature, // Signature is empty when ran from command line or taken from user in parameter) '__CHECK_READ__' => '', '__UNSUBSCRIBE__' => ''.$langs->trans("MailUnsubcribe").'' ); From e0af2feced0795c627439a2a3e62d3d6885b1423 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Sat, 18 Apr 2015 18:06:02 +0200 Subject: [PATCH 016/264] Fix : on impayees remain to pay did not include deposits --- htdocs/compta/facture/impayees.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php index 467d2b0636a44..b0001e706a950 100644 --- a/htdocs/compta/facture/impayees.php +++ b/htdocs/compta/facture/impayees.php @@ -649,13 +649,12 @@ print ''.price($objp->total_ttc).''; print ''; $cn=$facturestatic->getSumCreditNotesUsed(); - if (! empty($objp->am)) print price($objp->am); - if (! empty($objp->am) && ! empty($cn)) print '+'; - if (! empty($cn)) print price($cn); + $dep=$facturestatic->getSumDepositsUsed(); + print price($objp->am + $cn + $dep); print ''; // Remain to receive - print ''.((! empty($objp->am) || ! empty($cn))?price($objp->total_ttc-$objp->am-$cn):' ').''; + print ''.price($objp->total_ttc-$objp->am-$cn-$dep).''; // Status of invoice print ''; @@ -685,7 +684,7 @@ $total_ht+=$objp->total_ht; $total_tva+=($objp->total_tva + $tx1 + $tx2 + $revenuestamp); $total_ttc+=$objp->total_ttc; - $total_paid+=$objp->am + $cn; + $total_paid+=$objp->am + $cn + $dep; $i++; } From 8b307aac56b3f19147c13b75b3e8f3b24356d209 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Sat, 18 Apr 2015 18:06:27 +0200 Subject: [PATCH 017/264] Fix : customer outstanding was not calculated properly --- htdocs/societe/class/societe.class.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 2cb3e634841fc..99d7641123928 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -3091,7 +3091,7 @@ function get_OutstandingBill() $alreadypayed=price2num($paiement + $creditnotes + $deposits,'MT'); $remaintopay=price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits,'MT'); */ - $sql = "SELECT sum(total) as amount FROM ".MAIN_DB_PREFIX."facture as f"; + $sql = "SELECT rowid, total_ttc FROM ".MAIN_DB_PREFIX."facture as f"; $sql .= " WHERE fk_soc = ". $this->id; $sql .= " AND paye = 0"; $sql .= " AND fk_statut <> 0"; // Not a draft @@ -3102,8 +3102,17 @@ function get_OutstandingBill() $resql=$this->db->query($sql); if ($resql) { - $obj=$this->db->fetch_object($resql); - return ($obj->amount); + $outstandingBill = 0; + $facturestatic=new Facture($this->db); + while($obj=$this->db->fetch_object($resql)) { + $facturestatic->id=$obj->rowid; + $paiement = $facturestatic->getSommePaiement(); + $creditnotes = $facturestatic->getSumCreditNotesUsed(); + $deposits = $facturestatic->getSumDepositsUsed(); + + $outstandingBill+= $obj->total_ttc - $paiement - $creditnotes - $deposits; + } + return $outstandingBill; } else return 0; From 51522decf34daf43afbf0a6b03added6cd9b6e7b Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Sat, 18 Apr 2015 18:33:46 +0200 Subject: [PATCH 018/264] Fix : price in editkeyval function was forcing a price rounding --- 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 ee28ec6a4950f..ad6db774d3f46 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -203,7 +203,7 @@ function editfieldval($text, $htmlname, $value, $object, $perm, $typeofdata='str else { if ($typeofdata == 'email') $ret.=dol_print_email($value,0,0,0,0,1); - elseif ($typeofdata == 'amount') $ret.=($value != '' ? price($value,'',$langs,0,0,-1,$conf->currency) : ''); + elseif ($typeofdata == 'amount') $ret.=($value != '' ? price($value,'',$langs,0,-1,-1,$conf->currency) : ''); elseif (preg_match('/^text/',$typeofdata) || preg_match('/^note/',$typeofdata)) $ret.=dol_htmlentitiesbr($value); elseif ($typeofdata == 'day' || $typeofdata == 'datepicker') $ret.=dol_print_date($value,'day'); elseif ($typeofdata == 'datehourpicker') $ret.=dol_print_date($value,'dayhour'); From 7b035d3b5fe7a3ed5af70e7be718a0e4fdfb80d7 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Sat, 18 Apr 2015 20:11:19 +0200 Subject: [PATCH 019/264] Fix : menu financial was not displayed when only supplier module is activated --- htdocs/core/menus/standard/eldy.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 273ea7f6336d2..92489cd9d61aa 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -134,8 +134,8 @@ 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)), + $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->fournisseur->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->fournisseur->facture->lire)), 'module'=>'comptabilite|accounting|facture|don|tax|salaries'); $showmode=dol_eldy_showmenu($type_user, $tmpentry, $listofmodulesforexternal); if ($showmode) From 5a66e1f98ad1776a2c32575410c67cafd0e48364 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Sun, 19 Apr 2015 00:26:05 +0200 Subject: [PATCH 020/264] Fix : include facture class for outstanding bill --- htdocs/societe/class/societe.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 99d7641123928..8e5622cde77f5 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -3103,6 +3103,7 @@ function get_OutstandingBill() if ($resql) { $outstandingBill = 0; + require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; $facturestatic=new Facture($this->db); while($obj=$this->db->fetch_object($resql)) { $facturestatic->id=$obj->rowid; From 54a68116e42667d4298c605d2d781bf0f964f4ed Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Sun, 19 Apr 2015 01:55:35 +0200 Subject: [PATCH 021/264] Fix : prevelement with SEPA --- htdocs/compta/prelevement/card.php | 2 +- .../class/bonprelevement.class.php | 56 +++++++++---------- 2 files changed, 27 insertions(+), 31 deletions(-) diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php index e2a5e846b0a17..d27769e28a233 100644 --- a/htdocs/compta/prelevement/card.php +++ b/htdocs/compta/prelevement/card.php @@ -190,7 +190,7 @@ print '
'; print $langs->trans("WithdrawalFile").''; - $relativepath = 'receipts/'.$bon->ref; + $relativepath = 'receipts/'.$bon->ref.'.xml'; print ''.$relativepath.''; print '
'; diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php index eb0344d7010f6..e82e196fe99dd 100644 --- a/htdocs/compta/prelevement/class/bonprelevement.class.php +++ b/htdocs/compta/prelevement/class/bonprelevement.class.php @@ -914,9 +914,9 @@ function Create($banque=0, $agence=0, $mode='real') dol_syslog("Erreur recherche reference"); } - $ref = "T".$ref.str_pad(dol_substr("00".intval($row[0])+1),2,"0",STR_PAD_LEFT); + $ref = "T".$ref.str_pad(dol_substr("00".intval($row[0])+1,0,2),2,"0",STR_PAD_LEFT); - $filebonprev = $ref; + $this->filename = $conf->prelevement->dir_output.'/receipts/'.$ref.'.xml'; // Create withdraw receipt in database $sql = "INSERT INTO ".MAIN_DB_PREFIX."prelevement_bons ("; @@ -932,14 +932,11 @@ function Create($banque=0, $agence=0, $mode='real') if ($resql) { - $prev_id = $this->db->last_insert_id(MAIN_DB_PREFIX."prelevement_bons"); + $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."prelevement_bons"); $dir=$conf->prelevement->dir_output.'/receipts'; $file=$filebonprev; if (! is_dir($dir)) dol_mkdir($dir); - - $bonprev = new BonPrelevement($this->db, $dir."/".$file); - $bonprev->id = $prev_id; } else { @@ -972,7 +969,7 @@ function Create($banque=0, $agence=0, $mode='real') * $fac[8] : client nom * $fac[2] : client id */ - $ri = $bonprev->AddFacture($fac[0], $fac[2], $fac[8], $fac[7], $fac[3], $fac[4], $fac[5], $fac[6]); + $ri = $this->AddFacture($fac[0], $fac[2], $fac[8], $fac[7], $fac[3], $fac[4], $fac[5], $fac[6]); if ($ri <> 0) { $error++; @@ -982,7 +979,7 @@ function Create($banque=0, $agence=0, $mode='real') $sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_facture_demande"; $sql.= " SET traite = 1"; $sql.= ", date_traite = '".$this->db->idate($now)."'"; - $sql.= ", fk_prelevement_bons = ".$prev_id; + $sql.= ", fk_prelevement_bons = ".$this->id; $sql.= " WHERE rowid = ".$fac[1]; dol_syslog(get_class($this)."::Create", LOG_DEBUG); @@ -1010,24 +1007,24 @@ function Create($banque=0, $agence=0, $mode='real') if (count($factures_prev) > 0) { - $bonprev->date_echeance = $datetimeprev; - $bonprev->reference_remise = $ref; + $this->date_echeance = $datetimeprev; + $this->reference_remise = $ref; - $bonprev->numero_national_emetteur = $conf->global->PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR; - $bonprev->raison_sociale = $conf->global->PRELEVEMENT_RAISON_SOCIALE; + $this->numero_national_emetteur = $conf->global->PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR; + $this->raison_sociale = $conf->global->PRELEVEMENT_RAISON_SOCIALE; - $bonprev->emetteur_code_banque = $conf->global->PRELEVEMENT_CODE_BANQUE; - $bonprev->emetteur_code_guichet = $conf->global->PRELEVEMENT_CODE_GUICHET; - $bonprev->emetteur_numero_compte = $conf->global->PRELEVEMENT_NUMERO_COMPTE; - $bonprev->emetteur_number_key = $conf->global->PRELEVEMENT_NUMBER_KEY; - $bonprev->emetteur_iban = $conf->global->PRELEVEMENT_IBAN; - $bonprev->emetteur_bic = $conf->global->PRELEVEMENT_BIC; - $bonprev->emetteur_ics = $conf->global->PRELEVEMENT_ICS; // TODO Add this into setup of admin/prelevement.php. Ex: PRELEVEMENT_ICS = "FR78ZZZ123456"; + $this->emetteur_code_banque = $conf->global->PRELEVEMENT_CODE_BANQUE; + $this->emetteur_code_guichet = $conf->global->PRELEVEMENT_CODE_GUICHET; + $this->emetteur_numero_compte = $conf->global->PRELEVEMENT_NUMERO_COMPTE; + $this->emetteur_number_key = $conf->global->PRELEVEMENT_NUMBER_KEY; + $this->emetteur_iban = $conf->global->PRELEVEMENT_IBAN; + $this->emetteur_bic = $conf->global->PRELEVEMENT_BIC; + $this->emetteur_ics = $conf->global->PRELEVEMENT_ICS; // TODO Add this into setup of admin/prelevement.php. Ex: PRELEVEMENT_ICS = "FR78ZZZ123456"; - $bonprev->factures = $factures_prev_id; + $this->factures = $factures_prev_id; // Generation of SEPA file - $bonprev->generate(); + $this->generate(); } dol_syslog($filebonprev); dol_syslog("Fin prelevement"); @@ -1037,8 +1034,8 @@ function Create($banque=0, $agence=0, $mode='real') * Update total */ $sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_bons"; - $sql.= " SET amount = ".price2num($bonprev->total); - $sql.= " WHERE rowid = ".$prev_id; + $sql.= " SET amount = ".price2num($this->total); + $sql.= " WHERE rowid = ".$this->id; $sql.= " AND entity = ".$conf->entity; dol_syslog(get_class($this)."::Create", LOG_DEBUG); @@ -1275,7 +1272,7 @@ function generate() } } - $sql = "SELECT soc.code_client as code, soc.address, soc.zip, soc.town, soc.datec, p.code as country_code,"; + $sql = "SELECT soc.code_client as code, soc.address, soc.zip, soc.town, rib.datec, c.code as country_code,"; $sql.= " pl.client_nom as nom, pl.code_banque as cb, pl.code_guichet as cg, pl.number as cc, pl.amount as somme,"; $sql.= " f.facnumber as fac, pf.fk_facture as idfac, rib.iban_prefix as iban, rib.bic as bic, rib.rowid as drum"; $sql.= " FROM"; @@ -1334,7 +1331,7 @@ function generate() fputs($this->file, ' '.$i.''.$CrLf); fputs($this->file, ' '.$this->total.''.$CrLf); fputs($this->file, ' '.$CrLf); - fputs($this->file, ' '.$this->raison_sociale.''.$CrLf); + fputs($this->file, ' '.strtoupper(dol_string_unaccent($this->raison_sociale)).''.$CrLf); fputs($this->file, ' '.$CrLf); fputs($this->file, ' '.$CrLf); fputs($this->file, ' '.$CrLf); @@ -1571,7 +1568,7 @@ function EnregDestinataireSEPA($row_code_client, $row_nom, $row_address, $row_zi $XML_DEBITOR .=' '.strtoupper(dol_string_unaccent($row_nom)).''.$CrLf; $XML_DEBITOR .=' '.$CrLf; $XML_DEBITOR .=' '.$row_country_code.''.$CrLf; - $XML_DEBITOR .=' '.strtr($row_address, array(CHR(13) => ", ", CHR(10) => "")).''.$CrLf; + $XML_DEBITOR .=' '.dol_string_unaccent(strtr($row_address, array(CHR(13) => ", ", CHR(10) => ""))).''.$CrLf; $XML_DEBITOR .=' '.dol_string_unaccent($row_zip.' '.$row_town).''.$CrLf; $XML_DEBITOR .=' '.$CrLf; $XML_DEBITOR .=' '.$CrLf; @@ -1698,7 +1695,6 @@ function EnregEmetteurSEPA($configuration, $ladate, $nombre, $total, $CrLf='\n') $XML_SEPA_INFO .= ' '.$nombre.''.$CrLf; $XML_SEPA_INFO .= ' '.$total.''.$CrLf; $XML_SEPA_INFO .= ' '.$CrLf; - $XML_SEPA_INFO .= ' NORM'.$CrLf; $XML_SEPA_INFO .= ' '.$CrLf; $XML_SEPA_INFO .= ' SEPA'.$CrLf; $XML_SEPA_INFO .= ' '.$CrLf; @@ -1709,11 +1705,11 @@ function EnregEmetteurSEPA($configuration, $ladate, $nombre, $total, $CrLf='\n') $XML_SEPA_INFO .= ' '.$CrLf; $XML_SEPA_INFO .= ' '.$dateTime_ETAD.''.$CrLf; $XML_SEPA_INFO .= ' '.$CrLf; - $XML_SEPA_INFO .= ' '.$configuration->global->PRELEVEMENT_RAISON_SOCIALE.''.$CrLf; + $XML_SEPA_INFO .= ' '.strtoupper(dol_string_unaccent($configuration->global->PRELEVEMENT_RAISON_SOCIALE)).''.$CrLf; $XML_SEPA_INFO .= ' '.$CrLf; $XML_SEPA_INFO .= ' '.$country[1].''.$CrLf; - $XML_SEPA_INFO .= ' '.$configuration->global->MAIN_INFO_SOCIETE_ADDRESS.''.$CrLf; - $XML_SEPA_INFO .= ' '.$configuration->global->MAIN_INFO_SOCIETE_ZIP.' '.$configuration->global->MAIN_INFO_SOCIETE_TOWN.''.$CrLf; + $XML_SEPA_INFO .= ' '.strtoupper(dol_string_unaccent($configuration->global->MAIN_INFO_SOCIETE_ADDRESS)).''.$CrLf; + $XML_SEPA_INFO .= ' '.strtoupper(dol_string_unaccent($configuration->global->MAIN_INFO_SOCIETE_ZIP.' '.$configuration->global->MAIN_INFO_SOCIETE_TOWN)).''.$CrLf; $XML_SEPA_INFO .= ' '.$CrLf; $XML_SEPA_INFO .= ' '.$CrLf; $XML_SEPA_INFO .= ' '.$CrLf; From 0c7ae0dd473fa69ec57eee2333f52d67c7a83d7a Mon Sep 17 00:00:00 2001 From: jfefe Date: Sun, 19 Apr 2015 02:38:54 +0200 Subject: [PATCH 022/264] Fix: missing getEntity function --- htdocs/accountancy/customer/card.php | 2 +- htdocs/accountancy/customer/index.php | 6 +++--- htdocs/accountancy/customer/lines.php | 2 +- htdocs/accountancy/customer/list.php | 2 +- htdocs/accountancy/journal/purchasesjournal.php | 2 +- htdocs/accountancy/journal/sellsjournal.php | 2 +- htdocs/accountancy/supplier/card.php | 2 +- htdocs/accountancy/supplier/index.php | 4 ++-- htdocs/accountancy/supplier/lines.php | 2 +- htdocs/accountancy/supplier/list.php | 2 +- htdocs/admin/tools/listevents.php | 2 +- htdocs/comm/card.php | 2 +- htdocs/core/lib/sendings.lib.php | 2 +- htdocs/expedition/class/expedition.class.php | 2 +- htdocs/expedition/index.php | 4 ++-- htdocs/expedition/list.php | 2 +- htdocs/product/class/html.formproduct.class.php | 2 +- htdocs/product/class/product.class.php | 2 +- htdocs/product/stock/replenish.php | 8 ++++---- 19 files changed, 26 insertions(+), 26 deletions(-) diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php index 71afe4ca218d5..487f4dc27190e 100644 --- a/htdocs/accountancy/customer/card.php +++ b/htdocs/accountancy/customer/card.php @@ -87,7 +87,7 @@ $sql .= " WHERE f.fk_statut > 0 AND l.rowid = " . $id; if (! empty($conf->multicompany->enabled)) { - $sql .= " AND f.entity = '" . $conf->entity . "'"; + $sql .= " AND f.entity IN (" . getEntity("facture", 1) . ")"; } dol_syslog("/accounting/customer/card.php sql=" . $sql, LOG_DEBUG); diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php index 39c9d05c83343..df6351554164c 100644 --- a/htdocs/accountancy/customer/index.php +++ b/htdocs/accountancy/customer/index.php @@ -159,7 +159,7 @@ $sql .= " AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'"; if (! empty($conf->multicompany->enabled)) { - $sql .= " AND f.entity = '" . $conf->entity . "'"; + $sql .= " AND f.entity IN (" . getEntity("facture", 1) . ")"; } $sql .= " GROUP BY fd.fk_code_ventilation"; @@ -234,7 +234,7 @@ $sql .= " AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'"; if (! empty($conf->multicompany->enabled)) { - $sql .= " AND f.entity = '" . $conf->entity . "'"; + $sql .= " AND f.entity IN (" . getEntity("facture", 1) . ")"; } dol_syslog('htdocs/accountancy/customer/index.php:: $sql=' . $sql); @@ -307,7 +307,7 @@ $sql .= " AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'"; if (! empty($conf->multicompany->enabled)) { - $sql .= " AND f.entity = '" . $conf->entity . "'"; + $sql .= " AND f.entity IN (" . getEntity("facture", 1) . ")"; } dol_syslog('htdocs/accountancy/customer/index.php:: $sql=' . $sql); diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php index 01806db83320e..2b523040e6f52 100644 --- a/htdocs/accountancy/customer/lines.php +++ b/htdocs/accountancy/customer/lines.php @@ -124,7 +124,7 @@ } if (! empty($conf->multicompany->enabled)) { - $sql .= " AND f.entity = '" . $conf->entity . "'"; + $sql .= " AND f.entity IN (" . getEntity("facture", 1) . ")"; } $sql .= " ORDER BY l.rowid"; diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php index 3d4987bd94add..ac1c342965832 100644 --- a/htdocs/accountancy/customer/list.php +++ b/htdocs/accountancy/customer/list.php @@ -132,7 +132,7 @@ $sql .= " WHERE f.fk_statut > 0 AND fk_code_ventilation <= 0"; $sql .= " AND (accsys.rowid='" . $conf->global->CHARTOFACCOUNTS . "' OR p.accountancy_code_sell IS NULL OR p.accountancy_code_sell ='')"; if (! empty($conf->multicompany->enabled)) { - $sql .= " AND f.entity = '" . $conf->entity . "'"; + $sql .= " AND f.entity IN (" . getEntity("facture", 1) . ")"; } $sql .= " ORDER BY l.rowid"; diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php index 6d89e8f17a2cf..6d0e7a6541e4f 100644 --- a/htdocs/accountancy/journal/purchasesjournal.php +++ b/htdocs/accountancy/journal/purchasesjournal.php @@ -96,7 +96,7 @@ $sql .= " JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc"; $sql .= " WHERE f.fk_statut > 0 "; if (! empty($conf->multicompany->enabled)) { - $sql .= " AND f.entity = " . $conf->entity; + $sql .= " AND f.entity IN (" . getEntity("facture", 1) . ")"; } if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2)"; diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php index c2c51bacd4225..24ed25f56ed24 100644 --- a/htdocs/accountancy/journal/sellsjournal.php +++ b/htdocs/accountancy/journal/sellsjournal.php @@ -99,7 +99,7 @@ $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_tva as ct ON fd.tva_tx = ct.taux AND ct.fk_pays = '" . $idpays . "'"; $sql .= " WHERE fd.fk_code_ventilation > 0 "; if (! empty($conf->multicompany->enabled)) { - $sql .= " AND f.entity = " . $conf->entity; + $sql .= " AND f.entity IN (" . getEntity("facture", 1) . ")"; } $sql .= " AND f.fk_statut > 0"; if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) diff --git a/htdocs/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php index 70d97b376c542..51d09428c25a5 100644 --- a/htdocs/accountancy/supplier/card.php +++ b/htdocs/accountancy/supplier/card.php @@ -88,7 +88,7 @@ $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facture_fourn as f ON f.rowid = l.fk_facture_fourn "; $sql .= " WHERE f.fk_statut > 0 AND l.rowid = " . $id; if (! empty($conf->multicompany->enabled)) { - $sql .= " AND f.entity = '" . $conf->entity . "'"; + $sql .= " AND f.entity IN (" . getEntity("facture_fourn", 1) . ")"; } $result = $db->query($sql); diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php index 85d1c04cf53fa..3bdf2f45a7c11 100644 --- a/htdocs/accountancy/supplier/index.php +++ b/htdocs/accountancy/supplier/index.php @@ -144,7 +144,7 @@ $sql .= " AND ff.fk_statut > 0 "; if (! empty($conf->multicompany->enabled)) { - $sql .= " AND ff.entity = '" . $conf->entity . "'"; + $sql .= " AND ff.entity IN (" . getEntity("facture_fourn", 1) . ")"; } $sql .= " GROUP BY ffd.fk_code_ventilation"; @@ -221,7 +221,7 @@ $sql .= " AND ff.fk_statut > 0 "; if (! empty($conf->multicompany->enabled)) { - $sql .= " AND ff.entity = '" . $conf->entity . "'"; + $sql .= " AND ff.entity IN (" . getEntity("facture_fourn", 1) . ")"; } dol_syslog('/accountancy/supplier/index.php:: sql=' . $sql); diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php index 5df5ee0c06f52..df3816c4d4c6c 100644 --- a/htdocs/accountancy/supplier/lines.php +++ b/htdocs/accountancy/supplier/lines.php @@ -121,7 +121,7 @@ $sql .= " AND aa.account_number like '%" . $_GET["search_account"] . "%'"; } if (! empty($conf->multicompany->enabled)) { - $sql .= " AND f.entity = '" . $conf->entity . "'"; + $sql .= " AND f.entity IN (" . getEntity("facture_fourn", 1) . ")"; } $sql .= " ORDER BY l.rowid"; diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php index 656afbd32cc6a..bf14ebc185e6a 100644 --- a/htdocs/accountancy/supplier/list.php +++ b/htdocs/accountancy/supplier/list.php @@ -135,7 +135,7 @@ $sql .= " AND (accsys.rowid='".$conf->global->CHARTOFACCOUNTS."' OR p.accountancy_code_sell IS NULL OR p.accountancy_code_buy ='')"; if (! empty($conf->multicompany->enabled)) { - $sql .= " AND f.entity = '" . $conf->entity . "'"; + $sql .= " AND f.entity IN (" . getEntity("facture_fourn", 1) . ")"; } $sql .= " ORDER BY l.rowid"; diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php index 309bf1d935ee5..373b46c606247 100644 --- a/htdocs/admin/tools/listevents.php +++ b/htdocs/admin/tools/listevents.php @@ -123,7 +123,7 @@ $sql.= " u.login"; $sql.= " FROM ".MAIN_DB_PREFIX."events as e"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = e.fk_user"; -$sql.= " WHERE e.entity = ".$conf->entity; +$sql.= " WHERE e.entity IN (".getEntity('actioncomm', 1).")"; if ($search_code) { $usefilter++; $sql.=" AND e.type LIKE '%".$db->escape($search_code)."%'"; } if ($search_ip) { $usefilter++; $sql.=" AND e.ip LIKE '%".$db->escape($search_ip)."%'"; } if ($search_user) { $usefilter++; $sql.=" AND u.login LIKE '%".$db->escape($search_user)."%'"; } diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index 81e8b39696373..200c731d48a3a 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -684,7 +684,7 @@ $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.= " AND e.entity IN (".getEntity('expedition', 1).")"; $sql.= ' GROUP BY e.rowid'; $sql.= ', e.ref'; $sql.= ', e.date_creation'; diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php index 5ce30be59a082..1c0c589870e1c 100644 --- a/htdocs/core/lib/sendings.lib.php +++ b/htdocs/core/lib/sendings.lib.php @@ -167,7 +167,7 @@ function show_list_sending_receive($origin,$origin_id,$filter='') $sql.= ", ".MAIN_DB_PREFIX.$origin."det as obj"; //if ($conf->livraison_bon->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.fk_expedition = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."livraisondet as ld ON ld.fk_livraison = l.rowid AND obj.rowid = ld.fk_origin_line"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid"; - $sql.= " WHERE e.entity = ".$conf->entity; + $sql.= " WHERE e.entity IN (".getEntity('expedition', 1).")"; $sql.= " AND obj.fk_".$origin." = ".$origin_id; $sql.= " AND obj.rowid = ed.fk_origin_line"; $sql.= " AND ed.fk_expedition = e.rowid"; diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index 24ce24bae477e..58b6b5c65c248 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -438,7 +438,7 @@ function fetch($id, $ref='', $ref_ext='', $ref_int='') $sql.= " FROM ".MAIN_DB_PREFIX."expedition as e"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = e.rowid AND el.targettype = '".$this->element."'"; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON e.fk_incoterms = i.rowid'; - $sql.= " WHERE e.entity = ".$conf->entity; + $sql.= " WHERE e.entity IN (".getEntity('expedition', 1).")"; if ($id) $sql.= " AND e.rowid=".$id; if ($ref) $sql.= " AND e.ref='".$this->db->escape($ref)."'"; if ($ref_ext) $sql.= " AND e.ref_ext='".$this->db->escape($ref_ext)."'"; diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php index 2b41a939c7bf6..5ecd563a6136b 100644 --- a/htdocs/expedition/index.php +++ b/htdocs/expedition/index.php @@ -75,7 +75,7 @@ $clause = " AND "; } $sql.= $clause." e.fk_statut = 0"; -$sql.= " AND e.entity = ".$conf->entity; +$sql.= " AND e.entity IN (".getEntity('expedition', 1).")"; if ($socid) $sql.= " AND c.fk_soc = ".$socid; $resql=$db->query($sql); @@ -235,7 +235,7 @@ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON el.fk_source = c.rowid AND el.sourcetype IN ('commande') AND el.targettype = 'shipping'"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc"; if (! $user->rights->societe->client->voir && ! $socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc"; -$sql.= " WHERE e.entity = ".$conf->entity; +$sql.= " WHERE e.entity IN (".getEntity('expedition', 1).")"; if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND sc.fk_user = " .$user->id; $sql.= " AND e.fk_statut = 1"; if ($socid) $sql.= " AND c.fk_soc = ".$socid; diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php index 195687a4ab72f..94eac327fcdec 100644 --- a/htdocs/expedition/list.php +++ b/htdocs/expedition/list.php @@ -82,7 +82,7 @@ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as ee ON e.rowid = ee.fk_source AND ee.sourcetype = 'shipping' AND ee.targettype = 'delivery'"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.rowid = ee.fk_target"; -$sql.= " WHERE e.entity = ".$conf->entity; +$sql.= " WHERE e.entity IN (".getEntity('expedition', 1).")"; if (!$user->rights->societe->client->voir && !$socid) // Internal user with no permission to see all { $sql.= " AND e.fk_soc = sc.fk_soc"; diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php index d67b575023bf3..4e2da460a74c8 100644 --- a/htdocs/product/class/html.formproduct.class.php +++ b/htdocs/product/class/html.formproduct.class.php @@ -72,7 +72,7 @@ function loadWarehouses($fk_product=0) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps on ps.fk_entrepot = e.rowid"; $sql.= " AND ps.fk_product = '".$fk_product."'"; } - $sql.= " WHERE e.entity = ".$conf->entity; + $sql.= " WHERE e.entity IN (".getEntity('stock', 1).")"; $sql.= " AND e.statut = 1"; $sql.= " ORDER BY e.label"; diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 184560b7aad0c..837dadc5e4153 100755 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -1900,7 +1900,7 @@ function load_stats_sending($socid=0,$filtrestatut='') $sql.= " WHERE e.rowid = ed.fk_expedition"; $sql.= " AND c.rowid = cd.fk_commande"; $sql.= " AND e.fk_soc = s.rowid"; - $sql.= " AND e.entity = ".$conf->entity; + $sql.= " AND e.entity IN (".getEntity('expedition', 1).")"; $sql.= " AND ed.fk_origin_line = cd.rowid"; $sql.= " AND cd.fk_product = ".$this->id; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND e.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id; diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php index 0f935c0154c85..dc12f7d9042ee 100644 --- a/htdocs/product/stock/replenish.php +++ b/htdocs/product/stock/replenish.php @@ -295,7 +295,7 @@ $sqlCommandesCli = "(SELECT ".$db->ifsql("SUM(cd.qty) IS NULL", "0", "SUM(cd.qty)")." as qty"; $sqlCommandesCli.= " FROM ".MAIN_DB_PREFIX."commandedet as cd"; $sqlCommandesCli.= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON (c.rowid = cd.fk_commande)"; - $sqlCommandesCli.= " WHERE c.entity = ".$conf->entity; + $sqlCommandesCli.= " WHERE c.entity IN (".getEntity('order', 1).")"; $sqlCommandesCli.= " AND cd.fk_product = p.rowid"; $sqlCommandesCli.= " AND c.fk_statut IN (1,2))"; @@ -304,7 +304,7 @@ $sqlExpeditionsCli.= " LEFT JOIN ".MAIN_DB_PREFIX."expeditiondet as ed ON (ed.fk_expedition = e.rowid)"; $sqlExpeditionsCli.= " LEFT JOIN ".MAIN_DB_PREFIX."commandedet as cd ON (cd.rowid = ed.fk_origin_line)"; $sqlExpeditionsCli.= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON (c.rowid = cd.fk_commande)"; - $sqlExpeditionsCli.= " WHERE e.entity = ".$conf->entity; + $sqlExpeditionsCli.= " WHERE e.entity IN (".getEntity('expedition', 1).")"; $sqlExpeditionsCli.= " AND cd.fk_product = p.rowid"; $sqlExpeditionsCli.= " AND c.fk_statut IN (1,2))"; @@ -312,14 +312,14 @@ $sqlCommandesFourn.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd"; $sqlCommandesFourn.= ", ".MAIN_DB_PREFIX."commande_fournisseur as c"; $sqlCommandesFourn.= " WHERE c.rowid = cd.fk_commande"; - $sqlCommandesFourn.= " AND c.entity = ".$conf->entity; + $sqlCommandesFourn.= " AND c.entity IN (".getEntity('commande_fournisseur', 1).")"; $sqlCommandesFourn.= " AND cd.fk_product = p.rowid"; $sqlCommandesFourn.= " AND c.fk_statut IN (3,4))"; $sqlReceptionFourn = "(SELECT ".$db->ifsql("SUM(fd.qty) IS NULL", "0", "SUM(fd.qty)")." as qty"; $sqlReceptionFourn.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as cf"; $sqlReceptionFourn.= " LEFT JOIN ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as fd ON (fd.fk_commande = cf.rowid)"; - $sqlReceptionFourn.= " WHERE cf.entity = ".$conf->entity; + $sqlReceptionFourn.= " WHERE cf.entity IN (".getEntity('commande_fournisseur', 1).")"; $sqlReceptionFourn.= " AND fd.fk_product = p.rowid"; $sqlReceptionFourn.= " AND cf.fk_statut IN (3,4))"; From f5db4d5bb7a621924cb2a2e89459ce204313e906 Mon Sep 17 00:00:00 2001 From: jfefe Date: Sun, 19 Apr 2015 03:05:37 +0200 Subject: [PATCH 023/264] Fix: missing getEntity function --- htdocs/accountancy/customer/card.php | 2 +- htdocs/accountancy/customer/index.php | 6 ++--- htdocs/accountancy/customer/lines.php | 2 +- htdocs/accountancy/customer/list.php | 2 +- .../accountancy/journal/purchasesjournal.php | 2 +- htdocs/accountancy/journal/sellsjournal.php | 2 +- htdocs/accountancy/supplier/card.php | 2 +- htdocs/accountancy/supplier/index.php | 4 +-- htdocs/accountancy/supplier/lines.php | 2 +- htdocs/accountancy/supplier/list.php | 2 +- htdocs/adherents/class/adherent.class.php | 4 +-- .../adherents/class/adherentstats.class.php | 2 +- htdocs/adherents/list.php | 2 +- htdocs/admin/tools/listevents.php | 2 +- htdocs/comm/action/class/actioncomm.class.php | 6 ++--- htdocs/comm/card.php | 2 +- htdocs/comm/index.php | 10 +++---- htdocs/comm/propal.php | 2 +- htdocs/comm/propal/class/propal.class.php | 8 +++--- .../comm/propal/class/propalestats.class.php | 2 +- htdocs/comm/propal/index.php | 8 +++--- htdocs/comm/propal/list.php | 2 +- htdocs/comm/prospect/index.php | 4 +-- htdocs/commande/class/commande.class.php | 8 +++--- htdocs/commande/customer.php | 2 +- htdocs/commande/index.php | 10 +++---- htdocs/commande/list.php | 2 +- htdocs/commande/orderstoinvoice.php | 2 +- htdocs/compta/bank/account.php | 4 +-- htdocs/compta/bank/annuel.php | 12 ++++----- htdocs/compta/bank/class/account.class.php | 4 +-- htdocs/compta/bank/graph.php | 20 +++++++------- htdocs/compta/bank/search.php | 2 +- htdocs/compta/paiement/cheque/card.php | 4 +-- .../cheque/class/remisecheque.class.php | 2 +- htdocs/compta/resultat/clientfourn.php | 2 +- htdocs/compta/resultat/index.php | 2 +- htdocs/compta/stats/cabyuser.php | 2 +- htdocs/compta/stats/casoc.php | 2 +- htdocs/compta/stats/index.php | 2 +- htdocs/core/lib/sendings.lib.php | 2 +- htdocs/expedition/class/expedition.class.php | 2 +- htdocs/expedition/index.php | 4 +-- htdocs/expedition/list.php | 2 +- .../product/class/html.formproduct.class.php | 2 +- htdocs/product/class/product.class.php | 26 +++++++++---------- htdocs/product/index.php | 2 +- htdocs/product/stats/commande.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 +- htdocs/product/stock/replenish.php | 8 +++--- 53 files changed, 110 insertions(+), 110 deletions(-) diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php index 71afe4ca218d5..487f4dc27190e 100644 --- a/htdocs/accountancy/customer/card.php +++ b/htdocs/accountancy/customer/card.php @@ -87,7 +87,7 @@ $sql .= " WHERE f.fk_statut > 0 AND l.rowid = " . $id; if (! empty($conf->multicompany->enabled)) { - $sql .= " AND f.entity = '" . $conf->entity . "'"; + $sql .= " AND f.entity IN (" . getEntity("facture", 1) . ")"; } dol_syslog("/accounting/customer/card.php sql=" . $sql, LOG_DEBUG); diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php index 39c9d05c83343..df6351554164c 100644 --- a/htdocs/accountancy/customer/index.php +++ b/htdocs/accountancy/customer/index.php @@ -159,7 +159,7 @@ $sql .= " AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'"; if (! empty($conf->multicompany->enabled)) { - $sql .= " AND f.entity = '" . $conf->entity . "'"; + $sql .= " AND f.entity IN (" . getEntity("facture", 1) . ")"; } $sql .= " GROUP BY fd.fk_code_ventilation"; @@ -234,7 +234,7 @@ $sql .= " AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'"; if (! empty($conf->multicompany->enabled)) { - $sql .= " AND f.entity = '" . $conf->entity . "'"; + $sql .= " AND f.entity IN (" . getEntity("facture", 1) . ")"; } dol_syslog('htdocs/accountancy/customer/index.php:: $sql=' . $sql); @@ -307,7 +307,7 @@ $sql .= " AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'"; if (! empty($conf->multicompany->enabled)) { - $sql .= " AND f.entity = '" . $conf->entity . "'"; + $sql .= " AND f.entity IN (" . getEntity("facture", 1) . ")"; } dol_syslog('htdocs/accountancy/customer/index.php:: $sql=' . $sql); diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php index 01806db83320e..2b523040e6f52 100644 --- a/htdocs/accountancy/customer/lines.php +++ b/htdocs/accountancy/customer/lines.php @@ -124,7 +124,7 @@ } if (! empty($conf->multicompany->enabled)) { - $sql .= " AND f.entity = '" . $conf->entity . "'"; + $sql .= " AND f.entity IN (" . getEntity("facture", 1) . ")"; } $sql .= " ORDER BY l.rowid"; diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php index 3d4987bd94add..ac1c342965832 100644 --- a/htdocs/accountancy/customer/list.php +++ b/htdocs/accountancy/customer/list.php @@ -132,7 +132,7 @@ $sql .= " WHERE f.fk_statut > 0 AND fk_code_ventilation <= 0"; $sql .= " AND (accsys.rowid='" . $conf->global->CHARTOFACCOUNTS . "' OR p.accountancy_code_sell IS NULL OR p.accountancy_code_sell ='')"; if (! empty($conf->multicompany->enabled)) { - $sql .= " AND f.entity = '" . $conf->entity . "'"; + $sql .= " AND f.entity IN (" . getEntity("facture", 1) . ")"; } $sql .= " ORDER BY l.rowid"; diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php index 6d89e8f17a2cf..0a000e0183342 100644 --- a/htdocs/accountancy/journal/purchasesjournal.php +++ b/htdocs/accountancy/journal/purchasesjournal.php @@ -96,7 +96,7 @@ $sql .= " JOIN " . MAIN_DB_PREFIX . "societe as s ON s.rowid = f.fk_soc"; $sql .= " WHERE f.fk_statut > 0 "; if (! empty($conf->multicompany->enabled)) { - $sql .= " AND f.entity = " . $conf->entity; + $sql .= " AND f.entity IN (" . getEntity("facture_fourn", 1) . ")"; } if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2)"; diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php index c2c51bacd4225..24ed25f56ed24 100644 --- a/htdocs/accountancy/journal/sellsjournal.php +++ b/htdocs/accountancy/journal/sellsjournal.php @@ -99,7 +99,7 @@ $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_tva as ct ON fd.tva_tx = ct.taux AND ct.fk_pays = '" . $idpays . "'"; $sql .= " WHERE fd.fk_code_ventilation > 0 "; if (! empty($conf->multicompany->enabled)) { - $sql .= " AND f.entity = " . $conf->entity; + $sql .= " AND f.entity IN (" . getEntity("facture", 1) . ")"; } $sql .= " AND f.fk_statut > 0"; if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) diff --git a/htdocs/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php index 70d97b376c542..51d09428c25a5 100644 --- a/htdocs/accountancy/supplier/card.php +++ b/htdocs/accountancy/supplier/card.php @@ -88,7 +88,7 @@ $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "facture_fourn as f ON f.rowid = l.fk_facture_fourn "; $sql .= " WHERE f.fk_statut > 0 AND l.rowid = " . $id; if (! empty($conf->multicompany->enabled)) { - $sql .= " AND f.entity = '" . $conf->entity . "'"; + $sql .= " AND f.entity IN (" . getEntity("facture_fourn", 1) . ")"; } $result = $db->query($sql); diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php index 85d1c04cf53fa..3bdf2f45a7c11 100644 --- a/htdocs/accountancy/supplier/index.php +++ b/htdocs/accountancy/supplier/index.php @@ -144,7 +144,7 @@ $sql .= " AND ff.fk_statut > 0 "; if (! empty($conf->multicompany->enabled)) { - $sql .= " AND ff.entity = '" . $conf->entity . "'"; + $sql .= " AND ff.entity IN (" . getEntity("facture_fourn", 1) . ")"; } $sql .= " GROUP BY ffd.fk_code_ventilation"; @@ -221,7 +221,7 @@ $sql .= " AND ff.fk_statut > 0 "; if (! empty($conf->multicompany->enabled)) { - $sql .= " AND ff.entity = '" . $conf->entity . "'"; + $sql .= " AND ff.entity IN (" . getEntity("facture_fourn", 1) . ")"; } dol_syslog('/accountancy/supplier/index.php:: sql=' . $sql); diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php index 5df5ee0c06f52..df3816c4d4c6c 100644 --- a/htdocs/accountancy/supplier/lines.php +++ b/htdocs/accountancy/supplier/lines.php @@ -121,7 +121,7 @@ $sql .= " AND aa.account_number like '%" . $_GET["search_account"] . "%'"; } if (! empty($conf->multicompany->enabled)) { - $sql .= " AND f.entity = '" . $conf->entity . "'"; + $sql .= " AND f.entity IN (" . getEntity("facture_fourn", 1) . ")"; } $sql .= " ORDER BY l.rowid"; diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php index 656afbd32cc6a..bf14ebc185e6a 100644 --- a/htdocs/accountancy/supplier/list.php +++ b/htdocs/accountancy/supplier/list.php @@ -135,7 +135,7 @@ $sql .= " AND (accsys.rowid='".$conf->global->CHARTOFACCOUNTS."' OR p.accountancy_code_sell IS NULL OR p.accountancy_code_buy ='')"; if (! empty($conf->multicompany->enabled)) { - $sql .= " AND f.entity = '" . $conf->entity . "'"; + $sql .= " AND f.entity IN (" . getEntity("facture_fourn", 1) . ")"; } $sql .= " ORDER BY l.rowid"; diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 941f7b300fd73..f3c391b5ecde1 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -1703,7 +1703,7 @@ function load_state_board() $sql = "SELECT count(a.rowid) as nb"; $sql.= " FROM ".MAIN_DB_PREFIX."adherent as a"; $sql.= " WHERE a.statut > 0"; - $sql.= " AND a.entity = ".$conf->entity; + $sql.= " AND a.entity IN (".getEntity('adherent', 1).")"; $resql=$this->db->query($sql); if ($resql) @@ -1741,7 +1741,7 @@ function load_board($user) $sql = "SELECT a.rowid, a.datefin"; $sql.= " FROM ".MAIN_DB_PREFIX."adherent as a"; $sql.= " WHERE a.statut = 1"; - $sql.= " AND a.entity = ".$conf->entity; + $sql.= " AND a.entity IN (".getEntity('adherent', 1).")"; $sql.= " AND (a.datefin IS NULL or a.datefin < '".$this->db->idate($now)."')"; $resql=$this->db->query($sql); diff --git a/htdocs/adherents/class/adherentstats.class.php b/htdocs/adherents/class/adherentstats.class.php index e64a67d445d47..d3f72d2ea5dc7 100644 --- a/htdocs/adherents/class/adherentstats.class.php +++ b/htdocs/adherents/class/adherentstats.class.php @@ -65,7 +65,7 @@ function __construct($db, $socid=0, $userid=0) $this->field='cotisation'; $this->where.= " m.statut != 0"; - $this->where.= " AND p.fk_adherent = m.rowid AND m.entity = ".$conf->entity; + $this->where.= " AND p.fk_adherent = m.rowid AND m.entity IN (".getEntity('adherent', 1).")"; //if (!$user->rights->societe->client->voir && !$user->societe_id) $this->where .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id; if($this->memberid) { diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php index a94f6750f5549..38ffeae299322 100644 --- a/htdocs/adherents/list.php +++ b/htdocs/adherents/list.php @@ -99,7 +99,7 @@ if ($catid == -2) $sql.= " AND cm.fk_categorie IS NULL"; if ($search_categ > 0) $sql.= " AND cm.fk_categorie = ".$db->escape($search_categ); if ($search_categ == -2) $sql.= " AND cm.fk_categorie IS NULL"; -$sql.= " AND d.entity = ".$conf->entity; +$sql.= " AND d.entity IN (".getEntity('adherent', 1).")"; if ($sall) { // For natural search diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php index 309bf1d935ee5..373b46c606247 100644 --- a/htdocs/admin/tools/listevents.php +++ b/htdocs/admin/tools/listevents.php @@ -123,7 +123,7 @@ $sql.= " u.login"; $sql.= " FROM ".MAIN_DB_PREFIX."events as e"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = e.fk_user"; -$sql.= " WHERE e.entity = ".$conf->entity; +$sql.= " WHERE e.entity IN (".getEntity('actioncomm', 1).")"; if ($search_code) { $usefilter++; $sql.=" AND e.type LIKE '%".$db->escape($search_code)."%'"; } if ($search_ip) { $usefilter++; $sql.=" AND e.ip LIKE '%".$db->escape($search_ip)."%'"; } if ($search_user) { $usefilter++; $sql.=" AND u.login LIKE '%".$db->escape($search_user)."%'"; } diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 543cf862d8fbf..3577edeb27de5 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -743,7 +743,7 @@ static function getActions($db, $socid=0, $fk_element=0, $elementtype='', $filte $sql = "SELECT a.id"; $sql.= " FROM ".MAIN_DB_PREFIX."actioncomm as a"; - $sql.= " WHERE a.entity = ".$conf->entity; + $sql.= " WHERE a.entity IN (".getEntity('actioncomm', 1).")"; if (! empty($socid)) $sql.= " AND a.fk_soc = ".$socid; if (! empty($elementtype)) { @@ -794,7 +794,7 @@ function load_board($user) if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid"; $sql.= " WHERE a.percent >= 0 AND a.percent < 100"; - $sql.= " AND a.entity = ".$conf->entity; + $sql.= " AND a.entity IN (".getEntity('actioncomm', 1).")"; if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " AND (a.fk_soc IS NULL OR sc.fk_user = " .$user->id . ")"; if ($user->societe_id) $sql.=" AND a.fk_soc = ".$user->societe_id; if (! $user->rights->agenda->allactions->read) $sql.= " AND (a.fk_user_author = ".$user->id . " OR a.fk_user_action = ".$user->id . " OR a.fk_user_done = ".$user->id . ")"; @@ -1091,7 +1091,7 @@ function build_exportfile($format,$type,$cachedelay,$filename,$filters) // We must filter on assignement table if ($filters['logint'] || $filters['login']) $sql.=", ".MAIN_DB_PREFIX."actioncomm_resources as ar"; $sql.= " WHERE a.fk_action=c.id"; - $sql.= " AND a.entity = ".$conf->entity; + $sql.= " AND a.entity IN (".getEntity('actioncomm', 1).")"; foreach ($filters as $key => $value) { if ($key == 'notolderthan' && $value != '') $sql.=" AND a.datep >= '".$this->db->idate($now-($value*24*60*60))."'"; diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index 81e8b39696373..200c731d48a3a 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -684,7 +684,7 @@ $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.= " AND e.entity IN (".getEntity('expedition', 1).")"; $sql.= ' GROUP BY e.rowid'; $sql.= ', e.ref'; $sql.= ', e.date_creation'; diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 3924774f7fc0f..acf6ee95f8a7f 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -164,7 +164,7 @@ if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE p.fk_statut = 0"; $sql.= " AND p.fk_soc = s.rowid"; - $sql.= " AND p.entity = ".$conf->entity; + $sql.= " AND p.entity IN (".getEntity('propal', 1).")"; if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if ($socid) $sql.= " AND s.rowid = ".$socid; @@ -235,7 +235,7 @@ if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE c.fk_soc = s.rowid"; $sql.= " AND c.fk_statut = 0"; - $sql.= " AND c.entity = ".$conf->entity; + $sql.= " AND c.entity IN (".getEntity('commande', 1).")"; 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; @@ -440,7 +440,7 @@ $sql.= ", ".MAIN_DB_PREFIX."product as p"; if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE c.fk_soc = s.rowid"; - $sql.= " AND c.entity = ".$conf->entity; + $sql.= " AND c.entity IN (".getEntity('contrat', 1).")"; $sql.= " AND c.fk_product = p.rowid"; if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if ($socid) $sql.= " AND s.rowid = ".$socid; @@ -496,7 +496,7 @@ $sql.= ", ".MAIN_DB_PREFIX."propal as p"; if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE p.fk_soc = s.rowid"; - $sql.= " AND p.entity = ".$conf->entity; + $sql.= " AND p.entity IN (".getEntity('propal', 1).")"; $sql.= " AND p.fk_statut = 1"; if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if ($socid) $sql.= " AND s.rowid = ".$socid; @@ -592,7 +592,7 @@ $sql.= ", ".MAIN_DB_PREFIX."commande as c"; if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE c.fk_soc = s.rowid"; - $sql.= " AND c.entity = ".$conf->entity; + $sql.= " AND c.entity IN (".getEntity('commande', 1).")"; $sql.= " AND c.fk_statut = 1"; if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if ($socid) $sql.= " AND s.rowid = ".$socid; diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index c5cd570c24174..915c4766b98ad 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -1554,7 +1554,7 @@ $sql .= " FROM " . MAIN_DB_PREFIX . "propal p"; $sql .= ", " . MAIN_DB_PREFIX . "societe s"; $sql .= " WHERE s.rowid = p.fk_soc"; - $sql .= " AND p.entity = " . $conf->entity; + $sql .= " AND p.entity IN (".getEntity('propal', 1).")"; $sql .= " AND p.fk_statut <> 0"; $sql .= " ORDER BY Id"; diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index e7a7421e6eaee..2a02e54298af7 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -1194,7 +1194,7 @@ function fetch($rowid,$ref='') $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_input_reason as dr ON p.fk_input_reason = dr.rowid'; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON p.fk_incoterms = i.rowid'; $sql.= " WHERE p.fk_statut = c.id"; - $sql.= " AND p.entity = ".$conf->entity; + $sql.= " AND p.entity IN (".getEntity('propal', 1).")"; if ($ref) $sql.= " AND p.ref='".$ref."'"; else $sql.= " AND p.rowid=".$rowid; @@ -2011,7 +2011,7 @@ function liste_array($shortlist=0, $draft=0, $notcurrentuser=0, $socid=0, $limit if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."c_propalst as c"; if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; - $sql.= " WHERE p.entity = ".$conf->entity; + $sql.= " WHERE p.entity IN (".getEntity('propal', 1).")"; $sql.= " AND p.fk_soc = s.rowid"; $sql.= " AND p.fk_statut = c.id"; if (! $user->rights->societe->client->voir && ! $socid) //restriction @@ -2466,7 +2466,7 @@ function load_board($user,$mode) $sql.= " WHERE sc.fk_user = " .$user->id; $clause = " AND"; } - $sql.= $clause." p.entity = ".$conf->entity; + $sql.= $clause." p.entity IN (".getEntity('propal', 1).")"; 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; @@ -2629,7 +2629,7 @@ function load_state_board() $sql.= " WHERE sc.fk_user = " .$user->id; $clause = "AND"; } - $sql.= " ".$clause." p.entity = ".$conf->entity; + $sql.= " ".$clause." p.entity IN (".getEntity('propal', 1).")"; $resql=$this->db->query($sql); if ($resql) diff --git a/htdocs/comm/propal/class/propalestats.class.php b/htdocs/comm/propal/class/propalestats.class.php index 97256c840b147..05ec9c19629a7 100644 --- a/htdocs/comm/propal/class/propalestats.class.php +++ b/htdocs/comm/propal/class/propalestats.class.php @@ -69,7 +69,7 @@ function __construct($db, $socid=0, $userid=0) $this->where.= " p.fk_statut > 0"; //$this->where.= " AND p.fk_soc = s.rowid AND p.entity = ".$conf->entity; - $this->where.= " AND p.entity = ".$conf->entity; + $this->where.= " AND p.entity IN (".getEntity('propal', 1).")"; if (!$user->rights->societe->client->voir && !$this->socid) $this->where .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id; if($this->socid) { diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php index a0e8a3409ab02..af815ba0473d9 100644 --- a/htdocs/comm/propal/index.php +++ b/htdocs/comm/propal/index.php @@ -83,7 +83,7 @@ $sql.= ", ".MAIN_DB_PREFIX."propal as p"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE p.fk_soc = s.rowid"; -$sql.= " AND p.entity = ".$conf->entity; +$sql.= " AND p.entity IN (".getEntity('propal', 1).")"; if ($user->societe_id) $sql.=' AND p.fk_soc = '.$user->societe_id; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; $sql.= " AND p.fk_statut IN (0,1,2,3,4)"; @@ -159,7 +159,7 @@ $sql.= ", ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE c.fk_soc = s.rowid"; - $sql.= " AND c.entity = ".$conf->entity; + $sql.= " AND c.entity IN (".getEntity('propal', 1).")"; $sql.= " AND c.fk_statut = 0"; if ($socid) $sql.= " AND c.fk_soc = ".$socid; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; @@ -217,7 +217,7 @@ $sql.= ", ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE c.fk_soc = s.rowid"; -$sql.= " AND c.entity = ".$conf->entity; +$sql.= " AND c.entity IN (".getEntity('propal', 1).")"; //$sql.= " AND c.fk_statut > 2"; if ($socid) $sql .= " AND c.fk_soc = ".$socid; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; @@ -296,7 +296,7 @@ $sql.= ", ".MAIN_DB_PREFIX."propal as p"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE p.fk_soc = s.rowid"; - $sql.= " AND p.entity = ".$conf->entity; + $sql.= " AND p.entity IN (".getEntity('propal', 1).")"; $sql.= " AND p.fk_statut = 1"; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if ($socid) $sql.= " AND s.rowid = ".$socid; diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index c22b1952f9b11..9fbdb2ffd7ef5 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -162,7 +162,7 @@ $sql.=", ".MAIN_DB_PREFIX."c_type_contact as tc"; } $sql.= ' WHERE p.fk_soc = s.rowid'; -$sql.= ' AND p.entity = '.$conf->entity; +$sql.= ' AND p.entity IN ('.getEntity('propal', 1).')'; if (! $user->rights->societe->client->voir && ! $socid) //restriction { $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php index b27560442101d..0d72eac46e3df 100644 --- a/htdocs/comm/prospect/index.php +++ b/htdocs/comm/prospect/index.php @@ -120,7 +120,7 @@ if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE p.fk_statut = 0"; $sql.= " AND p.fk_soc = s.rowid"; - $sql.= " AND p.entity = ".$conf->entity; + $sql.= " AND p.entity IN (".getEntity('propal', 1).")"; if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; $resql=$db->query($sql); @@ -183,7 +183,7 @@ $sql.= " WHERE p.fk_soc = s.rowid"; $sql.= " AND p.fk_statut = c.id"; $sql.= " AND p.fk_statut = 1"; - $sql.= " AND p.entity = ".$conf->entity; + $sql.= " AND p.entity IN (".getEntity('propal', 1).")"; if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if ($socid) $sql.= " AND s.rowid = ".$socid; $sql.= " ORDER BY p.rowid DESC"; diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index eba8a557d25d7..ed5de40dbab55 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -1466,7 +1466,7 @@ function fetch($id, $ref='', $ref_ext='', $ref_int='') $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_availability as ca ON (c.fk_availability = ca.rowid)'; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_input_reason as dr ON (c.fk_input_reason = ca.rowid)'; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON c.fk_incoterms = i.rowid'; - $sql.= " WHERE c.entity = ".$conf->entity; + $sql.= " WHERE c.entity IN (".getEntity('commande', 1).")"; if ($id) $sql.= " AND c.rowid=".$id; if ($ref) $sql.= " AND c.ref='".$this->db->escape($ref)."'"; if ($ref_ext) $sql.= " AND c.ref_ext='".$this->db->escape($ref_ext)."'"; @@ -2185,7 +2185,7 @@ function liste_array($shortlist=0, $draft=0, $excluser='', $socid=0, $limit=0, $ if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c"; if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; - $sql.= " WHERE c.entity = ".$conf->entity; + $sql.= " WHERE c.entity IN (".getEntity('commande', 1).")"; $sql.= " AND c.fk_soc = s.rowid"; if (! $user->rights->societe->client->voir && ! $socid) //restriction { @@ -2824,7 +2824,7 @@ function load_board($user) $sql.= " WHERE sc.fk_user = " .$user->id; $clause = " AND"; } - $sql.= $clause." c.entity = ".$conf->entity; + $sql.= $clause." c.entity IN (".getEntity('commande', 1).")"; //$sql.= " AND c.fk_statut IN (1,2,3) AND c.facture = 0"; $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; @@ -3161,7 +3161,7 @@ function load_state_board() $sql.= " WHERE sc.fk_user = " .$user->id; $clause = "AND"; } - $sql.= " ".$clause." co.entity = ".$conf->entity; + $sql.= " ".$clause." co.entity IN (".getEntity('commande', 1).")"; $resql=$this->db->query($sql); if ($resql) diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php index e4662cc7ee8e9..391962c98cb1c 100644 --- a/htdocs/commande/customer.php +++ b/htdocs/commande/customer.php @@ -73,7 +73,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st, ".MAIN_DB_PREFIX."commande as c"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE s.fk_stcomm = st.id AND c.fk_soc = s.rowid"; -$sql.= " AND s.entity = ".$conf->entity; +$sql.= " AND s.entity IN (".getEntity('societe', 1).")"; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if (dol_strlen($stcomm)) { diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php index 40b39ccb66689..30eb31c82ba66 100644 --- a/htdocs/commande/index.php +++ b/htdocs/commande/index.php @@ -82,7 +82,7 @@ $sql.= ", ".MAIN_DB_PREFIX."commande as c"; if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE c.fk_soc = s.rowid"; -$sql.= " AND c.entity = ".$conf->entity; +$sql.= " AND c.entity IN (".getEntity('societe', 1).")"; if ($user->societe_id) $sql.=' AND c.fk_soc = '.$user->societe_id; if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; $sql.= " GROUP BY c.fk_statut, c.facture"; @@ -171,7 +171,7 @@ $sql.= ", ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE c.fk_soc = s.rowid"; - $sql.= " AND c.entity = ".$conf->entity; + $sql.= " AND c.entity IN (".getEntity('commande', 1).")"; $sql.= " AND c.fk_statut = 0"; if ($socid) $sql.= " AND c.fk_soc = ".$socid; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; @@ -220,7 +220,7 @@ $sql.= " ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE c.fk_soc = s.rowid"; -$sql.= " AND c.entity = ".$conf->entity; +$sql.= " AND c.entity IN (".getEntity('commande', 1).")"; //$sql.= " AND c.fk_statut > 2"; if ($socid) $sql .= " AND c.fk_soc = ".$socid; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; @@ -290,7 +290,7 @@ $sql.= ", ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE c.fk_soc = s.rowid"; - $sql.= " AND c.entity = ".$conf->entity; + $sql.= " AND c.entity IN (".getEntity('commande', 1).")"; $sql.= " AND c.fk_statut = 1"; if ($socid) $sql.= " AND c.fk_soc = ".$socid; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; @@ -361,7 +361,7 @@ $sql.= ", ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE c.fk_soc = s.rowid"; - $sql.= " AND c.entity = ".$conf->entity; + $sql.= " AND c.entity IN (".getEntity('commande', 1).")"; $sql.= " AND c.fk_statut = 2 "; if ($socid) $sql.= " AND c.fk_soc = ".$socid; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index 5164b30eed739..351a4171dd6f9 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -127,7 +127,7 @@ $sql.=", ".MAIN_DB_PREFIX."c_type_contact as tc"; } $sql.= ' WHERE c.fk_soc = s.rowid'; -$sql.= ' AND c.entity = '.$conf->entity; +$sql.= ' AND c.entity IN ('.getEntity('commande', 1).')'; if ($socid) $sql.= ' AND s.rowid = '.$socid; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if ($search_ref) { diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php index e6a40e1b027fa..064e56f1b4b64 100644 --- a/htdocs/commande/orderstoinvoice.php +++ b/htdocs/commande/orderstoinvoice.php @@ -526,7 +526,7 @@ $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s'; $sql.= ', '.MAIN_DB_PREFIX.'commande as c'; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; - $sql.= ' WHERE c.entity = '.$conf->entity; + $sql.= ' WHERE c.entity IN ('.getEntity('commande', 1).')'; $sql.= ' AND c.fk_soc = s.rowid'; // Show orders with status validated, shipping started and delivered (well any order we can bill) diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index ce2bbc5381ea9..e923f3b3fa10c 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -263,7 +263,7 @@ } $sql.= " WHERE b.fk_account = ".$object->id; $sql.= " AND b.fk_account = ba.rowid"; - $sql.= " AND ba.entity = ".$conf->entity; + $sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")"; $sql.= $sql_rech; dol_syslog("account.php count transactions -", LOG_DEBUG); @@ -511,7 +511,7 @@ } $sql.= " WHERE b.fk_account=".$object->id; $sql.= " AND b.fk_account = ba.rowid"; - $sql.= " AND ba.entity = ".$conf->entity; + $sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")"; $sql.= $sql_rech; $sql.= $db->order("b.datev, b.datec", "ASC"); // We add date of creation to have correct order when everything is done the same day $sql.= $db->plimit($limitsql, 0); diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php index 0a9cfc79b10c5..6dfbea2979130 100644 --- a/htdocs/compta/bank/annuel.php +++ b/htdocs/compta/bank/annuel.php @@ -80,7 +80,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."bank as b"; $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba"; $sql.= " WHERE b.fk_account = ba.rowid"; -$sql.= " AND ba.entity = ".$conf->entity; +$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")"; $sql.= " AND b.amount >= 0"; if (! empty($id)) $sql .= " AND b.fk_account IN (".$db->escape($id).")"; @@ -108,7 +108,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."bank as b"; $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba"; $sql.= " WHERE b.fk_account = ba.rowid"; -$sql.= " AND ba.entity = ".$conf->entity; +$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")"; $sql.= " AND b.amount <= 0"; if (! empty($id)) $sql .= " AND b.fk_account IN (".$db->escape($id).")"; @@ -261,7 +261,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."bank as b"; $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba"; $sql.= " WHERE b.fk_account = ba.rowid"; -$sql.= " AND ba.entity = ".$conf->entity; +$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")"; if (! empty($id)) $sql.= " AND b.fk_account IN (".$db->escape($id).")"; @@ -302,7 +302,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."bank as b"; $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba"; $sql.= " WHERE b.fk_account = ba.rowid"; - $sql.= " AND ba.entity = ".$conf->entity; + $sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")"; if ($id && $_GET["option"]!='all') $sql.= " AND b.fk_account IN (".$id.")"; $resql = $db->query($sql); @@ -333,7 +333,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."bank as b"; $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba"; $sql.= " WHERE b.fk_account = ba.rowid"; - $sql.= " AND ba.entity = ".$conf->entity; + $sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")"; $sql.= " AND b.datev >= '".($year-$annee)."-01-01 00:00:00'"; $sql.= " AND b.datev <= '".($year-$annee)."-12-31 23:59:59'"; $sql.= " AND b.amount > 0"; @@ -422,7 +422,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."bank as b"; $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba"; $sql.= " WHERE b.fk_account = ba.rowid"; - $sql.= " AND ba.entity = ".$conf->entity; + $sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")"; $sql.= " AND b.datev >= '".($year-$annee)."-01-01 00:00:00'"; $sql.= " AND b.datev <= '".($year-$annee)."-12-31 23:59:59'"; $sql.= " AND b.amount < 0"; diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index b6215165d35fe..c8badb1a880d6 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -930,7 +930,7 @@ function load_board($user,$filteraccountid=0) $sql.= " ".MAIN_DB_PREFIX."bank_account as ba"; $sql.= " WHERE b.rappro=0"; $sql.= " AND b.fk_account = ba.rowid"; - $sql.= " AND ba.entity = ".$conf->entity; + $sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")"; $sql.= " AND (ba.rappro = 1 AND ba.courant != 2)"; // Compte rapprochable if ($filteraccountid) $sql.=" AND ba.rowid = ".$filteraccountid; @@ -1191,7 +1191,7 @@ function fetch($rowid,$ref='',$num='') $sql.= " FROM ".MAIN_DB_PREFIX."bank as b,"; $sql.= " ".MAIN_DB_PREFIX."bank_account as ba"; $sql.= " WHERE b.fk_account = ba.rowid"; - $sql.= " AND ba.entity = ".$conf->entity; + $sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")"; if ($num) $sql.= " AND b.num_chq='".$this->db->escape($num)."'"; else if ($ref) $sql.= " AND b.rowid='".$this->db->escape($ref)."'"; else $sql.= " AND b.rowid=".$rowid; diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php index 60592085b35fe..d87d95f6026e8 100644 --- a/htdocs/compta/bank/graph.php +++ b/htdocs/compta/bank/graph.php @@ -90,7 +90,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."bank as b"; $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba"; $sql.= " WHERE b.fk_account = ba.rowid"; - $sql.= " AND ba.entity = ".$conf->entity; + $sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")"; if ($account && $_GET["option"]!='all') $sql.= " AND b.fk_account IN (".$account.")"; $resql = $db->query($sql); @@ -129,7 +129,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."bank as b"; $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba"; $sql.= " WHERE b.fk_account = ba.rowid"; - $sql.= " AND ba.entity = ".$conf->entity; + $sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")"; $sql.= " AND b.datev >= '".$year."-".$month."-01 00:00:00'"; $sql.= " AND b.datev < '".$yearnext."-".$monthnext."-01 00:00:00'"; if ($account && $_GET["option"]!='all') $sql.= " AND b.fk_account IN (".$account.")"; @@ -160,7 +160,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."bank as b"; $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba"; $sql.= " WHERE b.fk_account = ba.rowid"; - $sql.= " AND ba.entity = ".$conf->entity; + $sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")"; $sql.= " AND b.datev < '".$year."-".sprintf("%02s",$month)."-01'"; if ($account && $_GET["option"]!='all') $sql.= " AND b.fk_account IN (".$account.")"; @@ -272,7 +272,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."bank as b"; $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba"; $sql.= " WHERE b.fk_account = ba.rowid"; - $sql.= " AND ba.entity = ".$conf->entity; + $sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")"; $sql.= " AND b.datev >= '".$year."-01-01 00:00:00'"; $sql.= " AND b.datev <= '".$year."-12-31 23:59:59'"; if ($account && $_GET["option"]!='all') $sql.= " AND b.fk_account IN (".$account.")"; @@ -303,7 +303,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."bank as b"; $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba"; $sql.= " WHERE b.fk_account = ba.rowid"; - $sql.= " AND ba.entity = ".$conf->entity; + $sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")"; $sql.= " AND b.datev < '".$year."-01-01'"; if ($account && $_GET["option"]!='all') $sql.= " AND b.fk_account IN (".$account.")"; @@ -411,7 +411,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."bank as b"; $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba"; $sql.= " WHERE b.fk_account = ba.rowid"; - $sql.= " AND ba.entity = ".$conf->entity; + $sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")"; if ($account && $_GET["option"]!='all') $sql.= " AND b.fk_account IN (".$account.")"; $sql.= " GROUP BY date_format(b.datev,'%Y%m%d')"; @@ -534,7 +534,7 @@ $sql .= " FROM ".MAIN_DB_PREFIX."bank as b"; $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba"; $sql.= " WHERE b.fk_account = ba.rowid"; - $sql.= " AND ba.entity = ".$conf->entity; + $sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")"; $sql.= " AND b.datev >= '".$year."-".$month."-01 00:00:00'"; $sql.= " AND b.datev < '".$yearnext."-".$monthnext."-01 00:00:00'"; $sql.= " AND b.amount > 0"; @@ -572,7 +572,7 @@ $sql .= " FROM ".MAIN_DB_PREFIX."bank as b"; $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba"; $sql.= " WHERE b.fk_account = ba.rowid"; - $sql.= " AND ba.entity = ".$conf->entity; + $sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")"; $sql.= " AND b.datev >= '".$year."-".$month."-01 00:00:00'"; $sql.= " AND b.datev < '".$yearnext."-".$monthnext."-01 00:00:00'"; $sql.= " AND b.amount < 0"; @@ -652,7 +652,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."bank as b"; $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba"; $sql.= " WHERE b.fk_account = ba.rowid"; - $sql.= " AND ba.entity = ".$conf->entity; + $sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")"; $sql.= " AND b.datev >= '".$year."-01-01 00:00:00'"; $sql.= " AND b.datev <= '".$year."-12-31 23:59:59'"; $sql.= " AND b.amount > 0"; @@ -681,7 +681,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX."bank as b"; $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba"; $sql.= " WHERE b.fk_account = ba.rowid"; - $sql.= " AND ba.entity = ".$conf->entity; + $sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")"; $sql.= " AND b.datev >= '".$year."-01-01 00:00:00'"; $sql.= " AND b.datev <= '".$year."-12-31 23:59:59'"; $sql.= " AND b.amount < 0"; diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php index 63afe63c03ce5..9c0205c62b3d2 100644 --- a/htdocs/compta/bank/search.php +++ b/htdocs/compta/bank/search.php @@ -110,7 +110,7 @@ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_url as bu ON bu.fk_bank = b.rowid AND type = 'company'"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON bu.url_id = s.rowid"; $sql.= " WHERE b.fk_account = ba.rowid"; -$sql.= " AND ba.entity = ".$conf->entity; +$sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")"; if (GETPOST("req_nb")) { $sql.= " AND b.num_chq LIKE '%".$db->escape(GETPOST("req_nb"))."%'"; diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php index 4df88871cb9eb..f2af107c7cdc9 100644 --- a/htdocs/compta/paiement/cheque/card.php +++ b/htdocs/compta/paiement/cheque/card.php @@ -376,7 +376,7 @@ $sql.= " ".MAIN_DB_PREFIX."bank_account as ba"; $sql.= " WHERE b.fk_type = 'CHQ'"; $sql.= " AND b.fk_account = ba.rowid"; - $sql.= " AND ba.entity = ".$conf->entity; + $sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")"; $sql.= " AND b.fk_bordereau = 0"; $sql.= " AND b.amount > 0"; if ($filterdate) $sql.=" AND b.dateo = '".$db->idate($filterdate)."'"; @@ -599,7 +599,7 @@ $sql.= ", ".MAIN_DB_PREFIX."bank as b"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement as p ON p.fk_bank = b.rowid"; $sql.= " WHERE ba.rowid = b.fk_account"; - $sql.= " AND ba.entity = ".$conf->entity; + $sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")"; $sql.= " AND b.fk_type= 'CHQ'"; $sql.= " AND b.fk_bordereau = ".$object->id; $sql.= " ORDER BY $sortfield $sortorder"; diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php index a3fb835f194ce..2dc1efe04b403 100644 --- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php +++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php @@ -445,7 +445,7 @@ function load_board($user) $sql.= " FROM ".MAIN_DB_PREFIX."bank as b"; $sql.= ", ".MAIN_DB_PREFIX."bank_account as ba"; $sql.= " WHERE b.fk_account = ba.rowid"; - $sql.= " AND ba.entity = ".$conf->entity; + $sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")"; $sql.= " AND b.fk_type = 'CHQ'"; $sql.= " AND b.fk_bordereau = 0"; $sql.= " AND b.amount > 0"; diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index a9e140303886c..65e6866befe3c 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -235,7 +235,7 @@ $sql.= " WHERE pf.rowid IS NULL"; $sql.= " AND p.fk_bank = b.rowid"; $sql.= " AND b.fk_account = ba.rowid"; - $sql.= " AND ba.entity = ".$conf->entity; + $sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")"; if (! empty($date_start) && ! empty($date_end)) $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'"; $sql.= " GROUP BY name, idp"; diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php index 9f681d5b1ec9c..544c4d8a9e232 100644 --- a/htdocs/compta/resultat/index.php +++ b/htdocs/compta/resultat/index.php @@ -155,7 +155,7 @@ $sql.= " WHERE pf.rowid IS NULL"; $sql.= " AND p.fk_bank = b.rowid"; $sql.= " AND b.fk_account = ba.rowid"; - $sql.= " AND ba.entity = ".$conf->entity; + $sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")"; $sql.= " GROUP BY dm"; $sql.= " ORDER BY dm"; diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php index 066967cc2c3f9..385ac1f140c94 100644 --- a/htdocs/compta/stats/cabyuser.php +++ b/htdocs/compta/stats/cabyuser.php @@ -232,7 +232,7 @@ $sql.= " WHERE pf.rowid IS NULL"; $sql.= " AND p.fk_bank = b.rowid"; $sql.= " AND b.fk_account = ba.rowid"; - $sql.= " AND ba.entity = ".$conf->entity; + $sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")"; if ($date_start && $date_end) { $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'"; } diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php index 0f352defc5e35..8131e4b534814 100644 --- a/htdocs/compta/stats/casoc.php +++ b/htdocs/compta/stats/casoc.php @@ -279,7 +279,7 @@ $sql.= " WHERE pf.rowid IS NULL"; $sql.= " AND p.fk_bank = b.rowid"; $sql.= " AND b.fk_account = ba.rowid"; - $sql.= " AND ba.entity = ".$conf->entity; + $sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")"; if ($date_start && $date_end) $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'"; $sql.= " GROUP BY socid, name"; $sql.= " ORDER BY name"; diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php index a44cb4ed48e48..eb9a425c2afee 100644 --- a/htdocs/compta/stats/index.php +++ b/htdocs/compta/stats/index.php @@ -146,7 +146,7 @@ $sql.= " WHERE pf.rowid IS NULL"; $sql.= " AND p.fk_bank = b.rowid"; $sql.= " AND b.fk_account = ba.rowid"; - $sql.= " AND ba.entity = ".$conf->entity; + $sql.= " AND ba.entity IN (".getEntity('bank_account', 1).")"; $sql.= " GROUP BY dm"; $sql.= " ORDER BY dm"; diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php index 5ce30be59a082..1c0c589870e1c 100644 --- a/htdocs/core/lib/sendings.lib.php +++ b/htdocs/core/lib/sendings.lib.php @@ -167,7 +167,7 @@ function show_list_sending_receive($origin,$origin_id,$filter='') $sql.= ", ".MAIN_DB_PREFIX.$origin."det as obj"; //if ($conf->livraison_bon->enabled) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.fk_expedition = e.rowid LEFT JOIN ".MAIN_DB_PREFIX."livraisondet as ld ON ld.fk_livraison = l.rowid AND obj.rowid = ld.fk_origin_line"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON obj.fk_product = p.rowid"; - $sql.= " WHERE e.entity = ".$conf->entity; + $sql.= " WHERE e.entity IN (".getEntity('expedition', 1).")"; $sql.= " AND obj.fk_".$origin." = ".$origin_id; $sql.= " AND obj.rowid = ed.fk_origin_line"; $sql.= " AND ed.fk_expedition = e.rowid"; diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index 24ce24bae477e..58b6b5c65c248 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -438,7 +438,7 @@ function fetch($id, $ref='', $ref_ext='', $ref_int='') $sql.= " FROM ".MAIN_DB_PREFIX."expedition as e"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = e.rowid AND el.targettype = '".$this->element."'"; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON e.fk_incoterms = i.rowid'; - $sql.= " WHERE e.entity = ".$conf->entity; + $sql.= " WHERE e.entity IN (".getEntity('expedition', 1).")"; if ($id) $sql.= " AND e.rowid=".$id; if ($ref) $sql.= " AND e.ref='".$this->db->escape($ref)."'"; if ($ref_ext) $sql.= " AND e.ref_ext='".$this->db->escape($ref_ext)."'"; diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php index 2b41a939c7bf6..5ecd563a6136b 100644 --- a/htdocs/expedition/index.php +++ b/htdocs/expedition/index.php @@ -75,7 +75,7 @@ $clause = " AND "; } $sql.= $clause." e.fk_statut = 0"; -$sql.= " AND e.entity = ".$conf->entity; +$sql.= " AND e.entity IN (".getEntity('expedition', 1).")"; if ($socid) $sql.= " AND c.fk_soc = ".$socid; $resql=$db->query($sql); @@ -235,7 +235,7 @@ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON el.fk_source = c.rowid AND el.sourcetype IN ('commande') AND el.targettype = 'shipping'"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc"; if (! $user->rights->societe->client->voir && ! $socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc"; -$sql.= " WHERE e.entity = ".$conf->entity; +$sql.= " WHERE e.entity IN (".getEntity('expedition', 1).")"; if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND sc.fk_user = " .$user->id; $sql.= " AND e.fk_statut = 1"; if ($socid) $sql.= " AND c.fk_soc = ".$socid; diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php index 195687a4ab72f..94eac327fcdec 100644 --- a/htdocs/expedition/list.php +++ b/htdocs/expedition/list.php @@ -82,7 +82,7 @@ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as ee ON e.rowid = ee.fk_source AND ee.sourcetype = 'shipping' AND ee.targettype = 'delivery'"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."livraison as l ON l.rowid = ee.fk_target"; -$sql.= " WHERE e.entity = ".$conf->entity; +$sql.= " WHERE e.entity IN (".getEntity('expedition', 1).")"; if (!$user->rights->societe->client->voir && !$socid) // Internal user with no permission to see all { $sql.= " AND e.fk_soc = sc.fk_soc"; diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php index d67b575023bf3..4e2da460a74c8 100644 --- a/htdocs/product/class/html.formproduct.class.php +++ b/htdocs/product/class/html.formproduct.class.php @@ -72,7 +72,7 @@ function loadWarehouses($fk_product=0) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps on ps.fk_entrepot = e.rowid"; $sql.= " AND ps.fk_product = '".$fk_product."'"; } - $sql.= " WHERE e.entity = ".$conf->entity; + $sql.= " WHERE e.entity IN (".getEntity('stock', 1).")"; $sql.= " AND e.statut = 1"; $sql.= " ORDER BY e.label"; diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 184560b7aad0c..e5e24dc2cf6b3 100755 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -1770,7 +1770,7 @@ function load_stats_propale($socid=0) if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE p.rowid = pd.fk_propal"; $sql.= " AND p.fk_soc = s.rowid"; - $sql.= " AND p.entity = ".$conf->entity; + $sql.= " AND p.entity IN (".getEntity('propal', 1).")"; $sql.= " AND pd.fk_product = ".$this->id; if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id; //$sql.= " AND pr.fk_statut != 0"; @@ -1813,7 +1813,7 @@ function load_stats_commande($socid=0,$filtrestatut='') if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE c.rowid = cd.fk_commande"; $sql.= " AND c.fk_soc = s.rowid"; - $sql.= " AND c.entity = ".$conf->entity; + $sql.= " AND c.entity IN (".getEntity('commande', 1).")"; $sql.= " AND cd.fk_product = ".$this->id; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id; if ($socid > 0) $sql.= " AND c.fk_soc = ".$socid; @@ -1855,7 +1855,7 @@ function load_stats_commande_fournisseur($socid=0,$filtrestatut='') if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE c.rowid = cd.fk_commande"; $sql.= " AND c.fk_soc = s.rowid"; - $sql.= " AND c.entity = ".$conf->entity; + $sql.= " AND c.entity IN (".getEntity('commande_fourniseur', 1).")"; $sql.= " AND cd.fk_product = ".$this->id; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id; if ($socid > 0) $sql.= " AND c.fk_soc = ".$socid; @@ -1900,7 +1900,7 @@ function load_stats_sending($socid=0,$filtrestatut='') $sql.= " WHERE e.rowid = ed.fk_expedition"; $sql.= " AND c.rowid = cd.fk_commande"; $sql.= " AND e.fk_soc = s.rowid"; - $sql.= " AND e.entity = ".$conf->entity; + $sql.= " AND e.entity IN (".getEntity('expedition', 1).")"; $sql.= " AND ed.fk_origin_line = cd.rowid"; $sql.= " AND cd.fk_product = ".$this->id; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND e.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id; @@ -1943,7 +1943,7 @@ function load_stats_reception($socid=0,$filtrestatut='') if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE cf.rowid = fd.fk_commande"; $sql.= " AND cf.fk_soc = s.rowid"; - $sql.= " AND cf.entity = ".$conf->entity; + $sql.= " AND cf.entity IN (".getEntity('commande_fournisseur', 1).")"; $sql.= " AND fd.fk_product = ".$this->id; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND cf.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id; if ($socid > 0) $sql.= " AND cf.fk_soc = ".$socid; @@ -1985,7 +1985,7 @@ function load_stats_contrat($socid=0) if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE c.rowid = cd.fk_contrat"; $sql.= " AND c.fk_soc = s.rowid"; - $sql.= " AND c.entity = ".$conf->entity; + $sql.= " AND c.entity IN (".getEntity('contrat', 1).")"; $sql.= " AND cd.fk_product = ".$this->id; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id; //$sql.= " AND c.statut != 0"; @@ -2027,7 +2027,7 @@ function load_stats_facture($socid=0) if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE f.rowid = fd.fk_facture"; $sql.= " AND f.fk_soc = s.rowid"; - $sql.= " AND f.entity = ".$conf->entity; + $sql.= " AND f.entity IN (".getEntity('facture', 1).")"; $sql.= " AND fd.fk_product = ".$this->id; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id; //$sql.= " AND f.fk_statut != 0"; @@ -2069,7 +2069,7 @@ function load_stats_facture_fournisseur($socid=0) if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE f.rowid = fd.fk_facture_fourn"; $sql.= " AND f.fk_soc = s.rowid"; - $sql.= " AND f.entity = ".$conf->entity; + $sql.= " AND f.entity IN (".getEntity('facture_fourn', 1).")"; $sql.= " AND fd.fk_product = ".$this->id; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id; //$sql.= " AND f.fk_statut != 0"; @@ -2167,7 +2167,7 @@ function get_nb_vente($socid,$mode) $sql.= " WHERE f.rowid = d.fk_facture"; $sql.= " AND d.fk_product =".$this->id; $sql.= " AND f.fk_soc = s.rowid"; - $sql.= " AND f.entity = ".$conf->entity; + $sql.= " AND f.entity IN (".getEntity('facture', 1).")"; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id; if ($socid > 0) $sql.= " AND f.fk_soc = $socid"; $sql.= " GROUP BY date_format(f.datef,'%Y%m')"; @@ -2196,7 +2196,7 @@ function get_nb_achat($socid,$mode) $sql.= " WHERE f.rowid = d.fk_facture_fourn"; $sql.= " AND d.fk_product =".$this->id; $sql.= " AND f.fk_soc = s.rowid"; - $sql.= " AND f.entity = ".$conf->entity; + $sql.= " AND f.entity IN (".getEntity('facture_fourn', 1).")"; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id; if ($socid > 0) $sql.= " AND f.fk_soc = $socid"; $sql.= " GROUP BY date_format(f.datef,'%Y%m')"; @@ -2225,7 +2225,7 @@ function get_nb_propal($socid,$mode) $sql.= " WHERE p.rowid = d.fk_propal"; $sql.= " AND d.fk_product =".$this->id; $sql.= " AND p.fk_soc = s.rowid"; - $sql.= " AND p.entity = ".$conf->entity; + $sql.= " AND p.entity IN (".getEntity('propal', 1).")"; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id; if ($socid > 0) $sql.= " AND p.fk_soc = ".$socid; $sql.= " GROUP BY date_format(p.datep,'%Y%m')"; @@ -2252,7 +2252,7 @@ function get_nb_order($socid,$mode) $sql.= " WHERE c.rowid = d.fk_commande"; $sql.= " AND d.fk_product =".$this->id; $sql.= " AND c.fk_soc = s.rowid"; - $sql.= " AND c.entity = ".$conf->entity; + $sql.= " AND c.entity IN (".getEntity('commande', 1).")"; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id; if ($socid > 0) $sql.= " AND c.fk_soc = ".$socid; $sql.= " GROUP BY date_format(c.date_commande,'%Y%m')"; @@ -2279,7 +2279,7 @@ function get_nb_ordersupplier($socid,$mode) $sql.= " WHERE c.rowid = d.fk_commande"; $sql.= " AND d.fk_product =".$this->id; $sql.= " AND c.fk_soc = s.rowid"; - $sql.= " AND c.entity = ".$conf->entity; + $sql.= " AND c.entity IN (".getEntity('commande_fournisseur', 1).")"; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id; if ($socid > 0) $sql.= " AND c.fk_soc = ".$socid; $sql.= " GROUP BY date_format(c.date_commande,'%Y%m')"; diff --git a/htdocs/product/index.php b/htdocs/product/index.php index c14d27deb9d90..b00ed56166dda 100644 --- a/htdocs/product/index.php +++ b/htdocs/product/index.php @@ -377,7 +377,7 @@ function activitytrim($product_type) $sql.= " AND pf.fk_facture = f.rowid"; $sql.= " AND pf.fk_paiement= p.rowid"; $sql.= " AND fd.product_type=".$product_type; - $sql.= " AND s.entity = ".$conf->entity; + $sql.= " AND s.entity IN (".getEntity('societe', 1).")"; $sql.= " AND p.datep >= '".$db->idate(dol_get_first_day($yearofbegindate),1)."'"; $sql.= " GROUP BY annee, mois "; $sql.= " ORDER BY annee, mois "; diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php index 7dcf613953470..32fce234bc165 100644 --- a/htdocs/product/stats/commande.php +++ b/htdocs/product/stats/commande.php @@ -137,7 +137,7 @@ $sql.= ", ".MAIN_DB_PREFIX."commandedet as d"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE c.fk_soc = s.rowid"; - $sql.= " AND c.entity = ".$conf->entity; + $sql.= " AND c.entity IN (".getEntity('commande', 1).")"; $sql.= " AND d.fk_commande = c.rowid"; $sql.= " AND d.fk_product =".$product->id; if (! empty($search_month)) diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php index d098ca3399b38..bf65a80e64484 100644 --- a/htdocs/product/stats/contrat.php +++ b/htdocs/product/stats/contrat.php @@ -131,7 +131,7 @@ $sql.= ", ".MAIN_DB_PREFIX."contratdet as cd"; $sql.= " WHERE c.rowid = cd.fk_contrat"; $sql.= " AND c.fk_soc = s.rowid"; - $sql.= " AND c.entity = ".$conf->entity; + $sql.= " AND c.entity IN (".getEntity('contrat', 1).")"; $sql.= " AND cd.fk_product =".$product->id; if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if ($socid) $sql.= " AND s.rowid = ".$socid; diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php index 1f4e9b985e582..564132270b06e 100644 --- a/htdocs/product/stats/facture.php +++ b/htdocs/product/stats/facture.php @@ -138,7 +138,7 @@ $sql.= ", ".MAIN_DB_PREFIX."facturedet as d"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE f.fk_soc = s.rowid"; - $sql.= " AND f.entity = ".$conf->entity; + $sql.= " AND f.entity IN (".getEntity('facture', 1).")"; $sql.= " AND d.fk_facture = f.rowid"; $sql.= " AND d.fk_product =".$product->id; if (! empty($search_month)) diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php index debb0698c4472..0c1bfb18e9e8d 100644 --- a/htdocs/product/stats/facture_fournisseur.php +++ b/htdocs/product/stats/facture_fournisseur.php @@ -139,7 +139,7 @@ $sql .= ", " . MAIN_DB_PREFIX . "facture_fourn_det as d"; if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc"; $sql .= " WHERE f.fk_soc = s.rowid"; - $sql .= " AND f.entity = " . $conf->entity; + $sql .= " AND f.entity IN (".getEntity('facture_fourn', 1).")"; $sql .= " AND d.fk_facture_fourn = f.rowid"; $sql .= " AND d.fk_product =" . $product->id; if (! empty($search_month)) diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php index 1776ba571e0d6..c7e2acafb3eb2 100644 --- a/htdocs/product/stats/propal.php +++ b/htdocs/product/stats/propal.php @@ -138,7 +138,7 @@ if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc"; $sql .= " WHERE p.fk_soc = s.rowid"; - $sql .= " AND p.entity = " . $conf->entity; + $sql .= " AND p.entity IN (".getEntity('propal', 1).")"; $sql .= " AND d.fk_propal = p.rowid"; $sql .= " AND d.fk_product =" . $product->id; if (! empty($search_month)) diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php index 0f935c0154c85..dc12f7d9042ee 100644 --- a/htdocs/product/stock/replenish.php +++ b/htdocs/product/stock/replenish.php @@ -295,7 +295,7 @@ $sqlCommandesCli = "(SELECT ".$db->ifsql("SUM(cd.qty) IS NULL", "0", "SUM(cd.qty)")." as qty"; $sqlCommandesCli.= " FROM ".MAIN_DB_PREFIX."commandedet as cd"; $sqlCommandesCli.= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON (c.rowid = cd.fk_commande)"; - $sqlCommandesCli.= " WHERE c.entity = ".$conf->entity; + $sqlCommandesCli.= " WHERE c.entity IN (".getEntity('order', 1).")"; $sqlCommandesCli.= " AND cd.fk_product = p.rowid"; $sqlCommandesCli.= " AND c.fk_statut IN (1,2))"; @@ -304,7 +304,7 @@ $sqlExpeditionsCli.= " LEFT JOIN ".MAIN_DB_PREFIX."expeditiondet as ed ON (ed.fk_expedition = e.rowid)"; $sqlExpeditionsCli.= " LEFT JOIN ".MAIN_DB_PREFIX."commandedet as cd ON (cd.rowid = ed.fk_origin_line)"; $sqlExpeditionsCli.= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON (c.rowid = cd.fk_commande)"; - $sqlExpeditionsCli.= " WHERE e.entity = ".$conf->entity; + $sqlExpeditionsCli.= " WHERE e.entity IN (".getEntity('expedition', 1).")"; $sqlExpeditionsCli.= " AND cd.fk_product = p.rowid"; $sqlExpeditionsCli.= " AND c.fk_statut IN (1,2))"; @@ -312,14 +312,14 @@ $sqlCommandesFourn.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd"; $sqlCommandesFourn.= ", ".MAIN_DB_PREFIX."commande_fournisseur as c"; $sqlCommandesFourn.= " WHERE c.rowid = cd.fk_commande"; - $sqlCommandesFourn.= " AND c.entity = ".$conf->entity; + $sqlCommandesFourn.= " AND c.entity IN (".getEntity('commande_fournisseur', 1).")"; $sqlCommandesFourn.= " AND cd.fk_product = p.rowid"; $sqlCommandesFourn.= " AND c.fk_statut IN (3,4))"; $sqlReceptionFourn = "(SELECT ".$db->ifsql("SUM(fd.qty) IS NULL", "0", "SUM(fd.qty)")." as qty"; $sqlReceptionFourn.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as cf"; $sqlReceptionFourn.= " LEFT JOIN ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as fd ON (fd.fk_commande = cf.rowid)"; - $sqlReceptionFourn.= " WHERE cf.entity = ".$conf->entity; + $sqlReceptionFourn.= " WHERE cf.entity IN (".getEntity('commande_fournisseur', 1).")"; $sqlReceptionFourn.= " AND fd.fk_product = p.rowid"; $sqlReceptionFourn.= " AND cf.fk_statut IN (3,4))"; From 5a68cba0137ecc62f9ef09baba42fd6497ec80d0 Mon Sep 17 00:00:00 2001 From: BENKE Charlie Date: Sun, 19 Apr 2015 13:25:43 +0200 Subject: [PATCH 024/264] Create salaries.lib.php add lib salaries for menu management --- htdocs/core/lib/salaries.lib.php | 53 ++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 htdocs/core/lib/salaries.lib.php diff --git a/htdocs/core/lib/salaries.lib.php b/htdocs/core/lib/salaries.lib.php new file mode 100644 index 0000000000000..cff64bbf31f28 --- /dev/null +++ b/htdocs/core/lib/salaries.lib.php @@ -0,0 +1,53 @@ + + * + * 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/ + */ + +/** + * Returns an array with the tabs for the "salaries" section + * It loads tabs from modules looking for the entity salaries + * + * @param Paiement $object Current salaries object + * @return array Tabs for the salaries section + */ +function salaries_prepare_head($object) { + + global $langs, $conf; + + $h = 0; + $head = array(); + + $head[$h][0] = DOL_URL_ROOT.'/compta/salaries/card.php?id='.$object->id; + $head[$h][1] = $langs->trans("Card"); + $head[$h][2] = 'salaries'; + $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,'salaries'); + + $head[$h][0] = DOL_URL_ROOT.'/compta/salaries/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,'salaries', 'remove'); + + return $head; +} From a151defc4b2c4906c2d3f8daa77e935aad652363 Mon Sep 17 00:00:00 2001 From: BENKE Charlie Date: Sun, 19 Apr 2015 13:28:51 +0200 Subject: [PATCH 025/264] Add tabs management --- htdocs/compta/salaries/card.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php index 5c943aacbcab2..1fd3e1e59e066 100644 --- a/htdocs/compta/salaries/card.php +++ b/htdocs/compta/salaries/card.php @@ -2,6 +2,7 @@ /* Copyright (C) 2011-2014 Alexandre Spangaro * Copyright (C) 2014 Laurent Destailleur * Copyright (C) 2015 Jean-François Ferry + * Copyright (C) 2015 Charlie 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 @@ -27,6 +28,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT.'/compta/salaries/class/paymentsalary.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/salaries.lib.php'; + $langs->load("compta"); $langs->load("banks"); @@ -298,11 +301,8 @@ if ($id) { - $h = 0; - $head[$h][0] = DOL_URL_ROOT.'/compta/salaries/card.php?id='.$salpayment->id; - $head[$h][1] = $langs->trans('Card'); - $head[$h][2] = 'card'; - $h++; + + $head=salaries_prepare_head($object); dol_fiche_head($head, 'card', $langs->trans("SalaryPayment"), 0, 'payment'); From 51cb680f19208c2b61ebba6bc25a2bc385b50b6c Mon Sep 17 00:00:00 2001 From: BENKE Charlie Date: Sun, 19 Apr 2015 13:32:59 +0200 Subject: [PATCH 026/264] Create info.php add info tabs --- htdocs/compta/salaries/info.php | 68 +++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 htdocs/compta/salaries/info.php diff --git a/htdocs/compta/salaries/info.php b/htdocs/compta/salaries/info.php new file mode 100644 index 0000000000000..4d060685d54ac --- /dev/null +++ b/htdocs/compta/salaries/info.php @@ -0,0 +1,68 @@ + + * Copyright (C) 2015 Charlie 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 + * 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/salaries/info.php + * \ingroup salaries + * \brief Page with info about salaries contribution + */ + +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/salaries.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; + +$langs->load("compta"); +$langs->load("bills"); +$langs->load("salaries"); + +$id=GETPOST('id','int'); +$action=GETPOST("action"); + +// Security check +$socid = GETPOST('socid','int'); +if ($user->societe_id) $socid=$user->societe_id; +$result = restrictedArea($user, 'salaries', '', '', ''); + + +/* + * View + */ + +$help_url='EN:Module_Salaries|FR:Module Fiche de paie|ES:Módulo Salarios'; +llxHeader("",$langs->trans("Salaries"),$help_url); + + +$salpayment = new PaymentSalary($db); +$result = $salpayment->fetch($id); +$salpayment->info($id); + +$head = salaries_prepare_head($salpayment); + +dol_fiche_head($head, 'info', $langs->trans("SalaryPayment"), 0, 'payment'); + + +print '
'; +dol_print_object_info($salpayment); +print '
'; + +print ''; + +llxFooter(); + +$db->close(); From 7be7a770c1ffe2129e24968bd00e4f83ed1db4b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Sun, 19 Apr 2015 15:59:49 +0200 Subject: [PATCH 027/264] Implemented units for CommandeFournisseur and FactureFournisseur --- htdocs/comm/propal.php | 2 +- htdocs/contrat/card.php | 4 +- .../pdf/pdf_canelle.modules.php | 50 +++++++++++++++-- .../pdf/pdf_muscadet.modules.php | 54 ++++++++++++++++--- htdocs/core/tpl/objectline_edit.tpl.php | 1 - .../class/fournisseur.commande.class.php | 25 +++++---- .../fourn/class/fournisseur.facture.class.php | 18 ++++--- htdocs/fourn/commande/card.php | 22 ++++++-- htdocs/fourn/commande/orderstoinvoice.php | 2 +- htdocs/fourn/facture/card.php | 22 +++++--- .../install/mysql/migration/3.7.0-3.8.0.sql | 8 ++- .../mysql/tables/llx_commande_fournisseur.sql | 2 +- .../llx_commande_fournisseurdet.key.sql | 19 +++++++ .../tables/llx_commande_fournisseurdet.sql | 4 +- .../tables/llx_facture_fourn_det.key.sql | 1 + .../mysql/tables/llx_facture_fourn_det.sql | 3 +- htdocs/product/card.php | 1 + 17 files changed, 192 insertions(+), 46 deletions(-) create mode 100644 htdocs/install/mysql/tables/llx_commande_fournisseurdet.key.sql diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 10d51feb798f1..4143f2b8ffd15 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -452,7 +452,7 @@ $tva_tx=get_default_tva($mysoc, $object->thirdparty); - $result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, 'HT', 0, $lines[$i]->info_bits, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $date_start, $date_end, $array_options); + $result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, 'HT', 0, $lines[$i]->info_bits, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $date_start, $date_end, $array_options, $lines[$i]->fk_unit); if ($result > 0) { $lineid = $result; diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index d9afbe892ad5c..2841c709fccec 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -338,7 +338,9 @@ 0, $lines[$i]->info_bits, $lines[$i]->fk_fournprice, - $lines[$i]->pa_ht + $lines[$i]->pa_ht, + array(), + $lines[$i]->fk_unit ); if ($result < 0) 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 8b803eece33e8..c01dfacd1c335 100644 --- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php +++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php @@ -97,6 +97,13 @@ function __construct($db) $this->posxqty=145; $this->posxdiscount=162; $this->postotalht=174; + + if($conf->global->PRODUCT_USE_UNITS) { + $this->posxtva=99; + $this->posxup=114; + $this->posxqty=133; + $this->posxunit=150; + } //if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) $this->posxtva=$this->posxup; $this->posxpicture=$this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images if ($this->page_largeur < 210) // To work with US executive format @@ -237,7 +244,7 @@ function write_file($object, $outputlangs='', $srctemplatepath='', $hidedetails= $this->atleastonediscount++; } } - if (empty($this->atleastonediscount)) + if (empty($this->atleastonediscount) && empty($conf->global->PRODUCT_USE_UNITS)) { $this->posxpicture+=($this->postotalht - $this->posxdiscount); $this->posxtva+=($this->postotalht - $this->posxdiscount); @@ -382,9 +389,30 @@ function write_file($object, $outputlangs='', $srctemplatepath='', $hidedetails= $pdf->SetXY($this->posxup, $curY); $pdf->MultiCell($this->posxqty-$this->posxup-0.8, 3, price($object->lines[$i]->pu_ht), 0, 'R', 0); + // Unit price before discount + $up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails); + $pdf->SetXY($this->posxup, $curY); + $pdf->MultiCell($this->posxqty-$this->posxup-0.8, 3, $up_excl_tax, 0, 'R', 0); + // Quantity $pdf->SetXY($this->posxqty, $curY); - $pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 3, $object->lines[$i]->qty, 0, 'R'); + // Enough for 6 chars + if($conf->global->PRODUCT_USE_UNITS) + { + $pdf->MultiCell($this->posxunit-$this->posxqty-0.8, 4, $object->lines[$i]->qty, 0, 'R'); + } + else + { + $pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 4, $object->lines[$i]->qty, 0, 'R'); + } + + // Unit + if($conf->global->PRODUCT_USE_UNITS) + { + $unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager); + $pdf->SetXY($this->posxunit, $curY); + $pdf->MultiCell($this->posxdiscount-$this->posxunit-0.8, 4, $unit, 0, 'L'); + } // Discount on line $pdf->SetXY($this->posxdiscount, $curY); @@ -790,7 +818,23 @@ function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, if (empty($hidetop)) { $pdf->SetXY($this->posxqty-1, $tab_top+1); - $pdf->MultiCell($this->posxdiscount-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C'); + if($conf->global->PRODUCT_USE_UNITS) + { + $pdf->MultiCell($this->posxunit-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C'); + } + else + { + $pdf->MultiCell($this->posxdiscount-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C'); + } + } + + if($conf->global->PRODUCT_USE_UNITS) { + $pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height); + if (empty($hidetop)) { + $pdf->SetXY($this->posxunit - 1, $tab_top + 1); + $pdf->MultiCell($this->posxdiscount - $this->posxunit - 1, 2, $outputlangs->transnoentities("Unit"), '', + 'C'); + } } $pdf->line($this->posxdiscount-1, $tab_top, $this->posxdiscount-1, $tab_top + $tab_height); 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 ef34c1bf50b06..0089790f804cd 100644 --- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -103,11 +103,21 @@ function __construct($db) // Defini position des colonnes $this->posxdesc=$this->marge_gauche+1; - $this->posxtva=112; - $this->posxup=126; - $this->posxqty=145; $this->posxdiscount=162; $this->postotalht=174; + + if ($conf->global->PRODUCT_USE_UNITS) + { + $this->posxtva=99; + $this->posxup=114; + $this->posxqty=133; + $this->posxunit=150; + } else { + $this->posxtva=112; + $this->posxup=126; + $this->posxqty=145; + } + //if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) $this->posxtva=$this->posxup; $this->posxpicture=$this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH)?20:$conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images if ($this->page_largeur < 210) // To work with US executive format @@ -245,7 +255,7 @@ function write_file($object,$outputlangs='',$srctemplatepath='',$hidedetails=0,$ $this->atleastonediscount++; } } - if (empty($this->atleastonediscount)) + if (empty($this->atleastonediscount) && empty($conf->global->PRODUCT_USE_UNITS)) { $this->posxpicture+=($this->postotalht - $this->posxdiscount); $this->posxtva+=($this->postotalht - $this->posxdiscount); @@ -392,7 +402,23 @@ function write_file($object,$outputlangs='',$srctemplatepath='',$hidedetails=0,$ // Quantity $pdf->SetXY($this->posxqty, $curY); - $pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 3, $object->lines[$i]->qty, 0, 'R'); + // Enough for 6 chars + if($conf->global->PRODUCT_USE_UNITS) + { + $pdf->MultiCell($this->posxunit-$this->posxqty-0.8, 4, $object->lines[$i]->qty, 0, 'R'); + } + else + { + $pdf->MultiCell($this->posxdiscount-$this->posxqty-0.8, 4, $object->lines[$i]->qty, 0, 'R'); + } + + // Unit + if($conf->global->PRODUCT_USE_UNITS) + { + $unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager); + $pdf->SetXY($this->posxunit, $curY); + $pdf->MultiCell($this->posxdiscount-$this->posxunit-0.8, 4, $unit, 0, 'L'); + } // Discount on line $pdf->SetXY($this->posxdiscount, $curY); @@ -910,7 +936,23 @@ function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, if (empty($hidetop)) { $pdf->SetXY($this->posxqty-1, $tab_top+1); - $pdf->MultiCell($this->posxdiscount-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C'); + if($conf->global->PRODUCT_USE_UNITS) + { + $pdf->MultiCell($this->posxunit-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C'); + } + else + { + $pdf->MultiCell($this->posxdiscount-$this->posxqty-1,2, $outputlangs->transnoentities("Qty"),'','C'); + } + } + + if($conf->global->PRODUCT_USE_UNITS) { + $pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height); + if (empty($hidetop)) { + $pdf->SetXY($this->posxunit - 1, $tab_top + 1); + $pdf->MultiCell($this->posxdiscount - $this->posxunit - 1, 2, $outputlangs->transnoentities("Unit"), '', + 'C'); + } } $pdf->line($this->posxdiscount-1, $tab_top, $this->posxdiscount-1, $tab_top + $tab_height); diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php index f93595456d254..eb9c7521236e2 100644 --- a/htdocs/core/tpl/objectline_edit.tpl.php +++ b/htdocs/core/tpl/objectline_edit.tpl.php @@ -129,7 +129,6 @@ print '>'; } ?> - info_bits & 2) != 2) { // I comment this because it shows info even when not required diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 3b6de2109280e..ddddcf059a3cd 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -247,6 +247,7 @@ function fetch($id,$ref='') $sql.= " l.localtax1_tx, l. localtax2_tx, l.total_localtax1, l.total_localtax2,"; $sql.= " l.total_ht, l.total_tva, l.total_ttc, l.special_code, l.fk_parent_line, l.rang,"; $sql.= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.description as product_desc,"; + $sql.= " l.fk_unit,"; $sql.= " l.date_start, l.date_end"; $sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as l"; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid'; @@ -297,9 +298,10 @@ function fetch($id,$ref='') $line->date_start = $this->db->jdate($objp->date_start); $line->date_end = $this->db->jdate($objp->date_end); + $line->fk_unit = $objp->fk_unit; - $this->special_line = $objp->special_line; - $this->fk_parent_line = $objp->fk_parent_line; + $this->special_line = $objp->special_line; + $this->fk_parent_line = $objp->fk_parent_line; $this->rang = $objp->rang; @@ -1196,13 +1198,14 @@ function createFromClone() * @param int $date_start Date start of service * @param int $date_end Date end of service * @param array $array_options extrafields array + * @param int $fk_unit Id of the unit to use. Null to use the default one * @return int <=0 if KO, >0 if OK */ - function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0, $fk_product=0, $fk_prod_fourn_price=0, $fourn_ref='', $remise_percent=0.0, $price_base_type='HT', $pu_ttc=0.0, $type=0, $info_bits=0, $notrigger=false, $date_start=null, $date_end=null, $array_options=0) + function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0, $fk_product=0, $fk_prod_fourn_price=0, $fourn_ref='', $remise_percent=0.0, $price_base_type='HT', $pu_ttc=0.0, $type=0, $info_bits=0, $notrigger=false, $date_start=null, $date_end=null, $array_options=0, $fk_unit = null) { global $langs,$mysoc; - dol_syslog(get_class($this)."::addline $desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2. $fk_product, $fk_prod_fourn_price, $fourn_ref, $remise_percent, $price_base_type, $pu_ttc, $type"); + dol_syslog(get_class($this)."::addline $desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2. $fk_product, $fk_prod_fourn_price, $fourn_ref, $remise_percent, $price_base_type, $pu_ttc, $type, $fk_unit"); include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; // Clean parameters @@ -1305,7 +1308,7 @@ function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0 $sql.= " (fk_commande, label, description, date_start, date_end,"; $sql.= " fk_product, product_type,"; $sql.= " qty, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, remise_percent, subprice, ref,"; - $sql.= " total_ht, total_tva, total_localtax1, total_localtax2, total_ttc"; + $sql.= " total_ht, total_tva, total_localtax1, total_localtax2, total_ttc, fk_unit"; $sql.= ")"; $sql.= " VALUES (".$this->id.", '" . $this->db->escape($label) . "','" . $this->db->escape($desc) . "',"; $sql.= " ".($date_start?"'".$this->db->idate($date_start)."'":"null").","; @@ -1323,7 +1326,8 @@ function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0 $sql.= "'".price2num($total_tva)."',"; $sql.= "'".price2num($total_localtax1)."',"; $sql.= "'".price2num($total_localtax2)."',"; - $sql.= "'".price2num($total_ttc)."'"; + $sql.= "'".price2num($total_ttc)."',"; + $sql.= (!$fk_unit ? 'NULL' : $fk_unit); $sql.= ")"; dol_syslog(get_class($this)."::addline", LOG_DEBUG); @@ -1989,12 +1993,13 @@ function setStatus($user,$status) * @param timestamp $date_start Date start of service * @param timestamp $date_end Date end of service * @param array $array_options extrafields array + * @param int $fk_unit Id of the unit to use. Null to use the default one * @return int < 0 if error, > 0 if ok */ - function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type=0, $notrigger=false, $date_start='', $date_end='', $array_options=0) + function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type=0, $notrigger=false, $date_start='', $date_end='', $array_options=0, $fk_unit = null) { global $mysoc; - dol_syslog(get_class($this)."::updateline $rowid, $desc, $pu, $qty, $remise_percent, $txtva, $price_base_type, $info_bits, $type"); + dol_syslog(get_class($this)."::updateline $rowid, $desc, $pu, $qty, $remise_percent, $txtva, $price_base_type, $info_bits, $type, $fk_unit"); include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; if ($this->brouillon) @@ -2061,6 +2066,7 @@ function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocalt $sql.= ",total_localtax2='".price2num($total_localtax2)."'"; $sql.= ",total_ttc='".price2num($total_ttc)."'"; $sql.= ",product_type=".$type; + $sql.= ",fk_unit=".(!$fk_unit ? 'NULL' : $fk_unit); $sql.= " WHERE rowid = ".$rowid; dol_syslog(get_class($this)."::updateline", LOG_DEBUG); @@ -2493,7 +2499,7 @@ function fetch($rowid) $sql.= ' cd.info_bits, cd.total_ht, cd.total_tva, cd.total_ttc,'; $sql.= ' cd.total_localtax1, cd.total_localtax2,'; $sql.= ' p.ref as product_ref, p.label as product_libelle, p.description as product_desc,'; - $sql.= ' cd.date_start, cd.date_end'; + $sql.= ' cd.date_start, cd.date_end, cd.fk_unit'; $sql.= ' FROM '.MAIN_DB_PREFIX.'commande_fournisseurdet as cd'; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON cd.fk_product = p.rowid'; $sql.= ' WHERE cd.rowid = '.$rowid; @@ -2526,6 +2532,7 @@ function fetch($rowid) $this->date_start = $this->db->jdate($objp->date_start); $this->date_end = $this->db->jdate($objp->date_end); + $this->fk_unit = $objp->fk_unit; $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 59ea554468140..dd4e5f598d26f 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -480,7 +480,7 @@ 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.= ', 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.= ', 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, f.fk_unit'; $sql.= ', p.rowid as product_id, p.ref as product_ref, p.label as label, p.description as product_desc'; $sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn_det as f'; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON f.fk_product = p.rowid'; @@ -531,6 +531,7 @@ function fetch_lines() $this->lines[$i]->fk_parent_line = $obj->fk_parent_line; $this->lines[$i]->special_code = $obj->special_code; $this->lines[$i]->rang = $obj->rang; + $this->lines[$i]->fk_unit = $obj->fk_unit; $i++; } @@ -1117,13 +1118,14 @@ function set_draft($user, $idwarehouse=-1) * @param int $rang Position of line * @param int $notrigger Disable triggers * @param array $array_options extrafields array + * @param int $fk_unit Id of the unit to use. Null to use the default one * @return int >0 if OK, <0 if KO * * FIXME Add field ref (that should be named ref_supplier) and label into update. For example can be filled when product line created from order. */ - function addline($desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0, $rang=-1, $notrigger=false, $array_options=0) + function addline($desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0, $rang=-1, $notrigger=false, $array_options=0, $fk_unit = null) { - dol_syslog(get_class($this)."::addline $desc,$pu,$qty,$txtva,$fk_product,$remise_percent,$date_start,$date_end,$ventil,$info_bits,$price_base_type,$type", LOG_DEBUG); + dol_syslog(get_class($this)."::addline $desc,$pu,$qty,$txtva,$fk_product,$remise_percent,$date_start,$date_end,$ventil,$info_bits,$price_base_type,$type,$fk_unit", LOG_DEBUG); include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; // Clean parameters @@ -1158,7 +1160,7 @@ function addline($desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_produ { $idligne = $this->db->last_insert_id(MAIN_DB_PREFIX.'facture_fourn_det'); - $result=$this->updateline($idligne, $desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_product, $price_base_type, $info_bits, $type, $remise_percent, true, '', '', $array_options); + $result=$this->updateline($idligne, $desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_product, $price_base_type, $info_bits, $type, $remise_percent, true, '', '', $array_options, $fk_unit); if ($result > 0) { $this->rowid = $idligne; @@ -1213,12 +1215,13 @@ function addline($desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_produ * @param timestamp $date_start Date start of service * @param timestamp $date_end Date end of service * @param array $array_options extrafields array + * @param int $fk_unit Id of the unit to use. Null to use the default one * @return int <0 if KO, >0 if OK */ - function updateline($id, $desc, $pu, $vatrate, $txlocaltax1=0, $txlocaltax2=0, $qty=1, $idproduct=0, $price_base_type='HT', $info_bits=0, $type=0, $remise_percent=0, $notrigger=false, $date_start='', $date_end='', $array_options=0) + function updateline($id, $desc, $pu, $vatrate, $txlocaltax1=0, $txlocaltax2=0, $qty=1, $idproduct=0, $price_base_type='HT', $info_bits=0, $type=0, $remise_percent=0, $notrigger=false, $date_start='', $date_end='', $array_options=0, $fk_unit = null) { global $mysoc; - dol_syslog(get_class($this)."::updateline $id,$desc,$pu,$vatrate,$qty,$idproduct,$price_base_type,$info_bits,$type,$remise_percent", LOG_DEBUG); + dol_syslog(get_class($this)."::updateline $id,$desc,$pu,$vatrate,$qty,$idproduct,$price_base_type,$info_bits,$type,$remise_percent,$fk_unit", LOG_DEBUG); include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; $pu = price2num($pu); @@ -1288,6 +1291,7 @@ function updateline($id, $desc, $pu, $vatrate, $txlocaltax1=0, $txlocaltax2=0, $ else $sql.= ", fk_product = null"; $sql.= ", product_type = ".$product_type; $sql.= ", info_bits = ".$info_bits; + $sql .= ", fk_unit=".(!$fk_unit ? 'NULL' : $fk_unit); $sql.= " WHERE rowid = ".$id; dol_syslog(get_class($this)."::updateline", LOG_DEBUG); @@ -1877,7 +1881,7 @@ public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id) /** * Class to manage line invoices */ -class SupplierInvoiceLine extends CommonInvoice +class SupplierInvoiceLine extends CommonObjectLine { public $element='facture_fourn_det'; public $table_element='facture_fourn_det'; diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index fe6751c28f2fb..113758b7ee9e4 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -347,7 +347,8 @@ '', $date_start, $date_end, - $array_options + $array_options, + $productsupplier->fk_unit ); } if ($idprod == -99 || $idprod == 0) @@ -375,6 +376,12 @@ $desc = $product_desc; $type = GETPOST('type'); + $fk_unit= GETPOST('units', 'int'); + + if ($fk_unit <= 0) { + $fk_unit = null; + } + $tva_tx = price2num($tva_tx); // When vat is text input field // Local Taxes @@ -385,15 +392,16 @@ { $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, $array_options); + $ttc = 0; } 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, $array_options); } + + $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, $array_options, $fk_unit); } //print "xx".$tva_tx; exit; @@ -513,7 +521,8 @@ false, $date_start, $date_end, - $array_options + $array_options, + $_POST['units'] ); unset($_POST['qty']); unset($_POST['type']); @@ -525,6 +534,7 @@ unset($_POST['tva_tx']); unset($_POST['date_start']); unset($_POST['date_end']); + unset($_POST['units']); unset($localtax1_tx); unset($localtax2_tx); @@ -989,7 +999,9 @@ '', '', null, - null + null, + array(), + $lines[$i]->fk_unit ); if ($result < 0) { diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php index 6cd0dfb02c224..d35d318d4a20a 100644 --- a/htdocs/fourn/commande/orderstoinvoice.php +++ b/htdocs/fourn/commande/orderstoinvoice.php @@ -207,7 +207,7 @@ $fk_parent_line = 0; } // FIXME Missing $lines[$i]->ref_supplier and $lines[$i]->label into addline and updateline methods. They are filled when coming from order for example. - $result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->qty, $lines[$i]->fk_product, $lines[$i]->remise_percent, $date_start, $date_end, 0, $lines[$i]->info_bits, 'HT', $product_type); + $result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->qty, $lines[$i]->fk_product, $lines[$i]->remise_percent, $date_start, $date_end, 0, $lines[$i]->info_bits, 'HT', $product_type, -1, false, 0, $lines[$i]->fk_unit); if ($result > 0) { $lineid = $result; diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index 4c401c2c540eb..edac67e3fbfce 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -444,7 +444,8 @@ $product_type, $lines[$i]->rang, 1, - $lines[$i]->array_options + $lines[$i]->array_options, + $lines[$i]->fk_unit ); if ($result < 0) @@ -587,7 +588,7 @@ } } - $result=$object->updateline(GETPOST('lineid'), $label, $up, $tva_tx, $localtax1_tx, $localtax2_tx, GETPOST('qty'), GETPOST('productid'), $price_base_type, 0, $type, $remise_percent, 0, $date_start, $date_end, $array_options); + $result=$object->updateline(GETPOST('lineid'), $label, $up, $tva_tx, $localtax1_tx, $localtax2_tx, GETPOST('qty'), GETPOST('productid'), $price_base_type, 0, $type, $remise_percent, 0, $date_start, $date_end, $array_options, $_POST['units']); if ($result >= 0) { unset($_POST['label']); @@ -684,6 +685,7 @@ $idprod=$productsupplier->get_buyprice(GETPOST('idprodfournprice'), $qty); // Just to see if a price exists for the quantity. Not used to found vat. } + //Replaces $fk_unit with the product's if ($idprod > 0) { $result=$productsupplier->fetch($idprod); @@ -703,7 +705,7 @@ $price_base_type = 'HT'; // TODO Save the product supplier ref into database into field ref_supplier (must rename field ref into ref_supplier first) - $result=$object->addline($desc, $productsupplier->fourn_pu, $tvatx, $localtax1_tx, $localtax2_tx, $qty, $idprod, $remise_percent, '', '', 0, $npr, $price_base_type, $type, -1, 0, $array_options); + $result=$object->addline($desc, $productsupplier->fourn_pu, $tvatx, $localtax1_tx, $localtax2_tx, $qty, $idprod, $remise_percent, '', '', 0, $npr, $price_base_type, $type, -1, 0, $array_options, $productsupplier->fk_unit); } if ($idprod == -2 || $idprod == 0) { @@ -730,6 +732,12 @@ $desc = $product_desc; $type = GETPOST('type'); + $fk_unit= GETPOST('units', 'int'); + + if ($fk_unit <= 0) { + $fk_unit = null; + } + $tva_tx = price2num($tva_tx); // When vat is text input field // Local Taxes @@ -740,18 +748,15 @@ { $ht = price2num($_POST['price_ht']); $price_base_type = 'HT'; - - //print $product_desc, $pu, $txtva, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0 - $result=$object->addline($product_desc, $ht, $tva_tx, $localtax1_tx, $localtax2_tx, $qty, 0, $remise_percent, $datestart, $dateend, 0, $npr, $price_base_type, $type, -1, 0, $array_options); } else { $ttc = price2num($_POST['price_ttc']); $ht = $ttc / (1 + ($tva_tx / 100)); $price_base_type = 'HT'; - //print $product_desc, $pu, $txtva, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0 - $result=$object->addline($product_desc, $ht, $tva_tx,$localtax1_tx, $localtax2_tx, $qty, 0, $remise_percent, $datestart, $dateend, 0, $npr, $price_base_type, $type, -1, 0, $array_options); } + + $result=$object->addline($product_desc, $ht, $tva_tx, $localtax1_tx, $localtax2_tx, $qty, 0, $remise_percent, $datestart, $dateend, 0, $npr, $price_base_type, $type, -1, 0, $array_options, $fk_unit); } //print "xx".$tva_tx; exit; @@ -793,6 +798,7 @@ unset($_POST['np_markRate']); unset($_POST['dp_desc']); unset($_POST['idprodfournprice']); + unset($_POST['units']); unset($_POST['date_starthour']); unset($_POST['date_startmin']); 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 586ee98150d61..68f918d76052b 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 @@ -576,4 +576,10 @@ alter table llx_commandedet add fk_unit integer default NULL; ALTER TABLE llx_commandedet ADD CONSTRAINT fk_commandedet_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid); alter table llx_contratdet add fk_unit integer default NULL; -ALTER TABLE llx_contratdet ADD CONSTRAINT fk_contratdet_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid); \ No newline at end of file +ALTER TABLE llx_contratdet ADD CONSTRAINT fk_contratdet_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid); + +alter table llx_commande_fournisseurdet add fk_unit integer default NULL; +ALTER TABLE llx_commande_fournisseurdet ADD CONSTRAINT fk_commande_fournisseurdet_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid); + +alter table llx_facture_fourn_det add fk_unit integer default NULL; +ALTER TABLE llx_facture_fourn_det ADD CONSTRAINT fk_facture_fourn_det_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid); \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql index 33588d8bf662d..3b1dee31b9efe 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql @@ -66,5 +66,5 @@ create table llx_commande_fournisseur location_incoterms varchar(255), -- for incoterms import_key varchar(14), extraparams varchar(255) -- for stock other parameters with json format - + )ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.key.sql new file mode 100644 index 0000000000000..99d953ec17ccf --- /dev/null +++ b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.key.sql @@ -0,0 +1,19 @@ +-- ============================================================================ +-- 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 +-- 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 . +-- +-- ============================================================================ + +ALTER TABLE llx_commande_fournisseurdet ADD CONSTRAINT fk_commande_fournisseurdet_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid); \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql index cb2ec4882728d..a3dbd87d3595a 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseurdet.sql @@ -2,6 +2,7 @@ -- Copyright (C) 2007 Rodolphe Quiedeville -- Copyright (C) 2007-2009 Laurent Destailleur -- Copyright (C) 2010-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 @@ -47,5 +48,6 @@ create table llx_commande_fournisseurdet info_bits integer DEFAULT 0, -- TVA NPR ou non special_code integer DEFAULT 0, -- code pour les lignes speciales rang integer DEFAULT 0, - import_key varchar(14) + import_key varchar(14), + fk_unit integer DEFAULT NULL )ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql index 907f09360a13b..2048cf0602411 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.key.sql @@ -22,3 +22,4 @@ ALTER TABLE llx_facture_fourn_det ADD INDEX idx_facture_fourn_det_fk_facture (fk_facture_fourn); ALTER TABLE llx_facture_fourn_det ADD CONSTRAINT fk_facture_fourn_det_fk_facture FOREIGN KEY (fk_facture_fourn) REFERENCES llx_facture_fourn (rowid); +ALTER TABLE llx_facture_fourn_det ADD CONSTRAINT fk_facture_fourn_det_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid); \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql index 3985d0d348306..ad066752ea0d4 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn_det.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn_det.sql @@ -48,5 +48,6 @@ create table llx_facture_fourn_det fk_code_ventilation integer DEFAULT 0 NOT NULL, special_code integer DEFAULT 0, -- code pour les lignes speciales rang integer DEFAULT 0, - import_key varchar(14) + import_key varchar(14), + fk_unit integer DEFAULT NULL )ENGINE=innodb; diff --git a/htdocs/product/card.php b/htdocs/product/card.php index 475be8fdf79fd..eaef488dac3f9 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -244,6 +244,7 @@ $object->volume_units = GETPOST('volume_units'); $object->finished = GETPOST('finished'); $object->hidden = GETPOST('hidden')=='yes'?1:0; + $object->fk_unit = GETPOST('units'); if ($fk_unit > 0) { $object->fk_unit = $fk_unit; } From 28b89a2decd3bf76f2935dc488ebd90153ed2594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Sun, 19 Apr 2015 18:58:56 +0200 Subject: [PATCH 028/264] Fix [ bug #1786 ] Spanish localtax2 calculation errors with corrective invoices --- htdocs/compta/facture/class/facture.class.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 83210476a13f1..ddd31a18aaabf 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -2201,9 +2201,9 @@ function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $f $this->line->info_bits=$info_bits; $this->line->fk_remise_except=$fk_remise_except; $this->line->total_ht= (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_ht):$total_ht); // For credit note and if qty is negative, total is negative - $this->line->total_tva= (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_tva):$total_tva); - $this->line->total_localtax1=(($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_localtax1):$total_localtax1); - $this->line->total_localtax2=(($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_localtax2):$total_localtax2); + $this->line->total_tva= $total_tva; + $this->line->total_localtax1=$total_localtax1; + $this->line->total_localtax2=$total_localtax2; $this->line->localtax1_type = $localtaxes_type[0]; $this->line->localtax2_type = $localtaxes_type[2]; $this->line->total_ttc= (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_ttc):$total_ttc); @@ -2354,9 +2354,9 @@ function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $dat $this->line->date_start = $date_start; $this->line->date_end = $date_end; $this->line->total_ht = (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_ht):$total_ht); // For credit note and if qty is negative, total is negative - $this->line->total_tva = (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_tva):$total_tva); - $this->line->total_localtax1 = (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_localtax1):$total_localtax1); - $this->line->total_localtax2 = (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_localtax2):$total_localtax2); + $this->line->total_tva = $total_tva; + $this->line->total_localtax1 = $total_localtax1; + $this->line->total_localtax2 = $total_localtax2; $this->line->total_ttc = (($this->type==self::TYPE_CREDIT_NOTE||$qty<0)?-abs($total_ttc):$total_ttc); $this->line->info_bits = $info_bits; $this->line->special_code = $special_code; From ad5dd8e70f559205a80e5cb5fbb6131011ec89da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Mon, 20 Apr 2015 01:36:48 +0200 Subject: [PATCH 029/264] [ bug #1897 ] PHP Fatal error when editing Margin module settings with USER_UPDATE_SESSION trigger turned on --- ChangeLog | 1 + htdocs/main.inc.php | 22 +++++++++------------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7e2babf155f93..10796fa9f342d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -178,6 +178,7 @@ Dolibarr better: - A lot of pages called liste.php were renamed into list.php - If you used warehouse/stock module, recheck setup of stock increase/decrease rules of the warehouse module and your Point Of Sale module if you use one. +- Replaced USER_UPDATE_SESSION trigger with an updateSession hook ***** ChangeLog for 3.6.3 compared to 3.6.2 ***** - Fix: ref_ext was not saved when recording a customer order from web service diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index a85959cb93574..17395fd3de9b9 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -9,7 +9,7 @@ * Copyright (C) 2008 Matteli * Copyright (C) 2011-2013 Juanjo Menent * Copyright (C) 2012 Christophe Battarel - * Copyright (C) 2014 Marcos García + * Copyright (C) 2014-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 @@ -575,18 +575,14 @@ function analyse_sql_and_script(&$var, $type) } else { - if (! empty($conf->global->MAIN_ACTIVATE_UPDATESESSIONTRIGGER)) // We do not execute such trigger at each page load by default (triggers are time consuming) - { - // TODO We should use a hook here, not a trigger. - // Call triggers - include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; - $interface=new Interfaces($db); - $result=$interface->run_triggers('USER_UPDATE_SESSION',$user,$user,$langs,$conf); - if ($result < 0) { - $error++; - } - // End call triggers - } + // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array + $hookmanager->initHooks(array('main')); + + $action = ''; + $reshook = $hookmanager->executeHooks('updateSession', array(), $user, $action); + if ($reshook < 0) { + setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); + } } } From f2d05ce75473266eab98889ba512c0042f312a69 Mon Sep 17 00:00:00 2001 From: jfefe Date: Mon, 20 Apr 2015 16:20:04 +0200 Subject: [PATCH 030/264] Add missing value for object line type (product or service) --- htdocs/core/class/commondocgenerator.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php index bf11c4fea13f2..22a33f4d2a8f0 100644 --- a/htdocs/core/class/commondocgenerator.class.php +++ b/htdocs/core/class/commondocgenerator.class.php @@ -408,6 +408,7 @@ function get_substitutionarray_lines($line,$outputlangs) 'line_fulldesc'=>doc_getlinedesc($line,$outputlangs), 'line_product_ref'=>$line->product_ref, 'line_product_label'=>$line->product_label, + 'line_product_type'=>$line->product_type, 'line_desc'=>$line->desc, 'line_vatrate'=>vatrate($line->tva_tx,true,$line->info_bits), 'line_up'=>price2num($line->subprice), From 9f899c93ef4217a72191ab0d5e7977ad8d9af3c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Mon, 20 Apr 2015 17:11:09 +0200 Subject: [PATCH 031/264] Update .travis.yml --- .travis.yml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b5d73fc763f27..14b55443c26b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,7 +66,24 @@ before_script: - sh -c "if [ '$PHPV' = '5.4' ]; then echo 'zend_extension_ts = xdebug.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi" - cat ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - echo Mysql version + # INSTALL MYSQL 5.6 + # (https://github.com/piwik/piwik/commit/20bd2e1c24e5d673dce3feb256204ad48c29f160) + # TODO: Remove when mysql 5.6 is provided by travis. + # Otherwise, our migrations will raise a syntax error. + - "sudo apt-get remove mysql-common mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5 mysql-client-core-5.5" + - "sudo apt-get autoremove" + - "sudo apt-get install libaio1" + - "wget -O mysql-5.6.14.deb http://dev.mysql.com/get/Downloads/MySQL-5.6/mysql-5.6.14-debian6.0-x86_64.deb/from/http://cdn.mysql.com/" + - "sudo dpkg -i mysql-5.6.14.deb" + - "sudo cp /opt/mysql/server-5.6/support-files/mysql.server /etc/init.d/mysql.server" + - "sudo ln -s /opt/mysql/server-5.6/bin/* /usr/bin/" + - "sudo sed -i'' 's/table_cache/table_open_cache/' /etc/mysql/my.cnf" + - "sudo sed -i'' 's/log_slow_queries/slow_query_log/' /etc/mysql/my.cnf" + - "sudo sed -i'' 's/basedir[^=]\\+=.*$/basedir = \\/opt\\/mysql\\/server-5.6/' /etc/mysql/my.cnf" + - "sudo /etc/init.d/mysql.server start" - mysql --version + - mysql -e "SELECT VERSION();" + # /END MYSQL 5.6- mysql --version - echo Init database - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS myapp_test;' -U postgres; fi" - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'CREATE DATABASE myapp_test;' -U postgres; fi" @@ -90,7 +107,6 @@ before_script: - echo Install apache server - sudo apt-get update - sudo apt-get install -y --force-yes apache2 libapache2-mod-php5 php5-curl php5-mysql php5-pgsql php5-intl - - sudo apt-get install mysql-server-5.6 mysql-client-5.6 - sudo sed -i -e "s,/var/www,$(pwd)/htdocs,g" /etc/apache2/sites-available/default - echo Show default virtual host - sudo cat /etc/apache2/sites-available/default From 7a4d1d990e47e5969eb2e3e289ee7e1b6e86d6fe Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 21 Apr 2015 11:41:21 +0200 Subject: [PATCH 032/264] Fix security hole --- htdocs/filefunc.inc.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 13b2d8d1669bd..a5fdcbd24d367 100644 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -67,12 +67,15 @@ //$conffile = "/etc/dolibarr/conf.php"; //$conffiletoshow = "/etc/dolibarr/conf.php"; -//replace conf filename with "conf" parameter on url by GET -if (!empty($_GET['conf'])) { - setcookie('dolconf', $_GET['conf'],0,'/'); - $conffile = 'conf/' . $_GET['conf'] . '.php'; +// Replace conf filename with "conf" parameter on url by GET +if (! empty($_GET['conf'])) +{ + $confname=basename($_GET['conf']); + setcookie('dolconf', $confname, 0, '/'); + $conffile = 'conf/'.$confname.'.php'; } else { - $conffile = 'conf/' . (!empty($_COOKIE['dolconf']) ? $_COOKIE['dolconf'] : 'conf') . '.php'; + $confname=basename(empty($_COOKIE['dolconf']) ? 'conf' : $_COOKIE['dolconf']); + $conffile = 'conf/'.$confname.'.php'; } From 5a9c40eb5916f64e54f4b0466025b92eff8c730a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 21 Apr 2015 12:03:51 +0200 Subject: [PATCH 033/264] Fix minor look and security errors --- htdocs/comm/propal.php | 24 ++++++++++++------------ htdocs/filefunc.inc.php | 2 ++ htdocs/theme/eldy/style.css.php | 4 ++-- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index c5cd570c24174..856f39c2c587b 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -1374,7 +1374,7 @@ $absolute_discount = $soc->getAvailableDiscounts(); print '. '; if ($absolute_discount) - print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->trans("Currency" . $conf->currency)); + print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount, 0, $langs, 1, -1, -1, $conf->currency)); else print $langs->trans("CompanyHasNoAbsoluteDiscount"); print '.'; @@ -1516,18 +1516,18 @@ $newclassname = 'Intervention'; print '' . $langs->trans($newclassname) . '' . $objectsrc->getNomUrl(1) . ''; - print '' . $langs->trans('TotalHT') . '' . price($objectsrc->total_ht) . ''; - print '' . $langs->trans('TotalVAT') . '' . price($objectsrc->total_tva) . ""; + print '' . $langs->trans('TotalHT') . '' . price($objectsrc->total_ht, 0, $langs, 1, -1, -1, $conf->currency) . ''; + print '' . $langs->trans('TotalVAT') . '' . price($objectsrc->total_tva, 0, $langs, 1, -1, -1, $conf->currency) . ""; if ($mysoc->localtax1_assuj == "1" || $objectsrc->total_localtax1 != 0 ) // Localtax1 { - print '' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '' . price($objectsrc->total_localtax1) . ""; + print '' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '' . price($objectsrc->total_localtax1, 0, $langs, 1, -1, -1, $conf->currency) . ""; } if ($mysoc->localtax2_assuj == "1" || $objectsrc->total_localtax2 != 0) // Localtax2 { - print '' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '' . price($objectsrc->total_localtax2) . ""; + print '' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '' . price($objectsrc->total_localtax2, 0, $langs, 1, -1, -1, $conf->currency) . ""; } - print '' . $langs->trans('TotalTTC') . '' . price($objectsrc->total_ttc) . ""; + print '' . $langs->trans('TotalTTC') . '' . price($objectsrc->total_ttc, 0, $langs, 1, -1, -1, $conf->currency) . ""; } print "\n"; @@ -1990,7 +1990,7 @@ print $langs->trans('OutstandingBill'); print ''; print price($soc->get_OutstandingBill()) . ' / '; - print price($soc->outstanding_limit, 0, '', 1, - 1, - 1, $conf->currency); + print price($soc->outstanding_limit, 0, $langs, 1, - 1, - 1, $conf->currency); print ''; print ''; } @@ -2044,7 +2044,7 @@ // Amount HT print '' . $langs->trans('AmountHT') . ''; - print '' . price($object->total_ht, '', $langs, 0, - 1, - 1, $conf->currency) . ''; + print '' . price($object->total_ht, '', $langs, 0, - 1, - 1, $conf->currency) . ''; // Margin Infos if (! empty($conf->margin->enabled)) { @@ -2056,26 +2056,26 @@ // Amount VAT print '' . $langs->trans('AmountVAT') . ''; - print '' . price($object->total_tva, '', $langs, 0, - 1, - 1, $conf->currency) . ''; + print '' . price($object->total_tva, '', $langs, 0, - 1, - 1, $conf->currency) . ''; print ''; // 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, '', $langs, 0, - 1, - 1, $conf->currency) . ''; + print '' . price($object->total_localtax1, '', $langs, 0, - 1, - 1, $conf->currency) . ''; print ''; } if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) // Localtax2 { print '' . $langs->transcountry("AmountLT2", $mysoc->country_code) . ''; - print '' . price($object->total_localtax2, '', $langs, 0, - 1, - 1, $conf->currency) . ''; + print '' . price($object->total_localtax2, '', $langs, 0, - 1, - 1, $conf->currency) . ''; print ''; } // Amount TTC print '' . $langs->trans('AmountTTC') . ''; - print '' . price($object->total_ttc, '', $langs, 0, - 1, - 1, $conf->currency) . ''; + print '' . price($object->total_ttc, '', $langs, 0, - 1, - 1, $conf->currency) . ''; print ''; // Statut diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index a5fdcbd24d367..7dfc7ef1e7188 100644 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -84,6 +84,8 @@ if (! $result && ! empty($_SERVER["GATEWAY_INTERFACE"])) // If install not done and we are in a web session { + // Note: If calling page was not into htdocs (index.php, ...), then this redirect will fails. + // There is no real solution, because the only way to know the apache url relative path is to have into conf file. header("Location: install/index.php"); exit; } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 2d9f51bb2aa91..8ab891d388d23 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1796,11 +1796,11 @@ } table.nobordernopadding tr { border: 0px !important; - padding: 0px 0px; + padding: 0px 0px !important; } table.nobordernopadding td { border: 0px !important; - padding: 0px 0px; + padding: 0px 0px !important; } /* For lists */ From a69027606057913c9035218aff700dbd88f8248a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 21 Apr 2015 12:08:36 +0200 Subject: [PATCH 034/264] Fix js warnings, select2 css was not loaded. --- htdocs/core/class/conf.class.php | 2 +- htdocs/main.inc.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index ef0bef87c4b84..6370062a6a9dc 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -448,7 +448,7 @@ function setValues($db) 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($this->global->MAIN_USE_JQUERY_MULTISELECT)) $this->global->MAIN_USE_JQUERY_MULTISELECT='select2.min'; + 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; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index d0b80db119030..4ae94b276fa00 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1189,10 +1189,10 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs print ''."\n"; print ''."\n"; } - if (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')) // jQuery plugin "mutiselect", "multiple-select", "select2"... + if (! empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')) // jQuery plugin "mutiselect", "multiple-select", "select2", ... { $tmpplugin=empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)?constant('REQUIRE_JQUERY_MULTISELECT'):$conf->global->MAIN_USE_JQUERY_MULTISELECT; - print ''."\n"; + print ''."\n"; } // jQuery jMobile if (! empty($conf->global->MAIN_USE_JQUERY_JMOBILE) || defined('REQUIRE_JQUERY_JMOBILE') || (! empty($conf->dol_use_jmobile) && $conf->dol_use_jmobile > 0)) From d5e40057e7bf7949a30cd137dda1c0b5a0a73b84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Tue, 21 Apr 2015 14:29:16 +0200 Subject: [PATCH 035/264] Added a mailmap for better git statistics --- .mailmap | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 .mailmap diff --git a/.mailmap b/.mailmap new file mode 100644 index 0000000000000..5452dfd7eced6 --- /dev/null +++ b/.mailmap @@ -0,0 +1,49 @@ +Laurent Destailleur Laurent Destailleur +Laurent Destailleur eldy +Laurent Destailleur Laurent Destailleur +Laurent Destailleur eldy10 +Laurent Destailleur Laurent Destailleur +Regis Houssin Regis Houssin +Regis Houssin Régis Houssin +Juanjo Menent simnandez +Juanjo Menent Juanjo Menent +Juanjo Menent Simnandez +Juanjo Menent juanjo +Juanjo Menent juanjo +Marcos García de La Fuente Marcos García +Marcos García de La Fuente Marcos García +Florian Henry fhenry +Florian Henry Florian HENRY +Florian Henry FHenry +Florian Henry Florian HENRY +Florian Henry FHenry +Florian Henry HENRY Florian +Alexandre Spangaro aspangaro +Alexandre Spangaro Spangaro Alexandre +Alexandre Spangaro Alexandre SPANGARO +Raphaël Doursenaud Raphaël Doursenaud +Philippe Grand Grand Philippe +Philippe Grand Philippe GRAND +Philippe Grand philippe grand +Philippe Grand philippe +Philippe Grand unknown +Philippe Grand philippe +Philippe Grand Philippe Grand +Jean-François Ferry jfefe +Jean-François Ferry jfefe +Jean-François Ferry JF FERRY +Jean-François Ferry JF FERRY +Charles Benke BENKE Charles +Charles Benke BENKE Charlie +Charles Benke defrance69 +Maxime Kohlhaas MAxime Kohlhaas +Frédéric France Frédéric FRANCE +Frédéric France frederic34 +Frédéric France FRANCE Frédéric +Frédéric France frederic34 +Cyrille de Lambert cdelambert +Cédric Gross KreizIT +Cédric Gross Cedric +Cédric Gross Cedric GROSS +Jean Heimburger jean +Jean Heimburger tiaris From 96a33bbe8adcb8c1a2fdade61804e5c9d27cb316 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 21 Apr 2015 15:49:58 +0200 Subject: [PATCH 036/264] First clean of code after devcamp --- .travis.yml | 4 +-- htdocs/comm/propal.php | 6 +--- htdocs/comm/propal/class/propal.class.php | 10 +++--- htdocs/commande/card.php | 6 +--- htdocs/commande/class/commande.class.php | 8 ++--- htdocs/compta/facture.php | 6 +--- .../facture/class/facture-rec.class.php | 13 +++---- htdocs/compta/facture/class/facture.class.php | 6 ++-- htdocs/compta/facture/fiche-rec.php | 4 +-- htdocs/contrat/card.php | 34 ++++++++----------- htdocs/contrat/class/contrat.class.php | 10 +++--- htdocs/core/class/commonobject.class.php | 2 +- htdocs/core/class/commonobjectline.class.php | 12 +++---- htdocs/core/class/html.form.class.php | 34 +++++++------------ htdocs/core/lib/pdf.lib.php | 2 +- htdocs/core/tpl/objectline_create.tpl.php | 2 +- htdocs/core/tpl/objectline_edit.tpl.php | 2 +- htdocs/core/tpl/objectline_view.tpl.php | 2 +- .../class/fournisseur.commande.class.php | 14 ++++---- .../fourn/class/fournisseur.facture.class.php | 8 ++--- htdocs/fourn/commande/card.php | 6 +--- htdocs/fourn/facture/card.php | 6 +--- .../install/mysql/tables/llx_c_units.key.sql | 2 +- htdocs/product/card.php | 29 +++++++--------- htdocs/product/class/product.class.php | 8 ++--- 25 files changed, 100 insertions(+), 136 deletions(-) diff --git a/.travis.yml b/.travis.yml index 14b55443c26b4..5bc5f49b2e530 100644 --- a/.travis.yml +++ b/.travis.yml @@ -128,9 +128,9 @@ script: - php upgrade.php 3.6.0 3.7.0 ignoredbversion > upgrade360370.log - php upgrade2.php 3.6.0 3.7.0 ignoredbversion > upgrade360370-2.log - php upgrade.php 3.7.0 3.8.0 ignoredbversion > upgrade370380.log - - cat upgrade370380.log +# - cat upgrade370380.log - php upgrade2.php 3.7.0 3.8.0 ignoredbversion > upgrade370380-2.log - - cat upgrade370380-2.log +# - cat upgrade370380-2.log - cd ../.. - date - phpunit -d memory_limit=-1 --configuration test/phpunit/phpunittest.xml test/phpunit/AllTests.php diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 4dbcd43c3322f..c4ef27645d473 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -846,11 +846,7 @@ $desc = $product_desc; $type = GETPOST('type'); - $fk_unit = GETPOST('units', 'int'); - - if ($fk_unit <= 0) { - $fk_unit = null; - } + $fk_unit = GETPOST('units', 'alpha'); } // Margin diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 43379eb221c24..1a86a8ceb093e 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -399,12 +399,12 @@ function insert_discount($idremise) * @param int $date_start Start date of the line * @param int $date_end End date of the line * @param array $array_options extrafields array - * @param int $fk_unit Id of the unit to use. Null to use the default one + * @param string $fk_unit Code of the unit to use. Null to use the default one * @return int >0 if OK, <0 if KO * * @see add_product */ - function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0, $fk_product=0, $remise_percent=0.0, $price_base_type='HT', $pu_ttc=0.0, $info_bits=0, $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=0, $pa_ht=0, $label='',$date_start='', $date_end='',$array_options=0, $fk_unit = null) + function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0, $fk_product=0, $remise_percent=0.0, $price_base_type='HT', $pu_ttc=0.0, $info_bits=0, $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=0, $pa_ht=0, $label='',$date_start='', $date_end='',$array_options=0, $fk_unit=null) { global $mysoc; @@ -583,10 +583,10 @@ function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0 * @param int $date_start Start date of the line * @param int $date_end End date of the line * @param array $array_options extrafields array - * @param int $fk_unit Id of the unit to use. Null to use the default one + * @param string $fk_unit Code of the unit to use. Null to use the default one * @return int 0 if OK, <0 if KO */ - function updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0, $desc='', $price_base_type='HT', $info_bits=0, $special_code=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=0, $pa_ht=0, $label='', $type=0, $date_start='', $date_end='', $array_options=0, $fk_unit = null) + function updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0, $desc='', $price_base_type='HT', $info_bits=0, $special_code=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=0, $pa_ht=0, $label='', $type=0, $date_start='', $date_end='', $array_options=0, $fk_unit=null) { global $mysoc; @@ -1923,7 +1923,7 @@ function cloture($user, $statut, $note) if ( ! $error ) { $this->statut = $statut; - + $this->db->commit(); return 1; } diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 1628f79abaaa6..a4d6d8d3a3743 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -723,11 +723,7 @@ $label = (GETPOST('product_label') ? GETPOST('product_label') : ''); $desc = $product_desc; $type = GETPOST('type'); - $fk_unit=GETPOST('units', 'int'); - - if ($fk_unit <= 0) { - $fk_unit = null; - } + $fk_unit=GETPOST('units', 'alpha'); } // Margin diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 91b17273513c4..2f85461887e66 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -1169,7 +1169,7 @@ function createFromProposal($object) * @param int $pa_ht Buying price (without tax) * @param string $label Label * @param array $array_options extrafields array - * @param int $fk_unit Id of the unit to use. Null to use the default one + * @param string $fk_unit Code of the unit to use. Null to use the default one * @return int >0 if OK, <0 if KO * * @see add_product @@ -1179,7 +1179,7 @@ function createFromProposal($object) * par l'appelant par la methode get_default_tva(societe_vendeuse,societe_acheteuse,produit) * et le desc doit deja avoir la bonne valeur (a l'appelant de gerer le multilangue) */ - function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $info_bits=0, $fk_remise_except=0, $price_base_type='HT', $pu_ttc=0, $date_start='', $date_end='', $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0, $label='',$array_options=0, $fk_unit = null) + function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $info_bits=0, $fk_remise_except=0, $price_base_type='HT', $pu_ttc=0, $date_start='', $date_end='', $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0, $label='',$array_options=0, $fk_unit=null) { global $mysoc, $conf, $langs; @@ -2429,10 +2429,10 @@ function classer_facturee() * @param string $label Label * @param int $special_code Special code (also used by externals modules!) * @param array $array_options extrafields array - * @param int $fk_unit Id of the unit to use. Null to use the default one + * @param string $fk_unit Code of the unit to use. Null to use the default one * @return int < 0 if KO, > 0 if OK */ - function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0.0,$txlocaltax2=0.0, $price_base_type='HT', $info_bits=0, $date_start='', $date_end='', $type=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $special_code=0, $array_options=0, $fk_unit = null) + function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0.0,$txlocaltax2=0.0, $price_base_type='HT', $info_bits=0, $date_start='', $date_end='', $type=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $special_code=0, $array_options=0, $fk_unit=null) { global $conf, $mysoc; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 19f4335b685df..a78e64f675e79 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1376,11 +1376,7 @@ $label = (GETPOST('product_label') ? GETPOST('product_label') : ''); $desc = $product_desc; $type = GETPOST('type'); - $fk_unit= GETPOST('units', 'int'); - - if ($fk_unit <= 0) { - $fk_unit = null; - } + $fk_unit= GETPOST('units', 'alpha'); } // Margin diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php index 077299baa7dc0..7d0de20ce0bf5 100644 --- a/htdocs/compta/facture/class/facture-rec.class.php +++ b/htdocs/compta/facture/class/facture-rec.class.php @@ -1,9 +1,9 @@ - * Copyright (C) 2004-2012 Laurent Destailleur + * Copyright (C) 2004-2015 Laurent Destailleur * Copyright (C) 2009-2012 Regis Houssin * Copyright (C) 2010-2011 Juanjo Menent - * Copyright (C) 2012 Cedric Salvador + * Copyright (C) 2012 Cedric Salvador * Copyright (C) 2013 Florian Henry * Copyright (C) 2015 Marcos García * @@ -98,7 +98,7 @@ function create($user, $facid) // Clean parameters $this->titre=trim($this->titre); $this->usenewprice=empty($this->usenewprice)?0:$this->usenewprice; - + $this->db->begin(); // Charge facture modele @@ -415,9 +415,10 @@ function delete() * @param int $rang Position of line * @param int $special_code Special code * @param string $label Label of the line + * @param string $fk_unit Unit * @return int <0 if KO, Id of line if OK */ - function addline($desc, $pu_ht, $qty, $txtva, $fk_product=0, $remise_percent=0, $price_base_type='HT', $info_bits=0, $fk_remise_except='', $pu_ttc=0, $type=0, $rang=-1, $special_code=0, $label='', $fk_unit= null) + function addline($desc, $pu_ht, $qty, $txtva, $fk_product=0, $remise_percent=0, $price_base_type='HT', $info_bits=0, $fk_remise_except='', $pu_ttc=0, $type=0, $rang=-1, $special_code=0, $label='', $fk_unit=null) { $facid=$this->id; @@ -499,7 +500,7 @@ function addline($desc, $pu_ht, $qty, $txtva, $fk_product=0, $remise_percent=0, $sql.= ", '".price2num($total_ttc)."'"; $sql.= ", ".$rang; $sql.= ", ".$special_code; - $sql.= ", ".$fk_unit.")"; + $sql.= ", ".($fk_unit?"'".$this->db->escape($fk_unit)."'":"null").")"; dol_syslog(get_class($this)."::addline", LOG_DEBUG); if ($this->db->query($sql)) @@ -579,7 +580,7 @@ function getNomUrl($withpicto=0,$option='') return $result; } - + /** * Initialise an instance with random values. * Used to build previews or test instances. diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 920f165f83fcf..f97011acc57ee 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -2100,7 +2100,7 @@ function set_draft($user,$idwarehouse=-1) * @param array $array_options extrafields array * @param int $situation_percent Situation advance percentage * @param int $fk_prev_id Previous situation line id reference - * @param int $fk_unit Id of the unit to use. Null to use the default one + * @param string $fk_unit Code of the unit to use. Null to use the default one * @return int <0 if KO, Id of line if OK */ function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits=0, $fk_remise_except='', $price_base_type='HT', $pu_ttc=0, $type=self::TYPE_STANDARD, $rang=-1, $special_code=0, $origin='', $origin_id=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0, $label='', $array_options=0, $situation_percent=100, $fk_prev_id='', $fk_unit = null) @@ -2283,8 +2283,8 @@ function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $f * @param string $label Label of the line (deprecated, do not use) * @param int $special_code Special code (also used by externals modules!) * @param array $array_options extrafields array - * @param int $situation_percent Situation advance percentage - * @param int $fk_unit Id of the unit to use. Null to use the default one + * @param int $situation_percent Situation advance percentage + * @param string $fk_unit Code of the unit to use. Null to use the default one * @return int < 0 if KO, > 0 if OK */ function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type= self::TYPE_STANDARD, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $special_code=0, $array_options=0, $situation_percent=0, $fk_unit = null) diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index c94e49614823d..6a3bc3ab72df2 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -306,7 +306,7 @@ print ''.$objp->qty.''; if ($conf->global->PRODUCT_USE_UNITS) { - print ''.$product_static->get_unit_label().''; + print ''.$product_static->getLabelOfUnit().''; } // Percent @@ -528,7 +528,7 @@ print ''.$object->lines[$i]->remise_percent.' %'; print ''.$object->lines[$i]->qty.''; if ($conf->global->PRODUCT_USE_UNITS) { - print "".$object->lines[$i]->get_unit_label().""; + print "".$object->lines[$i]->getLabelOfUnit().""; } print "\n"; $i++; diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index 2841c709fccec..7193634af5463 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -505,11 +505,7 @@ $tva_tx=GETPOST('tva_tx')?str_replace('*','',GETPOST('tva_tx')):0; // tva_tx field may be disabled, so we use vat rate 0 $tva_npr=preg_match('/\*/',GETPOST('tva_tx'))?1:0; $desc=$product_desc; - $fk_unit= GETPOST('units', 'int'); - - if ($fk_unit <= 0) { - $fk_unit = null; - } + $fk_unit= GETPOST('units', 'alpha'); } $localtax1_tx=get_localtax($tva_tx,1,$object->thirdparty); @@ -631,7 +627,7 @@ else $pa_ht = null; - $fk_unit = GETPOST('unit', 'int'); + $fk_unit = GETPOST('unit', 'alpha'); $objectline->description=GETPOST('product_desc'); $objectline->price_ht=GETPOST('elprice'); @@ -650,7 +646,7 @@ $objectline->pa_ht=$pa_ht; if ($fk_unit > 0) { - $objectline->fk_unit = $_POST['unit']; + $objectline->fk_unit = GETPOST('unit'); } else { $objectline->fk_unit = null; } @@ -977,7 +973,7 @@ print ''; dol_fiche_head(); - + print ''; // Ref @@ -1087,7 +1083,7 @@ print '
'.$langs->trans("Note").': '.$langs->trans("OnlyLinesWithTypeServiceAreUsed"); } } - + print "\n"; } else @@ -1291,7 +1287,7 @@ if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) $usemargins=1; $var=false; - + // Title line for service $cursorline=1; while ($cursorline <= $nbofservices) @@ -1327,7 +1323,7 @@ print ''; print ''; print ''; - if($conf->global->PRODUCT_USE_UNITS) print ''; + if ($conf->global->PRODUCT_USE_UNITS) print ''; print ''; if (! empty($conf->margin->enabled) && ! empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) print ''; print ''; @@ -1368,8 +1364,8 @@ print '\n"; // Quantite print ''; - //Unit - if($conf->global->PRODUCT_USE_UNITS) print ''; + // Unit + if($conf->global->PRODUCT_USE_UNITS) print ''; // Remise if ($objp->remise_percent > 0) { @@ -1494,12 +1490,12 @@ print ''; print ''; print ''; - if($conf->global->PRODUCT_USE_UNITS) - { - print ''; - } + if ($conf->global->PRODUCT_USE_UNITS) + { + print ''; + } print ''; if (! empty($usemargins)) { diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index ac01abe6cd177..cdf2d789d09bc 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -1236,7 +1236,7 @@ function update($user=null, $notrigger=0) * @param int $fk_fournprice Fourn price id * @param int $pa_ht Buying price HT * @param array $array_options extrafields array - * @param int $fk_unit Id of the unit to use. Null to use the default one + * @param string $fk_unit Code of the unit to use. Null to use the default one * @return int <0 si erreur, >0 si ok */ function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $date_start, $date_end, $price_base_type='HT', $pu_ttc=0.0, $info_bits=0, $fk_fournprice=null, $pa_ht = 0,$array_options=0, $fk_unit = null) @@ -1339,7 +1339,7 @@ function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_pr else $sql.= ' null'; if ($date_start > 0) { $sql.= ",'".$this->db->idate($date_start)."'"; } if ($date_end > 0) { $sql.= ",'".$this->db->idate($date_end)."'"; } - $sql.= ", ".$fk_unit; + $sql.= ", ".($fk_unit?"'".$this->db->escape($fk_unit)."'":"null"); $sql.= ")"; dol_syslog(get_class($this)."::addline", LOG_DEBUG); @@ -1418,7 +1418,7 @@ function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_pr * @param int $fk_fournprice Fourn price id * @param int $pa_ht Buying price HT * @param array $array_options extrafields array - * @param int $fk_unit Id of the unit to use. Null to use the default one + * @param string $fk_unit Code of the unit to use. Null to use the default one * @return int < 0 si erreur, > 0 si ok */ function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $tvatx, $localtax1tx=0.0, $localtax2tx=0.0, $date_debut_reel='', $date_fin_reel='', $price_base_type='HT', $info_bits=0, $fk_fournprice=null, $pa_ht = 0,$array_options=0, $fk_unit = null) @@ -1512,7 +1512,7 @@ function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $dat else { $sql.=",date_ouverture=null"; } if ($date_fin_reel > 0) { $sql.= ",date_cloture='".$this->db->idate($date_fin_reel)."'"; } else { $sql.=",date_cloture=null"; } - $sql .= ", fk_unit=".$fk_unit; + $sql .= ", fk_unit=".($fk_unit?"'".$this->db->escape($fk_unit)."'":"null"); $sql .= " WHERE rowid = ".$rowid; dol_syslog(get_class($this)."::updateline", LOG_DEBUG); @@ -2474,7 +2474,7 @@ function update($user, $notrigger=0) if (empty($this->total_ht)) $this->total_ht = 0; if (empty($this->total_tva)) $this->total_tva = 0; if (empty($this->total_ttc)) $this->total_ttc = 0; - + // Check parameters // Put here code to add control on parameters values diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 775596735d53a..e84aa42edee07 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -3063,7 +3063,7 @@ function printOriginLine($line,$var) $this->tpl['vat_rate'] = vatrate($line->tva_tx, true); $this->tpl['price'] = price($line->subprice); $this->tpl['qty'] = (($line->info_bits & 2) != 2) ? $line->qty : ' '; - if($conf->global->PRODUCT_USE_UNITS) $this->tpl['unit'] = $line->get_unit_label('long'); + if($conf->global->PRODUCT_USE_UNITS) $this->tpl['unit'] = $line->getLabelOfUnit('long'); $this->tpl['remise_percent'] = (($line->info_bits & 2) != 2) ? vatrate($line->remise_percent, true) : ' '; // Output template part (modules that overwrite templates must declare this into descriptor) diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php index cfad5d09796bd..07019a0fa1dcd 100644 --- a/htdocs/core/class/commonobjectline.class.php +++ b/htdocs/core/class/commonobjectline.class.php @@ -38,7 +38,7 @@ abstract class CommonObjectLine extends CommonObject /** * Id of the line * @var int - * @deprecated Try to use id property as possible + * @deprecated Try to use id property as possible (even if field into database is still rowid) */ public $rowid; @@ -46,11 +46,11 @@ abstract class CommonObjectLine extends CommonObject public $db; /** - * Product/service unit - * @var int + * Product/service unit code ('km', 'm', 'p', ...) + * @var string */ public $fk_unit; - // TODO + /** * Returns the text label from units dictionnary @@ -58,7 +58,7 @@ abstract class CommonObjectLine extends CommonObject * @param string $type Label type (long or short) * @return string|int <0 if ko, label if ok */ - public function get_unit_label($type='long') + public function getLabelOfUnit($type='long') { global $langs; @@ -89,7 +89,7 @@ public function get_unit_label($type='long') else { $this->error=$this->db->error().' sql='.$sql; - dol_syslog(get_class($this)."::get_unit_label Error ".$this->error, LOG_ERR); + dol_syslog(get_class($this)."::getLabelOfUnit Error ".$this->error, LOG_ERR); return -1; } } diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 41c3fbf86c924..0d9db23a306a6 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -2823,46 +2823,36 @@ function load_situation_invoices($selected = '', $socid = '') } /** - * Prints units selector + * Creates HTML units selector (code => label) * - * @param string $selected Preselected ID - * @param string $htmlname Select name - * @return void + * @param string $selected Preselected code ('km', 'm', 'l', 'p', ...) + * @param string $htmlname Select name + * @param int $showempty Add a nempty line + * @return string HTML select */ - function select_units($selected = '', $htmlname = 'units') - { - print $this->load_units($selected, $htmlname); - } - - /** - * Creates HTML units selector - * - * @param string $selected Preselected ID - * @param string $htmlname Select name - * @return string HTML select - */ - function load_units($selected = '', $htmlname = 'units') + function selectUnits($selected = '', $htmlname = 'units', $showempty=0) { global $langs; $langs->load('products'); $return= ''; @@ -3009,7 +2999,7 @@ function select_all_categories($type, $selected='', $htmlname="parent", $maxleng $add = ''; } $output.= ''; - + $outarray[$cate_arbo[$key]['id']] = $cate_arbo[$key]['fulllabel']; } } diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index 369ef15cd88ac..6c94d5595ddc5 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -1463,7 +1463,7 @@ function pdf_getlineunit($object, $i, $outputlangs, $hidedetails = 0, $hookmanag $action); // Note that $action and $object may have been modified by some hooks } else { if (empty($hidedetails) || $hidedetails > 1) { - return $langs->transnoentitiesnoconv($object->lines[$i]->get_unit_label('short')); + return $langs->transnoentitiesnoconv($object->lines[$i]->getLabelOfUnit('short')); } } } diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php index 56106dae1d1b0..2bda2eb6b9125 100644 --- a/htdocs/core/tpl/objectline_create.tpl.php +++ b/htdocs/core/tpl/objectline_create.tpl.php @@ -233,7 +233,7 @@ if($conf->global->PRODUCT_USE_UNITS) { print ''; } ?> diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php index eb9c7521236e2..bc23438dfbcf9 100644 --- a/htdocs/core/tpl/objectline_edit.tpl.php +++ b/htdocs/core/tpl/objectline_edit.tpl.php @@ -147,7 +147,7 @@ if($conf->global->PRODUCT_USE_UNITS) { print ''; } ?> diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php index c2b66778d3392..593421fe52705 100644 --- a/htdocs/core/tpl/objectline_view.tpl.php +++ b/htdocs/core/tpl/objectline_view.tpl.php @@ -149,7 +149,7 @@ if($conf->global->PRODUCT_USE_UNITS) { print ''; print ''; } @@ -1379,13 +1376,13 @@ } print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, 250); print ""; - + // Units if($conf->global->PRODUCT_USE_UNITS) { print ''; print ''; } @@ -1659,7 +1656,7 @@ // Unit if($conf->global->PRODUCT_USE_UNITS) { - $unit = $object->get_unit_label(); + $unit = $object->getLabelOfUnit(); print ''; print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"t.rowid","",$param,"",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"t.label","",$param,'align="left"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"dm","",$param,'align="left"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("DatePayment"),$_SERVER["PHP_SELF"],"dm","",$param,'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("PayedByThisPayment"),$_SERVER["PHP_SELF"],"t.amount","",$param,'align="right"',$sortfield,$sortorder); print_liste_field_titre(""); @@ -128,7 +146,11 @@ print ''; print ''; print ''; - print ''; + print ''; // Type print '\n"; print "\n"; - print '\n"; + print '\n"; // Type print $type; // Amount From 3d08280026c5d6942ad9f7ad2d2ce9ad8fba680a Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Thu, 23 Apr 2015 10:35:08 +0200 Subject: [PATCH 059/264] Fix test for es. testGetDefaultLocalTax --- test/phpunit/FunctionsLibTest.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php index 0f1969c9e6a55..49400c119a5dc 100755 --- a/test/phpunit/FunctionsLibTest.php +++ b/test/phpunit/FunctionsLibTest.php @@ -1,5 +1,6 @@ + * 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 @@ -853,7 +854,7 @@ public function testGetDefaultLocalTax() $vat1=get_default_localtax($companyes,$companyes,1,0); $vat2=get_default_localtax($companyes,$companyes,2,0); $this->assertEquals(5.2,$vat1); - $this->assertEquals(-21,$vat2); + $this->assertEquals(-19,$vat2); // Test RULE ES-IT $vat1=get_default_localtax($companyes,$companyit,1,0); From f9285d6d231d285f85f59ab789c0bfc06ad3ccfb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 23 Apr 2015 13:44:45 +0200 Subject: [PATCH 060/264] NEW Can add all user of a project as user of a task, in one step. --- htdocs/core/class/html.form.class.php | 8 +++++--- htdocs/projet/tasks/contact.php | 29 ++++++++++++++++++++++----- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index e944d98aed3ee..00eca8b661a5a 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -1237,7 +1237,7 @@ function select_users($selected='',$htmlname='userid',$show_empty=0,$exclude='', * * @param string $selected User id or user object of user preselected. If -1, we use id of current user. * @param string $htmlname Field name in form - * @param int $show_empty 0=liste sans valeur nulle, 1=ajoute valeur inconnue + * @param int $show_empty 0=list with no empty value, 1=add also an empty value into list * @param array $exclude Array list of users id to exclude * @param int $disabled If select list must be disabled * @param array $include Array list of users id to include or 'hierarchy' to have only supervised users @@ -1246,15 +1246,16 @@ function select_users($selected='',$htmlname='userid',$show_empty=0,$exclude='', * @param int $maxlength Maximum length of string into list (0=no limit) * @param int $showstatus 0=show user status only if status is disabled, 1=always show user status into label, -1=never show user status * @param string $morefilter Add more filters into sql request + * @param string $show_every 0=default list, 1=add also a value "Everybody" at beginning of list * @return string HTML select string * @see select_dolgroups */ - function select_dolusers($selected='', $htmlname='userid', $show_empty=0, $exclude='', $disabled=0, $include='', $enableonly='', $force_entity=0, $maxlength=0, $showstatus=0, $morefilter='') + function select_dolusers($selected='', $htmlname='userid', $show_empty=0, $exclude='', $disabled=0, $include='', $enableonly='', $force_entity=0, $maxlength=0, $showstatus=0, $morefilter='', $show_every=0) { global $conf,$user,$langs; // If no preselected user defined, we take current user - if ((is_numeric($selected) && ($selected < -1 || empty($selected))) && empty($conf->global->SOCIETE_DISABLE_DEFAULT_SALESREPRESENTATIVE)) $selected=$user->id; + if ((is_numeric($selected) && ($selected < -2 || empty($selected))) && empty($conf->global->SOCIETE_DISABLE_DEFAULT_SALESREPRESENTATIVE)) $selected=$user->id; $excludeUsers=null; $includeUsers=null; @@ -1333,6 +1334,7 @@ function select_dolusers($selected='', $htmlname='userid', $show_empty=0, $exclu $out.= '
'.$langs->trans("VAT").''.$langs->trans("PriceUHT").''.$langs->trans("Qty").''.$langs->trans("Unit").''.$langs->trans("Unit").''.$langs->trans("ReductionShort").''.$langs->trans("BuyingPrice").' '.($objp->subprice != '' ? price($objp->subprice) : '')."'.$objp->qty.''.$langs->trans($object->lines[$cursorline-1]->get_unit_label()).''.$langs->trans($object->lines[$cursorline-1]->getLabelOfUnit()).''; - $form->select_units($objp->fk_unit, "unit"); - print ''; + print $form->selectUnits($objp->fk_unit, "unit"); + print '%'; - print $form->select_units($line->fk_unit, "units"); + print $form->selectUnits($line->fk_unit, "units"); print ''; - $form->select_units($line->fk_unit, "units"); + print $form->selectUnits($line->fk_unit, "units"); print ''; - $label = $line->get_unit_label('short'); + $label = $line->getLabelOfUnit('short'); if ($label !== '') { print $langs->trans($label); } diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index ddddcf059a3cd..b1b9e74266ecf 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -1198,10 +1198,10 @@ function createFromClone() * @param int $date_start Date start of service * @param int $date_end Date end of service * @param array $array_options extrafields array - * @param int $fk_unit Id of the unit to use. Null to use the default one + * @param string $fk_unit Code of the unit to use. Null to use the default one * @return int <=0 if KO, >0 if OK */ - function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0, $fk_product=0, $fk_prod_fourn_price=0, $fourn_ref='', $remise_percent=0.0, $price_base_type='HT', $pu_ttc=0.0, $type=0, $info_bits=0, $notrigger=false, $date_start=null, $date_end=null, $array_options=0, $fk_unit = null) + function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0, $fk_product=0, $fk_prod_fourn_price=0, $fourn_ref='', $remise_percent=0.0, $price_base_type='HT', $pu_ttc=0.0, $type=0, $info_bits=0, $notrigger=false, $date_start=null, $date_end=null, $array_options=0, $fk_unit=null) { global $langs,$mysoc; @@ -1327,7 +1327,7 @@ function addline($desc, $pu_ht, $qty, $txtva, $txlocaltax1=0.0, $txlocaltax2=0.0 $sql.= "'".price2num($total_localtax1)."',"; $sql.= "'".price2num($total_localtax2)."',"; $sql.= "'".price2num($total_ttc)."',"; - $sql.= (!$fk_unit ? 'NULL' : $fk_unit); + $sql.= ($fk_unit ? "'".$this->db->escape($fk_unit)."'":"null"); $sql.= ")"; dol_syslog(get_class($this)."::addline", LOG_DEBUG); @@ -1992,11 +1992,11 @@ function setStatus($user,$status) * @param int $notrigger Disable triggers * @param timestamp $date_start Date start of service * @param timestamp $date_end Date end of service - * @param array $array_options extrafields array - * @param int $fk_unit Id of the unit to use. Null to use the default one + * @param array $array_options Extrafields array + * @param string $fk_unit Code of the unit to use. Null to use the default one * @return int < 0 if error, > 0 if ok */ - function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type=0, $notrigger=false, $date_start='', $date_end='', $array_options=0, $fk_unit = null) + function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $type=0, $notrigger=false, $date_start='', $date_end='', $array_options=0, $fk_unit=null) { global $mysoc; dol_syslog(get_class($this)."::updateline $rowid, $desc, $pu, $qty, $remise_percent, $txtva, $price_base_type, $info_bits, $type, $fk_unit"); @@ -2066,7 +2066,7 @@ function updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocalt $sql.= ",total_localtax2='".price2num($total_localtax2)."'"; $sql.= ",total_ttc='".price2num($total_ttc)."'"; $sql.= ",product_type=".$type; - $sql.= ",fk_unit=".(!$fk_unit ? 'NULL' : $fk_unit); + $sql.= ($fk_unit ? "'".$this->db->escape($fk_unit)."'":"null"); $sql.= " WHERE rowid = ".$rowid; dol_syslog(get_class($this)."::updateline", LOG_DEBUG); diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index dd4e5f598d26f..c02728b1d2964 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -1118,12 +1118,12 @@ function set_draft($user, $idwarehouse=-1) * @param int $rang Position of line * @param int $notrigger Disable triggers * @param array $array_options extrafields array - * @param int $fk_unit Id of the unit to use. Null to use the default one + * @param string $fk_unit Code of the unit to use. Null to use the default one * @return int >0 if OK, <0 if KO * * FIXME Add field ref (that should be named ref_supplier) and label into update. For example can be filled when product line created from order. */ - function addline($desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0, $rang=-1, $notrigger=false, $array_options=0, $fk_unit = null) + function addline($desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_product=0, $remise_percent=0, $date_start='', $date_end='', $ventil=0, $info_bits='', $price_base_type='HT', $type=0, $rang=-1, $notrigger=false, $array_options=0, $fk_unit=null) { dol_syslog(get_class($this)."::addline $desc,$pu,$qty,$txtva,$fk_product,$remise_percent,$date_start,$date_end,$ventil,$info_bits,$price_base_type,$type,$fk_unit", LOG_DEBUG); include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; @@ -1215,7 +1215,7 @@ function addline($desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, $fk_produ * @param timestamp $date_start Date start of service * @param timestamp $date_end Date end of service * @param array $array_options extrafields array - * @param int $fk_unit Id of the unit to use. Null to use the default one + * @param string $fk_unit Code of the unit to use. Null to use the default one * @return int <0 if KO, >0 if OK */ function updateline($id, $desc, $pu, $vatrate, $txlocaltax1=0, $txlocaltax2=0, $qty=1, $idproduct=0, $price_base_type='HT', $info_bits=0, $type=0, $remise_percent=0, $notrigger=false, $date_start='', $date_end='', $array_options=0, $fk_unit = null) @@ -1291,7 +1291,7 @@ function updateline($id, $desc, $pu, $vatrate, $txlocaltax1=0, $txlocaltax2=0, $ else $sql.= ", fk_product = null"; $sql.= ", product_type = ".$product_type; $sql.= ", info_bits = ".$info_bits; - $sql .= ", fk_unit=".(!$fk_unit ? 'NULL' : $fk_unit); + $sql.= ", ".($fk_unit ? "'".$this->db->escape($fk_unit)."'":"null"); $sql.= " WHERE rowid = ".$id; dol_syslog(get_class($this)."::updateline", LOG_DEBUG); diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 113758b7ee9e4..725cd35a6cb73 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -376,11 +376,7 @@ $desc = $product_desc; $type = GETPOST('type'); - $fk_unit= GETPOST('units', 'int'); - - if ($fk_unit <= 0) { - $fk_unit = null; - } + $fk_unit= GETPOST('units', 'alpha'); $tva_tx = price2num($tva_tx); // When vat is text input field diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index edac67e3fbfce..ab67027884fd5 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -732,11 +732,7 @@ $desc = $product_desc; $type = GETPOST('type'); - $fk_unit= GETPOST('units', 'int'); - - if ($fk_unit <= 0) { - $fk_unit = null; - } + $fk_unit= GETPOST('units', 'alpha'); $tva_tx = price2num($tva_tx); // When vat is text input field diff --git a/htdocs/install/mysql/tables/llx_c_units.key.sql b/htdocs/install/mysql/tables/llx_c_units.key.sql index f97ea9f709f4d..3ec5b9ba6fbf3 100644 --- a/htdocs/install/mysql/tables/llx_c_units.key.sql +++ b/htdocs/install/mysql/tables/llx_c_units.key.sql @@ -1,6 +1,6 @@ -- ======================================================================== -- Copyright (C) 2005 Laurent Destailleur --- Copyright (C) 2012 Cédric Salvador +-- Copyright (C) 2012 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 diff --git a/htdocs/product/card.php b/htdocs/product/card.php index eaef488dac3f9..8d0d4484a2e6a 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -225,14 +225,14 @@ $object->barcode_type_label = $stdobject->barcode_type_label; $object->description = dol_htmlcleanlastbr(GETPOST('desc')); - $object->url = GETPOST('url'); + $object->url = GETPOST('url'); $object->note = dol_htmlcleanlastbr(GETPOST('note')); - $object->customcode = GETPOST('customcode'); - $object->country_id = GETPOST('country_id'); + $object->customcode = GETPOST('customcode'); + $object->country_id = GETPOST('country_id'); $object->duration_value = GETPOST('duration_value'); $object->duration_unit = GETPOST('duration_unit'); $object->seuil_stock_alerte = GETPOST('seuil_stock_alerte')?GETPOST('seuil_stock_alerte'):0; - $object->desiredstock = GETPOST('desiredstock')?GETPOST('desiredstock'):0; + $object->desiredstock = GETPOST('desiredstock')?GETPOST('desiredstock'):0; $object->canvas = GETPOST('canvas'); $object->weight = GETPOST('weight'); $object->weight_units = GETPOST('weight_units'); @@ -245,9 +245,6 @@ $object->finished = GETPOST('finished'); $object->hidden = GETPOST('hidden')=='yes'?1:0; $object->fk_unit = GETPOST('units'); - if ($fk_unit > 0) { - $object->fk_unit = $fk_unit; - } $object->accountancy_code_sell = GETPOST('accountancy_code_sell'); $object->accountancy_code_buy = GETPOST('accountancy_code_buy'); @@ -288,7 +285,7 @@ $cat->add_type($object, 'product'); } } - + header("Location: ".$_SERVER['PHP_SELF']."?id=".$id); exit; } @@ -380,18 +377,18 @@ $sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_product"; $sql .= " WHERE fk_product = ".$object->id; $db->query($sql); - + // Then we add the associated categories $categories = GETPOST('categories'); if(!empty($categories)) { $cat = new Categorie($db); - + foreach($categories as $id_category) { $cat->fetch($id_category); $cat->add_type($object, 'product'); } } - + $action = 'view'; } else @@ -1095,7 +1092,7 @@ { print '
'.$langs->trans('Unit').''; - $form->select_units("units"); + print $form->selectUnits("units"); print '
'.$langs->trans('Unit').''; - $form->select_units($object->fk_unit); + print $form->selectUnits($object->fk_unit); print '
'.$langs->trans('Unit').''; if ($unit !== '') { @@ -1695,7 +1692,7 @@ $cat = new Categorie($db); $categories = $cat->containing($object->id,0); $catarray = $form->select_all_categories(0, '', 'parent', 64, 0, 1); - + $toprint = array(); foreach($categories as $c) { $toprint[] = $catarray[$c->id]; diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index ce07c25a515f5..1f32e0a328fbb 100755 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -177,8 +177,8 @@ class Product extends CommonObject var $fk_price_expression; /** - * Unit - * @var int + * Unit code ('km', 'm', 'l', 'p', ...) + * @var string */ public $fk_unit; @@ -3820,7 +3820,7 @@ function initAsSpecimen() * @param string $type Label type (long or short) * @return string|int <0 if ko, label if ok */ - function get_unit_label($type='long') + function getLabelOfUnit($type='long') { global $langs; @@ -3851,7 +3851,7 @@ function get_unit_label($type='long') else { $this->error=$this->db->error().' sql='.$sql; - dol_syslog(get_class($this)."::get_unit_label Error ".$this->error, LOG_ERR); + dol_syslog(get_class($this)."::getLabelOfUnit Error ".$this->error, LOG_ERR); return -1; } } From f06255e9d26b974e89c0c906d08fc287fbbb25cf Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 21 Apr 2015 16:57:45 +0200 Subject: [PATCH 037/264] Complete the mailmap file. --- .mailmap | 42 +++++++++++++++++++++++++++++++++++++++ test/phpunit/UserTest.php | 6 +++--- 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/.mailmap b/.mailmap index 5452dfd7eced6..e8821f0f8ebb5 100644 --- a/.mailmap +++ b/.mailmap @@ -1,3 +1,6 @@ +# This is mapping list between real user name/email and entry into sources files +# If you don't want to have your real email appears here, just send a Pull Request to +# replace the second field between <> with Laurent Destailleur Laurent Destailleur Laurent Destailleur eldy Laurent Destailleur Laurent Destailleur @@ -47,3 +50,42 @@ Cédric Gross Cedric Cédric Gross Cedric GROSS Jean Heimburger jean Jean Heimburger tiaris +Benoit Mortier opensides +Eric Seigne erics +Jean-Louis Bergamo jlb +Remco Gerbrands r2gnl +Phf phf +Yannick Warnier ywarnier +Jerome Warnier jwarnier +Franky Van Liedekerke liedekef +Lalaina Rasamoelina lalaina rasamoelina +Marc Ocebo marc_ocebo +Unknown box7890 +Unknown beedauchon +Loic loic +Christophe Combelle +Unknown activdev +Unknown bouba +Unknown bcroq +Unknown dutoit +Unknown bureau2crea +Unknown unknown +Simon Tosser simontosser +Unknown tipaul +Raphaël Bertrand raphael_bertrand +Claudio Aschieri cla +Tommaso Basilici kaos +Tommaso Basilici Tommaso Basilici +Faust faust +Ferran Marcet fmarcet +Geoffrey Girard geoffrey.girard +Bernard Paquier BadPixxel +Patrick Delcroix delcroix Patrick +Damien Clochard damien clochard +Damien Clochard damien clochard +Grégory David Grégory DAVID +Grégory David Gregory DAVID +Baffir Abbes bafbes +Kevin Guerrier GUERRIER Kevin +Remy Younes remy +Estephe Loridan Estephe L. diff --git a/test/phpunit/UserTest.php b/test/phpunit/UserTest.php index 1e171737a6b67..4e0c0ba58cafd 100644 --- a/test/phpunit/UserTest.php +++ b/test/phpunit/UserTest.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2010-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 @@ -187,7 +187,7 @@ public function testUserUpdate($localobject) $newlocalobject=new User($this->savdb); $newlocalobject->initAsSpecimen(); $this->changeProperties($newlocalobject); - $this->assertEquals($this->objCompare($localobject,$newlocalobject,true,array('id','ref','pass_indatabase','pass_indatabase_crypted','datec','datem','datelastlogin','datepreviouslogin')), array()); // Actual, Expected + $this->assertEquals($this->objCompare($localobject,$newlocalobject,true,array('id','socid','societe_id','ref','pass_indatabase','pass_indatabase_crypted','datec','datem','datelastlogin','datepreviouslogin')), array()); // Actual, Expected return $localobject; } @@ -301,7 +301,7 @@ public function objCompare($oA,$oB,$ignoretype=true,$fieldstoignorearray=array(' $oVarsB=get_object_vars($oB); $aKeys=array_keys($oVarsA); foreach($aKeys as $sKey) { - if (in_array($sKey,$fieldstoignorearray)) + if (in_array($sKey,$fieldstoignorearray)) continue; if (! $ignoretype && $oVarsA[$sKey] !== $oVarsB[$sKey]) { $retAr[]=$sKey.' : '.(is_object($oVarsA[$sKey])?get_class($oVarsA[$sKey]):$oVarsA[$sKey]).' <> '.(is_object($oVarsB[$sKey])?get_class($oVarsB[$sKey]):$oVarsB[$sKey]); From bce952fa9bf60d5304b4e754b15503310fc095ee Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 21 Apr 2015 17:06:13 +0200 Subject: [PATCH 038/264] Fix bad link --- 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 0f6e48a15206c..fdd69a26a5bd5 100644 --- a/htdocs/core/boxes/box_actions.php +++ b/htdocs/core/boxes/box_actions.php @@ -118,7 +118,7 @@ function loadBox($max=5) $this->info_box_contents[$line][] = array( 'td' => 'align="left"', - 'text' => $societestatic->getNomUrl(1), + 'text' => ($societestatic->id > 0 ? $societestatic->getNomUrl(1) : ''), 'asis' => 1, ); From e0cc007487bed124334d3606c67ca8cf30c34729 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laurent=20L=C3=A9onard?= Date: Tue, 21 Apr 2015 20:21:24 +0200 Subject: [PATCH 039/264] Add sorting for extra fields values --- htdocs/core/class/extrafields.class.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index a9a44fc27d1c4..71cf0c6577d20 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -808,6 +808,8 @@ function showInputField($key,$value,$moreparam='',$keyprefix='') $sql.=$sqlwhere; //print $sql; + $sql .= ' ORDER BY ' . implode(', ', $fields_label); + dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG); $resql = $this->db->query($sql); if ($resql) From ad31f0110ae805b1be60a9cd25fb9767c6c1217f Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Tue, 21 Apr 2015 22:01:53 +0200 Subject: [PATCH 040/264] Improve PHPUnit Prices test for Spanish localtax1 and localtax2 --- test/phpunit/PricesTest.php | 105 ++++++++++++++++++++++++++++-------- 1 file changed, 83 insertions(+), 22 deletions(-) diff --git a/test/phpunit/PricesTest.php b/test/phpunit/PricesTest.php index 654f908beffae..e7c566ad79d88 100755 --- a/test/phpunit/PricesTest.php +++ b/test/phpunit/PricesTest.php @@ -1,5 +1,6 @@ +/* Copyright (C) 2010 Laurent Destailleur + * 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 @@ -135,52 +136,112 @@ public function testCalculPriceTotal() global $mysoc; $mysoc=new Societe($db); + /* + * Country France + */ + // qty=1, unit_price=1.24, discount_line=0, vat_rate=10, price_base_type='HT' (method we provide value) $mysoc->country_code='FR'; $mysoc->country_id=1; $result1=calcul_price_total(1, 1.24, 0, 10, 0, 0, 0, 'HT', 0, 0); print __METHOD__." result1=".join(', ',$result1)."\n"; // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) - $this->assertEquals(array(1.24, 0.12, 1.36, 1.24, 0.124, 1.364, 1.24, 0.12, 1.36, 0, 0, 0, 0, 0, 0, 0),$result1,'Test1'); + $this->assertEquals(array(1.24, 0.12, 1.36, 1.24, 0.124, 1.364, 1.24, 0.12, 1.36, 0, 0, 0, 0, 0, 0, 0),$result1,'Test1 FR'); - // 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1 type 1, 0% localtax2 type 0 (method we provide value) + + /* + * Country Spain + */ + + // 10 * 10 HT - 0% discount with 10% vat, seller not using localtax1, not localtax2 (method we provide value) + $mysoc->country_code='ES'; + $mysoc->country_id=4; + $mysoc->localtax1_assuj=0; + $mysoc->localtax2_assuj=0; + $result2=calcul_price_total(10, 10, 0, 10, 0, 0, 0, 'HT', 0, 0); // 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1, 0% localtax2 + print __METHOD__." result2=".join(', ',$result2)."\n"; + // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) + $this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0),$result2,'Test1 ES'); + + // 10 * 10 HT - 0% discount with 10% vat, seller not using localtax1, not localtax2 (other method autodetect) + $mysoc->country_code='ES'; + $mysoc->country_id=4; + $mysoc->localtax1_assuj=0; + $mysoc->localtax2_assuj=0; + $result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 0); // 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1, 0% localtax2 + print __METHOD__." result2=".join(', ',$result2)."\n"; + // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) + $this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0),$result2,'Test2 ES'); + + // -------------------------------------------------------- + + // 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1 type 3, 0% localtax2 type 5 (method we provide value) $mysoc->country_code='ES'; $mysoc->country_id=4; $mysoc->localtax1_assuj=1; $mysoc->localtax2_assuj=0; $result2=calcul_price_total(10, 10, 0, 10, 1.4, 0, 0, 'HT', 0, 0); print __METHOD__." result2=".join(', ',$result2)."\n"; - $this->assertEquals(array(100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0, 0.14, 0, 0, 1.4, 0),$result2,'Test2'); - - // 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1 type 1, 0% localtax2 type 0 (other method autodetect) + // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) + $this->assertEquals(array(100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0, 0.14, 0, 0, 1.4, 0),$result2,'Test3 ES'); + + // 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1 type 3, 0% localtax2 type 5 (other method autodetect) $mysoc->country_code='ES'; $mysoc->country_id=4; $mysoc->localtax1_assuj=1; $mysoc->localtax2_assuj=0; $result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 0); print __METHOD__." result2=".join(', ',$result2)."\n"; - $this->assertEquals(array(100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0, 0.14, 0, 0, 1.4, 0),$result2,'Test3 ES'); - - // 10 * 10 HT - 0% discount with 10% vat, seller not using localtax1, nor localtax2 (method we provide value) + // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) + $this->assertEquals(array(100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0, 0.14, 0, 0, 1.4, 0),$result2,'Test4 ES'); + + // -------------------------------------------------------- + + // 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 19% localtax2 type 5 (method we provide value) $mysoc->country_code='ES'; $mysoc->country_id=4; $mysoc->localtax1_assuj=0; - $mysoc->localtax2_assuj=0; - $result3=calcul_price_total(10, 10, 0, 10, 0, 0, 0, 'HT', 0, 0); // 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1, 0% localtax2 - print __METHOD__." result3=".join(', ',$result3)."\n"; - // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) - $this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0),$result3,'Test4'); + $mysoc->localtax2_assuj=1; + $result2=calcul_price_total(10, 10, 0, 10, 0, -19, 0, 'HT', 0, 0); + // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) + $this->assertEquals(array(100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19, 0, -1.90, 0, 0, -19),$result2,'Test5 ES'); - // 10 * 10 HT - 0% discount with 10% vat, seller not using localtax1, nor localtax2 (other method autodetect) + // 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1 type 3, 0% localtax2 type 5 (other method autodetect) $mysoc->country_code='ES'; $mysoc->country_id=4; $mysoc->localtax1_assuj=0; - $mysoc->localtax2_assuj=0; - $result3=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 0); // 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1, 0% localtax2 - print __METHOD__." result3=".join(', ',$result3)."\n"; - // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) - $this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0),$result3,'Test5'); + $mysoc->localtax2_assuj=1; + $result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 0); + print __METHOD__." result2=".join(', ',$result2)."\n"; + // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) + $this->assertEquals(array(100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19, 0, -1.90, 0, 0, -19),$result2,'Test6 ES'); + + // -------------------------------------------------------- + + // Credit Note: 10 * -10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 19% localtax2 type 5 (method we provide value) + $mysoc->country_code='ES'; + $mysoc->country_id=4; + $mysoc->localtax1_assuj=0; + $mysoc->localtax2_assuj=1; + $result2=calcul_price_total(10, -10, 0, 10, 0, 19, 0, 'HT', 0, 0); + print __METHOD__." result2=".join(', ',$result2)."\n"; + // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) + $this->assertEquals(array(-100, -10, -91, -10, -1, -9.1, -100, -10,- 91, 0, 19, 0, 1.90, 0, 0, 19),$result2,'Test7 ES'); + // Credit Note: 10 * -10 HT - 0% discount with 10% vat and 1.4% localtax1 type 3, 0% localtax2 type 5 (other method autodetect) + $mysoc->country_code='ES'; + $mysoc->country_id=4; + $mysoc->localtax1_assuj=0; + $mysoc->localtax2_assuj=1; + $result2=calcul_price_total(10, -10, 0, 10, -1, -1, 0, 'HT', 0, 0); + print __METHOD__." result2=".join(', ',$result2)."\n"; + $this->assertEquals(array(-100, -10, -91, -10, -1, -9.1, -100, -10,- 91, 0, 19, 0, 1.90, 0, 0, 19),$result2,'Test8 ES'); + + + /* + * Country Côte d'Ivoire + */ + // 10 * 10 HT - 0% discount with 18% vat, seller using localtax1 type 2, not localtax2 (method we provide value) $mysoc->country_code='CI'; $mysoc->country_id=21; @@ -191,7 +252,7 @@ public function testCalculPriceTotal() $result3=calcul_price_total(10, 10, 0, 18, 7.5, 0, 0, 'HT', 0, 0); // 10 * 10 HT - 0% discount with 18% vat and 7.5% localtax1, 0% localtax2 print __METHOD__." result3=".join(', ',$result3)."\n"; // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) - $this->assertEquals(array(100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0, 0.885, 0, 0, 8.85, 0),$result3,'Test6 CI'); + $this->assertEquals(array(100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0, 0.885, 0, 0, 8.85, 0),$result3,'Test9 CI'); // 10 * 10 HT - 0% discount with 18% vat, seller using localtax1 type 2, not localtax2 (other method autodetect) $mysoc->country_code='CI'; @@ -201,7 +262,7 @@ public function testCalculPriceTotal() $result3=calcul_price_total(10, 10, 0, 18, -1, -1, 0, 'HT', 0, 0); // 10 * 10 HT - 0% discount with 18% vat and 7.5% localtax1, 0% localtax2 print __METHOD__." result3=".join(', ',$result3)."\n"; // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) - $this->assertEquals(array(100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0, 0.885, 0, 0, 8.85, 0),$result3,'Test7 CI'); + $this->assertEquals(array(100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0, 0.885, 0, 0, 8.85, 0),$result3,'Test10 CI'); return true; } From 5b758e0e166267515372a804b3da96701d9afa67 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 22 Apr 2015 00:17:03 +0200 Subject: [PATCH 041/264] Fix migration process --- .../install/mysql/migration/3.7.0-3.8.0.sql | 26 ++++++++++++++----- htdocs/install/mysql/tables/llx_user.key.sql | 2 +- 2 files changed, 21 insertions(+), 7 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 a341b31d01342..53cf461fe370c 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 @@ -533,11 +533,6 @@ CREATE TABLE IF NOT EXISTS llx_propal_merge_pdf_product ( ) ENGINE=InnoDB; --- Feature request: A page to merge two thirdparties into one #2613 -ALTER TABLE llx_categorie_societe CHANGE COLUMN fk_societe fk_soc INTEGER NOT NULL; -ALTER TABLE llx_categorie_fournisseur CHANGE COLUMN fk_societe fk_soc INTEGER NOT NULL; -ALTER TABLE llx_societe CHANGE COLUMN fk_societe fk_soc INTEGER NOT NULL; -ALTER TABLE llx_user CHANGE COLUMN fk_societe fk_soc INTEGER NOT NULL; -- Units create table llx_c_units( rowid integer AUTO_INCREMENT PRIMARY KEY, @@ -583,4 +578,23 @@ alter table llx_commande_fournisseurdet add fk_unit integer default NULL; ALTER TABLE llx_commande_fournisseurdet ADD CONSTRAINT fk_commande_fournisseurdet_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid); alter table llx_facture_fourn_det add fk_unit integer default NULL; -ALTER TABLE llx_facture_fourn_det ADD CONSTRAINT fk_facture_fourn_det_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid); \ No newline at end of file +ALTER TABLE llx_facture_fourn_det ADD CONSTRAINT fk_facture_fourn_det_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid); + + +ALTER TABLE llx_user DROP INDEX uk_user_fk_societe; +ALTER TABLE llx_user ADD INDEX idx_user_fk_societe (fk_soc); + + +-- Feature request: A page to merge two thirdparties into one #2613 +ALTER TABLE llx_categorie_societe DROP FOREIGN KEY fk_categorie_societe_fk_soc; +ALTER TABLE llx_categorie_societe CHANGE COLUMN fk_societe fk_soc INTEGER NOT NULL; +ALTER TABLE llx_categorie_societe ADD CONSTRAINT fk_categorie_societe_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid); + +ALTER TABLE llx_categorie_fournisseur DROP FOREIGN KEY fk_categorie_fournisseur_fk_soc; +ALTER TABLE llx_categorie_fournisseur CHANGE COLUMN fk_societe fk_soc INTEGER NOT NULL; +ALTER TABLE llx_categorie_fournisseur ADD CONSTRAINT fk_categorie_fournisseur_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid); + +ALTER TABLE llx_user CHANGE COLUMN fk_societe fk_soc INTEGER NOT NULL; +ALTER TABLE llx_societe CHANGE COLUMN fk_societe fk_soc INTEGER NOT NULL; + + diff --git a/htdocs/install/mysql/tables/llx_user.key.sql b/htdocs/install/mysql/tables/llx_user.key.sql index 8232e7cacb766..127d45046d6e7 100644 --- a/htdocs/install/mysql/tables/llx_user.key.sql +++ b/htdocs/install/mysql/tables/llx_user.key.sql @@ -21,7 +21,7 @@ ALTER TABLE llx_user ADD UNIQUE INDEX uk_user_login (login, entity); -ALTER TABLE llx_user ADD INDEX uk_user_fk_societe (fk_soc); +ALTER TABLE llx_user ADD INDEX idx_user_fk_societe (fk_soc); ALTER TABLE llx_user ADD UNIQUE INDEX uk_user_fk_socpeople (fk_socpeople); ALTER TABLE llx_user ADD UNIQUE INDEX uk_user_fk_member (fk_member); From 560150fd1c6c6204f274417b3455bfd42a5e7984 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Wed, 22 Apr 2015 07:15:17 +0200 Subject: [PATCH 042/264] Fixed: For salaries in bank module : missing language file & simplify thidparty column (Informations are truncated by default) --- htdocs/compta/bank/account.php | 1 + htdocs/compta/bank/ligne.php | 1 + htdocs/compta/salaries/class/paymentsalary.class.php | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index ce2bbc5381ea9..3fc72e25e3ad1 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -46,6 +46,7 @@ $langs->load("categories"); $langs->load("bills"); $langs->load("companies"); +$langs->load("salaries"); $langs->load("loan"); $langs->load("donations"); diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php index 8bba13039a92f..2093d62802c6f 100644 --- a/htdocs/compta/bank/ligne.php +++ b/htdocs/compta/bank/ligne.php @@ -37,6 +37,7 @@ if (! empty($conf->adherent->enabled)) $langs->load("members"); if (! empty($conf->don->enabled)) $langs->load("donations"); if (! empty($conf->loan->enabled)) $langs->load("loan"); +if (! empty($conf->salaries->enabled)) $langs->load("salaries"); $id = (GETPOST('id','int') ? GETPOST('id','int') : GETPOST('account','int')); diff --git a/htdocs/compta/salaries/class/paymentsalary.class.php b/htdocs/compta/salaries/class/paymentsalary.class.php index f7da679196b14..f44a1c0560824 100644 --- a/htdocs/compta/salaries/class/paymentsalary.class.php +++ b/htdocs/compta/salaries/class/paymentsalary.class.php @@ -424,7 +424,8 @@ function create($user) $bank_line_id, $this->fk_user, DOL_URL_ROOT.'/user/card.php?id=', - $langs->trans("SalaryPayment").' '.$fuser->getFullName($langs).' '.dol_print_date($this->datesp,'dayrfc').' '.dol_print_date($this->dateep,'dayrfc'), + $fuser->getFullName($langs), + // $langs->trans("SalaryPayment").' '.$fuser->getFullName($langs).' '.dol_print_date($this->datesp,'dayrfc').' '.dol_print_date($this->dateep,'dayrfc'), 'user' ); From 768fdde2d15b223f7ce02f4c33d491a576b9f6ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 22 Apr 2015 10:39:32 +0200 Subject: [PATCH 043/264] Update product.class.php --- htdocs/product/class/product.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 1f32e0a328fbb..e4f2a9d02c08f 100755 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -1514,7 +1514,7 @@ function fetch($id='', $ref='', $ref_ext='', $ignore_expression = 0) $sql.= " weight, weight_units, length, length_units, surface, surface_units, volume, volume_units, barcode, fk_barcode_type, finished,"; $sql.= " accountancy_code_buy, accountancy_code_sell, stock, pmp,"; $sql.= " datec, tms, import_key, entity, desiredstock, tobatch, fk_unit"; - $sql.= " ,ref_ext, fk_price_expression"; + $sql.= " , fk_price_expression"; $sql.= " FROM ".MAIN_DB_PREFIX."product"; if ($id) $sql.= " WHERE rowid = ".$this->db->escape($id); else From 3d609d5fd06f6090cc874b50d0aa699b6fdb6604 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 22 Apr 2015 14:58:06 +0200 Subject: [PATCH 044/264] Sync transifex --- build/debian/control | 2 +- htdocs/langs/ar_SA/admin.lang | 36 +- htdocs/langs/ar_SA/banks.lang | 2 + htdocs/langs/ar_SA/boxes.lang | 26 +- htdocs/langs/ar_SA/errors.lang | 7 +- htdocs/langs/ar_SA/interventions.lang | 2 +- htdocs/langs/ar_SA/main.lang | 7 + htdocs/langs/ar_SA/orders.lang | 4 +- htdocs/langs/ar_SA/other.lang | 1 + htdocs/langs/ar_SA/productbatch.lang | 21 +- htdocs/langs/ar_SA/projects.lang | 1 + htdocs/langs/ar_SA/stocks.lang | 7 +- htdocs/langs/ar_SA/suppliers.lang | 2 +- htdocs/langs/ar_SA/trips.lang | 24 - htdocs/langs/bg_BG/admin.lang | 36 +- htdocs/langs/bg_BG/banks.lang | 2 + htdocs/langs/bg_BG/boxes.lang | 1 + htdocs/langs/bg_BG/errors.lang | 7 +- htdocs/langs/bg_BG/interventions.lang | 2 +- htdocs/langs/bg_BG/main.lang | 7 + htdocs/langs/bg_BG/orders.lang | 4 +- htdocs/langs/bg_BG/other.lang | 1 + htdocs/langs/bg_BG/productbatch.lang | 21 +- htdocs/langs/bg_BG/projects.lang | 1 + htdocs/langs/bg_BG/stocks.lang | 7 +- htdocs/langs/bg_BG/suppliers.lang | 2 +- htdocs/langs/bg_BG/trips.lang | 24 - htdocs/langs/bs_BA/admin.lang | 36 +- htdocs/langs/bs_BA/banks.lang | 2 + htdocs/langs/bs_BA/boxes.lang | 26 +- htdocs/langs/bs_BA/errors.lang | 7 +- htdocs/langs/bs_BA/interventions.lang | 2 +- htdocs/langs/bs_BA/main.lang | 7 + htdocs/langs/bs_BA/orders.lang | 4 +- htdocs/langs/bs_BA/other.lang | 1 + htdocs/langs/bs_BA/productbatch.lang | 21 +- htdocs/langs/bs_BA/projects.lang | 1 + htdocs/langs/bs_BA/stocks.lang | 7 +- htdocs/langs/bs_BA/suppliers.lang | 2 +- htdocs/langs/bs_BA/trips.lang | 24 - htdocs/langs/ca_ES/admin.lang | 430 ++--- htdocs/langs/ca_ES/banks.lang | 30 +- htdocs/langs/ca_ES/boxes.lang | 34 +- htdocs/langs/ca_ES/errors.lang | 7 +- htdocs/langs/ca_ES/interventions.lang | 28 +- htdocs/langs/ca_ES/main.lang | 103 +- htdocs/langs/ca_ES/orders.lang | 4 +- htdocs/langs/ca_ES/other.lang | 1 + htdocs/langs/ca_ES/productbatch.lang | 21 +- htdocs/langs/ca_ES/projects.lang | 1 + htdocs/langs/ca_ES/stocks.lang | 7 +- htdocs/langs/ca_ES/suppliers.lang | 2 +- htdocs/langs/ca_ES/trips.lang | 24 - htdocs/langs/cs_CZ/admin.lang | 36 +- htdocs/langs/cs_CZ/banks.lang | 2 + htdocs/langs/cs_CZ/boxes.lang | 26 +- htdocs/langs/cs_CZ/errors.lang | 7 +- htdocs/langs/cs_CZ/interventions.lang | 2 +- htdocs/langs/cs_CZ/main.lang | 7 + htdocs/langs/cs_CZ/orders.lang | 4 +- htdocs/langs/cs_CZ/other.lang | 1 + htdocs/langs/cs_CZ/productbatch.lang | 21 +- htdocs/langs/cs_CZ/projects.lang | 1 + htdocs/langs/cs_CZ/stocks.lang | 7 +- htdocs/langs/cs_CZ/suppliers.lang | 2 +- htdocs/langs/cs_CZ/trips.lang | 24 - htdocs/langs/da_DK/admin.lang | 36 +- htdocs/langs/da_DK/banks.lang | 2 + htdocs/langs/da_DK/boxes.lang | 64 +- htdocs/langs/da_DK/errors.lang | 7 +- htdocs/langs/da_DK/interventions.lang | 2 +- htdocs/langs/da_DK/main.lang | 7 + htdocs/langs/da_DK/orders.lang | 4 +- htdocs/langs/da_DK/other.lang | 1 + htdocs/langs/da_DK/productbatch.lang | 21 +- htdocs/langs/da_DK/projects.lang | 1 + htdocs/langs/da_DK/stocks.lang | 7 +- htdocs/langs/da_DK/suppliers.lang | 2 +- htdocs/langs/da_DK/trips.lang | 24 - htdocs/langs/de_AT/products.lang | 1 - htdocs/langs/de_DE/accountancy.lang | 12 +- htdocs/langs/de_DE/admin.lang | 272 ++-- htdocs/langs/de_DE/agenda.lang | 10 +- htdocs/langs/de_DE/banks.lang | 12 +- htdocs/langs/de_DE/boxes.lang | 36 +- htdocs/langs/de_DE/categories.lang | 154 +- htdocs/langs/de_DE/companies.lang | 2 +- htdocs/langs/de_DE/compta.lang | 32 +- htdocs/langs/de_DE/contracts.lang | 14 +- htdocs/langs/de_DE/cron.lang | 16 +- htdocs/langs/de_DE/errors.lang | 33 +- htdocs/langs/de_DE/holiday.lang | 16 +- htdocs/langs/de_DE/install.lang | 8 +- htdocs/langs/de_DE/interventions.lang | 2 +- htdocs/langs/de_DE/languages.lang | 2 +- htdocs/langs/de_DE/mailmanspip.lang | 38 +- htdocs/langs/de_DE/main.lang | 33 +- htdocs/langs/de_DE/members.lang | 8 +- htdocs/langs/de_DE/orders.lang | 36 +- htdocs/langs/de_DE/other.lang | 19 +- htdocs/langs/de_DE/productbatch.lang | 29 +- htdocs/langs/de_DE/products.lang | 156 +- htdocs/langs/de_DE/projects.lang | 25 +- htdocs/langs/de_DE/propal.lang | 10 +- htdocs/langs/de_DE/sendings.lang | 58 +- htdocs/langs/de_DE/stocks.lang | 39 +- htdocs/langs/de_DE/suppliers.lang | 8 +- htdocs/langs/de_DE/trips.lang | 168 +- htdocs/langs/de_DE/withdrawals.lang | 6 +- htdocs/langs/de_DE/workflow.lang | 2 +- htdocs/langs/el_GR/admin.lang | 64 +- htdocs/langs/el_GR/banks.lang | 2 + htdocs/langs/el_GR/bills.lang | 35 +- htdocs/langs/el_GR/boxes.lang | 1 + htdocs/langs/el_GR/errors.lang | 7 +- htdocs/langs/el_GR/interventions.lang | 2 +- htdocs/langs/el_GR/main.lang | 7 + htdocs/langs/el_GR/orders.lang | 14 +- htdocs/langs/el_GR/other.lang | 1 + htdocs/langs/el_GR/productbatch.lang | 21 +- htdocs/langs/el_GR/projects.lang | 1 + htdocs/langs/el_GR/stocks.lang | 31 +- htdocs/langs/el_GR/suppliers.lang | 2 +- htdocs/langs/el_GR/trips.lang | 38 +- htdocs/langs/en_GB/admin.lang | 8 + htdocs/langs/en_GB/interventions.lang | 2 + htdocs/langs/en_GB/main.lang | 2 +- htdocs/langs/en_GB/orders.lang | 1 + htdocs/langs/en_GB/productbatch.lang | 11 + htdocs/langs/en_GB/stocks.lang | 2 + htdocs/langs/es_AR/admin.lang | 10 + htdocs/langs/es_AR/interventions.lang | 2 + htdocs/langs/es_AR/orders.lang | 2 + htdocs/langs/es_AR/other.lang | 3 + htdocs/langs/es_AR/productbatch.lang | 11 + htdocs/langs/es_AR/stocks.lang | 3 +- htdocs/langs/es_AR/trips.lang | 1 + htdocs/langs/es_CO/admin.lang | 10 + htdocs/langs/es_CO/interventions.lang | 2 + htdocs/langs/es_CO/main.lang | 1 + htdocs/langs/es_CO/orders.lang | 2 + htdocs/langs/es_CO/other.lang | 3 + htdocs/langs/es_CO/productbatch.lang | 11 + htdocs/langs/es_CO/stocks.lang | 2 + htdocs/langs/es_CO/trips.lang | 1 + htdocs/langs/es_ES/admin.lang | 78 +- htdocs/langs/es_ES/agenda.lang | 8 +- htdocs/langs/es_ES/banks.lang | 2 + htdocs/langs/es_ES/bills.lang | 5 +- htdocs/langs/es_ES/boxes.lang | 1 + htdocs/langs/es_ES/categories.lang | 150 +- htdocs/langs/es_ES/cron.lang | 16 +- htdocs/langs/es_ES/donations.lang | 10 +- htdocs/langs/es_ES/errors.lang | 17 +- htdocs/langs/es_ES/install.lang | 2 +- htdocs/langs/es_ES/interventions.lang | 2 +- htdocs/langs/es_ES/mails.lang | 4 +- htdocs/langs/es_ES/main.lang | 19 +- htdocs/langs/es_ES/orders.lang | 14 +- htdocs/langs/es_ES/other.lang | 9 +- htdocs/langs/es_ES/productbatch.lang | 5 +- htdocs/langs/es_ES/products.lang | 30 +- htdocs/langs/es_ES/projects.lang | 3 +- htdocs/langs/es_ES/sendings.lang | 2 +- htdocs/langs/es_ES/stocks.lang | 5 + htdocs/langs/es_ES/suppliers.lang | 2 +- htdocs/langs/es_ES/trips.lang | 180 +-- htdocs/langs/et_EE/admin.lang | 36 +- htdocs/langs/et_EE/banks.lang | 2 + htdocs/langs/et_EE/boxes.lang | 1 + htdocs/langs/et_EE/errors.lang | 7 +- htdocs/langs/et_EE/interventions.lang | 2 +- htdocs/langs/et_EE/main.lang | 7 + htdocs/langs/et_EE/orders.lang | 4 +- htdocs/langs/et_EE/other.lang | 1 + htdocs/langs/et_EE/productbatch.lang | 21 +- htdocs/langs/et_EE/projects.lang | 1 + htdocs/langs/et_EE/stocks.lang | 7 +- htdocs/langs/et_EE/suppliers.lang | 2 +- htdocs/langs/et_EE/trips.lang | 24 - htdocs/langs/eu_ES/admin.lang | 36 +- htdocs/langs/eu_ES/banks.lang | 2 + htdocs/langs/eu_ES/boxes.lang | 186 +-- htdocs/langs/eu_ES/errors.lang | 7 +- htdocs/langs/eu_ES/interventions.lang | 2 +- htdocs/langs/eu_ES/main.lang | 7 + htdocs/langs/eu_ES/orders.lang | 4 +- htdocs/langs/eu_ES/other.lang | 1 + htdocs/langs/eu_ES/productbatch.lang | 21 +- htdocs/langs/eu_ES/projects.lang | 1 + htdocs/langs/eu_ES/stocks.lang | 7 +- htdocs/langs/eu_ES/suppliers.lang | 2 +- htdocs/langs/eu_ES/trips.lang | 24 - htdocs/langs/fa_IR/admin.lang | 36 +- htdocs/langs/fa_IR/banks.lang | 2 + htdocs/langs/fa_IR/boxes.lang | 50 +- htdocs/langs/fa_IR/errors.lang | 7 +- htdocs/langs/fa_IR/interventions.lang | 2 +- htdocs/langs/fa_IR/main.lang | 7 + htdocs/langs/fa_IR/orders.lang | 4 +- htdocs/langs/fa_IR/other.lang | 1 + htdocs/langs/fa_IR/productbatch.lang | 21 +- htdocs/langs/fa_IR/projects.lang | 1 + htdocs/langs/fa_IR/stocks.lang | 7 +- htdocs/langs/fa_IR/suppliers.lang | 2 +- htdocs/langs/fa_IR/trips.lang | 24 - htdocs/langs/fi_FI/admin.lang | 36 +- htdocs/langs/fi_FI/banks.lang | 2 + htdocs/langs/fi_FI/boxes.lang | 26 +- htdocs/langs/fi_FI/errors.lang | 7 +- htdocs/langs/fi_FI/interventions.lang | 2 +- htdocs/langs/fi_FI/main.lang | 7 + htdocs/langs/fi_FI/orders.lang | 4 +- htdocs/langs/fi_FI/other.lang | 1 + htdocs/langs/fi_FI/productbatch.lang | 21 +- htdocs/langs/fi_FI/projects.lang | 1 + htdocs/langs/fi_FI/stocks.lang | 7 +- htdocs/langs/fi_FI/suppliers.lang | 2 +- htdocs/langs/fi_FI/trips.lang | 24 - htdocs/langs/fr_FR/admin.lang | 52 +- htdocs/langs/fr_FR/banks.lang | 2 + htdocs/langs/fr_FR/bills.lang | 1 + htdocs/langs/fr_FR/boxes.lang | 1 + htdocs/langs/fr_FR/categories.lang | 142 +- htdocs/langs/fr_FR/companies.lang | 6 +- htdocs/langs/fr_FR/compta.lang | 2 +- htdocs/langs/fr_FR/donations.lang | 2 +- htdocs/langs/fr_FR/errors.lang | 5 +- htdocs/langs/fr_FR/install.lang | 4 +- htdocs/langs/fr_FR/interventions.lang | 2 +- htdocs/langs/fr_FR/main.lang | 17 +- htdocs/langs/fr_FR/orders.lang | 4 +- htdocs/langs/fr_FR/other.lang | 1 + htdocs/langs/fr_FR/productbatch.lang | 7 +- htdocs/langs/fr_FR/products.lang | 14 +- htdocs/langs/fr_FR/projects.lang | 1 + htdocs/langs/fr_FR/stocks.lang | 7 +- htdocs/langs/fr_FR/trips.lang | 26 +- htdocs/langs/he_IL/admin.lang | 36 +- htdocs/langs/he_IL/banks.lang | 2 + htdocs/langs/he_IL/boxes.lang | 184 ++- htdocs/langs/he_IL/errors.lang | 7 +- htdocs/langs/he_IL/interventions.lang | 2 +- htdocs/langs/he_IL/main.lang | 7 + htdocs/langs/he_IL/orders.lang | 4 +- htdocs/langs/he_IL/other.lang | 1 + htdocs/langs/he_IL/productbatch.lang | 21 +- htdocs/langs/he_IL/projects.lang | 1 + htdocs/langs/he_IL/stocks.lang | 7 +- htdocs/langs/he_IL/suppliers.lang | 2 +- htdocs/langs/he_IL/trips.lang | 24 - htdocs/langs/hr_HR/admin.lang | 36 +- htdocs/langs/hr_HR/banks.lang | 2 + htdocs/langs/hr_HR/boxes.lang | 26 +- htdocs/langs/hr_HR/errors.lang | 7 +- htdocs/langs/hr_HR/interventions.lang | 2 +- htdocs/langs/hr_HR/main.lang | 7 + htdocs/langs/hr_HR/orders.lang | 4 +- htdocs/langs/hr_HR/other.lang | 1 + htdocs/langs/hr_HR/productbatch.lang | 21 +- htdocs/langs/hr_HR/projects.lang | 1 + htdocs/langs/hr_HR/stocks.lang | 7 +- htdocs/langs/hr_HR/suppliers.lang | 2 +- htdocs/langs/hr_HR/trips.lang | 24 - htdocs/langs/hu_HU/admin.lang | 316 ++-- htdocs/langs/hu_HU/banks.lang | 2 + htdocs/langs/hu_HU/boxes.lang | 64 +- htdocs/langs/hu_HU/errors.lang | 7 +- htdocs/langs/hu_HU/interventions.lang | 2 +- htdocs/langs/hu_HU/main.lang | 7 + htdocs/langs/hu_HU/orders.lang | 4 +- htdocs/langs/hu_HU/other.lang | 1 + htdocs/langs/hu_HU/productbatch.lang | 21 +- htdocs/langs/hu_HU/projects.lang | 1 + htdocs/langs/hu_HU/stocks.lang | 7 +- htdocs/langs/hu_HU/suppliers.lang | 2 +- htdocs/langs/hu_HU/trips.lang | 24 - htdocs/langs/id_ID/admin.lang | 36 +- htdocs/langs/id_ID/banks.lang | 2 + htdocs/langs/id_ID/boxes.lang | 26 +- htdocs/langs/id_ID/errors.lang | 7 +- htdocs/langs/id_ID/interventions.lang | 2 +- htdocs/langs/id_ID/main.lang | 7 + htdocs/langs/id_ID/orders.lang | 4 +- htdocs/langs/id_ID/other.lang | 1 + htdocs/langs/id_ID/productbatch.lang | 21 +- htdocs/langs/id_ID/projects.lang | 1 + htdocs/langs/id_ID/stocks.lang | 7 +- htdocs/langs/id_ID/suppliers.lang | 2 +- htdocs/langs/id_ID/trips.lang | 24 - htdocs/langs/is_IS/admin.lang | 36 +- htdocs/langs/is_IS/banks.lang | 2 + htdocs/langs/is_IS/boxes.lang | 26 +- htdocs/langs/is_IS/errors.lang | 7 +- htdocs/langs/is_IS/interventions.lang | 2 +- htdocs/langs/is_IS/main.lang | 7 + htdocs/langs/is_IS/orders.lang | 4 +- htdocs/langs/is_IS/other.lang | 1 + htdocs/langs/is_IS/productbatch.lang | 21 +- htdocs/langs/is_IS/projects.lang | 1 + htdocs/langs/is_IS/stocks.lang | 7 +- htdocs/langs/is_IS/suppliers.lang | 2 +- htdocs/langs/is_IS/trips.lang | 24 - htdocs/langs/it_IT/accountancy.lang | 10 +- htdocs/langs/it_IT/admin.lang | 112 +- htdocs/langs/it_IT/banks.lang | 14 +- htdocs/langs/it_IT/bills.lang | 57 +- htdocs/langs/it_IT/boxes.lang | 32 +- htdocs/langs/it_IT/categories.lang | 112 +- htdocs/langs/it_IT/commercial.lang | 2 +- htdocs/langs/it_IT/contracts.lang | 8 +- htdocs/langs/it_IT/cron.lang | 24 +- htdocs/langs/it_IT/dict.lang | 6 +- htdocs/langs/it_IT/donations.lang | 6 +- htdocs/langs/it_IT/ecm.lang | 4 +- htdocs/langs/it_IT/errors.lang | 9 +- htdocs/langs/it_IT/install.lang | 6 +- htdocs/langs/it_IT/interventions.lang | 18 +- htdocs/langs/it_IT/languages.lang | 2 +- htdocs/langs/it_IT/mails.lang | 12 +- htdocs/langs/it_IT/main.lang | 37 +- htdocs/langs/it_IT/margins.lang | 4 +- htdocs/langs/it_IT/members.lang | 2 +- htdocs/langs/it_IT/orders.lang | 6 +- htdocs/langs/it_IT/other.lang | 1 + htdocs/langs/it_IT/printipp.lang | 18 +- htdocs/langs/it_IT/productbatch.lang | 35 +- htdocs/langs/it_IT/products.lang | 72 +- htdocs/langs/it_IT/projects.lang | 37 +- htdocs/langs/it_IT/resource.lang | 4 +- htdocs/langs/it_IT/stocks.lang | 37 +- htdocs/langs/it_IT/suppliers.lang | 4 +- htdocs/langs/it_IT/trips.lang | 178 +- htdocs/langs/it_IT/users.lang | 2 +- htdocs/langs/it_IT/workflow.lang | 2 +- htdocs/langs/ja_JP/admin.lang | 36 +- htdocs/langs/ja_JP/banks.lang | 2 + htdocs/langs/ja_JP/boxes.lang | 26 +- htdocs/langs/ja_JP/errors.lang | 7 +- htdocs/langs/ja_JP/interventions.lang | 2 +- htdocs/langs/ja_JP/main.lang | 7 + htdocs/langs/ja_JP/orders.lang | 4 +- htdocs/langs/ja_JP/other.lang | 1 + htdocs/langs/ja_JP/productbatch.lang | 21 +- htdocs/langs/ja_JP/projects.lang | 1 + htdocs/langs/ja_JP/stocks.lang | 7 +- htdocs/langs/ja_JP/suppliers.lang | 2 +- htdocs/langs/ja_JP/trips.lang | 24 - htdocs/langs/ka_GE/admin.lang | 36 +- htdocs/langs/ka_GE/banks.lang | 2 + htdocs/langs/ka_GE/boxes.lang | 1 + htdocs/langs/ka_GE/errors.lang | 7 +- htdocs/langs/ka_GE/interventions.lang | 2 +- htdocs/langs/ka_GE/main.lang | 7 + htdocs/langs/ka_GE/orders.lang | 4 +- htdocs/langs/ka_GE/other.lang | 1 + htdocs/langs/ka_GE/productbatch.lang | 21 +- htdocs/langs/ka_GE/projects.lang | 1 + htdocs/langs/ka_GE/stocks.lang | 7 +- htdocs/langs/ka_GE/suppliers.lang | 2 +- htdocs/langs/ka_GE/trips.lang | 24 - htdocs/langs/kn_IN/admin.lang | 36 +- htdocs/langs/kn_IN/banks.lang | 2 + htdocs/langs/kn_IN/boxes.lang | 1 + htdocs/langs/kn_IN/errors.lang | 7 +- htdocs/langs/kn_IN/interventions.lang | 2 +- htdocs/langs/kn_IN/main.lang | 7 + htdocs/langs/kn_IN/orders.lang | 4 +- htdocs/langs/kn_IN/other.lang | 1 + htdocs/langs/kn_IN/productbatch.lang | 21 +- htdocs/langs/kn_IN/projects.lang | 1 + htdocs/langs/kn_IN/stocks.lang | 7 +- htdocs/langs/kn_IN/suppliers.lang | 2 +- htdocs/langs/kn_IN/trips.lang | 24 - htdocs/langs/ko_KR/admin.lang | 36 +- htdocs/langs/ko_KR/banks.lang | 2 + htdocs/langs/ko_KR/boxes.lang | 186 +-- htdocs/langs/ko_KR/errors.lang | 7 +- htdocs/langs/ko_KR/interventions.lang | 2 +- htdocs/langs/ko_KR/main.lang | 7 + htdocs/langs/ko_KR/orders.lang | 4 +- htdocs/langs/ko_KR/other.lang | 1 + htdocs/langs/ko_KR/productbatch.lang | 21 +- htdocs/langs/ko_KR/projects.lang | 1 + htdocs/langs/ko_KR/stocks.lang | 7 +- htdocs/langs/ko_KR/suppliers.lang | 2 +- htdocs/langs/ko_KR/trips.lang | 24 - htdocs/langs/lo_LA/admin.lang | 36 +- htdocs/langs/lo_LA/banks.lang | 2 + htdocs/langs/lo_LA/boxes.lang | 1 + htdocs/langs/lo_LA/errors.lang | 7 +- htdocs/langs/lo_LA/interventions.lang | 2 +- htdocs/langs/lo_LA/main.lang | 7 + htdocs/langs/lo_LA/orders.lang | 4 +- htdocs/langs/lo_LA/other.lang | 1 + htdocs/langs/lo_LA/productbatch.lang | 21 +- htdocs/langs/lo_LA/projects.lang | 1 + htdocs/langs/lo_LA/stocks.lang | 7 +- htdocs/langs/lo_LA/suppliers.lang | 2 +- htdocs/langs/lo_LA/trips.lang | 24 - htdocs/langs/lt_LT/accountancy.lang | 224 +-- htdocs/langs/lt_LT/admin.lang | 358 +++-- htdocs/langs/lt_LT/agenda.lang | 8 +- htdocs/langs/lt_LT/banks.lang | 16 +- htdocs/langs/lt_LT/boxes.lang | 186 +-- htdocs/langs/lt_LT/commercial.lang | 14 +- htdocs/langs/lt_LT/companies.lang | 26 +- htdocs/langs/lt_LT/contracts.lang | 14 +- htdocs/langs/lt_LT/deliveries.lang | 50 +- htdocs/langs/lt_LT/ecm.lang | 4 +- htdocs/langs/lt_LT/errors.lang | 7 +- htdocs/langs/lt_LT/exports.lang | 6 +- htdocs/langs/lt_LT/install.lang | 8 +- htdocs/langs/lt_LT/interventions.lang | 2 +- htdocs/langs/lt_LT/main.lang | 7 + htdocs/langs/lt_LT/members.lang | 6 +- htdocs/langs/lt_LT/orders.lang | 40 +- htdocs/langs/lt_LT/other.lang | 1 + htdocs/langs/lt_LT/productbatch.lang | 21 +- htdocs/langs/lt_LT/projects.lang | 1 + htdocs/langs/lt_LT/propal.lang | 4 +- htdocs/langs/lt_LT/resource.lang | 54 +- htdocs/langs/lt_LT/stocks.lang | 7 +- htdocs/langs/lt_LT/suppliers.lang | 4 +- htdocs/langs/lt_LT/trips.lang | 216 ++- htdocs/langs/lt_LT/users.lang | 12 +- htdocs/langs/lt_LT/withdrawals.lang | 14 +- htdocs/langs/lv_LV/admin.lang | 36 +- htdocs/langs/lv_LV/banks.lang | 6 +- htdocs/langs/lv_LV/bills.lang | 1 + htdocs/langs/lv_LV/boxes.lang | 26 +- htdocs/langs/lv_LV/errors.lang | 7 +- htdocs/langs/lv_LV/interventions.lang | 2 +- htdocs/langs/lv_LV/main.lang | 7 + htdocs/langs/lv_LV/orders.lang | 4 +- htdocs/langs/lv_LV/other.lang | 1 + htdocs/langs/lv_LV/productbatch.lang | 21 +- htdocs/langs/lv_LV/products.lang | 4 +- htdocs/langs/lv_LV/projects.lang | 1 + htdocs/langs/lv_LV/stocks.lang | 7 +- htdocs/langs/lv_LV/suppliers.lang | 2 +- htdocs/langs/lv_LV/trips.lang | 62 +- htdocs/langs/mk_MK/admin.lang | 36 +- htdocs/langs/mk_MK/banks.lang | 2 + htdocs/langs/mk_MK/boxes.lang | 186 +-- htdocs/langs/mk_MK/errors.lang | 7 +- htdocs/langs/mk_MK/interventions.lang | 2 +- htdocs/langs/mk_MK/main.lang | 7 + htdocs/langs/mk_MK/orders.lang | 4 +- htdocs/langs/mk_MK/other.lang | 1 + htdocs/langs/mk_MK/productbatch.lang | 21 +- htdocs/langs/mk_MK/projects.lang | 1 + htdocs/langs/mk_MK/stocks.lang | 7 +- htdocs/langs/mk_MK/suppliers.lang | 2 +- htdocs/langs/mk_MK/trips.lang | 24 - htdocs/langs/nb_NO/admin.lang | 76 +- htdocs/langs/nb_NO/banks.lang | 2 + htdocs/langs/nb_NO/boxes.lang | 1 + htdocs/langs/nb_NO/errors.lang | 7 +- htdocs/langs/nb_NO/interventions.lang | 2 +- htdocs/langs/nb_NO/main.lang | 7 + htdocs/langs/nb_NO/orders.lang | 4 +- htdocs/langs/nb_NO/other.lang | 1 + htdocs/langs/nb_NO/productbatch.lang | 21 +- htdocs/langs/nb_NO/projects.lang | 1 + htdocs/langs/nb_NO/sendings.lang | 2 +- htdocs/langs/nb_NO/stocks.lang | 7 +- htdocs/langs/nb_NO/suppliers.lang | 2 +- htdocs/langs/nb_NO/trips.lang | 24 - htdocs/langs/nl_BE/bills.lang | 2 - htdocs/langs/nl_NL/admin.lang | 292 ++-- htdocs/langs/nl_NL/agenda.lang | 42 +- htdocs/langs/nl_NL/banks.lang | 14 +- htdocs/langs/nl_NL/bills.lang | 103 +- htdocs/langs/nl_NL/boxes.lang | 22 +- htdocs/langs/nl_NL/categories.lang | 150 +- htdocs/langs/nl_NL/companies.lang | 22 +- htdocs/langs/nl_NL/compta.lang | 36 +- htdocs/langs/nl_NL/contracts.lang | 10 +- htdocs/langs/nl_NL/deliveries.lang | 2 + htdocs/langs/nl_NL/donations.lang | 18 +- htdocs/langs/nl_NL/ecm.lang | 4 +- htdocs/langs/nl_NL/errors.lang | 7 +- htdocs/langs/nl_NL/exports.lang | 12 +- htdocs/langs/nl_NL/externalsite.lang | 2 +- htdocs/langs/nl_NL/help.lang | 4 +- htdocs/langs/nl_NL/install.lang | 6 +- htdocs/langs/nl_NL/interventions.lang | 28 +- htdocs/langs/nl_NL/languages.lang | 2 +- htdocs/langs/nl_NL/main.lang | 55 +- htdocs/langs/nl_NL/margins.lang | 10 +- htdocs/langs/nl_NL/orders.lang | 40 +- htdocs/langs/nl_NL/other.lang | 1 + htdocs/langs/nl_NL/productbatch.lang | 41 +- htdocs/langs/nl_NL/products.lang | 130 +- htdocs/langs/nl_NL/projects.lang | 109 +- htdocs/langs/nl_NL/propal.lang | 14 +- htdocs/langs/nl_NL/resource.lang | 4 +- htdocs/langs/nl_NL/salaries.lang | 24 +- htdocs/langs/nl_NL/sendings.lang | 32 +- htdocs/langs/nl_NL/stocks.lang | 63 +- htdocs/langs/nl_NL/suppliers.lang | 14 +- htdocs/langs/nl_NL/trips.lang | 24 - htdocs/langs/nl_NL/users.lang | 12 +- htdocs/langs/nl_NL/workflow.lang | 8 +- htdocs/langs/pl_PL/admin.lang | 880 +++++----- htdocs/langs/pl_PL/banks.lang | 40 +- htdocs/langs/pl_PL/bills.lang | 193 +-- htdocs/langs/pl_PL/boxes.lang | 133 +- htdocs/langs/pl_PL/deliveries.lang | 24 +- htdocs/langs/pl_PL/errors.lang | 21 +- htdocs/langs/pl_PL/interventions.lang | 32 +- htdocs/langs/pl_PL/main.lang | 21 +- htdocs/langs/pl_PL/orders.lang | 16 +- htdocs/langs/pl_PL/other.lang | 9 +- htdocs/langs/pl_PL/productbatch.lang | 21 +- htdocs/langs/pl_PL/products.lang | 30 +- htdocs/langs/pl_PL/projects.lang | 155 +- htdocs/langs/pl_PL/stocks.lang | 31 +- htdocs/langs/pl_PL/suppliers.lang | 2 +- htdocs/langs/pl_PL/trips.lang | 24 - htdocs/langs/pt_BR/admin.lang | 16 +- htdocs/langs/pt_BR/banks.lang | 1 - htdocs/langs/pt_BR/boxes.lang | 22 +- htdocs/langs/pt_BR/interventions.lang | 12 +- htdocs/langs/pt_BR/margins.lang | 2 - htdocs/langs/pt_BR/productbatch.lang | 3 - htdocs/langs/pt_BR/stocks.lang | 3 +- htdocs/langs/pt_BR/suppliers.lang | 1 + htdocs/langs/pt_BR/trips.lang | 21 +- htdocs/langs/pt_PT/admin.lang | 72 +- htdocs/langs/pt_PT/banks.lang | 2 + htdocs/langs/pt_PT/boxes.lang | 1 + htdocs/langs/pt_PT/errors.lang | 7 +- htdocs/langs/pt_PT/interventions.lang | 2 +- htdocs/langs/pt_PT/main.lang | 35 +- htdocs/langs/pt_PT/orders.lang | 4 +- htdocs/langs/pt_PT/other.lang | 1 + htdocs/langs/pt_PT/productbatch.lang | 25 +- htdocs/langs/pt_PT/projects.lang | 1 + htdocs/langs/pt_PT/stocks.lang | 7 +- htdocs/langs/pt_PT/suppliers.lang | 12 +- htdocs/langs/pt_PT/trips.lang | 118 +- htdocs/langs/ro_RO/admin.lang | 36 +- htdocs/langs/ro_RO/banks.lang | 2 + htdocs/langs/ro_RO/boxes.lang | 1 + htdocs/langs/ro_RO/categories.lang | 20 +- htdocs/langs/ro_RO/errors.lang | 7 +- htdocs/langs/ro_RO/interventions.lang | 2 +- htdocs/langs/ro_RO/main.lang | 7 + htdocs/langs/ro_RO/orders.lang | 8 +- htdocs/langs/ro_RO/other.lang | 1 + htdocs/langs/ro_RO/productbatch.lang | 21 +- htdocs/langs/ro_RO/projects.lang | 1 + htdocs/langs/ro_RO/stocks.lang | 11 +- htdocs/langs/ro_RO/suppliers.lang | 2 +- htdocs/langs/ro_RO/trips.lang | 188 +-- htdocs/langs/ru_RU/admin.lang | 116 +- htdocs/langs/ru_RU/banks.lang | 8 +- htdocs/langs/ru_RU/boxes.lang | 1 + htdocs/langs/ru_RU/donations.lang | 10 +- htdocs/langs/ru_RU/errors.lang | 21 +- htdocs/langs/ru_RU/interventions.lang | 4 +- htdocs/langs/ru_RU/main.lang | 13 +- htdocs/langs/ru_RU/orders.lang | 14 +- htdocs/langs/ru_RU/other.lang | 15 +- htdocs/langs/ru_RU/productbatch.lang | 19 +- htdocs/langs/ru_RU/products.lang | 52 +- htdocs/langs/ru_RU/projects.lang | 13 +- htdocs/langs/ru_RU/stocks.lang | 7 +- htdocs/langs/ru_RU/suppliers.lang | 2 +- htdocs/langs/ru_RU/trips.lang | 24 - htdocs/langs/ru_UA/banks.lang | 1 - htdocs/langs/sk_SK/accountancy.lang | 28 +- htdocs/langs/sk_SK/admin.lang | 168 +- htdocs/langs/sk_SK/banks.lang | 2 + htdocs/langs/sk_SK/boxes.lang | 30 +- htdocs/langs/sk_SK/commercial.lang | 10 +- htdocs/langs/sk_SK/companies.lang | 32 +- htdocs/langs/sk_SK/errors.lang | 7 +- htdocs/langs/sk_SK/help.lang | 8 +- htdocs/langs/sk_SK/install.lang | 96 +- htdocs/langs/sk_SK/interventions.lang | 64 +- htdocs/langs/sk_SK/languages.lang | 36 +- htdocs/langs/sk_SK/main.lang | 101 +- htdocs/langs/sk_SK/opensurvey.lang | 50 +- htdocs/langs/sk_SK/orders.lang | 28 +- htdocs/langs/sk_SK/other.lang | 7 +- htdocs/langs/sk_SK/printipp.lang | 24 +- htdocs/langs/sk_SK/productbatch.lang | 21 +- htdocs/langs/sk_SK/projects.lang | 1 + htdocs/langs/sk_SK/salaries.lang | 24 +- htdocs/langs/sk_SK/sendings.lang | 26 +- htdocs/langs/sk_SK/sms.lang | 18 +- htdocs/langs/sk_SK/stocks.lang | 75 +- htdocs/langs/sk_SK/suppliers.lang | 66 +- htdocs/langs/sk_SK/trips.lang | 24 - htdocs/langs/sk_SK/users.lang | 122 +- htdocs/langs/sl_SI/admin.lang | 148 +- htdocs/langs/sl_SI/banks.lang | 12 +- htdocs/langs/sl_SI/boxes.lang | 26 +- htdocs/langs/sl_SI/errors.lang | 7 +- htdocs/langs/sl_SI/interventions.lang | 2 +- htdocs/langs/sl_SI/main.lang | 15 +- htdocs/langs/sl_SI/orders.lang | 18 +- htdocs/langs/sl_SI/other.lang | 13 +- htdocs/langs/sl_SI/productbatch.lang | 21 +- htdocs/langs/sl_SI/projects.lang | 1 + htdocs/langs/sl_SI/stocks.lang | 11 +- htdocs/langs/sl_SI/suppliers.lang | 4 +- htdocs/langs/sl_SI/trips.lang | 24 - htdocs/langs/sq_AL/admin.lang | 36 +- htdocs/langs/sq_AL/banks.lang | 2 + htdocs/langs/sq_AL/boxes.lang | 26 +- htdocs/langs/sq_AL/errors.lang | 7 +- htdocs/langs/sq_AL/interventions.lang | 2 +- htdocs/langs/sq_AL/main.lang | 7 + htdocs/langs/sq_AL/orders.lang | 4 +- htdocs/langs/sq_AL/other.lang | 1 + htdocs/langs/sq_AL/productbatch.lang | 21 +- htdocs/langs/sq_AL/projects.lang | 1 + htdocs/langs/sq_AL/stocks.lang | 7 +- htdocs/langs/sq_AL/suppliers.lang | 2 +- htdocs/langs/sq_AL/trips.lang | 24 - htdocs/langs/sv_SE/admin.lang | 38 +- htdocs/langs/sv_SE/banks.lang | 2 + htdocs/langs/sv_SE/boxes.lang | 1 + htdocs/langs/sv_SE/errors.lang | 7 +- htdocs/langs/sv_SE/interventions.lang | 2 +- htdocs/langs/sv_SE/main.lang | 7 + htdocs/langs/sv_SE/orders.lang | 4 +- htdocs/langs/sv_SE/other.lang | 1 + htdocs/langs/sv_SE/productbatch.lang | 21 +- htdocs/langs/sv_SE/projects.lang | 1 + htdocs/langs/sv_SE/stocks.lang | 7 +- htdocs/langs/sv_SE/suppliers.lang | 2 +- htdocs/langs/sv_SE/trips.lang | 24 - htdocs/langs/sw_SW/admin.lang | 36 +- htdocs/langs/sw_SW/banks.lang | 2 + htdocs/langs/sw_SW/boxes.lang | 1 + htdocs/langs/sw_SW/errors.lang | 7 +- htdocs/langs/sw_SW/interventions.lang | 2 +- htdocs/langs/sw_SW/main.lang | 7 + htdocs/langs/sw_SW/orders.lang | 4 +- htdocs/langs/sw_SW/other.lang | 1 + htdocs/langs/sw_SW/productbatch.lang | 21 +- htdocs/langs/sw_SW/projects.lang | 1 + htdocs/langs/sw_SW/stocks.lang | 7 +- htdocs/langs/sw_SW/suppliers.lang | 2 +- htdocs/langs/sw_SW/trips.lang | 24 - htdocs/langs/th_TH/admin.lang | 36 +- htdocs/langs/th_TH/banks.lang | 2 + htdocs/langs/th_TH/boxes.lang | 26 +- htdocs/langs/th_TH/errors.lang | 7 +- htdocs/langs/th_TH/interventions.lang | 2 +- htdocs/langs/th_TH/main.lang | 7 + htdocs/langs/th_TH/orders.lang | 4 +- htdocs/langs/th_TH/other.lang | 1 + htdocs/langs/th_TH/productbatch.lang | 21 +- htdocs/langs/th_TH/projects.lang | 1 + htdocs/langs/th_TH/stocks.lang | 7 +- htdocs/langs/th_TH/suppliers.lang | 2 +- htdocs/langs/th_TH/trips.lang | 24 - htdocs/langs/tr_TR/accountancy.lang | 8 +- htdocs/langs/tr_TR/admin.lang | 86 +- htdocs/langs/tr_TR/agenda.lang | 8 +- htdocs/langs/tr_TR/banks.lang | 2 + htdocs/langs/tr_TR/bills.lang | 5 +- htdocs/langs/tr_TR/boxes.lang | 3 +- htdocs/langs/tr_TR/cashdesk.lang | 2 +- htdocs/langs/tr_TR/categories.lang | 150 +- htdocs/langs/tr_TR/companies.lang | 2 +- htdocs/langs/tr_TR/compta.lang | 10 +- htdocs/langs/tr_TR/cron.lang | 16 +- htdocs/langs/tr_TR/donations.lang | 10 +- htdocs/langs/tr_TR/errors.lang | 19 +- htdocs/langs/tr_TR/exports.lang | 2 +- htdocs/langs/tr_TR/interventions.lang | 2 +- htdocs/langs/tr_TR/mails.lang | 4 +- htdocs/langs/tr_TR/main.lang | 15 +- htdocs/langs/tr_TR/margins.lang | 2 +- htdocs/langs/tr_TR/orders.lang | 14 +- htdocs/langs/tr_TR/other.lang | 9 +- htdocs/langs/tr_TR/productbatch.lang | 17 +- htdocs/langs/tr_TR/products.lang | 40 +- htdocs/langs/tr_TR/projects.lang | 3 +- htdocs/langs/tr_TR/sendings.lang | 2 +- htdocs/langs/tr_TR/stocks.lang | 7 +- htdocs/langs/tr_TR/suppliers.lang | 2 +- htdocs/langs/tr_TR/trips.lang | 24 - htdocs/langs/uk_UA/admin.lang | 36 +- htdocs/langs/uk_UA/banks.lang | 2 + htdocs/langs/uk_UA/boxes.lang | 1 + htdocs/langs/uk_UA/errors.lang | 7 +- htdocs/langs/uk_UA/interventions.lang | 2 +- htdocs/langs/uk_UA/main.lang | 7 + htdocs/langs/uk_UA/orders.lang | 4 +- htdocs/langs/uk_UA/other.lang | 1 + htdocs/langs/uk_UA/productbatch.lang | 21 +- htdocs/langs/uk_UA/projects.lang | 1 + htdocs/langs/uk_UA/stocks.lang | 7 +- htdocs/langs/uk_UA/suppliers.lang | 2 +- htdocs/langs/uk_UA/trips.lang | 24 - htdocs/langs/uz_UZ/admin.lang | 36 +- htdocs/langs/uz_UZ/banks.lang | 2 + htdocs/langs/uz_UZ/boxes.lang | 26 +- htdocs/langs/uz_UZ/errors.lang | 7 +- htdocs/langs/uz_UZ/interventions.lang | 2 +- htdocs/langs/uz_UZ/main.lang | 7 + htdocs/langs/uz_UZ/orders.lang | 4 +- htdocs/langs/uz_UZ/other.lang | 1 + htdocs/langs/uz_UZ/productbatch.lang | 21 +- htdocs/langs/uz_UZ/projects.lang | 1 + htdocs/langs/uz_UZ/stocks.lang | 7 +- htdocs/langs/uz_UZ/suppliers.lang | 2 +- htdocs/langs/uz_UZ/trips.lang | 24 - htdocs/langs/vi_VN/admin.lang | 2142 +++++++++++++------------ htdocs/langs/vi_VN/banks.lang | 2 + htdocs/langs/vi_VN/bills.lang | 633 ++++---- htdocs/langs/vi_VN/boxes.lang | 1 + htdocs/langs/vi_VN/companies.lang | 466 +++--- htdocs/langs/vi_VN/deliveries.lang | 40 +- htdocs/langs/vi_VN/errors.lang | 7 +- htdocs/langs/vi_VN/interventions.lang | 2 +- htdocs/langs/vi_VN/main.lang | 701 ++++---- htdocs/langs/vi_VN/orders.lang | 268 ++-- htdocs/langs/vi_VN/other.lang | 1 + htdocs/langs/vi_VN/productbatch.lang | 39 +- htdocs/langs/vi_VN/projects.lang | 185 +-- htdocs/langs/vi_VN/propal.lang | 152 +- htdocs/langs/vi_VN/stocks.lang | 7 +- htdocs/langs/vi_VN/suppliers.lang | 64 +- htdocs/langs/vi_VN/trips.lang | 24 - htdocs/langs/vi_VN/users.lang | 152 +- htdocs/langs/zh_CN/admin.lang | 36 +- htdocs/langs/zh_CN/banks.lang | 2 + htdocs/langs/zh_CN/boxes.lang | 30 +- htdocs/langs/zh_CN/errors.lang | 7 +- htdocs/langs/zh_CN/interventions.lang | 2 +- htdocs/langs/zh_CN/main.lang | 7 + htdocs/langs/zh_CN/orders.lang | 4 +- htdocs/langs/zh_CN/other.lang | 1 + htdocs/langs/zh_CN/productbatch.lang | 21 +- htdocs/langs/zh_CN/projects.lang | 1 + htdocs/langs/zh_CN/stocks.lang | 7 +- htdocs/langs/zh_CN/suppliers.lang | 2 +- htdocs/langs/zh_CN/trips.lang | 24 - htdocs/langs/zh_TW/admin.lang | 36 +- htdocs/langs/zh_TW/banks.lang | 2 + htdocs/langs/zh_TW/boxes.lang | 64 +- htdocs/langs/zh_TW/errors.lang | 7 +- htdocs/langs/zh_TW/interventions.lang | 2 +- htdocs/langs/zh_TW/main.lang | 7 + htdocs/langs/zh_TW/orders.lang | 4 +- htdocs/langs/zh_TW/other.lang | 1 + htdocs/langs/zh_TW/productbatch.lang | 21 +- htdocs/langs/zh_TW/projects.lang | 1 + htdocs/langs/zh_TW/stocks.lang | 7 +- htdocs/langs/zh_TW/suppliers.lang | 2 +- htdocs/langs/zh_TW/trips.lang | 24 - 760 files changed, 10803 insertions(+), 10339 deletions(-) create mode 100644 htdocs/langs/en_GB/interventions.lang create mode 100644 htdocs/langs/en_GB/productbatch.lang create mode 100644 htdocs/langs/en_GB/stocks.lang create mode 100644 htdocs/langs/es_AR/interventions.lang create mode 100644 htdocs/langs/es_AR/other.lang create mode 100644 htdocs/langs/es_AR/productbatch.lang create mode 100644 htdocs/langs/es_CO/interventions.lang create mode 100644 htdocs/langs/es_CO/other.lang create mode 100644 htdocs/langs/es_CO/productbatch.lang create mode 100644 htdocs/langs/es_CO/stocks.lang delete mode 100644 htdocs/langs/pt_BR/productbatch.lang diff --git a/build/debian/control b/build/debian/control index 164b919e06614..d25c752c14c58 100755 --- a/build/debian/control +++ b/build/debian/control @@ -22,7 +22,7 @@ Depends: libapache2-mod-php5 | libapache2-mod-php5filter | php5-cgi | php5-fpm | # libnusoap-php, # libphp-pclzip, # Required javascript libraries -# libjs-jquery, libjs-jquery-ui, libjs-flot, ckeditor, +# javascript-common, libjs-jquery, libjs-jquery-ui, libjs-jquery-flot, ckeditor, # Misc dependencies # fonts-dejavu-core | ttf-dejavu-core, xdg-utils, diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang index e96b095b5d049..d0a43020f135b 100644 --- a/htdocs/langs/ar_SA/admin.lang +++ b/htdocs/langs/ar_SA/admin.lang @@ -297,10 +297,11 @@ MenuHandlers=قائمة مناولي MenuAdmin=قائمة تحرير DoNotUseInProduction=Do not use in production ThisIsProcessToFollow=هذا هو الإعداد لهذه العملية : +ThisIsAlternativeProcessToFollow=This is an alternative setup to process: StepNb=الخطوة ق ٪ FindPackageFromWebSite=العثور على الحزمة التي توفر ميزة تريد (على سبيل المثال على موقع الويب ق ٪). DownloadPackageFromWebSite=Download package %s. -UnpackPackageInDolibarrRoot=تفريغ الملف إلى مجموعة Dolibarr 'sجذور دليل ٪ ق +UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: %s SetupIsReadyForUse=الانتهاء من تركيب وDolibarr على استعداد لاستخدام هذا العنصر الجديد. 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).
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_ 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) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s RefreshPhoneLink=Refresh link @@ -540,8 +541,8 @@ 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 +Module39000Name=Product lot +Module39000Desc=Lot or serial number, eat-by and sell-by date management on products Module50000Name=PayBox Module50000Desc=وحدة لتقديم على صفحة الدفع عبر الإنترنت عن طريق بطاقة الائتمان مع PayBox Module50100Name=نقطة البيع @@ -558,8 +559,6 @@ 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=قراءة الفواتير Permission12=خلق الفواتير Permission13=تعديل الفواتير @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= معدل الطاقة المتجددة بشكل افتر LocalTax2IsNotUsedDescES= افتراضيا IRPF المقترحة هي 0. نهاية الحكم. LocalTax2IsUsedExampleES= في اسبانيا ، لحسابهم الخاص والمهنيين المستقلين الذين يقدمون الخدمات والشركات الذين اختاروا النظام الضريبي من وحدات. LocalTax2IsNotUsedExampleES= في اسبانيا هم bussines لا تخضع لنظام ضريبي وحدات. -CalcLocaltax=Reports -CalcLocaltax1ES=Sales - Purchases +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Sales - Purchases CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Purchases +CalcLocaltax2=Purchases CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Sales +CalcLocaltax3=Sales CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales LabelUsedByDefault=العلامة التي يستخدمها التقصير إذا لم يمكن العثور على ترجمة للقانون LabelOnDocuments=علامة على وثائق @@ -1018,14 +1017,14 @@ NoEventOrNoAuditSetup=لا أمن الحدث وقد سجلت حتى الآن. ه NoEventFoundWithCriteria=لا أمن حال تم العثور على مثل هذا البحث criterias. SeeLocalSendMailSetup=انظر المحلية الإعداد sendmail BackupDesc=لتقديم دعم كامل للDolibarr ، يجب عليك : -BackupDesc2=* حفظ الوثائق محتوى الدليل (٪) والذي يحتوي على جميع وتحميل الملفات ولدت (هل يمكن أن تقدم على سبيل المثال والرمز البريدي). -BackupDesc3=* حفظ محتوى قاعدة البيانات مع نفايات. لهذا ، يمكنك استخدام التالية مساعد. +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=الأرشيف دليل ينبغي أن تحفظ في مكان آمن. BackupDescY=وقد ولدت وينبغي التخلص من الملفات المخزنة في مكان آمن. BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one RestoreDesc=Dolibarr لاستعادة النسخ الاحتياطي ، يجب عليك : -RestoreDesc2=* استعادة ارشيف ملف (ملف مضغوط على سبيل المثال) للوثائق ودليل لانتزاع شجرة الملفات في دليل وثائق جديدة أو Dolibarr تركيب هذه الوثائق الحالية directoy (٪). -RestoreDesc3=* استعادة البيانات ، احتياطية من إلقاء الملف في قاعدة البيانات من جديد Dolibarr تركيب أو في قاعدة البيانات الحالية لهذا التثبيت. تحذير ، بعد الانتهاء من اعادة ، يجب استخدام ادخل كلمة السر ، التي كانت موجودة عندما تم احتياطية ، لربط جديد. النسخ الاحتياطي لاستعادة قاعدة بيانات في هذا التركيب الحالي ، يمكنك اتباع هذه مساعدا. +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= هذه القاعدة ق ٪ الى جانب تفعيل وحدة PreviousDumpFiles=متاح تفريغ النسخ الاحتياطي ملفات قاعدة البيانات @@ -1337,6 +1336,8 @@ LDAPFieldCountry=قطر LDAPFieldCountryExample=على سبيل المثال : (ج) LDAPFieldDescription=وصف LDAPFieldDescriptionExample=مثال ذلك : وصف +LDAPFieldNotePublic=Public Note +LDAPFieldNotePublicExample=Example : publicnote LDAPFieldGroupMembers= أعضاء الفريق LDAPFieldGroupMembersExample= على سبيل المثال : uniqueMember LDAPFieldBirthdate=تاريخ الميلاد @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= حساب لاستخدام لاستلام المبال 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=إعداد وحدة المرجعية @@ -1616,3 +1617,8 @@ 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 +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" diff --git a/htdocs/langs/ar_SA/banks.lang b/htdocs/langs/ar_SA/banks.lang index 3f25d223c7527..3f11c7edbf22d 100644 --- a/htdocs/langs/ar_SA/banks.lang +++ b/htdocs/langs/ar_SA/banks.lang @@ -163,3 +163,5 @@ LabelRIB=BAN Label NoBANRecord=No BAN record DeleteARib=Delete BAN record ConfirmDeleteRib=Are you sure you want to delete this BAN record ? +StartDate=Start date +EndDate=End date diff --git a/htdocs/langs/ar_SA/boxes.lang b/htdocs/langs/ar_SA/boxes.lang index c91d17a12def2..f2aa5325277a8 100644 --- a/htdocs/langs/ar_SA/boxes.lang +++ b/htdocs/langs/ar_SA/boxes.lang @@ -12,6 +12,7 @@ BoxLastProspects=آفاق الماضي BoxLastCustomers=آخر الزبائن BoxLastSuppliers=الماضي الموردين BoxLastCustomerOrders=آخر طلبات الزبائن +BoxLastValidatedCustomerOrders=Last validated customer orders BoxLastBooks=آخر الكتب BoxLastActions=آخر الأعمال BoxLastContracts=آخر العقود @@ -27,26 +28,29 @@ BoxTitleNbOfCustomers=دي اسم العميل BoxTitleLastRssInfos=آخر الأخبار من ٪ ق ق ٪ BoxTitleLastProducts=آخر تعديل ٪ ق المنتجات / الخدمات BoxTitleProductsAlertStock=Products in stock alert -BoxTitleLastCustomerOrders=آخر تعديل ق ٪ طلبات الزبائن +BoxTitleLastCustomerOrders=Last %s customer orders +BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders BoxTitleLastSuppliers=الماضي وسجل الموردين ق ٪ BoxTitleLastCustomers=الماضي وسجل للعملاء ل ٪ BoxTitleLastModifiedSuppliers=%s آخر تعديل الموردين BoxTitleLastModifiedCustomers=%s آخر تعديل الزبائن -BoxTitleLastCustomersOrProspects=آخر تعديل ق ٪ العملاء أو آفاق -BoxTitleLastPropals=٪ ق الماضي سجلت مقترحات +BoxTitleLastCustomersOrProspects=Last %s customers or prospects +BoxTitleLastPropals=Last %s proposals +BoxTitleLastModifiedPropals=Last %s modified proposals BoxTitleLastCustomerBills=ق الماضي ٪ العميل الفواتير +BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices BoxTitleLastSupplierBills=ق الماضي ٪ فواتير المورد -BoxTitleLastProspects=الماضي وسجل آفاق ق ٪ +BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices BoxTitleLastModifiedProspects=%s آخر تعديل آفاق BoxTitleLastProductsInContract=الماضي ٪ ق المنتجات / الخدمات في عقد -BoxTitleLastModifiedMembers=آخر تعديل لأعضاء %s +BoxTitleLastModifiedMembers=Last %s members BoxTitleLastFicheInter=Last %s modified intervention -BoxTitleOldestUnpaidCustomerBills=أقدم ٪ ق العميل الفواتير غير المدفوعة -BoxTitleOldestUnpaidSupplierBills=أقدم ٪ ق المورد الفواتير غير المدفوعة +BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices +BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices BoxTitleCurrentAccounts=Opened account's balances BoxTitleSalesTurnover=مبيعات -BoxTitleTotalUnpaidCustomerBills=العميل الفواتير غير المدفوعة -BoxTitleTotalUnpaidSuppliersBills=المورد الفواتير غير المدفوعة +BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices +BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices BoxTitleLastModifiedContacts=%s آخر تعديل الأسماء / عناوين BoxMyLastBookmarks=آخر العناوين ق ٪ BoxOldestExpiredServices=أقدم نشط خدمات منتهية الصلاحية @@ -76,7 +80,8 @@ NoContractedProducts=أي المنتجات / الخدمات المتعاقد ع NoRecordedContracts=لا عقود المسجلة 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 @@ -89,3 +94,4 @@ BoxProductDistributionFor=Distribution of %s for %s ForCustomersInvoices=العملاء والفواتير ForCustomersOrders=Customers orders ForProposals=مقترحات +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/ar_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang index 7a6c5c7908189..de1ec8009ce58 100644 --- a/htdocs/langs/ar_SA/errors.lang +++ b/htdocs/langs/ar_SA/errors.lang @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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/langs/ar_SA/interventions.lang b/htdocs/langs/ar_SA/interventions.lang index a3c527f874d66..8737bfed170b5 100644 --- a/htdocs/langs/ar_SA/interventions.lang +++ b/htdocs/langs/ar_SA/interventions.lang @@ -50,4 +50,4 @@ ArcticNumRefModelError=فشل لتفعيل PacificNumRefModelDesc1=عودة número مع الشكل nnnn - ٪ syymm فيها السنة هي السنة ، هو شهر ملم وnnnn هو كسر التسلسل وليس هناك عودة لل0 PacificNumRefModelError=تدخل البطاقة ابتداء من دولار ويوجد بالفعل syymm لا تتفق مع هذا النموذج من التسلسل. إزالة أو تغيير تسميتها لتصبح لتفعيل هذه الوحدة. PrintProductsOnFichinter=Print products on intervention card -PrintProductsOnFichinterDetails=forinterventions generated from orders +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang index ed51c5273933f..64d059476b761 100644 --- a/htdocs/langs/ar_SA/main.lang +++ b/htdocs/langs/ar_SA/main.lang @@ -220,6 +220,7 @@ Next=التالي Cards=بطاقات Card=بطاقة Now=الآن +HourStart=Start hour Date=تاريخ DateAndHour=Date and hour DateStart=تاريخ البدء @@ -242,6 +243,8 @@ DatePlanShort=تاريخ تعتزم DateRealShort=التاريخ الحقيقي. DateBuild=التقرير بناء التاريخ DatePayment=تاريخ الدفع +DateApprove=Approving date +DateApprove2=Approving date (second approval) DurationYear=سنة DurationMonth=الشهر DurationWeek=الأسبوع @@ -408,6 +411,8 @@ OtherInformations=معلومات أخرى Quantity=الكمية Qty=الكمية ChangedBy=تغيير +ApprovedBy=Approved by +ApprovedBy2=Approved by (second approval) ReCalculate=Recalculate ResultOk=النجاح ResultKo=فشل @@ -696,6 +701,8 @@ 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. +Deny=Deny +Denied=Denied # Week day Monday=يوم الاثنين Tuesday=الثلاثاء diff --git a/htdocs/langs/ar_SA/orders.lang b/htdocs/langs/ar_SA/orders.lang index 2424a0118b44c..1afad05c4f552 100644 --- a/htdocs/langs/ar_SA/orders.lang +++ b/htdocs/langs/ar_SA/orders.lang @@ -79,7 +79,9 @@ NoOpenedOrders=أي أوامر فتح NoOtherOpenedOrders=أي أوامر فتح NoDraftOrders=No draft orders OtherOrders=أوامر أخرى -LastOrders=ق الماضي أوامر ٪ +LastOrders=Last %s customer orders +LastCustomerOrders=Last %s customer orders +LastSupplierOrders=Last %s supplier orders LastModifiedOrders=آخر تعديل أوامر ق ٪ LastClosedOrders=٪ ق الماضي أوامر مغلقة AllOrders=جميع أوامر diff --git a/htdocs/langs/ar_SA/other.lang b/htdocs/langs/ar_SA/other.lang index 4af940e2fdf5f..513c4ad2325cb 100644 --- a/htdocs/langs/ar_SA/other.lang +++ b/htdocs/langs/ar_SA/other.lang @@ -203,6 +203,7 @@ 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. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=إضافة الدخول في التقويم ق ٪ diff --git a/htdocs/langs/ar_SA/productbatch.lang b/htdocs/langs/ar_SA/productbatch.lang index 452636819653f..85b1d27f3a611 100644 --- a/htdocs/langs/ar_SA/productbatch.lang +++ b/htdocs/langs/ar_SA/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use batch/serial number -ProductStatusOnBatch=Yes (Batch/serial required) -ProductStatusNotOnBatch=No (Batch/serial not used) +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/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 +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial 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 +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %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. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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/ar_SA/projects.lang b/htdocs/langs/ar_SA/projects.lang index 511c52cdfe054..028bb4b69a268 100644 --- a/htdocs/langs/ar_SA/projects.lang +++ b/htdocs/langs/ar_SA/projects.lang @@ -14,6 +14,7 @@ MyTasksDesc=ويقتصر هذا الرأي على المشروعات أو الم OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=هذا الرأي يعرض جميع المشاريع والمهام ويسمح لك قراءة. TasksDesc=هذا الرأي يعرض جميع المشاريع والمهام (أذونات المستخدم الخاص أعطى الصلاحية لعرض كل شيء). +AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. ProjectsArea=مشاريع المنطقة NewProject=مشروع جديد AddProject=إنشاء مشروع diff --git a/htdocs/langs/ar_SA/stocks.lang b/htdocs/langs/ar_SA/stocks.lang index 965feeea1bcc9..8471a5db9977c 100644 --- a/htdocs/langs/ar_SA/stocks.lang +++ b/htdocs/langs/ar_SA/stocks.lang @@ -16,6 +16,7 @@ CancelSending=الغاء ارسال DeleteSending=حذف ارسال Stock=الأسهم Stocks=الاسهم +StocksByLotSerial=Stock by lot/serial Movement=الحركة Movements=حركات ErrorWarehouseRefRequired=مستودع الاشارة اسم مطلوب @@ -78,6 +79,7 @@ IdWarehouse=معرف مخزن DescWareHouse=وصف المخزن LieuWareHouse=المكان مخزن WarehousesAndProducts=والمستودعات والمنتجات +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=متوسط أسعار المدخلات AverageUnitPricePMP=متوسط أسعار المدخلات SellPriceMin=بيع سعر الوحدة @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/ar_SA/suppliers.lang b/htdocs/langs/ar_SA/suppliers.lang index 2220fa6765862..3416148052d08 100644 --- a/htdocs/langs/ar_SA/suppliers.lang +++ b/htdocs/langs/ar_SA/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) +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/ar_SA/trips.lang b/htdocs/langs/ar_SA/trips.lang index fadc1044001b5..5e026e3d0ff51 100644 --- a/htdocs/langs/ar_SA/trips.lang +++ b/htdocs/langs/ar_SA/trips.lang @@ -69,11 +69,9 @@ 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 @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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 42ca0f9cb57b5..26563ac77b6b5 100644 --- a/htdocs/langs/bg_BG/admin.lang +++ b/htdocs/langs/bg_BG/admin.lang @@ -297,10 +297,11 @@ MenuHandlers=Меню работещи MenuAdmin=Menu Editor DoNotUseInProduction=Не използвайте на продукшън платформа ThisIsProcessToFollow=Това е настройка на процеса: +ThisIsAlternativeProcessToFollow=This is an alternative setup to process: StepNb=Стъпка %s FindPackageFromWebSite=Намери пакет, който осигурява функция искате (например относно официалния уеб сайт %s). DownloadPackageFromWebSite=Изтегляне на пакет %s. -UnpackPackageInDolibarrRoot=Разопаковайте пакет файл в главната директория %s Dolibarr +UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: %s SetupIsReadyForUse=Install е завършен и Dolibarr е готов за използване с този нов компонент. NotExistsDirect=Алтернатива главната директория не е дефинирано.
InfDirAlt=От версия 3 е възможно да се определи алтернативен directory.This корен ви позволява да съхранявате, едно и също място, плъгини и собствени шаблони.
Просто създайте директория, в основата на Dolibarr (напр. по поръчка).
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_ 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=Библиотека използвана за направа на 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) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s RefreshPhoneLink=Обнови връзка @@ -540,8 +541,8 @@ 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 +Module39000Name=Product lot +Module39000Desc=Lot or serial number, eat-by and sell-by date management on products Module50000Name=Paybox Module50000Desc=Модул предлага онлайн страница на плащане с кредитна карта с Paybox Module50100Name=Точка на продажбите @@ -558,8 +559,6 @@ Module59000Name=Полета Module59000Desc=Модул за управление на маржовете Module60000Name=Комисии Module60000Desc=Модул за управление на комисии -Module150010Name=Batch number, eat-by date and sell-by date -Module150010Desc=batch number, eat-by date and sell-by date management for product Permission11=Клиентите фактури Permission12=Създаване / промяна на фактури на клиентите Permission13=Unvalidate клиентите фактури @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= RE процент по подразбиране при с LocalTax2IsNotUsedDescES= По подразбиране предложения IRPF е 0. Край на правило. LocalTax2IsUsedExampleES= В Испания, на свободна практика и независими специалисти, които предоставят услуги и фирми, които са избрани на данъчната система от модули. LocalTax2IsNotUsedExampleES= В Испания те са за бизнес, които не подлежат на данъчната система от модули. -CalcLocaltax=Reports -CalcLocaltax1ES=Sales - Purchases +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Sales - Purchases CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Purchases +CalcLocaltax2=Purchases CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Sales +CalcLocaltax3=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=Етикет на документи @@ -1018,14 +1017,14 @@ NoEventOrNoAuditSetup=Няма да се иска никакво обезпеч NoEventFoundWithCriteria=Няма да се иска никакво обезпечение събитие е за такива критерии за търсене. SeeLocalSendMailSetup=Вижте настройка Sendmail BackupDesc=За да направите пълно архивно копие на Dolibarr, трябва да: -BackupDesc2=* Запазване на съдържанието на директорията с документи (%s), която съдържа всички качени и генерирани файлове (можете да направите примерно zip). -BackupDesc3=* Запазване на съдържанието на базата данни в дъмп файл. Можете да използвате този помощник. +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=Архива на директорията трябва да се съхранява на сигурно място. BackupDescY=Генерирания дъмп файл трябва да се съхранява на сигурно място. BackupPHPWarning=Backup с този метод не може да бъде гарантирано. Предпочитам предишния RestoreDesc=За да възстановите резервно копие на Dolibarr, трябва да: -RestoreDesc2=* Възстановяване от архивен файл (примерно zip) на документи, указател, за да извлечете дървото на файлове в документите директория на нова инсталация Dolibarr или в тази актуални документи directoy (%s). -RestoreDesc3=* Възстановяване на данни от архивния файл на сметището в базата данни на новата инсталация Dolibarr или в базата данни на тази инсталация. Внимание, след като се възстанови приключи, трябва да се използва име / парола, че е съществувал, когато резервно копие е направено, за да се свържете отново. За да възстановите резервната база данни в тази инсталация, можете да следвате този помощник. +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 внос ForcedToByAModule= Това правило е принуден да %s от активиран модул PreviousDumpFiles=Файлове с бекъпи на базата данни @@ -1337,6 +1336,8 @@ LDAPFieldCountry=Държава LDAPFieldCountryExample=Пример: в LDAPFieldDescription=Описание LDAPFieldDescriptionExample=Пример: описание +LDAPFieldNotePublic=Public Note +LDAPFieldNotePublicExample=Example : publicnote LDAPFieldGroupMembers= Членовете на групата LDAPFieldGroupMembersExample= Пример: uniqueMember LDAPFieldBirthdate=Рождена дата @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= Акаунт по подразбиране да се 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=Bookmark настройка модул @@ -1616,3 +1617,8 @@ 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 +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" diff --git a/htdocs/langs/bg_BG/banks.lang b/htdocs/langs/bg_BG/banks.lang index e609966ddf76f..8644681b941fe 100644 --- a/htdocs/langs/bg_BG/banks.lang +++ b/htdocs/langs/bg_BG/banks.lang @@ -163,3 +163,5 @@ LabelRIB=BAN Label NoBANRecord=No BAN record DeleteARib=Delete BAN record ConfirmDeleteRib=Are you sure you want to delete this BAN record ? +StartDate=Start date +EndDate=End date diff --git a/htdocs/langs/bg_BG/boxes.lang b/htdocs/langs/bg_BG/boxes.lang index 77d4e23521fff..3baced62eb9fc 100644 --- a/htdocs/langs/bg_BG/boxes.lang +++ b/htdocs/langs/bg_BG/boxes.lang @@ -94,3 +94,4 @@ BoxProductDistributionFor=Разпределение на %s за %s ForCustomersInvoices=Клиента фактури ForCustomersOrders=Клиентски поръчки ForProposals=Предложения +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/bg_BG/errors.lang b/htdocs/langs/bg_BG/errors.lang index aba2303da230b..167445d56a122 100644 --- a/htdocs/langs/bg_BG/errors.lang +++ b/htdocs/langs/bg_BG/errors.lang @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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=Задължителни параметри на настройката все още не са определени diff --git a/htdocs/langs/bg_BG/interventions.lang b/htdocs/langs/bg_BG/interventions.lang index b283f32ebe463..f32826021c309 100644 --- a/htdocs/langs/bg_BG/interventions.lang +++ b/htdocs/langs/bg_BG/interventions.lang @@ -50,4 +50,4 @@ ArcticNumRefModelError=Неуспешно да активирате PacificNumRefModelDesc1=Връщане Numero с формат %syymm-NNNN, където YY е годината, mm е месец и NNNN е последователност, без почивка и няма връщане назад 0 PacificNumRefModelError=Интервенционната карта започва с $ syymm вече съществува и не е съвместим с този модел на последователност. Извадете го или го преименувайте да се активира този модул. PrintProductsOnFichinter=Print products on intervention card -PrintProductsOnFichinterDetails=forinterventions generated from orders +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang index e441743cfd033..4ee5f7c846990 100644 --- a/htdocs/langs/bg_BG/main.lang +++ b/htdocs/langs/bg_BG/main.lang @@ -220,6 +220,7 @@ Next=Следващ Cards=Карти Card=Карта Now=Сега +HourStart=Start hour Date=Дата DateAndHour=Date and hour DateStart=Начална дата @@ -242,6 +243,8 @@ DatePlanShort=Планирана дата DateRealShort=Реална дата DateBuild=Report build date DatePayment=Дата на изплащане +DateApprove=Approving date +DateApprove2=Approving date (second approval) DurationYear=година DurationMonth=месец DurationWeek=седмица @@ -408,6 +411,8 @@ OtherInformations=Други данни Quantity=Количество Qty=Количество ChangedBy=Променено от +ApprovedBy=Approved by +ApprovedBy2=Approved by (second approval) ReCalculate=Recalculate ResultOk=Успех ResultKo=Провал @@ -696,6 +701,8 @@ 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. +Deny=Deny +Denied=Denied # Week day Monday=Понеделник Tuesday=Вторник diff --git a/htdocs/langs/bg_BG/orders.lang b/htdocs/langs/bg_BG/orders.lang index 6033e574571a9..4c2ecd6f2d640 100644 --- a/htdocs/langs/bg_BG/orders.lang +++ b/htdocs/langs/bg_BG/orders.lang @@ -79,7 +79,9 @@ NoOpenedOrders=Не са открити поръчки NoOtherOpenedOrders=Няма други поръчки NoDraftOrders=No draft orders OtherOrders=Други поръчки -LastOrders=Последни поръчки %s +LastOrders=Last %s customer orders +LastCustomerOrders=Last %s customer orders +LastSupplierOrders=Last %s supplier orders LastModifiedOrders=Последните %s променени поръчки LastClosedOrders=Последните %s затворени поръчки AllOrders=Всички поръчки diff --git a/htdocs/langs/bg_BG/other.lang b/htdocs/langs/bg_BG/other.lang index adb385d5a47f1..4695ddec91364 100644 --- a/htdocs/langs/bg_BG/other.lang +++ b/htdocs/langs/bg_BG/other.lang @@ -203,6 +203,7 @@ NewKeyWillBe=Вашият нов ключ за влизане в софтуер ClickHereToGoTo=Click here to go to %s YouMustClickToChange=Необходимо е да щтракнете върху следния линк за да потвърдите промяната на паролата ForgetIfNothing=Ако не сте заявили промяната, просто забравете за този имейл. Вашите идентификационни данни се съхраняват на сигурно място. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=Добави запис в календара %s diff --git a/htdocs/langs/bg_BG/productbatch.lang b/htdocs/langs/bg_BG/productbatch.lang index 452636819653f..85b1d27f3a611 100644 --- a/htdocs/langs/bg_BG/productbatch.lang +++ b/htdocs/langs/bg_BG/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use batch/serial number -ProductStatusOnBatch=Yes (Batch/serial required) -ProductStatusNotOnBatch=No (Batch/serial not used) +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/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 +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial 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 +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %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. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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/bg_BG/projects.lang b/htdocs/langs/bg_BG/projects.lang index bedf0a7b8f648..bac8cef7acc27 100644 --- a/htdocs/langs/bg_BG/projects.lang +++ b/htdocs/langs/bg_BG/projects.lang @@ -14,6 +14,7 @@ MyTasksDesc=Тази гледна точка е ограничена до про OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=Този възглед представя всички проекти и задачи, които може да чете. TasksDesc=Този възглед представя всички проекти и задачи (потребителски разрешения ви даде разрешение да видите всичко). +AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. ProjectsArea=Проекти област NewProject=Нов проект AddProject=Create project diff --git a/htdocs/langs/bg_BG/stocks.lang b/htdocs/langs/bg_BG/stocks.lang index 2188c85aae584..4662362079238 100644 --- a/htdocs/langs/bg_BG/stocks.lang +++ b/htdocs/langs/bg_BG/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Отмяна на изпращане DeleteSending=Изтриване на изпращане Stock=Наличност Stocks=Наличности +StocksByLotSerial=Stock by lot/serial Movement=Движение Movements=Движения ErrorWarehouseRefRequired=Изисква се референтно име на склад @@ -78,6 +79,7 @@ IdWarehouse=Id на склад DescWareHouse=Описание на склад LieuWareHouse=Локализация на склад WarehousesAndProducts=Складове и продукти +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=Средна входна цена AverageUnitPricePMP=Средна изходна цена SellPriceMin=Единична продажна цена @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/bg_BG/suppliers.lang b/htdocs/langs/bg_BG/suppliers.lang index b737c270035b5..67f85043e38be 100644 --- a/htdocs/langs/bg_BG/suppliers.lang +++ b/htdocs/langs/bg_BG/suppliers.lang @@ -43,4 +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) +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/bg_BG/trips.lang b/htdocs/langs/bg_BG/trips.lang index 4e70dd8d132db..cf20af222e5fd 100644 --- a/htdocs/langs/bg_BG/trips.lang +++ b/htdocs/langs/bg_BG/trips.lang @@ -69,11 +69,9 @@ 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 @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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 5f59ffde1f205..efe5ae4147e51 100644 --- a/htdocs/langs/bs_BA/admin.lang +++ b/htdocs/langs/bs_BA/admin.lang @@ -297,10 +297,11 @@ MenuHandlers=Menu handlers MenuAdmin=Menu editor DoNotUseInProduction=Do not use in production ThisIsProcessToFollow=Ove postavke su za procesuiranje: +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).
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_ 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) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s RefreshPhoneLink=Refresh link @@ -540,8 +541,8 @@ Module6000Name=Workflow - Tok rada Module6000Desc=Upravljanje workflow-om - tokom rada 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 +Module39000Name=Product lot +Module39000Desc=Lot 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 @@ -558,8 +559,6 @@ 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 @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, 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 +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Sales - Purchases CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Purchases +CalcLocaltax2=Purchases CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Sales +CalcLocaltax3=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 @@ -1018,14 +1017,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 @@ -1337,6 +1336,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 @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= Default account to use to receive payments by credit c 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot 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 @@ -1616,3 +1617,8 @@ 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 +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" diff --git a/htdocs/langs/bs_BA/banks.lang b/htdocs/langs/bs_BA/banks.lang index cc94be9e78326..8ec490d7e5fc2 100644 --- a/htdocs/langs/bs_BA/banks.lang +++ b/htdocs/langs/bs_BA/banks.lang @@ -163,3 +163,5 @@ LabelRIB=BAN Label NoBANRecord=No BAN record DeleteARib=Delete BAN record ConfirmDeleteRib=Are you sure you want to delete this BAN record ? +StartDate=Start date +EndDate=End date diff --git a/htdocs/langs/bs_BA/boxes.lang b/htdocs/langs/bs_BA/boxes.lang index a46f319e13f9f..6b13f5176ffe6 100644 --- a/htdocs/langs/bs_BA/boxes.lang +++ b/htdocs/langs/bs_BA/boxes.lang @@ -12,6 +12,7 @@ BoxLastProspects=Last modified prospects BoxLastCustomers=Zadnji izmijenjeni kupci BoxLastSuppliers=Zadnji izmijenjeni dobavljači BoxLastCustomerOrders=Zadnje narudžbe kupca +BoxLastValidatedCustomerOrders=Last validated customer orders BoxLastBooks=Zadnje knjige BoxLastActions=Zadnje akcije BoxLastContracts=Zadnji ugovori @@ -27,26 +28,29 @@ BoxTitleNbOfCustomers=Broj klijenata BoxTitleLastRssInfos=Zanjih %s vijesti od %s BoxTitleLastProducts=Zadnjih %s izmijenjenih proizvoda/usluga BoxTitleProductsAlertStock=Upozorenje za proizvode u zalihama -BoxTitleLastCustomerOrders=Zadnjih %s izmijenjenih narudžbi kupca +BoxTitleLastCustomerOrders=Last %s customer orders +BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders BoxTitleLastSuppliers=Zadnjih %s zapisanih dobavljača BoxTitleLastCustomers=Zadnjih %s zapisanih kupaca BoxTitleLastModifiedSuppliers=Zadnjih %s izmijenjenih dobavljača BoxTitleLastModifiedCustomers=Zadnjih %s izmijenjenih kupaca -BoxTitleLastCustomersOrProspects=Last %s modified customers or prospects -BoxTitleLastPropals=Zadnjih %s zapisanih prijedloga +BoxTitleLastCustomersOrProspects=Last %s customers or prospects +BoxTitleLastPropals=Last %s proposals +BoxTitleLastModifiedPropals=Last %s modified proposals BoxTitleLastCustomerBills=Zadnjih %s faktura kupca +BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices BoxTitleLastSupplierBills=Zadnjih %s faktura dobavljača -BoxTitleLastProspects=Last %s recorded prospects +BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices BoxTitleLastModifiedProspects=Last %s modified prospects BoxTitleLastProductsInContract=Zadnjih %s proizvoda/usluga u ugovoru -BoxTitleLastModifiedMembers=Zadnjih %s izmijenjenih članova +BoxTitleLastModifiedMembers=Last %s members BoxTitleLastFicheInter=Zadnjih %s izmijenjenih intervencija -BoxTitleOldestUnpaidCustomerBills=Najstarijih %s neplaćenih faktura kupaca -BoxTitleOldestUnpaidSupplierBills=Najstarijih %s neplaćenih faktura dobavljača +BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices +BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices BoxTitleCurrentAccounts=Stanja otvorenog računa BoxTitleSalesTurnover=Sales turnover -BoxTitleTotalUnpaidCustomerBills=Neplaćene fakture kupca -BoxTitleTotalUnpaidSuppliersBills=Neplaćene fakture dobavljača +BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices +BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices BoxTitleLastModifiedContacts=Zadnjih %s izmijenjenih kontakata/adresa BoxMyLastBookmarks=Mojih zadnjih %s bookmark-a BoxOldestExpiredServices=Najstarije aktivne zastarjele usluge @@ -76,7 +80,8 @@ NoContractedProducts=Nema ugovorenih proizvoda/usluga NoRecordedContracts=Nema zapisanih kontakata NoRecordedInterventions=Nema zapisanih intervencija BoxLatestSupplierOrders=Najnovije narudžbe dobavljaču -BoxTitleLatestSupplierOrders=%s najnovijih narudžbi dobavljaču +BoxTitleLatestSupplierOrders=Last %s supplier orders +BoxTitleLatestModifiedSupplierOrders=Last %s modified supplier orders NoSupplierOrder=Nema zapisanih narudžbi dobavljaču BoxCustomersInvoicesPerMonth=Fakture kupca po mjesecu BoxSuppliersInvoicesPerMonth=Fakture dobavljača po mjesecu @@ -89,3 +94,4 @@ BoxProductDistributionFor=Distribucija %s za %s ForCustomersInvoices=Fakture kupaca ForCustomersOrders=Narudžbe kupaca ForProposals=Prijedlozi +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/bs_BA/errors.lang b/htdocs/langs/bs_BA/errors.lang index 52e9f6aeae473..dbafde2f6e546 100644 --- a/htdocs/langs/bs_BA/errors.lang +++ b/htdocs/langs/bs_BA/errors.lang @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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/langs/bs_BA/interventions.lang b/htdocs/langs/bs_BA/interventions.lang index 5f340d0b6c46b..67ab49b21fcba 100644 --- a/htdocs/langs/bs_BA/interventions.lang +++ b/htdocs/langs/bs_BA/interventions.lang @@ -50,4 +50,4 @@ ArcticNumRefModelError=Neuspjelo aktiviranje PacificNumRefModelDesc1=Vratiti broj sa formatom %syymm-nnnn, gdje je yy godina, mm mjesec i nnnn niz bez prekida i bez vraćanja za 0. PacificNumRefModelError=Kartica intervencije koja počinje sa $syymm već postoji i nije kompatibilna sa ovim modelom nizda. Odstrani ili promijeni da bi se modul mogao aktivirati. PrintProductsOnFichinter=Isprintaj proizvode sa kartice intervencije -PrintProductsOnFichinterDetails=za intervencije generisano sa narudžbi +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang index 7b8d50fd9efe4..b7b40e8e49838 100644 --- a/htdocs/langs/bs_BA/main.lang +++ b/htdocs/langs/bs_BA/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 @@ -242,6 +243,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 +411,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 @@ -696,6 +701,8 @@ 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. +Deny=Deny +Denied=Denied # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/bs_BA/orders.lang b/htdocs/langs/bs_BA/orders.lang index 3d4f381c40b4d..044bcc0eb0174 100644 --- a/htdocs/langs/bs_BA/orders.lang +++ b/htdocs/langs/bs_BA/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/langs/bs_BA/other.lang b/htdocs/langs/bs_BA/other.lang index 9b2de3eeb9024..6b60f5eac9717 100644 --- a/htdocs/langs/bs_BA/other.lang +++ b/htdocs/langs/bs_BA/other.lang @@ -203,6 +203,7 @@ 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. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=Add entry in calendar %s diff --git a/htdocs/langs/bs_BA/productbatch.lang b/htdocs/langs/bs_BA/productbatch.lang index 452636819653f..85b1d27f3a611 100644 --- a/htdocs/langs/bs_BA/productbatch.lang +++ b/htdocs/langs/bs_BA/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use batch/serial number -ProductStatusOnBatch=Yes (Batch/serial required) -ProductStatusNotOnBatch=No (Batch/serial not used) +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/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 +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial 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 +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %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. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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/bs_BA/projects.lang b/htdocs/langs/bs_BA/projects.lang index c8f591a726255..d4fb90709bf57 100644 --- a/htdocs/langs/bs_BA/projects.lang +++ b/htdocs/langs/bs_BA/projects.lang @@ -14,6 +14,7 @@ MyTasksDesc=Ovaj pregled predstavlja sve projekte ili zadatke za koje ste kontak 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). +AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. ProjectsArea=Područje za projekte NewProject=Novi projekat AddProject=Create project diff --git a/htdocs/langs/bs_BA/stocks.lang b/htdocs/langs/bs_BA/stocks.lang index 14059aefcc0ea..21c1a748cb491 100644 --- a/htdocs/langs/bs_BA/stocks.lang +++ b/htdocs/langs/bs_BA/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Poništi slanje DeleteSending=Obriši slanje Stock=Zaliha Stocks=Zalihe +StocksByLotSerial=Stock by lot/serial Movement=Kretanje Movements=Kretanja ErrorWarehouseRefRequired=Referentno ime skladište je potrebno @@ -78,6 +79,7 @@ IdWarehouse=ID skladišta DescWareHouse=Opis skladišta LieuWareHouse=Lokalizacija skladišta WarehousesAndProducts=Skladišta i proizvodi +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=Ponderirani prosjek ulazne cijene AverageUnitPricePMP=Ponderirani prosjek ulazne cijene SellPriceMin=Prodajna cijena jedinice @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/bs_BA/suppliers.lang b/htdocs/langs/bs_BA/suppliers.lang index 7a367073af7c7..62e1d2bf6b897 100644 --- a/htdocs/langs/bs_BA/suppliers.lang +++ b/htdocs/langs/bs_BA/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) +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/bs_BA/trips.lang b/htdocs/langs/bs_BA/trips.lang index 282500cf7783c..6921130574195 100644 --- a/htdocs/langs/bs_BA/trips.lang +++ b/htdocs/langs/bs_BA/trips.lang @@ -69,11 +69,9 @@ 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 @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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 cacc980f0e3bb..b964f2ff9789d 100644 --- a/htdocs/langs/ca_ES/admin.lang +++ b/htdocs/langs/ca_ES/admin.lang @@ -8,11 +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 +FileCheck=Arxius d'Integritat +FilesMissing=Arxius que falten +FilesUpdated=Arxius actualitzats +FileCheckDolibarr=Comproveu arxius de Dolibarr +XmlNotFound=Arxiu XML de Dolibarr no trobat SessionId=Sesió ID SessionSaveHandler=Modalitat de salvaguardat de sessions SessionSavePath=Localització salvaguardat de sessions @@ -26,9 +26,9 @@ YourSession=La seva sessió Sessions=Sessions d'usuaris WebUserGroup=Servidor web usuari/grup NoSessionFound=Sembla que el seu PHP no pot llistar les sessions actives. El directori de salvaguardat de sessions (%s) pot estar protegit (per exemple, pels permisos del sistema operatiu o per la directiva open_basedir del seu PHP) -HTMLCharset=Charset de les pàgines HTML -DBStoringCharset=Charset base de dades per emmagatzematge de dades -DBSortingCharset=Charset base de dades per classificar les dades +HTMLCharset=Codificació de les pàgines HTML +DBStoringCharset=Codificació base de dades per emmagatzematge de dades +DBSortingCharset=Codificació base de dades per classificar les dades WarningModuleNotActive=Mòdul %s no actiu WarningOnlyPermissionOfActivatedModules=Atenció, només els permisos relacionats amb els mòduls activats s'indiquen aquí. Activar els altres mòduls a la pàgina Configuració->Mòduls DolibarrSetup=Instal·lació/Actualització de Dolibarr @@ -48,19 +48,19 @@ SecuritySetup=Configuració de la seguretat ErrorModuleRequirePHPVersion=Error, aquest mòdul requereix una versió %s o superior de PHP ErrorModuleRequireDolibarrVersion=Error, aquest mòdul requereix una versió %s o superior de Dolibarr ErrorDecimalLargerThanAreForbidden=Error, les precisions superiors a %s no estan suportades. -DictionarySetup=Dictionary setup -Dictionary=Dictionaries -Chartofaccounts=Chart of accounts -Fiscalyear=Fiscal years +DictionarySetup=Diccionaris +Dictionary=Diccionaris +Chartofaccounts=Pla comptable +Fiscalyear=Anys fiscals ErrorReservedTypeSystemSystemAuto=L'ús del tipus 'system' i 'systemauto' està reservat. Podeu utilitzar 'user' com a valor per afegir el seu propi registre ErrorCodeCantContainZero=El codi no pot contenir el valor 0 -DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) +DisableJavascript=Desactivar funcions JavaScript i Ajax (Recomanat per a persones o navegadors de text) ConfirmAjax=Utilitzar els popups de confirmació Ajax 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. +UseSearchToSelectCompany=Utilitzeu els camps de autocompletat per triar tercers en lloc d'utilitzar un quadre de llista. ActivityStateToSelectCompany= Afegir un filtre en la recerca per mostrar/ocultar els tercers en actiu o que hagin deixat d'exercir 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). +UseSearchToSelectContact=Utilitzeu els camps de autocompletat per triar contactes (en lloc d'utilitzar un quadre de llista). 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=Opcions filtres de cerca @@ -74,7 +74,7 @@ ShowPreview=Veure previsualització PreviewNotAvailable=Vista prèvia no disponible ThemeCurrentlyActive=Tema actualment actiu CurrentTimeZone=Fus horari PHP (Servidor) -MySQLTimeZone=TimeZone MySql (database) +MySQLTimeZone=Zona horària MySql (base de dades) 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=Taula @@ -84,7 +84,7 @@ Mask=Màscara NextValue=Pròxim valor NextValueForInvoices=Pròxim valor (factures) NextValueForCreditNotes=Pròxim valor (abonaments) -NextValueForDeposit=Next value (deposit) +NextValueForDeposit=Pròxim valor (dipòsit) NextValueForReplacements=Next value (replacements) MustBeLowerThanPHPLimit=Observació: El seu PHP limita la mida a %s %s de màxim, qualsevol que sigui el valor d'aquest paràmetre NoMaxSizeByPHPLimit=Cap limitació interna en el seu servidor PHP @@ -113,9 +113,9 @@ OtherOptions=Altres opcions OtherSetup=Varis CurrentValueSeparatorDecimal=Separador decimal CurrentValueSeparatorThousand=eparador milers -Destination=Destination -IdModule=Module ID -IdPermissions=Permissions ID +Destination=Destinació +IdModule=ID del modul +IdPermissions=ID de permisos Modules=Mòduls ModulesCommon=Mòduls principals ModulesOther=Mòduls complementaris @@ -125,9 +125,9 @@ ParameterInDolibarr=Variable %s LanguageParameter=Variable idioma %s LanguageBrowserParameter=Variable %s LocalisationDolibarrParameters=Paràmetres de localització -ClientTZ=Client Time Zone (user) -ClientHour=Client time (user) -OSTZ=Server OS Time Zone +ClientTZ=Zona horària client (usuari) +ClientHour=Hora client (usuari) +OSTZ=Zona horària Servidor SO PHPTZ=Zona horària Servidor PHP PHPServerOffsetWithGreenwich=Offset amb Greenwich (segons) ClientOffsetWithGreenwich=Offset client/navegador amb Greenwich (segons) @@ -142,7 +142,7 @@ Box=Panell Boxes=Panells MaxNbOfLinesForBoxes=Nº de línies màxim per als panells PositionByDefault=Posició per defecte -Position=Position +Position=Lloc MenusDesc=Els gestors de menú defineixen el contingut de les 2 barres de menús (la barra horitzontal i la barra vertical). És possible assignar gestors diferents segons l'usuari sigui intern o extern. MenusEditorDesc=L'editor de menús permet definir entrades personalitzades en els menús. S'ha d'utilitzar amb prudència sota pena de posar a Dolibarr en una situació inestable essent necessària una instal·lació per trobar un menú coherent. MenuForUsers=Menú per als usuaris @@ -246,8 +246,8 @@ OfficialWebSiteFr=lloc web oficial francòfon OfficialWiki=Wiki Dolibarr OfficialDemo=Demo en línia Dolibarr OfficialMarketPlace=Lloc oficial de mòduls complementaris i extensions -OfficialWebHostingService=Referenced web hosting services (Cloud hosting) -ReferencedPreferredPartners=Preferred Partners +OfficialWebHostingService=Serveis d'allotjament web (cloud hosting) +ReferencedPreferredPartners=Soci preferent OtherResources=Autres ressources ForDocumentationSeeWiki=Per a la documentació d'usuari, desenvolupador o Preguntes Freqüents (FAQ), consulteu el wiki Dolibarr:
%s ForAnswersSeeForum=Per altres qüestions o realitzar les seves pròpies consultes, pot utilitzar el fòrum Dolibarr:
%s @@ -268,7 +268,7 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Nom servidor o ip del servidor SMT MAIN_MAIL_EMAIL_FROM=Correu electrònic de l'emissor per trameses e automàtics (Per defecte en php.ini: %s) MAIN_MAIL_ERRORS_TO=E-Mail usat per als retorns d'error dels e-mails enviats MAIN_MAIL_AUTOCOPY_TO= Enviar automàticament còpia oculta dels e-mails enviats a -MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to +MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Enviar automàticament còpia oculta dels pressupostos enviats a 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=Desactivar globalment tot enviament de correus electrònics (per mode de proves) @@ -297,10 +297,11 @@ MenuHandlers=Gestors de menú MenuAdmin=Editor de menú DoNotUseInProduction=No utilitzar en producció ThisIsProcessToFollow=Heus aquí el procediment a seguir: +ThisIsAlternativeProcessToFollow=This is an alternative setup to process: StepNb=Pas %s FindPackageFromWebSite=Cercar el paquet que respon a la seva necessitat (per exemple en el lloc web %s) -DownloadPackageFromWebSite=Download package %s. -UnpackPackageInDolibarrRoot=Descomprimir el paquet a la carpeta arrel de Dolibarr %s sobre els arxius existents (sense desplaçar o esborrar els existents, sota pena de perdre la seva configuració o els mòduls no oficials instal·lats) +DownloadPackageFromWebSite=Descarregar el paquet %s. +UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: %s SetupIsReadyForUse=La instal·lació ha finalitzat i Dolibarr està disponible amb el nou component. NotExistsDirect=No existeix el directori alternatiu.
InfDirAlt=Des de la versió 3 és possible definir un directori root alternatiu, això li permet emmagatzemar en el mateix lloc mòduls i temes personalitzades.
Només cal crear un directori en l'arrel de Dolibarr (per exemple: custom).
@@ -309,9 +310,9 @@ YouCanSubmitFile=Seleccioneu mòdul: CurrentVersion=Versió actual de Dolibarr CallUpdatePage=Trucar a la pàgina d'actualització de l'estructura i dades de la base de dades %s. LastStableVersion=Última versió estable disponible -UpdateServerOffline=Update server offline +UpdateServerOffline=Actualitzacións del servidor fora de línia GenericMaskCodes=Podeu introduir qualsevol màscara numèrica. En aquesta màscara, pot utilitzar les següents etiquetes:
{000000} correspon a un número que s'incrementa en cadascun %s. Introduïu tants zeros com longuitud desitgi mostrar. El comptador es completarà a partir de zeros per l'esquerra per tal de tenir tants zeros com la màscara.
{000000+000}Igual que l'anterior, amb una compensació corresponent al número a la dreta del signe + s'aplica a partir del primer %s.
{000000@x}igual que l'anterior, però el comptador es restableix a zero quan s'arriba a x mesos (x entre 1 i 12). Si aquesta opció s'utilitza i x és de 2 o superior, llavors la seqüència {yy}{mm} ó {yyyy}{mm} també és necessària.
{dd} dies (01 a 31).
{mm} mes (01 a 12).
{yy} , {yyyy ó {y} any en 2, 4 ó 1 xifra.
-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).
+GenericMaskCodes2={cccc} el codi de client de n caràcters
{cccc000} el codi de client en n caràcters és seguir per un comptador dedicat per al client. Aquest comptador dedicat del client es reinicia al mateix temps que el comptador global.
{tttt} El codi de tipus tercer en n caràcters (veure tipus Diccionari tercers).
GenericMaskCodes3=Qualsevol altre caràcter a la màscara es quedarà sense canvis.
No es permeten espais
GenericMaskCodes4a=Exemple a la 99ª %s del tercer L'Empresa realitzada el 31/03/2007:
GenericMaskCodes4b=Exemple sobre un tercer creat el 31/03/2007:
@@ -388,16 +389,16 @@ ExtrafieldSelectList = Llista de selecció de table 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
... +ExtrafieldCheckBoxFromList= Casella de verificació de la taula +ExtrafieldLink=Enllaç a un objecte +ExtrafieldParamHelpselect=La llista ha de ser en forma clau, valor

per exemple :
1,text1
2,text2
3,text3
... +ExtrafieldParamHelpcheckbox=La llista ha de ser en forma clau, valor

per exemple :
1,text1
2,text2
3,text3
... +ExtrafieldParamHelpradio=La llista ha de ser en forma clau, valor

per exemple :
1,text1
2,text2
3,text3
... 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=Llibreria usada per a la creació d'arxius PDF WarningUsingFPDF=Atenció: El seu arxiu conf.php conté la directiva dolibarr_pdf_force_fpdf=1. Això fa que s'usi la llibreria FPDF per generar els seus arxius PDF. Aquesta llibreria és antiga i no cobreix algunes funcionalitats (Unicode, transparència d'imatges, idiomes ciríl · lics, àrabs o asiàtics, etc.), Pel que pot tenir problemes en la generació dels PDF.
Per resoldre-ho, i disposar d'un suport complet de PDF, pot descarregar la llibreria TCPDF , i a continuació comentar o eliminar la línia $dolibarr_pdf_force_fpdf=1, i afegir al seu lloc $dolibarr_lib_TCPDF_PATH='ruta_a_TCPDF' -LocalTaxDesc=Alguns països apliquen 2 o 3 taxes a cada línia de factura. Si és el cas, escolliu el tipus de la segona i tercera taxa i el seu valor. Els possibles tipus són:
1: taxa local aplicable a productes i serveis sense IVA (IVA no s'aplica a la taxa local)
2: taxa local s'aplica a productes i serveis abans de l'IVA (IVA es calcula sobre import + taxa local)
3: taxa local s'aplica a productes sense IVA (IVA no s'aplica a la taxa local)
4: taxa local s'aplica a productes abans de l'IVA (IVA es calcula sobre l'import + taxa local)
5: taxa local s'aplica a serveis sense IVA (IVA no s'aplica a la taxa local)
6: taxa local s'aplica a serveis abans de l'IVA (IVA es calcula sobre import + taxa local) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Introduïu un número de telèfon que voleu marcar per provar l'enllaç de crida ClickToDial per a l'usuari %s RefreshPhoneLink=Refrescar enllaç @@ -405,15 +406,15 @@ LinkToTest=Enllaç seleccionable per l'usuari %s (feu clic al n KeepEmptyToUseDefault=Deixeu aquest camp buit per usar el valor per defecte DefaultLink=Enllaç per defecte ValueOverwrittenByUserSetup=Atenció: Aquest valor pot ser sobreescrit per un valor específic de la configuració de l'usuari (cada usuari pot tenir la seva pròpia url clicktodial) -ExternalModule=External module - Installed into directory %s +ExternalModule=Mòdul extern - Instal·lat al directori %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. +CurrentlyNWithoutBarCode=Actualment, té %s registres a %s %s sense codi de barres definit. 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. +EraseAllCurrentBarCode=Esborrar tots els valors de codi de barres actuals +ConfirmEraseAllCurrentBarCode=Esteu segur que voleu esborrar tots els valors de codis de barres actuals? +AllBarcodeReset=S'han eliminat tots els valors de codi de barres +NoBarcodeNumberingTemplateDefined=No hi ha plantilla de codi de barres habilitada a la configuració del mòdul de codi de barres. NoRecordWithoutBarcodeDefined=No record with no barcode value defined. # Modules @@ -449,8 +450,8 @@ Module52Name=Stocks de productes Module52Desc=Gestió de stocks de productes Module53Name=Serveis Module53Desc=Gestió de serveis -Module54Name=Contracts/Subscriptions -Module54Desc=Management of contracts (services or reccuring subscriptions) +Module54Name=Contractes/Subscripcions +Module54Desc=Gestió de contractes (serveis o subscripcions diaries) Module55Name=Codis de barra Module55Desc=Gestió dels codis de barra Module56Name=Telefonia @@ -487,38 +488,38 @@ Module320Name=Fils RSS Module320Desc=Addició de fils d'informació RSS en les pantalles Dolibarr Module330Name=Bookmarks Module330Desc=Gestió de bookmarks -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=Projectes/Oportunitats/Leads +Module400Desc=Gestió de projectes, oportunitats o clients potencials. A continuació, pot assignar qualsevol element (factura, ordre, proposta, intervenció, ...) a un projecte i obtenir una visió transversal de la vista del projecte. Module410Name=Webcalendar Module410Desc=Interface amb el calendari webcalendar -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 +Module500Name=Despeses especials (impostos, càrregues socials, dividends) +Module500Desc=Gestió de despeses especials, impostos, càrregues socials, dividends i salaris +Module510Name=Sous +Module510Desc=Gestió dels salaris dels empleats i pagaments +Module520Name=Préstec +Module520Desc=Gestió de préstecs Module600Name=Notificacions -Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) +Module600Desc=Enviar notificacions per correu electrònic sobre alguns esdeveniments de negocis del Dolibarr als contactes de tercers (configuració definida en cada tercer) Module700Name=Donacions Module700Desc=Gestió de donacions -Module770Name=Expense Report -Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module770Name=Informe de despeses +Module770Desc=Informes de despeses de gestió i reclamació (transport, menjar, ...) 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=Tags/Categories +Module1520Name=Generar document +Module1520Desc=Generació de documents de correu massiu +Module1780Name=Etiquetes/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 +Module2200Name=Multi-preus +Module2200Desc=Activar l'ús d'expressions matemàtiques per als preus Module2300Name=Cron -Module2300Desc=Scheduled job management +Module2300Desc=Gestor de tasques programades Module2400Name=Agenda Module2400Desc=Gestió de l'agenda i de les accions Module2500Name=Gestió Electrònica de Documents @@ -533,33 +534,31 @@ Module2800Desc=Client FTP Module2900Name=GeoIPMaxmind Module2900Desc=Capacitats de conversió GeoIP Maxmind Module3100Name=Skype -Module3100Desc=Add a Skype button into card of adherents / third parties / contacts +Module3100Desc=Afegir un botó de Skype a la targeta d'adherents/dels tercers/contactes Module5000Name=Multi-empresa Module5000Desc=Permet gestionar diverses empreses 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=Gestió Workflow +Module20000Name=Dies lliures +Module20000Desc=Gestió dels dies lliures dels empleats +Module39000Name=Product lot +Module39000Desc=Lot or serial number, eat-by and sell-by date management on products Module50000Name=PayBox Module50000Desc=Mòdul per a proporcionar un pagament en línia amb targeta de crèdit mitjançant Paybox Module50100Name=TPV Module50100Desc=Terminal Punt de Venda per a la venda al taulell Module50200Name=Paypal Module50200Desc=Mòdul per a proporcionar un pagament en línia amb targeta de crèdit mitjançant Paypal -Module50400Name=Accounting (advanced) -Module50400Desc=Accounting management (double parties) +Module50400Name=Comptabilitat (avançat) +Module50400Desc=Gestió experta de la comptabilitat (doble partida) 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=Márgenes +Module55000Name=Obrir enquesta +Module55000Desc=Mòdul per fer enquestes en línia (com Doodle, Studs, Rdvz, ...) +Module59000Name=Marges Module59000Desc=Mòdul per gestionar els marges de benefici Module60000Name=Comissions Module60000Desc=Mòdul per gestionar les comissions -Module150010Name=Batch number, eat-by date and sell-by date -Module150010Desc=batch number, eat-by date and sell-by date management for product Permission11=Consultar factures Permission12=Crear/Modificar factures Permission13=Devalidar factures @@ -589,7 +588,7 @@ Permission67=Exporta intervencions Permission71=Consultar membres Permission72=Crear/modificar membres Permission74=Eliminar membres -Permission75=Setup types of membership +Permission75=Configurar tipus dels membres Permission76=Exportar membres Permission78=Consultar cotitzacions Permission79=Crear/modificar cotitzacions @@ -612,8 +611,8 @@ Permission106=Exportar expedicions Permission109=Eliminar expedicions Permission111=Consultar comptes financers (comptes bancaris, caixes) Permission112=Crear/modificar quantitat/eliminar registres bancaris -Permission113=Setup financial accounts (create, manage categories) -Permission114=Reconciliate transactions +Permission113=Configuració de comptes financers (crear, controlar les categories) +Permission114=Reconciliar transaccions Permission115=Exporta transaccions i extractes Permission116=Captar transferències entre comptes Permission117=Gestionar enviament de xecs @@ -630,22 +629,22 @@ Permission151=Consultar domiciliacions Permission152=Crear/modificar domiciliacions Permission153=Enviar domiciliacions Permission154=Abonar/tornar domiciliacions -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=Consultar contractes/subscripcions +Permission162=Crear/Modificar contractes/subscripcions +Permission163=Activar un servei/subscripció d'un contracte +Permission164=Desactivar un servei/subscripció d'un contracte +Permission165=Eliminar contractes/subscripcions +Permission171=Llegir viatges i despeses (propis i els seus subordinats) +Permission172=Crear/modificar desplaçaments i despeses +Permission173=Eliminar desplaçaments i despeses +Permission174=Cercar tots els honoraris +Permission178=Exportar desplaçaments i despeses Permission180=Consultar proveïdors 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=Order or cancel supplier orders +Permission185=Enviar o cancel·lar comandes de proveïdors Permission186=Rebre comandes de proveïdors Permission187=Tancar comandes a proveïdors Permission188=Anul·lar comandes a proveïdors @@ -696,7 +695,7 @@ Permission300=Consultar codis de barra Permission301=Crear/modificar codis de barra Permission302=Eliminar codi de barra Permission311=Consultar serveis -Permission312=Assign service/subscription to contract +Permission312=Assignar serveis/subscripció a un contracte Permission331=Consultar bookmarks Permission332=Crear/modificar bookmarks Permission333=Eliminar bookmarks @@ -713,15 +712,15 @@ Permission401=Consultar havers Permission402=Crear/modificar havers Permission403=Validar havers Permission404=Eliminar havers -Permission510=Read Salaries -Permission512=Create/modify salaries -Permission514=Delete salaries -Permission517=Export salaries -Permission520=Read Loans -Permission522=Create/modify loans -Permission524=Delete loans +Permission510=Consultar salaris +Permission512=Crear/modificar salaris +Permission514=Eliminar salaris +Permission517=Exportació salaris +Permission520=Consultar préstecs +Permission522=Crear/modificar préstecs +Permission524=Eliminar préstecs Permission525=Access loan calculator -Permission527=Export loans +Permission527=Exportar préstecs Permission531=Consultar serveis Permission532=Crear/modificar serveis Permission534=Eliminar serveis @@ -732,14 +731,14 @@ Permission702=Crear/modificar donacions Permission703=Eliminar donacions Permission771=Read expense reports (own and his subordinates) Permission772=Create/modify expense reports -Permission773=Delete expense reports +Permission773=Eliminar els informes de despeses Permission774=Read all expense reports (even for user not subordinates) -Permission775=Approve expense reports -Permission776=Pay expense reports -Permission779=Export expense reports +Permission775=Aprovar els informes de despeses +Permission776=Pagar informes de despeses +Permission779=Exportar informes de despeses Permission1001=Consultar stocks -Permission1002=Create/modify warehouses -Permission1003=Delete warehouses +Permission1002=Crear/modificar els magatzems +Permission1003=Eliminar magatzems Permission1004=Consultar moviments de stock Permission1005=Crear/modificar moviments de stock Permission1101=Consultar ordres d'enviament @@ -754,7 +753,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 +Permission1190=Aprovar (segona aprovació) comandes de proveïdors Permission1201=Obtenir resultat d'una exportació Permission1202=Crear/modificar exportacions Permission1231=Consultar factures de proveïdors @@ -767,10 +766,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=Read Scheduled job -Permission23002=Create/update Scheduled job -Permission23003=Delete Scheduled job -Permission23004=Execute Scheduled job +Permission23001=Veure les tasques programades +Permission23002=Crear/Modificar les tasques programades +Permission23003=Eliminar tasques programades +Permission23004=Executar tasca programada 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 @@ -786,41 +785,41 @@ Permission2802=Utilitzar el client FTP en mode escriptura (esborrar o pujar arxi Permission50101=Utilitzar TPV Permission50201=Consultar les transaccions Permission50202=Importar les transaccions -Permission54001=Print -Permission55001=Read polls -Permission55002=Create/modify polls +Permission54001=Imprimir +Permission55001=Llegir enquestes +Permission55002=Crear/modificar enquestes 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 +DictionaryCompanyType=Tipus de tercers +DictionaryCompanyJuridicalType=Formes jurídiques de tercers +DictionaryProspectLevel=Perspectiva nivell client potencial +DictionaryCanton=Departaments/Províncies/Zones 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 +DictionaryCountry=Països +DictionaryCurrency=Monedes +DictionaryCivility=Títol cortesia +DictionaryActions=Tipus d'esdeveniments de l'agenda +DictionarySocialContributions=Tipus de càrregues socials +DictionaryVAT=Taxa d'IVA (Impost sobre vendes als EEUU) +DictionaryRevenueStamp=Imports de segells fiscals +DictionaryPaymentConditions=Condicions de pagament +DictionaryPaymentModes=Modes de pagament +DictionaryTypeContact=Tipus de contactes/adreces +DictionaryEcotaxe=Barems CEcoParticipación (DEEE) +DictionaryPaperFormat=Formats paper +DictionaryFees=Tipus de desplaçaments i honoraris +DictionarySendingMethods=Mètodes d'expedició +DictionaryStaff=Empleats +DictionaryAvailability=Temps de lliurament +DictionaryOrderMethods=Mètodes de comanda +DictionarySource=Orígens de pressupostos/comandes +DictionaryAccountancyplan=Pla comptable +DictionaryAccountancysystem=Models de plans comptables +DictionaryEMailTemplates=Models d'emails SetupSaved=Configuració desada BackToModuleList=Retornar llista de mòduls -BackToDictionaryList=Back to dictionaries list +BackToDictionaryList=Tornar a la llista de diccionaris VATReceivedOnly=Impostos especials no facturables VATManagement=Gestió IVA VATIsUsedDesc=El tipus d'IVA proposat per defecte en les creacions de pressupostos, factures, comandes, etc. Respon a la següent regla:
Si el venedor no està subjecte a IVA, IVA per defecte= 0. Final de regla.
Si el país del venedor= país del comprador llavors IVA per defecte= IVA del producte venut. Final de regla.
Si venedor i comprador resideixen a la Comunitat Europea i el bé venut= nou mitjà de transports (auto, vaixell, avió), IVA per defecte= 0 (l'IVA ha de ser pagat pel comprador a la hisenda pública del seu país i no al venedor). Final de regla
Si venedor i comprador resideixen a la Comunitat Europea i comprador= particular o empresa sense NIF intracomunitari llavors IVA per defecte= IVA del producte venut. Final de regla.
Si venedor i comprador resideixen a la Comunitat Europea i comprador= empresa amb NIF intracomunitari llavors IVA per defecte= 0. Final de regla.
Sinó, IVA proposat per defecte= 0. Final de regla.
@@ -828,7 +827,7 @@ VATIsNotUsedDesc=El tipus d'IVA proposat per defecte és 0. Aquest és el cas d' VATIsUsedExampleFR=A França, es tracta de les societats o organismes que trien un règim fiscal general (General simplificat o General normal), règim en el qual es declara l'IVA. VATIsNotUsedExampleFR=A França, es tracta d'associacions exemptes d'IVA o societats, organismes o professions liberals que han eligedo el règim fiscal de mòduls (IVA en franquícia), pagant un IVA en franquícia sense fer declaració d'IVA. Aquesta elecció fa aparèixer l'anotació "IVA no aplicable - art-293B del CGI" en les factures. ##### Local Taxes ##### -LTRate=Rate +LTRate=Tarifa LocalTax1IsUsed=Subjecte LocalTax1IsNotUsed=No subjecte LocalTax1IsUsedDesc=Ús d'un 2on. tipus d'impost (Diferent de l'IVA) @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= El tipus d'IRPF proposat per defecte en les creacions de LocalTax2IsNotUsedDescES= El tipus d'IRPF proposat per defecte es 0. Final de regla. LocalTax2IsUsedExampleES= A Espanya, es tracta de persones físiques: autònoms i professionals independents que presten serveis i empreses que han triat el règim fiscal de mòduls. LocalTax2IsNotUsedExampleES= A Espanya, es tracta d'empreses no subjectes al règim fiscal de mòduls. -CalcLocaltax=Reports -CalcLocaltax1ES=Sales - Purchases +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Sales - Purchases CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Purchases +CalcLocaltax2=Purchases CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Sales +CalcLocaltax3=Sales CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales LabelUsedByDefault=Etiqueta que s'utilitzarà si no es troba traducció per aquest codi LabelOnDocuments=Etiqueta sobre documents @@ -972,14 +971,14 @@ EventsSetup=Configuració del registre d'esdeveniments LogEvents=Auditoria de la seguretat d'esdeveniments Audit=Auditoria InfoDolibarr=Info Dolibarr -InfoBrowser=Infos Browser +InfoBrowser=Info. del navegador InfoOS=Info SO InfoWebServer=Info servidor InfoDatabase=Info base de dades InfoPHP=Info PHP InfoPerf=Info rendiment -BrowserName=Browser name -BrowserOS=Browser OS +BrowserName=Nom del navegador +BrowserOS=SSOO del navegador ListEvents=Auditoria d'esdeveniments ListOfSecurityEvents=Llistat d'esdeveniments de seguretat Dolibarr SecurityEventsPurged=Esdeveniments de seguretat purgats @@ -1000,7 +999,7 @@ TriggerDisabledAsModuleDisabled=Triggers d'aquest arxiu desactivats ja que el m TriggerAlwaysActive=Triggers d'aquest arxiu sempre actius, ja que els mòduls Dolibarr relacionats estan activats TriggerActiveAsModuleActive=Triggers d'aquest arxiu actius ja que el mòdul %s està activat GeneratedPasswordDesc=Indiqui aquí que norma vol utilitzar per generar les contrasenyes quan vulgui generar una nova contrasenya -DictionaryDesc=Define here all reference datas. You can complete predefined value with yours. +DictionaryDesc=Indiqui aquí les dades de referència. Pot completar/modificar les dades predefinides amb les seves ConstDesc=Qualsevol altre paràmetre no editable en les pàgines anteriors OnceSetupFinishedCreateUsers=Atenció, està sota un compte d'administrador de Dolibarr. Els administradors s'utilitzen per configurar Dolibarr. Per a un ús corrent de Dolibarr, es recomana utilitzar un compte no administrador creada des del menú "Usuaris i grups" MiscellaneousDesc=Definiu aquí els altres paràmetres relacionats amb la seguretat. @@ -1018,14 +1017,14 @@ NoEventOrNoAuditSetup=No s'han registrat esdeveniments de seguretat. Això pot s NoEventFoundWithCriteria=No s'han trobat esdeveniments de seguretat per a aquests criteris de cerca. SeeLocalSendMailSetup=Veure la configuració local d'sendmail BackupDesc=Per realitzar una còpia de seguretat completa de Dolibarr, vostè ha de: -BackupDesc2=* Guardar el contingut de la carpeta de documents (%s) que conté tots els arxius pujats o generats (comprimint la carpeta, per exemple). -BackupDesc3=* Guardar el contingut de la base de dades en un arxiu de bolcat. Per això pot utilitzar l'assistent a continuació. +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=La carpeta arxivada haurà de guardar-se en un lloc segur BackupDescY=L'arxiu de bolcat generat haurà de guardar-se en un lloc segur. BackupPHPWarning=La còpia de seguretat no pot ser garantida amb aquest mètode. És preferible utilitzar l'anterior RestoreDesc=Per restaurar una còpia de seguretat de Dolibarr, vostè ha de: -RestoreDesc2=* Prendre el fitxer (fitxer zip, per exemple) de la carpeta dels documents i descomprimir-lo a la carpeta dels documents d'una nova instal·lació de Dolibarr o en la carpeda dels documents d'aquesta instal·lació (%s). -RestoreDesc3=* Recarregar el fitxer de bolcat guardat a la base de dades d'una nova instal·lació de Dolibarr o d'aquesta instal·lació. Atenció, una vegada realitzada la restauració, haurà d'utilitzar un login/contrasenya d'administrador existent en el moment de la còpia de seguretat per connectar-se. Per restaurar la base de dades en la instal·lació actual, pot utilitzar l'assistent a continuació. +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=Importació MySQL ForcedToByAModule= Aquesta regla està forçada a %s per un dels mòduls activats PreviousDumpFiles=Arxius de còpia de seguretat de la base de dades disponibles @@ -1052,21 +1051,21 @@ 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) +ExtraFieldsSupplierOrdersLines=Atributs complementaris (línies de comanda) +ExtraFieldsSupplierInvoicesLines=Atributs complementaris (línies de factura) ExtraFieldsThirdParties=Atributs adicionals (tercers) ExtraFieldsContacts=Atributs adicionals (contactes/adreçes) ExtraFieldsMember=Atributs complementaris (membres) ExtraFieldsMemberType=Atributs complementaris (tipus de membres) -ExtraFieldsCustomerOrders=Complementary attributes (orders) -ExtraFieldsCustomerInvoices=Complementary attributes (invoices) +ExtraFieldsCustomerOrders=Atributs complementaris (comandes) +ExtraFieldsCustomerInvoices=AAtributs complementaris (factures) ExtraFieldsSupplierOrders=Atributs complementaris (comandes) ExtraFieldsSupplierInvoices=AAtributs complementaris (factures) ExtraFieldsProject=Atributs complementaris (projets) ExtraFieldsProjectTask=Atributs complementaris (tâches) ExtraFieldHasWrongValue=Attribute %s has a wrong value. AlphaNumOnlyCharsAndNoSpace=només carateres alfanumèrics sense espais -AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space +AlphaNumOnlyLowerCharsAndNoSpace=només alfanumèrics i caràcters en minúscula sense espai SendingMailSetup=Configuració de l'enviament per mail SendmailOptionNotComplete=Atenció, en alguns sistemes Linux, amb aquest mètode d'enviament, per poder enviar mails en nom seu, la configuració de sendmail ha de contenir l'opció -ba (paràmetre mail.force_extra_parameters a l'arxiu php.ini). Si alguns dels seus destinataris no reben els seus missatges, proveu de modificar aquest paràmetre PHP amb mail.force_extra_parameters =-ba . PathToDocuments=Rutes d'accés a documents @@ -1082,20 +1081,20 @@ OnlyFollowingModulesAreOpenedToExternalUsers=Recordeu que només els mòduls seg SuhosinSessionEncrypt=Emmagatzematge de sessions xifrades per Suhosin ConditionIsCurrently=Actualment la condició és %s YouUseBestDriver=Està utilitzant el driver %s, actualment és el millor driver disponible. -YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. +YouDoNotUseBestDriver=Està utilitzant el driver %s però és recomanat l'ús del driver %s. NbOfProductIsLowerThanNoPb=Té %s productes/serveis a la base de dades. No és necessària cap optimització en particular. SearchOptim=Cercar optimització YouHaveXProductUseSearchOptim=Té %s productes a la base de dades. Hauria afegir la constant PRODUCT_DONOTSEARCH_ANYWHERE a 1 a Inici-Configuració-Varis, limitant la cerca al principi de la cadena que fa possible que la base de dades usi l'índex i s'obtingui una resposta immediata. BrowserIsOK=Utilitza el navegador web %s. Aquest navegador està optimitzat per a la seguretat i el rendiment. BrowserIsKO=Utilitza el navegador web %s. Aquest navegador és una mala opció per a la seguretat, rendiment i fiabilitat. Aconsellem fer servir Firefox, Chrome, Opera o Safari. -XDebugInstalled=XDebug is loaded. +XDebugInstalled=XDebug està carregat. XCacheInstalled=XCache cau està carregat. 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 +FieldEdition=Edició del camp %s +FixTZ=Fixar zona horaria 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. +GetBarCode=Obtenir codi de barres +EmptyNumRefModelDesc=Codi de client/proveïdor lliure sense verificació. Pot ser modificat en qualsevol moment. ##### Module password generation PasswordGenerationStandard=Retorna una contrasenya generada per l'algoritme intern Dolibarr: 8 caràcters, números i caràcters en minúscules barrejades. PasswordGenerationNone=No ofereix contrasenyes. La contrasenya s'introdueix manualment. @@ -1123,8 +1122,8 @@ WatermarkOnDraft=Marca d'aigua en els documents esborrany JSOnPaimentBill=Activate feature to autofill payment lines on payment form CompanyIdProfChecker=Règles sobre els ID professionals MustBeUnique=Ha de ser únic? -MustBeMandatory=Mandatory to create third parties ? -MustBeInvoiceMandatory=Mandatory to validate invoices ? +MustBeMandatory=Obligatori per crear tercers? +MustBeInvoiceMandatory=Obligatori per validar les factures? Miscellaneous=Miscel·lània ##### Webcal setup ##### WebCalSetup=Configuració d'enllaç amb el calendari webcalendar @@ -1138,7 +1137,7 @@ WebCalServer=Servidor de la base de dades del calendari WebCalDatabaseName=Nom de la base de dades WebCalUser=Usuari amb accés a la base WebCalSetupSaved=Les dades d'enllaç s'han desat correctament. -WebCalTestOk=Connection to server '%s' on database '%s' with user '%s' successful. +WebCalTestOk=La connexió al servidor '%s' a la base '%s' per l'usuari '%s' ha estat satisfactòria. WebCalTestKo1=La connexió al servidor '%s' ha estat satisfactòria, però la base '%s' no s'ha pogut comprovar. WebCalTestKo2=La conexió al servidor '%s' per l'usuari '%s' ha fallat. WebCalErrorConnectOkButWrongDatabase=La connexió ha sortit bé però la base no sembla ser una base webcalendar. @@ -1180,7 +1179,7 @@ AddDeliveryAddressAbility=Possibilitat de seleccionar una adreça d'enviament UseOptionLineIfNoQuantity=Una línia de producte/servei que té una quantitat nul·la es considera com una opció 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 +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Preguntar compte bancari del pressupost ##### AskPriceSupplier ##### AskPriceSupplierSetup=Price requests suppliers module setup AskPriceSupplierNumberingModules=Price requests suppliers numbering models @@ -1192,7 +1191,7 @@ BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination o OrdersSetup=Configuració del mòdul comandes OrdersNumberingModules=Mòduls de numeració de les comandes OrdersModelModule=Models de documents de comandes -HideTreadedOrders=Hide the treated or cancelled orders in the list +HideTreadedOrders=Amaga les comandes processades o anul·lades del llistat ValidOrderAfterPropalClosed=Validar la comanda després del tancament del pressupost, permet no passar per la comanda provisional FreeLegalTextOnOrders=Text lliure en comandes WatermarkOnDraftOrders=Marca d'aigua en comandes esborrany (en cas d'estar buit) @@ -1210,11 +1209,11 @@ FicheinterNumberingModules=Mòduls de numeració de les fitxes d'intervenció TemplatePDFInterventions=Model de documents de les fitxes d'intervenció WatermarkOnDraftInterventionCards=Marca d'aigua en fitxes d'intervenció (en cas d'estar buit) ##### Contracts ##### -ContractsSetup=Contracts/Subscriptions module setup +ContractsSetup=Configuració del modul contractes/subscripcions ContractsNumberingModules=Mòduls de numeració dels contratos TemplatePDFContracts=Contracts documents models -FreeLegalTextOnContracts=Free text on contracts -WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty) +FreeLegalTextOnContracts=Text lliure en contractes +WatermarkOnDraftContractCards=Marca d'aigua en contractes (en cas d'estar buit) ##### Members ##### MembersSetup=Configuració del mòdulo Associacions MemberMainOptions=Opcions principals @@ -1289,9 +1288,9 @@ LDAPSynchroKO=Prova de sincronització errònia LDAPSynchroKOMayBePermissions=Error de la prova de sincronització. Comproveu que la connexió al servidor sigui correcta i que permet les actualitzacions LDAP LDAPTCPConnectOK=Connexió TCP al servidor LDAP efectuada (Servidor=%s, Port=%s) LDAPTCPConnectKO=Error de connexió TCP al servidor LDAP (Servidor=%s, Port=%s) -LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s) +LDAPBindOK=Connexió/Autenticació al servidor LDAP aconseguida (Servidor=%s, Port=%s, Admin=%s, Password=%s) LDAPBindKO=Error de connexió/autenticació al servidor LDAP (Servidor=%s, Port=%s, Admin=%s, Password=%s) -LDAPUnbindSuccessfull=Disconnect successful +LDAPUnbindSuccessfull=Desconnexió realitzada LDAPUnbindFailed=Desconnexió fallada LDAPConnectToDNSuccessfull=Connexió a DN (%s) realitzada LDAPConnectToDNFailed=Connexió a DN (%s) fallada @@ -1337,6 +1336,8 @@ LDAPFieldCountry=Pais LDAPFieldCountryExample=Exemple : c LDAPFieldDescription=Descripció LDAPFieldDescriptionExample=Exemple : description +LDAPFieldNotePublic=Public Note +LDAPFieldNotePublicExample=Example : publicnote LDAPFieldGroupMembers= Membres del grup LDAPFieldGroupMembersExample= Exemple: uniqueMember LDAPFieldBirthdate=Data de naixement @@ -1348,7 +1349,7 @@ LDAPFieldSidExample=Exemple : objectsid LDAPFieldEndLastSubscription=Data finalització com a membre LDAPFieldTitle=Lloc/Funció LDAPFieldTitleExample=Exemple:títol -LDAPParametersAreStillHardCoded=LDAP parameters are still hardcoded (in contact class) +LDAPParametersAreStillHardCoded=Els paràmetres LDAP són codificats en dur (a la classe contact) LDAPSetupNotComplete=Configuració LDAP incompleta (a completar en les altres pestanyes) LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Administrador o contrasenya no indicats. Els accessos LDAP seran anònims i en només lectura. LDAPDescContact=Aquesta pàgina permet definir el nom dels atributs de l'arbre LDAP per a cada informació dels contactes Dolibarr. @@ -1362,8 +1363,8 @@ YouMayFindPerfAdviceHere=En aquesta pàgina trobareu diverses proves i consells NotInstalled=No instal·lat, de manera que el servidor no baixa de rendiment amb això. ApplicativeCache=Aplicació memòria cau 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. +MemcachedModuleAvailableButNotSetup=Mòdul de memoria cache actiu, però la configuració del mòdul no està completa. +MemcachedAvailableAndSetup=Modul de memoria cache dedicada a utilitzar el servidor memcached està habilitat. OPCodeCache=OPCode memòria cau NoOPCodeCacheFound=No s'ha trobat cap opcode memòria cau. Pot ser que estigui utilitzant un altre opcode com XCache o eAccelerator (millor), o potser no tingui opcode memòria cau (pitjor). HTTPCacheStaticResources=Memòria cau HTTP per a estadístiques de recursos (css, img, javascript) @@ -1374,7 +1375,7 @@ FilesOfTypeNotCompressed=Fitxers de tipus %s no són comprimits pel servidor HTT CacheByServer=Memòria cau amb el servidor CacheByClient=Memòria cau mitjançant el navegador CompressionOfResources=Compressió de les respostes HTTP -TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers +TestNotPossibleWithCurrentBrowsers=La detecció automàtica no és possible amb els navegadors actuals ##### Products ##### ProductSetup=Configuració del mòdul Productes ServiceSetup=Configuració del mòdul Serveis @@ -1385,7 +1386,7 @@ ModifyProductDescAbility=Personalització de les descripcions dels productes en ViewProductDescInFormAbility=Visualització de les descripcions dels productes en els formularis ViewProductDescInThirdpartyLanguageAbility=Visualització de les descripcions de productes en l'idioma del tercer 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). +UseSearchToSelectProduct=Utilitzeu un formulari de cerca per triar un producte (en lloc d'una llista desplegable). UseEcoTaxeAbility=Assumir ecotaxa (DEEE) SetDefaultBarcodeTypeProducts=Tipus de codi de barres utilitzat per defecte per als productes SetDefaultBarcodeTypeThirdParties=Tipus de codi de barres utilitzat per defecte per als tercers @@ -1419,9 +1420,9 @@ 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=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=Generador de codi de barres (utilitzat pel motor intern per a alguns tipus de codis de barres). Ha de ser compatible amb "genbarcode".
Per exemple: /usr/local/bin/genbarcode BarcodeInternalEngine=Motor intern -BarCodeNumberManager=Manager to auto define barcode numbers +BarCodeNumberManager=Configuració de la numeració automatica de codis de barres ##### Prelevements ##### WithdrawalsSetup=Configuració del mòdul domiciliacions ##### ExternalRSS ##### @@ -1435,7 +1436,7 @@ MailingEMailFrom=E-Mail emissor (From) dels correus enviats per E-Mailing MailingEMailError=E-mail de resposta (Errors-to) per a les respostes sobre enviaments per e-mailing amb error. MailingDelay=Seconds to wait after sending next message ##### Notification ##### -NotificationSetup=EMail notification module setup +NotificationSetup=Configuració del modul de notificació d'EMail NotificationEMailFrom=E-Mail emissor (From) dels correus enviats a través de notificacions 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 @@ -1443,9 +1444,9 @@ FixedEmailTarget=Fixed email target SendingsSetup=Configuració del mòdul Expedicions SendingsReceiptModel=Model de notes de lliurament SendingsNumberingModules=Mòduls de numeració de notes de lliurament -SendingsAbility=Support shipment sheets for customer deliveries +SendingsAbility=Ús de notes de lliurament per als enviaments a clients NoNeedForDeliveryReceipts=En la majoria dels casos, les notes de lliurament (llista de productes enviats) també actuen com a notes de recepció i són signades pel client. La gestió de les notes de recepció és per tant redundant i poques vegades s'activarà. -FreeLegalTextOnShippings=Free text on shipments +FreeLegalTextOnShippings=Text lliure en els enviaments ##### Deliveries ##### DeliveryOrderNumberingModules=Mòdul de numeració de les notes de recepció DeliveryOrderModel=Model de notes de recepció @@ -1466,8 +1467,8 @@ OSCommerceTestOk=La connexió al servidor '%s' sobre la base '%s' per l'usuari ' OSCommerceTestKo1=La connexió al servidor '%s' sobre la base '%s' per l'usuari '%s' no s'ha pogut fer. OSCommerceTestKo2=La connexió al servidor '%s' per l'usuari '%s' ha fallat. ##### Stock ##### -StockSetup=Warehouse module setup -UserWarehouse=Use user personal warehouses +StockSetup=Configuració del mòdul de magatzem +UserWarehouse=Utilitzar els stocks personals d'usuaris 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=Menú eliminat @@ -1503,11 +1504,11 @@ ConfirmDeleteLine=Esteu segur de voler eliminar aquesta línia? ##### Tax ##### TaxSetup=Configuració del mòdul d'impostos, càrregues socials i dividends OptionVatMode=Opció de càrrega d'IVA -OptionVATDefault=Cash basis -OptionVATDebitOption=Accrual basis +OptionVATDefault=Efectiu +OptionVATDebitOption=Dèbit OptionVatDefaultDesc=La càrrega de l'IVA és:
-en l'enviament dels béns (en la pràctica s'usa la data de la factura)
-sobre el pagament pels serveis OptionVatDebitOptionDesc=La càrrega de l'IVA és:
-en l'enviament dels béns en la pràctica s'usa la data de la factura
-sobre la facturació dels serveis -SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option: +SummaryOfVatExigibilityUsedByDefault=Moment d'exigibilitat per defecte l'IVA per a l'opció escollida: OnDelivery=Al lliurament OnPayment=Al pagament OnInvoice=A la factura @@ -1524,7 +1525,7 @@ AccountancyCodeBuy=Codi comptable compres AgendaSetup=Mòdul configuració d'accions i agenda PasswordTogetVCalExport=Clau d'autorització vCal export link PastDelayVCalExport=No exportar els esdeveniments de més de -AGENDA_USE_EVENT_TYPE=Use events types (managed into menu Setup -> Dictionary -> Type of agenda events) +AGENDA_USE_EVENT_TYPE=Utilitza tipus d'esdeveniments (administrats en menú a Configuració -> Diccionari -> Tipus d'esdeveniments de l'agenda) 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 @@ -1533,14 +1534,14 @@ ClickToDialDesc=Aquest mòdul permet afegir una icona després del número de te ##### Point Of Sales (CashDesk) ##### CashDesk=TPV CashDeskSetup=Mòdul de configuració Terminal Punt de Venda -CashDeskThirdPartyForSell=Default generic third party to use for sells +CashDeskThirdPartyForSell=Tercer genéric a utilitzar per a les vendes 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 (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 +CashDeskIdWareHouse=Forçar i restringir el magatzem a usar l'stock a disminuir StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled -StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot 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 @@ -1584,35 +1585,40 @@ TaskModelModule=Mòdul de documents informes de tasques ECMSetup = Configuració del mòdul GED ECMAutoTree = L'arbre automàtic està disponible ##### 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=Anys fiscals +FiscalYear=Any fiscal +FiscalYearCard=Carta d'any fiscal +NewFiscalYear=Nou any fiscal +EditFiscalYear=Editar any fiscal +OpenFiscalYear=Obrir any fiscal +CloseFiscalYear=Tancar any fiscal +DeleteFiscalYear=Eliminar any fiscal +ConfirmDeleteFiscalYear=Esteu segur d'eliminar aquest any fiscal? +Opened=Obert +Closed=Tancat +AlwaysEditable=Sempre es pot editar 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 +NbMajMin=Nombre mínim de caràcters en majúscules +NbNumMin=Nombre mínim de caràcters numèrics +NbSpeMin=Nombre mínim de caràcters especials +NbIteConsecutive=Capacitat màxima per repetir mateixos caràcters +NoAmbiCaracAutoGeneration=No utilitzar caràcters semblants ("1", "l", "i", "|", "0", "O") per a la generació automàtica +SalariesSetup=Configuració dels sous dels mòduls +SortOrder=Ordre de classificació 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) +IncludePath=Incloure ruta (que es defineix a 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. YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification". -ListOfNotificationsPerContact=List of notifications per contact* +ListOfNotificationsPerContact=Llista de notificacions per contacte* 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" diff --git a/htdocs/langs/ca_ES/banks.lang b/htdocs/langs/ca_ES/banks.lang index c329a4a3eb4ec..709b9e8250e14 100644 --- a/htdocs/langs/ca_ES/banks.lang +++ b/htdocs/langs/ca_ES/banks.lang @@ -8,7 +8,7 @@ FinancialAccount=Compte FinancialAccounts=Comptes BankAccount=Compte bancari BankAccounts=Comptes bancaris -ShowAccount=Show Account +ShowAccount=Mostrar el compte AccountRef=Ref. compte financier AccountLabel=Etiqueta compte financier CashAccount=Compte caixa/efectiu @@ -29,15 +29,15 @@ EndBankBalance=Saldo final CurrentBalance=Saldo actual FutureBalance=Saldo previst ShowAllTimeBalance=Mostar balanç des de principi -AllTime=From start +AllTime=Des del principi Reconciliation=Conciliació RIB=Compte bancari IBAN=Identificador IBAN -IbanValid=IBAN is Valid -IbanNotValid=IBAN is Not Valid +IbanValid=Codi IBAN vàlid +IbanNotValid=Codi IBAN no és vàlid BIC=Identificador BIC/SWIFT -SwiftValid=BIC/SWIFT is Valid -SwiftNotValid=BIC/SWIFT is Not Valid +SwiftValid=BIC/SWIFT és vàlid +SwiftNotValid=BIC/SWIFT no és vàlid StandingOrders=Domiciliacions StandingOrder=Domiciliació Withdrawals=Reintegraments @@ -138,7 +138,7 @@ CashBudget=Pressupost de tresoreria PlannedTransactions=Transaccions previstes Graph=Gràfics ExportDataset_banque_1=Transacció bancària i extracte -ExportDataset_banque_2=Deposit slip +ExportDataset_banque_2=Resguard TransactionOnTheOtherAccount=Transacció sobre l'altra compte TransactionWithOtherAccount=Transferència de compte PaymentNumberUpdateSucceeded=Numero de pagament modificat @@ -152,14 +152,16 @@ 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=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD +InputReceiptNumber=Seleccioneu l'estat del compte bancari relacionat amb la conciliació. Utilitzeu un valor numèric com: AAAAMM o AAAAMMDD 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 BankDashboard=Resum comptes bancaris -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 ? +DefaultRIB=Codi BAN per defecte +AllRIB=Tots els codis BAN +LabelRIB=Etiqueta del codi BAN +NoBANRecord=Codi BAN no registrat +DeleteARib=Codi BAN eliminat +ConfirmDeleteRib=Segur que vols eliminar aquest registre BAN? +StartDate=Start date +EndDate=End date diff --git a/htdocs/langs/ca_ES/boxes.lang b/htdocs/langs/ca_ES/boxes.lang index 9f1d4d0a9b43b..449785f58959c 100644 --- a/htdocs/langs/ca_ES/boxes.lang +++ b/htdocs/langs/ca_ES/boxes.lang @@ -12,13 +12,14 @@ BoxLastProspects=Últims clients potencials modificats BoxLastCustomers=Últims clients modificats BoxLastSuppliers=Últims proveïdors modificats BoxLastCustomerOrders=Últimes comandes +BoxLastValidatedCustomerOrders=Ultimes comandes de clients validades BoxLastBooks=Últims books BoxLastActions=Últims esdeveniments BoxLastContracts=Últims contractes BoxLastContacts=Últims contactes/adreçes BoxLastMembers=Últims membres modificats BoxFicheInter=Últimes intervencions modificades -BoxCurrentAccounts=Opened accounts balance +BoxCurrentAccounts=Balanç de comptes oberts BoxSalesTurnover=Volum de vendes BoxTotalUnpaidCustomerBills=Total factures a clients pendents de cobrament BoxTotalUnpaidSuppliersBills=Total factures de proveïdors pendents de pagament @@ -27,26 +28,29 @@ BoxTitleNbOfCustomers=Nombre de clients BoxTitleLastRssInfos=Les %s últimes infos de %s BoxTitleLastProducts=Els %s darrers productes/serveis registrats BoxTitleProductsAlertStock=Productes en alerta d'estoc -BoxTitleLastCustomerOrders=Les %s darreres comandes de clients modificades +BoxTitleLastCustomerOrders=Ultimes %s comandes de clients +BoxTitleLastModifiedCustomerOrders=Últimes %s comandes de clients modificades BoxTitleLastSuppliers=Els %s darrers proveïdors registrats BoxTitleLastCustomers=Els %s darrers clients registrats BoxTitleLastModifiedSuppliers=Els %s últims proveïdors modificats BoxTitleLastModifiedCustomers=Els %s últims clients modificats -BoxTitleLastCustomersOrProspects=Els %s darrers clients o clients potencials registrats -BoxTitleLastPropals=Els %s darrers pressupostos registrats +BoxTitleLastCustomersOrProspects=Últims %s clients o clients potencials registrats +BoxTitleLastPropals=Últims %s pressupostos +BoxTitleLastModifiedPropals=Últims %s pressupostos modificats BoxTitleLastCustomerBills=Les %s últimes factures a clients modificades +BoxTitleLastModifiedCustomerBills=Ultimes %s factures de clients modificades BoxTitleLastSupplierBills=Les %s últimes factures de proveïdors modificades -BoxTitleLastProspects=Els %s darrers clients potencials registrats +BoxTitleLastModifiedSupplierBills=Últimes %s factures de proveïdors modificades BoxTitleLastModifiedProspects=Els %s últims clients potencials modificats BoxTitleLastProductsInContract=Els %s darrers productes/serveis contractats -BoxTitleLastModifiedMembers=Els %s últims membres modificats +BoxTitleLastModifiedMembers=Últims %s membres modificats BoxTitleLastFicheInter=Les %s últimes intervencions modificades BoxTitleOldestUnpaidCustomerBills=Les %s factures més antigues a clients pendents de cobrament BoxTitleOldestUnpaidSupplierBills=Les %s factures més antigues de proveïdors pendents de pagament -BoxTitleCurrentAccounts=Opened account's balances +BoxTitleCurrentAccounts=Balanç de comptes oberts BoxTitleSalesTurnover=Volum de vendes realitzades -BoxTitleTotalUnpaidCustomerBills=Pendent de clients -BoxTitleTotalUnpaidSuppliersBills=Pendent a proveïdors +BoxTitleTotalUnpaidCustomerBills=Factures a clients pendents de cobrament +BoxTitleTotalUnpaidSuppliersBills=Factures de proveïdors pendents de pagament BoxTitleLastModifiedContacts=Els últims %s contactes/adreçes modificades BoxMyLastBookmarks=Els meus %s darrers marcadors BoxOldestExpiredServices=Serveis antics expirats @@ -74,9 +78,10 @@ NoRecordedProducts=Sense productes/serveis registrats NoRecordedProspects=Sense clients potencials registrats NoContractedProducts=Sense productes/serveis contractats NoRecordedContracts=Sense contractes registrats -NoRecordedInterventions=No recorded interventions +NoRecordedInterventions=No hi ha intervencions registrades BoxLatestSupplierOrders=Últimes comandes a proveïdors -BoxTitleLatestSupplierOrders=Les %s últimes comandes a proveïdors +BoxTitleLatestSupplierOrders=Últimes %s comandes a proveïdors +BoxTitleLatestModifiedSupplierOrders=Últimes %s comandes de proveïdors modificades NoSupplierOrder=Sense comandes a proveïdors BoxCustomersInvoicesPerMonth=Factures a clients per mes BoxSuppliersInvoicesPerMonth=Factures de proveïdors per mes @@ -84,8 +89,9 @@ BoxCustomersOrdersPerMonth=Comandes de clients per mes BoxSuppliersOrdersPerMonth=Comandes a proveïdors per mes BoxProposalsPerMonth=Pressupostos per mes NoTooLowStockProducts=Sense productes per sota de l'estoc mínim -BoxProductDistribution=Products/Services distribution -BoxProductDistributionFor=Distribution of %s for %s +BoxProductDistribution=Distribució de productes/serveis +BoxProductDistributionFor=Distribució de %s per %s ForCustomersInvoices=Factures a clientes -ForCustomersOrders=Customers orders +ForCustomersOrders=Comandes de clients ForProposals=Pressupostos +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang index 8377ca7b49c8f..e465e49b67308 100644 --- a/htdocs/langs/ca_ES/errors.lang +++ b/htdocs/langs/ca_ES/errors.lang @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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=Els paràmetres obligatoris de configuració no estan encara definits diff --git a/htdocs/langs/ca_ES/interventions.lang b/htdocs/langs/ca_ES/interventions.lang index 0bdcd01a5bf29..67cde06844a0a 100644 --- a/htdocs/langs/ca_ES/interventions.lang +++ b/htdocs/langs/ca_ES/interventions.lang @@ -3,7 +3,7 @@ Intervention=Intervenció Interventions=Intervencions InterventionCard=Fitxa intervenció NewIntervention=Nova itervenció -AddIntervention=Create intervention +AddIntervention=Crear intervenció ListOfInterventions=Llista d'intervencions EditIntervention=Editar ActionsOnFicheInter=Esdeveniments sobre l'intervenció @@ -24,21 +24,21 @@ NameAndSignatureOfInternalContact=Nom i signatura del participant: NameAndSignatureOfExternalContact=Nom i signatura del client: DocumentModelStandard=Document model estàndard per a intervencions InterventionCardsAndInterventionLines=Fitxes i línies d'intervenció -InterventionClassifyBilled=Classify "Billed" -InterventionClassifyUnBilled=Classify "Unbilled" +InterventionClassifyBilled=Classificar "facturat" +InterventionClassifyUnBilled=Classificar "no facturat" StatusInterInvoiced=Facturado RelatedInterventions=Intervencions adjuntes ShowIntervention=Mostrar intervenció -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=Presentar intervenció %s +SendInterventionByMail=Enviar intervenció per email +InterventionCreatedInDolibarr=Intervenció %s creada +InterventionValidatedInDolibarr=Intervenció %s validada +InterventionModifiedInDolibarr=Intervenció %s modificada +InterventionClassifiedBilledInDolibarr=Intervenció %s marcada com a facturada +InterventionClassifiedUnbilledInDolibarr=Intervenció %s marcada com a no facturada +InterventionSentByEMail=Intervenció %s enviada per email +InterventionDeletedInDolibarr=Intevenció %s eliminada +SearchAnIntervention=Cerca una intervenció ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Responsable seguiment de la intervenció TypeContact_fichinter_internal_INTERVENING=Interventor @@ -50,4 +50,4 @@ ArcticNumRefModelError=Activació impossible PacificNumRefModelDesc1=Retorna el número amb el format %syymm-nnnn on yy és l'any, mm. el mes i nnnn un comptador seqüencial sense ruptura i sense quedar a 0 PacificNumRefModelError=Una factura que comença per # $$syymm existeix en base i és incompatible amb aquesta numeració. Elemínela o renombrela per activar aquest mòdul. PrintProductsOnFichinter=Mostrar els productes a la fitxa d'intervenció -PrintProductsOnFichinterDetails=per a les intervencions generades a partir de comandes +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang index bafdc982e29b8..05c93f2874a82 100644 --- a/htdocs/langs/ca_ES/main.lang +++ b/htdocs/langs/ca_ES/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=HH:MM FormatHourShort=%H:%M FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y @@ -35,7 +35,7 @@ ErrorFailedToOpenFile=Impossible obrir el fitxer %s ErrorCanNotCreateDir=Impossible crear la carpeta %s ErrorCanNotReadDir=Impossible llegir la carpeta %s ErrorConstantNotDefined=Parámetre %s no definit -ErrorUnknown=Unknown error +ErrorUnknown=Error desconegut ErrorSQL=Error de SQL ErrorLogoFileNotFound=El arxiu logo '%s' no es troba ErrorGoToGlobalSetup=Aneu a la Configuració 'Empresa/Institució' per corregir @@ -59,13 +59,13 @@ ErrorCantLoadUserFromDolibarrDatabase=Impossible trobar l'usuari %s a la ErrorNoVATRateDefinedForSellerCountry=Error, cap tipus d'IVA definit per al país '%s'. ErrorNoSocialContributionForSellerCountry=Error, cap tipus de càrrega social definida per al país '%s'. ErrorFailedToSaveFile=Error, el registre del fitxer ha fallat. -SetDate=Set date -SelectDate=Select a date +SetDate=Definir data +SelectDate=Seleccioneu una data SeeAlso=Veure també %s -SeeHere=See here +SeeHere=Mira aquí BackgroundColorByDefault=Color de fons -FileNotUploaded=The file was not uploaded -FileUploaded=The file was successfully uploaded +FileNotUploaded=No s'ha pujat l'arxiu +FileUploaded=L'arxiu s'ha carregat correctament FileWasNotUploaded=Un arxiu ha estat seleccionat per adjuntar, però encara no ha estat pujat. Feu clic a "Adjuntar aquest arxiu" per a això. NbOfEntries=Nº d'entrades GoToWikiHelpPage=Consultar l'ajuda (pot requerir accés a Internet) @@ -96,7 +96,7 @@ InformationLastAccessInError=Informació sobre l'últim accés a la base de dade DolibarrHasDetectedError=Dolibarr ha trobat un error tècnic InformationToHelpDiagnose=Heus aquí la informació que podrà ajudar al diagnòstic MoreInformation=Més informació -TechnicalInformation=Technical information +TechnicalInformation=Informació tècnica NotePublic=Nota (pública) NotePrivate=Nota (privada) PrecisionUnitIsLimitedToXDecimals=Dolibarr està configurat per limitar la precisió dels preus unitaris a %s decimals. @@ -141,7 +141,7 @@ Cancel=Anul·lar Modify=Modificar Edit=Editar Validate=Validar -ValidateAndApprove=Validate and Approve +ValidateAndApprove=Validar i aprovar ToValidate=A validar Save=Gravar SaveAs=Gravar com @@ -159,10 +159,10 @@ Search=Cercar SearchOf=Cerca de Valid=Validar Approve=Aprovar -Disapprove=Disapprove +Disapprove=Desaprovar ReOpen=Reobrir Upload=Enviar arxiu -ToLink=Link +ToLink=Enllaç Select=Seleccionar Choose=Escollir ChooseLangage=Triar l'idioma @@ -173,7 +173,7 @@ User=Usuari Users=Usuaris Group=Grup Groups=Grups -NoUserGroupDefined=No user group defined +NoUserGroupDefined=Grup d'usuari no definit Password=Contrasenya PasswordRetype=Repetir contrasenya NoteSomeFeaturesAreDisabled=Atenció, només uns pocs mòduls/funcionalitats han estat activats en aquesta demo. @@ -211,7 +211,7 @@ Limit=Límit Limits=Límits DevelopmentTeam=Equip de desenvolupament Logout=Desconnexió -NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode %s +NoLogoutProcessWithAuthMode=No s'ha pogut desconnectar amb el mètode de autenticació %s Connection=Connexió Setup=Configuració Alert=Alerta @@ -220,8 +220,9 @@ Next=Següent Cards=Fitxes Card=Fitxa Now=Ara +HourStart=Start hour Date=Data -DateAndHour=Date and hour +DateAndHour=Data i hora DateStart=Data inici DateEnd=Data fi DateCreation=Data de creació @@ -242,6 +243,8 @@ DatePlanShort=Data Planif. DateRealShort=Data real DateBuild=Data generació de l'informe DatePayment=Data pagament +DateApprove=Approving date +DateApprove2=Approving date (second approval) DurationYear=any DurationMonth=mes DurationWeek=setmana @@ -264,16 +267,16 @@ days=dies Hours=Hores Minutes=Minuts Seconds=Segons -Weeks=Weeks +Weeks=setmanes Today=Avuí Yesterday=Ahir Tomorrow=Demà -Morning=Morning -Afternoon=Afternoon +Morning=Demati +Afternoon=Tarda Quadri=Trimistre MonthOfDay=Mes del dia HourShort=H -MinuteShort=mn +MinuteShort=Minut Rate=Tipus UseLocalTax=Incloure taxes Bytes=Bytes @@ -324,7 +327,7 @@ SubTotal=Subtotal TotalHTShort=Import TotalTTCShort=Total TotalHT=Base imponible -TotalHTforthispage=Total (net of tax) for this page +TotalHTforthispage=Base imposable a la pagina TotalTTC=Total TotalTTCToYourCredit=Total a crèdit TotalVAT=Total IVA @@ -349,10 +352,10 @@ FullList=Llista completa Statistics=Estadístiques OtherStatistics=Altres estadístiques Status=Estat -Favorite=Favorite +Favorite=Favorit ShortInfo=Info. Ref=Ref. -ExternalRef=Ref. extern +ExternalRef=Ref. externa RefSupplier=Ref. proveïdor RefPayment=Ref. pagament CommercialProposalsShort=Pressupostos @@ -367,7 +370,7 @@ ActionNotApplicable=No aplicable ActionRunningNotStarted=No començat ActionRunningShort=Començat ActionDoneShort=Acabat -ActionUncomplete=Uncomplete +ActionUncomplete=Incomplet CompanyFoundation=Empresa o institució ContactsForCompany=Contactes d'aquest tercer ContactsAddressesForCompany=Contactes/adreces d'aquest tercer @@ -376,7 +379,7 @@ ActionsOnCompany=Esdeveniments respecte aquest tercer ActionsOnMember=Esdeveniments respecte aquest membre NActions=%s esdeveniments NActionsLate=%s en retard -RequestAlreadyDone=Request already recorded +RequestAlreadyDone=Sol·licitud ja recollida Filter=Filtre RemoveFilter=Eliminar filtre ChartGenerated=Gràfics generats @@ -395,8 +398,8 @@ Available=Disponible NotYetAvailable=Encara no disponible NotAvailable=No disponible Popularity=Popularitat -Categories=Tags/categories -Category=Tag/category +Categories=Etiquetes/categories +Category=Etiqueta/categoria By=Per From=De to=a @@ -408,7 +411,9 @@ OtherInformations=Altres informacions Quantity=Quantitat Qty=Qt. ChangedBy=Modificat per -ReCalculate=Recalculate +ApprovedBy=Approved by +ApprovedBy2=Approved by (second approval) +ReCalculate=Recalcular ResultOk=Èxit ResultKo=Error Reporting=Informe @@ -520,13 +525,13 @@ NbOfCustomers=Nombre de clients NbOfLines=Números de línies NbOfObjects=Nombre d'objectes NbOfReferers=Consumició -Referers=Refering objects +Referers=Objectes vinculats TotalQuantity=Quantitat total DateFromTo=De %s a %s DateFrom=A partir de %s DateUntil=Fins %s Check=Verificar -Uncheck=Uncheck +Uncheck=Desmarcar Internal=Intern External=Extern Internals=Interns @@ -565,7 +570,7 @@ MailSentBy=Mail enviat per TextUsedInTheMessageBody=Text utilitzat en el cos del missatge SendAcknowledgementByMail=Enviament rec. per e-mail NoEMail=Sense e-mail -NoMobilePhone=No mobile phone +NoMobilePhone=Sense mòbil Owner=Propietari DetectedVersion=Versió detectada FollowingConstantsWillBeSubstituted=Les següents constants seran substituïdes pel seu valor corresponent. @@ -591,7 +596,7 @@ TotalWoman=Total TotalMan=Total NeverReceived=Mai rebut Canceled=Cancel·lat -YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary +YouCanChangeValuesForThisListFromDictionarySetup=Pot canviar aquestos valors al menú configuració->diccionaris Color=Color Documents=Documents DocumentsNb=Fitxers adjunts (%s) @@ -620,8 +625,8 @@ Notes=Notes AddNewLine=Afegir nova línia AddFile=Afegir arxiu ListOfFiles=Llistat d'arxius disponibles -FreeZone=Free entry -FreeLineOfType=Free entry of type +FreeZone=Zona lliure +FreeLineOfType=Tipus de zona lliure CloneMainAttributes=Clonar l'objecte amb aquests atributs principals PDFMerge=Fussió PDF Merge=Fussió @@ -658,7 +663,7 @@ OptionalFieldsSetup=Configuració dels atributs opcionals URLPhoto=Url de la foto/logo SetLinkToThirdParty=Vincular a un altre tercer CreateDraft=Crea esborrany -SetToDraft=Back to draft +SetToDraft=Tornar a redactar ClickToEdit=Clic per a editar ObjectDeleted=Objecte %s eliminat ByCountry=Per país @@ -681,21 +686,23 @@ HomeDashboard=Resum Deductible=Deduïble from=de toward=cap a -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 -GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide. +Access=Accés +HelpCopyToClipboard=Utilitzeu Ctrl+C per copiar al portapapers +SaveUploadedFileWithMask=Desa el fitxer al servidor amb el nom "%s" (del contrari "%s") +OriginFileName=Nom original de l'arxiu +SetDemandReason=Definir orige +SetBankAccount=Definir el compte bancari +AccountCurrency=Divisa del compte +ViewPrivateNote=Veure notes +XMoreLines=%s línia(es) oculta(es) +PublicUrl=URL pública +AddBox=Afegir quadre +SelectElementAndClickRefresh=Seleccioneu un element i feu clic a Actualitza +PrintFile=%s arxius a imprimir +ShowTransaction=Mostra transacció +GoIntoSetupToChangeLogo=Anar a Inici->Configuració->Empresa per canviar el logotip o anar a Inici->Configuració->Visualització per amagar. +Deny=Deny +Denied=Denied # Week day Monday=Dilluns Tuesday=Dimarts diff --git a/htdocs/langs/ca_ES/orders.lang b/htdocs/langs/ca_ES/orders.lang index 5088cabc3527a..5571c384c3420 100644 --- a/htdocs/langs/ca_ES/orders.lang +++ b/htdocs/langs/ca_ES/orders.lang @@ -79,7 +79,9 @@ NoOpenedOrders=Cap comanda esborrany NoOtherOpenedOrders=Cap altra comanda esborrany NoDraftOrders=Sense comandes esborrany OtherOrders=Altres comandes -LastOrders=Les %s darreres comandes +LastOrders=Last %s customer orders +LastCustomerOrders=Last %s customer orders +LastSupplierOrders=Last %s supplier orders LastModifiedOrders=Les %s darreres comandes modificades LastClosedOrders=Les %s darreres comandes tancades AllOrders=Totes les comandes diff --git a/htdocs/langs/ca_ES/other.lang b/htdocs/langs/ca_ES/other.lang index b8b1dcf2992c2..3b60ef608154a 100644 --- a/htdocs/langs/ca_ES/other.lang +++ b/htdocs/langs/ca_ES/other.lang @@ -203,6 +203,7 @@ 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. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=Afegir entrada al calendari diff --git a/htdocs/langs/ca_ES/productbatch.lang b/htdocs/langs/ca_ES/productbatch.lang index 452636819653f..85b1d27f3a611 100644 --- a/htdocs/langs/ca_ES/productbatch.lang +++ b/htdocs/langs/ca_ES/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use batch/serial number -ProductStatusOnBatch=Yes (Batch/serial required) -ProductStatusNotOnBatch=No (Batch/serial not used) +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/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 +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial 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 +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %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. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang index 4aae30221f4de..d1706c8c5bc54 100644 --- a/htdocs/langs/ca_ES/projects.lang +++ b/htdocs/langs/ca_ES/projects.lang @@ -14,6 +14,7 @@ MyTasksDesc=Aquesta vista es limita als projectes i tasques en què vostè és u 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). +AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. ProjectsArea=Àrea projectes NewProject=Nou projecte AddProject=Create project diff --git a/htdocs/langs/ca_ES/stocks.lang b/htdocs/langs/ca_ES/stocks.lang index 4b3f823d58975..c312f676481cd 100644 --- a/htdocs/langs/ca_ES/stocks.lang +++ b/htdocs/langs/ca_ES/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Anul·lar enviament DeleteSending=Eliminar enviament Stock=Estoc Stocks=Estocs +StocksByLotSerial=Stock by lot/serial Movement=Moviment Movements=Moviments ErrorWarehouseRefRequired=El nom de referència del magatzem és obligatori @@ -78,6 +79,7 @@ IdWarehouse=Id. magatzem DescWareHouse=Descripció magatzem LieuWareHouse=Localització magatzem WarehousesAndProducts=Magatzems i productes +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=Preu mitjà ponderat (PMP) AverageUnitPricePMP=Preu mitjà ponderat (PMP) d'aquisició SellPriceMin=Preu de venda unitari @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/ca_ES/suppliers.lang b/htdocs/langs/ca_ES/suppliers.lang index a06046334e5df..248eeb557cc7c 100644 --- a/htdocs/langs/ca_ES/suppliers.lang +++ b/htdocs/langs/ca_ES/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) +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/ca_ES/trips.lang b/htdocs/langs/ca_ES/trips.lang index 7999889e67838..5e9ca6a8d9f74 100644 --- a/htdocs/langs/ca_ES/trips.lang +++ b/htdocs/langs/ca_ES/trips.lang @@ -69,11 +69,9 @@ 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 @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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 3233222e75315..05b7ea91f2821 100644 --- a/htdocs/langs/cs_CZ/admin.lang +++ b/htdocs/langs/cs_CZ/admin.lang @@ -297,10 +297,11 @@ MenuHandlers=Menu handlery MenuAdmin=Menu editor DoNotUseInProduction=Nepoužívejte ve výrobě ThisIsProcessToFollow=Nastaveno na proces: +ThisIsAlternativeProcessToFollow=This is an alternative setup to process: StepNb=Krok %s FindPackageFromWebSite=Nalezni balíček, obsahující funkci jež chcete (např. na oficiálních stránkách %s). DownloadPackageFromWebSite=Download package %s. -UnpackPackageInDolibarrRoot=Rozbalit balíček do kořenového adresáře Dolibarr %s +UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: %s SetupIsReadyForUse=Instalace je dokončena a Dolibarr je připraven k použití. NotExistsDirect=Alternativní kořenový adresář není definován.
InfDirAlt=Od verze 3 je možné definovat alternativní kořenovou složku. To umožňuje ukládat na stejné místo plug-iny a vlastní šablony.
Stačí vytvořit adresář v kořenovém adresáři Dolibarr (např.: custom).
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_ 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=Knihovna použít k vytvoření PDF WarningUsingFPDF=Upozornění: Váš conf.php obsahuje direktivu dolibarr_pdf_force_fpdf = 1. To znamená, že můžete používat knihovnu FPDF pro generování PDF souborů. Tato knihovna je stará a nepodporuje mnoho funkcí (Unicode, obraz transparentnost, azbuka, arabské a asijské jazyky, ...), takže může dojít k chybám při generování PDF.
Chcete-li vyřešit tento a mají plnou podporu generování PDF, stáhněte si TCPDF knihovny , pak komentář nebo odebrat řádek $ dolibarr_pdf_force_fpdf = 1, a místo něj doplnit $ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir " -LocalTaxDesc=Některé země používají 2 nebo 3 daně na každou fakturu řádku. Pokud je to tento případ, vybrat typ druhém a třetím daně a její sazba. Možné typem jsou:
1: pobytová taxa platí o produktech a službách bez DPH (není aplikován na místní daně)
2: pobytová taxa platí o produktech a službách před DPH (je vypočtena na částku + localtax)
3: pobytová taxa platí na výrobky bez DPH (není aplikován na místní daně)
4: pobytová taxa platí na výrobky před DPH (je vypočtena na částku + localtax)
5: pobytová taxa platí na služby bez DPH (není aplikován na místní daně)
6: pobytová taxa platí o službách před DPH (je vypočtena na částku + localtax) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Zadejte telefonní číslo pro volání ukázat odkaz na test ClickToDial URL pro %s RefreshPhoneLink=Obnovit odkaz @@ -540,8 +541,8 @@ 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 +Module39000Name=Product lot +Module39000Desc=Lot or serial number, eat-by and sell-by date management on products Module50000Name=Paybox Module50000Desc=Modul nabídnout on-line platby kreditní kartou stránku s Paybox Module50100Name=Bod prodeje @@ -558,8 +559,6 @@ Module59000Name=Okraje Module59000Desc=Modul pro správu marže Module60000Name=Provize Module60000Desc=Modul pro správu provize -Module150010Name=Batch number, eat-by date and sell-by date -Module150010Desc=batch number, eat-by date and sell-by date management for product Permission11=Přečtěte si zákazníků faktury Permission12=Vytvořit / upravit zákazníků faktur Permission13=Unvalidate zákazníků faktury @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= RE sazba ve výchozím nastavení při vytváření vyhl LocalTax2IsNotUsedDescES= Ve výchozím nastavení je navrhovaná IRPF je 0. Konec vlády. LocalTax2IsUsedExampleES= Ve Španělsku, na volné noze a nezávislí odborníci, kteří poskytují služby a firmy, kteří se rozhodli daňového systému modulů. LocalTax2IsNotUsedExampleES= Ve Španělsku jsou bussines, které nejsou předmětem daňového systému modulů. -CalcLocaltax=Reports -CalcLocaltax1ES=Sales - Purchases +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Sales - Purchases CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Purchases +CalcLocaltax2=Purchases CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Sales +CalcLocaltax3=Sales CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales LabelUsedByDefault=Label používá ve výchozím nastavení, pokud není překlad lze nalézt kód LabelOnDocuments=Štítek na dokumenty @@ -1018,14 +1017,14 @@ NoEventOrNoAuditSetup=Žádná událost zabezpečení byl zaznamenán ještě. T NoEventFoundWithCriteria=Žádná událost zabezpečení byl nalezen na těchto vyhledávacích kritérii. SeeLocalSendMailSetup=Podívejte se na místní sendmail nastavení BackupDesc=Chcete-li provést kompletní zálohu Dolibarr, musíte: -BackupDesc2=* Uložte obsah adresáře dokumentů (%s), který obsahuje všechny nahrané a generované soubory (můžete udělat zip pro příklad). -BackupDesc3=* Ukládání obsahu databáze do souboru s výpisem. K tomu můžete použít následující asistenta. +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=Archivní adresář by měl být skladován na bezpečném místě. BackupDescY=Vygenerovaný soubor výpisu by měl být skladován na bezpečném místě. BackupPHPWarning=Záloha nemůže být garantováno s touto metodou. Preferuji předchozí RestoreDesc=Chcete-li obnovit zálohu Dolibarr, musíte: -RestoreDesc2=* Obnovení souboru archivu (zip soubor například) v adresáři dokumentů získat struktuře souborů v adresáři dokumentů jako nová instalace Dolibarr nebo do této aktuálních dokumentech directoy (%s). -RestoreDesc3=* Obnovení dat ze záložního souboru výpisu, do databáze nové instalaci Dolibarr nebo do databáze této aktuální instalaci. Pozor, po obnovení dokončeno, musíte použít login / heslo, které existovaly, kdy byla provedena záloha, znovu připojit. Chcete-li obnovit zálohu databáze do této aktuální instalaci, můžete sledovat náš pomocník. +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= Toto pravidlo je nucen %s aktivovaným modulem PreviousDumpFiles=Dostupné databázové soubory zálohování výpisu @@ -1337,6 +1336,8 @@ LDAPFieldCountry=Země LDAPFieldCountryExample=Příklad: c LDAPFieldDescription=Popis LDAPFieldDescriptionExample=Příklad: popis +LDAPFieldNotePublic=Public Note +LDAPFieldNotePublicExample=Example : publicnote LDAPFieldGroupMembers= Členové skupiny LDAPFieldGroupMembersExample= Příklad: uniqueMember LDAPFieldBirthdate=Datum narození @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= Výchozí účet použít pro příjem plateb prostře 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot 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 @@ -1616,3 +1617,8 @@ 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 +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" diff --git a/htdocs/langs/cs_CZ/banks.lang b/htdocs/langs/cs_CZ/banks.lang index 67ff3cf601101..2b8e112326370 100644 --- a/htdocs/langs/cs_CZ/banks.lang +++ b/htdocs/langs/cs_CZ/banks.lang @@ -163,3 +163,5 @@ LabelRIB=BAN Label NoBANRecord=No BAN record DeleteARib=Delete BAN record ConfirmDeleteRib=Are you sure you want to delete this BAN record ? +StartDate=Start date +EndDate=End date diff --git a/htdocs/langs/cs_CZ/boxes.lang b/htdocs/langs/cs_CZ/boxes.lang index 66b2325fb14c5..0fa28ad9184d0 100644 --- a/htdocs/langs/cs_CZ/boxes.lang +++ b/htdocs/langs/cs_CZ/boxes.lang @@ -12,6 +12,7 @@ BoxLastProspects=Naposledy měnění prospekti BoxLastCustomers=Naposledy měnění zákazníci BoxLastSuppliers=Naposledy měnění dodavatelé BoxLastCustomerOrders=Poslední zákaznické objednávky +BoxLastValidatedCustomerOrders=Last validated customer orders BoxLastBooks=Poslední knihy BoxLastActions=Poslední akce BoxLastContracts=Poslední smlouvy @@ -27,26 +28,29 @@ BoxTitleNbOfCustomers=Počet klientů BoxTitleLastRssInfos=Poslední %s zprávy z %s BoxTitleLastProducts=Poslední %s modifikované produkty / služby BoxTitleProductsAlertStock=Produkty skladem pohotovosti -BoxTitleLastCustomerOrders=Poslední %s upravené zákaznické objednávky +BoxTitleLastCustomerOrders=Last %s customer orders +BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders BoxTitleLastSuppliers=Poslední %s zaznamenán dodavatele BoxTitleLastCustomers=Poslední %s nahrané zákazníky BoxTitleLastModifiedSuppliers=Poslední %s upravené dodavatele BoxTitleLastModifiedCustomers=Poslední %s modifikované zákazníky -BoxTitleLastCustomersOrProspects=Poslední %s modifikované zákazníky nebo vyhlídky -BoxTitleLastPropals=Poslední %s zaznamenané návrhy +BoxTitleLastCustomersOrProspects=Last %s customers or prospects +BoxTitleLastPropals=Last %s proposals +BoxTitleLastModifiedPropals=Last %s modified proposals BoxTitleLastCustomerBills=Minulý %s zákazníka faktury +BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices BoxTitleLastSupplierBills=Minulý %s dodavatelských faktur -BoxTitleLastProspects=Poslední %s zaznamenán vyhlídky +BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices BoxTitleLastModifiedProspects=Poslední %s upravené vyhlídky BoxTitleLastProductsInContract=Poslední %s produkty / služby ve smlouvě -BoxTitleLastModifiedMembers=Poslední %s modifikované členů +BoxTitleLastModifiedMembers=Last %s members BoxTitleLastFicheInter=Poslední %s upravený zásah -BoxTitleOldestUnpaidCustomerBills=Nejstarší %s Nezaplacené faktury zákazníka -BoxTitleOldestUnpaidSupplierBills=Nejstarší %s Nezaplacené faktury dodavatele +BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices +BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices BoxTitleCurrentAccounts=Opened account's balances BoxTitleSalesTurnover=Obrat -BoxTitleTotalUnpaidCustomerBills=Nezaplacené faktury zákazníka -BoxTitleTotalUnpaidSuppliersBills=Nezaplacené faktury dodavatele +BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices +BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices BoxTitleLastModifiedContacts=Poslední %s upravené kontakty / adresy BoxMyLastBookmarks=Moje poslední %s záložky BoxOldestExpiredServices=Nejstarší aktivní vypršela služby @@ -76,7 +80,8 @@ NoContractedProducts=Žádné produkty / služby smluvně NoRecordedContracts=Žádné zaznamenané smlouvy NoRecordedInterventions=Žádné zaznamenané zásahy BoxLatestSupplierOrders=Nejnovější dodavatelské objednávky -BoxTitleLatestSupplierOrders=%s nejnovější dodavatelské objednávky +BoxTitleLatestSupplierOrders=Last %s supplier orders +BoxTitleLatestModifiedSupplierOrders=Last %s modified supplier orders NoSupplierOrder=Žádné zaznamenané dodavatele, aby BoxCustomersInvoicesPerMonth=Zákazníků faktury za měsíc BoxSuppliersInvoicesPerMonth=Dodavatelských faktur za měsíc @@ -89,3 +94,4 @@ BoxProductDistributionFor=Distribuce %s pro %s ForCustomersInvoices=Zákazníci faktury ForCustomersOrders=Zákazníci objednávky ForProposals=Návrhy +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/cs_CZ/errors.lang b/htdocs/langs/cs_CZ/errors.lang index 9443bb8c68323..7a9d91e07666b 100644 --- a/htdocs/langs/cs_CZ/errors.lang +++ b/htdocs/langs/cs_CZ/errors.lang @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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=Povinné parametry jsou dosud stanoveny diff --git a/htdocs/langs/cs_CZ/interventions.lang b/htdocs/langs/cs_CZ/interventions.lang index 0e824e8fcef34..a37f812b23dc3 100644 --- a/htdocs/langs/cs_CZ/interventions.lang +++ b/htdocs/langs/cs_CZ/interventions.lang @@ -50,4 +50,4 @@ ArcticNumRefModelError=Nepodařilo se aktivovat PacificNumRefModelDesc1=Zpět numero ve formátu %syymm-nnnn, kde yy je rok, MM je měsíc a nnnn je sekvence bez přerušení a bez vrátí na 0. PacificNumRefModelError=Zásah karta začíná s $ syymm již existuje a není kompatibilní s tímto modelem sekvence. Vyjměte ji nebo přejmenujte jej na aktivaci tohoto modulu. PrintProductsOnFichinter=Vytisknout produktů na intervenční karty -PrintProductsOnFichinterDetails=forinterventions získané z objednávek +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang index a712b705f4bd6..516340250cb48 100644 --- a/htdocs/langs/cs_CZ/main.lang +++ b/htdocs/langs/cs_CZ/main.lang @@ -220,6 +220,7 @@ Next=Další Cards=Karty Card=Karta Now=Nyní +HourStart=Start hour Date=Datum DateAndHour=Date and hour DateStart=Datum začátku @@ -242,6 +243,8 @@ DatePlanShort=Datum hoblované DateRealShort=Datum skutečný. DateBuild=Zpráva datum sestavení DatePayment=Datum platby +DateApprove=Approving date +DateApprove2=Approving date (second approval) DurationYear=rok DurationMonth=měsíc DurationWeek=týden @@ -408,6 +411,8 @@ OtherInformations=Ostatní informace Quantity=Množství Qty=Množství ChangedBy=Změnil +ApprovedBy=Approved by +ApprovedBy2=Approved by (second approval) ReCalculate=Přepočítat ResultOk=Úspěch ResultKo=Selhání @@ -696,6 +701,8 @@ 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. +Deny=Deny +Denied=Denied # Week day Monday=Pondělí Tuesday=Úterý diff --git a/htdocs/langs/cs_CZ/orders.lang b/htdocs/langs/cs_CZ/orders.lang index 860d43d75b6c2..0a0cddfa5d88a 100644 --- a/htdocs/langs/cs_CZ/orders.lang +++ b/htdocs/langs/cs_CZ/orders.lang @@ -79,7 +79,9 @@ NoOpenedOrders=Žádné otevřené příkazy NoOtherOpenedOrders=Žádný jiný otevřel objednávky NoDraftOrders=Žádné návrhy objednávky OtherOrders=Ostatní objednávky -LastOrders=Poslední %s objednávky +LastOrders=Last %s customer orders +LastCustomerOrders=Last %s customer orders +LastSupplierOrders=Last %s supplier orders LastModifiedOrders=Poslední %s modifikované objednávky LastClosedOrders=Poslední %s uzavřené objednávky AllOrders=Všechny objednávky diff --git a/htdocs/langs/cs_CZ/other.lang b/htdocs/langs/cs_CZ/other.lang index 475e40fdbad20..0d7c1c4f99ba5 100644 --- a/htdocs/langs/cs_CZ/other.lang +++ b/htdocs/langs/cs_CZ/other.lang @@ -203,6 +203,7 @@ NewKeyWillBe=Váš nový klíč pro přihlášení do softwaru bude ClickHereToGoTo=Klikněte zde pro přechod na %s YouMustClickToChange=Musíte však nejprve kliknout na následující odkaz pro potvrzení této změny hesla ForgetIfNothing=Pokud jste o tuto změnu, stačí zapomenout na tento e-mail. Vaše přihlašovací údaje jsou v bezpečí. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=Přidat záznam do kalendáře %s diff --git a/htdocs/langs/cs_CZ/productbatch.lang b/htdocs/langs/cs_CZ/productbatch.lang index 452636819653f..85b1d27f3a611 100644 --- a/htdocs/langs/cs_CZ/productbatch.lang +++ b/htdocs/langs/cs_CZ/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use batch/serial number -ProductStatusOnBatch=Yes (Batch/serial required) -ProductStatusNotOnBatch=No (Batch/serial not used) +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/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 +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial 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 +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %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. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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/cs_CZ/projects.lang b/htdocs/langs/cs_CZ/projects.lang index 515e20fac140a..67feb9b64539d 100644 --- a/htdocs/langs/cs_CZ/projects.lang +++ b/htdocs/langs/cs_CZ/projects.lang @@ -14,6 +14,7 @@ MyTasksDesc=Tento pohled je omezen na projekty či úkoly u kterých jste uveden 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). +AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. ProjectsArea=Projekty NewProject=Nový projekt AddProject=Create project diff --git a/htdocs/langs/cs_CZ/stocks.lang b/htdocs/langs/cs_CZ/stocks.lang index 451126fb05434..d284ef3464038 100644 --- a/htdocs/langs/cs_CZ/stocks.lang +++ b/htdocs/langs/cs_CZ/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Zrušit zasílání DeleteSending=Smazat odeslání Stock=Sklad Stocks=Zásoby +StocksByLotSerial=Stock by lot/serial Movement=Pohyb Movements=Pohyby ErrorWarehouseRefRequired=Sklad referenční jméno je povinné @@ -78,6 +79,7 @@ IdWarehouse=Id sklad DescWareHouse=Popis sklad LieuWareHouse=Lokalizace sklad WarehousesAndProducts=Sklady a produkty +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=Vážený průměr cen vstupů AverageUnitPricePMP=Vážený průměr cen vstupů SellPriceMin=Prodejní jednotka Cena @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/cs_CZ/suppliers.lang b/htdocs/langs/cs_CZ/suppliers.lang index 2c56c9da67fb5..7515875ecc33c 100644 --- a/htdocs/langs/cs_CZ/suppliers.lang +++ b/htdocs/langs/cs_CZ/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) +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/cs_CZ/trips.lang b/htdocs/langs/cs_CZ/trips.lang index faeac138096a2..72a8632728185 100644 --- a/htdocs/langs/cs_CZ/trips.lang +++ b/htdocs/langs/cs_CZ/trips.lang @@ -69,11 +69,9 @@ 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 @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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 50aff90a32d2d..1d4269faf05ff 100644 --- a/htdocs/langs/da_DK/admin.lang +++ b/htdocs/langs/da_DK/admin.lang @@ -297,10 +297,11 @@ MenuHandlers=Menu håndterer MenuAdmin=Menu editor DoNotUseInProduction=Do not use in production ThisIsProcessToFollow=Det er opsætningen til processen: +ThisIsAlternativeProcessToFollow=This is an alternative setup to process: StepNb=Trin %s FindPackageFromWebSite=Find en pakke, der giver funktion, du ønsker (for eksempel på web site %s). DownloadPackageFromWebSite=Download package %s. -UnpackPackageInDolibarrRoot=Pak pakke filen i Dolibarr's rodbibliotek %s +UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: %s SetupIsReadyForUse=Installer er færdig og Dolibarr er klar til brug med denne nye komponent. 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).
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_ 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) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s RefreshPhoneLink=Refresh link @@ -540,8 +541,8 @@ 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 +Module39000Name=Product lot +Module39000Desc=Lot or serial number, eat-by and sell-by date management on products Module50000Name=PAYBOX Module50000Desc=Modul til at tilbyde en online betaling side med kreditkort med PAYBOX Module50100Name=Cash desk @@ -558,8 +559,6 @@ Module59000Name=Margin 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=Læs fakturaer Permission12=Opret/Modify fakturaer Permission13=Unvalidate fakturaer @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= RE sats som standard, når du opretter udsigter, fakturae LocalTax2IsNotUsedDescES= Som standard den foreslåede IRPF er 0. Slut på reglen. LocalTax2IsUsedExampleES= I Spanien, freelancere og selvstændige, der leverer tjenesteydelser og virksomheder, der har valgt at skattesystemet i de moduler. LocalTax2IsNotUsedExampleES= I Spanien er bussines ikke underlagt skattesystemet i moduler. -CalcLocaltax=Reports -CalcLocaltax1ES=Sales - Purchases +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Sales - Purchases CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Purchases +CalcLocaltax2=Purchases CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Sales +CalcLocaltax3=Sales CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales LabelUsedByDefault=Etiket, som bruges som standard, hvis ingen oversættelse kan findes for kode LabelOnDocuments=Etiketten på dokumenter @@ -1018,14 +1017,14 @@ NoEventOrNoAuditSetup=Ingen sikkerhed tilfælde er blevet registreret endnu. Det NoEventFoundWithCriteria=Ingen sikkerhed tilfælde er fundet for sådanne søgefelter. SeeLocalSendMailSetup=Se din lokale sendmail setup BackupDesc=Hvis du vil foretage en komplet sikkerhedskopi af Dolibarr, skal du: -BackupDesc2=* Gem indholdet af dokumenter directory ( %s), der indeholder alle uploadede og genererede filer (du kan gøre en zip for eksempel). -BackupDesc3=* Gem indholdet af din database med en dump. for dette, kan du bruge følgende assistent. +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=Arkiveret mappe skal opbevares på et sikkert sted. BackupDescY=De genererede dump fil bør opbevares på et sikkert sted. BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one RestoreDesc=At genskabe en Dolibarr sikkerhedskopi, skal du: -RestoreDesc2=* Restore arkivfil (zip-fil, for eksempel) af dokumenter biblioteket til at udpakke træ af filer i dokumenter mappe til en ny Dolibarr installation eller i denne aktuelle dokumenter directoy ( %s). -RestoreDesc3=* Gendan data fra en sikkerhedskopi dump fil, i databasen i den nye Dolibarr installation eller i databasen i denne aktuelle installation. Advarsel, når genoprette er færdig, skal du bruge et login / password, der eksisterede, da backup blev foretaget, for at oprette forbindelse igen. Sådan gendanner du en backup-database i denne aktuelle installation, kan du følge dette assistent. +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= Denne regel er tvunget til at %s ved en aktiveret modul PreviousDumpFiles=Tilgængelig database backup dump filer @@ -1337,6 +1336,8 @@ LDAPFieldCountry=Land LDAPFieldCountryExample=Eksempel: c LDAPFieldDescription=Beskrivelse LDAPFieldDescriptionExample=Eksempel: beskrivelse +LDAPFieldNotePublic=Public Note +LDAPFieldNotePublicExample=Example : publicnote LDAPFieldGroupMembers= Gruppens medlemmer LDAPFieldGroupMembersExample= Eksempel: uniqueMember LDAPFieldBirthdate=Fødselsdato @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= Konto til at bruge til at modtage kontant betaling ved 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot 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 @@ -1616,3 +1617,8 @@ 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 +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" diff --git a/htdocs/langs/da_DK/banks.lang b/htdocs/langs/da_DK/banks.lang index d66fa525a7bed..38da46493aa10 100644 --- a/htdocs/langs/da_DK/banks.lang +++ b/htdocs/langs/da_DK/banks.lang @@ -163,3 +163,5 @@ LabelRIB=BAN Label NoBANRecord=No BAN record DeleteARib=Delete BAN record ConfirmDeleteRib=Are you sure you want to delete this BAN record ? +StartDate=Start date +EndDate=End date diff --git a/htdocs/langs/da_DK/boxes.lang b/htdocs/langs/da_DK/boxes.lang index 335817568378e..04ef669a9b529 100644 --- a/htdocs/langs/da_DK/boxes.lang +++ b/htdocs/langs/da_DK/boxes.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - boxes BoxLastRssInfos=Rss oplysninger BoxLastProducts=Seneste produkter / ydelser -# BoxProductsAlertStock=Products in stock alert +BoxProductsAlertStock=Products in stock alert BoxLastProductsInContract=Seneste kontraheret produkter / tjenester BoxLastSupplierBills=Seneste leverandørens fakturaer BoxLastCustomerBills=Seneste kundens fakturaer @@ -12,13 +12,14 @@ BoxLastProspects=Seneste udsigter BoxLastCustomers=Seneste kunder BoxLastSuppliers=Seneste leverandører BoxLastCustomerOrders=Seneste kundens ordrer +BoxLastValidatedCustomerOrders=Last validated customer orders BoxLastBooks=Seneste bøger BoxLastActions=Seneste tiltag BoxLastContracts=Seneste kontrakter BoxLastContacts=Sidste kontakter / adresser BoxLastMembers=Nyeste medlemmer -# BoxFicheInter=Last interventions -# BoxCurrentAccounts=Opened accounts balance +BoxFicheInter=Last interventions +BoxCurrentAccounts=Opened accounts balance BoxSalesTurnover=Omsætning BoxTotalUnpaidCustomerBills=Total ubetalte kundens fakturaer BoxTotalUnpaidSuppliersBills=Total ubetalte leverandørens fakturaer @@ -26,27 +27,30 @@ BoxTitleLastBooks=Seneste %s registreres bøger BoxTitleNbOfCustomers=Nombre de klient BoxTitleLastRssInfos=Seneste %s nyheder fra %s BoxTitleLastProducts=Seneste %s modificerede produkter / ydelser -# BoxTitleProductsAlertStock=Products in stock alert -BoxTitleLastCustomerOrders=Seneste %s modificerede kundens ordrer +BoxTitleProductsAlertStock=Products in stock alert +BoxTitleLastCustomerOrders=Last %s customer orders +BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders BoxTitleLastSuppliers=Seneste %s registreres leverandører BoxTitleLastCustomers=Seneste %s registreres kunder BoxTitleLastModifiedSuppliers=Sidst %s ændret leverandører BoxTitleLastModifiedCustomers=Sidst %s ændret kunder -BoxTitleLastCustomersOrProspects=Seneste %s registreres kunder eller kundeemner -BoxTitleLastPropals=Seneste %s registreres forslag +BoxTitleLastCustomersOrProspects=Last %s customers or prospects +BoxTitleLastPropals=Last %s proposals +BoxTitleLastModifiedPropals=Last %s modified proposals BoxTitleLastCustomerBills=Seneste %s kundens fakturaer +BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices BoxTitleLastSupplierBills=Seneste %s leverandørens fakturaer -BoxTitleLastProspects=Seneste %s registreres udsigter +BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices BoxTitleLastModifiedProspects=Sidst %s ændret udsigterne BoxTitleLastProductsInContract=Seneste %s produkter / services i en kontrakt -BoxTitleLastModifiedMembers=Sidste %s modificerede medlemmer -# BoxTitleLastFicheInter=Last %s modified intervention -BoxTitleOldestUnpaidCustomerBills=Aldersformand %s ubetalte kundens fakturaer -BoxTitleOldestUnpaidSupplierBills=Aldersformand %s ubetalte leverandørens fakturaer -# BoxTitleCurrentAccounts=Opened account's balances +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=Omsætning -BoxTitleTotalUnpaidCustomerBills=Ulønnet kundens fakturaer -BoxTitleTotalUnpaidSuppliersBills=Ulønnet leverandørens fakturaer +BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices +BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices BoxTitleLastModifiedContacts=Sidste %s ændret kontakter / adresser BoxMyLastBookmarks=Min sidste %s bogmærker BoxOldestExpiredServices=Ældste aktive udløbne tjenester @@ -55,7 +59,7 @@ BoxTitleLastActionsToDo=Seneste %s aktioner at gøre BoxTitleLastContracts=Sidste %s kontrakter BoxTitleLastModifiedDonations=Sidste %s ændret donationer BoxTitleLastModifiedExpenses=Sidste %s ændret udgifter -# BoxGlobalActivity=Global activity (invoices, proposals, orders) +BoxGlobalActivity=Global activity (invoices, proposals, orders) FailedToRefreshDataInfoNotUpToDate=Det lykkedes ikke at opdatere RSS flux. Seneste vellykkede opdatere dato: %s LastRefreshDate=Sidst opdateret dato NoRecordedBookmarks=No bookmarks defined. Click her for at tilføje bogmærker. @@ -74,18 +78,20 @@ NoRecordedProducts=Nr. registreres produkter / tjenester NoRecordedProspects=Nr. registreres udsigter NoContractedProducts=Ingen produkter / tjenesteydelser kontrakt NoRecordedContracts=Ingen registrerede 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 +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=Kundernes fakturaer -# ForCustomersOrders=Customers orders +ForCustomersOrders=Customers orders ForProposals=Forslag +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang index 3a988907211db..5714851a08990 100644 --- a/htdocs/langs/da_DK/errors.lang +++ b/htdocs/langs/da_DK/errors.lang @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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/langs/da_DK/interventions.lang b/htdocs/langs/da_DK/interventions.lang index efb080c2be457..53cf38a44cf2f 100644 --- a/htdocs/langs/da_DK/interventions.lang +++ b/htdocs/langs/da_DK/interventions.lang @@ -50,4 +50,4 @@ ArcticNumRefModelError=Det lykkedes ikke at aktivere PacificNumRefModelDesc1=Retur numero med format %syymm-nnnn hvor ÅÅ er årstal, MM er måneden og nnnn er en sekvens uden pause, og ikke vende tilbage til 0 PacificNumRefModelError=En intervention kortet begynder med $ syymm allerede eksisterer og er ikke kompatible med denne model af sekvensinformation. Fjern den eller omdøbe den til at aktivere dette modul. PrintProductsOnFichinter=Print products on intervention card -PrintProductsOnFichinterDetails=forinterventions generated from orders +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang index a905c89c749cf..8d3150d51388a 100644 --- a/htdocs/langs/da_DK/main.lang +++ b/htdocs/langs/da_DK/main.lang @@ -220,6 +220,7 @@ Next=Næste Cards=Postkort Card=Kort Now=Nu +HourStart=Start hour Date=Dato DateAndHour=Date and hour DateStart=Dato start @@ -242,6 +243,8 @@ DatePlanShort=Dato høvlet DateRealShort=Dato reel. DateBuild=Rapport bygge dato DatePayment=Dato for betaling +DateApprove=Approving date +DateApprove2=Approving date (second approval) DurationYear=år DurationMonth=måned DurationWeek=uge @@ -408,6 +411,8 @@ OtherInformations=Andre informationer Quantity=Mængde Qty=Qty ChangedBy=Ændret ved +ApprovedBy=Approved by +ApprovedBy2=Approved by (second approval) ReCalculate=Genberegn ResultOk=Succes ResultKo=Fejl @@ -696,6 +701,8 @@ 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. +Deny=Deny +Denied=Denied # Week day Monday=Mandag Tuesday=Tirsdag diff --git a/htdocs/langs/da_DK/orders.lang b/htdocs/langs/da_DK/orders.lang index 9bc52e0047bbb..472e2f51115d3 100644 --- a/htdocs/langs/da_DK/orders.lang +++ b/htdocs/langs/da_DK/orders.lang @@ -79,7 +79,9 @@ NoOpenedOrders=Nr. åbnet ordrer NoOtherOpenedOrders=Ingen andre åbnet ordrer NoDraftOrders=No draft orders OtherOrders=Andre kendelser -LastOrders=Seneste %s ordrer +LastOrders=Last %s customer orders +LastCustomerOrders=Last %s customer orders +LastSupplierOrders=Last %s supplier orders LastModifiedOrders=Seneste %s modificerede ordrer LastClosedOrders=Seneste %s lukkede ordrer AllOrders=Alle ordrer diff --git a/htdocs/langs/da_DK/other.lang b/htdocs/langs/da_DK/other.lang index 334c5cfe289a8..4d9f0fcae4cc4 100644 --- a/htdocs/langs/da_DK/other.lang +++ b/htdocs/langs/da_DK/other.lang @@ -203,6 +203,7 @@ 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. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=Tilføj post i kalenderen %s diff --git a/htdocs/langs/da_DK/productbatch.lang b/htdocs/langs/da_DK/productbatch.lang index 452636819653f..85b1d27f3a611 100644 --- a/htdocs/langs/da_DK/productbatch.lang +++ b/htdocs/langs/da_DK/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use batch/serial number -ProductStatusOnBatch=Yes (Batch/serial required) -ProductStatusNotOnBatch=No (Batch/serial not used) +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/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 +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial 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 +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %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. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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/da_DK/projects.lang b/htdocs/langs/da_DK/projects.lang index 8cb189e42f1b8..feef267709956 100644 --- a/htdocs/langs/da_DK/projects.lang +++ b/htdocs/langs/da_DK/projects.lang @@ -14,6 +14,7 @@ MyTasksDesc=Dette synspunkt er begrænset til projekter eller opgaver, du er en 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). +AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. ProjectsArea=Projekter område NewProject=Nyt projekt AddProject=Create project diff --git a/htdocs/langs/da_DK/stocks.lang b/htdocs/langs/da_DK/stocks.lang index 19b708156b783..894cd3015e3e0 100644 --- a/htdocs/langs/da_DK/stocks.lang +++ b/htdocs/langs/da_DK/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Annuller afsendelse DeleteSending=Slet afsendelse Stock=Stock Stocks=Lagre +StocksByLotSerial=Stock by lot/serial Movement=Bevægelighed Movements=Bevægelser ErrorWarehouseRefRequired=Warehouse reference navn er påkrævet @@ -78,6 +79,7 @@ IdWarehouse=Id lager DescWareHouse=Beskrivelse lager LieuWareHouse=Lokalisering lager WarehousesAndProducts=Lager og produkter +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=Gennemsnitlig input pris AverageUnitPricePMP=Gennemsnitlig input pris SellPriceMin=Salgsenhed Pris @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/da_DK/suppliers.lang b/htdocs/langs/da_DK/suppliers.lang index 8702698b604e4..24d8c97f28077 100644 --- a/htdocs/langs/da_DK/suppliers.lang +++ b/htdocs/langs/da_DK/suppliers.lang @@ -43,4 +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) +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/da_DK/trips.lang b/htdocs/langs/da_DK/trips.lang index 561a88dfc8a3e..bb78c2e3d37e3 100644 --- a/htdocs/langs/da_DK/trips.lang +++ b/htdocs/langs/da_DK/trips.lang @@ -69,11 +69,9 @@ 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 @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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/products.lang b/htdocs/langs/de_AT/products.lang index 9e4f09d628ce6..e3084cb4bc5fb 100644 --- a/htdocs/langs/de_AT/products.lang +++ b/htdocs/langs/de_AT/products.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - products ProductRef=Artikel Nr. -ProductLabel=Produktbezeichnung ProductAccountancyBuyCode=Kontierungsschlüssel (Einkauf) ProductAccountancySellCode=Kontierungsschlüssel (verkaufen) OnSell=Verfügbar diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang index 27a4b5b3bc130..aa0bd17f4520a 100644 --- a/htdocs/langs/de_DE/accountancy.lang +++ b/htdocs/langs/de_DE/accountancy.lang @@ -19,7 +19,7 @@ OptionsDeactivatedForThisExportModel=Für dieses Exportierungsmodell, sind die E Selectmodelcsv=Wählen Sie ein Exportmodell Modelcsv_normal=Klassischer Export Modelcsv_CEGID=Export zu CEGID Expert -BackToChartofaccounts=Return chart of accounts +BackToChartofaccounts=Zurück zum Kontenplan Back=Rückkehr Definechartofaccounts=Kontenplan definieren @@ -52,7 +52,7 @@ AccountingVentilationSupplier=Abbau von Buchhaltungs-Lieferanten AccountingVentilationCustomer=Abbau von Buchhaltungs-Kunden Line=Zeile -CAHTF=Total purchase supplier HT +CAHTF=Summe Lieferantenbestellungen netto InvoiceLines=Rechnungszeile bereinigen InvoiceLinesDone=Bereinigte Rechnungszeilen IntoAccount=Im Buchhaltungs-Konto @@ -75,7 +75,7 @@ ACCOUNTING_LIST_SORT_VENTILATION_TODO=Beginnen Sie die Sortierung der Abbau Seit ACCOUNTING_LIST_SORT_VENTILATION_DONE=Beginnen Sie die Sortierung der Abbau Seiten "Abbau" durch die aktuellen Elemente AccountLength=Länge der in Dolibarr gezeigten Rechnungskonten -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. +AccountLengthDesc=Funktion ermöglicht, eine Länge von Rechnungslegungs Konto indem Räume, die durch den Nullwert vorzutäuschen. Diese Funktion berührt nur die Anzeige, ist es nicht die in Dolibarr registriert Rechnungswesen Konten ändern. Für den Export ist diese Funktion erforderlich, bei bestimmten Software-kompatibel zu sein. ACCOUNTING_LENGTH_GACCOUNT=Länge der Finanzbuchführung ACCOUNTING_LENGTH_AACCOUNT=Länge der Partner @@ -91,8 +91,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Konto der Warte ACCOUNTING_PRODUCT_BUY_ACCOUNT=Buchhaltungskonto standardmäßig für die gekauften Produkte (wenn nicht im Produktblatt definiert) ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Buchhaltungskonto standardmäßig für die verkauften Produkte (wenn nicht im Produktblatt definiert) -ACCOUNTING_SERVICE_BUY_ACCOUNT=Buchhaltungskonto standardmäßig für die gekauften Dienstleistungen (wenn nicht im Produktblatt definiert) -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Buchhaltungskonto standardmäßig für die verkauften Dienstleistungen (wenn nicht im Produktblatt definiert) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Buchhaltungskonto standardmäßig für die gekauften Leistungen (wenn nicht im Produktblatt definiert) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Buchhaltungskonto standardmäßig für die verkauften Leistungen (wenn nicht im Produktblatt definiert) Doctype=Dokumententyp Docdate=Datum @@ -103,7 +103,7 @@ Labelcompte=Label-Account Debit=Soll Credit=Haben Amount=Betrag -Sens=Sens +Sens=Zweck Codejournal=Journal DelBookKeeping=Löschen Sie die Einträge des Hauptbuchs diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang index 0cfe4d3443d93..42e60123ff70b 100644 --- a/htdocs/langs/de_DE/admin.lang +++ b/htdocs/langs/de_DE/admin.lang @@ -8,11 +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 +FileCheck=Datei Integrität +FilesMissing=Fehlende Dateien +FilesUpdated=Dateien ersetzt +FileCheckDolibarr=Überprüfe Integrität von Dolibarr Dateien +XmlNotFound=XML-Datei Integrität von Dolibarr nicht gefunden SessionId=Sitzungs ID SessionSaveHandler=Handler für Sitzungsspeicherung SessionSavePath=Pfad für Sitzungsdatenspeicherung @@ -96,8 +96,8 @@ AntiVirusCommandExample= Beispiel für ClamWin: c:\\Program Files (x86)\\ClamWin AntiVirusParam= Weitere Parameter auf der Kommandozeile AntiVirusParamExample= Beispiel für ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib" ComptaSetup=Buchhaltungsmoduls-Einstellungen -UserSetup=Benutzerverwaltungs-Einstellunen -MenuSetup=Menüverwaltungs-Einstellungen +UserSetup=Benutzerverwaltung Einstellungen +MenuSetup=Menüverwaltung Einstellungen MenuLimits=Grenzwerte und Genauigkeit MenuIdParent=Eltern-Menü-ID DetailMenuIdParent=ID des übergeordneten Menüs (0 für einen Eltern-Menü) @@ -227,7 +227,7 @@ AutomaticIfJavascriptDisabled=Bei deaktiviertem JavaScript automatisch AvailableOnlyIfJavascriptNotDisabled=Nur bei aktiviertem JavaScript verfügbar AvailableOnlyIfJavascriptAndAjaxNotDisabled=Nur bei aktiviertem JavaScript und AJAX verfügbar Required=Erforderlich -UsedOnlyWithTypeOption=Used by some agenda option only +UsedOnlyWithTypeOption=verwendet nur von einigen Agenda-Optionen Security=Sicherheit Passwords=Passwörter DoNotStoreClearPassword=Passwörter in der Datenbank nicht im Klartext speichern (Empfohlene Einstellung) @@ -297,9 +297,10 @@ MenuHandlers=Menü-Handler MenuAdmin=Menü-Editor DoNotUseInProduction=Nicht in Produktion nutzen ThisIsProcessToFollow=So führen Sie die Installation/Aktualisierung des Systems durch: +ThisIsAlternativeProcessToFollow=Dies ist ein alternativer Setup-Prozess: StepNb=Schritt %s FindPackageFromWebSite=Finden Sie ein Paket, das die gewünschten Funktionen beinhaltet (zum Beispiel auf der offiziellen Website %s). -DownloadPackageFromWebSite=Download package %s. +DownloadPackageFromWebSite=Herunterladen des Installationspakets von der Website %s UnpackPackageInDolibarrRoot=Entpacken des Pakets in den Stammordner der Systeminstallation %s SetupIsReadyForUse=Die Installation ist abgeschlossen und das System zur Verwendung der neuen Komponente bereit. NotExistsDirect=Kein alternatives Stammverzeichnis definiert.
@@ -309,9 +310,9 @@ YouCanSubmitFile=Modul wählen: CurrentVersion=Aktuelle dolibarr-Version CallUpdatePage=Zur Aktualisierung der Daten und Datenbankstrukturen gehen Sie zur Seite %s. LastStableVersion=Letzte stabile Version -UpdateServerOffline=Update server offline +UpdateServerOffline=Update-Server offline GenericMaskCodes=Sie können ein beliebiges Numerierungsschema wählen. Dieses Schema könnte z.B. so aussehen:
{000000} steht für eine 6-stellige Nummer, die sich bei jedem neuen %s automatisch erhöht. Wählen Sie die Anzahl der Nullen je nach gewünschter Nummernlänge. Der Zähler füllt sich automatisch bis zum linken Ende mit Nullen um das gewünschte Format abzubilden.
{000000+000} führt zu einem ähnlichen Ergebnis, allerdings mit einem Wertsprung in Höhe des Werts rechts des Pluszeichens, der beim ersten %s angewandt wird.
{000000@x} wie zuvor, jedoch stellt sich der Zähler bei Erreichen des Monats x (zwischen 1 und 12) automatisch auf 0 zurück. Ist diese Option gewählt und x hat den Wert 2 oder höher, ist die Folge {mm}{yy} or {mm}{yyyy} ebenfalls erfoderlich.
{dd} Tag (01 bis 31).
{mm} Monat (01 bis 12).
{yy}, {yyyy} or {y} Jahreszahl 1-, 2- oder 4-stellig.
-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).
+GenericMaskCodes2={cccc} den Kunden-Code mit n Zeichen
{cccc000} den Kunden-Code mit n Zeichen, gefolgt von einer Client-Zähler zugeordnet zu dem Kunden.
{tttt} Die Partner ID mit n Zeichen (siehe Wörterbuch Partner Typen).
GenericMaskCodes3=Alle anderen Zeichen in der Maske bleiben.
Leerzeichen sind nicht zulässig.
GenericMaskCodes4a=Beispiel auf der 99. %s des Dritten thecompany Geschehen 2007-01-31:
GenericMaskCodes4b=Beispiel für Dritte erstellt am 2007-03-01:
@@ -371,7 +372,7 @@ GetSecuredUrl=Holen der berechneten URL ButtonHideUnauthorized=Unterdrücke Schaltflächen bei unerlaubtem Zugriff statt sie zu deaktivieren OldVATRates=Alter MwSt. Satz NewVATRates=Neuer MwSt. Satz -PriceBaseTypeToChange=Modify on prices with base reference value defined on +PriceBaseTypeToChange=Ändern Sie den Basispreis definierte nach MassConvert=Starte Massenkonvertierung String=Zeichenkette TextLong=Langer Text @@ -388,16 +389,16 @@ ExtrafieldSelectList = Wähle von Tabelle ExtrafieldSeparator=Trennzeichen ExtrafieldCheckBox=Checkbox ExtrafieldRadio=Radio button -ExtrafieldCheckBoxFromList= Checkbox from table -ExtrafieldLink=Link to an object +ExtrafieldCheckBoxFromList= Checkbox von Tabelle +ExtrafieldLink=Verknüpftes Objekt 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
... -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 +ExtrafieldParamHelpsellist=Parameter-Liste stammt aus einer Tabelle
Syntax : \ntable_name:label_field:id_field::filter
Beispiel :\nc_typent:libelle:id::filter

\nFilter kann ein einfacher Test (z.B. aktiv = 1) angezeigt werden nur aktiv, Wert
wenn Sie auf extrafields filtern möchten verwenden syntaxt extra.fieldcode = ... (wo Feld-Code ist der Code, der extrafield)

Um die Liste haben, je nach dem anderen : \n
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=Verwendete Bibliothek zur PDF-Erzeugung WarningUsingFPDF=Achtung: Ihre conf.php enthält $dolibarr_pdf_force_fpdf=1 Dies bedeutet, dass Sie die FPDF-Bibliothek verwenden, um PDF-Dateien zu erzeugen. Diese Bibliothek ist alt und unterstützt viele Funktionen nicht (Unicode-, Bild-Transparenz, kyrillische, arabische und asiatische Sprachen, ...), so dass es zu Fehlern bei der PDF-Erstellung kommen kann.
Um dieses Problem zu beheben und volle Unterstützung der PDF-Erzeugung zu erhalten, laden Sie bitte die TCPDF Bibliothek , dann kommentieren Sie die Zeile $dolibarr_pdf_force_fpdf=1 aus oder entfernen diese und fügen statt dessen $dolibarr_lib_TCPDF_PATH='Pfad_zum_TCPDF_Verzeichnisr' ein -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) +LocalTaxDesc=In einigen Ländern gelten 2 oder 3 Steuern auf jede Rechnungszeile. Wenn dies der Fall ist, wählen Sie Typ für die zweite und dritte Steuer und seine Geschwindigkeit. Mögliche Art sind:
1: Ortstaxe gelten über Produkte und Dienstleistungen, ohne Mehrwertsteuer (MwSt nicht der örtlichen Steuer angewendet)
2: Ortstaxe gelten für Produkte und Dienstleistungen vor Mehrwertsteuer (MwSt auf Höhe + localtax berechnet)
3: Ortstaxe gelten für Produkte ohne Mehrwertsteuer (MwSt nicht der örtlichen Steuer angewendet)
4: Ortstaxe gelten für Erzeugnisse, bevor Mehrwertsteuer (MwSt auf Höhe + localtax berechnet)
5: Ortstaxe gelten für Dienstleistungen, ohne Mehrwertsteuer (MwSt nicht der örtlichen Steuer angewendet)
6: Ortstaxe gelten für Dienstleistungen vor Mehrwertsteuer (MwSt auf Höhe + localtax berechnet) SMS=SMS LinkToTestClickToDial=Geben Sie die anzurufende Telefonnr ein, um einen Link zu zeigen, mit dem die ClickToDial-URL für den Benutzer %s getestet werden kann RefreshPhoneLink=Aktualisierungslink @@ -449,14 +450,14 @@ Module52Name=Produktbestände Module52Desc=Produktbestandsverwaltung Module53Name=Leistungen Module53Desc=Leistungs-Verwaltung -Module54Name=Kontrakte/Abonnements -Module54Desc=Kontraktverwaltung (Dienstleistungen oder sich wiederholende Abos) +Module54Name=Verträge/Abonnements +Module54Desc=Vertragsverwaltung (Services oder sich wiederholende Abos) Module55Name=Barcodes Module55Desc=Barcode-Verwaltung Module56Name=Telefonie Module56Desc=Telefonie-Integration Module57Name=Daueraufträge -Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. +Module57Desc=Daueraufträge und Entzugsmanagement. Hierzu gehört auch Generation von SEPA-Datei für europäische Länder. Module58Name=ClickToDial Module58Desc=ClickToDial-Integration Module59Name=Bookmark4u @@ -465,8 +466,8 @@ Module70Name=Service Module70Desc=Serviceverwaltung Module75Name=Reise- und Fahrtspesen Module75Desc=Reise- und Fahrtspesenverwaltung -Module80Name=Sendungen -Module80Desc=Sendungs-u und Lieferscheinverwaltung +Module80Name=Lieferungen +Module80Desc=Versand und Lieferauftragsverwaltung Module85Name=Banken und Geld Module85Desc=Verwaltung von Bank- oder Bargeldkonten Module100Name=Externe Website @@ -487,45 +488,45 @@ Module320Name=RSS-Feed Module320Desc=RSS-Feed-Bildschirm innerhalb des Systems anzeigen Module330Name=Lesezeichen Module330Desc=Lesezeichenverwaltung -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=Projekte / Chancen / Leads +Module400Desc=Projektmanagement, Aufträge oder Leads. Anschließend können Sie ein beliebiges Element (Rechnung, Bestellung, Angebot, Intervention, ...) einem Projekt zuordnen und eine Queransicht von der Projektanzeige bekommen. Module410Name=Webkalender Module410Desc=Webkalenderintegration 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 +Module520Name=Darlehen +Module520Desc=Verwaltung von Darlehen 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 +Module770Name=Spesenabrechnung Module770Desc=Management and claim expense reports (transportation, meal, ...) -Module1120Name=Supplier commercial proposal -Module1120Desc=Request supplier commercial proposal and prices +Module1120Name=Lieferant-Angebote +Module1120Desc=Anfordern von Lieferanten-Angeboten und Preise Module1200Name=Mantis Module1200Desc=Mantis-Integation Module1400Name=Buchhaltung Module1400Desc=Buchhaltung für Experten (doppelte Buchhaltung) -Module1520Name=Document Generation -Module1520Desc=Mass mail document generation -Module1780Name=Tags/Categories -Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members) +Module1520Name=Dokumente erstellen +Module1520Desc= Mailings Dokumente erstellen +Module1780Name=Kategorien +Module1780Desc=Kategorien erstellen (Produkte, Kunden, Lieferanten, Kontakte oder Mitglieder) Module2000Name=FCKeditor Module2000Desc=WYSIWYG-Editor Module2200Name=Dynamische Preise Module2200Desc=Mathematische Ausdrücke für Preise aktivieren Module2300Name=Cron -Module2300Desc=Scheduled job management +Module2300Desc=CronJob Verwaltung Module2400Name=Agenda Module2400Desc=Maßnahmen/Aufgaben und Agendaverwaltung Module2500Name=Inhaltsverwaltung(ECM) Module2500Desc=Speicherung und Verteilung von Dokumenten Module2600Name=WebServices Module2600Desc=Aktivieren Sie Verwendung von Webservices -Module2650Name=WebServices (client) +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=Verwenden Sie den online Gravatar-Dienst (www.gravatar.com) für die Anzeige von Benutzer- und Mitgliederbildern (Zuordnung über E-Mail-Adressen). Hierfür benötigen Sie eine aktive Internetverbindung @@ -540,8 +541,8 @@ Module6000Name=Workflow Module6000Desc=Workflow management Module20000Name=Urlaubsantrags-Verwaltung Module20000Desc=Definieren und beobachten sie die Urlaubsanträge Ihrer Angestellten. -Module39000Name=Produktstapel -Module39000Desc=Chargen- oder Serien-Nummer, verzehren-bis-Datum und verkaufen-bis-Datum auf Produkten +Module39000Name=Produkt Menge +Module39000Desc=Lot or serial number, eat-by and sell-by date management on products Module50000Name=PayBox Module50000Desc=Über dieses Modul können Sie online Kreditkartenzahlungen entgegennehmen Module50100Name=Kasse @@ -552,14 +553,12 @@ Module50400Name=Buchhaltung (erweitert) Module50400Desc=Buchhaltung für Experten (doppelte Buchhaltung) Module54000Name=PrintIPP Module54000Desc=Direktdruck (ohne die Dokumente zu öffnen) mittels CUPS IPP (Drucker muss vom Server aus sichtbar sein und auf dem Server muss CUPS installiert sein) -Module55000Name=Open Poll +Module55000Name=Offene Umfrage Module55000Desc=Modul um online Umfragen zu starten. (Wie Doodle, Studs, Rdvz,...) Module59000Name=Gewinnspannen Module59000Desc=Modul zur Verwaltung von Gewinnspannen Module60000Name=Kommissionen Module60000Desc=Modul zur Verwaltung von Kommissionen -Module150010Name=Batch-Nummer, verzehren-bis-Datum und verkaufen-bis-Datum -Module150010Desc=Verwaltung von Batch-Nummer, verzehren-bis-Datum und verkaufen-bis-Datum für Produkte Permission11=Rechnungen einsehen Permission12=Rechnungen erstellen/bearbeiten Permission13=Rechnungsfreigabe aufheben @@ -571,8 +570,8 @@ Permission21=Angebote einsehen Permission22=Angebote erstellen/bearbeiten Permission24=Angebote freigeben Permission25=Angeobte per E-Mail versenden -Permission26=Angebot schließen -Permission27=Angeobte löschen +Permission26=Angebote schließen +Permission27=Angebote löschen Permission28=Angebote exportieren Permission31=Produkte/Leistungen einsehen Permission32=Produkte/Leistungen erstellen/bearbeiten @@ -582,9 +581,9 @@ Permission38=Produkte exportieren Permission41=Projekte/Aufgaben einsehen Permission42=Projekte/Aufgaben erstellen/bearbeiten (Meine) Permission44=Projekte löschen -Permission61=Service ansehen -Permission62=Service erstellen/bearbeiten -Permission64=Service löschen +Permission61=Leistungen ansehen +Permission62=Leistungen erstellen/bearbeiten +Permission64=Leistungen löschen Permission67=Service exportieren Permission71=Mitglieder einsehen Permission72=Mitglieder erstellen/bearbeiten @@ -604,12 +603,12 @@ Permission91=Steuern/Sozialbeiträge einsehen Permission92=Steuern/Sozialbeiträge erstellen/bearbeiten Permission93=Steuern/Sozialbeiträge löschen Permission94=Sozialbeiträge exportieren -Permission95=Berichte einsehen -Permission101=Sendungen einsehen -Permission102=Sendungen erstellen/bearbeiten -Permission104=Sendungen freigeben -Permission106=Sendungen exportieren -Permission109=Sendungen löschen +Permission95=Buchhaltung einsehen +Permission101=Auslieferungen einsehen +Permission102=Auslieferungen erstellen/bearbeiten +Permission104=Auslieferungen freigeben +Permission106=Auslieferungen exportieren +Permission109=Auslieferungen löschen Permission111=Finanzkonten einsehen Permission112=Transaktionen anlegen/ändern/löschen und vergleichen Permission113=Einstellungen Finanzkonten (erstellen, Kategorien verwalten) @@ -623,18 +622,18 @@ Permission125=Mit Benutzer verbundene Partner löschen Permission126=Partner exportieren Permission141=Aufgaben einsehen Permission142=Aufgaben erstellen/bearbeiten -Permission144=Aufgaben löschen +Permission144=Löschen aller Projekte und Aufgaben (einschließlich privater auch nicht in Verbindung treten) Permission146=Lieferanten einsehen Permission147=Statistiken einsehen Permission151=Daueraufträge einsehen Permission152=Dauerauftragsanträge erstellen/bearbeiten Permission153=Dauerauftragsbelege übertragen Permission154=Dauerauftragsbelege kreditieren/ablehnen -Permission161=Kontrakte/Abonnements einsehen -Permission162=Kontrakte/Abonnements erstellen/bearbeiten -Permission163=Dienstleistungen/Abonnements in einem Vertrag aktivieren -Permission164=Dienstleistungen/Abonnements in einem Vertrag deaktivieren -Permission165=Kontrakt/Abonnement löschen +Permission161=Verträge/Abonnements einsehen +Permission162=Verträge/Abonnements erstellen/bearbeiten +Permission163=Service/Abonnement in einem Vertrag aktivieren +Permission164=Service/Abonnement in einem Vertrag deaktivieren +Permission165=Verträge/Abonnement löschen Permission171=Reisen und Spesen einsehen (eigene und Untergebene) Permission172=Reisen und Spesen erstellen/ändern Permission173=Reisen und Spesen löschen @@ -645,7 +644,7 @@ Permission181=Lieferantenbestellungen einsehen Permission182=Lieferantenbestellungen erstellen/bearbeiten Permission183=Lieferantenbestellungen freigeben Permission184=Lieferantenbestellungen bestätigen -Permission185=Order or cancel supplier orders +Permission185=Bestellung oder Lieferantenbestellungen verwerfen Permission186=Lieferantenbestellungen empfangen Permission187=Lieferantenbestellungen schließen Permission188=Lieferantenbestellungen verwerfen @@ -653,12 +652,12 @@ Permission192=Leitungen erstellen Permission193=Leitungen abbrechen Permission194=Read the bandwith lines Permission202=ADSL Verbindungen erstellen -Permission203=Order connections orders -Permission204=Order connections +Permission203=Bestellungsverbindungen Bestellungen +Permission204=Bestell-Verbindungen Permission205=Verbindungen verwalten Permission206=Verbindungen lesen Permission211=Telefonie lesen -Permission212=Order lines +Permission212=Auftragszeilen Permission213=Leitung aktivieren Permission214=Telefonie einrichten Permission215=Anbieter einrichten @@ -683,8 +682,8 @@ Permission255=Andere Passwörter ändern Permission256=Andere Benutzer löschen oder deaktivieren Permission262=Zugang auf alle Partner erweitern (nicht nur diejenigen im Zusammenhang mit Benutzer). Nicht wirksam für externe Nutzer (immer auf sich selbst beschränkt). Permission271=Read CA -Permission272=Read invoices -Permission273=Issue invoices +Permission272=Rechnungen anzeigen +Permission273=Ausgabe Rechnungen Permission281=Kontakte einsehen Permission282=Kontakte erstellen/bearbeiten Permission283=Kontakte löschen @@ -717,11 +716,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 +Permission520=Darlehen einsehen +Permission522=Darlehen erstellen/bearbeiten +Permission524=Lösche Darlehen +Permission525=Darlehens-rechner +Permission527=Exportiere Darlehen Permission531=Leistungen einsehen Permission532=Leistungen erstellen/bearbeiten Permission534=Leistungen löschen @@ -730,13 +729,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 +Permission771=Spesenabrechnungen lesen (eigene und die der Untergebenen) +Permission772=Spesenabrechnung erstellen/ändern +Permission773=Spesenabrechnung löschen +Permission774=Spesenabrechnungen lesen (Alle Benutzer auch nicht Untergebene) +Permission775=Spesenabrechnung genehmigen +Permission776=Spesenabrechnung bezahlen +Permission779=Spesenabrechnung exportieren Permission1001=Warenbestände einsehen Permission1002=Warenlager erstellen/ändern Permission1003=Warenlager löschen @@ -754,7 +753,7 @@ Permission1185=Lieferantenbestellungen bestätigen Permission1186=Lieferantenbestellungen übermitteln Permission1187=Eingang von Lieferantenbestellungen bestätigen Permission1188=Lieferantenbestellungen schließen -Permission1190=Approve (second approval) supplier orders +Permission1190=Lieferantenbestellungen bestätigen (zweite Bestätigung) Permission1201=Exportresultate einsehen Permission1202=Export erstellen/bearbeiten Permission1231=Lieferantenrechnungen einsehen @@ -767,10 +766,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=Read Scheduled job -Permission23002=Create/update Scheduled job -Permission23003=Delete Scheduled job -Permission23004=Execute Scheduled job +Permission23001=anzeigen cronjobs +Permission23002=erstellen/ändern cronjobs +Permission23003=cronjobs löschen +Permission23004=cronjobs ausführen 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 @@ -791,7 +790,7 @@ Permission55001=Abstimmungen einsehen Permission55002=Abstimmung erstellen/ändern Permission59001=Margen einsehen Permission59002=Margen definieren -Permission59003=Read every user margin +Permission59003=Lesen aller Benutzer Margen DictionaryCompanyType=Partnertyp DictionaryCompanyJuridicalType=Gesellschaftsformen von Drittanbietern DictionaryProspectLevel=Geschäftsaussicht @@ -809,7 +808,7 @@ DictionaryPaymentModes=Zahlungsarten DictionaryTypeContact=Kontaktarten DictionaryEcotaxe=Ökosteuern (WEEE) DictionaryPaperFormat=Papierformate -DictionaryFees=Gebührenarten +DictionaryFees=Spesen- und Kostenarten DictionarySendingMethods=Versandarten DictionaryStaff=Mitarbeiter DictionaryAvailability=Lieferverzug @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= Die RE Rate standardmäßig beim Erstellen Aussichten, Re LocalTax2IsNotUsedDescES= Standardmäßig werden die vorgeschlagenen IRPF 0 ist. Ende der Regel. LocalTax2IsUsedExampleES= In Spanien, Freiberufler und unabhängigen Fachleuten, die ihre Dienstleistungen und Unternehmen, die das Steuersystem von Modulen gewählt haben. LocalTax2IsNotUsedExampleES= In Spanien sind sie bussines nicht der Steuer unterliegen System von Modulen. -CalcLocaltax=Berichte -CalcLocaltax1ES=Verkauf - Einkauf +CalcLocaltax=Berichte über lokale Steuern +CalcLocaltax1=Sales - Käufe CalcLocaltax1Desc=Lokale Steuer-Reports werden mit der Differenz von lokalen Verkaufs- und Einkaufs-Steuern berechnet -CalcLocaltax2ES=Einkäufe +CalcLocaltax2=Einkauf CalcLocaltax2Desc=Lokale Steuer-Reports sind die Summe der lokalen Steuern auf Einkäufe -CalcLocaltax3ES=Verkäufe +CalcLocaltax3=Verkauf CalcLocaltax3Desc=Lokale Steuer-Reports sind die Summe der lokalen Steuern auf Verkäufe LabelUsedByDefault=Standardmäßig verwendete Bezeichnung falls keine Übersetzung vorhanden ist LabelOnDocuments=Bezeichnung auf Dokumenten @@ -1018,14 +1017,14 @@ NoEventOrNoAuditSetup=Keine sicherheitsrelevanten Protokollereignisse. Überprü NoEventFoundWithCriteria=Kein sicherheitsrelevantes Protokollereignis zu Ihren Suchkriterien gefunden SeeLocalSendMailSetup=Lokale sendmail-Einstellungen anzeigen BackupDesc=Um eine vollständige Systemsicherung durchzuführen müssen Sie: -BackupDesc2=* Eine Sicherung des Dokumentenverzeichnisses (%s), das alle hochgeladenen und erzeugte Dateien beinhaltet, erzeugen (z.B. als zip-Archiv). -BackupDesc3=* Eine Sicherung der Datenbank über Dump-Befehl anlegen. Hierzu steht Ihnen der folgende Assistent zur Verfügung. +BackupDesc2=Sichern des Dokumenten-Verzeichnis (%s) welches alle hochgeladenen und erzeugt Dateien enthält (Sie können zum Beispiel eine Zip Datei machen). +BackupDesc3=Sicherung der Datenbank (%s) über Dump-Befehl anlegen. Dafür können Sie folgende Assistenten verwenden. BackupDescX=Bewahren Sie die archivierten Verzeichnisse an einem sicheren Ort auf. BackupDescY=Bewahren Sie den Datenbank-Dump an einem sicheren Ort auf. BackupPHPWarning=Datensicherung kann mit dieser Methode nicht garantiert werden. Bevorzugen Sie die vorherige. RestoreDesc=Um eine Systemsicherung wiederherzustellen, müssen Sie: -RestoreDesc2=* Eine erstellte Archivdatei (z.B. ein zip-Archiv) Ihres Dokumentenordners in eine neue dolibarr-Installation oder das derzeitige Dokumentenverzeichnis (%s) entpacken -RestoreDesc3=* Die Datenbanksicherung aus dem Dump in eine neue dolibarr-Installation oder das bestehende System zurückspielen. Achtung: Nach Beendigung dieses Vorganges müssen Sie sich mit dem Benutzernamen/Passwort-Paar zum Zeitpunkt der Sicherung am System anmelden. Zur Wiederherstellung der Datenbank steht Ihnen der folgende Assistent zur Verfügung: +RestoreDesc2=Wiederherstellung von Archive Datei (zip Datei zum Beispiel)\nvom documents Verzeichnis um den documents Datei-Baum im documents verzeichnis in eine neue Dolibarr Installation oder in ein bestehendes Dolibarr Verzeichnis (%s). +RestoreDesc3=* Die Datenbanksicherung aus dem Dump in eine neue Dolibarr-Installation oder das bestehende System (%s) zurückspielen. Achtung: Nach Beendigung dieses Vorganges müssen Sie sich mit dem Benutzernamen/Passwort-Paar zum Zeitpunkt der Sicherung am System anmelden. Zur Wiederherstellung der Datenbank steht Ihnen der folgende Assistent zur Verfügung: RestoreMySQL=MySQL Import ForcedToByAModule= Diese Regel wird %s durch ein aktiviertes Modul aufgezwungen PreviousDumpFiles=Vorige Datenbanksicherungen @@ -1036,7 +1035,7 @@ YourPHPDoesNotHaveSSLSupport=Ihre PHP-Konfiguration unterstützt keine SSL-Versc DownloadMoreSkins=Weitere Oberflächen (Skins) herunterladen SimpleNumRefModelDesc=Liefere eine Nummer im Format %syymm-nnnn zurück, wobei YY für das Jahr, MM für das Monat und nnnn für eine 4-stellige, nicht unterbrochene Zahlensequenz steht ShowProfIdInAddress=Zeige professionnal ID mit Adressen auf Dokumente -ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents +ShowVATIntaInAddress=Ausblenden UID Nummer in Adressen auf Dokumenten. TranslationUncomplete=Teilweise Übersetzung SomeTranslationAreUncomplete=Einige Sprachen könnten nur teilweise oder fehlerhaft übersetzt sein. Wenn Sie Fehler bemerken, können Sie die Sprachdateien verbessern, indem Sie sich bei Transifex regsitrieren. MenuUseLayout=Machen Sie vertikales Menü hidable (Option Javascript muss nicht deaktiviert werden) @@ -1049,15 +1048,15 @@ MAIN_PROXY_HOST=Name / Anschrift des Proxy-Servers MAIN_PROXY_PORT=Port of Proxy-Server MAIN_PROXY_USER=Passwort an, um den Proxy-Server verwenden 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. +DefineHereComplementaryAttributes=Definieren Sie hier alle Attribute, die nicht standardmäßig vorhanden sind, und in %s unterstützt werden sollen. ExtraFields=Ergänzende Attribute ExtraFieldsLines=Ergänzende Attribute (Zeilen) -ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) -ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) +ExtraFieldsSupplierOrdersLines=Ergänzende Attribute (in Bestellungszeile) +ExtraFieldsSupplierInvoicesLines=Ergänzende Attribute (in Rechnungszeile) ExtraFieldsThirdParties=Ergänzende Attribute (Partner) ExtraFieldsContacts=Ergänzende Attribute (Kontakt) ExtraFieldsMember=Ergänzende Attribute (Mitglied) -ExtraFieldsMemberType=Complementary attributes (member type) +ExtraFieldsMemberType=Ergänzende Attribute (Mitglied) ExtraFieldsCustomerOrders=Ergänzende Attribute (Bestellungen) ExtraFieldsCustomerInvoices=Ergänzende Attribute (Rechnungen) ExtraFieldsSupplierOrders=Ergänzende Attribute (Bestellungen) @@ -1071,7 +1070,7 @@ SendingMailSetup=Einrichten von Sendungen per E-Mail SendmailOptionNotComplete=Achtung, auf einigen Linux-Systemen, E-Mails von Ihrem E-Mail zu senden, sendmail Ausführung Setup muss conatins Option-ba (Parameter mail.force_extra_parameters in Ihre php.ini-Datei). Wenn einige Empfänger niemals E-Mails erhalten, versuchen, diese Parameter mit PHP mail.force_extra_parameters =-ba) zu bearbeiten. PathToDocuments=Dokumentenpfad PathDirectory=Verzeichnispfad -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=Feature-Mails mit der Methode "PHP mail direkt" senden generiert eine Mail-Nachricht, die nicht korrekt möglicherweise von einigen Mail-Servern empfangen analysiert werden. Ergebnis ist, dass manche Mails nicht von Menschen, die von thoose abgehört Plattformen gehostet gelesen werden. Es ist bei einigen Internet-Providern (Ex: Orange in Frankreich). Dies ist nicht ein Problem in Dolibarr noch in PHP aber auf empfangende Mail-Server. Sie können jedoch hinzuzufügen MAIN_FIX_FOR_BUGGED_MTA Option auf 1 in die Setup - andere zu Dolibarr ändern, um dies zu vermeiden. Sie können jedoch Probleme mit anderen Servern, dass die Achtung streng dem SMTP-Standard zu erleben. Die andere Lösung (empfohlen) ist es, die Methode "SMTP-Socket-Bibliothek", die keine Nachteile hat benutzen. TranslationSetup=Configuration de la traduction TranslationDesc=Wahl der Sprache auf dem Bildschirm sichtbar verändert werden kann:
* Weltweit aus dem Menü Start - Einstellungen - Anzeige
* Für die Benutzer nur von Benutzer-Registerkarte Anzeige von Benutzer-Karte (klicken Sie auf Login-Bildschirm auf der Oberseite). TotalNumberOfActivatedModules=Summe aktivierter Module: %s @@ -1083,9 +1082,9 @@ SuhosinSessionEncrypt=Sitzungsspeicher durch Suhosin verschlüsselt ConditionIsCurrently=Einstellung ist aktuell %s YouUseBestDriver=Sie verwenden den Treiber %s, dies ist derzeit der beste verfügbare. YouDoNotUseBestDriver=Sie verwenden Treiber %s, aber der Treiber %s wird empfohlen. -NbOfProductIsLowerThanNoPb=Sie haben nur %s Produkte/Dienstleistungen in der Datenbank. Daher ist keine bestimmte Optimierung erforderlich. +NbOfProductIsLowerThanNoPb=Sie haben nur %s Produkte/Leistungen in der Datenbank. Daher ist keine bestimmte Optimierung erforderlich. SearchOptim=Such Optimierung -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. +YouHaveXProductUseSearchOptim=Sie haben %s Produkte/Leistungen in die Datenbank. Sie sollten die Konstante PRODUCT_DONOTSEARCH_ANYWHERE auf 1 unter in Übersicht-Einstellungen-Andere Einstellungen hinzufügen, wodurch sich das Suchlimit in der Datenbank von Anfang des Strings möglich gemacht wird, und der Index verwendet wird, dadurch sollten sie \nsofort Antwort auf Ihre suche bekommen. BrowserIsOK=Sie benutzen den Webbrowser %s. Dieser ist hinsichtlich Sicherheit und Leistung ok. BrowserIsKO=Sie benutzen den Webbrowser %s. Dieser ist bekannt für Sicherheitsprobleme, schlechte Leistung und Zuverlässigkeit. Wir empfehlen Ihnen, Firefox, Chrome, Opera oder Safari zu nutzen. XDebugInstalled=XDebug installiert. @@ -1116,7 +1115,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=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. +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 ModelModules=Dokumentvorlagenmodul DocumentModelOdt=Erstellen von Dokumentvorlagen im OpenDocuments-Format (.odt- oder .ods-Dateien für OpenOffice, KOffice, TextEdit, ...) WatermarkOnDraft=Wasserzeichen auf Entwurf @@ -1159,7 +1158,7 @@ CreditNoteSetup=Gutschriftsmoduleinstellungen CreditNotePDFModules=PDF-Gutschriftsvorlagen CreditNote=Gutschrift CreditNotes=Gutschriften -ForceInvoiceDate=Sezte Rechnungsdatum zwingend auf Freigabedatum +ForceInvoiceDate=Rechnungsdatum ist zwingend Freigabedatum DisableRepeatable=Wiederholbare Rechnungen deaktivieren SuggestedPaymentModesIfNotDefinedInInvoice=Empfohlene Zahlungsart für Rechnung falls nicht in gesondert definiert EnableEditDeleteValidInvoice=Aktivieren Sie die Möglichkeit, freigegebene Rechnungen ohne Zahlungseingang zu bearbeiten/löschen @@ -1182,11 +1181,11 @@ 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) +AskPriceSupplierSetup=Lieferanten Preisauskunft Moduleinstellungen +AskPriceSupplierNumberingModules=Nummerierungsmodul Preisanfragen Lieferanten +AskPriceSupplierPDFModules=Lieferanten Preisauskunft Dokumentvorlagen +FreeLegalTextOnAskPriceSupplier=Freier Text auf Preisauskunft Lieferanten +WatermarkOnDraftAskPriceSupplier=Wasserzeichen auf Entwürfen von Lieferanten Preisauskunft (keins, wenn leer) BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Bestellverwaltungseinstellungen @@ -1197,7 +1196,7 @@ ValidOrderAfterPropalClosed=Zur Freigabe der Bestellung nach Schließung des Ang FreeLegalTextOnOrders=Freier Rechtstext auf Bestellungen WatermarkOnDraftOrders=Wasserzeichen auf Entwürfen von Aufträgen (keins, wenn leer) ShippableOrderIconInList=In Auftragsliste ein entsprechendes Icon zufügen, wenn die Bestellung versandbereit ist -BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order +BANK_ASK_PAYMENT_BANK_DURING_ORDER=Fragen Sie nach der Ziel-Bankverbindung ##### Clicktodial ##### ClickToDialSetup=Click-to-Dial Moduleinstellungen ClickToDialUrlDesc=Definieren Sie hier die URL, die bei einem Klick auf das Telefonsymbol aufgerufen werden soll. In dieser URL können Sie Tags verwenden
%%1$s wird durch die Telefonnummer des Angerufenen ersetzt
%%2$s wird durch die Telefonnummer des Anrufers (Ihre) ersetzt
%%3$s wird durch Ihren Benutzernamen für Click-to-Dial ersetzt (siehe Benutzerdatenblatt)
%%4$s wird durch Ihr Click-to-Dial-Passwort ersetzt (siehe Benutzerdatenblatt). @@ -1205,12 +1204,12 @@ ClickToDialUrlDesc=Definieren Sie hier die URL, die bei einem Klick auf das Tele Bookmark4uSetup=Bookmark4u Moduleinstellungen ##### Interventions ##### InterventionsSetup=Servicemoduleinstellungen -FreeLegalTextOnInterventions=Freier Rechtstext für Services +FreeLegalTextOnInterventions=Freier Rechtstext auf Interventions Dokument FicheinterNumberingModules=Intervention Nummerierung Module TemplatePDFInterventions=Intervention Karte Dokumenten Modelle WatermarkOnDraftInterventionCards=Wasserzeichen auf Interventionskarte Dokumente (keins, wenn leer) ##### Contracts ##### -ContractsSetup=Kontrakte/Abonnements-Modul Einstellungen +ContractsSetup=Verträge/Abonnements-Modul Einstellungen ContractsNumberingModules=Verträge Nummerierung Module TemplatePDFContracts=Vertragsvorlagen FreeLegalTextOnContracts=Freier Text auf Verträgen @@ -1337,6 +1336,8 @@ LDAPFieldCountry=Land LDAPFieldCountryExample=Beispiel: land LDAPFieldDescription=Beschreibung LDAPFieldDescriptionExample=Beispiel : Beschreibung +LDAPFieldNotePublic=öffentlicher Hinweis +LDAPFieldNotePublicExample=Beispiel : Beschreibung LDAPFieldGroupMembers= Gruppenmitglieder LDAPFieldGroupMembersExample= Beispiel: uniqueMember LDAPFieldBirthdate=Geburtsdatum @@ -1360,10 +1361,10 @@ ForANonAnonymousAccess=Für einen authentifizierten Zugang (z.B. für Schreibzug PerfDolibarr=Leistungs-Einstellungen/Optimierungsreport YouMayFindPerfAdviceHere=Auf dieser Seite finden Sie einige Überprüfungen oder Hinweise zur Leistung. NotInstalled=Nicht installiert, Ihr Server wird dadurch nicht verlangsamt. -ApplicativeCache=Applicative cache +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. +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 für statische Ressourcen (CSS, img, Javascript) @@ -1377,8 +1378,8 @@ CompressionOfResources=Komprimierung von HTTP Antworten TestNotPossibleWithCurrentBrowsers=Automatische Erkennung mit den aktuellen Browsern nicht möglich ##### Products ##### ProductSetup=Produktmoduleinstellungen -ServiceSetup=Dienstleistungen Modul Setup -ProductServiceSetup=Produkte und Services Module Setup +ServiceSetup=Leistungen Modul Setup +ProductServiceSetup=Produkte und Leistungen Module Einstellungen NumberOfProductShowInSelect=Max. Anzahl der Produkte in Mehrfachauswahllisten (0=kein Limit) ConfirmDeleteProductLineAbility=Bestätigung für die Entfernung von Produktzeilen in Formularen ModifyProductDescAbility=Produktbeschreibungen in Formularen individuell anpassbar @@ -1419,9 +1420,9 @@ BarcodeDescUPC=Barcode vom Typ UPC BarcodeDescISBN=Barcode vom Typ ISBN BarcodeDescC39=Barcode vom Typ C39 BarcodeDescC128=Barcode vom Typ 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 Code Kommandozeilen-Tool (verwendet interne Engine für einige Barcodetypen) Muss mit "genbarcode" kompatibel sein.
Zum Beispiel: /usr/local/bin/genbarcode BarcodeInternalEngine=interne Engine -BarCodeNumberManager=Manager to auto define barcode numbers +BarCodeNumberManager=Manager für die automatische Generierung von Barcode-Nummer ##### Prelevements ##### WithdrawalsSetup=Abbuchungseinstellungen ##### ExternalRSS ##### @@ -1433,7 +1434,7 @@ RSSUrlExample=Ein interessanter RSS Feed MailingSetup=E-Mail-Kampagnenmodul-Einstellungen MailingEMailFrom=E-Mail-Absender (für ausgehende Mails) des E-Mail-Moduls MailingEMailError=Antwort-E-Mail-Adresse für unzustellbare E-Mails -MailingDelay=Seconds to wait after sending next message +MailingDelay=Wartezeit in Sekunden, bevor die nächste Nachricht gesendet wird ##### Notification ##### NotificationSetup=E-Mail Benachrichtigungs-Einstellungen NotificationEMailFrom=E-Mail-Absender (für ausgehende Mails) des Benachrichtigungsmoduls @@ -1442,9 +1443,9 @@ FixedEmailTarget=Festes E-Mail-Ziel ##### Sendings ##### SendingsSetup=Versandmoduleinstellungen SendingsReceiptModel=Versandbelegsvorlage -SendingsNumberingModules=Sendungen Nummerierung Module -SendingsAbility=Support shipment sheets for customer deliveries -NoNeedForDeliveryReceipts=In den meisten Fällen werden Lieferschein sowohl als Versand- (für die Zusammenstellung der Sendung), als auch als Zustellsscheine (vom Kunden zu unterschreiben) verwendet. Ensprechend sind Empfangsbelege meist eine doppelte und daher nicht verwendete Option. +SendingsNumberingModules=Nummerierungsmodell Auslieferungen +SendingsAbility=Unterstützung Lieferunterlagen für Kunden +NoNeedForDeliveryReceipts=In den meisten Fällen werden Lieferschein sowohl als Versand- (für die Zusammenstellung der Auslieferung), als auch als Zustellsscheine (vom Kunden zu unterschreiben) verwendet. Entsprechend sind Empfangsbelege meist eine doppelte und daher nicht verwendete Option. FreeLegalTextOnShippings=Freier Text auf Lieferungen ##### Deliveries ##### DeliveryOrderNumberingModules=Zustellscheinnumerierungs-Module @@ -1505,7 +1506,7 @@ TaxSetup=Steuer-, Sozialbeitrags- und Dividendenmodul-Einstellungen OptionVatMode=MwSt. fällig OptionVATDefault=Barbestandsbasis OptionVATDebitOption=Rückstellungsbasis -OptionVatDefaultDesc=Mehrwertsteuerschuld entsteht:
- Bei Lieferung/Zahlung für Waren
- Bei Zahlung für Dienstleistungen +OptionVatDefaultDesc=Mehrwertsteuerschuld entsteht:
- Bei Lieferung/Zahlung für Waren
- Bei Zahlung für Leistungen OptionVatDebitOptionDesc=Mehrwertsteuerschuld entsteht:
- Bei Lieferung/Zahlung für Waren
- Bei Rechnungslegung (Lastschrift) für Dienstleistungen SummaryOfVatExigibilityUsedByDefault=Standardmäßiger Zeitpunkt der MwSt.-Fälligkeit in Abhängigkeit zur derzeit gewählten Option: OnDelivery=Bei Lieferung @@ -1517,14 +1518,14 @@ Buy=Kaufen Sell=Verkaufen InvoiceDateUsed=Rechnungsdatum verwendet YourCompanyDoesNotUseVAT=Für Ihr Unternehmen wurde keine MwSt.-Verwendung definiert (Übersicht-Einstellungen-Unternehmen/Stiftung), entsprechend stehen in der Konfiguration keine MwSt.-Optionen zur Verfügung. -AccountancyCode=Rechnungswesen-Code +AccountancyCode=Kontierungs-Code AccountancyCodeSell=Verkaufskonto-Code AccountancyCodeBuy=Einkaufskonto-Code ##### Agenda ##### AgendaSetup=Agenda-Moduleinstellungen PasswordTogetVCalExport=Passwort für den VCal-Export PastDelayVCalExport=Keine Termine exportieren die älter sind als -AGENDA_USE_EVENT_TYPE=Use events types (managed into menu Setup -> Dictionary -> Type of agenda events) +AGENDA_USE_EVENT_TYPE=Verwenden der Termintypen \nEinstellen unter (Übersicht -> Einstellungen -> Wörterbücher -> Maßnahme) AGENDA_DEFAULT_FILTER_TYPE=Diesen Ereignistyp automatisch in den Suchfilter für die Agenda-Ansicht übernehmen AGENDA_DEFAULT_FILTER_STATUS=Diesen Ereignisstatus automatisch in den Suchfilter für die Agenda-Ansicht übernehmen AGENDA_DEFAULT_VIEW=Welchen Reiter möchten Sie beim Öffnen der Agenda automatisch anzeigen @@ -1540,8 +1541,8 @@ CashDeskBankAccountForCB= Finanzkonto für die Einlösung von Bargeldzahlungen v 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. +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management +CashDeskYouDidNotDisableStockDecease=Sie haben die Reduzierung der Lagerbestände nicht deaktiviert, wenn Sie einen Verkauf auf dem POS durchführen.\nAuch ist ein Lager/Standort notwendig. ##### Bookmark ##### BookmarkSetup=Lesezeichenmoduleinstellungen BookmarkDesc=Dieses Modul ermöglicht die Verwaltung von Lesezeichen. Außerdem können Sie hiermit Verknüpfungen zu internen und externen Seiten im linken Menü anlegen. @@ -1581,8 +1582,8 @@ ProjectsModelModule=Projektvorlagenmodul TasksNumberingModules=Aufgaben-Nummerierungs-Modul TaskModelModule=Vorlage für Arbeitsberichte ##### ECM (GED) ##### -ECMSetup = GED Setup -ECMAutoTree = Automatic tree folder and document +ECMSetup = EDM-Einstellungen +ECMAutoTree = Automatischer Baumansicht ##### Fiscal Year ##### FiscalYears=Fiskalische Jahre FiscalYear=Fiskalisches Jahr @@ -1596,7 +1597,7 @@ ConfirmDeleteFiscalYear=Möchten Sie dieses fiskalische Jahr wirklich löschen? Opened=Geöffnet Closed=Geschlossen AlwaysEditable=kann immer bearbeitet werden -MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +MAIN_APPLICATION_TITLE=Erzwinge sichtbaren Anwendungsnamen (Warnung: Setzen Ihres eigenen Namen hier, kann Autofill Login-Funktion abbrechen, wenn Sie DoliDroid Anwendung nutzen) NbMajMin=Mindestanzahl Großbuchstaben NbNumMin=Mindestanzahl Ziffern NbSpeMin=Mindestanzahl Sonderzeichen @@ -1606,13 +1607,18 @@ SalariesSetup=Einstellungen des Gehaltsmodul 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 +IncludePath=Include-Pfad (in Variable '%s' definiert) +ExpenseReportsSetup=Einstellungen des Moduls Spesenabrechnung 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 +NoModueToManageStockDecrease=Kein Modul zur automatische Bestandsverkleinerung ist aktiviert. Lager Bestandsverkleinerung kann nur durch manuelle Eingabe erfolgen. +NoModueToManageStockIncrease=Kein Modul zur automatische Bestandserhöhung ist aktiviert. Lager Bestandserhöhung kann nur durch manuelle Eingabe erfolgen. +YouMayFindNotificationsFeaturesIntoModuleNotification=Sie können Optionen für E-Mail-Benachrichtigungen von Aktivierung und Konfiguration des Moduls "Benachrichtigung" finden. +ListOfNotificationsPerContact=Liste der Benachrichtigungen nach Kontakt* +ListOfFixedNotifications=Liste von ausbesserten Benachrichtigungen GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses -Threshold=Threshold +Threshold=Schwellenwert +BackupDumpWizard=Assistenten zum erstellen der Datenbank-Backup Dump-Datei +SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason: +SomethingMakeInstallFromWebNotPossible2=Aus diesem Grund wird die Prozess hier beschriebenen Upgrade ist nur manuelle Schritte ein privilegierter Benutzer tun kann. +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=Installation eines externen Modul aus der Anwendung speichern Sie die Modul-Dateien in Verzeichnis %s. Zu haben dieses Verzeichnis durch Dolibarr verarbeitet, müssen Sie das Setup Ihrer conf/conf.php Option haben
- - $dolibarr_main_url_root_alt auf <$dolibarr_main_url_root_alt="/custom" enabled = "/custom"
- $dolibarr_main_document_root_alt zu Wert aktiviert "%s/custom" diff --git a/htdocs/langs/de_DE/agenda.lang b/htdocs/langs/de_DE/agenda.lang index 080a83dc99801..45a14eb64f38b 100644 --- a/htdocs/langs/de_DE/agenda.lang +++ b/htdocs/langs/de_DE/agenda.lang @@ -49,9 +49,9 @@ InvoiceValidatedInDolibarrFromPos=Rechnung %s von POS validiert InvoiceBackToDraftInDolibarr=Rechnung %s in den Entwurf Status zurücksetzen InvoiceDeleteDolibarr=Rechnung %s gelöscht OrderValidatedInDolibarr=Bestellung %s freigegeben -OrderDeliveredInDolibarr=Order %s classified delivered +OrderDeliveredInDolibarr=Bestellung %s als geliefert markieren OrderCanceledInDolibarr=Auftrag storniert %s -OrderBilledInDolibarr=Order %s classified billed +OrderBilledInDolibarr=Bestellung %s als bezahlt markieren OrderApprovedInDolibarr=Bestellen %s genehmigt OrderRefusedInDolibarr=Bestellung %s abgelehnt OrderBackToDraftInDolibarr=Bestellen %s zurück nach Draft-Status @@ -62,7 +62,7 @@ InvoiceSentByEMail=Kundenrechnung %s per E-Mail versendet SupplierOrderSentByEMail=Lieferantenbestellung %s per E-Mail versendet SupplierInvoiceSentByEMail=Lieferantenrechnung %s per E-Mail versendet ShippingSentByEMail=Lieferung %s per Email versendet -ShippingValidated= Sendung %s freigegeben +ShippingValidated= Lieferung %s freigegeben InterventionSentByEMail=Intervention %s gesendet via E-Mail NewCompanyToDolibarr= Partner erstellt DateActionPlannedStart= Geplantes Startdatum @@ -94,5 +94,5 @@ WorkingTimeRange=Arbeitszeit-Bereich WorkingDaysRange=Arbeitstag-Bereich AddEvent=Maßnahme erstellen MyAvailability=Meine Verfügbarkeit -ActionType=Event type -DateActionBegin=Start event date +ActionType=Ereignistyp +DateActionBegin=Startdatum des Ereignisses diff --git a/htdocs/langs/de_DE/banks.lang b/htdocs/langs/de_DE/banks.lang index b70c2cecc29f0..6e1c47d2165fb 100644 --- a/htdocs/langs/de_DE/banks.lang +++ b/htdocs/langs/de_DE/banks.lang @@ -33,11 +33,11 @@ AllTime=Vom start Reconciliation=Zahlungsabgleich RIB=Kontonummer IBAN=IBAN -IbanValid=IBAN is Valid -IbanNotValid=IBAN is Not Valid +IbanValid=IBAN is gültig +IbanNotValid=IBAN ist nicht gültig BIC=BIC / SWIFT Code -SwiftValid=BIC/SWIFT is Valid -SwiftNotValid=BIC/SWIFT is Not Valid +SwiftValid=BIC/SWIFT ist gültig +SwiftNotValid=BIC/Swift ist nicht gültig StandingOrders=Daueraufträge StandingOrder=Dauerauftrag Withdrawals=Entnahmen @@ -152,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=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD +InputReceiptNumber=Wählen Sie den Kontoauszug der mit der Zahlungs übereinstimmt. Verwenden Sie einen sortierbaren numerischen Wert: YYYYMM oder YYYYMMDD EventualyAddCategory=Wenn möglich Kategorie angeben, worin die Daten eingeordnet werden ToConciliate=Konsolidieren? ThenCheckLinesAndConciliate=Dann die Zeilen im Bankauszug prüfen und Klicken @@ -163,3 +163,5 @@ LabelRIB=Bankkonto-Nummer Bezeichnung NoBANRecord=Keine Bankkonto-Nummern Einträge DeleteARib=Lösche Bankkonto-Nummern Eintrag ConfirmDeleteRib=Möchten Sie diesen Bankkonto-Nummern Eintrag wirklich löschen? +StartDate=Anfangsdatum +EndDate=Enddatum diff --git a/htdocs/langs/de_DE/boxes.lang b/htdocs/langs/de_DE/boxes.lang index 92484683696c1..3376004cdd290 100644 --- a/htdocs/langs/de_DE/boxes.lang +++ b/htdocs/langs/de_DE/boxes.lang @@ -1,8 +1,8 @@ # Dolibarr language file - Source file is en_US - boxes BoxLastRssInfos=RSS-Informationen -BoxLastProducts=%s zuletzt bearbeitete Produkte/Services +BoxLastProducts=%s zuletzt bearbeitete Produkte/Leistungen BoxProductsAlertStock=Lagerbestands-Warnungen -BoxLastProductsInContract=%s zuletzt verkaufte Produkte/Services +BoxLastProductsInContract=%s zuletzt verkaufte Waren auf Verträgen BoxLastSupplierBills=Zuletzt bearbeitete Lieferantenrechnungen BoxLastCustomerBills=Zuletzt bearbeitete Kundenrechnungen BoxOldestUnpaidCustomerBills=Älteste offene Kundenrechnungen @@ -12,6 +12,7 @@ BoxLastProspects=Zuletzt bearbeitete Leads BoxLastCustomers=Zuletzt bearbeitete Kunden BoxLastSuppliers=Zuletzt bearbeitete Lieferanten BoxLastCustomerOrders=Zuletzt bearbeitete Kundenaufträge +BoxLastValidatedCustomerOrders=Letzte freigegebene Kundenaufträge BoxLastBooks=Zuletzt bearbeitete Konten BoxLastActions=Zuletzt bearbeitete Maßnahmen BoxLastContracts=Zuletzt abgeschlossene Verträge @@ -25,28 +26,31 @@ BoxTotalUnpaidSuppliersBills=Summe offener Lieferantenrechnungen BoxTitleLastBooks=Letzte %s aufgezeichnet Bücher BoxTitleNbOfCustomers=Nombre de-Client BoxTitleLastRssInfos=%s letzte Neuigkeiten aus %s -BoxTitleLastProducts=%s zuletzt bearbeitete Produkte/Services +BoxTitleLastProducts=%s zuletzt bearbeitete Produkte/Leistungen BoxTitleProductsAlertStock=Lagerbestands-Warnungen -BoxTitleLastCustomerOrders=%s zuletzt bearbeitete Kundenaufträge +BoxTitleLastCustomerOrders=Letzte %s Kundenaufträge +BoxTitleLastModifiedCustomerOrders=Letzte %s bearbeiteten Kundenaufträge BoxTitleLastSuppliers=%s zuletzt erfasste Lieferanten BoxTitleLastCustomers=%s zuletzt erfasste Kunden BoxTitleLastModifiedSuppliers=%s zuletzt bearbeitete Lieferanten BoxTitleLastModifiedCustomers=%s zuletzt bearbeitete Kunden -BoxTitleLastCustomersOrProspects=%s zuletzt erfasste Kunden oder Interessenten -BoxTitleLastPropals=%s zuletzt erfasste Angebote +BoxTitleLastCustomersOrProspects=Letzte %s Kunden oder Leads +BoxTitleLastPropals=Letzte %s Angebote +BoxTitleLastModifiedPropals=Letzte %s bearbeiteten Angebote BoxTitleLastCustomerBills=%s zuletzt erfasste Kundenrechnungen +BoxTitleLastModifiedCustomerBills=Letzte %s bearbeiteten Kundenrechnungen BoxTitleLastSupplierBills=%s zuletzt erfasste Lieferantenrechnungen -BoxTitleLastProspects=%s zuletzt erfasste Leads +BoxTitleLastModifiedSupplierBills=Letzte %s bearbeiteten Lieferantenrechnungen BoxTitleLastModifiedProspects=%s zuletzt bearbeitete Leads -BoxTitleLastProductsInContract=%s zuletzt in Verträgen erfasste Produkte/Services -BoxTitleLastModifiedMembers=Zuletzt geänderte %s Mitglieder +BoxTitleLastProductsInContract=%s zuletzt in Verträgen erfasste Produkte/Leistungen +BoxTitleLastModifiedMembers=Letzte %s Mitglieder BoxTitleLastFicheInter=Neueste %s veränderte Eingriffe BoxTitleOldestUnpaidCustomerBills=Älteste %s offene Kundenrechnungen BoxTitleOldestUnpaidSupplierBills=Älteste %s offene Lieferantenrechnungen BoxTitleCurrentAccounts=Saldo des offenen Kontos BoxTitleSalesTurnover=Umsatz -BoxTitleTotalUnpaidCustomerBills=Summe offener Kundenrechnungen (OP) -BoxTitleTotalUnpaidSuppliersBills=offene Lieferantenrechnungen +BoxTitleTotalUnpaidCustomerBills=Offene Kundenrechnungen +BoxTitleTotalUnpaidSuppliersBills=Unbezahlte Lieferantenrechnungen BoxTitleLastModifiedContacts=Zuletzt geändert %s Kontakte/Adressen BoxMyLastBookmarks=Meine %s letzten Lesezeichen BoxOldestExpiredServices=Die ältesten abgelaufenen aktiven Dienste @@ -70,13 +74,14 @@ NoUnpaidCustomerBills=Keine offenen Kundenrechnungen NoRecordedSupplierInvoices=Keine erfassten Lieferantenrechnungen NoUnpaidSupplierBills=Keine offenen Lieferantenrechnungen NoModifiedSupplierBills=Keine bearbeiteten Lieferantenrechnungen -NoRecordedProducts=Keine erfassten Produkte/Services +NoRecordedProducts=Keine erfassten Produkte/Leistungen NoRecordedProspects=Keine erfassten Leads -NoContractedProducts=Keine Produkte/Services in Auftrag +NoContractedProducts=Keine Produkte/Leistungen im Auftrag NoRecordedContracts=Keine Verträge erfasst NoRecordedInterventions=Keine bearbeiteten Eingriffe BoxLatestSupplierOrders=Neueste Lieferantenbestellungen -BoxTitleLatestSupplierOrders=%s neueste Lieferantenbestellungen +BoxTitleLatestSupplierOrders=Letzte %s Lieferantenbestellungen +BoxTitleLatestModifiedSupplierOrders=Letzte %s bearbeiteten Lieferantenbestellungen NoSupplierOrder=Keine bearbeiteten Lieferantenbestellungen BoxCustomersInvoicesPerMonth=Kundenrechnungen pro Monat BoxSuppliersInvoicesPerMonth=Lieferantenrechnungen pro Monat @@ -84,8 +89,9 @@ BoxCustomersOrdersPerMonth=Kundenbestellungen pro Monat BoxSuppliersOrdersPerMonth=Lieferantenbestellungen pro Monat BoxProposalsPerMonth=Angebote pro Monat NoTooLowStockProducts=Keine Produkte unter der min. Warenlimite -BoxProductDistribution=Produkte/Services Verteilung +BoxProductDistribution=Verteilung von Produkten/Leistungen BoxProductDistributionFor=Verteilung von %s für %s ForCustomersInvoices=Kundenrechnungen ForCustomersOrders=Kundenbestellungen ForProposals=Angebote +LastXMonthRolling=Die letzten %s Monate rollier diff --git a/htdocs/langs/de_DE/categories.lang b/htdocs/langs/de_DE/categories.lang index c558a8436a5c9..ce96c9c15db8c 100644 --- a/htdocs/langs/de_DE/categories.lang +++ b/htdocs/langs/de_DE/categories.lang @@ -1,62 +1,62 @@ # 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=Kategorie +Rubriques=Kategorien +categories=Kategorien +TheCategorie=Die Kategorie +NoCategoryYet=Keine Kategorie von dieser Art erstellt In=In AddIn=Einfügen in modify=Ändern Classify=Einordnen -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 +CategoriesArea=Kategorienbereich-Übersicht +ProductsCategoriesArea=Produkte/Leistungen Kategorien-Übersicht +SuppliersCategoriesArea=Lieferantenkategorienübersicht +CustomersCategoriesArea=Kundenkategorien +ThirdPartyCategoriesArea=Partnerkategorien +MembersCategoriesArea=Mitgliederkategorien +ContactsCategoriesArea=Kontaktkategorien-Übersicht +MainCats=Hauptkategorien SubCats=Unterkategorien CatStatistics=Statistik -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 +CatList=Liste der Kategorien +AllCats=Alle Kategorien +ViewCat=Zeige Tag/Kategorie +NewCat=Kategorie hinzufügen +NewCategory=Neue Kategorie +ModifCat=Kategorie bearbeiten +CatCreated=Kategorie erstellt +CreateCat=Kategorie erstellen +CreateThisCat=Kategorie erstellen ValidateFields=Überprüfen Sie die Felder NoSubCat=Keine Unterkategorie SubCatOf=Unterkategorie von -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 +FoundCats=Kategorien gefunden +FoundCatsForName=Kategorien gefunden für den Suchbegriff: +FoundSubCatsIn=Unterkategorien in der Kategorie gefunden +ErrSameCatSelected=Sie haben die gleiche Kategorie mehrmals ausgewählt +ErrForgotCat=Sie haben vergessen eine Kategorie zu wählen ErrForgotField=Sie haben ein oder mehrere Felder nicht ausgefüllt ErrCatAlreadyExists=Dieser Name wird bereits verwendet -AddProductToCat=Add this product to a tag/category? -ImpossibleAddCat=Impossible to add the tag/category -ImpossibleAssociateCategory=Impossible to associate the tag/category to +AddProductToCat=Dieses Produkt einer Kategorie zuweisen? +ImpossibleAddCat=Kategorie erstellen ist nicht möglich +ImpossibleAssociateCategory=Es ist nicht möglich die Kategorie zuweisen an WasAddedSuccessfully= %s wurde erfolgreich hinzugefügt. -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 +ObjectAlreadyLinkedToCategory=Element ist bereits mit dieser Kategorie verknüpft. +CategorySuccessfullyCreated=Die Kategorie %s wurde erfolgreich hinzugefügt. +ProductIsInCategories=Dieses Produkt/Service ist folgenden Kategorien zugewiesen +SupplierIsInCategories=Dieser Lieferant ist folgenden Kategorien zugewiesen +CompanyIsInCustomersCategories=Dieser Partner ist folgenden Lead-/Kundenkategorien zugewiesen +CompanyIsInSuppliersCategories=Dieser Partner ist folgenden Lieferantenkategorien zugewiesen +MemberIsInCategories=Dieses Mitglied ist folgenden Kategorien zugewiesen +ContactIsInCategories=Dieser Kontakt ist folgenden Kategorien zugewiesen +ProductHasNoCategory=Dieses Produkt/Service ist keiner Kategorie zugewiesen. +SupplierHasNoCategory=Dieser Lieferant ist keiner Kategorie zugewiesen. +CompanyHasNoCategory= Dieses Unternehmen ist keiner Kategorie zugewiesen. +MemberHasNoCategory= Dieses Mitglied ist keiner Kategorie zugewiesen. +ContactHasNoCategory= Dieser Kontakt ist keiner Kategorie zugewiesen. +ClassifyInCategory=Folgender Kategorie zuweisen NoneCategory=Keine -NotCategorized=Without tag/category +NotCategorized=ohne Zuordnung CategoryExistsAtSameLevel=Diese Kategorie existiert bereits auf diesem Level ReturnInProduct=Zurück zur Produktkarte ReturnInSupplier=Zurück zur Anbieterkarte @@ -64,22 +64,22 @@ ReturnInCompany=Zurück zur Kunden-/Lead-Karte ContentsVisibleByAll=Für alle sichtbarer Inhalt ContentsVisibleByAllShort=Öffentl. Inhalt ContentsNotVisibleByAllShort=Privater Inhalt -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=Products tags/categories -MembersCategoriesShort=Members tags/categories -ContactCategoriesShort=Contacts tags/categories +CategoriesTree=Kategoriebaum +DeleteCategory=Lösche Kategorie +ConfirmDeleteCategory=Möchten Sie diese Kategorie wirklich löschen? +RemoveFromCategory=Aus Kategorie entfernen +RemoveFromCategoryConfirm=Möchten Sie die Kategoriezuweisung wirklich entfernen? +NoCategoriesDefined=Keine Kategorie definiert +SuppliersCategoryShort=Lieferantenkategorie +CustomersCategoryShort=Kundenkategorie +ProductsCategoryShort=Produktkategorie +MembersCategoryShort=Mitgliederkategorie +SuppliersCategoriesShort=Lieferantenkategorien +CustomersCategoriesShort=Kundenkategorien +CustomersProspectsCategoriesShort=Kunden- / Leadkategorien +ProductsCategoriesShort=Produktkategorien +MembersCategoriesShort=Mitgliederkategorien +ContactCategoriesShort=Kontaktkategorien ThisCategoryHasNoProduct=Diese Kategorie enthält keine Produkte. ThisCategoryHasNoSupplier=Diese Kategorie enthält keine Lieferanten. ThisCategoryHasNoCustomer=Diese Kategorie enthält keine Kunden. @@ -88,23 +88,23 @@ ThisCategoryHasNoContact=Diese Kategorie enthält keine Kontakte. AssignedToCustomer=Einem Kunden zugeordnet AssignedToTheCustomer=An den Kunden InternalCategory=Interne 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 +CategoryContents=Kategorie/Bezeichnung +CategId=Kategorie-ID +CatSupList=Liste der Lieferantenkategorien +CatCusList=Liste der Kunden-/ Leadkategorien +CatProdList=Liste der Produktkategorien +CatMemberList=Liste der Mitgliederkategorien +CatContactList=Liste der Kontaktkategorien +CatSupLinks=Verbindung zwischen Lieferanten und Kategorien +CatCusLinks=Verbindung zwischen Kunden-/Leads und Kategorien +CatProdLinks=Verbindung zwischen Produkten/Leistungen und Kategorien +CatMemberLinks=Verbindung zwischen Mitgliedern und Kategorien +DeleteFromCat=Aus Kategorie entfernen DeletePicture=Bild löschen ConfirmDeletePicture=Bild wirklich löschen? ExtraFieldsCategories=Ergänzende Attribute -CategoriesSetup=Tags/categories setup -CategorieRecursiv=Link with parent tag/category automatically +CategoriesSetup=Tags / Kategorien Einstellungen +CategorieRecursiv=Automatisch mit übergeordneter Kategorie verbinden CategorieRecursivHelp=Wenn aktiviert, wird das Produkt auch zur übergeordneten Kategorie zugewiesen, wenn es einer Unterkategorie zugewiesen wird -AddProductServiceIntoCategory=Folgendes Produkt/Dienstleistungen hinzufügen -ShowCategory=Show tag/category +AddProductServiceIntoCategory=Folgendes Produkt/Service hinzufügen +ShowCategory=Zeige Kategorie diff --git a/htdocs/langs/de_DE/companies.lang b/htdocs/langs/de_DE/companies.lang index c752a4840dd24..509d06ea3de07 100644 --- a/htdocs/langs/de_DE/companies.lang +++ b/htdocs/langs/de_DE/companies.lang @@ -83,7 +83,7 @@ DefaultLang=Standardsprache VATIsUsed=MwSt.-pflichtig VATIsNotUsed=Nicht MwSt-pflichtig CopyAddressFromSoc=Übernehme die Adresse vom Partner -NoEmailDefined=Es ist keine Mail-Adresse definiert +NoEmailDefined=Es wurde keine Mailadresse definiert ##### Local Taxes ##### LocalTax1IsUsedES= RE wird verwendet LocalTax1IsNotUsedES= RE wird nicht verwendet diff --git a/htdocs/langs/de_DE/compta.lang b/htdocs/langs/de_DE/compta.lang index 11607daae6c57..ecebc150e038d 100644 --- a/htdocs/langs/de_DE/compta.lang +++ b/htdocs/langs/de_DE/compta.lang @@ -29,7 +29,7 @@ ReportTurnover=Umsatz PaymentsNotLinkedToInvoice=Zahlungen mit keiner Rechnung und damit auch keinem Partner verbunden PaymentsNotLinkedToUser=Zahlungen mit keinem Benutzer verbunden Profit=Gewinn -AccountingResult=Accounting result +AccountingResult=Buchhaltungsergebnis Balance=Bilanz Debit=Soll Credit=Haben @@ -47,7 +47,7 @@ LT1SummaryES=RE Balance VATPaid=Bezahlte MwSt. SalaryPaid=Gezahlter Lohn LT2PaidES=EKSt. gezahlt -LT1PaidES=RE Paid +LT1PaidES=RE Zahlungen LT2CustomerES=EKSt. Verkauf LT2SupplierES=EKSt. Einkauf LT1CustomerES=RE sales @@ -55,7 +55,7 @@ LT1SupplierES=RE purchases VATCollected=Erhobene MwSt. ToPay=Zu zahlen ToGet=Zu erhalten -SpecialExpensesArea=Area for all special payments +SpecialExpensesArea=Bereich für alle Sonderzahlungen TaxAndDividendsArea=Steuern-, Sozialabgaben- und Dividendenübersicht SocialContribution=Sozialbeitrag SocialContributions=Sozialbeiträge @@ -67,7 +67,7 @@ MenuNewSocialContribution=Neuer Beitrag NewSocialContribution=Neuer Sozialbeitrag ContributionsToPay=Zu zahlende Beiträge AccountancyTreasuryArea=Rechnungswesen/Vermögensverwaltung -AccountancySetup=Rechnungswesen Einstellungen +AccountancySetup=Buchhaltung Einstellungen NewPayment=Neue Zahlung Payments=Zahlungen PaymentCustomerInvoice=Zahlung Kundenrechnung @@ -121,7 +121,7 @@ ConfirmPaySocialContribution=Möchten Sie diesen Sozialbeitrag wirklich als beza DeleteSocialContribution=Sozialbeitrag löschen ConfirmDeleteSocialContribution=Möchten Sie diesen Sozialbeitrag wirklich löschen? ExportDataset_tax_1=Sozialbeiträge und Zahlungen -CalcModeVATDebt=Mode %sVAT on commitment accounting%s. +CalcModeVATDebt=Modus %s Mwst. auf Engagement Rechnungslegung %s. CalcModeVATEngagement=Mode %sVAT on incomes-expenses%s. CalcModeDebt=Mode %sClaims-Debts%s said Commitment accounting. CalcModeEngagement=Mode %sIncomes-Expenses%s said cash accounting @@ -148,12 +148,12 @@ LT2ReportByCustomersInInputOutputModeES=Bericht von Partner EKSt. LT1ReportByCustomersInInputOutputModeES=Report by third party RE VATReportByCustomersInInputOutputMode=Bericht zur vereinnahmten und bezahlten MwSt. nach Kunden VATReportByCustomersInDueDebtMode=Bericht zur vereinnahmten und bezahlten MwSt. nach Kunden -VATReportByQuartersInInputOutputMode=Report by rate of the VAT collected and paid +VATReportByQuartersInInputOutputMode=Quartalsbericht zur vereinnahmten und bezahlten MwSt. LT1ReportByQuartersInInputOutputMode=Report by RE rate -LT2ReportByQuartersInInputOutputMode=Report by IRPF rate -VATReportByQuartersInDueDebtMode=Report by rate of the VAT collected and paid +LT2ReportByQuartersInInputOutputMode=Quartal-Bericht EKSt. Rate +VATReportByQuartersInDueDebtMode=Quartalsbericht zur vereinnahmten und bezahlten MwSt. LT1ReportByQuartersInDueDebtMode=Report by RE rate -LT2ReportByQuartersInDueDebtMode=Report by IRPF rate +LT2ReportByQuartersInDueDebtMode=Quartal-Bericht EKSt. Rate SeeVATReportInInputOutputMode=Siehe %sMwSt.-Einnahmen%s-Bericht für eine standardmäßige Berechnung SeeVATReportInDueDebtMode=Siehe %sdynamischen MwSt.%s-Bericht für eine Berechnung mit dynamischer Option RulesVATInServices=- Für Services beinhaltet der Bericht alle vereinnahmten oder bezahlten Steuern nach Zahlungsdatum. @@ -179,14 +179,14 @@ CodeNotDef=Nicht definiert AddRemind=Verfügbare Menge zum Versenden RemainToDivide= Noch zu Versenden : WarningDepositsNotIncluded=Abschlagsrechnungen werden in dieser Version des Rechnungswesens nicht berücksichtigt. -DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date. +DatePaymentTermCantBeLowerThanObjectDate=Die Zahlungsfrist darf nicht kleiner als das Objektdatum sein Pcg_version=Pcg-Version -Pcg_type=Pcg type -Pcg_subtype=Pcg subtype -InvoiceLinesToDispatch=Invoice lines to dispatch +Pcg_type=PCG Typ +Pcg_subtype=PCG Subtyp +InvoiceLinesToDispatch=versandbereite Rechnungszeilen InvoiceDispatched=Versandte Rechnungen AccountancyDashboard=Rechnungswesen Zusammenfassung -ByProductsAndServices=Nach Produkten und Services +ByProductsAndServices=Nach Produkten und Leistungen RefExt=Externe Referenz ToCreateAPredefinedInvoice=Um eine vordefinierte Rechnung zu erzeugen, erstellen Sie eine Standard-Rechnung und klicken dann ohne Freigabe auf "In vordefinierte Rechnung umwandeln". LinkedOrder=Link zur Bestellung @@ -200,8 +200,8 @@ CalculationMode=Berechnungsmodus AccountancyJournal=Buchhaltungscode-Journal ACCOUNTING_VAT_ACCOUNT=Standard-Erlöskonto, um MwSt einzuziehen ACCOUNTING_VAT_BUY_ACCOUNT=Standard-Aufwandskonto, um MwSt zu bezahlen -ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties -ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +ACCOUNTING_ACCOUNT_CUSTOMER=Standard Buchhaltungs-Code für Kunden/Debitoren +ACCOUNTING_ACCOUNT_SUPPLIER=Standard Buchhaltungs-Code für Lieferanten/Kreditoren CloneTax=Sozialbeitrag duplizieren ConfirmCloneTax=Bestätigung 'Sozialbeitrag duplizieren' CloneTaxForNextMonth=Für nächsten Monat duplizieren diff --git a/htdocs/langs/de_DE/contracts.lang b/htdocs/langs/de_DE/contracts.lang index 9cb31dac0468c..b6ed03c343ce2 100644 --- a/htdocs/langs/de_DE/contracts.lang +++ b/htdocs/langs/de_DE/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Vertragsübersicht ListOfContracts=Liste der Verträge -LastModifiedContracts=Letzte %s geänderte Kontrakte +LastModifiedContracts=Letzte %s geänderte Verträge AllContracts=Alle Verträge ContractCard=Vertragskarte ContractStatus=Vertragsstatus @@ -19,7 +19,7 @@ ServiceStatusLateShort=Abgelaufen ServiceStatusClosed=Geschlossen ServicesLegend=Services Legende Contracts=Verträge -ContractsAndLine=Contracts and line of contracts +ContractsAndLine=Verträge und Zeilen von Verträgen Contract=Vertrag NoContracts=Keine Verträge MenuServices=Services @@ -28,7 +28,7 @@ MenuRunningServices=Aktive Services MenuExpiredServices=Abgelaufene Services MenuClosedServices=Geschlossene Services NewContract=Neuer Vertrag -AddContract=Kontrakt erstellen +AddContract=Vertrag erstellen SearchAContract=Suche einen Vertrag DeleteAContract=Löschen eines Vertrages CloseAContract=Schließen eines Vertrages @@ -39,7 +39,7 @@ ConfirmCloseService=Möchten Sie dieses Service wirklich mit Datum %s sch ValidateAContract=Einen Vertrag freigeben ActivateService=Service aktivieren ConfirmActivateService=Möchten Sie diesen Service wirklich mit Datum %s aktivieren? -RefContract=Vertrags-Referenz +RefContract=Vertragsnummer DateContract=Vertragsdatum DateServiceActivate=Service-Aktivierungsdatum DateServiceUnactivate=Service-Deaktivierungsdatum @@ -54,7 +54,7 @@ ListOfRunningContractsLines=Liste der aktiven Vertragspositionen ListOfRunningServices=Liste aktiver Services NotActivatedServices=Inaktive Services (in freigegebenen Verträgen) BoardNotActivatedServices=Zu aktivierende Services (in freigegebenen Verträgen) -LastContracts=Letzte %s Kontrakte +LastContracts=Letzte %s Verträge LastActivatedServices=%s zuletzt aktivierte Services LastModifiedServices=%s zuletzt bearbeitete Services EditServiceLine=Service-Position bearbeiten @@ -89,10 +89,10 @@ NoExpiredServices=Keine abgelaufen aktiven Dienste ListOfServicesToExpireWithDuration=Liste der Leistungen die in %s Tagen ablaufen ListOfServicesToExpireWithDurationNeg=Liste der Services die seit mehr als %s Tagen abgelaufen sind ListOfServicesToExpire=Liste der Services die ablaufen -NoteListOfYourExpiredServices=Diese Liste enthält nur Dienstleistungen an Partner, bei denen Sie als Vertreter Angegeben sind. +NoteListOfYourExpiredServices=Diese Liste enthält nur Leistungen an Partner, bei denen Sie als Vertreter angegeben sind. StandardContractsTemplate=Standard Vertragsschablone ContactNameAndSignature=Für %s, Name und Unterschrift -OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. +OnlyLinesWithTypeServiceAreUsed=Nur die Zeile der Kategorie "Service" wird kopiert. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Vertragsunterzeichnung durch Vertreter diff --git a/htdocs/langs/de_DE/cron.lang b/htdocs/langs/de_DE/cron.lang index 21c56d1a7072b..12744e135d5df 100644 --- a/htdocs/langs/de_DE/cron.lang +++ b/htdocs/langs/de_DE/cron.lang @@ -15,7 +15,7 @@ OrToLaunchASpecificJob=Oder zum Prüfen und Starten von speziellen Jobs KeyForCronAccess=Sicherheitsschlüssel für URL zum Starten von Cronjobs FileToLaunchCronJobs=Kommandozeile zum Starten von Cronjobs 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 +CronExplainHowToRunWin=In Microsoft(tm) Windows Umgebungen kannst Du die Aufgabenplanung benutzen um die Kommandozeile jede 5 Minuten aufzurufen # Menu CronJobs=Geplante Jobs CronListActive=Liste der aktiven/geplanten Jobs @@ -26,13 +26,13 @@ CronLastOutput=Ausgabe der letzten Ausführung CronLastResult=Letzter Resultatcode CronListOfCronJobs=Liste der geplanten Jobs CronCommand=Befehl -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 +CronList=Geplante cronjobs +CronDelete=cronjobs löschen +CronConfirmDelete=Möchten Sie diesen Cronjob wirklich löschen? +CronExecute=Starte geplante cronjobs +CronConfirmExecute=Sind Sie sicher, dass Sie diesen cronjob jetzt ausführen wollen? +CronInfo=Das Schedule Cron-Jobs Module erlaubt die geplanten Cron-Jobs die programmiert wurden durchzuführen. +CronWaitingJobs=Wartende Jobs CronTask=Job CronNone=Keine CronDtStart=Startdatum diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang index 0dc32476d559b..ea186ca174c9f 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=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=Falsche Syntax für den Barcode. Vielleicht haben Sie eine falsche Barcodeart eingestellt oder eine falsche Barcode Maske definiert. 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=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) +ErrorFieldValueNotIn=Nicht korrekter Wert für das Feld-Nummer %s (Wert: '%s' ist kein verfügbarer Wert im Feld %s der Tabelle %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) @@ -91,8 +91,8 @@ ErrorModuleSetupNotComplete=Das Setup des Moduls scheint unvollständig zu sein. ErrorBadMask=Fehler auf der Maske ErrorBadMaskFailedToLocatePosOfSequence=Fehler, Maske ohne fortlaufende Nummer ErrorBadMaskBadRazMonth=Fehler, falscher Reset-Wert -ErrorMaxNumberReachForThisMask=Max number reach for this mask -ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits +ErrorMaxNumberReachForThisMask=Maximum Größe für diese Maske erreicht +ErrorCounterMustHaveMoreThan3Digits=Zähler muss länger als 3 Stellen sein ErrorSelectAtLeastOne=Fehler. Wählen Sie mindestens einen Eintrag. ErrorProductWithRefNotExist=Produkt mit der Nummer '%s' nicht gefunden ErrorDeleteNotPossibleLineIsConsolidated=Löschen nicht möglich, da der Datensatz mit einer Banktransaktion verbunden ist. @@ -122,7 +122,7 @@ ErrorNoActivatedBarcode=Kein Barcode aktiviert ErrUnzipFails=Fehler beim Entpacken von %s mit ZipArchive ErrNoZipEngine=Kein Entpackprogramm in PHP gefunden für Datei %s ErrorFileMustBeADolibarrPackage=Die Datei %s muss ein Dolibarr ZIP-Paket sein -ErrorFileRequired=It takes a package Dolibarr file +ErrorFileRequired=Eine Dolibarr Datei wird benötigt ErrorPhpCurlNotInstalled=PHP CURL ist nicht installiert, aber erforderlich für Paypal ErrorFailedToAddToMailmanList=Fehler beim Hinzufügen von %s zur Mailman Liste %s oder SPIP basis ErrorFailedToRemoveToMailmanList=Fehler beim Löschen von %s von der Mailman Liste %s oder SPIP basis @@ -137,7 +137,7 @@ ErrorOpenIDSetupNotComplete=Sie haben im Dolibarr Konfigurationsfile eingestellt ErrorWarehouseMustDiffers=Quell- und Ziel-Lager müssen unterschiedlich sein ErrorBadFormat=Falsches Format! ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Fehler: Dieses Mitglied ist noch nicht mit einem Partner verbunden. Verknüpfen Sie das Mitglied zuerst mit einem vorhandenen Partner oder legen Sie einen neuen an, bevor Sie ein Abonnement mit Rechnung erstellen. -ErrorThereIsSomeDeliveries=Fehler: Lieferung(en) zu dieser Sendung vorhanden. Löschen nicht möglich. +ErrorThereIsSomeDeliveries=Fehler: Es sind noch Auslieferungen zu diesen Versand vorhanden. Löschen deshalb nicht möglich. ErrorCantDeletePaymentReconciliated=Eine Zahlung, deren Bank-Transaktion schon abgeglichen wurde, kann nicht gelöscht werden ErrorCantDeletePaymentSharedWithPayedInvoice=Eine Zahlung, die zu mindestens einer als bezahlt markierten Rechnung gehört, kann nicht entfernt werden ErrorPriceExpression1=Zur Konstanten '%s' kann nicht zugewiesen werden @@ -158,15 +158,18 @@ ErrorPriceExpression21=Leeres Ergebnis '%s' ErrorPriceExpression22=Negatives Ergebnis '%s' 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 -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 +ErrorSrcAndTargetWarehouseMustDiffers=Quelle und Ziel-Lager müssen unterschiedlich sein +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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-Anforderung ist mit dem Fehler '%s' fehlgeschlagen +ErrorGlobalVariableUpdater1=JSON format '%s' ungültig +ErrorGlobalVariableUpdater2=Parameter '%s' fehlt +ErrorGlobalVariableUpdater3=Die gesuchten Daten wurden im Ergebnis nicht gefunden +ErrorGlobalVariableUpdater4=SOAP Client fehlgeschlagen mit Fehler '%s' +ErrorGlobalVariableUpdater5=Keine globale Variable ausgewählt +ErrorFieldMustBeANumeric=Feld %s muss ein numerischer Wert sein +ErrorFieldMustBeAnInteger=Feld %s muss eine ganze Zahl sein # Warnings WarningMandatorySetupNotComplete=Zwingend notwendige Parameter sind noch nicht definiert diff --git a/htdocs/langs/de_DE/holiday.lang b/htdocs/langs/de_DE/holiday.lang index 4850a0a80c729..658b81d78a9f6 100644 --- a/htdocs/langs/de_DE/holiday.lang +++ b/htdocs/langs/de_DE/holiday.lang @@ -69,7 +69,7 @@ DefineEventUserCP=Sonderurlaub für einen Anwender zuweisen addEventToUserCP=Urlaub zuweisen MotifCP=Grund UserCP=Benutzer -ErrorAddEventToUserCP=Ein Fehler ist aufgetreten beim Hinzufügen des Sonderurlaubs +ErrorAddEventToUserCP=Ein Fehler ist aufgetreten beim erstellen des Sonderurlaubs AddEventToUserOkCP=Das Hinzufügen des Sonderurlaubs wurde abgeschlossen. MenuLogCP=Zeige Logdaten zu Urlaubsanträgen LogCP=Log der Aktualisierung von verfügbaren Urlaubstagen @@ -84,7 +84,7 @@ FirstDayOfHoliday=Erster Urlaubstag LastDayOfHoliday=Letzter Urlaubstag HolidaysMonthlyUpdate=Monatliches Update ManualUpdate=Manuelles Update -HolidaysCancelation=Leave request cancelation +HolidaysCancelation=Urlaubsanfragen Stornos ## Configuration du Module ## ConfCP=Konfiguration des Urlaubsmoduls @@ -97,7 +97,7 @@ UpdateConfCPOK=Erfolgreich bearbeitet. ErrorUpdateConfCP=Ein Fehler trat beim Bearbeiten auf, bitte nochmals versuchen. AddCPforUsers=Bitte geben Sie die Anzahl Urlaubstage der Benutzer an, indem Sie hier klicken. DelayForSubmitCP=Letztmöglicher Termin für Urlaubsanträge -AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline +AlertapprobatortorDelayCP=der Urlaubsantrag hält die Frist nicht ein! AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance nbUserCP=Anzahl unterstützter Benutzer im Urlaubsmodul @@ -106,7 +106,7 @@ nbHolidayEveryMonthCP=Anzahl hinzugefügter Urlaubstage pro Monat Module27130Name= Verwaltung von Urlaubsanträgen Module27130Desc= Verwaltung von Urlaubsanträgen TitleOptionMainCP=Wichtigste Urlaubs-Einstellungen -TitleOptionEventCP=Settings of leave requets for events +TitleOptionEventCP=Einstellungen des Urlaubs Bedienungsruf für Veranstaltungen ValidEventCP=Freigeben UpdateEventCP=Maßnahmen aktualisieren CreateEventCP=Erstelle @@ -118,9 +118,9 @@ ErrorUpdateEventCP=Fehler bei der Aktualisierung der Maßnahme. DeleteEventCP=Maßnahme löschen DeleteEventOkCP=Maßnahme wurde gelöscht. ErrorDeleteEventCP=Fehler bei der Löschung der Maßnahme. -TitleDeleteEventCP=Delete a exceptional leave -TitleCreateEventCP=Create a exceptional leave -TitleUpdateEventCP=Edit or delete a exceptional leave +TitleDeleteEventCP=Löschen von Sonderurlaub +TitleCreateEventCP=Erstellen von Sonderurlaub +TitleUpdateEventCP=Verändern oder Löschen von Sonderurlaub DeleteEventOptionCP=Lösche Gruppe UpdateEventOptionCP=Aktualisieren ErrorMailNotSend=Ein Fehler ist beim EMail-Senden aufgetreten: @@ -144,5 +144,5 @@ Permission20001=Erstellen/Ändern Ihrer Urlaubsanträge Permission20002=Anlegen/Ändern der Urlaube für alle Permission20003=Urlaubsanträge löschen Permission20004=Bestimme die verfügbaren Urlaubstage des Benutzers -Permission20005=Review log of modified leave requests +Permission20005=Überprüfung Protokoll geänderte Urlaubsanträge Permission20006=Monatlichen Urlaubsbericht einsehen diff --git a/htdocs/langs/de_DE/install.lang b/htdocs/langs/de_DE/install.lang index 323979fb31f5e..5609141c87965 100644 --- a/htdocs/langs/de_DE/install.lang +++ b/htdocs/langs/de_DE/install.lang @@ -155,8 +155,8 @@ MigrationFinished=Migration abgeschlossen LastStepDesc=Letzter Schritt: Legen Sie Ihr Logo und das Passwort fest, welches Sie für dolibarr verwenden möchten. Verlieren Sie diese Administrator-Passwort nicht, da es der "Generalschlüssel" ist. 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) +WarningUpgrade=Warnung: \nHaben Sie zuerst eine Sicherungskopie der Datenbank gemacht ? \nAufgrund der Probleme im Datenbanksystem (zB MySQL Version 5.5.40 ) , viele Daten oder Tabellen können während der Migration verloren gehen , so ist es sehr empfehlenswert , vor dem Starten des Migrationsprozesses, eine vollständige Sicherung Ihrer Datenbank zu haben.\n\nKlicken Sie auf OK , um die Migration zu starten +ErrorDatabaseVersionForbiddenForMigration=Die Version Ihres Datenbankmanager ist %s.\nDies ist einen kritischer Bug welcher zu Datenverlust führen kann, wenn Sie die Struktur der Datenbank wie vom Migrationsprozess erforderlich ändern. Aus diesem Grund, ist die Migration nicht erlaubt bevor der Datenbankmanager auf eine später Version aktualisiert wurde (Liste betroffer Versionen %s ) ######### # upgrade @@ -196,12 +196,12 @@ MigrationReopenedContractsNumber=%s Verträge geändert MigrationReopeningContractsNothingToUpdate=Keine geschlossenen Verträge zur Wiedereröffnung MigrationBankTransfertsUpdate=Verknüpfung zwischen Banktransaktion und einer Überweisung aktualisieren MigrationBankTransfertsNothingToUpdate=Alle Banktransaktionen sind auf neuestem Stand. -MigrationShipmentOrderMatching=Aktualisiere Sendungsscheine +MigrationShipmentOrderMatching=Aktualisierung Versand MigrationDeliveryOrderMatching=Aktualisiere Lieferscheine MigrationDeliveryDetail=Aktualisiere Lieferungen MigrationStockDetail=Produklagerwerte aktualisieren MigrationMenusDetail=Tabellen der dynamischen Menüs aktualisieren -MigrationDeliveryAddress=Lieferadresse in Sendungen aktualisieren +MigrationDeliveryAddress=Update Lieferadresse in Versand MigrationProjectTaskActors=Datenmigration für llx_projet_task_actors Tabelle MigrationProjectUserResp=Datenmigration des Feldes fk_user_resp von llx_projet nach llx_element_contact MigrationProjectTaskTime=Aktualisiere aufgewandte Zeit (in Sekunden) diff --git a/htdocs/langs/de_DE/interventions.lang b/htdocs/langs/de_DE/interventions.lang index e17e1c339db34..b1d2282b6098a 100644 --- a/htdocs/langs/de_DE/interventions.lang +++ b/htdocs/langs/de_DE/interventions.lang @@ -50,4 +50,4 @@ ArcticNumRefModelError=Fehler beim aktivieren PacificNumRefModelDesc1=Liefere Nummer im Format %syymm-nnnn zurück, wobei yy das Jahr, mm das Monat und nnnn eine Zahlensequenz ohne Nullwert oder Leerzeichen ist PacificNumRefModelError=Eine Interventionskarte beginnend mit $syymm existiert bereits und ist nicht mir dieser Numerierungssequenz kompatibel. Bitte löschen oder umbenennen. PrintProductsOnFichinter=Drucke Produkte auf Eingriffskarte -PrintProductsOnFichinterDetails=forinterventions generated from orders +PrintProductsOnFichinterDetails=Interventionen von Bestellungen generiert diff --git a/htdocs/langs/de_DE/languages.lang b/htdocs/langs/de_DE/languages.lang index 9424f5cdf5715..32b0c88a89f96 100644 --- a/htdocs/langs/de_DE/languages.lang +++ b/htdocs/langs/de_DE/languages.lang @@ -13,7 +13,7 @@ Language_de_AT=Deutsch (Österreich) Language_de_CH=Deutsch (Schweiz) Language_el_GR=Griechisch Language_en_AU=Englisch (Australien) -Language_en_CA=English (Canada) +Language_en_CA=Englisch (Kanada) Language_en_GB=Englisch (Großbritannien) Language_en_IN=Englisch (Indien) Language_en_NZ=Englisch (Neuseeland) diff --git a/htdocs/langs/de_DE/mailmanspip.lang b/htdocs/langs/de_DE/mailmanspip.lang index 443e785f10ad1..6d3510cd844e2 100644 --- a/htdocs/langs/de_DE/mailmanspip.lang +++ b/htdocs/langs/de_DE/mailmanspip.lang @@ -1,27 +1,27 @@ # Dolibarr language file - Source file is en_US - mailmanspip MailmanSpipSetup=Konfiguration Mailman und SPIP Modul -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) +MailmanTitle=Mailman Mailingliste System +TestSubscribe=Zum Testen von Mailman Abonnement Anmeldung Listen +TestUnSubscribe=Zum Testen von Mailman Abonnement Abmeldung Listen +MailmanCreationSuccess=Abonnement-Test wurde erfolgreich durchgeführt +MailmanDeletionSuccess=Abmeldung Test wurde erfolgreich durchgeführt +SynchroMailManEnabled=Ein Mailman-Update wird durchgeführt werden +SynchroSpipEnabled=Ein Spip-Update wird durchgeführt werden +DescADHERENT_MAILMAN_ADMINPW=Administratorpasswort +DescADHERENT_MAILMAN_URL=URL für Mailman Anmeldungen +DescADHERENT_MAILMAN_UNSUB_URL=URL für Mailman Abmeldungen +DescADHERENT_MAILMAN_LISTS=Liste(n) für die automatische Beschriftung der neuen Mitglieder (durch Komma getrennt) SPIPTitle=SPIP Content Management System DescADHERENT_SPIP_SERVEUR=SPIP-Server DescADHERENT_SPIP_DB=SPIP-Datenbankname DescADHERENT_SPIP_USER=SPIP-Datenbankkennung DescADHERENT_SPIP_PASS=SPIP-Datenbankpasswort -AddIntoSpip=Add into SPIP -AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP? -AddIntoSpipError=Failed to add the user in SPIP +AddIntoSpip=Einfügen in SPIP +AddIntoSpipConfirmation=Sind Sie sicher, dass Sie diesen Teilnehmer in SPIP hinzufügen möchten? +AddIntoSpipError=Fehler beim anfügen des Benutzers in SPIP DeleteIntoSpip=Von SPIP entfernen -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 +DeleteIntoSpipConfirmation=Sind Sie sicher, dass Sie dieses Mitglied von SPIP entfernen wollen? +DeleteIntoSpipError=Fehler zu unterdrücken des Benutzers von SPIP +SPIPConnectionFailed=Fehler beim Verbinden mit SPIP +SuccessToAddToMailmanList=Hinzufügen von %s, in mailman-Liste %s oder SPIP-Datenbank durchgeführt +SuccessToRemoveToMailmanList=Entfernung von %s, in mailman-Liste %s oder SPIP-Datenbank durchgeführt diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang index 1fccacfd60b2b..c5c5a57353dd0 100644 --- a/htdocs/langs/de_DE/main.lang +++ b/htdocs/langs/de_DE/main.lang @@ -141,7 +141,7 @@ Cancel=Abbrechen Modify=Ändern Edit=Bearbeiten Validate=Freigeben -ValidateAndApprove=Validate and Approve +ValidateAndApprove=Freigegeben und Bestätigt ToValidate=Freizugeben Save=Speichern SaveAs=Speichern unter @@ -159,7 +159,7 @@ Search=Suchen SearchOf=Suche nach Valid=Gültig Approve=Genehmigen -Disapprove=Disapprove +Disapprove=Abgelehnt ReOpen=Wiedereröffnen Upload=Datei laden ToLink=Link @@ -211,7 +211,7 @@ Limit=Grenze Limits=Grenzen DevelopmentTeam=Entwicklungsteam Logout=Abmelden -NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode %s +NoLogoutProcessWithAuthMode=Keine Anwendung Trennungsfunktion mit Authentifizierungsmodus % s Connection=Verbindung Setup=Einstellungen Alert=Warnung @@ -220,8 +220,9 @@ Next=Vor Cards=Karten Card=Karte Now=Jetzt +HourStart=Startzeit Date=Datum -DateAndHour=Date and hour +DateAndHour=Datum und Uhrzeit DateStart=Beginndatum DateEnd=Enddatum DateCreation=Erstellungsdatum @@ -242,6 +243,8 @@ DatePlanShort=gepl. Datum DateRealShort=eff. Datum DateBuild=Datum der Berichterstellung DatePayment=Zahlungsziel +DateApprove=Genehmigungsdatum +DateApprove2=Genehmigungsdatum (zweite Genehmigung) DurationYear=Jahr DurationMonth=Monat DurationWeek=Woche @@ -298,7 +301,7 @@ UnitPriceHT=Stückpreis (netto) UnitPriceTTC=Stückpreis (brutto) PriceU=VP PriceUHT=VP (netto) -AskPriceSupplierUHT=P.U. HT Requested +AskPriceSupplierUHT=Nettopreis anfordern PriceUTTC=VP (brutto) Amount=Betrag AmountInvoice=Rechnungsbetrag @@ -352,7 +355,7 @@ Status=Status Favorite=Favorit ShortInfo=Info. Ref=Nummer -ExternalRef=Ref. extern +ExternalRef=Externe-ID RefSupplier=Lieferanten-Nr. RefPayment=Zahlungs-Nr. CommercialProposalsShort=Angebote @@ -395,8 +398,8 @@ Available=Verfügbar NotYetAvailable=Noch nicht verfügbar NotAvailable=Nicht verfügbar Popularity=Beliebtheit -Categories=Tags/categories -Category=Tag/category +Categories= Kategorien / Bezeichnungen +Category=Kategorie/Bezeichnung By=Von From=Von to=An @@ -408,6 +411,8 @@ OtherInformations=Zusatzinformationen Quantity=Menge Qty=Menge ChangedBy=Geändert von +ApprovedBy=genehmigt von +ApprovedBy2=Genehmige von (zweite Genehmigung) ReCalculate=Neuberechnung ResultOk=Erfolg ResultKo=Fehlschlag @@ -526,7 +531,7 @@ DateFromTo=Von %s bis %s DateFrom=Von %s DateUntil=Bis %s Check=Prüfen -Uncheck=Uncheck +Uncheck=nicht gewählt Internal=Intern External=Extern Internals=Interne @@ -621,7 +626,7 @@ AddNewLine=Neue Zeile hinzufügen AddFile=Datei hinzufügen ListOfFiles=Liste verfügbarer Dateien FreeZone=Freier Text -FreeLineOfType=Free entry of type +FreeLineOfType=Freier Texteintrag von Typ CloneMainAttributes=Objekt mit Haupteigenschaften duplizieren PDFMerge=PDFs verbinden Merge=Verbinden @@ -657,7 +662,7 @@ AttributeCode=Attribut Code OptionalFieldsSetup=Zusätzliche Attributeinstellungen URLPhoto=URL für Foto/Bild SetLinkToThirdParty=Link zu einem Partner -CreateDraft=Angebot erstellen +CreateDraft=Entwurf erstellen SetToDraft=Auf Entwurf zurücksetzen ClickToEdit=Klicken zum Bearbeiten ObjectDeleted=Objekt %s gelöscht @@ -694,8 +699,10 @@ PublicUrl=Öffentliche URL 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. +ShowTransaction=Transaktion anzeigen +GoIntoSetupToChangeLogo=Gehen Sie zu Übersicht - Einstellungen - Firma/Stiftung um das Logo zu ändern oder gehen Sie in Übersicht - Einstellungen - Anzeige um es zu verstecken. +Deny=ablehnen +Denied=abgelehnt # Week day Monday=Montag Tuesday=Dienstag diff --git a/htdocs/langs/de_DE/members.lang b/htdocs/langs/de_DE/members.lang index 02362bbd66502..c84ef7d5f2055 100644 --- a/htdocs/langs/de_DE/members.lang +++ b/htdocs/langs/de_DE/members.lang @@ -1,5 +1,5 @@ # Dolibarr language file - Source file is en_US - members -MembersArea=Mitgliederübersicht +MembersArea=Mitglieder-Übersicht PublicMembersArea=Öffentliche Mitgliederübersicht MemberCard=Mitgliedskarte SubscriptionCard=Abonnementkarte @@ -155,7 +155,7 @@ NoThirdPartyAssociatedToMember=Mit diesem Mitglied ist kein Partner verknüpft ThirdPartyDolibarr=Partner MembersAndSubscriptions= Mitglieder und Abonnements MoreActions=Ergänzende Erfassungsmaßnahmen -MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription +MoreActionsOnSubscription=Ergänzende Maßnahmen standardmäßig vorgeschlagen bei der Aufnahme einer Subscription MoreActionBankDirect=Autom. einen Einzugsermächtigunsantrag zum Mitgliedskonto erstellen MoreActionBankViaInvoice=Autom. eine Rechnung zum Mitgliedskonto erstellen und Zahlung auf Rechnung setzen MoreActionInvoiceOnly=Autom. eine Rechnung (ohne Zahlung) erstellen @@ -199,8 +199,8 @@ Entreprises=Unternehmen DOLIBARRFOUNDATION_PAYMENT_FORM=Um Ihre Beitragszahlung mit einer Banküberweisung auszuführen, gehen Sie zur Seite: http://wiki.dolibarr.org/index.php/Subscribe.
Um mittels Kreditkarte zu zahlen, klicken Sie auf den Button am Seitenende.
ByProperties=nach Eigenschaften MembersStatisticsByProperties=Mitgliederstatistik nach Eigenschaften -MembersByNature=Members by nature +MembersByNature=Mitglieder von Natur aus VATToUseForSubscriptions=Mehrwertsteuersatz für Abonnements -NoVatOnSubscription=No TVA for subscriptions +NoVatOnSubscription=Kein MwSt. auf Mitgliedschaft. 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/de_DE/orders.lang b/htdocs/langs/de_DE/orders.lang index 5253f9dccc7bf..9f09e0474a733 100644 --- a/htdocs/langs/de_DE/orders.lang +++ b/htdocs/langs/de_DE/orders.lang @@ -1,5 +1,5 @@ # Dolibarr language file - Source file is en_US - orders -OrdersArea=Übersicht Kundenbestellungen +OrdersArea=Kundenbestellungen-Übersicht SuppliersOrdersArea=Übersicht Lieferantenbestellungen OrderCard=Bestell-Karte OrderId=Bestell-ID @@ -33,7 +33,7 @@ StatusOrderOnProcessShort=Bestellt StatusOrderProcessedShort=Bearbeitet StatusOrderToBillShort=Zu verrechnen StatusOrderToBill2Short=Zu verrechnen -StatusOrderApprovedShort=Genehmigt +StatusOrderApprovedShort=genehmigt StatusOrderRefusedShort=Abgelehnt StatusOrderToProcessShort=Zu bearbeiten StatusOrderReceivedPartiallyShort=Teilweise erhalten @@ -46,17 +46,17 @@ StatusOrderOnProcessWithValidation=Bestellt - wartet auf Eingang/Bestätigung StatusOrderProcessed=Bearbeitet StatusOrderToBill=Zu verrechnen StatusOrderToBill2=Zu verrechnen -StatusOrderApproved=Genehmigt +StatusOrderApproved=Bestellung genehmigt StatusOrderRefused=Abgelehnt StatusOrderReceivedPartially=Teilweise erhalten StatusOrderReceivedAll=Komplett erhalten -ShippingExist=Eine Sendung ist vorhanden +ShippingExist=Eine Lieferung ist vorhanden ProductQtyInDraft=Produktmenge in Bestellentwurf -ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered +ProductQtyInDraftOrWaitingApproved=Produktmenge in Bestellentwurf oder Bestellung benötigt Genehmigung, noch nicht bestellt DraftOrWaitingApproved=Entwurf oder genehmigt, noch nicht bestellt DraftOrWaitingShipped=Entwurf oder bestätigt, noch nicht versandt MenuOrdersToBill=Bestellverrechnung -MenuOrdersToBill2=Billable orders +MenuOrdersToBill2=abrechenbare Bestellungen SearchOrder=Suche Bestellung SearchACustomerOrder=Kundenauftrag suchen SearchASupplierOrder=Suche Lieferantenbestellung @@ -64,22 +64,24 @@ ShipProduct=Produkt versenden Discount=Rabatt CreateOrder=Erzeuge Bestellung RefuseOrder=Bestellung ablehnen -ApproveOrder=Approve order -Approve2Order=Approve order (second level) +ApproveOrder=Bestellung genehmigen +Approve2Order=Genehmige Bestellung (2. Bestätigung) ValidateOrder=Bestellung freigeben UnvalidateOrder=Unbestätigte Bestellung DeleteOrder=Bestellung löschen CancelOrder=Bestellung verwerfen -AddOrder=Bestellung anlegen +AddOrder=Bestellung erstellen AddToMyOrders=Zu meinen Bestellungen hinzufügen -AddToOtherOrders=Zu Bestellungen Anderer hinzufügen +AddToOtherOrders=Zu anderer Bestellungen hinzufügen AddToDraftOrders=Zu Bestellentwurf hinzufügen ShowOrder=Zeige Bestellung NoOpenedOrders=Keine offenen Bestellungen NoOtherOpenedOrders=Keine offenen Bestellungen Anderer NoDraftOrders=Keine Bestellentwürfe OtherOrders=Bestellungen Anderer -LastOrders=Neuesten %s Bestellungen +LastOrders=Letzte %s Kundenbestellungen +LastCustomerOrders=Letzte %s Kundenbestellungen +LastSupplierOrders=Letzte %s Lieferantenbestellungen LastModifiedOrders=%s zuletzt bearbeitete Bestellungen LastClosedOrders=%s zuletzt geschlossene Bestellungen AllOrders=Alle Bestellungen @@ -102,9 +104,9 @@ ClassifyShipped=Als geliefert markieren ClassifyBilled=Als verrechnet markieren ComptaCard=Buchhaltungskarte DraftOrders=Bestellentwürfe -RelatedOrders=Verknüpfte Bestellungen -RelatedCustomerOrders=Related customer orders -RelatedSupplierOrders=Related supplier orders +RelatedOrders=Ähnliche Bestellungen +RelatedCustomerOrders=Ähnliche Kundenbestellungen +RelatedSupplierOrders=Ähnliche Lieferantenbestellungen OnProcessOrders=Bestellungen in Bearbeitung RefOrder=Bestell-Nr. RefCustomerOrder=Kunden-Bestellung-Nr. @@ -121,7 +123,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 +FirstApprovalAlreadyDone=1. Bestätigung bereits erledigt ##### Types de contacts ##### TypeContact_commande_internal_SALESREPFOLL=Kundenauftrag-Nachverfolgung durch Vertreter TypeContact_commande_internal_SHIPPING=Versand-Nachverfolgung durch Vertreter @@ -165,6 +167,6 @@ CloseProcessedOrdersAutomatically=Markiere alle ausgewählten Bestellungen als " OrderCreation=Erstellen einer Bestellung Ordered=Bestellt OrderCreated=Ihre Bestellungen wurden erstellt -OrderFail=Ein Fehler trat beim Erstellen der Bestellungen auf +OrderFail=Ein Fehler trat beim erstellen der Bestellungen auf CreateOrders=Erzeuge Bestellungen -ToBillSeveralOrderSelectCustomer=Um eine Rechnung für verschiedene Bestellungen zu erstellen, klicken Sie erst auf Kunde und dann wählen Sie "%s". +ToBillSeveralOrderSelectCustomer=Um eine Rechnung für verschiedene Bestellungen zu erstellen, klicken Sie erst auf Kunde und wählen Sie dann "%s". diff --git a/htdocs/langs/de_DE/other.lang b/htdocs/langs/de_DE/other.lang index 64ab0a6e45a67..ea4ecead17b0e 100644 --- a/htdocs/langs/de_DE/other.lang +++ b/htdocs/langs/de_DE/other.lang @@ -12,13 +12,13 @@ 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_VALIDATE=freigegebene Lieferantenbestellung Notify_ORDER_SUPPLIER_APPROVE=Lieferantenbestellung freigegeben Notify_ORDER_SUPPLIER_REFUSE=Lieferantenbestellung abgelehnt Notify_ORDER_VALIDATE=Kundenbestellung freigegeben Notify_PROPAL_VALIDATE=Angebot freigegeben -Notify_PROPAL_CLOSE_SIGNED=Customer propal closed signed -Notify_PROPAL_CLOSE_REFUSED=Customer propal closed refused +Notify_PROPAL_CLOSE_SIGNED=geschlossene Verkäufe Signiert Angebote +Notify_PROPAL_CLOSE_REFUSED=Geschlossene Verkäufe Angebot abgelehnt Notify_WITHDRAW_TRANSMIT=Transaktion zurückziehen Notify_WITHDRAW_CREDIT=Kreditkarten Rücknahme Notify_WITHDRAW_EMIT=Ausgabe aussetzen @@ -29,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=Supplier order recorded +Notify_ORDER_SUPPLIER_VALIDATE=freigegebene Lieferantenbestellung Notify_ORDER_SUPPLIER_SENTBYMAIL=Lieferantenbestellung per E-Mail zugestellt Notify_BILL_SUPPLIER_VALIDATE=Lieferantenrechnung bestätigen Notify_BILL_SUPPLIER_PAYED=Lieferantenrechnung bezahlt @@ -48,20 +48,20 @@ Notify_PROJECT_CREATE=Projekt-Erstellung Notify_TASK_CREATE=Aufgabe erstellt Notify_TASK_MODIFY=Aufgabe geändert Notify_TASK_DELETE=Aufgabe gelöscht -SeeModuleSetup=See setup of module %s +SeeModuleSetup=Finden Sie im Modul-Setup %s NbOfAttachedFiles=Anzahl der angehängten Dateien/okumente TotalSizeOfAttachedFiles=Gesamtgröße der angehängten Dateien/Dokumente MaxSize=Maximalgröße AttachANewFile=Neue Datei/Dokument anhängen LinkedObject=Verknüpftes Objekt Miscellaneous=Verschiedenes -NbOfActiveNotifications=Number of notifications (nb of recipient emails) +NbOfActiveNotifications= Anzahl Benachrichtigungen ( Anz. E-Mail Empfänger) 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__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__ \n\n Anbei erhalten Sie die Rechnung __ FACREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\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__ @@ -171,7 +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. +EMailTextOrderValidatedBy=Der Auftrag %s wurde von %s freigegeben. EMailTextOrderApprovedBy=Bestellung %s wurde von %s genehmigt EMailTextOrderRefused=Bestellung %s wurde abgelehnt EMailTextOrderRefusedBy=Bestellung %s wurde von %s abgelehnt @@ -203,6 +203,7 @@ NewKeyWillBe=Ihr neuer Anmeldeschlüssel für die Software ist ClickHereToGoTo=Hier klicken für %s YouMustClickToChange=Sie müssen zuerst auf den folgenden Link klicken um die Passwortänderung zu bestätigen. ForgetIfNothing=Wenn Sie diese Änderung nicht beantragt haben, löschen Sie einfach dieses Mail. Ihre Anmeldedaten sind sicher bei uns aufbewahrt. +IfAmountHigherThan=Wenn der Betrag höher als %s ##### Calendar common ##### AddCalendarEntry=Neuer Eintrag im Kalender %s @@ -225,7 +226,7 @@ MemberResiliatedInDolibarr=Mitglied %s aufgehoben MemberDeletedInDolibarr=Mitglied %s gelöscht MemberSubscriptionAddedInDolibarr=Abonnement für Mitglied %s hinzugefügt ShipmentValidatedInDolibarr=Versand %s in Dolibarr geprüft -ShipmentDeletedInDolibarr=Sendung %s gelöscht +ShipmentDeletedInDolibarr=Lieferung %s gelöscht ##### Export ##### Export=Export ExportsArea=Exportübersicht diff --git a/htdocs/langs/de_DE/productbatch.lang b/htdocs/langs/de_DE/productbatch.lang index 4ec2f570e7c05..b277dbaa7d9d8 100644 --- a/htdocs/langs/de_DE/productbatch.lang +++ b/htdocs/langs/de_DE/productbatch.lang @@ -1,21 +1,22 @@ # 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=Charge/Seriennr -atleast1batchfield=Verzehren-bis-, verkaufen-bis-Datum oder Chargennr -batch_number=Charge/Seriennr +ManageLotSerial=Verwende Lot / Seriennummer +ProductStatusOnBatch=Ja (Lot / Seriennummer erforderlich) +ProductStatusNotOnBatch=Nein (Lot / Seriennummer nicht verwendet) +ProductStatusOnBatchShort=Ja +ProductStatusNotOnBatchShort=Keine +Batch=Chg / Serie +atleast1batchfield=Verzehr-bis oder Verkaufen-bis Datum oder Lot / Seriennummer +batch_number=Lot / Seriennummer +BatchNumberShort=Charge / Serie l_eatby=Verzehren-bis-Datum l_sellby=Verkaufen-bis-Datum -DetailBatchNumber=Chargen-/Seriennummern-Details -DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) -printBatch=Charge: %s +DetailBatchNumber=Chg / Serie Details +DetailBatchFormat=Lot/Serien-Nr.: %s - Verbrauchen-bis: %s -Verkaufen bis: %s (Menge: %d) +printBatch=Chg / Serie: %s printEatby=Verzehren bis: %s printSellby=Verkaufen bis: %s printQty=Menge: %d -AddDispatchBatchLine=Add a line for Shelf Life dispatching +AddDispatchBatchLine=Fügen Sie eine Zeile für Haltbarkeit Dispatching BatchDefaultNumber=Nicht definiert -WhenProductBatchModuleOnOptionAreForced=Wenn das Modul Chargen/Seriennr eingeschaltet ist, wird der Modus für Lagerbestands-Erhöhungen / -Senkungen auf die letzte Auswahl festgelegt und kann nicht geändert werden. Andere Optionen können nach Wunsch eingestellt werden. -ProductDoesNotUseBatchSerial=This product does not use batch/serial number +WhenProductBatchModuleOnOptionAreForced=Wenn das Modul Lot/Seriennr eingeschaltet ist, wird der Modus für Lagerbestands-Erhöhungen / -Senkungen auf die letzte Auswahl festgelegt und kann nicht geändert werden. Andere Optionen können nach Wunsch eingestellt werden. +ProductDoesNotUseBatchSerial=Dieses Produkt hat keine Chargen- / Seriennummer. diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang index 35033adced363..03be2b928677a 100644 --- a/htdocs/langs/de_DE/products.lang +++ b/htdocs/langs/de_DE/products.lang @@ -1,47 +1,47 @@ # Dolibarr language file - Source file is en_US - products -ProductRef=Produktreferenz -ProductLabel=Produkt-Beschriftung -ProductServiceCard=Produkt-/Dienstleistungs-Karte +ProductRef=Produkt-Nr. +ProductLabel=Produktbezeichnung +ProductServiceCard=Produkte/Leistungen Karte Products=Produkte -Services=Dienstleistungen +Services=Leistungen Product=Produkt -Service=Dienstleistung -ProductId=Produkt/Dienstleistungs ID +Service=Leistung +ProductId=Produkt/Leistungs ID Create=Erstelle Reference=Referenz NewProduct=Neues Produkt -NewService=Neue Dienstleistung +NewService=Neue Leistung ProductCode=Produkt-Code -ServiceCode=Dienstleistungs-Code +ServiceCode=Leistungs-Code ProductVatMassChange=MwSt-Massenänderung ProductVatMassChangeDesc=Mit dieser Seite kann ein Steuersatz für Produkte oder Dienstleistungen von einem Wert auf einen anderen geändert werden. Achtung: Diese Änderung erfolgt über die gesamte Datenbank! -MassBarcodeInit=Mass barcode init +MassBarcodeInit=Initialisierung Barcodes MassBarcodeInitDesc=Hier können Objekte mit einem Barcode initialisiert werden, die noch keinen haben. Stellen Sie vor Benutzung sicher, dass die Einstellungen des Barcode-Moduls vollständig sind! ProductAccountancyBuyCode=Buchhaltung - Aufwandskonto ProductAccountancySellCode=Buchhaltung - Erlöskonto -ProductOrService=Produkt oder Dienstleistung -ProductsAndServices=Produkte und Dienstleistungen -ProductsOrServices=Produkte oder Dienstleistungen -ProductsAndServicesOnSell=Products and Services for sale or for purchase -ProductsAndServicesNotOnSell=Products and Services out of sale -ProductsAndServicesStatistics=Produkt- und Dienstleistungs-Statistik +ProductOrService=Produkt oder Leistung +ProductsAndServices=Produkte und Leistungen +ProductsOrServices=Produkte oder Leistungen +ProductsAndServicesOnSell=Produkte für Ein- oder Verkauf +ProductsAndServicesNotOnSell=Produkte/Services weder für Ein- noch Verkauf +ProductsAndServicesStatistics=Produkt- und Leistungs-Statistik ProductsStatistics=Produktstatistik ProductsOnSell=Produkte für Ein- oder Verkauf ProductsNotOnSell=Produkte weder für Ein- noch Verkauf -ProductsOnSellAndOnBuy=Products for sale and for purchase -ServicesOnSell=Service für Verkauf oder für Einkauf -ServicesNotOnSell=Service weder für Ein- noch Verkauf -ServicesOnSellAndOnBuy=Services for sale and for purchase +ProductsOnSellAndOnBuy=Produkte für Ein- und Verkauf +ServicesOnSell=Leistungen für Ein- oder Verkauf +ServicesNotOnSell=Leistungen weder für Ein- noch Verkauf +ServicesOnSellAndOnBuy=Services für Ein- und Verkauf InternalRef=Interne Referenz -LastRecorded=Zuletzt erfasste, verfügbare Produkte/Dienstleistungen -LastRecordedProductsAndServices=%s zuletzt erfasste Produkte/Dienstleistungen -LastModifiedProductsAndServices=%s zuletzt bearbeitete Produkte/Dienstleistungen +LastRecorded=Zuletzt erfasste, verfügbare Produkte/Leistungen +LastRecordedProductsAndServices=%s zuletzt erfasste Produkte/Leistungen +LastModifiedProductsAndServices=%s zuletzt bearbeitete Produkte/Leistungen LastRecordedProducts=%s zuletzt erfasste Produkte -LastRecordedServices=%s zuletzt erfasste Dienstleistungen +LastRecordedServices=%s zuletzt erfasste Leistungen LastProducts=Neueste Produkte CardProduct0=Produkt-Karte -CardProduct1=Dienstleistungs-Karte -CardContract=Auftrags-Karte +CardProduct1=Leistungs-Karte +CardContract=Verträge Warehouse=Warenlager Warehouses=Warenlager WarehouseOpened=Lager aktiv @@ -84,15 +84,15 @@ ContractStatusToRun=zu bearbeiten ContractNotRunning=Dieser Vertrag wird nicht bearbeitet ErrorProductAlreadyExists=Ein Produkt mit Artikel Nr. %s existiert bereits. ErrorProductBadRefOrLabel=Für Artikel Nr. oder Bezeichnung wurde ein ungültiger Wert eingegeben. -ErrorProductClone=Beim Duplizieren des Produkts oder der Dienstleistung ist ein Problem aufgetreten +ErrorProductClone=Beim Duplizieren des Produkts oder der Leistung ist ein Problem aufgetreten ErrorPriceCantBeLowerThanMinPrice=Fehler - Preis darf nicht unter dem Minimalpreis liegen. Suppliers=Lieferanten SupplierRef=Lieferanten-Artikelnummer ShowProduct=Produkt anzeigen -ShowService=Dienstleistung anzeigen -ProductsAndServicesArea=Produkt-und Dienstleistungs-Übersicht +ShowService=Leistung anzeigen +ProductsAndServicesArea=Produkt- und Leistungsübersicht ProductsArea=Produktübersicht -ServicesArea=Dienstleistungs-Übersicht +ServicesArea=Leistungs-Übersicht AddToMyProposals=Zu meinen Angebote hinzufügen AddToOtherProposals=Zu Angeboten Anderer hinzufügen AddToMyBills=Zu meinen Rechnungen hinzufügen @@ -112,9 +112,9 @@ BarcodeType=Barcode-Typ SetDefaultBarcodeType=Wählen Sie den standardmäßigen Barcode-Typ BarcodeValue=Barcode-Wert NoteNotVisibleOnBill=Anmerkung (nicht sichtbar auf Rechnungen, Angeboten,...) -CreateCopy=Kopie erstellen +CreateCopy=erstelle Kopie ServiceLimitedDuration=Ist die Erringung einer Dienstleistung zeitlich beschränkt: -MultiPricesAbility=Mehrere Preisstufen pro Produkt/Dienstleistung +MultiPricesAbility=Mehrere Preisstufen pro Produkt/Leistung MultiPricesNumPrices=Anzahl Preise MultiPriceLevelsName=Preiskategorien AssociatedProductsAbility=Untergeordnete Produkte aktivieren @@ -132,17 +132,17 @@ AddDel=Hinzufügen/Löschen Quantity=Stückzahl NoMatchFound=Kein Eintrag gefunden ProductAssociationList=Liste der verknüpften Produkte/Leistungen: Name des Produkts/der Leistung (Stückzahl) -ProductParentList=Liste der Produkte / Dienstleistungen mit diesem Produkt als Bestandteil +ProductParentList=Liste der Produkte/Leistungen mit diesem Produkt als Bestandteil ErrorAssociationIsFatherOfThis=Eines der ausgewählten Produkte ist Elternteil des aktuellen Produkts -DeleteProduct=Produkt/Dienstleistung löschen +DeleteProduct=Produkt/Leistung löschen ConfirmDeleteProduct=Möchten Sie dieses Produkt/Leistung wirklich löschen? -ProductDeleted=Produkt/Dienstleistung "%s" aus der Datenbank gelöscht. +ProductDeleted=Produkt/Leistung "%s" aus der Datenbank gelöscht. DeletePicture=Ein Bild löschen ConfirmDeletePicture=Möchten Sie dieses Bild wirklich löschen? ExportDataset_produit_1=Produkte -ExportDataset_service_1=Dienstleistungen +ExportDataset_service_1=Leistungen ImportDataset_produit_1=Produkte -ImportDataset_service_1=Dienstleistungen +ImportDataset_service_1=Leistungen DeleteProductLine=Produktlinie löschen ConfirmDeleteProductLine=Möchten Sie diese Position wirklich löschen? NoProductMatching=Kein Produkt/Leistung entspricht Ihren Suchkriterien @@ -159,14 +159,14 @@ DiscountQtyMin=Standard-Rabatt für die Menge NoPriceDefinedForThisSupplier=Einkaufskonditionen für diesen Hersteller noch nicht definiert NoSupplierPriceDefinedForThisProduct=Einkaufskonditionen für dieses Produkt noch nicht definiert RecordedProducts=Erfasste Produkte -RecordedServices=Erfasste Dienstleistungen +RecordedServices=Erfasste Leistungen RecordedProductsAndServices=Erfasste Produkte/Leistungen PredefinedProductsToSell=Vordefinierte Verkaufs-Produkte -PredefinedServicesToSell=Vordefinierte Dienstleistungen zum Verkauf -PredefinedProductsAndServicesToSell=Vordefinierte Verkaufs-Produkte/-Dienstleistungen +PredefinedServicesToSell=Vordefinierte Leistungen für Verkauf +PredefinedProductsAndServicesToSell=Vordefinierte Produkte/Leistungen für Verkauf PredefinedProductsToPurchase=Vordefinierte Einkaufs-Produkte -PredefinedServicesToPurchase=Vordefinierte Dienstleistungen zum Einkauf -PredefinedProductsAndServicesToPurchase=Vordefinierte Einkaufs-Produkte/-Dienstleistungen +PredefinedServicesToPurchase=Vordefinierte Leistungen für Einkauf +PredefinedProductsAndServicesToPurchase=Vordefinierte Produkte/Leistungen für Einkauf GenerateThumb=Erzeuge Vorschaubild ProductCanvasAbility=Verwende spezielle "canvas" Add-Ons ServiceNb=Leistung #%s @@ -179,12 +179,12 @@ CloneProduct=Produkt/Leistung duplizieren ConfirmCloneProduct=Möchten Sie die Leistung %s wirklich duplizieren? CloneContentProduct=Allgemeine Informationen des Produkts/Leistungen duplizieren ClonePricesProduct=Allgemeine Informationen und Preise duplizieren -CloneCompositionProduct=Clone packaged product/services +CloneCompositionProduct=Clone gebündelte Produkte/Services ProductIsUsed=Produkt in Verwendung NewRefForClone=Artikel-Nr. des neuen Produkts/Leistungen CustomerPrices=Kundenpreise SuppliersPrices=Lieferantenpreise -SuppliersPricesOfProductsOrServices=Lieferanten-Preise (für Produkte oder Dienstleistungen) +SuppliersPricesOfProductsOrServices=Lieferanten-Preise (für Produkte oder Leistungen) CustomCode=Interner Code CountryOrigin=Urspungsland HiddenIntoCombo=In ausgewählten Listen nicht anzeigen @@ -193,30 +193,30 @@ ProductCodeModel=Vorlage für Produktreferenz ServiceCodeModel=Vorlage für Dienstleistungs-Referenz AddThisProductCard=Produktkarte erstellen HelpAddThisProductCard=Dies gibt ihnen die Möglichkeit, ein Produkt zu erstellen oder zu duplizieren wenn es noch nicht existiert. -AddThisServiceCard=Dienstleistungs-Karte erstellen +AddThisServiceCard=Leistungs-Karte erstellen HelpAddThisServiceCard=Dies gibt ihnen die Möglichkeit, eine Dienstleistung zu erstellen oder zu duplizieren wenn sie noch nicht existiert. CurrentProductPrice=Aktueller Preis -AlwaysUseNewPrice=Immer aktuellen Preis des Produkts/Dienstleistung nutzen +AlwaysUseNewPrice=Immer aktuellen Preis von Produkt/Leistung nutzen AlwaysUseFixedPrice=Festen Preis nutzen -PriceByQuantity=Different prices by quantity +PriceByQuantity=Unterschiedliche Preise nach Menge PriceByQuantityRange=Bereich der Menge -ProductsDashboard=Produkt- und Dienstleistungs-Zusammenfassung +ProductsDashboard=Produkt- und Leistungs-Zusammenfassung UpdateOriginalProductLabel=Ursprüngliches Label verändern HelpUpdateOriginalProductLabel=Gibt die Möglichkeit, den Namen des Produkts zu bearbeiten ### composition fabrication -Building=Production and items dispatchment +Building=Herstellung Build=Produzieren -BuildIt=Produziere und Versende +BuildIt=produzieren und versenden BuildindListInfo=Verfügbare Menge zur Produktion pro Lager (auf 0 setzen um keine weitere Aktion durchzuführen) QtyNeed=Menge -UnitPmp=Net unit VWAP -CostPmpHT=Net total VWAP +UnitPmp=Einzelpreis +CostPmpHT=Netto Einkaufspreis ProductUsedForBuild=Automatisch für Produktion verbraucht ProductBuilded=Produktion fertiggestellt ProductsMultiPrice=Produkt Multi-Preis -ProductsOrServiceMultiPrice=Kunden-Preise (für Produkte oder Dienstleistungen, Multi-Preise) -ProductSellByQuarterHT=Products turnover quarterly VWAP -ServiceSellByQuarterHT=Services turnover quarterly VWAP +ProductsOrServiceMultiPrice=Kunden-Preise (für Produkte oder Leistungen, Multi-Preise) +ProductSellByQuarterHT=Umsatz Produkte pro Quartal +ServiceSellByQuarterHT=Umsatz Services pro Quartal Quarter1=1. Quartal Quarter2=2. Quartal Quarter3=3. Quartal @@ -233,37 +233,37 @@ DefinitionOfBarCodeForProductNotComplete=Barcode-Typ oder -Wert bei Produkt %s u DefinitionOfBarCodeForThirdpartyNotComplete=Barcode-Typ oder -Wert bei Partner %s unvollständig. 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) +ResetBarcodeForAllRecords=Definieren Sie den Barcode-Wert für alle Datensätze (das auch die Barcode-Werte bereits von neuen definiert Reset) PriceByCustomer=Verschiedene Kundenpreise -PriceCatalogue=Einzigartiger Preis pro Produkt/Dienstleistung -PricingRule=Rules for customer prices +PriceCatalogue=Einzigartiger Preis pro Produkt/Leistung +PricingRule=Preisregel für Kundenpreise AddCustomerPrice=Preis je Kunde hinzufügen ForceUpdateChildPriceSoc=Lege den gleichen Preis für Kunden-Tochtergesellschaften fest -PriceByCustomerLog=Price by customer log +PriceByCustomerLog=Preis nach Kunde MinimumPriceLimit=Minimaler Preis kann nicht kleiner als %s sein 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 +PriceExpressionEditor=Preis Ausdrucks Editor +PriceExpressionSelected=Ausgewählter Preis Ausdruck +PriceExpressionEditorHelp1="Preis = 2 + 2" oder "2 + 2" für die Einstellung der Preis. \nVerwende ; um Ausdrücke zu trennen 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 +PriceExpressionEditorHelp5=verfügbare globale Werte: +PriceMode=Preisfindungs-Methode PriceNumeric=Nummer DefaultPrice=Standardpreis -ComposedProductIncDecStock=Increase/Decrease stock on parent change -ComposedProduct=Sub-product -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 +ComposedProductIncDecStock=Erhöhen/verringern Lagerbestand bei verknüpften Produkten +ComposedProduct=Teilprodukt +MinSupplierPrice=Minimaler Einkaufspreis +DynamicPriceConfiguration=Dynamische Preis Konfiguration +GlobalVariables=Globale Variablen +GlobalVariableUpdaters=Globale Variablen aktualisieren +GlobalVariableUpdaterType0=JSON Daten +GlobalVariableUpdaterHelp0=Analysiert JSON-Daten von angegebener URL, VALUE gibt den Speicherort des entsprechenden Wertes, +GlobalVariableUpdaterHelpFormat0=Format {"URL": "http://example.com/urlofjson", "VALUE": "array1, array2, Targetvalue"} +GlobalVariableUpdaterType1=WebService-Daten +GlobalVariableUpdaterHelp1=Analysiert WebService Daten aus angegebenen URL, NS gibt den Namespace, VALUE gibt den Speicherort der entsprechende Wert sollte DATA die Daten enthalten, zu senden und Methode ist der Aufruf von WS-Methode +GlobalVariableUpdaterHelpFormat1=Format {"URL": "http://example.com/urlofws", "VALUE": "Array, Targetvalue", "NS": "http://example.com/urlofns", "METHOD": " myWSMethod "," DATA ": {" Your ":" data "to: "Send"}} +UpdateInterval=Update-Intervall (Minuten) +LastUpdated=zuletzt verändert +CorrectlyUpdated=erfolgreich aktualisiert diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang index 94a6592d4eb39..c10a451e94097 100644 --- a/htdocs/langs/de_DE/projects.lang +++ b/htdocs/langs/de_DE/projects.lang @@ -8,12 +8,13 @@ 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. +ProjectsPublicTaskDesc=Diese Ansicht ist beschränkt auf Projekt und Aufgaben bei welchen Sie über Leserechte verfügen. 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). +OnlyOpenedProject=Nur geöffnete Projekte sind sichtbar (Projekte im Status Entwurf oder geschlossenen sind nicht sichtbar). 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). +AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. ProjectsArea=Projektübersicht NewProject=Neues Projekt AddProject=Projekt erstellen @@ -31,8 +32,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 +TimeSpentByYou=Dein Zeitaufwand +TimeSpentByUser=Zeitaufwand von Benutzer ausgegeben TimesSpent=Zeitaufwände RefTask=Aufgaben-Nr. LabelTask=Aufgabenbezeichnung @@ -71,8 +72,8 @@ 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 -ListExpenseReportsAssociatedProject=List of expense reports associated with the project -ListDonationsAssociatedProject=List of donations associated with the project +ListExpenseReportsAssociatedProject=Liste der mit diesem Projekt verknüpften Spesenabrechnungen +ListDonationsAssociatedProject=Liste der mit diesem Projekt verbundenen Spenden ListActionsAssociatedProject=Liste der mit diesem Projekt verknüpften Maßnahmen ActivityOnProjectThisWeek=Projektaktivitäten dieser Woche ActivityOnProjectThisMonth=Projektaktivitäten dieses Monats @@ -107,7 +108,7 @@ CloneTasks=Dupliziere Aufgaben CloneContacts=Dupliziere Kontakte CloneNotes=Dupliziere Hinweise CloneProjectFiles=Dupliziere verbundene Projektdateien -CloneTaskFiles=Clone task(s) joined files (if task(s) cloned) +CloneTaskFiles=Aufgabe (n) clonen beigetreten Dateien (falls Aufgabe (n) geklont) CloneMoveDate=Projekt / Aufgaben Daten vom aktuellen Zeitpunkt updaten? ConfirmCloneProject=Möchten Sie dieses Projekt wirklich duplizieren? ProjectReportDate=Passe Aufgaben-Datum dem Projekt-Startdatum an @@ -133,13 +134,13 @@ UnlinkElement=Verknüpfung zu Element aufheben DocumentModelBaleine=Eine vollständige Projektberichtsvorlage (Logo, uwm.) PlannedWorkload=Geplante Auslastung PlannedWorkloadShort=Workload -WorkloadOccupation=Workload assignation +WorkloadOccupation=Workloadzuordnung 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 -InputPerDay=Input per day -InputPerWeek=Input per week -InputPerAction=Input per action -TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s +InputPerDay=Eingabe pro Tag +InputPerWeek=Eingabe pro Woche +InputPerAction=Eingabe pro Aktion +TimeAlreadyRecorded=Zeitaufwand für diese Aufgabe/Tag und Benutzer %s bereits aufgenommen diff --git a/htdocs/langs/de_DE/propal.lang b/htdocs/langs/de_DE/propal.lang index dd29ee2178390..99a6577b352f7 100644 --- a/htdocs/langs/de_DE/propal.lang +++ b/htdocs/langs/de_DE/propal.lang @@ -16,9 +16,9 @@ Prospect=Lead ProspectList=Liste der Leads DeleteProp=Angebot löschen ValidateProp=Angebot freigeben -AddProp=Angebot hinzufügen +AddProp=Angebot erstellen ConfirmDeleteProp=Möchten Sie dieses Angebot wirklich löschen? -ConfirmValidateProp=Möchten Sie dieses Angebots wirklich freigeben? +ConfirmValidateProp=Möchten Sie dieses Angebot %s wirklich freigeben? LastPropals=Die letzten %s bearbeiteten Angebote LastClosedProposals=Die letzten %s abgeschlossenen Angebote LastModifiedProposals=Die letzen %s bearbeiteten Angebote @@ -55,8 +55,6 @@ NoOpenedPropals=Keine offenen Angebote NoOtherOpenedPropals=Keine offene Angebote Dritter RefProposal=Angebots-Nr. SendPropalByMail=Angebot per E-Mail senden -FileNotUploaded=Datei wurde nicht hochgeladen -FileUploaded=Datei wurde erfolgreich hochgeladen AssociatedDocuments=Dokumente mit Bezug zum Angebot: ErrorCantOpenDir=Verzeichnis kann nicht geöffnet werden DatePropal=Angebotsdatum @@ -73,7 +71,7 @@ OtherPropals=Andere Angebote AddToDraftProposals=Zu Angebots-Entwurf hinzufügen NoDraftProposals=Keine Angebotsentwürfe CopyPropalFrom=Erstelle neues Angebot durch Kopieren eines vorliegenden Angebots -CreateEmptyPropal=Erstelle leeres Angebot oder aus der Liste der Produkte/Dienstleistungen +CreateEmptyPropal=Erstelle leeres Angebot oder aus der Liste der Produkte/Leistungen DefaultProposalDurationValidity=Standardmäßige Gültigkeitsdatuer (Tage) UseCustomerContactAsPropalRecipientIfExist=Falls vorhanden die Adresse des Partnerkontakts statt der Partneradresse verwenden ClonePropal=Angebot duplizieren @@ -98,5 +96,5 @@ TypeContact_propal_external_CUSTOMER=Partnerkontakt für Angebot DocModelAzurDescription=Eine vollständige Angebotsvorlage (Logo, uwm.) DocModelJauneDescription=Angebotsvorlage DefaultModelPropalCreate=Erstellung Standardvorlage -DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced) +DefaultModelPropalToBill=Standard-Template, wenn Sie ein Angebot schließen wollen (zur Verrechung) DefaultModelPropalClosed=Standard Schablone wenn sie ein Geschäftsangebot schließen wollen. (ohne Rechnung) diff --git a/htdocs/langs/de_DE/sendings.lang b/htdocs/langs/de_DE/sendings.lang index 549d40885e0eb..7de0830fadd75 100644 --- a/htdocs/langs/de_DE/sendings.lang +++ b/htdocs/langs/de_DE/sendings.lang @@ -1,36 +1,36 @@ # Dolibarr language file - Source file is en_US - sendings RefSending=Versand Nr. -Sending=Sendung -Sendings=Sendungen -AllSendings=All Shipments -Shipment=Sendung +Sending=Auslieferung +Sendings=Auslieferungen +AllSendings=Alle Lieferungen +Shipment=Versand Shipments=Lieferungen -ShowSending=Zeige Sendung +ShowSending=Zeige Versand Receivings=Beleg SendingsArea=Versandübersicht ListOfSendings=Versandliste SendingMethod=Versandart SendingReceipt=Versandschein -LastSendings=Letzte %s Sendungen -SearchASending=Suche Sendung +LastSendings=Letzte %s Auslieferung +SearchASending=Suche Auslieferung StatisticsOfSendings=Versandstatistik -NbOfSendings=Anzahl der Sendungen -NumberOfShipmentsByMonth=Anzahl der Sendungen nach Monaten -SendingCard=Sendungs-Karte -NewSending=Neue Sendung -CreateASending=Erzeuge eine Sendung -CreateSending=Sendung erzeugen +NbOfSendings=Anzahl Auslieferungen +NumberOfShipmentsByMonth=Anzahl Auslieferungen nach Monat +SendingCard=Auslieferungen +NewSending=Neue Auslieferung +CreateASending=Erstelle Auslieferung +CreateSending=Auslieferung erstellen QtyOrdered=Bestellmenge QtyShipped=Liefermenge QtyToShip=Versandmenge QtyReceived=Erhaltene Menge -KeepToShip=Remain to ship -OtherSendingsForSameOrder=Weitere Sendungen zu dieser Bestellung +KeepToShip=Zum Versand behalten +OtherSendingsForSameOrder=Weitere Lieferungen zu dieser Bestellung DateSending=Datum des Versands DateSendingShort=Versanddatum -SendingsForSameOrder=Sendungen zu dieser Bestellung -SendingsAndReceivingForSameOrder=Sendungen und Warenerhalt zu dieser Bestellung -SendingsToValidate=Freizugebende Sendungen +SendingsForSameOrder=Lieferungen zu dieser Bestellung +SendingsAndReceivingForSameOrder=An- und Auslieferungen zu dieser Bestellung +SendingsToValidate=Freizugebende Auslieferungen StatusSendingCanceled=Storniert StatusSendingDraft=Entwurf StatusSendingValidated=Freigegeben (Artikel versandfertig oder bereits versandt) @@ -39,14 +39,14 @@ StatusSendingCanceledShort=Storno StatusSendingDraftShort=Entwurf StatusSendingValidatedShort=Freigegeben StatusSendingProcessedShort=Fertig -SendingSheet=Sendungs Blatt +SendingSheet=Auslieferungen Carriers=Spediteure Carrier=Spediteur CarriersArea=Spediteursübersicht NewCarrier=Neuer Spediteur -ConfirmDeleteSending=Möchten Sie diese Sendung wirklich löschen? -ConfirmValidateSending=Möchten Sie diese Sendung wirklich freigeben? -ConfirmCancelSending=Möchten Sie diese Sendung wirklich verwerfen? +ConfirmDeleteSending=Möchten Sie diese Lieferung wirklich löschen? +ConfirmValidateSending=Möchten Sie diese Auslieferung %s wirklich freigeben? +ConfirmCancelSending=Sind Sie sicher, dass Sie diese Auslieferung stornieren wollen? GenericTransport=Generischer Transport Enlevement=Vom Kunden erhalten DocumentModelSimple=Einfache Dokumentvorlage @@ -56,12 +56,12 @@ StatsOnShipmentsOnlyValidated=Versandstatistik (nur Freigegebene). Das Datum ist DateDeliveryPlanned=Geplantes Zustellungsdatum DateReceived=Datum der Zustellung SendShippingByEMail=Verand per E-Mail -SendShippingRef=Abgabe der Sendung %s -ActionsOnShipping=Anmerkungen zur Sendung -LinkToTrackYourPackage=Link zur Sendungsnachverfolgung -ShipmentCreationIsDoneFromOrder=Aktuell ist die Erstellung der neuen Sendung über die Bestellkarte erfolgt. -RelatedShippings=Ähnliche Sendungen -ShipmentLine=Sendungszeilen +SendShippingRef=Versendung der Auslieferung %s +ActionsOnShipping=Hinweis zur Lieferung +LinkToTrackYourPackage=Link zur Paket- bzw. Sendungsverfolgung +ShipmentCreationIsDoneFromOrder=Im Moment wurde eine neue Auslieferung von der Bestellung erfolgt. +RelatedShippings=Ähnliche Auslieferungen +ShipmentLine=Zeilen Lieferschein CarrierList=Liste der Transporter SendingRunning=Die Produktion von dem bestellten Kundenaufträge SuppliersReceiptRunning=Produkt aus Lieferantenbestellung @@ -83,4 +83,4 @@ SumOfProductWeights=Summe der Produktegewichte # warehouse details DetailWarehouseNumber= Warenlager-Details -DetailWarehouseFormat= W:%s (Qty : %d) +DetailWarehouseFormat= W:%s (Menge : %d) diff --git a/htdocs/langs/de_DE/stocks.lang b/htdocs/langs/de_DE/stocks.lang index ec7c2010c6a46..b375868359c21 100644 --- a/htdocs/langs/de_DE/stocks.lang +++ b/htdocs/langs/de_DE/stocks.lang @@ -11,11 +11,12 @@ WarehouseSource=Ursprungslager WarehouseSourceNotDefined=Keine Lager definiert, AddOne=Hinzufügen WarehouseTarget=Ziellager -ValidateSending=Sendung freigeben -CancelSending=Sendung abbrechen -DeleteSending=Sendung löschen +ValidateSending=Lieferung freigeben +CancelSending=Lieferung abbrechen +DeleteSending=Lieferung löschen Stock=Warenbestand Stocks=Warenbestände +StocksByLotSerial=Stock by lot/serial Movement=Lagerbewegung Movements=Lagerbewegungen ErrorWarehouseRefRequired=Warenlager-Referenz erforderlich @@ -32,7 +33,7 @@ LastMovement=Letzte Bewegung LastMovements=Letzte Bewegungen Units=Einheiten Unit=Einheit -StockCorrection=Lageranpassung +StockCorrection=Lagerstandsanpassung StockTransfer=Lagerbewegung StockMovement=Lagerbewegung StockMovements=Lagerbewegungen @@ -47,10 +48,10 @@ PMPValue=Gewichteter Warenwert PMPValueShort=DSWP EnhancedValueOfWarehouses=Lagerwert UserWarehouseAutoCreate=Beim Anlegen eines Benutzers automatisch neues Warenlager erstellen -IndependantSubProductStock=Product stock and subproduct stock are independant +IndependantSubProductStock=Produkt Lager und Unterprodukt Lager sind unabhängig QtyDispatched=Menge -QtyDispatchedShort=Qty dispatched -QtyToDispatchShort=Qty to dispatch +QtyDispatchedShort=Menge versandt +QtyToDispatchShort=Menge zu versenden OrderDispatch=Bestellabwicklung RuleForStockManagementDecrease=Regel für Lagerstandsanpassung (Verringerung) RuleForStockManagementIncrease=Regel für Lagerstandsanpassung (Erhöhung) @@ -62,7 +63,7 @@ ReStockOnValidateOrder=Erhöhung der realen Bestände auf Bestellungen stellt fe ReStockOnDispatchOrder=Reale Bestände auf manuelle Dispatching in Hallen, nach Erhalt Lieferanten bestellen ReStockOnDeleteInvoice=Erhöhung der tatsächlichen Bestände bei Löschung von Rechnungen OrderStatusNotReadyToDispatch=Auftrag wurde noch nicht oder nicht mehr ein Status, der Erzeugnisse auf Lager Hallen Versand ermöglicht. -StockDiffPhysicTeoric=Explanation for difference between physical and theoretical stock +StockDiffPhysicTeoric=Begründung für Differenz zwischen Inventurbestand und Lagerbestand NoPredefinedProductToDispatch=Keine vordefinierten Produkte für dieses Objekt. Also kein Versand im Lager erforderlich ist. DispatchVerb=Versand StockLimitShort=Alarmschwelle @@ -78,6 +79,7 @@ IdWarehouse=Warenlager ID DescWareHouse=Beschreibung Warenlager LieuWareHouse=Standort Warenlager WarehousesAndProducts=Warenlager und Produkte +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=Gewichteter Durchschnitts-Einkaufspreis AverageUnitPricePMP=Gewichteter Durchschnitts-Eingangspreis SellPriceMin=Verkaufspreis @@ -111,24 +113,27 @@ 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=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=Das ist eine Liste aller geöffneten Lieferantenaufträge einschließlich vordefinierter Produkte. Nur geöffnete Bestellungen mit vordefinierten Produkten, so dass möglicherweise Lager betreffen, sind hier sichtbar. 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) MassMovement=Massenbewegung MassStockMovement=Massen-Umlagerung SelectProductInAndOutWareHouse=Wählen Sie ein Produkt, eine Menge, ein Quellen- und ein Ziel-Lager und klicken Sie dann auf "%s". Sobald Sie dies für alle erforderlichen Bewegungen getan haben, klicken Sie auf "%s". -RecordMovement=Record transfert -ReceivingForSameOrder=Receipts for this order +RecordMovement=Eintrag verschoben +ReceivingForSameOrder=Empfänger zu dieser Bestellung StockMovementRecorded=aufgezeichnete Lagerbewegungen RuleForStockAvailability=Regeln für Bestands-Verfügbarkeit StockMustBeEnoughForInvoice=Ausreichender Lagerbestand ist erforderlich, um das Produkt / den Service einer Rechnung hinzu zu fügen StockMustBeEnoughForOrder=Ausreichender Lagerbestand ist erforderlich, um das Produkt / den Service einer Bestellung hinzu zu fügen StockMustBeEnoughForShipment= Ausreichender Lagerbestand ist erforderlich, um das Produkt / den Service einer Lieferung hinzu zu fügen -MovementLabel=Label of movement -InventoryCode=Movement or inventory code -IsInPackage=Contained into package +MovementLabel=Titel der Lagerbewegung +InventoryCode=Bewegungs- oder Bestandscode +IsInPackage=In Paket enthalten 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. +MovementCorrectStock=Lager korrigiert für Produkt %s +MovementTransferStock=Umlagerung des Produkt %s in ein anderes Lager +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=Keine anstehenden Eingänge aufgrund geöffneter Lieferantenbestellungen +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/de_DE/suppliers.lang b/htdocs/langs/de_DE/suppliers.lang index 390acc8f1343a..ed15b19c592ec 100644 --- a/htdocs/langs/de_DE/suppliers.lang +++ b/htdocs/langs/de_DE/suppliers.lang @@ -29,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=Deny this order +DenyingThisOrder=Bestellung ablehnen ConfirmDenyingThisOrder=Möchten Sie diese Bestellung wirklich ablehnen %s ? ConfirmCancelThisOrder=Möchten Sie diese Bestellung wirklich verwerfen %s ? AddCustomerOrder=Erzeuge Kundenbestellung @@ -41,6 +41,6 @@ NoneOrBatchFileNeverRan=Keiner oder Batch-Job %s wurde nie ausgeführt SentToSuppliers=An Lieferanten geschickt 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) +NbDaysToDelivery=Lieferverzug in Tagen +DescNbDaysToDelivery=Max. Verspätungstoleranz in Tage für Lieferung +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/de_DE/trips.lang b/htdocs/langs/de_DE/trips.lang index 2ea6735cd00e3..84a4eef229f0c 100644 --- a/htdocs/langs/de_DE/trips.lang +++ b/htdocs/langs/de_DE/trips.lang @@ -1,126 +1,102 @@ # 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=Spesenabrechnung +ExpenseReports=Spesenabrechnungen Hinweis +Trip=Spesenabrechnung +Trips=Spesenabrechnungen +TripsAndExpenses=Reise- und Spesenabrechnungen +TripsAndExpensesStatistics=Reise- und Spesen Statistik +TripCard=Reisekosten Karte +AddTrip=Reisekostenabrechnung erstellen +ListOfTrips=Liste Reisekostenabrechnungen ListOfFees=Liste der Spesen -NewTrip=New expense report +NewTrip=neue Reisekostenabrechnung CompanyVisited=Besuchter Partner Kilometers=Kilometerstand FeesKilometersOrAmout=Kilometergeld oder Spesenbetrag -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=Spesenabrechnung löschen +ConfirmDeleteTrip=Möchten Sie diese Spesenabrechnung wirklich löschen? +ListTripsAndExpenses=Liste Reise- und Spesenabrechnungen +ListToApprove=Warten auf Bestätigung +ExpensesArea=Spesenabrechnungen +SearchATripAndExpense=Suche nach einer Spesenabrechnung 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 ? +AnyOtherInThisListCanValidate=Person für die Validierung zu informieren . +TripSociete=Partner +TripSalarie=Mitarbeiter +TripNDF=Hinweise Spesenabrechnung +DeleteLine=Enferne eine Zeile von der Spesenabrechnung +ConfirmDeleteLine=Möchten Sie diese Zeile wirklich löschen? PDFStandardExpenseReports=Standard template to generate a PDF document for expense report -ExpenseReportLine=Expense report line +ExpenseReportLine=Spesenabrechnung Zeile TF_OTHER=Andere -TF_TRANSPORTATION=Transportation +TF_TRANSPORTATION=Spedition TF_LUNCH=Essen -TF_METRO=Metro -TF_TRAIN=Train +TF_METRO=S- und U-Bahn +TF_TRAIN=Bahn TF_BUS=Bus -TF_CAR=Car -TF_PEAGE=Toll -TF_ESSENCE=Fuel -TF_HOTEL=Hostel +TF_CAR=Auto +TF_PEAGE=Mautgebühr +TF_ESSENCE=Kraftstoff +TF_HOTEL=Herberge 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=Sie haben bereits eine andere Spesenabrechnung in einem ähnliche Datumsbereich erstellt. +ListTripsAndExpenses=Liste Reise- und Spesenabrechnungen +AucuneNDF=Keine Spesenabrechnungen für diese Kriterien gefunden +AucuneLigne=Es wurde noch keine Spesenabrechnung erstellt. +AddLine=Neue Zeile hinzufügen +AddLineMini=Hinzufügen -Date_DEBUT=Period date start -Date_FIN=Period date end -ModePaiement=Payment mode -Note=Note -Project=Project +Date_DEBUT=Beginndatum +Date_FIN=Enddatum +ModePaiement=Zahlungsart +Note=Hinweis +Project=Projekt VALIDATOR=User to inform for approbation -VALIDOR=Approved by -AUTHOR=Recorded by -AUTHORPAIEMENT=Paied by -REFUSEUR=Denied by -CANCEL_USER=Canceled by +VALIDOR=genehmigt durch +AUTHOR=gespeichert von +AUTHORPAIEMENT=einbezahlt von +REFUSEUR=abgelehnt durch +CANCEL_USER=verworfen von -MOTIF_REFUS=Reason -MOTIF_CANCEL=Reason +MOTIF_REFUS=Grund +MOTIF_CANCEL=Grund -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=Datum Ablehnung +DATE_SAVE=Freigabedatum +DATE_VALIDE=Freigabedatum +DATE_CANCEL=Stornodatum +DATE_PAIEMENT=Zahlungsdatum -Deny=Deny -TO_PAID=Pay -BROUILLONNER=Reopen -SendToValid=Sent to approve -ModifyInfoGen=Edit -ValidateAndSubmit=Validate and submit for approval +TO_PAID=bezahlen +BROUILLONNER=entwerfen +SendToValid=senden zu genehmigen +ModifyInfoGen=Bearbeiten +ValidateAndSubmit=Validieren und zur Genehmigung einreichen -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=Sie sind nicht berechtigt, diese Spesennabrechnung zu genehmigen +NOT_AUTHOR=Sie sind nicht der Autor dieser Spesenabrechnung. Vorgang abgebrochen. -RefuseTrip=Deny an expense report -ConfirmRefuseTrip=Are you sure you want to deny this expense report ? +RefuseTrip=Verweigern eine Spesenabrechnung +ConfirmRefuseTrip=Möchten Sie diese Spesenabrechnung wirklich ablehnen? -ValideTrip=Approve expense report -ConfirmValideTrip=Are you sure you want to approve this expense report ? +ValideTrip=Genehmigen Spesenabrechnung +ConfirmValideTrip=Sind Sie sicher, dass diese Spesenabrechnung genehmigen möchten? -PaidTrip=Pay an expense report -ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? +PaidTrip=Spesenabrechnung bezahlen +ConfirmPaidTrip=Möchten Sie den Status dieser Reisekostenabrechnung auf "Bezahlt" ändern? -CancelTrip=Cancel an expense report -ConfirmCancelTrip=Are you sure you want to cancel this expense report ? +CancelTrip=Abrechen einer Spesenabrechnung +ConfirmCancelTrip=Möchten Sie diese Spesenabrechnung wirklich abbrechen? -BrouillonnerTrip=Move back expense report to status "Draft"n -ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? +BrouillonnerTrip=Gehen Sie zurück Spesenabrechnung zu Status "Entwurf" +ConfirmBrouillonnerTrip=Möchten Sie den Status dieser Reisekostenabrechnung auf "Entwurf" ändern? -SaveTrip=Validate expense report +SaveTrip=Bestätige Spesenabrechnung 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. +NoTripsToExportCSV=Keine Spesenabrechnung für diesen Zeitraum zu exportieren. diff --git a/htdocs/langs/de_DE/withdrawals.lang b/htdocs/langs/de_DE/withdrawals.lang index 88714db1dc7e0..d31096d2b2026 100644 --- a/htdocs/langs/de_DE/withdrawals.lang +++ b/htdocs/langs/de_DE/withdrawals.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - withdrawals StandingOrdersArea=Dauerauftragsübersicht -CustomersStandingOrdersArea=Dauerauftragsübersicht (Kunden) +CustomersStandingOrdersArea=SEPA-Lastschriftverfahren-Übersicht StandingOrders=Daueraufträge StandingOrder=Dauerauftrag NewStandingOrder=Neuer Dauerauftrag @@ -14,8 +14,8 @@ WithdrawalReceiptShort=Beleg LastWithdrawalReceipts=%s neuste Abbuchungsbelege WithdrawedBills=Abgebuchte Rechnungen WithdrawalsLines=Abbuchungszeilen -RequestStandingOrderToTreat=Request for standing orders to process -RequestStandingOrderTreated=Request for standing orders processed +RequestStandingOrderToTreat=Anfrage für Dauerauftrage zu bearbeiten +RequestStandingOrderTreated=Anfrage für Daueraufträge bearbeitet NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. CustomersStandingOrders=Daueraufträge (Kunden) CustomerStandingOrder=Dauerauftrag (Kunde) diff --git a/htdocs/langs/de_DE/workflow.lang b/htdocs/langs/de_DE/workflow.lang index 10b56ef4b3879..11644cd0e8699 100644 --- a/htdocs/langs/de_DE/workflow.lang +++ b/htdocs/langs/de_DE/workflow.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - admin WorkflowSetup=Workflow Moduleinstellungen -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=Dieses Modul wurde entwickelt um zu verändern das Verhalten von automatischen Aktionen. Standardmäßig ist die Workflow geöffnet (Sie können alles in Ihrer Reihenfolge erledigen). Sie können automatische Vorgänge aktivieren, falls Sie für Sie von Interesse. ThereIsNoWorkflowToModify=Es gibt keine Vorgänge für das aktivierte Modul die Sie ändern können. descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Erstelle eine automatische Kundenbestellung, nachdem ein Angebot unterzeichnet wurde descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Erstelle eine automatische Kundenrechnung, nachdem ein Angebot unterzeichnet wurde diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang index 815220b132463..c6c64032d7fef 100644 --- a/htdocs/langs/el_GR/admin.lang +++ b/htdocs/langs/el_GR/admin.lang @@ -253,10 +253,10 @@ ForDocumentationSeeWiki=Για την τεκμηρίωση χρήστη ή πρ ForAnswersSeeForum=Για οποιαδήποτε άλλη ερώτηση/βοήθεια, μπορείτε να χρησιμοποιήσετε το forum του Dolibarr:
%s HelpCenterDesc1=Αυτή η περιοχή μπορεί να σας βοηθήσει να αποκτήσετε υπηρεσίες βοήθειας στο Dolibarr. HelpCenterDesc2=Κάποια κομμάτια αυτής της υπηρεσίας είναι διαθέσιμα μόνο στα αγγλικά. -CurrentTopMenuHandler=Τωρινός διαμορφωτής πάνω μενού -CurrentLeftMenuHandler=Τωρινός διαμορφωτής αριστερού μενού -CurrentMenuHandler=Τωρινός διαμορφωτής μενού -CurrentSmartphoneMenuHandler=Τωρινός διαμορφωτής μενού για κινητές συσκευές +CurrentTopMenuHandler=Τρέχον πάνω μενού +CurrentLeftMenuHandler=Τρέχον αριστερό μενού +CurrentMenuHandler=Τρέχον μενού +CurrentSmartphoneMenuHandler=Τρέχον μενού για κινητές συσκευές MeasuringUnit=Μονάδα μέτρησης Emails=E-mails EMailsSetup=Διαχείριση E-mails @@ -297,11 +297,12 @@ MenuHandlers=Διαχειριστές μενού MenuAdmin=Επεξεργαστής μενού DoNotUseInProduction=Να μην χρησιμοποιείται για παραγωγή ThisIsProcessToFollow=Αυτό έχει ρυθμιστεί για να επεξεργαστεί: +ThisIsAlternativeProcessToFollow=This is an alternative setup to process: StepNb=Βήμα %s FindPackageFromWebSite=Βρείτε ένα πακέτο που να παρέχει την λειτουργία που επιθυμείτε (για παράδειγμα στο επίσημο %s). DownloadPackageFromWebSite=Μεταφόρτωση πακέτου %s. -UnpackPackageInDolibarrRoot=Αποσυμπίεσε το αρχείο εκεί που βρίσκεται η εγκατάσταση του Dolibarr %s -SetupIsReadyForUse=Η εγκατάσταση τελείωσε και το Dolibarr είναι έτοιμο να χρησιμοποιηθεί με αυτό το νέο μέρος. +UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: %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'
*Αυτές οι γραμμές είναι απενεργοποιημένες με χρήση του χαρακτήρα "#", για να της ενεργοποιήσετε απλά αφαιρέστε το χαρακτήρα. @@ -394,10 +395,10 @@ ExtrafieldParamHelpselect=Η λίστα παραμέτρων θα πρέπει ExtrafieldParamHelpcheckbox=Η λίστα παραμέτρων θα πρέπει να είναι σαν το κλειδί,value

για παράδειγμα :
1,value1
2,value2
3,value3
... 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 +ExtrafieldParamHelpchkbxlst=Λίστα Παραμέτρων που προέρχεται από έναν πίνακα
σύνταξη : 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 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) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Εισάγετε έναν τηλεφωνικό αριθμό για να δημιουργηθεί ένας σύνδεσμος που θα σας επιτρέπει να κάνετε κλήση με το ClickToDial για τον χρήστη %s RefreshPhoneLink=Ανανέωση συνδέσμου @@ -511,14 +512,14 @@ Module1400Name=Accounting Module1400Desc=Accounting management (double parties) Module1520Name=Document Generation Module1520Desc=Mass mail document generation -Module1780Name=Tags/Categories -Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members) +Module1780Name=Ετικέτες/Κατηγορίες +Module1780Desc=Δημιουργήστε ετικέτες/κατηγορίες (προϊόντα, πελάτες, προμηθευτές, επαφές ή μέλη) Module2000Name=WYSIWYG editor Module2000Desc=Allow to edit some text area using an advanced editor Module2200Name=Δυναμικές Τιμές Module2200Desc=Ενεργοποιήστε τη χρήση των μαθηματικών εκφράσεων για τις τιμές Module2300Name=Μενού -Module2300Desc=Scheduled job management +Module2300Desc=Διαχείριση προγραμματισμένων ενεργειών Module2400Name=Ατζέντα Module2400Desc=Events/tasks and agenda management Module2500Name=Electronic Content Management @@ -539,9 +540,9 @@ Module5000Desc=Allows you to manage multiple companies Module6000Name=Ροή εργασίας Module6000Desc=Διαχείρισης Ροών Εργασιών Module20000Name=Αφήστε τη διαχείριση των ερωτήσεων -Module20000Desc=Declare and follow employees leaves requests -Module39000Name=Παρτίδα προϊόντων -Module39000Desc=Batch or serial number, eat-by and sell-by date management on products +Module20000Desc=Δηλώστε και παρακολουθήστε τις αιτήσεις αδειών των εργαζομένων +Module39000Name=Product lot +Module39000Desc=Lot or serial number, eat-by and sell-by date management on products Module50000Name=Paybox Module50000Desc=Ενότητα για να προσφέρει μια σε απευθείας σύνδεση σελίδα πληρωμής με πιστωτική κάρτα με Paybox Module50100Name=Σημείο Πωλήσεων @@ -558,8 +559,6 @@ Module59000Name=Margins Module59000Desc=Module to manage margins Module60000Name=Commissions Module60000Desc=Module to manage commissions -Module150010Name=Αριθμός παρτίδας, κατανάλωση μέχρι ημερομηνία και πώληση μέχρι ημερομηνία. -Module150010Desc=αριθμός παρτίδας, κατανάλωση μέχρι ημερομηνία και πώληση μέχρι ημερομηνία διαχείρηση για προϊόν Permission11=Read customer invoices Permission12=Create/modify customer invoices Permission13=Unvalidate customer invoices @@ -767,10 +766,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 job -Permission23002=Create/update Scheduled job -Permission23003=Delete Scheduled job -Permission23004=Execute Scheduled job +Permission23001=Λεπτομέρειες προγραμματισμένης εργασίας +Permission23002=Δημιουργήστε/ενημερώστε μια προγραμματισμένη εργασία +Permission23003=Διαγράψτε μια προγραμματισμένη εργασία +Permission23004=Εκτελέστε μια προγραμματισμένη εργασία 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 @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, 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=Αναφορές -CalcLocaltax1ES=Πωλήσεις - Αγορές +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Sales - Purchases CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Αγορές +CalcLocaltax2=Purchases CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Πωλήσεις +CalcLocaltax3=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=Ετικέτα στα έγγραφα @@ -1018,14 +1017,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 @@ -1337,6 +1336,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 @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= Default account to use to receive payments by credit c 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management CashDeskYouDidNotDisableStockDecease=Δεν έχετε απενεργοποιήσει μείωση των αποθεμάτων κατά την πραγματοποίηση μιας πώλησης από το σημείο πώλησης "POS". Μια αποθήκη είναι απαραίτητη. ##### Bookmark ##### BookmarkSetup=Bookmark module setup @@ -1616,3 +1617,8 @@ 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 +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" diff --git a/htdocs/langs/el_GR/banks.lang b/htdocs/langs/el_GR/banks.lang index 726182bd6eecf..12c3becee2d5e 100644 --- a/htdocs/langs/el_GR/banks.lang +++ b/htdocs/langs/el_GR/banks.lang @@ -163,3 +163,5 @@ LabelRIB=Ετικέτα BAN NoBANRecord=Καμία εγγραφή BAN DeleteARib=Διαγραφή BAN εγγραφή ConfirmDeleteRib=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή την εγγραφή BAN; +StartDate=Ημερομηνία έναρξης +EndDate=Ημερομηνία λήξης diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang index ee85738b276f5..f14f373d8872b 100644 --- a/htdocs/langs/el_GR/bills.lang +++ b/htdocs/langs/el_GR/bills.lang @@ -74,9 +74,9 @@ PaymentsAlreadyDone=Ιστορικό Πληρωμών PaymentsBackAlreadyDone=Payments back already done PaymentRule=Κανόνας Πληρωμής PaymentMode=Τρόπος Πληρωμής -PaymentTerm=Payment term -PaymentConditions=Payment terms -PaymentConditionsShort=Payment terms +PaymentTerm=Όρος πληρωμής +PaymentConditions=Όροι πληρωμής +PaymentConditionsShort=Όροι πληρωμής PaymentAmount=Σύνολο πληρωμής ValidatePayment=Επικύρωση πληρωμής PaymentHigherThanReminderToPay=Η πληρωμή είναι μεγαλύτερη από το υπόλοιπο @@ -294,10 +294,11 @@ TotalOfTwoDiscountMustEqualsOriginal=Το σύνολο των δύο νέων τ ConfirmRemoveDiscount=Είστε σίγουροι ότι θέλετε να αφαιρέσετε την έκπτωση; RelatedBill=Σχετιζόμενο τιμολόγιο RelatedBills=Σχετιζόμενα τιμολόγια -RelatedCustomerInvoices=Related customer invoices -RelatedSupplierInvoices=Related supplier invoices +RelatedCustomerInvoices=Σχετικά τιμολόγια πελατών +RelatedSupplierInvoices=Σχετικά τιμολόγια προμηθευτών LatestRelatedBill=Τελευταίο σχετικό τιμολόγιο WarningBillExist=Προσοχή, ένα ή περισσότερα τιμολόγια υπάρχουν ήδη +MergingPDFTool=Συγχώνευση εργαλείο PDF # PaymentConditions PaymentConditionShortRECEP=Άμεση @@ -417,17 +418,17 @@ TypeContact_invoice_supplier_external_SERVICE=Αντιπρόσωπος υπηρ # Situation invoices InvoiceFirstSituationAsk=Κατάσταση πρώτου τιμολογίου 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 +InvoiceSituation=Κατάσταση τιμολογίου +InvoiceSituationAsk=Τιμολόγιο που έπεται της κατάστασης +InvoiceSituationDesc=Δημιουργία μιας νέας κατάστασης μετά από μια ήδη υπάρχουσα +SituationAmount=Κατάσταση τιμολογίου ποσό (καθαρό) +SituationDeduction=Αφαίρεση κατάστασης 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. +ModifyAllLines=Τροποποίηση σε όλες τις γραμμές +CreateNextSituationInvoice=Δημιουργήστε την επόμενη κατάσταση +NotLastInCycle=Το τιμολόγιο αυτό δεν είναι το τελευταίο στον κύκλο και δεν πρέπει να τροποποιηθεί. +DisabledBecauseNotLastInCycle=Η επόμενη κατάσταση υπάρχει ήδη. +DisabledBecauseFinal=Η κατάσταση αυτή είναι οριστική. CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation. -NoSituations=No opened situations -InvoiceSituationLast=Final and general invoice +NoSituations=Δεν υπάρχουν ανοιχτές καταστάσεις +InvoiceSituationLast=Τελικό και γενικό τιμολόγιο diff --git a/htdocs/langs/el_GR/boxes.lang b/htdocs/langs/el_GR/boxes.lang index ee96a994ae70e..45d09637caf29 100644 --- a/htdocs/langs/el_GR/boxes.lang +++ b/htdocs/langs/el_GR/boxes.lang @@ -94,3 +94,4 @@ BoxProductDistributionFor=Κατανομή των %s για %s ForCustomersInvoices=Τιμολόγια Πελάτη ForCustomersOrders=Παραγγελίες πελατών ForProposals=Προσφορές +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang index ee9895547349c..16e711c27c738 100644 --- a/htdocs/langs/el_GR/errors.lang +++ b/htdocs/langs/el_GR/errors.lang @@ -159,14 +159,17 @@ ErrorPriceExpression22=Αρνητικό αποτέλεσμα '%s' 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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/langs/el_GR/interventions.lang b/htdocs/langs/el_GR/interventions.lang index 9bc945326670f..60fbdbe60503b 100644 --- a/htdocs/langs/el_GR/interventions.lang +++ b/htdocs/langs/el_GR/interventions.lang @@ -50,4 +50,4 @@ ArcticNumRefModelError=Αποτυχία ενεργοποίησης PacificNumRefModelDesc1=Αριθμός επιστροφής με μορφή %syymm-nnnn όπυ yy το έτος, mm ο μήνας και nnnn μια ακολουθία χωρίς διακοπή και χωρίς επιστροφή στο 0. PacificNumRefModelError=Μια καρτέλα παρέμβασης με $syymm ήδη υπάρχει και δεν είναι συμβατή με αυτή την ακολουθία. Απομακρύνετε την ή μετονομάστε την για να ενεργοποιήσετε το module. PrintProductsOnFichinter=Εκτυπώστε προϊόντα στην κάρτα παρέμβασης -PrintProductsOnFichinterDetails=Για τις παρεμβάσεις που προέρχονται από παραγγελίες +PrintProductsOnFichinterDetails=παρεμβάσεις που προέρχονται από παραγγελίες diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang index f16111aaa0673..c46f6b675599b 100644 --- a/htdocs/langs/el_GR/main.lang +++ b/htdocs/langs/el_GR/main.lang @@ -220,6 +220,7 @@ Next=Επόμ. Cards=Καρτέλες Card=Καρτέλα Now=Τώρα +HourStart=Start hour Date=Ημερομηνία DateAndHour=Ημερομηνία και ώρα DateStart=Ημερομηνία Έναρξης @@ -242,6 +243,8 @@ DatePlanShort=Προγρ/σμένη Ημερ. DateRealShort=Πραγμ. Ημερ. DateBuild=Αναφορά ημερομηνία κατασκευής DatePayment=Ημερομηνία πληρωμής +DateApprove=Approving date +DateApprove2=Approving date (second approval) DurationYear=έτος DurationMonth=μήνας DurationWeek=εβδομάδα @@ -408,6 +411,8 @@ OtherInformations=Άλλες Πληροφορίες Quantity=Ποσότητα Qty=Ποσ. ChangedBy=Τροποποιήθηκε από +ApprovedBy=Approved by +ApprovedBy2=Approved by (second approval) ReCalculate=Επανυπολογισμός ResultOk=Επιτυχία ResultKo=Αποτυχία @@ -696,6 +701,8 @@ SelectElementAndClickRefresh=Επιλέξτε ένα στοιχείο και κ PrintFile=Εκτύπωση του αρχείου %s ShowTransaction=Εμφάνιση συναλλαγών GoIntoSetupToChangeLogo=Πηγαίνετε Αρχική - Ρυθμίσεις - Εταιρία να αλλάξει το λογότυπο ή πηγαίνετε Αρχική - Ρυθμίσεις - Προβολή για απόκρυψη. +Deny=Deny +Denied=Denied # Week day Monday=Δευτέρα Tuesday=Τρίτη diff --git a/htdocs/langs/el_GR/orders.lang b/htdocs/langs/el_GR/orders.lang index 2759e5ab7baf3..38cd385862c3c 100644 --- a/htdocs/langs/el_GR/orders.lang +++ b/htdocs/langs/el_GR/orders.lang @@ -64,8 +64,8 @@ ShipProduct=Ship product Discount=Έκπτωση CreateOrder=Δημιουργία παραγγελίας RefuseOrder=Άρνηση παραγγελίας -ApproveOrder=Approve order -Approve2Order=Approve order (second level) +ApproveOrder=Έγκριση παραγγελίας +Approve2Order=Έγκριση παραγγελίας (δεύτερο επίπεδο) ValidateOrder=Επικύρωση παραγγελίας UnvalidateOrder=Για Unvalidate DeleteOrder=Διαγραφή παραγγελίας @@ -79,7 +79,9 @@ NoOpenedOrders=Δεν υπάρχουν ανοιχτές παραγγελίες NoOtherOpenedOrders=Δεν υπάρχουν άλλες ανοιχτές παραγγελίες NoDraftOrders=Δεν υπάρχουν προσχέδια παραγγελιών OtherOrders=Άλλες παραγγελίες -LastOrders=%s τελευταίες παραγγελίες +LastOrders=Τελευταίες %s παραγγελίες πελατών +LastCustomerOrders=Τελευταίες %s παραγγελίες πελατών +LastSupplierOrders=Τελευταίες %s παραγγελίες προμηθευτών. LastModifiedOrders=Τελευταίες %s τροποποιημένες παραγγελίες LastClosedOrders=Τελυταίες %s κλειστές παραγγελίες AllOrders=Όλες οι παραγγελίες @@ -103,8 +105,8 @@ ClassifyBilled=Χαρακτηρισμός "Τιμολογημένη" ComptaCard=Λογιστική κάρτα DraftOrders=Προσχέδια παραγγελιών RelatedOrders=Σχετικές παραγγελίες -RelatedCustomerOrders=Related customer orders -RelatedSupplierOrders=Related supplier orders +RelatedCustomerOrders=Σχετικές παραγγελίες πελατών +RelatedSupplierOrders=Σχετικές παραγγελιών προμηθευτών OnProcessOrders=Παραγγελίες σε εξέλιξη RefOrder=Κωδ. παραγγελίας RefCustomerOrder=Κωδ. πελάτη παραγγελίας @@ -121,7 +123,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 +FirstApprovalAlreadyDone=Η πρώτη έγκριση ήδη έγινε ##### 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 bcc1ade3821ae..48bee13203338 100644 --- a/htdocs/langs/el_GR/other.lang +++ b/htdocs/langs/el_GR/other.lang @@ -203,6 +203,7 @@ NewKeyWillBe=Το νέο σας κλειδί για να συνδεθείτε μ ClickHereToGoTo=Κάντε κλικ εδώ για να μεταβείτε στο %s YouMustClickToChange=Θα πρέπει πρώτα να κάνετε κλικ στον παρακάτω σύνδεσμο για να επικυρώσει την αλλαγή του κωδικού πρόσβασης ForgetIfNothing=Αν δεν ζητήσατε αυτή την αλλαγή, απλά ξεχάστε αυτό το email. Τα διαπιστευτήριά σας παραμένουν ασφαλή. +IfAmountHigherThan=Εάν το ποσό υπερβαίνει %s ##### Calendar common ##### AddCalendarEntry=Προσθήκη εγγραφής στο ημερολόγιο %s diff --git a/htdocs/langs/el_GR/productbatch.lang b/htdocs/langs/el_GR/productbatch.lang index 400c52b0d5ceb..3175a885086eb 100644 --- a/htdocs/langs/el_GR/productbatch.lang +++ b/htdocs/langs/el_GR/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Χρησιμοποιήστε παρτίδα/σειριακό αριθμό -ProductStatusOnBatch=Ναι (απαιτείται Παρτίδα/σειριακό αριθμό) -ProductStatusNotOnBatch=Όχι (δεν χρησιμοποιείται Παρτίδα/σειριακό αριθμό) +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/serial not used) ProductStatusOnBatchShort=Ναι ProductStatusNotOnBatchShort=Όχι -Batch=Παρτίδα/Σειριακός -atleast1batchfield=Φάτε την ημερομηνία λήξης ή ημερομηνία πώλησης ή τον αριθμό παρτίδας -batch_number=Παρτίδα/Σειριακός αριθμός +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial l_eatby=Φάτε ημερομηνία λήξης l_sellby=Ημερομηνία πώλησης -DetailBatchNumber=Παρτίδα/Λεπτομέρειες σειριακού -DetailBatchFormat=Παρτίδα/Σειριακός: %s - Αφαιρέθηκε από: %s - Πώληση από: %s (Ποσ. : %d) -printBatch=Παρτίδα: %s +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %s printEatby=Eat-by: %s printSellby=Πώληση ανά: %s printQty=Ποσότητα: %d AddDispatchBatchLine=Προσθέστε μια γραμμή για Χρόνο Διάρκειας αποστολής BatchDefaultNumber=Απροσδιόριστο -WhenProductBatchModuleOnOptionAreForced=Όταν το module παρτίδας/σειριακός είναι ενεργοποιημένο, αύξηση/μείωση \nη κατάσταση των αποθεμάτων αναγκάζει την τελευταία επιλογή και δεν μπορούν να τροποποιηθούν. Άλλες επιλογές μπορούν να οριστούν όπως θέλετε. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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=Αυτό το προϊόν δεν χρησιμοποιεί παρτίδα/σειριακό αριθμό diff --git a/htdocs/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang index 71c1c7e7cdb19..72026081d478a 100644 --- a/htdocs/langs/el_GR/projects.lang +++ b/htdocs/langs/el_GR/projects.lang @@ -14,6 +14,7 @@ MyTasksDesc=Η άποψη αυτή περιορίζονται σε έργα ή OnlyOpenedProject=Μόνο τα έργα που είναι ανοιχτά είναι ορατά (έργα που είναι σχέδιο ή κλειστά δεν είναι ορατά) TasksPublicDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα και τα καθήκοντα που επιτρέπεται να διαβάζουν. TasksDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα και τα καθήκοντα (δικαιώματα χρήστη να δώσει δικαίωμα για να δείτε τα πάντα). +AllTaskVisibleButEditIfYouAreAssigned=Όλες οι εργασίες για το συγκεκριμένο έργο είναι ορατές, αλλά μπορείτε να εισάγετε χρόνο μόνο για την εργασία που σας έχει εκχωρηθεί. ProjectsArea=Περιοχή Έργων NewProject=Νέο Έργο AddProject=Δημιουργία έργου diff --git a/htdocs/langs/el_GR/stocks.lang b/htdocs/langs/el_GR/stocks.lang index 438a99de606b9..dcb4885791e1c 100644 --- a/htdocs/langs/el_GR/stocks.lang +++ b/htdocs/langs/el_GR/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Ακύρωση αποστολής DeleteSending=Διαγραφή αποστολή Stock=Χρηματιστήριο Stocks=Αποθέματα +StocksByLotSerial=Stock by lot/serial Movement=Κίνηση Movements=Κινήματα ErrorWarehouseRefRequired=Αποθήκη όνομα αναφοράς απαιτείται @@ -47,10 +48,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,7 +63,7 @@ ReStockOnValidateOrder=Αύξηση πραγματικού αποθεμάτων ReStockOnDispatchOrder=Αύξηση των αποθεμάτων σε πραγματικό εγχειρίδιο αποστολή σε αποθήκες, μετά από σειρά προμηθευτής που λαμβάνει ReStockOnDeleteInvoice=Increase real stocks on invoice deletion OrderStatusNotReadyToDispatch=Παραγγελία δεν έχει ακόμη ή όχι περισσότερο μια κατάσταση που επιτρέπει την αποστολή των προϊόντων σε αποθήκες αποθεμάτων. -StockDiffPhysicTeoric=Explanation for difference between physical and theoretical stock +StockDiffPhysicTeoric=Εξήγηση για τη διαφορά μεταξύ των φυσικών και θεωρητικών αποθεμάτων NoPredefinedProductToDispatch=Δεν προκαθορισμένα προϊόντα για αυτό το αντικείμενο. Έτσι, δεν έχει αποστολή σε απόθεμα είναι απαραίτητη. DispatchVerb=Αποστολή StockLimitShort=Όριο για ειδοποιήσεις @@ -78,6 +79,7 @@ IdWarehouse=Id αποθήκη DescWareHouse=Αποθήκη Περιγραφή LieuWareHouse=Αποθήκη Localisation WarehousesAndProducts=Αποθήκες και τα προϊόντα +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=Μέση σταθμική τιμή εισόδου AverageUnitPricePMP=Μέση σταθμική τιμή εισόδου SellPriceMin=Πώληση Τιμή μονάδας @@ -111,7 +113,7 @@ WarehouseForStockDecrease=Η αποθήκη %s να να χρησιμοπ WarehouseForStockIncrease=Η αποθήκη %s θα χρησιμοποιηθεί για την αύξηση των αποθεμάτων ForThisWarehouse=Για αυτή την αποθήκη ReplenishmentStatusDesc=Αυτή είναι η λίστα όλων των προϊόντων με απόθεμα κάτω από το επιθυμητό απόθεμα (ή χαμηλότερες από την αξία συναγερμού, εφόσον κουτάκι "ειδοποίηση μόνο" είναι επιλεγμένο), και προτείνουμε να δημιουργήσετε παραγγελίες σε προμηθευτές για να αναπληρώσει τη διαφορά. -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=Αυτή είναι η λίστα όλων των ανοικτών παραγγελιών προκαθορισμένων προϊόντων σε προμηθευτές. Μόνο ανοιχτές παραγγελίες προκαθορισμένων προϊόντων, παραγγελίες δηλαδή που μπορούν να επηρεάσουν τα αποθέματα, φαίνονται εδώ. Replenishments=Αναπληρώσεις NbOfProductBeforePeriod=Ποσότητα του προϊόντος %s σε απόθεμα πριν από την επιλεγμένη περίοδο (< %s) NbOfProductAfterPeriod=Ποσότητα του προϊόντος %s σε απόθεμα πριν από την επιλεγμένη περίοδο (> %s) @@ -119,16 +121,19 @@ MassMovement=Μαζική μετακίνηση MassStockMovement=Μαζική κίνηση αποθεμάτων SelectProductInAndOutWareHouse=Επιλέξτε ένα προϊόν, ποσότητα, μια αποθήκη πηγή και μια αποθήκη στόχο, στη συνέχεια, κάντε κλικ στο "%s". Μόλις γίνει αυτό για όλες τις απαιτούμενες κινήσεις, κάντε κλικ στο "%s". RecordMovement=Η εγγραφή μεταφέρθηκε -ReceivingForSameOrder=Receipts for this order +ReceivingForSameOrder=Αποδείξεις για αυτή την παραγγελία StockMovementRecorded=Οι κινήσεις των αποθεμάτων καταγράφονται RuleForStockAvailability=Κανόνες σχετικά με τις απαιτήσεις του αποθέματος StockMustBeEnoughForInvoice=Το επίπεδο των αποθεμάτων πρέπει να είναι επαρκής για να προσθέσετε το προϊόν / υπηρεσία στο τιμολόγιο StockMustBeEnoughForOrder=Το επίπεδο των αποθεμάτων πρέπει να είναι επαρκής για να προσθέσετε το προϊόν / υπηρεσία για αγορά StockMustBeEnoughForShipment= Το επίπεδο των αποθεμάτων πρέπει να είναι επαρκής για να προσθέσετε το προϊόν / υπηρεσία για αποστολή -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. +MovementLabel=Ετικέτα λογιστικής κίνησης +InventoryCode=Λογιστική κίνηση ή κωδικός απογραφής +IsInPackage=Περιεχόμενα συσκευασίας +ShowWarehouse=Εμφάνιση αποθήκης +MovementCorrectStock=Διόρθωση αποθέματος για το προϊόν %s +MovementTransferStock=Μετακίνηση του προϊόντος %s σε μια άλλη αποθήκη +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/el_GR/suppliers.lang b/htdocs/langs/el_GR/suppliers.lang index fef618b130016..66c20c456872a 100644 --- a/htdocs/langs/el_GR/suppliers.lang +++ b/htdocs/langs/el_GR/suppliers.lang @@ -43,4 +43,4 @@ ListOfSupplierOrders=Λίστα παραγγελιών των προμηθευτ MenuOrdersSupplierToBill=Παραγγελίες προμηθευτών για τιμολόγηση NbDaysToDelivery=Καθυστέρηση παράδοσης σε ημέρες DescNbDaysToDelivery=Η μεγαλύτερη καθυστέρηση εμφανίζετε μεταξύ παραγγελίας και τη λίστα των προϊόντων -UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group) +UseDoubleApproval=Χρησιμοποιήστε διπλή έγκριση (η δεύτερη έγκριση μπορεί να γίνει από οποιονδήποτε χρήστη με ειδική άδεια) diff --git a/htdocs/langs/el_GR/trips.lang b/htdocs/langs/el_GR/trips.lang index fff849b2bf42e..6d18622fa0845 100644 --- a/htdocs/langs/el_GR/trips.lang +++ b/htdocs/langs/el_GR/trips.lang @@ -1,10 +1,10 @@ # 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 +Trip=Αναφορά εξόδων +Trips=Αναφορές εξόδων +TripsAndExpenses=Αναφορές εξόδων +TripsAndExpensesStatistics=Στατιστικές αναφορές εξόδων TripCard=Expense report card AddTrip=Create expense report ListOfTrips=List of expense report @@ -37,9 +37,9 @@ TF_LUNCH=Γεύμα TF_METRO=Metro TF_TRAIN=Train TF_BUS=Bus -TF_CAR=Car -TF_PEAGE=Toll -TF_ESSENCE=Fuel +TF_CAR=Όχημα +TF_PEAGE=Διόδια +TF_ESSENCE=Καύσιμα TF_HOTEL=Hostel TF_TAXI=Taxi @@ -69,11 +69,9 @@ 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 @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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_GB/admin.lang b/htdocs/langs/en_GB/admin.lang index 7d791ef1b5bfb..c25fb01f69047 100644 --- a/htdocs/langs/en_GB/admin.lang +++ b/htdocs/langs/en_GB/admin.lang @@ -1,8 +1,16 @@ # 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" +UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: %s ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members) +Module39000Name=Product lot +Module39000Desc=Lot or serial number, eat-by and sell-by date management on products +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. +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. 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). +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management 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/interventions.lang b/htdocs/langs/en_GB/interventions.lang new file mode 100644 index 0000000000000..84b26b1f95e09 --- /dev/null +++ b/htdocs/langs/en_GB/interventions.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - interventions +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/en_GB/main.lang b/htdocs/langs/en_GB/main.lang index 79c78254e46e5..568f81040e96d 100644 --- a/htdocs/langs/en_GB/main.lang +++ b/htdocs/langs/en_GB/main.lang @@ -15,7 +15,7 @@ FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y FormatDateHourShort=%d/%m/%Y %H:%M -FormatDateHourSecShort=%d/%m/%Y %H:%M:%S +FormatDateHourSecShort=%d/%m/%Y %H:%M:%S FormatDateHourTextShort=%d %b %Y %H:%M FormatDateHourText=%d %B %Y %H:%M AmountVAT=Amount VAT diff --git a/htdocs/langs/en_GB/orders.lang b/htdocs/langs/en_GB/orders.lang index 2efc33c6c5b08..6d902132a46c4 100644 --- a/htdocs/langs/en_GB/orders.lang +++ b/htdocs/langs/en_GB/orders.lang @@ -2,3 +2,4 @@ StatusOrderOnProcessShort=Ordered StatusOrderOnProcess=Ordered - Standby reception ApproveOrder=Approve order +LastOrders=Last %s customer orders diff --git a/htdocs/langs/en_GB/productbatch.lang b/htdocs/langs/en_GB/productbatch.lang new file mode 100644 index 0000000000000..53edc04d8c473 --- /dev/null +++ b/htdocs/langs/en_GB/productbatch.lang @@ -0,0 +1,11 @@ +# Dolibarr language file - Source file is en_US - productbatch +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/serial not used) +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %s +WhenProductBatchModuleOnOptionAreForced=When module Lot/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. diff --git a/htdocs/langs/en_GB/stocks.lang b/htdocs/langs/en_GB/stocks.lang new file mode 100644 index 0000000000000..3a989d45e7d76 --- /dev/null +++ b/htdocs/langs/en_GB/stocks.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - stocks +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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_AR/admin.lang b/htdocs/langs/es_AR/admin.lang index 7233ad928c4bc..c25fb01f69047 100644 --- a/htdocs/langs/es_AR/admin.lang +++ b/htdocs/langs/es_AR/admin.lang @@ -1,6 +1,16 @@ # 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" +UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: %s ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir +Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members) +Module39000Name=Product lot +Module39000Desc=Lot or serial number, eat-by and sell-by date management on products +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. +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. +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). +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management 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/interventions.lang b/htdocs/langs/es_AR/interventions.lang new file mode 100644 index 0000000000000..84b26b1f95e09 --- /dev/null +++ b/htdocs/langs/es_AR/interventions.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - interventions +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/es_AR/orders.lang b/htdocs/langs/es_AR/orders.lang index 2c71fc66ccc02..6d902132a46c4 100644 --- a/htdocs/langs/es_AR/orders.lang +++ b/htdocs/langs/es_AR/orders.lang @@ -1,3 +1,5 @@ # Dolibarr language file - Source file is en_US - orders StatusOrderOnProcessShort=Ordered StatusOrderOnProcess=Ordered - Standby reception +ApproveOrder=Approve order +LastOrders=Last %s customer orders diff --git a/htdocs/langs/es_AR/other.lang b/htdocs/langs/es_AR/other.lang new file mode 100644 index 0000000000000..c50a095e492a0 --- /dev/null +++ b/htdocs/langs/es_AR/other.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - other +Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded +SeeModuleSetup=See setup of module %s diff --git a/htdocs/langs/es_AR/productbatch.lang b/htdocs/langs/es_AR/productbatch.lang new file mode 100644 index 0000000000000..53edc04d8c473 --- /dev/null +++ b/htdocs/langs/es_AR/productbatch.lang @@ -0,0 +1,11 @@ +# Dolibarr language file - Source file is en_US - productbatch +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/serial not used) +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %s +WhenProductBatchModuleOnOptionAreForced=When module Lot/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. diff --git a/htdocs/langs/es_AR/stocks.lang b/htdocs/langs/es_AR/stocks.lang index 295151fbd08c9..3a989d45e7d76 100644 --- a/htdocs/langs/es_AR/stocks.lang +++ b/htdocs/langs/es_AR/stocks.lang @@ -1,3 +1,2 @@ # 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 +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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_AR/trips.lang b/htdocs/langs/es_AR/trips.lang index b4a068e21c43f..f5e6f1a92ebf2 100644 --- a/htdocs/langs/es_AR/trips.lang +++ b/htdocs/langs/es_AR/trips.lang @@ -11,3 +11,4 @@ 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/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang index 7233ad928c4bc..c25fb01f69047 100644 --- a/htdocs/langs/es_CO/admin.lang +++ b/htdocs/langs/es_CO/admin.lang @@ -1,6 +1,16 @@ # 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" +UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: %s ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir +Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members) +Module39000Name=Product lot +Module39000Desc=Lot or serial number, eat-by and sell-by date management on products +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. +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. +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). +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management 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/interventions.lang b/htdocs/langs/es_CO/interventions.lang new file mode 100644 index 0000000000000..84b26b1f95e09 --- /dev/null +++ b/htdocs/langs/es_CO/interventions.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - interventions +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/es_CO/main.lang b/htdocs/langs/es_CO/main.lang index 678fac2d5bb5e..1ed4341bde4a3 100644 --- a/htdocs/langs/es_CO/main.lang +++ b/htdocs/langs/es_CO/main.lang @@ -34,6 +34,7 @@ DateModificationShort=Fecha modificación UseLocalTax=Incluir impuestos CommercialProposalsShort=Cotizaciones RequestAlreadyDone=La solicitud ya ha sido procesada +December=diciembre NbOfReferers=Número de remitentes Currency=Moneda SelectElementAndClickRefresh=Seleccione un elemento y haga clic en Actualizar diff --git a/htdocs/langs/es_CO/orders.lang b/htdocs/langs/es_CO/orders.lang index 2c71fc66ccc02..6d902132a46c4 100644 --- a/htdocs/langs/es_CO/orders.lang +++ b/htdocs/langs/es_CO/orders.lang @@ -1,3 +1,5 @@ # Dolibarr language file - Source file is en_US - orders StatusOrderOnProcessShort=Ordered StatusOrderOnProcess=Ordered - Standby reception +ApproveOrder=Approve order +LastOrders=Last %s customer orders diff --git a/htdocs/langs/es_CO/other.lang b/htdocs/langs/es_CO/other.lang new file mode 100644 index 0000000000000..c50a095e492a0 --- /dev/null +++ b/htdocs/langs/es_CO/other.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - other +Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded +SeeModuleSetup=See setup of module %s diff --git a/htdocs/langs/es_CO/productbatch.lang b/htdocs/langs/es_CO/productbatch.lang new file mode 100644 index 0000000000000..53edc04d8c473 --- /dev/null +++ b/htdocs/langs/es_CO/productbatch.lang @@ -0,0 +1,11 @@ +# Dolibarr language file - Source file is en_US - productbatch +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/serial not used) +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %s +WhenProductBatchModuleOnOptionAreForced=When module Lot/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. diff --git a/htdocs/langs/es_CO/stocks.lang b/htdocs/langs/es_CO/stocks.lang new file mode 100644 index 0000000000000..3a989d45e7d76 --- /dev/null +++ b/htdocs/langs/es_CO/stocks.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - stocks +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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_CO/trips.lang b/htdocs/langs/es_CO/trips.lang index b4a068e21c43f..f5e6f1a92ebf2 100644 --- a/htdocs/langs/es_CO/trips.lang +++ b/htdocs/langs/es_CO/trips.lang @@ -11,3 +11,4 @@ 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/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index 526f47dc0ce43..b27ba7206ea26 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -297,10 +297,11 @@ MenuHandlers=Gestores menú MenuAdmin=Editor menú DoNotUseInProduction=No usar en producción ThisIsProcessToFollow=He aquí el procedimiento a seguir: +ThisIsAlternativeProcessToFollow=Este es una configuración alternativa para procesar: StepNb=Paso %s FindPackageFromWebSite=Buscar el paquete que responde a su necesidad (por ejemplo en el sitio web %s) DownloadPackageFromWebSite=Descargar paquete %s. -UnpackPackageInDolibarrRoot=Descomprimir el paquete en el directorio raíz de Dolibarr %s sobre los archivos existentes (sin desplazar o borrar los existentes, so pena de perder su configuración o los módulos no oficiales instalados) +UnpackPackageInDolibarrRoot=Descomprimir el paquete en el directorio dedicado a los módulos externos: %s SetupIsReadyForUse=La instalación ha finalizado y Dolibarr está disponible con el nuevo componente. NotExistsDirect=No existe el directorio alternativo.
InfDirAlt=Desde la versión 3 es posible definir un directorio root alternativo, esto le permite almacenar en el mismo lugar módulos y temas personalizados.
Basta con crear un directorio en el raíz de Dolibarr (por ejemplo: custom).
@@ -389,7 +390,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 +ExtrafieldLink=Objeto adjuntado 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
... @@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Lista Parámetros viene de una tabla
Sintaxis: n ExtrafieldParamHelpchkbxlst=Lista de parámetros viene de una tabla
Sintaxis: nombre_tabla: etiqueta_campo: identificador_campo :: filtro
Ejemplo: c_typent: libelle: id :: filtro
filtro puede ser una prueba simple (por ejemplo, activo = 1) para mostrar el valor sólo se activa
si desea filtrar un campo extra utilizar la sintáxis extra.fieldcode = ... (donde el código de campo es el código del campo extra)
para tener la lista en función de otra:
c_typent: libelle: id: parent_list_code | parent_column: filtro LibraryToBuildPDF=Librería usada para la creación de archivos PDF WarningUsingFPDF=Atención: Su archivo conf.php contiene la directiva dolibarr_pdf_force_fpdf=1. Esto hace que se use la librería FPDF para generar sus archivos PDF. Esta librería es antigua y no cubre algunas funcionalidades (Unicode, transparencia de imágenes, idiomas cirílicos, árabes o asiáticos, etc.), por lo que puede tener problemas en la generación de los PDF.
Para resolverlo, y disponer de un soporte completo de PDF, puede descargar la librería TCPDF , y a continuación comentar o eliminar la línea $dolibarr_pdf_force_fpdf=1, y añadir en su lugar $dolibarr_lib_TCPDF_PATH='ruta_a_TCPDF' -LocalTaxDesc=Algunos países aplican 2 o 3 tasas a cada línea de factura. Si es el caso, escoja el tipo de la segunda y tercera tasa y su valor. Los posibles tipos son:
1 : tasa local aplicable a productos y servicios sin IVA (IVA no se aplica en la tasa local)
2 : tasa local se aplica a productos y servicios antes del IVA (IVA se calcula sobre importe+tasa local)
3 : tasa local se aplica a productos sin IVA (IVA no se aplica en la tasa local)
4 : tasa local se aplica a productos antes del IVA (IVA se calcula sobre el importe+tasa local)
5 : tasa local se aplica a servicios sin IVA (IVA no se aplica a la tasa local)
6 : tasa local se aplica a servicios antes del IVA (IVA se calcula sobre importe + tasa local) +LocalTaxDesc=Algunos países aplican 2 o 3 tasas a cada línea de factura. Si es el caso, escoja el tipo de la segunda y tercera tasa y su valor. Los posibles tipos son:
1 : tasa local aplicable a productos y servicios sin IVA (tasa local es calculada sobre la base imponible)
2 : tasa local se aplica a productos y servicios incluyendo el IVA (tasa local es calculada sobre base imponible+IVA)
3 : tasa local se aplica a productos sin IVA (tasa local es calculada sobre la base imponible)
4 : tasa local se aplica a productos incluyendo el IVA (tasa local es calculada sobre base imponible+IVA)
5 : tasa local se aplica a servicios sin IVA (tasa local es calculada sobre base imponible)
6 : tasa local se aplica a servicios incluyendo el IVA (tasa local es calculada sobre base imponible+IVA) SMS=SMS LinkToTestClickToDial=Introduzca un número de teléfono al que llamar para probar el enlace de llamada ClickToDial para el usuario %s RefreshPhoneLink=Refrescar enlace @@ -495,8 +496,8 @@ 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 +Module520Name=Crédito +Module520Desc=Gestión de créditos 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 @@ -511,14 +512,14 @@ Module1400Name=Contabilidad experta Module1400Desc=Gestión experta de la contabilidad (doble partida) 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) +Module1780Name=Etiquetas/Categorías +Module1780Desc=Crear etiquetas/Categoría(Productos, clientes,proveedores,contactos y miembros) 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=Scheduled job management +Module2300Desc=Gestión del Trabajo programado Module2400Name=Agenda Module2400Desc=Gestión de la agenda y de las acciones Module2500Name=Gestión Electrónica de Documentos @@ -540,7 +541,7 @@ Module6000Name=Flujo de trabajo Module6000Desc=Gestión del flujo de trabajo Module20000Name=Gestión de días libres retribuidos Module20000Desc=Gestión de los días libres retribuidos de los empleados -Module39000Name=Lotes de productos +Module39000Name=Lotes de producto Module39000Desc=Gestión de lotes o series, fechas de caducidad y venta de los productos Module50000Name=PayBox Module50000Desc=Módulo para proporcionar un pago en línea con tarjeta de crédito mediante Paybox @@ -558,8 +559,6 @@ Module59000Name=Márgenes Module59000Desc=Módulo para gestionar los márgenes de beneficio Module60000Name=Comisiones Module60000Desc=Módulo para gestionar las comisiones de venta -Module150010Name=Nº de lote, fecha de consumo, fecha de venta -Module150010Desc=gestión de productos por nº de lote, fecha de consumo, fecha de venta Permission11=Consultar facturas Permission12=Crear/Modificar facturas Permission13=De-validar facturas @@ -717,11 +716,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 +Permission520=Consultar Créditos +Permission522=Crear/modificar Créditos +Permission524=Eliminar Crédito +Permission525=Calculadora de crédito +Permission527=Exportar crédito Permission531=Consultar servicios Permission532=Crear/modificar servicios Permission534=Eliminar servicios @@ -754,7 +753,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 +Permission1190=Aprobar (segunda aprobación) pedidos a proveedores Permission1201=Obtener resultado de una exportación Permission1202=Crear/codificar exportaciones Permission1231=Consultar facturas de proveedores @@ -767,10 +766,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=Read Scheduled job -Permission23002=Create/update Scheduled job -Permission23003=Delete Scheduled job -Permission23004=Execute Scheduled job +Permission23001=Consultar Trabajo programado +Permission23002=Crear/actualizar Trabajo programado +Permission23003=Borrar Trabajo Programado +Permission23004=Ejecutar Trabajo programado 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 @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= El tipo de IRPF propuesto por defecto en las creaciones d LocalTax2IsNotUsedDescES= El tipo de IRPF propuesto por defecto es 0. Final de regla. LocalTax2IsUsedExampleES= En España, se trata de personas físicas: autónomos y profesionales independientes que prestan servicios y empresas que han elegido el régimen fiscal de módulos. LocalTax2IsNotUsedExampleES= En España, se trata de empresas no sujetas al régimen fiscal de módulos. -CalcLocaltax=Informes -CalcLocaltax1ES=Ventas - Compras +CalcLocaltax=Informes de impuestos locales +CalcLocaltax1=Ventas - Compras CalcLocaltax1Desc=Los informes se calculan con la diferencia entre las ventas y las compras -CalcLocaltax2ES=Compras +CalcLocaltax2=Compras CalcLocaltax2Desc=Los informes se basan en el total de las compras -CalcLocaltax3ES=Ventas +CalcLocaltax3=Ventas CalcLocaltax3Desc=Los informes se basan en el total de las ventas LabelUsedByDefault=Etiqueta que se utilizará si no se encuentra traducción para este código LabelOnDocuments=Etiqueta sobre documentos @@ -1018,14 +1017,14 @@ NoEventOrNoAuditSetup=No se han registrado eventos de seguridad. Esto puede ser NoEventFoundWithCriteria=No se han encontrado eventos de seguridad para tales criterios de búsqueda. SeeLocalSendMailSetup=Ver la configuración local de sendmail BackupDesc=Para realizar una copia de seguridad completa de Dolibarr, usted debe: -BackupDesc2=* Guardar el contenido del directorio de documentos (%s) que contiene todos los archivos subidos o generados (comprimiendo el directorio, por ejemplo). -BackupDesc3=* Guardar el contenido de su base de datos en un archivo de volcado. Para ello puede utilizar el asistente a continuación. +BackupDesc2=Guardar el contenido del directorio de documentos (%s) que contiene todos los archivos subidos o generados (comprimiendo el directorio, por ejemplo). +BackupDesc3=Guardar el contenido de su base de datos (%s) en un archivo de volcado. Para ello puede utilizar el asistente a continuación. BackupDescX=El directorio archivado deberá guardarse en un lugar seguro. BackupDescY=El archivo de volcado generado deberá guardarse en un lugar seguro. BackupPHPWarning=La copia de seguridad no puede ser garantizada con este método. Es preferible utilizar el anterior RestoreDesc=Para restaurar una copia de seguridad de Dolibarr, usted debe: -RestoreDesc2=* Tomar el archivo (archivo zip, por ejemplo) del directorio de los documentos y descomprimirlo en el directorio de los documentos de una nueva instalación de Dolibarr directorio o en la carpeta de los documentos de esta instalación (%s). -RestoreDesc3=* Recargar el archivo de volcado guardado en la base de datos de una nueva instalación de Dolibarr o de esta instalación. Atención, una vez realizada la restauración, deberá utilizar un login/contraseña de administrador existente en el momento de la copia de seguridad para conectarse. Para restaurar la base de datos en la instalación actual, puede utilizar el asistente a continuación. +RestoreDesc2=Tomar el archivo (archivo zip, por ejemplo) del directorio de los documentos y descomprimirlo en el directorio de los documentos de una nueva instalación de Dolibarr o en la carpeta de los documentos de esta instalación (%s). +RestoreDesc3=Restaurar el archivo de volcado guardado en la base de datos de la nueva instalación de Dolibarr o de esta instalación (%s). Atención, una vez realizada la restauración, deberá utilizar un login/contraseña de administrador existente en el momento de la copia de seguridad para conectarse. Para restaurar la base de datos en la instalación actual, puede utilizar el asistente a continuación. RestoreMySQL=Importación MySQL ForcedToByAModule= Esta regla está forzada a %s por uno de los módulos activados PreviousDumpFiles=Archivos de copia de seguridad de la base de datos disponibles @@ -1116,7 +1115,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=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. +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. ModelModules=Modelos de documentos DocumentModelOdt=Generación desde los documentos OpenDocument (Archivo .ODT OpenOffice, KOffice, TextEdit,...) WatermarkOnDraft=Marca de agua en los documentos borrador @@ -1337,6 +1336,8 @@ LDAPFieldCountry=País LDAPFieldCountryExample=Ejemplo : c LDAPFieldDescription=Descripción LDAPFieldDescriptionExample=Ejemplo : description +LDAPFieldNotePublic=Nota Pública +LDAPFieldNotePublicExample=Ejemplo: publicnote LDAPFieldGroupMembers= Miembros del grupo LDAPFieldGroupMembersExample= Ejemplo: uniqueMember LDAPFieldBirthdate=Fecha de nacimiento @@ -1566,7 +1567,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 +IfSetToYesDontForgetPermission=Si está seleccionado, no olvides de modificar los permisos en los grupos o usuarios para permitir la segunda aprobación ##### 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 @@ -1611,8 +1612,13 @@ 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 +YouMayFindNotificationsFeaturesIntoModuleNotification=Puede encontrar opciones para notificaciones de e-mail activando y configurando el módulo "Notificaciones". +ListOfNotificationsPerContact=Listado de notificaciones por contacto +ListOfFixedNotifications=Listado de notificaciones fijas +GoOntoContactCardToAddMore=Vaya a la pestaña "Notificaciones" de un contacto de tercero para añadir o eliminar notificaciones para contactos/direcciones +Threshold=Valor mínimo/umbral +BackupDumpWizard=Asistente para crear una copia de seguridad de la base de datos +SomethingMakeInstallFromWebNotPossible=No es posible la instalación de módulos externos desde la interfaz web por la siguiente razón: +SomethingMakeInstallFromWebNotPossible2=Por esta razón, explicaremos aquí los pasos del proceso de actualización manual que puede realizar un usuario con privilegios. +InstallModuleFromWebHasBeenDisabledByFile=La instalación de módulos externos desde la aplicación se encuentra desactivada por el administrador. Debe requerirle que elimine el archivo %s para habilitar esta funcionalidad. +ConfFileMuseContainCustom=La instalación de módulos externos desde la aplicación guarda los archivos de los módulos en el directorio %s. Para disponer de este directorio en Dolibarr, debe configurar el archivo conf/conf.php para tener la opción
- $dolibarr_main_url_root_alt activada al valor $dolibarr_main_url_root_alt="/custom"
- $dolibarr_main_document_root_alt activa al valor "%s/custom" diff --git a/htdocs/langs/es_ES/agenda.lang b/htdocs/langs/es_ES/agenda.lang index fe2acb4ff8a71..3c21ca04654ac 100644 --- a/htdocs/langs/es_ES/agenda.lang +++ b/htdocs/langs/es_ES/agenda.lang @@ -49,9 +49,9 @@ InvoiceValidatedInDolibarrFromPos=Factura %s validada desde TPV InvoiceBackToDraftInDolibarr=Factura %s devuelta a borrador InvoiceDeleteDolibarr=Factura %s eliminada OrderValidatedInDolibarr=Pedido %s validado -OrderDeliveredInDolibarr=Order %s classified delivered +OrderDeliveredInDolibarr=Pedido %s clasificado como enviado OrderCanceledInDolibarr=Pedido %s anulado -OrderBilledInDolibarr=Order %s classified billed +OrderBilledInDolibarr=Pedido %s clasificado como facturado OrderApprovedInDolibarr=Pedido %s aprobado OrderRefusedInDolibarr=Pedido %s rechazado OrderBackToDraftInDolibarr=Pedido %s devuelto a borrador @@ -94,5 +94,5 @@ WorkingTimeRange=Rango temporal WorkingDaysRange=Rango diario AddEvent=Crear evento MyAvailability=Mi disponibilidad -ActionType=Event type -DateActionBegin=Start event date +ActionType=Tipo de evento +DateActionBegin=Fecha de inicio del evento diff --git a/htdocs/langs/es_ES/banks.lang b/htdocs/langs/es_ES/banks.lang index 7366655c7a734..03cdf7b835fdb 100644 --- a/htdocs/langs/es_ES/banks.lang +++ b/htdocs/langs/es_ES/banks.lang @@ -163,3 +163,5 @@ LabelRIB=Nombre de la cuenta bancaria NoBANRecord=Ninguna cuenta bancaria definida DeleteARib=Eliminar cuenta bancaria ConfirmDeleteRib=¿Está seguro de que desea eliminar esta cuenta bancaria? +StartDate=Fecha de inicio +EndDate=Fecha de fin diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang index c63fe576b5607..ae658582b6338 100644 --- a/htdocs/langs/es_ES/bills.lang +++ b/htdocs/langs/es_ES/bills.lang @@ -294,10 +294,11 @@ 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 +RelatedCustomerInvoices=Facturas a clientes asociadas +RelatedSupplierInvoices=Facturas de proveedores asociadas LatestRelatedBill=Última factura relacionada WarningBillExist=Atención, ya existe al menos una factura +MergingPDFTool=Herramienta de fusión PDF # PaymentConditions PaymentConditionShortRECEP=A la recepción diff --git a/htdocs/langs/es_ES/boxes.lang b/htdocs/langs/es_ES/boxes.lang index 56353b2006e94..73e54a30c5ce7 100644 --- a/htdocs/langs/es_ES/boxes.lang +++ b/htdocs/langs/es_ES/boxes.lang @@ -94,3 +94,4 @@ BoxProductDistributionFor=Distribución de %s para %s ForCustomersInvoices=Facturas a clientes ForCustomersOrders=Pedidos de clientes ForProposals=Presupuestos +LastXMonthRolling=El último %s mes natural diff --git a/htdocs/langs/es_ES/categories.lang b/htdocs/langs/es_ES/categories.lang index 1825a9c57c901..47ba4f29cb447 100644 --- a/htdocs/langs/es_ES/categories.lang +++ b/htdocs/langs/es_ES/categories.lang @@ -1,62 +1,62 @@ # 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=Etiqueta/Categoría +Rubriques=Etiqueta/Categoría +categories=etiquetas/categorías +TheCategorie=La etiqueta/categoría +NoCategoryYet=Ninguna etiqueta/categoría de este tipo creada In=En AddIn=Añadir en modify=Modificar Classify=Clasificar -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 +CategoriesArea=Área Etiquetas/Categorías +ProductsCategoriesArea=Área etiquetas/categorías Productos/Servicios +SuppliersCategoriesArea=Área etiquetas/categorías Proveedores +CustomersCategoriesArea=Área etiquetas/categorías Clientes +ThirdPartyCategoriesArea=Área etiquetas/categorías Terceros +MembersCategoriesArea=Área etiquetas/categorías Miembros +ContactsCategoriesArea=Área etiquetas/categorías de contactos +MainCats=Inicio etiquetas/categorías SubCats=Subcategorías CatStatistics=Estadísticas -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 +CatList=Listado de etiquetas/categorías +AllCats=Todas las etiquetas/categorías +ViewCat=Ver etiqueta/categoría +NewCat=Añadir etiqueta/categoría +NewCategory=Nueva etiqueta/categoría +ModifCat=Modificar etiqueta/categoría +CatCreated=Etiqueta/categoría creada +CreateCat=Crear etiqueta/categoría +CreateThisCat=Crear esta etiqueta/categoría ValidateFields=Validar los campos NoSubCat=Esta categoría no contiene ninguna subcategoría. SubCatOf=Subcategorí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 +FoundCats=Encontradas etiquetas/categorías +FoundCatsForName=Etiquetas/categorías encontradas para el nombre: +FoundSubCatsIn=Subcategorías encontradas en la etiqueta/categoría +ErrSameCatSelected=Ha seleccionado la misma etiqueta/categoría varias veces +ErrForgotCat=Ha olvidado escoger la etiqueta/categoría ErrForgotField=Ha olvidado reasignar un campo ErrCatAlreadyExists=Este nombre esta siendo utilizado -AddProductToCat=Add this product to a tag/category? -ImpossibleAddCat=Impossible to add the tag/category -ImpossibleAssociateCategory=Impossible to associate the tag/category to +AddProductToCat=¿Añadir este producto a una etiqueta/categoría? +ImpossibleAddCat=Imposible añadir la etiqueta/categoría +ImpossibleAssociateCategory=Imposible asociar la etiqueta/categoría a WasAddedSuccessfully=La categoría se ha añadido con éxito. -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 +ObjectAlreadyLinkedToCategory=El elemento ya está enlazado a esta etiqueta/categoría +CategorySuccessfullyCreated=La etiqueta/categoría %s se insertado correctamente. +ProductIsInCategories=Este producto/servicio se encuentra en las siguientes etiquetas/categorías +SupplierIsInCategories=Este tercero se encuentra en las siguientes etiquetas/categorías de proveedores +CompanyIsInCustomersCategories=Este tercero se encuentra en las siguientes etiquetas/categorías de clientes/clientes potenciales +CompanyIsInSuppliersCategories=Este tercero se encuentra en las siguientes etiquetas/categorías de proveedores +MemberIsInCategories=Este miembro se encuentra en las siguientes etiquetas/categorías de miembros +ContactIsInCategories=Este contacto se encuentra en las siguientes etiquetas/categorías +ProductHasNoCategory=Este producto/servicio no se encuentra en ninguna etiqueta/categoría en particular +SupplierHasNoCategory=Este proveedor no se encuentra en ninguna etiqueta/categoría en particular +CompanyHasNoCategory=Esta empresa no se encuentra en ninguna etiqueta/categoría en particular +MemberHasNoCategory=Este miembro no se encuentra en ninguna etiqueta/categoría en particular +ContactHasNoCategory=Este contacto no se encuentra en ninguna etiqueta/categoría +ClassifyInCategory=Clasificar en la etiqueta/categoría NoneCategory=Ninguna -NotCategorized=Without tag/category +NotCategorized=Sin etiqueta/categoría CategoryExistsAtSameLevel=Esta categoría ya existe para esta referencia ReturnInProduct=Volver a la ficha producto/servicio ReturnInSupplier=Volver a la ficha proveedor @@ -64,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=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 +CategoriesTree=Árbol de etiquetas/categorías +DeleteCategory=Eliminar etiqueta/categoría +ConfirmDeleteCategory=¿Está seguro de querer eliminar esta etiqueta/categoría? +RemoveFromCategory=Eliminar vínculo con etiqueta/categoría +RemoveFromCategoryConfirm=¿Está seguro de querer eliminar el vínculo entre la transacción y la etiqueta/categoría? +NoCategoriesDefined=Ninguna etiqueta/categoría definida +SuppliersCategoryShort=Etiquetas/categorías de proveedores +CustomersCategoryShort=Etiquetas/categorías de clientes +ProductsCategoryShort=Etiquetas/categorías de productos +MembersCategoryShort=Etiqueta/categorías de miembros +SuppliersCategoriesShort=Etiquetas/categorías de proveedores +CustomersCategoriesShort=Etiquetas/categorías de clientes CustomersProspectsCategoriesShort=Categorías clientes -ProductsCategoriesShort=Products tags/categories -MembersCategoriesShort=Members tags/categories -ContactCategoriesShort=Contacts tags/categories +ProductsCategoriesShort=Etiquetas/categorías de productos +MembersCategoriesShort=Etiquetas/categorías de miembros +ContactCategoriesShort=Etiquetas/categorías de contactos 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. @@ -88,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=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 +CategoryContents=Contenido de la etiqueta/categoría +CategId=Id etiqueta/categoría +CatSupList=Listado de etiquetas/categorías de proveedores +CatCusList=Listado de etiquetas/categorías de clientes +CatProdList=Listado de etiquetas/categorías de productos +CatMemberList=Listado de etiquetas/categorías de miembros +CatContactList=Listado de etiquetas/categorías y contactos +CatSupLinks=Enlaces entre proveedores y etiquetas/categorías +CatCusLinks=Enlaces entre clientes/clientes potenciales y etiquetas/categorías +CatProdLinks=Enlaces entre productos/servicios y etiquetas/categorías +CatMemberLinks=Enlace entre miembros y etiquetas/categorías +DeleteFromCat=Eliminar de la etiqueta/categoría DeletePicture=Eliminar imagen ConfirmDeletePicture=¿Confirma la eliminación de la imagen? ExtraFieldsCategories=Atributos complementarios -CategoriesSetup=Tags/categories setup -CategorieRecursiv=Link with parent tag/category automatically +CategoriesSetup=Configuración de etiquetas/categorías +CategorieRecursiv=Enlazar con la etiqueta/categoría automáticamente 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=Show tag/category +ShowCategory=Mostrar etiqueta/categoría diff --git a/htdocs/langs/es_ES/cron.lang b/htdocs/langs/es_ES/cron.lang index e7a2d5c90985d..57f77f36616a5 100644 --- a/htdocs/langs/es_ES/cron.lang +++ b/htdocs/langs/es_ES/cron.lang @@ -26,13 +26,13 @@ CronLastOutput=Res. ult. ejec. CronLastResult=Últ. cód. res. CronListOfCronJobs=Lista de tareas programadas CronCommand=Comando -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 +CronList=Tarea programada +CronDelete=Borrar tareas programadas +CronConfirmDelete=¿Está seguro de querer eliminar esta tarea programada? +CronExecute=Lanzar tareas programadas +CronConfirmExecute=¿Está seguro de querer ejecutar esta tarea ahora? +CronInfo=Tareas programadas le permite ejecutar tareas que han sido programadas +CronWaitingJobs=Trabajos en espera CronTask=Tarea CronNone=Ninguna CronDtStart=Fecha inicio @@ -75,7 +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 +CronCreateJob=Crear nueva tarea programada # Info CronInfoPage=Información # Common diff --git a/htdocs/langs/es_ES/donations.lang b/htdocs/langs/es_ES/donations.lang index ca7df9cc00a4b..e42d195b9e80f 100644 --- a/htdocs/langs/es_ES/donations.lang +++ b/htdocs/langs/es_ES/donations.lang @@ -6,8 +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 ? +DeleteADonation=Eliminar una donación +ConfirmDeleteADonation=¿Está seguro de querer eliminar esta donación? ShowDonation=Mostrar donación DonationPromise=Promesa de donación PromisesNotValid=Promesas no validadas @@ -23,8 +23,8 @@ DonationStatusPaid=Donación pagada DonationStatusPromiseNotValidatedShort=No validada DonationStatusPromiseValidatedShort=Validada DonationStatusPaidShort=Pagada -DonationTitle=Donation receipt -DonationDatePayment=Payment date +DonationTitle=Recibo de donación +DonationDatePayment=Fecha de pago ValidPromess=Validar promesa DonationReceipt=Recibo de donación BuildDonationReceipt=Crear recibo @@ -40,4 +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 +DonationPayment=Pago de donación diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang index 25da88ffde1f2..08a4bf1c7f417 100644 --- a/htdocs/langs/es_ES/errors.lang +++ b/htdocs/langs/es_ES/errors.lang @@ -160,13 +160,16 @@ 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=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 +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Todas las recepciones deben verificarse primero (aprobadas o denegadas) antes para poder reallizar esta acción +ErrorCantSetReceptionToTotalDoneWithReceptionDenied=Todas las recepciones deben verificarse primero (aprobadas) antes para poder reallizar esta acción +ErrorGlobalVariableUpdater0=Petición HTTP fallada con error '%s' +ErrorGlobalVariableUpdater1=Formato JSON '%s' inválido +ErrorGlobalVariableUpdater2=Falta el parámetro '%s' +ErrorGlobalVariableUpdater3=No han sido encontrados los datos solicitados +ErrorGlobalVariableUpdater4=El cliente SOAP ha fallado con el error '%s' +ErrorGlobalVariableUpdater5=Sin variable global seleccionada +ErrorFieldMustBeANumeric=El campo %s debe contener un valor numérico +ErrorFieldMustBeAnInteger=El campo %s debe de ser un entero # 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 9a567b19ed5d9..48dd5a8058911 100644 --- a/htdocs/langs/es_ES/install.lang +++ b/htdocs/langs/es_ES/install.lang @@ -156,7 +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) +ErrorDatabaseVersionForbiddenForMigration=Su versión de base de datos es la %s. Tiene un error crítico que hace que pierda los datos si cambia la estructura de la base de datos, como esto es necesario para el proceso de actualización, este no se va a realizar hasta que actualice su base de datos a una versión mayor con el error subsanado (listado de versiones conocidas con este error: %s) ######### # upgrade diff --git a/htdocs/langs/es_ES/interventions.lang b/htdocs/langs/es_ES/interventions.lang index d674f45fc5d3f..8dbfd95b3fc0a 100644 --- a/htdocs/langs/es_ES/interventions.lang +++ b/htdocs/langs/es_ES/interventions.lang @@ -50,4 +50,4 @@ ArcticNumRefModelError=Activación imposible PacificNumRefModelDesc1=Devuelve el número con el formato %syymm-nnnn dónde yy es el año, mm. el mes y nnnn un contador secuencial sin ruptura y sin quedar a 0 PacificNumRefModelError=Una factura que empieza por # $$syymm existe en base y es incompatible con esta numeración. Elimínela o renombrela para activar este módulo. PrintProductsOnFichinter=Mostrar los productos en la ficha de intervención -PrintProductsOnFichinterDetails=para las intervenciones generadas a partir de pedidos +PrintProductsOnFichinterDetails=Intervenciones generadas desde pedidos diff --git a/htdocs/langs/es_ES/mails.lang b/htdocs/langs/es_ES/mails.lang index 575d03acabc95..7d8d6f9fa16b2 100644 --- a/htdocs/langs/es_ES/mails.lang +++ b/htdocs/langs/es_ES/mails.lang @@ -139,5 +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 +YouCanAlsoUseSupervisorKeyword=Puede también añadir la etiqueta __SUPERVISOREMAIL__ para tener un e-mail enviado del supervisor al usuario (solamente funciona si un e-mail es definido para este supervisor) +NbOfTargetedContacts=Número actual de contactos destinariarios de e-mails diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang index 8298465c933d2..ebdc89f8d8535 100644 --- a/htdocs/langs/es_ES/main.lang +++ b/htdocs/langs/es_ES/main.lang @@ -220,6 +220,7 @@ Next=Siguiente Cards=Fichas Card=Ficha Now=Ahora +HourStart=Hora de inicio Date=Fecha DateAndHour=Fecha y hora DateStart=Fecha inicio @@ -242,6 +243,8 @@ DatePlanShort=Fecha planif. DateRealShort=Fecha real DateBuild=Fecha generación del informe DatePayment=Fecha pago +DateApprove=Fecha de aprobación +DateApprove2=Fecha de aprobación (segunda aprobación) DurationYear=año DurationMonth=mes DurationWeek=semana @@ -352,7 +355,7 @@ Status=Estado Favorite=Favorito ShortInfo=Info. Ref=Ref. -ExternalRef=Ref. extern +ExternalRef=Ref. externa RefSupplier=Ref. proveedor RefPayment=Ref. pago CommercialProposalsShort=Presupuestos @@ -395,8 +398,8 @@ Available=Disponible NotYetAvailable=Aún no disponible NotAvailable=No disponible Popularity=Popularidad -Categories=Tags/categories -Category=Tag/category +Categories=Etiquetas/Categorías +Category=Etiqueta/Categoría By=Por From=De to=a @@ -408,6 +411,8 @@ OtherInformations=Otras informaciones Quantity=Cantidad Qty=Cant. ChangedBy=Modificado por +ApprovedBy=Aprobado por +ApprovedBy2=Aprobado por (segunda aprobación) ReCalculate=Recalcular ResultOk=Éxito ResultKo=Error @@ -454,7 +459,7 @@ August=agosto September=septiembre October=octubre November=noviembre -December=diciembre +December=Diciembre JanuaryMin=Ene FebruaryMin=Feb MarchMin=Mar @@ -466,7 +471,7 @@ AugustMin=Ago SeptemberMin=Sep OctoberMin=Oct NovemberMin=Nov -DecemberMin=Dec +DecemberMin=Dic Month01=enero Month02=febrero Month03=marzo @@ -695,7 +700,9 @@ AddBox=Añadir caja SelectElementAndClickRefresh=Seleccione un elemento y haga clic en Refrescar PrintFile=Imprimir Archivo %s ShowTransaction=Ver transacción -GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide. +GoIntoSetupToChangeLogo=Vaya a Inicio->Configuración->Empresa/Institución para cambiar el logo o vaya a Inicio->Configuración->Entorno para ocultarlo +Deny=Denegar +Denied=Denegada # Week day Monday=Lunes Tuesday=Martes diff --git a/htdocs/langs/es_ES/orders.lang b/htdocs/langs/es_ES/orders.lang index 76b17328889f4..3f32f489da71d 100644 --- a/htdocs/langs/es_ES/orders.lang +++ b/htdocs/langs/es_ES/orders.lang @@ -64,8 +64,8 @@ ShipProduct=Enviar producto Discount=Descuento CreateOrder=Crear pedido RefuseOrder=Rechazar el pedido -ApproveOrder=Approve order -Approve2Order=Approve order (second level) +ApproveOrder=Aprobar pedido +Approve2Order=Aprobar pedido (segundo nivel) ValidateOrder=Validar el pedido UnvalidateOrder=Desvalidar el pedido DeleteOrder=Eliminar el pedido @@ -79,7 +79,9 @@ NoOpenedOrders=Níngun pedido borrador NoOtherOpenedOrders=Ningún otro pedido borrador NoDraftOrders=Sin pedidos borrador OtherOrders=Otros pedidos -LastOrders=Los %s últimos pedidos +LastOrders=Últimos %s pedidos de clientes +LastCustomerOrders=Últimos %s pedidos de clientes +LastSupplierOrders=Últimos %s pedidos a proveedores LastModifiedOrders=Los %s últimos pedidos modificados LastClosedOrders=Los %s últimos pedidos cerrados AllOrders=Todos los pedidos @@ -103,8 +105,8 @@ ClassifyBilled=Clasificar facturado ComptaCard=Ficha contable DraftOrders=Pedidos borrador RelatedOrders=Pedidos adjuntos -RelatedCustomerOrders=Related customer orders -RelatedSupplierOrders=Related supplier orders +RelatedCustomerOrders=Pedidos de clientes relacionados +RelatedSupplierOrders=Pedidos a clientes relacionados OnProcessOrders=Pedidos en proceso RefOrder=Ref. pedido RefCustomerOrder=Ref. pedido cliente @@ -121,7 +123,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 +FirstApprovalAlreadyDone=Primera aprobación realizada ##### 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 8a724494efceb..1299312d12cd6 100644 --- a/htdocs/langs/es_ES/other.lang +++ b/htdocs/langs/es_ES/other.lang @@ -12,7 +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_VALIDATE=Pedido a proveedor registrado Notify_ORDER_SUPPLIER_APPROVE=Aprobación pedido a proveedor Notify_ORDER_SUPPLIER_REFUSE=Rechazo pedido a proveedor Notify_ORDER_VALIDATE=Validación pedido cliente @@ -29,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=Supplier order recorded +Notify_ORDER_SUPPLIER_VALIDATE=Pedido a proveedor registrado 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 @@ -48,7 +48,7 @@ Notify_PROJECT_CREATE=Creación de proyecto Notify_TASK_CREATE=Tarea creada Notify_TASK_MODIFY=Tarea modificada Notify_TASK_DELETE=Tarea eliminada -SeeModuleSetup=See setup of module %s +SeeModuleSetup=Vea la configuración del módulo %s NbOfAttachedFiles=Número archivos/documentos adjuntos TotalSizeOfAttachedFiles=Tamaño total de los archivos/documentos adjuntos MaxSize=Tamaño máximo @@ -171,7 +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. +EMailTextOrderValidatedBy=El pedido %s ha sido registrado por %s. EMailTextOrderApprovedBy=Pedido %s aprobado por %s EMailTextOrderRefused=Pedido %s rechazado EMailTextOrderRefusedBy=Pedido %s rechazado por %s @@ -203,6 +203,7 @@ NewKeyWillBe=Su nueva contraseña para iniciar sesión en el software será ClickHereToGoTo=Haga click aquí para ir a %s YouMustClickToChange=Sin embargo, debe hacer click primero en el siguiente enlace para validar este cambio de contraseña ForgetIfNothing=Si usted no ha solicitado este cambio, simplemente ignore este email. Sus credenciales son guardadas de forma segura. +IfAmountHigherThan=si el importe es mayor que %s ##### Calendar common ##### AddCalendarEntry=Añadir entrada en el calendario diff --git a/htdocs/langs/es_ES/productbatch.lang b/htdocs/langs/es_ES/productbatch.lang index 6fa46be9db56b..c64dd71d4fc81 100644 --- a/htdocs/langs/es_ES/productbatch.lang +++ b/htdocs/langs/es_ES/productbatch.lang @@ -5,13 +5,14 @@ ProductStatusNotOnBatch=No (no se usa lote/serie) ProductStatusOnBatchShort=Sí ProductStatusNotOnBatchShort=No Batch=Lote/Serie -atleast1batchfield=Fecha de caducidad o Fecha de venta o Lote +atleast1batchfield=Fecha de caducidad o Fecha de venta o Lote/Numero de Serie batch_number=Número Lote/Serie +BatchNumberShort=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) -printBatch=Lote: %s +printBatch=Lote/Serie %s printEatby=Caducidad: %s printSellby=Límite venta: %s printQty=Cant.: %d diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang index d375d856198af..c46ff18e246b3 100644 --- a/htdocs/langs/es_ES/products.lang +++ b/htdocs/langs/es_ES/products.lang @@ -245,25 +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=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode# +PriceExpressionEditorHelp2=Puede acceder a los atributos adicionales con variables como #extrafield_myextrafieldkey# y variables globales con #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: +PriceExpressionEditorHelp5=Valores globales disponibles: PriceMode=Modo precio PriceNumeric=Número 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 +MinSupplierPrice=Precio mínimo de proveedor +DynamicPriceConfiguration=Configuración de precio dinámico +GlobalVariables=Variables globales +GlobalVariableUpdaters=Actualizaciones de variables globales +GlobalVariableUpdaterType0=datos JSON +GlobalVariableUpdaterHelp0=Analiza datos JSON desde la URL especificada, el valor especifica la ubicación de valor relevante, +GlobalVariableUpdaterHelpFormat0=el formato es {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"} +GlobalVariableUpdaterType1=datos WebService +GlobalVariableUpdaterHelp1=Analiza datos WebService de la URL especificada, NS especifica el namespace, VALUE especifica la ubicación del valor pertinente, DATA contiene los datos a enviar y METHOD es el método WS a llamar +GlobalVariableUpdaterHelpFormat1=el formato es {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}} +UpdateInterval=Intervalo de actualización (minutos) +LastUpdated=Última actualización +CorrectlyUpdated=Actualizado correctamente diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang index 02b13e916e790..0f9ad15ba40b8 100644 --- a/htdocs/langs/es_ES/projects.lang +++ b/htdocs/langs/es_ES/projects.lang @@ -14,6 +14,7 @@ MyTasksDesc=Esta vista se limita a los proyectos y tareas en los que usted es un 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). +AllTaskVisibleButEditIfYouAreAssigned=Todas las tareas para dichos proyectos son visibles, pero introducir tiempos sólo para la tarea que tenga asignada. ProjectsArea=Área proyectos NewProject=Nuevo proyecto AddProject=Crear proyecto @@ -72,7 +73,7 @@ ListSupplierInvoicesAssociatedProject=Listado de facturas de proveedor asociados ListContractAssociatedProject=Listado de contratos asociados al proyecto ListFichinterAssociatedProject=Listado de intervenciones asociadas al proyecto ListExpenseReportsAssociatedProject=Listado de informes de gastos asociados al proyecto -ListDonationsAssociatedProject=List of donations associated with the project +ListDonationsAssociatedProject=Listado de donaciones asociadas al proyecto ListActionsAssociatedProject=Lista de eventos asociados al proyecto ActivityOnProjectThisWeek=Actividad en el proyecto esta semana ActivityOnProjectThisMonth=Actividad en el proyecto este mes diff --git a/htdocs/langs/es_ES/sendings.lang b/htdocs/langs/es_ES/sendings.lang index 898041a139857..9a5a4a59826dc 100644 --- a/htdocs/langs/es_ES/sendings.lang +++ b/htdocs/langs/es_ES/sendings.lang @@ -2,7 +2,7 @@ RefSending=Ref. envío Sending=Envío Sendings=Envíos -AllSendings=All Shipments +AllSendings=Todos los envíos Shipment=Envío Shipments=Envíos ShowSending=Mostrar envío diff --git a/htdocs/langs/es_ES/stocks.lang b/htdocs/langs/es_ES/stocks.lang index 845239bba1544..513727f022f47 100644 --- a/htdocs/langs/es_ES/stocks.lang +++ b/htdocs/langs/es_ES/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Anular envío DeleteSending=Eliminar envío Stock=Stock Stocks=Stocks +StocksByLotSerial=Stock por lote/serie Movement=Movimiento Movements=Movimientos ErrorWarehouseRefRequired=El nombre de referencia del almacén es obligatorio @@ -78,6 +79,7 @@ IdWarehouse=Id. almacén DescWareHouse=Descripción almacén LieuWareHouse=Localización almacén WarehousesAndProducts=Almacenes y productos +WarehousesAndProductsBatchDetail=Almacenes y productos (con detalle por lote/serie) AverageUnitPricePMPShort=Precio medio ponderado (PMP) AverageUnitPricePMP=Precio Medio Ponderado (PMP) de adquisición SellPriceMin=Precio de venta unitario @@ -132,3 +134,6 @@ ShowWarehouse=Mostrar almacén MovementCorrectStock=Corrección de stock del producto %s MovementTransferStock=Transferencia de stock del producto %s a otro almacén 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. +InventoryCodeShort=Código Inv./Mov. +NoPendingReceptionOnSupplierOrder=No existen recepciones pendientes ya que el pedido está abierto +ThisSerialAlreadyExistWithDifferentDate=Este número de lote/serie (%s) ya existe, pero con una fecha de caducidad o venta diferente (encontrada %s pero ha introducido %s). diff --git a/htdocs/langs/es_ES/suppliers.lang b/htdocs/langs/es_ES/suppliers.lang index 85648f97f12ca..84a3fb9ad3491 100644 --- a/htdocs/langs/es_ES/suppliers.lang +++ b/htdocs/langs/es_ES/suppliers.lang @@ -43,4 +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) +UseDoubleApproval=Usar aprobación doble (la segunda aprobación puede ser realizada por un usuario con el permiso dedicado) diff --git a/htdocs/langs/es_ES/trips.lang b/htdocs/langs/es_ES/trips.lang index a3e5cf804bf40..ab3c7a4740220 100644 --- a/htdocs/langs/es_ES/trips.lang +++ b/htdocs/langs/es_ES/trips.lang @@ -1,126 +1,102 @@ # Dolibarr language file - Source file is en_US - trips -ExpenseReport=Expense report -ExpenseReports=Expense reports -Trip=Informe de gastos -Trips=Informes de gastos -TripsAndExpenses=Informes de gastos +ExpenseReport=Gasto +ExpenseReports=Informes de gastos +Trip=Gasto +Trips=Gastos +TripsAndExpenses=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=Nuevo informe de gastos +TripCard=Ficha de gasto +AddTrip=Crear gasto +ListOfTrips=Listado de gastos +ListOfFees=Listado de honorarios +NewTrip=Nuevo gasto CompanyVisited=Empresa/institución visitada Kilometers=Kilometros FeesKilometersOrAmout=Importe o kilómetros -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=Área informe de gastos -SearchATripAndExpense=Search an expense report +DeleteTrip=Eliminar gasto +ConfirmDeleteTrip=¿Está seguro de querer eliminar este gasto? +ListTripsAndExpenses=Listado de gastos +ListToApprove=En espera de aprobación +ExpensesArea=Área de gastos +SearchATripAndExpense=Buscar un gasto 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 +ExpenseReportWaitingForApproval=Se ha enviado un nuevo gasto para ser aprobado +ExpenseReportWaitingForApprovalMessage=Un nuevo gasto ha sido enviado y espera su aprobación.\n-Usuario: %s\n-Periodo: %s\nHaga clic aquí para validarlo: %s +TripId=Id de gasto +AnyOtherInThisListCanValidate=Persona a informar para la validación +TripSociete=Información de la empresa +TripSalarie=Información del usuario +TripNDF=Información del gasto +DeleteLine=Eliminar una línea del gasto +ConfirmDeleteLine=¿Está seguro de querer eliminar esta línea? +PDFStandardExpenseReports=Plantilla estandard para generar un documento de gasto +ExpenseReportLine=Línea de gasto TF_OTHER=Otro -TF_TRANSPORTATION=Transportation +TF_TRANSPORTATION=Transporte 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_TRAIN=Tren +TF_BUS=Autobus +TF_CAR=Coche +TF_PEAGE=Peaje +TF_ESSENCE=Combustible +TF_HOTEL=Hotel TF_TAXI=Taxi -ErrorDoubleDeclaration=You have declared another expense report into a similar date range. -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 -AddLineMini=Add +ErrorDoubleDeclaration=Ha declarado otro gasto en un rango similar de fechas. +ListTripsAndExpenses=Listado de gastos +AucuneNDF=No se han encontrado gastos con este criterio +AucuneLigne=No hay gastos declarados +AddLine=Añadir una línea +AddLineMini=Añadir -Date_DEBUT=Period date start -Date_FIN=Period date end -ModePaiement=Payment mode -Note=Note -Project=Project +Date_DEBUT=Fecha de inicio del periodo +Date_FIN=Fecha fin del periodo +ModePaiement=Modo de pago +Note=Nota +Project=Proyecto -VALIDATOR=User to inform for approbation -VALIDOR=Approved by -AUTHOR=Recorded by -AUTHORPAIEMENT=Paied by -REFUSEUR=Denied by -CANCEL_USER=Canceled by +VALIDATOR=Usuario a informar para la aprobación +VALIDOR=Aprobado por +AUTHOR=Registrado por +AUTHORPAIEMENT=Pagado por +REFUSEUR=Denegado por +CANCEL_USER=Cancelado por -MOTIF_REFUS=Reason -MOTIF_CANCEL=Reason +MOTIF_REFUS=Razón +MOTIF_CANCEL=Razón -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=Fecha denegación +DATE_SAVE=Fecha de validación +DATE_VALIDE=Fecha de validación +DATE_CANCEL=Fecha cancelación +DATE_PAIEMENT=Fecha de pago -Deny=Deny -TO_PAID=Pay -BROUILLONNER=Reopen -SendToValid=Sent to approve -ModifyInfoGen=Edit -ValidateAndSubmit=Validate and submit for approval +TO_PAID=Pagar +BROUILLONNER=Reabrir +SendToValid=Enviar para aprobar +ModifyInfoGen=Modificar +ValidateAndSubmit=Validar y enviar para aprobar -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=No está autorizado para aprobar este gasto +NOT_AUTHOR=No es el autor de este gasto. Operación cancelada. -RefuseTrip=Deny an expense report -ConfirmRefuseTrip=Are you sure you want to deny this expense report ? +RefuseTrip=Denegar un gasto +ConfirmRefuseTrip=¿Está seguro de querer denegar este gasto? -ValideTrip=Approve expense report -ConfirmValideTrip=Are you sure you want to approve this expense report ? +ValideTrip=Aprobar gasto +ConfirmValideTrip=¿Está seguro de querer aprobar este gasto? -PaidTrip=Pay an expense report -ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? +PaidTrip=Pagar gasto +ConfirmPaidTrip=¿Está seguro de querer cambiar el estado de este gasto a "Pagado"? -CancelTrip=Cancel an expense report -ConfirmCancelTrip=Are you sure you want to cancel this expense report ? +CancelTrip=Cancelar gasto +ConfirmCancelTrip=¿Está seguro de querer cancelar este gasto? -BrouillonnerTrip=Move back expense report to status "Draft"n -ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? +BrouillonnerTrip=Devolver gasto al estado "Borrador" +ConfirmBrouillonnerTrip=¿Está seguro de querer devolver este gasto al estado "Borrador"? -SaveTrip=Validate expense report -ConfirmSaveTrip=Are you sure you want to validate this expense report ? +SaveTrip=Validar gasto +ConfirmSaveTrip=¿Está seguro de querer validar este gasto? -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. +NoTripsToExportCSV=Sin gastos a exportar para este periodo. diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang index 057367cc7a257..ae0443ccffbf3 100644 --- a/htdocs/langs/et_EE/admin.lang +++ b/htdocs/langs/et_EE/admin.lang @@ -297,10 +297,11 @@ MenuHandlers=Menüüde töötlejad MenuAdmin=Menüü toimeti DoNotUseInProduction=Ära kasuta tootmispaigaldustes ThisIsProcessToFollow=See on seadistatud töötlema üksust: +ThisIsAlternativeProcessToFollow=This is an alternative setup to process: StepNb=Samm %s FindPackageFromWebSite=Leia pakett, mis võimaldab soovitud funktsionaalsuse (näiteks ametlikul veebilehel %s). DownloadPackageFromWebSite=Download package %s. -UnpackPackageInDolibarrRoot=Paki paketifail Dolibarri juurkataloogi %s +UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: %s SetupIsReadyForUse=Paigaldamine on lõpetatud ja Dolibarr on valmis kasutama uut komponenti. NotExistsDirect=Alternatiivset juurkausta pole määratletud.
InfDirAlt=Alates versioonist 3 on võimalik määratleda alternatiivne juurkaust. See võimaldab samas kohas säilitada liidesed ja enda loodud mallid.
Lihtsalt loo Dolibarri juurkausta lisakataloog (näiteks: custom).
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parameetrite nimekiri on määratletud tabelis
Sü 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=PDFide loomiseks kasutatav teek WarningUsingFPDF=Hoiatus: conf.php sisaldab direktiivi dolibarr_pdf_force_fpdf=1. See tähendab, et PDF failide loomiseks kasutatakse FPDF teeki. FPDF teek on vananenud ja ei toeta paljusid võimalusi (Unicode, läbipaistvad pildid, kirillitsa, araabia ja aasia märgistikke jne), seega võib PDFi loomise ajal tekkida vigu.
Probleemide vältimiseks ja täieliku PDFi loomise toe jaoks palun lae alla TCPDF teek ning seejärel kommenteeri välja või kustuta rida $dolibarr_pdf_force_fpdf=1 ja lisa rida $dolibarr_lib_TCPDF_PATH='TCPDF_kausta_rada' -LocalTaxDesc=Mõnedes riikides rakendub igale arve reale 2 või 3 maksu. Sellisel juhul vali vali teise või kolmanda maksu tüüp ja maksu määr. Võimalikud tüübid on järgnevad:
1 - kohalik maks, rakendub ainult käibemaksuta toodetele ja teenustele (käibemaksu ei rakendata kohalikule maksule)
2 - kohalik maks, rakendub toodetele ja teenustele enne käibemaksu (käibemaksu arvutatakse summa + kohalik_maks pealt)
3 - kohalik maks rakendub käibemaksuta toodetele (käibemaksu ei rakendata kohalikule maksule)
4 - kohalik maks rakendub toodetele enne käibemaksu (käibemaksu arvutatakse summa + kohalik_maks pealt)
5 - kohalik maks rakendub käibemaksuta teenustele (käibemaksu ei rakendata kohalikule maksule)
6 - kohalik maks rakendub teenustele enne käibemaksu (käibemaksu arvutatakse summa + kohalik_maks pealt) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Sisesta telefoninumber, millele kasutaja helistab ClickToDial nupu testimisel %s RefreshPhoneLink=Värskenda linki @@ -540,8 +541,8 @@ Module6000Name=Töövoog Module6000Desc=Töövoo haldamine 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 +Module39000Name=Product lot +Module39000Desc=Lot or serial number, eat-by and sell-by date management on products Module50000Name=Paybox Module50000Desc=Moodul, mis pakub online-makse võimalust krediitkaardiga PayBoxi abil Module50100Name=Kassa @@ -558,8 +559,6 @@ Module59000Name=Marginaalid Module59000Desc=Marginaalide haldamise moodu Module60000Name=Komisjonitasu Module60000Desc=Komisjonitasude haldamise moodu -Module150010Name=Partii number, söö-kuni kuupäev ja müü-kuni kuupäev -Module150010Desc=Toote partii numbri, söö-kuni ja müü-kuni kuupäevade haldamine Permission11=Müügiarvete vaatamine Permission12=Müügiarvete loomine/toimetamine Permission13=Müügiarvete muutmine @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= Pakkumiste, arvete, tellimuste jne loomisel kasutatav RE LocalTax2IsNotUsedDescES= Vaikimisi pakutud IRPF on 0. Reegli lõpp. LocalTax2IsUsedExampleES= Hispaanias on nad vabakutselised ja spetsialistid, kes pakuvad teenuseid ja ettevõtted, kes on valinud moodulipõhise maksusüsteemi. LocalTax2IsNotUsedExampleES= Hispaanias on nad ettevõtted, kes ei kasuta moodulipõhist maksusüsteemi. -CalcLocaltax=Aruanded -CalcLocaltax1ES=Müügid - Ostud +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Sales - Purchases CalcLocaltax1Desc=Kohalike maksude aruannete arvutamiseks kasutatakse kohalike maksude müügi ja kohalike maksude ostude vahet -CalcLocaltax2ES=Ostud +CalcLocaltax2=Purchases CalcLocaltax2Desc=Kohalike maksude aruanded on kohalike maksude ostude summas -CalcLocaltax3ES=Müügid +CalcLocaltax3=Sales CalcLocaltax3Desc=Kohalike maksude aruanded on kohalike maksude müükide summas LabelUsedByDefault=Vaikimisi kasutatav silt, kui koodile ei leitud tõlke vastet LabelOnDocuments=Dokumentide silt @@ -1018,14 +1017,14 @@ NoEventOrNoAuditSetup=Ühtki turvasündmust pole veel salvestatud. See on täies NoEventFoundWithCriteria=Selliste otsingutingimustega ei leitud ühtkik turvasündmust. SeeLocalSendMailSetup=Vaata oma kohaliku sendmaili seadistust BackupDesc=Dolibarrist täieliku varukoopia tegemiseks pead: -BackupDesc2=* Salvestama dokumentide kausta (%s) sisu, mis sisaldab kõiki üles laetud ja loodud faile (näiteks .zip-faili kokku pakkides). -BackupDesc3=* Andmebaasi sisu salvestama tõmmisfaili. Selle jaoks võid kasutada järgmist abilist. +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=Arhiveeritud kausta peaks säilitama turvalises kohas. BackupDescY=Loodud tõmmisfaili peaks säilitama turvalises kohas. BackupPHPWarning=Antud meetodi abil ei saa garanteerida varukoopia loomist, eelistan eelmist meetodit. RestoreDesc=Dolibarri varukoopiast taastamiseks peate: -RestoreDesc2=* Taastama dokumentide kaustast loodud arhiivifaili (näiteks .zip fail) ja selle lahti pakkima uue Dolibarri paigalduse dokumentide kausta või praeguse paigalduse dokumentide kausta (%s). -RestoreDesc3=* Taasta andmebaasi tõmmisest andmed uude Dolibarri paigaldusse või praeguse paigalduse andmebasi. Hoiatus: pärast andmete taastamist pead sisse logimiseks kasutama seda kasutajanime/parooli, mis oli kasutuses varukoopia loomise ajal. Varundatud andmebaasi praegusse paigaldusse sikutamiseks võid kasutada antud abilist. +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=MySQLi import ForcedToByAModule= Aktiveeritud moodul on antud reegli väärtuseks sundinud %s PreviousDumpFiles=Saadaval andmebaasi varukoopiate tõmmised @@ -1337,6 +1336,8 @@ LDAPFieldCountry=Riik LDAPFieldCountryExample=Näide: c LDAPFieldDescription=Kirjeldus LDAPFieldDescriptionExample=Näide: kirjeldus +LDAPFieldNotePublic=Public Note +LDAPFieldNotePublicExample=Example : publicnote LDAPFieldGroupMembers= Grupi liikmed LDAPFieldGroupMembersExample= Näide: unikaalneLiige LDAPFieldBirthdate=Sünniaeg @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= Krediitkaardimaksete vastu võtmiseks kasutatav konto 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot 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 @@ -1616,3 +1617,8 @@ 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 +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" diff --git a/htdocs/langs/et_EE/banks.lang b/htdocs/langs/et_EE/banks.lang index 1003b8caa8e2b..740d08009c490 100644 --- a/htdocs/langs/et_EE/banks.lang +++ b/htdocs/langs/et_EE/banks.lang @@ -163,3 +163,5 @@ LabelRIB=BAN silt NoBANRecord=BAN kirje puudub DeleteARib=Kustuta BAN kirje ConfirmDeleteRib=Kas oled täiesti kindel, et soovid selle BAN kirje kustutada? +StartDate=Start date +EndDate=End date diff --git a/htdocs/langs/et_EE/boxes.lang b/htdocs/langs/et_EE/boxes.lang index 58d9ff2eabee1..a7801245f4536 100644 --- a/htdocs/langs/et_EE/boxes.lang +++ b/htdocs/langs/et_EE/boxes.lang @@ -94,3 +94,4 @@ BoxProductDistributionFor=%s jaotus %s kaupa ForCustomersInvoices=Müügiarved ForCustomersOrders=Müügiarved ForProposals=Pakkumised +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/et_EE/errors.lang b/htdocs/langs/et_EE/errors.lang index 7e9d9f3cba87e..86106217529ab 100644 --- a/htdocs/langs/et_EE/errors.lang +++ b/htdocs/langs/et_EE/errors.lang @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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=Kohustuslikud seadistusparameetrid on määratlemata diff --git a/htdocs/langs/et_EE/interventions.lang b/htdocs/langs/et_EE/interventions.lang index fc1c006e81e20..518a40681f726 100644 --- a/htdocs/langs/et_EE/interventions.lang +++ b/htdocs/langs/et_EE/interventions.lang @@ -50,4 +50,4 @@ ArcticNumRefModelError=Aktiveerimine ebaõnnestus PacificNumRefModelDesc1=Tagastab numbri formaadiga %syymm-nnnn kus yy on aasta, mm on kuu ja nnnn on katkestusteta jada, mis ei lähe kunagi tagasi 0 PacificNumRefModelError=$syymm algusega sekkumise kaart on juba olemas ja too ei sobi kokku sellise mudeliga jadaga. Kustuta või nimeta too kaart ümber selle mooduli aktiveerimiseks. PrintProductsOnFichinter=Trüki tooted sekkumise kaardile -PrintProductsOnFichinterDetails=sekkumiste jaoks, mis on automaatselt loodud tellimustest +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang index e767a115d7501..2a99ca35036b9 100644 --- a/htdocs/langs/et_EE/main.lang +++ b/htdocs/langs/et_EE/main.lang @@ -220,6 +220,7 @@ Next=Järgmine Cards=Kaardid Card=Kaart Now=Nüüd +HourStart=Start hour Date=Kuupäev DateAndHour=Date and hour DateStart=Alguskuupäev @@ -242,6 +243,8 @@ DatePlanShort=Planeeritud kuupäev DateRealShort=Reaalne kuupäev DateBuild=Aruande koostamise kuupäev DatePayment=Maksekuupäev +DateApprove=Approving date +DateApprove2=Approving date (second approval) DurationYear=aasta DurationMonth=kuu DurationWeek=nädal @@ -408,6 +411,8 @@ OtherInformations=Muu informatsioon Quantity=Kogus Qty=Kogus ChangedBy=Muutis +ApprovedBy=Approved by +ApprovedBy2=Approved by (second approval) ReCalculate=Arvuta uuesti ResultOk=Õnnestumine ResultKo=Viga @@ -696,6 +701,8 @@ 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. +Deny=Deny +Denied=Denied # 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 74e61e45396eb..f886109879c63 100644 --- a/htdocs/langs/et_EE/orders.lang +++ b/htdocs/langs/et_EE/orders.lang @@ -79,7 +79,9 @@ NoOpenedOrders=Pole ühtki avatud tellimust NoOtherOpenedOrders=Pole ühtki muud avatud tellimust NoDraftOrders=Ühtki tellimuse mustandit ei ole OtherOrders=Muud tellimused -LastOrders=Viimased %s tellimust +LastOrders=Last %s customer orders +LastCustomerOrders=Last %s customer orders +LastSupplierOrders=Last %s supplier orders LastModifiedOrders=Viimased %s muudetud tellimust LastClosedOrders=Viimased %s suletud tellimust AllOrders=Kõik tellimused diff --git a/htdocs/langs/et_EE/other.lang b/htdocs/langs/et_EE/other.lang index dc8d17da65676..eab9c51be72f4 100644 --- a/htdocs/langs/et_EE/other.lang +++ b/htdocs/langs/et_EE/other.lang @@ -203,6 +203,7 @@ NewKeyWillBe=Uus tarkvarasse sisselogimise salasõna on ClickHereToGoTo=Klõpsa siia, et minna %s YouMustClickToChange=Esmalt pead klõpsa järgneval lingil, et kinnitada salasõna muutmine ForgetIfNothing=Kui Sina ei palunud seda muudatust, siis ignoreeri antud kirja ja mingeid muudatusi ei toimu. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=Lisa kirje kalendrisse %s diff --git a/htdocs/langs/et_EE/productbatch.lang b/htdocs/langs/et_EE/productbatch.lang index 452636819653f..85b1d27f3a611 100644 --- a/htdocs/langs/et_EE/productbatch.lang +++ b/htdocs/langs/et_EE/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use batch/serial number -ProductStatusOnBatch=Yes (Batch/serial required) -ProductStatusNotOnBatch=No (Batch/serial not used) +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/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 +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial 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 +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %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. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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/et_EE/projects.lang b/htdocs/langs/et_EE/projects.lang index 38a2c9c6d3741..a5aeb31e5a9c5 100644 --- a/htdocs/langs/et_EE/projects.lang +++ b/htdocs/langs/et_EE/projects.lang @@ -14,6 +14,7 @@ MyTasksDesc=Selles vaates näidatakse vaid neid projekte või ülesandeid, mille 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) +AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. ProjectsArea=Projektide ala NewProject=Uus projekt AddProject=Create project diff --git a/htdocs/langs/et_EE/stocks.lang b/htdocs/langs/et_EE/stocks.lang index 026f5f6aefe15..34bab60106b2f 100644 --- a/htdocs/langs/et_EE/stocks.lang +++ b/htdocs/langs/et_EE/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Tühista saatmine DeleteSending=Kustuta saatmine Stock=Laojääk Stocks=Laojäägid +StocksByLotSerial=Stock by lot/serial Movement=Liikumine Movements=Liikumised ErrorWarehouseRefRequired=Lao viide on nõutud @@ -78,6 +79,7 @@ IdWarehouse=Lao ID DescWareHouse=Lao kirjeldus LieuWareHouse=Lao lokaliseerimine WarehousesAndProducts=Laod ja tooted +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=Kaalutud keskmine sisendhind AverageUnitPricePMP=Kaalutud keskmine sisendhind SellPriceMin=Ühiku müügihind @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/et_EE/suppliers.lang b/htdocs/langs/et_EE/suppliers.lang index bba811e26e959..e5f5685505d22 100644 --- a/htdocs/langs/et_EE/suppliers.lang +++ b/htdocs/langs/et_EE/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) +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/et_EE/trips.lang b/htdocs/langs/et_EE/trips.lang index 12661480a8e18..1aba2f539ee5e 100644 --- a/htdocs/langs/et_EE/trips.lang +++ b/htdocs/langs/et_EE/trips.lang @@ -69,11 +69,9 @@ 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 @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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 1955826bb0307..6c71d93825aeb 100644 --- a/htdocs/langs/eu_ES/admin.lang +++ b/htdocs/langs/eu_ES/admin.lang @@ -297,10 +297,11 @@ MenuHandlers=Menu maneiatzailea MenuAdmin=Menu editorea DoNotUseInProduction=Do not use in production ThisIsProcessToFollow=This is setup to process: +ThisIsAlternativeProcessToFollow=This is an alternative setup to process: StepNb=%s pausua 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).
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_ 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=PDF-ak sortzeko erabilitako liburutegia 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) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s RefreshPhoneLink=Esteka freskatu @@ -540,8 +541,8 @@ 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 +Module39000Name=Product lot +Module39000Desc=Lot 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 @@ -558,8 +559,6 @@ Module59000Name=Marjinak Module59000Desc=Marjinak kudeatzeko modulua 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=Bezeroen fakturak ikusi Permission12=Bezeroen fakturak sortu/aldatu Permission13=Bezeroaren fakturak baliogabetu @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, 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 +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Sales - Purchases CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Purchases +CalcLocaltax2=Purchases CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Sales +CalcLocaltax3=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 @@ -1018,14 +1017,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 @@ -1337,6 +1336,8 @@ LDAPFieldCountry=Country LDAPFieldCountryExample=Example : c LDAPFieldDescription=Deskribapena LDAPFieldDescriptionExample=Adibidea : deskribapena +LDAPFieldNotePublic=Public Note +LDAPFieldNotePublicExample=Example : publicnote LDAPFieldGroupMembers= Group members LDAPFieldGroupMembersExample= Example : uniqueMember LDAPFieldBirthdate=Jaiotze-data @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= Default account to use to receive payments by credit c 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot 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 @@ -1616,3 +1617,8 @@ 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 +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" diff --git a/htdocs/langs/eu_ES/banks.lang b/htdocs/langs/eu_ES/banks.lang index a2306950fb484..72639883e1ac2 100644 --- a/htdocs/langs/eu_ES/banks.lang +++ b/htdocs/langs/eu_ES/banks.lang @@ -163,3 +163,5 @@ LabelRIB=BAN Label NoBANRecord=No BAN record DeleteARib=Delete BAN record ConfirmDeleteRib=Are you sure you want to delete this BAN record ? +StartDate=Start date +EndDate=End date diff --git a/htdocs/langs/eu_ES/boxes.lang b/htdocs/langs/eu_ES/boxes.lang index 0596d677c46ad..c0180bebdaa46 100644 --- a/htdocs/langs/eu_ES/boxes.lang +++ b/htdocs/langs/eu_ES/boxes.lang @@ -1,91 +1,97 @@ # 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 -# 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 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 -# BoxTitleLastCustomerBills=Last %s customer's invoices -# BoxTitleLastSupplierBills=Last %s supplier's invoices -# BoxTitleLastProspects=Last %s recorded prospects -# BoxTitleLastModifiedProspects=Last %s modified prospects -# BoxTitleLastProductsInContract=Last %s products/services in a contract -# BoxTitleLastModifiedMembers=Last %s modified members -# BoxTitleLastFicheInter=Last %s modified intervention -# BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer's invoices -# BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier's invoices -# BoxTitleCurrentAccounts=Opened account's balances -# BoxTitleSalesTurnover=Sales turnover -# BoxTitleTotalUnpaidCustomerBills=Unpaid customer's invoices -# BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier's 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=%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 -# ForCustomersInvoices=Customers invoices -# ForCustomersOrders=Customers orders -# ForProposals=Proposals +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 +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/eu_ES/errors.lang b/htdocs/langs/eu_ES/errors.lang index 52e9f6aeae473..dbafde2f6e546 100644 --- a/htdocs/langs/eu_ES/errors.lang +++ b/htdocs/langs/eu_ES/errors.lang @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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/langs/eu_ES/interventions.lang b/htdocs/langs/eu_ES/interventions.lang index c79da05364e61..67d4f61d9f15d 100644 --- a/htdocs/langs/eu_ES/interventions.lang +++ b/htdocs/langs/eu_ES/interventions.lang @@ -50,4 +50,4 @@ 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 +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang index 64a77ffde2714..5adafa00c76af 100644 --- a/htdocs/langs/eu_ES/main.lang +++ b/htdocs/langs/eu_ES/main.lang @@ -220,6 +220,7 @@ Next=Hurrengoa Cards=Cards Card=Card Now=Orain +HourStart=Start hour Date=Data DateAndHour=Date and hour DateStart=Date start @@ -242,6 +243,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 +411,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 @@ -696,6 +701,8 @@ 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. +Deny=Deny +Denied=Denied # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/eu_ES/orders.lang b/htdocs/langs/eu_ES/orders.lang index 3d4f381c40b4d..044bcc0eb0174 100644 --- a/htdocs/langs/eu_ES/orders.lang +++ b/htdocs/langs/eu_ES/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/langs/eu_ES/other.lang b/htdocs/langs/eu_ES/other.lang index 9b2de3eeb9024..6b60f5eac9717 100644 --- a/htdocs/langs/eu_ES/other.lang +++ b/htdocs/langs/eu_ES/other.lang @@ -203,6 +203,7 @@ 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. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=Add entry in calendar %s diff --git a/htdocs/langs/eu_ES/productbatch.lang b/htdocs/langs/eu_ES/productbatch.lang index 452636819653f..85b1d27f3a611 100644 --- a/htdocs/langs/eu_ES/productbatch.lang +++ b/htdocs/langs/eu_ES/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use batch/serial number -ProductStatusOnBatch=Yes (Batch/serial required) -ProductStatusNotOnBatch=No (Batch/serial not used) +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/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 +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial 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 +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %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. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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/eu_ES/projects.lang b/htdocs/langs/eu_ES/projects.lang index 03c11382a2d8b..eac0f41d321f1 100644 --- a/htdocs/langs/eu_ES/projects.lang +++ b/htdocs/langs/eu_ES/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/langs/eu_ES/stocks.lang b/htdocs/langs/eu_ES/stocks.lang index 29706d1761545..c2b432d7f9b93 100644 --- a/htdocs/langs/eu_ES/stocks.lang +++ b/htdocs/langs/eu_ES/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Cancel sending DeleteSending=Delete sending Stock=Stock Stocks=Stocks +StocksByLotSerial=Stock by lot/serial Movement=Movement Movements=Movements ErrorWarehouseRefRequired=Warehouse reference name is required @@ -78,6 +79,7 @@ IdWarehouse=Id warehouse DescWareHouse=Description warehouse LieuWareHouse=Localisation warehouse WarehousesAndProducts=Warehouses and products +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=Weighted average input price AverageUnitPricePMP=Weighted average input price SellPriceMin=Selling Unit Price @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/eu_ES/suppliers.lang b/htdocs/langs/eu_ES/suppliers.lang index d9de79fe84dbc..e0552c064e8ce 100644 --- a/htdocs/langs/eu_ES/suppliers.lang +++ b/htdocs/langs/eu_ES/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) +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/eu_ES/trips.lang b/htdocs/langs/eu_ES/trips.lang index 35f4d8f1cada4..a39886daeb87c 100644 --- a/htdocs/langs/eu_ES/trips.lang +++ b/htdocs/langs/eu_ES/trips.lang @@ -69,11 +69,9 @@ 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 @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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 76814c7ae0bff..0ab1934d70781 100644 --- a/htdocs/langs/fa_IR/admin.lang +++ b/htdocs/langs/fa_IR/admin.lang @@ -297,10 +297,11 @@ MenuHandlers=گرداننده منو MenuAdmin=ویرایشگر منو DoNotUseInProduction=آیا در استفاده از تولید نیست ThisIsProcessToFollow=این راه اندازی به فرآیند است: +ThisIsAlternativeProcessToFollow=This is an alternative setup to process: StepNb=مرحله٪ s را FindPackageFromWebSite=پیدا کردن یک بسته است که ویژگی فراهم می کند شما می خواهید (به عنوان مثال در وب سایت رسمی٪ بازدید کنندگان). DownloadPackageFromWebSite=دانلود بسته %s. -UnpackPackageInDolibarrRoot=باز کردن فایل بسته به پوشه ریشه Dolibarr هست٪ s +UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: %s SetupIsReadyForUse=نصب به پایان رسید و Dolibarr آماده استفاده است با این بخش جدید است. NotExistsDirect=ریشه جایگزین تعریف نشده است.
InfDirAlt=از آنجا که نسخه 3 این امکان وجود دارد که تعریف کند directory.This ریشه جایگزین شما اجازه می دهد برای ذخیره، همان محل، پلاگین ها و قالب های سفارشی.
(: سفارشی به عنوان مثال) فقط یک پوشه در ریشه Dolibarr ایجاد کنید.
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=لیست پارامترها می آید از یک ج 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=کتابخانه مورد استفاده برای ساخت PDF WarningUsingFPDF=اخطار: conf.php شما شامل dolibarr_pdf_force_fpdf بخشنامه = 1. این به این معنی شما استفاده از کتابخانه FPDF برای تولید فایل های PDF. این کتابخانه قدیمی است و بسیاری از ویژگی های (یونیکد، شفافیت تصویر، زبان سیریلیک، عربی و آسیایی، ...) را پشتیبانی نمی کند، بنابراین شما ممکن است خطا در PDF نسل را تجربه کنند.
برای حل این و دارای پشتیبانی کامل از PDF نسل، لطفا دانلود کنید کتابخانه TCPDF ، پس از آن اظهار نظر و یا حذف خط $ dolibarr_pdf_force_fpdf = 1، و اضافه کردن به جای $ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir' -LocalTaxDesc=برخی از کشورها 2 یا 3 مالیات در هر خط فاکتور اعمال می شود. اگر این مورد است، نوع مالیات دوم و سوم و نرخ آن را انتخاب کنید. نوع ممکن است:
1: مالیات های محلی اعمال می شود بر روی محصولات و خدمات بدون مالیات بر ارزش افزوده (مالیات بر ارزش افزوده بر مالیات های محلی به کار گرفته نمی شود)
2: مالیات های محلی اعمال می شود بر روی محصولات و خدمات قبل از مالیات بر ارزش افزوده (مالیات بر ارزش افزوده بر مقدار + localtax محاسبه)
3: مالیات های محلی اعمال می شود بر روی محصولات بدون مالیات بر ارزش افزوده (مالیات بر ارزش افزوده بر مالیات های محلی به کار گرفته نمی شود)
4: مالیات های محلی اعمال می شود بر روی محصولات قبل از مالیات بر ارزش افزوده (مالیات بر ارزش افزوده بر مقدار + localtax محاسبه)
5: مالیات های محلی اعمال می شود در خدمات بدون مالیات بر ارزش افزوده (مالیات بر ارزش افزوده بر مالیات های محلی به کار گرفته نمی شود)
6: مالیات های محلی اعمال می شود در مورد خدمات قبل از مالیات بر ارزش افزوده (مالیات بر ارزش افزوده بر مقدار + localtax محاسبه) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=شماره تلفن را وارد کنید تماس بگیرید برای نشان دادن یک لینک برای تست آدرس ClickToDial برای کاربر٪ s را RefreshPhoneLink=تازه کردن لینک @@ -540,8 +541,8 @@ Module6000Name=گردش کار Module6000Desc=مدیریت گردش کار 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 +Module39000Name=Product lot +Module39000Desc=Lot or serial number, eat-by and sell-by date management on products Module50000Name=خزانه Module50000Desc=ماژول برای ارائه یک صفحه پرداخت آنلاین از طریق کارت اعتباری با خزانه Module50100Name=نقطه ای از فروش @@ -558,8 +559,6 @@ Module59000Name=حاشیه Module59000Desc=ماژول برای مدیریت حاشیه Module60000Name=کمیسیون ها Module60000Desc=ماژول برای مدیریت کمیسیون -Module150010Name=شماره بچ، غذا خوردن، بر اساس تاریخ و فروش بر اساس تاریخ -Module150010Desc=تعداد دسته، غذا خوردن، بر اساس تاریخ و فروش توسط مدیریت تاریخ برای محصول Permission11=خوانده شده فاکتورها مشتری Permission12=ایجاد / اصلاح صورت حساب مشتری Permission13=صورت حساب مشتری Unvalidate @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= نرخ RE به طور پیش فرض هنگام ایجاد LocalTax2IsNotUsedDescES= به طور پیش فرض IRPF پیشنهاد 0. پایان حکومت است. LocalTax2IsUsedExampleES= در اسپانیا، مترجمان آزاد و مستقل حرفه ای که ارائه خدمات و شرکت های که انتخاب کرده اند نظام مالیاتی از ماژول های. LocalTax2IsNotUsedExampleES= در اسپانیا آنها bussines به سیستم مالیاتی از ماژول های موضوع نیست. -CalcLocaltax=گزارش ها -CalcLocaltax1ES=فروش - خرید +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Sales - Purchases CalcLocaltax1Desc=گزارش مالیات های محلی با تفاوت بین localtaxes فروش و localtaxes خرید محاسبه -CalcLocaltax2ES=خرید +CalcLocaltax2=Purchases CalcLocaltax2Desc=گزارش مالیات های محلی هستند که مجموع localtaxes خرید -CalcLocaltax3ES=فروش +CalcLocaltax3=Sales CalcLocaltax3Desc=گزارش مالیات های محلی هستند که مجموع localtaxes فروش LabelUsedByDefault=برچسب استفاده می شود به طور پیش فرض اگر هیچ ترجمه ای برای کد یافت LabelOnDocuments=برچسب در اسناد @@ -1018,14 +1017,14 @@ NoEventOrNoAuditSetup=هیچ رویداد امنیتی ثبت نشده است. NoEventFoundWithCriteria=هیچ رویداد امنیتی شده است برای چنین معیارهای جستجو در بر داشت. SeeLocalSendMailSetup=مشاهده راه اندازی از sendmail محلی خود BackupDesc=برای ایجاد یک پشتیبان کامل از Dolibarr، شما باید: -BackupDesc2=* ذخیره محتوای دایرکتوری اسناد (٪) که شامل تمام فایل های آپلود و تولید (شما می توانید فایل های فشرده به عنوان مثال را). -BackupDesc3=* ذخیره محتوای پایگاه داده خود را به یک فایل روگرفت. برای این کار، شما می توانید زیر دستیار استفاده کنید. +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=دایرکتوری آرشیو شده باید در یک مکان امن ذخیره می شود. BackupDescY=فایل روگرفت تولید باید در یک مکان امن ذخیره می شود. BackupPHPWarning=پشتیبان گیری می توانید با این روش نمی توان guaranted. ترجیح می دهند قبل RestoreDesc=برای بازگرداندن یک نسخه پشتیبان تهیه Dolibarr، شما باید: -RestoreDesc2=* بازگرداندن فایل آرشیو (فایل زیپ به عنوان مثال) از اسناد دایرکتوری برای استخراج درخت فایل در اسناد دایرکتوری از یک نصب جدید Dolibarr و یا به این directoy اسناد فعلی (از٪ s). -RestoreDesc3=* بازگرداندن داده ها، از یک فایل روگرفت پشتیبان گیری، به پایگاه داده از نصب جدید Dolibarr و یا به پایگاه داده از نصب در حال حاضر. اخطار، یک بار بازگرداندن به پایان رسید، شما باید وارد شوید / رمز عبور، که وجود داشته است هنگامی که پشتیبان گیری ساخته شده برای اتصال دوباره استفاده کنید. برای بازگرداندن پایگاه داده پشتیبان گیری به این نصب و راه اندازی در حال حاضر، شما می توانید این دستیار دنبال کنید. +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=واردات خروجی زیر ForcedToByAModule= این قانون توسط یک ماژول فعال به٪ s اجباری PreviousDumpFiles=فایل روگرفت پایگاه داده پشتیبان گیری می کند @@ -1337,6 +1336,8 @@ LDAPFieldCountry=کشور LDAPFieldCountryExample=به عنوان مثال: ج LDAPFieldDescription=توصیف LDAPFieldDescriptionExample=به عنوان مثال: توضیحات +LDAPFieldNotePublic=Public Note +LDAPFieldNotePublicExample=Example : publicnote LDAPFieldGroupMembers= اعضای گروه LDAPFieldGroupMembersExample= به عنوان مثال: uniqueMember LDAPFieldBirthdate=تاریخ تولد @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= پیش فرض حساب استفاده برای دری 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=راه اندازی ماژول چوب الف @@ -1616,3 +1617,8 @@ 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 +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" diff --git a/htdocs/langs/fa_IR/banks.lang b/htdocs/langs/fa_IR/banks.lang index 30e1877cfe803..fb73c087b53d6 100644 --- a/htdocs/langs/fa_IR/banks.lang +++ b/htdocs/langs/fa_IR/banks.lang @@ -163,3 +163,5 @@ LabelRIB=BAN برچسب NoBANRecord=هیچ سابقه BAN DeleteARib=حذف رکورد BAN ConfirmDeleteRib=آیا مطمئن هستید که می خواهید این رکورد BAN را حذف کنید؟ +StartDate=Start date +EndDate=End date diff --git a/htdocs/langs/fa_IR/boxes.lang b/htdocs/langs/fa_IR/boxes.lang index 9ce956f693d72..9be03f59ea74c 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,8 @@ BoxSuppliersOrdersPerMonth=سفارشات تامین کننده در هر ماه BoxProposalsPerMonth=پیشنهادات در هر ماه NoTooLowStockProducts=هیچ محصولی در زیر حد سهام کم BoxProductDistribution=محصولات / خدمات توزیع -BoxProductDistributionFor=توزیع از%s را برای%s +BoxProductDistributionFor=توزیع از٪ s را برای٪ s ForCustomersInvoices=مشتریان فاکتورها ForCustomersOrders=سفارشات مشتریان ForProposals=پیشنهادات +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/fa_IR/errors.lang b/htdocs/langs/fa_IR/errors.lang index 6331432e54835..27b8070130f8d 100644 --- a/htdocs/langs/fa_IR/errors.lang +++ b/htdocs/langs/fa_IR/errors.lang @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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=پارامترهای راه اندازی اجباری هنوز تعریف نشده diff --git a/htdocs/langs/fa_IR/interventions.lang b/htdocs/langs/fa_IR/interventions.lang index 2b495fe60aa70..34dfa614e403f 100644 --- a/htdocs/langs/fa_IR/interventions.lang +++ b/htdocs/langs/fa_IR/interventions.lang @@ -50,4 +50,4 @@ ArcticNumRefModelError=برای فعال سازی ناموفق PacificNumRefModelDesc1=بازگشت numero با فرمت٪ syymm-NNNN که در آن YY سال است، میلی متر در ماه است و NNNN دنباله بدون استراحت و بدون بازگشت به 0 است PacificNumRefModelError=کارت مداخله با $ شروع میشوند syymm حال حاضر وجود دارد و سازگار با این مدل توالی نیست. آن را حذف و یا تغییر نام آن را به این ماژول را فعال کنید. PrintProductsOnFichinter=محصول چاپ بر روی کارت مداخله -PrintProductsOnFichinterDetails=forinterventions تولید شده از سفارشات +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang index 578185c24e25f..aeac14cf35bb8 100644 --- a/htdocs/langs/fa_IR/main.lang +++ b/htdocs/langs/fa_IR/main.lang @@ -220,6 +220,7 @@ Next=بعد Cards=کارت Card=کارت Now=اکنون +HourStart=Start hour Date=تاریخ DateAndHour=Date and hour DateStart=تاریخ شروع @@ -242,6 +243,8 @@ DatePlanShort=تاریخ برنامه ریزی DateRealShort=تاریخ واقعی است. DateBuild=تاریخ گزارش ساخت DatePayment=تاریخ پرداخت +DateApprove=Approving date +DateApprove2=Approving date (second approval) DurationYear=سال DurationMonth=ماه DurationWeek=هفته @@ -408,6 +411,8 @@ OtherInformations=سایر اطلاعات Quantity=مقدار Qty=تعداد ChangedBy=تغییر توسط +ApprovedBy=Approved by +ApprovedBy2=Approved by (second approval) ReCalculate=دوباره حساب کردن ResultOk=موفقیت ResultKo=شکست @@ -696,6 +701,8 @@ 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. +Deny=Deny +Denied=Denied # Week day Monday=دوشنبه Tuesday=سهشنبه diff --git a/htdocs/langs/fa_IR/orders.lang b/htdocs/langs/fa_IR/orders.lang index bd43d5e63811d..93046ff0b3ed5 100644 --- a/htdocs/langs/fa_IR/orders.lang +++ b/htdocs/langs/fa_IR/orders.lang @@ -79,7 +79,9 @@ NoOpenedOrders=بدون سفارشات باز NoOtherOpenedOrders=بدون دیگر سفارشات باز NoDraftOrders=بدون پیش نویس سفارشات OtherOrders=دیگر سفارشات -LastOrders=تاریخ و زمان آخرین٪ بازدید کنندگان سفارشات +LastOrders=Last %s customer orders +LastCustomerOrders=Last %s customer orders +LastSupplierOrders=Last %s supplier orders LastModifiedOrders=تاریخ و زمان آخرین٪ s در دستور تغییر LastClosedOrders=تاریخ و زمان آخرین٪ s در دستور بسته AllOrders=تمام سفارشات diff --git a/htdocs/langs/fa_IR/other.lang b/htdocs/langs/fa_IR/other.lang index e552336f4050c..391adaa8c6c8d 100644 --- a/htdocs/langs/fa_IR/other.lang +++ b/htdocs/langs/fa_IR/other.lang @@ -203,6 +203,7 @@ NewKeyWillBe=کلید جدید را برای ورود به نرم افزار خ ClickHereToGoTo=برای رفتن به٪ s اینجا را کلیک کنید YouMustClickToChange=با این حال شما باید اول بر روی لینک زیر کلیک کنید تا اعتبار این تغییر رمز عبور ForgetIfNothing=اگر شما این تغییر را درخواست نکرده، فقط این ایمیل را فراموش کرده ام. اعتبار نامه های شما امن نگهداری می شود. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=اضافه کردن ورودی در تقویم از٪ s diff --git a/htdocs/langs/fa_IR/productbatch.lang b/htdocs/langs/fa_IR/productbatch.lang index 452636819653f..85b1d27f3a611 100644 --- a/htdocs/langs/fa_IR/productbatch.lang +++ b/htdocs/langs/fa_IR/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use batch/serial number -ProductStatusOnBatch=Yes (Batch/serial required) -ProductStatusNotOnBatch=No (Batch/serial not used) +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/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 +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial 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 +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %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. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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/fa_IR/projects.lang b/htdocs/langs/fa_IR/projects.lang index 31b2ef018c6f0..042df9b5617b7 100644 --- a/htdocs/langs/fa_IR/projects.lang +++ b/htdocs/langs/fa_IR/projects.lang @@ -14,6 +14,7 @@ MyTasksDesc=این دیدگاه به پروژه ها و یا کارهای شما OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=این دیدگاه ارائه تمام پروژه ها و کارهای شما مجاز به خواندن. TasksDesc=این دیدگاه ارائه تمام پروژه ها و وظایف (مجوز دسترسی خود را به شما عطا اجازه دسترسی به همه چیز). +AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. ProjectsArea=منطقه پروژه ها NewProject=پروژه های جدید AddProject=Create project diff --git a/htdocs/langs/fa_IR/stocks.lang b/htdocs/langs/fa_IR/stocks.lang index 1e27de088b8d4..bdbb171514029 100644 --- a/htdocs/langs/fa_IR/stocks.lang +++ b/htdocs/langs/fa_IR/stocks.lang @@ -16,6 +16,7 @@ CancelSending=لغو ارسال DeleteSending=حذف ارسال Stock=موجودی Stocks=سهام +StocksByLotSerial=Stock by lot/serial Movement=جنبش Movements=جنبش ErrorWarehouseRefRequired=نام انبار مرجع مورد نیاز است @@ -78,6 +79,7 @@ IdWarehouse=انبار شناسه DescWareHouse=شرح انبار LieuWareHouse=انبار محل WarehousesAndProducts=سیستم های ذخیره سازی و محصولات +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=میانگین وزنی قیمت ورودی AverageUnitPricePMP=میانگین وزنی قیمت ورودی SellPriceMin=فروش قیمت واحد @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/fa_IR/suppliers.lang b/htdocs/langs/fa_IR/suppliers.lang index 0699573aec7c9..34c369e9eeadd 100644 --- a/htdocs/langs/fa_IR/suppliers.lang +++ b/htdocs/langs/fa_IR/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) +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/fa_IR/trips.lang b/htdocs/langs/fa_IR/trips.lang index 3b596baa3e7b3..920831df47508 100644 --- a/htdocs/langs/fa_IR/trips.lang +++ b/htdocs/langs/fa_IR/trips.lang @@ -69,11 +69,9 @@ 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 @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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 33c0c40e2801f..bf1d3b9765c92 100644 --- a/htdocs/langs/fi_FI/admin.lang +++ b/htdocs/langs/fi_FI/admin.lang @@ -297,10 +297,11 @@ MenuHandlers=Valikko käsitteleville MenuAdmin=Valikko editor DoNotUseInProduction=Do not use in production ThisIsProcessToFollow=Tämä on asetettu käsitellä: +ThisIsAlternativeProcessToFollow=This is an alternative setup to process: StepNb=Vaihe %s FindPackageFromWebSite=Etsi paketti, joka sisältää haluamasi toiminnon (esimerkiksi www-sivuston %s). DownloadPackageFromWebSite=Download package %s. -UnpackPackageInDolibarrRoot=Pura paketti tiedoston Dolibarr juurihakemistoon %s +UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: %s SetupIsReadyForUse=Asenna on päättynyt ja Dolibarr on valmis käyttämään tätä uutta komponenttia. 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).
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_ 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) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s RefreshPhoneLink=Refresh link @@ -540,8 +541,8 @@ 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 +Module39000Name=Product lot +Module39000Desc=Lot or serial number, eat-by and sell-by date management on products Module50000Name=Paybox Module50000Desc=Moduuli tarjoaa online-maksu sivun luottokortti Paybox Module50100Name=Kassa @@ -558,8 +559,6 @@ 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=Lue laskut Permission12=Luo laskut Permission13=Muokka laskut @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= RE määrä oletuksena luodessasi näkymiä, laskuja, til LocalTax2IsNotUsedDescES= Oletuksena ehdotettu IRPF on 0. Loppu sääntö. LocalTax2IsUsedExampleES= Espanjassa, freelancer ja itsenäisten ammatinharjoittajien, jotka tarjoavat palveluja ja yrityksiä, jotka ovat valinneet verojärjestelmän moduuleja. LocalTax2IsNotUsedExampleES= Espanjassa niitä bussines ei veroteta järjestelmän moduulit. -CalcLocaltax=Reports -CalcLocaltax1ES=Sales - Purchases +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Sales - Purchases CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Purchases +CalcLocaltax2=Purchases CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Sales +CalcLocaltax3=Sales CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales LabelUsedByDefault=Label käyttää oletusarvoisesti, jos ei ole käännös löytyy koodi LabelOnDocuments=Label asiakirjoihin @@ -1018,14 +1017,14 @@ NoEventOrNoAuditSetup=O turvallisuus tapahtuma on kirjattu vielä. Tämä voi ol NoEventFoundWithCriteria=O turvallisuus tapauksessa on todettu tällaisen haun criterias. SeeLocalSendMailSetup=Katso paikallisen sendmail setup BackupDesc=Voit tehdä täydellinen varmuuskopio Dolibarr sinun tulee: -BackupDesc2=* Tallenna asiakirjojen sisällöstä hakemistosta ( %s), joka sisältää kaikki ladataan ja se tuotti tiedostoja (voit tehdä zip esim.). -BackupDesc3=* Tallenna sisältöä tietokannan kanssa kaatopaikka. tämän, voit käyttää seuraavia avustaja. +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=Arkistoidut hakemistossa on säilytettävä turvallisessa paikassa. BackupDescY=Luotu dump tiedosto on säilytettävä turvallisessa paikassa. BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one RestoreDesc=Jos haluat palauttaa Dolibarr varmuuskopio, sinun täytyy: -RestoreDesc2=* Palautetaan arkistotiedosto (zip-tiedosto esimerkiksi) asiakirjojen hakemistoon otteen puu tiedostoja asiakirjoissa hakemiston uuden Dolibarr asennus tai tämän nykyisen asiakirjojen directoy ( %s). -RestoreDesc3=* Palautetaan tietoja siitä varmuuskopion dump tiedoston, osaksi tietokannan uuden Dolibarr asennus tai tietokannan nykyinen asennus. Varoitus, kun palauttaa on valmis, sinun täytyy käyttää tunnus / salasana, joka vallitsi silloin, kun varmuuskopio tehtiin, muodostaa yhteys uudelleen. Jos haluat palauttaa varmuuskopion tietokanta tämän nykyisen asennuksen, voit seurata tämän avustaja. +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= Tämä sääntö on pakko %s on aktivoitu moduuli PreviousDumpFiles=Käytettävissä oleva tietokanta taaksepäin dumpata arkistoida @@ -1337,6 +1336,8 @@ LDAPFieldCountry=Maa LDAPFieldCountryExample=Esimerkki: c LDAPFieldDescription=Kuvaus LDAPFieldDescriptionExample=Esimerkki: kuvaus +LDAPFieldNotePublic=Public Note +LDAPFieldNotePublicExample=Example : publicnote LDAPFieldGroupMembers= Ryhmän jäsenet LDAPFieldGroupMembersExample= Esimerkki: uniqueMember LDAPFieldBirthdate=Syntymäaika @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= Tilin käyttö voidaan saada käteismaksujen luottokor 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot 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 @@ -1616,3 +1617,8 @@ 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 +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" diff --git a/htdocs/langs/fi_FI/banks.lang b/htdocs/langs/fi_FI/banks.lang index 3a30c33e0f440..b3062b5b0ae9f 100644 --- a/htdocs/langs/fi_FI/banks.lang +++ b/htdocs/langs/fi_FI/banks.lang @@ -163,3 +163,5 @@ LabelRIB=BAN tunnus NoBANRecord=Ei BAN tietuetta DeleteARib=Poista BAN tiedue ConfirmDeleteRib=Are you sure you want to delete this BAN record ? +StartDate=Start date +EndDate=End date diff --git a/htdocs/langs/fi_FI/boxes.lang b/htdocs/langs/fi_FI/boxes.lang index c42efbcd00f05..0caf66cfaf764 100644 --- a/htdocs/langs/fi_FI/boxes.lang +++ b/htdocs/langs/fi_FI/boxes.lang @@ -12,6 +12,7 @@ BoxLastProspects=Viimeksi muokatut mahdollisuudet BoxLastCustomers=Viimeisin muokatut asiakkaat BoxLastSuppliers=Viimeksi muokatut toimittajat BoxLastCustomerOrders=Viimeisimmät asiakkaan tilaukset +BoxLastValidatedCustomerOrders=Last validated customer orders BoxLastBooks=Uusimmat kirjat BoxLastActions=Viimeisimmät toiminnot BoxLastContracts=Viimeisimmät sopimukset @@ -27,26 +28,29 @@ BoxTitleNbOfCustomers=Asiakasmäärä BoxTitleLastRssInfos=Viimeisimmät %s uutiset %s BoxTitleLastProducts=Viimeksi %s muokattuja tuotteita/palveluita BoxTitleProductsAlertStock=Tuotteiden varastohälytykset -BoxTitleLastCustomerOrders=Viimeksi %s muokatut asiakkaiden tilaukset +BoxTitleLastCustomerOrders=Last %s customer orders +BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders BoxTitleLastSuppliers=Viimeksi %s lisätyt toimittajat BoxTitleLastCustomers=Viimeisimmät %s lisätyt asiakkaat BoxTitleLastModifiedSuppliers=Viimeksi %s muokatut toimittajat BoxTitleLastModifiedCustomers=Viimeksi %s muokatut asiakkaat -BoxTitleLastCustomersOrProspects=Viimeisin %s muokatut asiakkaat tai mahdollisuudet -BoxTitleLastPropals=Viimeksi %s lisätyt mahdollisuudet +BoxTitleLastCustomersOrProspects=Last %s customers or prospects +BoxTitleLastPropals=Last %s proposals +BoxTitleLastModifiedPropals=Last %s modified proposals BoxTitleLastCustomerBills=Viimeisimmät %s asiakkaiden laskut +BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices BoxTitleLastSupplierBills=Viimeisimmät %s toimittajien laskut -BoxTitleLastProspects=Viimeisimmät %s lisätyt mahdollisuudet +BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices BoxTitleLastModifiedProspects=Viimeksi %s muokatut mahdollisuudet BoxTitleLastProductsInContract=Viimeisimmät %s tuotteet / palvelut sopimuksissa -BoxTitleLastModifiedMembers=Viimeksi %s muutetut jäsenet +BoxTitleLastModifiedMembers=Last %s members BoxTitleLastFicheInter=Viimeisimmät %s muokkaamat väliintulot -BoxTitleOldestUnpaidCustomerBills=Vanhimmat %s maksamattomat asiakkaiden laskut -BoxTitleOldestUnpaidSupplierBills=Vanhimmat %s maksamattomat toimittajan laskut +BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices +BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices BoxTitleCurrentAccounts=Avattujen tilien saldot BoxTitleSalesTurnover=Myynnin liikevaihto -BoxTitleTotalUnpaidCustomerBills=Maksamattomat asiakkaiden laskut -BoxTitleTotalUnpaidSuppliersBills=Maksamattomat toimittajien laskut +BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices +BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices BoxTitleLastModifiedContacts=Viimeksi %s muokattuja kontaktit/osoitteet BoxMyLastBookmarks=Viimeisimmät %s kirjanmerkit BoxOldestExpiredServices=Vanhimat aktiiviset päättyneet palvelut @@ -76,7 +80,8 @@ NoContractedProducts=Ei tuotteita/palveluita sopimuksissa NoRecordedContracts=Ei tallennetuja sopimuksia NoRecordedInterventions=Ei tallennettuja väliintuloja BoxLatestSupplierOrders=Viimeisin toimittajan tilaus -BoxTitleLatestSupplierOrders=%s viimeisintä toimittajan tilausta +BoxTitleLatestSupplierOrders=Last %s supplier orders +BoxTitleLatestModifiedSupplierOrders=Last %s modified supplier orders NoSupplierOrder=Ei tallennettuja toimittajan tilauksia BoxCustomersInvoicesPerMonth=Asiakaslaskuja kuukausittain BoxSuppliersInvoicesPerMonth=Toimittajien laskuja kuukausittain @@ -89,3 +94,4 @@ BoxProductDistributionFor=%s jakelut %s ForCustomersInvoices=Asiakkaiden laskut ForCustomersOrders=Asiakkaiden tilaukset ForProposals=Ehdotukset +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang index 53a0744840fc5..b845435f00176 100644 --- a/htdocs/langs/fi_FI/errors.lang +++ b/htdocs/langs/fi_FI/errors.lang @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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/langs/fi_FI/interventions.lang b/htdocs/langs/fi_FI/interventions.lang index 672722c112af7..1285e1e7b9a8b 100644 --- a/htdocs/langs/fi_FI/interventions.lang +++ b/htdocs/langs/fi_FI/interventions.lang @@ -50,4 +50,4 @@ ArcticNumRefModelError=Epäonnistui aktivoida PacificNumRefModelDesc1=Paluu numero on muodossa %syymm-nnnn jossa VV on vuosi, mm kuukausi ja nnnn on sarja ilman taukoa eikä palata 0 PacificNumRefModelError=Interventiokynnyksen kortin alkaen $ syymm jo olemassa, ja ei ole yhteensopiva tämän mallin järjestyksessä. Poistaa sen tai nimetä sen aktivoida tämän moduulin. PrintProductsOnFichinter=Print products on intervention card -PrintProductsOnFichinterDetails=forinterventions generated from orders +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang index 5f32596ece359..2632df0ec4b54 100644 --- a/htdocs/langs/fi_FI/main.lang +++ b/htdocs/langs/fi_FI/main.lang @@ -220,6 +220,7 @@ Next=Seuraava Cards=Kortit Card=Kortti Now=Nyt +HourStart=Start hour Date=Päivä DateAndHour=Date and hour DateStart=Alkaen @@ -242,6 +243,8 @@ DatePlanShort=Suunniteltu DateRealShort=Todellinen DateBuild=Raportti rakentaa päivämäärä DatePayment=Maksupäivä +DateApprove=Approving date +DateApprove2=Approving date (second approval) DurationYear=vuosi DurationMonth=kuukausi DurationWeek=viikko @@ -408,6 +411,8 @@ OtherInformations=Muut tiedot Quantity=Määrä Qty=Kpl ChangedBy=Muuttanut +ApprovedBy=Approved by +ApprovedBy2=Approved by (second approval) ReCalculate=Laske uudelleen ResultOk=Onnistuminen ResultKo=Virhe @@ -696,6 +701,8 @@ 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. +Deny=Deny +Denied=Denied # Week day Monday=Maanantai Tuesday=Tiistai diff --git a/htdocs/langs/fi_FI/orders.lang b/htdocs/langs/fi_FI/orders.lang index ab380e928e388..680d42db1c7c8 100644 --- a/htdocs/langs/fi_FI/orders.lang +++ b/htdocs/langs/fi_FI/orders.lang @@ -79,7 +79,9 @@ NoOpenedOrders=N: o avataan tilaukset NoOtherOpenedOrders=Mikään muu avataan tilaukset NoDraftOrders=No draft orders OtherOrders=Muut tilaukset -LastOrders=Viimeisin %s tilaukset +LastOrders=Last %s customer orders +LastCustomerOrders=Last %s customer orders +LastSupplierOrders=Last %s supplier orders LastModifiedOrders=Viimeisin %s muunnettu tilaukset LastClosedOrders=Viimeisin %s suljettu tilaukset AllOrders=Kaikki tilaukset diff --git a/htdocs/langs/fi_FI/other.lang b/htdocs/langs/fi_FI/other.lang index 3a3ceea116957..d1386b4dd21a7 100644 --- a/htdocs/langs/fi_FI/other.lang +++ b/htdocs/langs/fi_FI/other.lang @@ -203,6 +203,7 @@ 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. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=Lisää merkintä kalenteri %s diff --git a/htdocs/langs/fi_FI/productbatch.lang b/htdocs/langs/fi_FI/productbatch.lang index 452636819653f..85b1d27f3a611 100644 --- a/htdocs/langs/fi_FI/productbatch.lang +++ b/htdocs/langs/fi_FI/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use batch/serial number -ProductStatusOnBatch=Yes (Batch/serial required) -ProductStatusNotOnBatch=No (Batch/serial not used) +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/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 +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial 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 +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %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. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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/fi_FI/projects.lang b/htdocs/langs/fi_FI/projects.lang index 1c9d5a4bd16ea..94a28050ab025 100644 --- a/htdocs/langs/fi_FI/projects.lang +++ b/htdocs/langs/fi_FI/projects.lang @@ -14,6 +14,7 @@ MyTasksDesc=Tämä näkemys on vain hankkeisiin tai tehtäviä olet yhteyshenkil 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). +AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. ProjectsArea=Projektit alueella NewProject=Uusi projekti AddProject=Create project diff --git a/htdocs/langs/fi_FI/stocks.lang b/htdocs/langs/fi_FI/stocks.lang index 797bda3896d3d..ae6cf714dc550 100644 --- a/htdocs/langs/fi_FI/stocks.lang +++ b/htdocs/langs/fi_FI/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Peruuta lähettäminen DeleteSending=Poista lähettäminen Stock=Kanta Stocks=Varastot +StocksByLotSerial=Stock by lot/serial Movement=Movement Movements=Liikkeet ErrorWarehouseRefRequired=Warehouse viite nimi tarvitaan @@ -78,6 +79,7 @@ IdWarehouse=Id-varasto DescWareHouse=Kuvaus varasto LieuWareHouse=Lokalisointi varasto WarehousesAndProducts=Varastot ja tuotteet +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=Keskimääräiset tulohintajärjestelmää AverageUnitPricePMP=Keskimääräiset tulohintajärjestelmää SellPriceMin=Myynnin Yksikköhinta @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/fi_FI/suppliers.lang b/htdocs/langs/fi_FI/suppliers.lang index 0112a1bf12739..ba88216b66adc 100644 --- a/htdocs/langs/fi_FI/suppliers.lang +++ b/htdocs/langs/fi_FI/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) +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/fi_FI/trips.lang b/htdocs/langs/fi_FI/trips.lang index 2012c28cf4455..de170b586d4e8 100644 --- a/htdocs/langs/fi_FI/trips.lang +++ b/htdocs/langs/fi_FI/trips.lang @@ -69,11 +69,9 @@ 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 @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index dedbc1d5f502c..10c3b8fcf28d7 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -297,10 +297,11 @@ MenuHandlers=Gestionnaires de menu MenuAdmin=Édition menu DoNotUseInProduction=Ne pas utiliser en production ThisIsProcessToFollow=Voici la procédure à suivre : +ThisIsAlternativeProcessToFollow=This is an alternative setup to process: StepNb=Étape %s FindPackageFromWebSite=Recherche le paquet qui répond à votre besoin (par exemple sur le site web %s). DownloadPackageFromWebSite=Télécharger le package %s. -UnpackPackageInDolibarrRoot=Décompresser le paquet dans le répertoire racine de Dolibarr %s par dessus les fichiers existants (sans déplacer ou effacer cet existant sous peine de perdre sa configuration ou les modules non officiels installés) +UnpackPackageInDolibarrRoot=Décompresser le paquet dans le répertoire dédié aux modules externes : %s SetupIsReadyForUse=L'installation est terminée et Dolibarr est prêt à être utilisé avec le nouveau composant. NotExistsDirect=Il n'y a pas répertoire alternatif.
InfDirAlt=Depuis la version 3, il est possible de définir un répertoire alternatif qui vous permet de stocker dans le même endroit les modules et thèmes personnalisés.
Il suffit de créer un répertoire à la racine de Dolibarr (par exemple : custom).
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=La liste vient d'une table
Syntaxe:
nom_de_tab ExtrafieldParamHelpchkbxlst=La liste vient d'une table
Syntaxe: nom_de_table:nom_de_champ:id_champ::filtre
Exemple : c_typent:libelle:id::filter

filter peux être un test simple (exemple active=1 pour ne proposer que les valeur active)
si vous voulez faire un filtre sur des attributs supplémentaires, utilisez la syntax extra.champ=... (où champ est la code de l'attribut supplémentaire)

Pour que la liste soit dépendante d'une autre :
c_typent:libelle:id:code_liste_parent|colonne_parent:filter LibraryToBuildPDF=Bibliothèque utilisée pour la génération des PDF WarningUsingFPDF=Attention : votre fichier conf.php contient la directive dolibarr_pdf_force_fpdf=1. Cela signifie que vous utilisez la librairie FPDF pour générer vos fichiers PDF. Cette librairie est ancienne et ne couvre pas de nombreuses fonctionnalités (Unicode, transparence des images, langues cyrilliques, arabes ou asiatiques...), aussi vous pouvez rencontrer des problèmes durant la génération des PDF.
Pour résoudre cela et avoir une prise en charge complète de PDF, vous pouvez télécharger la bibliothèque TCPDF puis commenter ou supprimer la ligne $dolibarr_pdf_force_fpdf=1, et ajouter à la place $dolibarr_lib_TCPDF_PATH='chemin_vers_TCPDF' -LocalTaxDesc=Certains pays appliquent 2 voire 3 taux sur chaque ligne de facture. Si c'est le cas, choisissez le type du deuxième et troisième taux et sa valeur. Les types possibles sont:
1 : taxe locale sur les produits et services hors tva (la tva n'est pas appliquée sur la taxe locale)
2 : taxe locale sur les produits et services avant tva (la tva est appliquée sur le montant + la taxe locale)
3 : taxe locale uniquement sur les produits hors tva (la tva n'est pas appliquée sur la taxe locale)
4 : taxe locale uniquement sur les produits avant tva (la tva est appliquée sur le montant + la taxe locale)
5 : taxe locale uniquement sur les services hors tva (la tva n'est pas appliquée sur la taxe locale)
6 : taxe locale uniquement sur les service avant tva (la tva est appliquée sur le montant + la taxe locale) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Entrez un numéro de téléphone à appeler pour tester le lien d'appel « ClickToDial » pour l'utilisateur %s RefreshPhoneLink=Rafraichir lien @@ -495,8 +496,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=Loan -Module520Desc=Management of loans +Module520Name=Emprunt +Module520Desc=Gestion des emprunts 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 @@ -511,7 +512,7 @@ Module1400Name=Comptabilité Module1400Desc=Gestion de la comptabilité (partie double) Module1520Name=Génération de document Module1520Desc=Génération de documents de publipostages -Module1780Name=Tags/Catégories +Module1780Name=Libellés/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é @@ -540,8 +541,8 @@ Module6000Name=Workflow Module6000Desc=Gérer le Workflow Module20000Name=Gestion de la demande de congès Module20000Desc=Déclaration et suivi des congès des employés -Module39000Name=Lot -Module39000Desc=Gestion des lots et numéro de série, et date de péremption sur les produits +Module39000Name=Product lot +Module39000Desc=Lot or serial number, eat-by and sell-by date management on products Module50000Name=PayBox Module50000Desc=Module permettant d'offrir en ligne une page de paiement par carte de crédit avec PayBox Module50100Name=Point de vente @@ -558,8 +559,6 @@ Module59000Name=Marges Module59000Desc=Module pour gérer les marges Module60000Name=Commissions Module60000Desc=Module pour gérer les commissions -Module150010Name=Numéro de lots ou date de péremption -Module150010Desc=gestion de numéro de lot ou date de péremption pour les produits Permission11=Consulter les factures clients Permission12=Créer/modifier les factures clients Permission13=Dé-valider les factures clients @@ -717,11 +716,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 +Permission520=Consulter les emprunts +Permission522=Créer/Modifier les emprunts +Permission524=Supprimer les emprunts +Permission525=Utiliser le calculateur d'emprunts +Permission527=Exporter les emprunts Permission531=Consulter les services Permission532=Créer/modifier les services Permission534=Supprimer les services @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= L'IRPF proposé par défaut lors de la création de propo LocalTax2IsNotUsedDescES= L'IRPF proposé par défaut est 0. Fin de règle. LocalTax2IsUsedExampleES= En Espagne, ce sont des professionnels autonomes et indépendants qui offrent des services, et des sociétés qui ont choisi le système fiscal du module. LocalTax2IsNotUsedExampleES= En Espagne, ce sont des sociétés qui ne sont pas soumises au système fiscal du module. -CalcLocaltax=Rapports -CalcLocaltax1ES=Ventes - Achats +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Ventes - Achats CalcLocaltax1Desc=Les rapports des Taxes locales sont calculées avec la différence entre les taxes locales de ventes et les taxes locales d'achats -CalcLocaltax2ES=Achats +CalcLocaltax2=Achats CalcLocaltax2Desc=Le Rapport des Taxes locales sont le total des taxes locales d'achats -CalcLocaltax3ES=Ventes +CalcLocaltax3=Ventes CalcLocaltax3Desc=Le Rapports des Taxes locales sont le total des taxes locales de ventes LabelUsedByDefault=Libellé qui sera utilisé si aucune traduction n'est trouvée pour ce code LabelOnDocuments=Libellé sur les documents @@ -1018,14 +1017,14 @@ NoEventOrNoAuditSetup=Aucun événement d'audit de sécurité n'a été enregist NoEventFoundWithCriteria=Aucun événement d'audit de sécurité trouvé avec ces critères. SeeLocalSendMailSetup=Voir la configuration locale de sendmail BackupDesc=Pour réaliser une sauvegarde complète de Dolibarr, vous devez : -BackupDesc2=* Sauvegarder le contenu du répertoire document (%s) qui contient tous les fichiers envoyés ou générés (en compressant le répertoire par exemple). -BackupDesc3=* Sauvegarder le contenu de votre base de données dans un fichier « dump ». Pour cela vous pouvez utiliser l'assistant ci-dessous. +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=Le répertoire archivé devra être placé en lieu sûr. BackupDescY=Le fichier « dump » généré devra être placé en lieu sûr. BackupPHPWarning=La sauvegarde n'est pas garantie avec cette méthode. Préférez la méthode précédente. RestoreDesc=Pour restaurer une sauvegarde de Dolibarr, vous devez : -RestoreDesc2=* Reprendre le fichier archive (fichier zip par exemple) du répertoire documents et en extraire l'arborescence dans le répertoire documents d'une nouvelle installation de Dolibarr ou dans le répertoire documents de cette installation (%s). -RestoreDesc3=* Recharger depuis le fichier « dump » sauvegardé, la base de données d'une nouvelle installation de Dolibarr ou de cette installation. Attention, une fois la restauration faite, il faudra utiliser un identifiant/mot de passe administrateur existant à l'époque de la sauvegarde pour se connecter. Pour restaurer la base dans l'installation actuelle, vous pouvez utiliser l'assistant suivant. +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=Importation MySQL ForcedToByAModule= Cette règle est forcée à %s par un des modules activés PreviousDumpFiles=Fichiers de sauvegarde de la base de données disponibles @@ -1337,6 +1336,8 @@ LDAPFieldCountry=Pays LDAPFieldCountryExample=Exemple : c LDAPFieldDescription=Description LDAPFieldDescriptionExample=Exemple : description +LDAPFieldNotePublic=Note publique +LDAPFieldNotePublicExample=Exemple : publicnote LDAPFieldGroupMembers= Membres du groupe LDAPFieldGroupMembersExample= Exemple : uniqueMember LDAPFieldBirthdate=Date de naissance @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= Compte par défaut à utiliser pour l'encaissement en 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=La décrémentation de stock depuis le Point de Vente n'est pas encore compatible avec la gestion des lots/série. +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot 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 @@ -1616,3 +1617,8 @@ 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 +BackupDumpWizard=Assistant de génération d'un fichier de sauvegarde de la base de données +SomethingMakeInstallFromWebNotPossible=L'installation de module externe est impossible depuis l'interface web pour la raison suivante : +SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do. +InstallModuleFromWebHasBeenDisabledByFile=L'installation de module externe depuis l'application a été désactivé par l'administrator. Vous devez lui demander de supprimer le fichier %s pour permettre cette fonctionnalité. +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" diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang index 84f2225b771fa..3d4ad1aede805 100644 --- a/htdocs/langs/fr_FR/banks.lang +++ b/htdocs/langs/fr_FR/banks.lang @@ -163,3 +163,5 @@ LabelRIB=Nom du RIB NoBANRecord=Aucun RIB enregistré DeleteARib=Supprimé RIB enregistré ConfirmDeleteRib=Etes vous sur de vouloir supprimé ce RIB ? +StartDate=Start date +EndDate=End date diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang index a6a4c1a85a4d7..1df8154d4ba18 100644 --- a/htdocs/langs/fr_FR/bills.lang +++ b/htdocs/langs/fr_FR/bills.lang @@ -298,6 +298,7 @@ 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à +MergingPDFTool=Outil de fusion de PDF # PaymentConditions PaymentConditionShortRECEP=À réception diff --git a/htdocs/langs/fr_FR/boxes.lang b/htdocs/langs/fr_FR/boxes.lang index a98fa367fbe51..a42189e312788 100644 --- a/htdocs/langs/fr_FR/boxes.lang +++ b/htdocs/langs/fr_FR/boxes.lang @@ -94,3 +94,4 @@ BoxProductDistributionFor=Répartition des %s pour les %s ForCustomersInvoices=Factures clients ForCustomersOrders=Commandes clients ForProposals=Propositions commerciales +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang index c310342fefff4..4d63a116d177d 100644 --- a/htdocs/langs/fr_FR/categories.lang +++ b/htdocs/langs/fr_FR/categories.lang @@ -1,62 +1,62 @@ # Dolibarr language file - Source file is en_US - categories Rubrique=Label/Catégorie -Rubriques=Labels/Catégories -categories=labels/catégories +Rubriques=Libellés/Catégories +categories=libellés/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 Classify=Classer -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 +CategoriesArea=Espace libellés/catégories +ProductsCategoriesArea=Espace libellés/catégories de produits/services +SuppliersCategoriesArea=Espace libellés/catégories de fournisseurs +CustomersCategoriesArea=Espace libellés/catégories de clients +ThirdPartyCategoriesArea=Espace libellés/catégories de tiers +MembersCategoriesArea=Espace libellés/catégories de membres +ContactsCategoriesArea=Espace libellés/catégories de contacts +MainCats=Libellés/catégories principaux(ales) SubCats=Sous-catégories CatStatistics=Statistiques -CatList=Liste des labels/catégories -AllCats=Tous les labels/catégories -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 +CatList=Liste des libellés/catégories +AllCats=Tous les libellés/catégories +ViewCat=Consulter libellé/catégorie +NewCat=Ajouter libellé/catégorie +NewCategory=Nouveau(elle) libellé/catégorie +ModifCat=Modifier libellé/catégorie +CatCreated=Libellé/catégorie créé(e) +CreateCat=Créer libellé/catégorie +CreateThisCat=Créer ce(tte) libellé/catégorie ValidateFields=Valider les champs NoSubCat=Cette catégorie ne contient aucune sous-catégorie. SubCatOf=Sous-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 +FoundCats=Libellés/catégories trouvé(e)s +FoundCatsForName=Libellés/catégories trouvé(e)s pour le nom : +FoundSubCatsIn=Sous-catégorie trouvée dans le(a) libellé/catégorie +ErrSameCatSelected=Vous avez sélectionné le(a) même libellé/catégorie plusieurs fois +ErrForgotCat=Vous avez oublié de choisir le(a) libellé/catégorie ErrForgotField=Vous avez oublié de renseigner un champ ErrCatAlreadyExists=Ce nom est déjà utilisé -AddProductToCat=Add this product to a tag/category? -ImpossibleAddCat=Impossible to add the tag/category -ImpossibleAssociateCategory=Impossible to associate the tag/category to +AddProductToCat=Ajouter ce produit à un(e) libellé/catégorie +ImpossibleAddCat=Impossible d'ajouter le(a) libellé/catégorie +ImpossibleAssociateCategory=Impossible d'associer le(a) libellé/catégorie à WasAddedSuccessfully=%s a été ajouté avec succès. -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 +ObjectAlreadyLinkedToCategory=L'élément est déjà lié à ce(tte) libellé/catégorie +CategorySuccessfullyCreated=Ce(tte) libellé/catégorie %s a été ajouté avec succès +ProductIsInCategories=Produit/service appartient aux libellés/catégories suivant(e)s +SupplierIsInCategories=Tiers appartient aux libellés/catégories fournisseurs suivant(e)s: +CompanyIsInCustomersCategories=Ce tiers appartient aux libellés/catégories de clients/prospects suivant(e)s +CompanyIsInSuppliersCategories=Ce tiers appartient aux libellés/catégories de fournisseurs suivant(e)s +MemberIsInCategories=Ce membre appartient aux libellés/catégories suivant(e)s +ContactIsInCategories=Ce contact appartient aux libellés/catégories suivant(e)s +ProductHasNoCategory=Ce produit/service n'appartient à aucun(e) libellé/catégorie +SupplierHasNoCategory=Ce fournisseur n'appartient à aucun(e) libellé/catégorie +CompanyHasNoCategory=Ce tiers n'appartient à aucun(e) libellé/catégorie +MemberHasNoCategory=Ce membre n'appartient à aucun(e) libellé/catégorie +ContactHasNoCategory=Ce contact n'appartient à aucun(e) libellé/catégorie +ClassifyInCategory=Classer dans le(a) libellé/catégorie NoneCategory=Aucune -NotCategorized=Without tag/category +NotCategorized=Sans libellé/catégorie 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 @@ -64,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=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 +CategoriesTree=Arbre des libellés/catégories +DeleteCategory=Effacer le(a) libellé/catégorie +ConfirmDeleteCategory=Êtes-vous sûr de vouloir supprimer ce(tte) libellé/catégorie ? +RemoveFromCategory=Supprimer le lien avec le(a) libellé/catégorie +RemoveFromCategoryConfirm=Êtes-vous sûr de vouloir supprimer le lien entre la transaction et le(a) libellé/catégorie ? +NoCategoriesDefined=Aucun(e) libellé/catégorie défini(e) +SuppliersCategoryShort=Libellés/catégories de fournisseurs +CustomersCategoryShort=Libellés/catégories de clients +ProductsCategoryShort=Libellés/catégories de produits +MembersCategoryShort=Libellés/catégories de membres +SuppliersCategoriesShort=Libellés/catégories de fournisseurs +CustomersCategoriesShort=Libellés/catégories de clients CustomersProspectsCategoriesShort=Catégories clients/prosp. -ProductsCategoriesShort=Products tags/categories -MembersCategoriesShort=Members tags/categories -ContactCategoriesShort=Contacts tags/categories +ProductsCategoriesShort=Libellés/catégories de produits +MembersCategoriesShort=Libellés/catégories de membres +ContactCategoriesShort=Libellés/catégories de contacts ThisCategoryHasNoProduct=Cette catégorie ne contient aucun produit. ThisCategoryHasNoSupplier=Cette catégorie ne contient aucun fournisseur. ThisCategoryHasNoCustomer=Cette catégorie ne contient aucun client. @@ -88,23 +88,23 @@ ThisCategoryHasNoContact=Cette catégorie ne contient aucun contact. AssignedToCustomer=Attribuer à un client AssignedToTheCustomer=Attribué au client InternalCategory=Catégorie interne -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 +CategoryContents=Contenu du(de la) libellé/catégorie +CategId=ID du(de la) libellé/catégorie +CatSupList=Liste des libellés/catégories de fournisseurs +CatCusList=Liste des libellés/catégories de clients/prospects +CatProdList=Liste des libellés/catégories de produits/services +CatMemberList=Liste des libellés/catégories de membres +CatContactList=Liste des libellés/catégories de contact +CatSupLinks=Liens entre fournisseurs et libellés/catégories +CatCusLinks=Liens entre clients/prospects et libellés/catégories +CatProdLinks=Liens entre produits/services et libellés/catégories +CatMemberLinks=Liens entre membres et libellés/catégories +DeleteFromCat=Enlever des libellés/catégories DeletePicture=Supprimer image ConfirmDeletePicture=Etes-vous sur de vouloir supprimer cette image ? ExtraFieldsCategories=Attributs supplémentaires -CategoriesSetup=Tags/categories setup -CategorieRecursiv=Link with parent tag/category automatically +CategoriesSetup=Configuration des libellés/catégories +CategorieRecursiv=Lier automatiquement avec le(a) libellé/catégorie parent(e) 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=Show tag/category diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang index af76117f21320..689206b9a2457 100644 --- a/htdocs/langs/fr_FR/companies.lang +++ b/htdocs/langs/fr_FR/companies.lang @@ -393,7 +393,7 @@ Organization=Organisme AutomaticallyGenerated=Généré automatiquement FiscalYearInformation=Information sur l'année fiscale FiscalMonthStart=Mois de début d'exercice -YouMustCreateContactFirst=Vous devez créer des contacts avec emails sur le tiers pour pouvoir lui définir des notifications par mails. +YouMustCreateContactFirst=Vous devez créer un contact avec une adresse email sur le tiers avant de pouvoir lui définir des notifications par emails. ListSuppliersShort=Liste fournisseurs ListProspectsShort=Liste prospects ListCustomersShort=Liste clients @@ -405,8 +405,8 @@ ActivityCeased=Clos ActivityStateFilter=Statut d'activité ProductsIntoElements=Liste des produits dans les %s CurrentOutstandingBill=Montant encours -OutstandingBill=Montant max. en attente -OutstandingBillReached=Montant max. endetté +OutstandingBill=Montant encours autorisé +OutstandingBillReached=Montant encours autorisé dépassé MonkeyNumRefModelDesc=Renvoie le numéro sous la forme %syymm-nnnn pour les codes clients et %syymm-nnnn pour les codes fournisseurs où yy est l'année, mm le mois et nnnn un compteur séquentiel sans rupture et sans remise à 0. LeopardNumRefModelDesc=Code libre sans vérification. Peut être modifié à tout moment. ManagingDirectors=Nom du(des) gestionnaire(s) (PDG, directeur, président...) diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang index 5a8f99a9308e8..544cf775e7062 100644 --- a/htdocs/langs/fr_FR/compta.lang +++ b/htdocs/langs/fr_FR/compta.lang @@ -66,7 +66,7 @@ MenuSocialContributions=Charges sociales MenuNewSocialContribution=Nouvelle charge NewSocialContribution=Nouvelle charge sociale ContributionsToPay=Charges à payer -AccountancyTreasuryArea=Espace Compta/Tréso +AccountancyTreasuryArea=Espace comptabilité/trésorerie AccountancySetup=Configuration compta NewPayment=Nouveau règlement Payments=Règlements diff --git a/htdocs/langs/fr_FR/donations.lang b/htdocs/langs/fr_FR/donations.lang index 3dbb4cc5f767e..2265eb7ea8c0e 100644 --- a/htdocs/langs/fr_FR/donations.lang +++ b/htdocs/langs/fr_FR/donations.lang @@ -16,7 +16,7 @@ DonationsPaid=Dons payés DonationsReceived=Dons encaissés PublicDonation=Don public DonationsNumber=Nombre de dons -DonationsArea=Espace Dons +DonationsArea=Espace dons DonationStatusPromiseNotValidated=Promesse non validée DonationStatusPromiseValidated=Promesse validée DonationStatusPaid=Don payé diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang index dd92729aa4d52..0ae2f924c69a8 100644 --- a/htdocs/langs/fr_FR/errors.lang +++ b/htdocs/langs/fr_FR/errors.lang @@ -160,13 +160,16 @@ 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=Toutes les réceptions enregistrées doivent d'abord être vérifiées avant d'être autorisés à faire cette action +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Toutes les réceptions enregistrées doivent d'abord être vérifiées (approuvées ou refusées) avant d'être autorisé à faire cette action +ErrorCantSetReceptionToTotalDoneWithReceptionDenied=Toutes les réceptions enregistrées doivent d'abord être vérifiées (approuvées) avant d'être autorisé à 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 +ErrorFieldMustBeANumeric=Le champ %s doit être un numérique +ErrorFieldMustBeAnInteger=Le champ %s doit être un numérique # 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 7b0a6256edea5..5cfb51fa42c32 100644 --- a/htdocs/langs/fr_FR/install.lang +++ b/htdocs/langs/fr_FR/install.lang @@ -89,7 +89,7 @@ SystemIsUpgraded=Dolibarr a été mis à jour avec succès. YouNeedToPersonalizeSetup=Vous devez maintenant configurer Dolibarr selon vos besoins (Choix de l'apparence, des fonctionnalités, etc.). Pour cela, cliquez sur le lien ci-dessous : AdminLoginCreatedSuccessfuly=Création du compte administrateur Dolibarr '%s' réussie. GoToDolibarr=Accéder à Dolibarr -GoToSetupArea=Accéder à Dolibarr (espace configuration) +GoToSetupArea=Accéder à Dolibarr (espace de configuration) MigrationNotFinished=La version de votre base n'est pas encore complètement à niveau, aussi il vous faudra relancer à nouveau une migration. GoToUpgradePage=Accéder à la page de migration à nouveau Examples=Exemples @@ -156,7 +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) +ErrorDatabaseVersionForbiddenForMigration=La version de votre gestionnaire de base de données est %s. Celle-ci présente un défaut critique entraînant des pertes de données si vous changez la structure de votre base de données tel que requis par le processus de migration. C'est pourquoi la migration vous sera interdite tant que vous n'aurez pas mis à jour votre gestionnaire de base de données vers une version supérieure corrigée (Liste des versions affectées par le défaut : %s). ######### # upgrade diff --git a/htdocs/langs/fr_FR/interventions.lang b/htdocs/langs/fr_FR/interventions.lang index 3f15a1538230b..f43c8d44825e4 100644 --- a/htdocs/langs/fr_FR/interventions.lang +++ b/htdocs/langs/fr_FR/interventions.lang @@ -50,4 +50,4 @@ ArcticNumRefModelError=Activation impossible PacificNumRefModelDesc1=Renvoie le numéro sous la forme %syymm-nnnn où yy est l'année, mm le mois et nnnn un compteur séquentiel sans rupture et sans remise à 0 PacificNumRefModelError=Une facture commençant par $syymm existe en base et est incompatible avec cette numérotation. Supprimez la ou renommez la pour activer ce module. PrintProductsOnFichinter=Afficher les produits sur la fiche d'intervention -PrintProductsOnFichinterDetails=pour les interventions générées à partir des commandes +PrintProductsOnFichinterDetails=interventions générées à partir des commandes diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 94676450fbcc1..fe465c318833c 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -220,6 +220,7 @@ Next=Suivant Cards=Fiches Card=Fiche Now=Maintenant +HourStart=Heure de début Date=Date DateAndHour=Date et heure DateStart=Date début @@ -242,6 +243,8 @@ DatePlanShort=Date planif. DateRealShort=Date réal. DateBuild=Date génération du rapport DatePayment=Date paiement +DateApprove=Date approbation +DateApprove2=Date approbation (deuxième approbation) DurationYear=an DurationMonth=mois DurationWeek=semaine @@ -298,7 +301,7 @@ UnitPriceHT=Prix unitaire HT UnitPriceTTC=Prix unitaire TTC PriceU=P.U. PriceUHT=P.U. HT -AskPriceSupplierUHT=P.U. HT Requested +AskPriceSupplierUHT=P.U. HT. demandé PriceUTTC=P.U. TTC Amount=Montant AmountInvoice=Montant facture @@ -352,7 +355,7 @@ Status=État Favorite=Favori ShortInfo=Infos Ref=Réf. -ExternalRef=Ref. extern +ExternalRef=Réf. externe RefSupplier=Réf. fournisseur RefPayment=Réf. paiement CommercialProposalsShort=Propositions/devis @@ -408,6 +411,8 @@ OtherInformations=Autres informations Quantity=Quantité Qty=Qté ChangedBy=Modifié par +ApprovedBy=Approuvé par +ApprovedBy2=Approuvé par (deuxième approbation) ReCalculate=Recalculer ResultOk=Succès ResultKo=Échec @@ -526,7 +531,7 @@ DateFromTo=Du %s au %s DateFrom=A partir du %s DateUntil=Jusqu'au %s Check=Vérifier -Uncheck=Uncheck +Uncheck=Décocher Internal=Interne External=Externe Internals=Internes @@ -694,8 +699,10 @@ PublicUrl=URL publique 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. +ShowTransaction=Afficher transaction +GoIntoSetupToChangeLogo=Allez dans Accueil - Configuration - Société/institution pour changer le logo ou aller dans Accueil - Configuration - Affichage pour le cacher. +Deny=Refuser +Denied=Refusé # Week day Monday=Lundi Tuesday=Mardi diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang index ec71dfaebca27..6f38e908c4e54 100644 --- a/htdocs/langs/fr_FR/orders.lang +++ b/htdocs/langs/fr_FR/orders.lang @@ -79,7 +79,9 @@ NoOpenedOrders=Pas de commande ouvertes NoOtherOpenedOrders=Pas d'autre commandes ouvertes NoDraftOrders=Pas de commandes brouillons OtherOrders=Autres commandes -LastOrders=Les %s dernières commandes +LastOrders=Les %s dernières commandes clients +LastCustomerOrders=Les %s dernières commandes clients +LastSupplierOrders=Les %s dernières commandes fournisseurs LastModifiedOrders=Les %s dernières commandes modifiées LastClosedOrders=Les %s dernières commandes clôturées AllOrders=Toutes les commandes diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang index 4e45d3068028e..fd87446570e78 100644 --- a/htdocs/langs/fr_FR/other.lang +++ b/htdocs/langs/fr_FR/other.lang @@ -203,6 +203,7 @@ NewKeyWillBe=Vos nouveaux identifiants pour vous connecter à l'application sero ClickHereToGoTo=Cliquez ici pour aller sur %s YouMustClickToChange=Vous devez toutefois auparavant cliquer sur le lien suivant, afin de valider ce changement de mot de passe ForgetIfNothing=Si vous n'êtes pas à l'origine de cette demande, ignorez simplement ce message. Vos identifiants restent sécurisés. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=Ajouter entrée dans le calendrier %s diff --git a/htdocs/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang index 5551523ad3ac6..708c79321715f 100644 --- a/htdocs/langs/fr_FR/productbatch.lang +++ b/htdocs/langs/fr_FR/productbatch.lang @@ -1,12 +1,13 @@ # ProductBATCH language file - en_US - ProductBATCH ManageLotSerial=Utiliser les numéros de lots/série ProductStatusOnBatch=Oui (Lot/Série requis) -ProductStatusNotOnBatch=Non (Lot/série non utilisé) +ProductStatusNotOnBatch=No (Lot/Série non utilisé) ProductStatusOnBatchShort=Oui ProductStatusNotOnBatchShort=Non Batch=Lot/Série -atleast1batchfield=Date de péremption ou numéro de lot/série -batch_number=Lot/Numéro de série +atleast1batchfield=Date limite consommation, péremption ou numéro de lot/série +batch_number=Numéro de Lot/Série +BatchNumberShort=Lot/Série l_eatby=Date limite de consommation l_sellby=Date de péremption DetailBatchNumber=Détails Lot/Série diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang index e7ec1cba00e09..0c14a9a44c3c9 100644 --- a/htdocs/langs/fr_FR/products.lang +++ b/htdocs/langs/fr_FR/products.lang @@ -90,9 +90,9 @@ Suppliers=Fournisseurs SupplierRef=Réf. produit fournisseur ShowProduct=Afficher produit ShowService=Afficher service -ProductsAndServicesArea=Espace Produits et Services -ProductsArea=Espace Produits -ServicesArea=Espace Services +ProductsAndServicesArea=Espace produits et services +ProductsArea=Espace produits +ServicesArea=Espace services AddToMyProposals=Ajouter à mes propositions AddToOtherProposals=Ajouter propositions brouillons AddToMyBills=Ajouter à mes factures @@ -248,7 +248,7 @@ PriceExpressionEditorHelp1="price = 2 + 2" ou "2 + 2" pour définir un prix. Uti 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: +PriceExpressionEditorHelp5=Valeurs globales disponibles: PriceMode=Mode de tarification PriceNumeric=Nombre DefaultPrice=Prix par défaut @@ -257,12 +257,12 @@ ComposedProduct=Sous-produits MinSupplierPrice=Prix minimum fournisseur DynamicPriceConfiguration=Configuration du prix dynamique GlobalVariables=Variables globales -GlobalVariableUpdaters=Global variable updaters +GlobalVariableUpdaters=Mis à jour variable globale GlobalVariableUpdaterType0=Données JSON -GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value, +GlobalVariableUpdaterHelp0=Analyse les données JSON depuis l'URL spécifiée, VALUE indique l'emplacement de la valeur pertinente, 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 +GlobalVariableUpdaterHelp1=Analyse les données de WebService pour l'URL spécifiée, NS spécifie l'espace de noms, VALUE indique l'emplacement de la valeur pertinente, DATA doit contenir les données à envoyer et METHOD est la méthode WS appelée 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 diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang index 4f1cecb79c850..24eef7ce06b3b 100644 --- a/htdocs/langs/fr_FR/projects.lang +++ b/htdocs/langs/fr_FR/projects.lang @@ -14,6 +14,7 @@ MyTasksDesc=Cette vue est restreinte aux projets et tâches pour lesquels vous 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). +AllTaskVisibleButEditIfYouAreAssigned=Toutes les tâches de ce projet sont visibles, mais vous pouvez entrer le temps seulement pour une tâche à laquelle vous êtes affecté. ProjectsArea=Espace projet NewProject=Nouveau projet AddProject=Créer projet diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang index 7a342f04a7dde..cae2a14d1879f 100644 --- a/htdocs/langs/fr_FR/stocks.lang +++ b/htdocs/langs/fr_FR/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Annuler expédition DeleteSending=Supprimer expédition Stock=Stock Stocks=Stocks +StocksByLotSerial=Stock par lot/série Movement=Mouvement Movements=Mouvements ErrorWarehouseRefRequired=Le nom de référence de l'entrepôt est obligatoire @@ -78,6 +79,7 @@ IdWarehouse=Identifiant entrepôt DescWareHouse=Description entrepôt LieuWareHouse=Lieu entrepôt WarehousesAndProducts=Entrepôts et produits +WarehousesAndProductsBatchDetail=Entrepôts et produits (avec détail par lot/série) AverageUnitPricePMPShort=Prix moyen pondéré (PMP) AverageUnitPricePMP=Prix moyen pondéré (PMP) d'acquisition SellPriceMin=Prix de vente unitaire @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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=Code Inv./Mouv. +NoPendingReceptionOnSupplierOrder=Pas de réception en attente du fait de commande fournisseur en cours +ThisSerialAlreadyExistWithDifferentDate=Ce lot/numéro de série (%s) existe déjà mais avec des dates de consommation ou péremption différente (trouvé %s mais vous avez entré %s). diff --git a/htdocs/langs/fr_FR/trips.lang b/htdocs/langs/fr_FR/trips.lang index b36286cdb57df..a9af539f1d96f 100644 --- a/htdocs/langs/fr_FR/trips.lang +++ b/htdocs/langs/fr_FR/trips.lang @@ -17,7 +17,7 @@ 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 +ExpensesArea=Espace notes de frais SearchATripAndExpense=Rechercher une note de frais ClassifyRefunded=Classer 'Remboursé' ExpenseReportWaitingForApproval=Une nouvelle note de frais a été soumise pour approbation @@ -69,11 +69,9 @@ MOTIF_CANCEL=Motif DATE_REFUS=Date refus DATE_SAVE=Date validation DATE_VALIDE=Date validation -DateApprove=Date approbation DATE_CANCEL=Date annulation DATE_PAIEMENT=Payment date -Deny=Refuser TO_PAID=Payer BROUILLONNER=Reopen SendToValid=Sent to approve @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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=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 4ca97ee13e9c6..e88ecd1a9d6c4 100644 --- a/htdocs/langs/he_IL/admin.lang +++ b/htdocs/langs/he_IL/admin.lang @@ -297,10 +297,11 @@ MenuHandlers=תפריט מטפלים MenuAdmin=תפריט העורך DoNotUseInProduction=Do not use in production ThisIsProcessToFollow=זהו תהליך ההתקנה: +ThisIsAlternativeProcessToFollow=This is an alternative setup to process: StepNb=שלב %s FindPackageFromWebSite=מצא חבילה המספקת התכונה הרצויה (לדוגמה על %s באתר הרשמי של רשת). DownloadPackageFromWebSite=Download package %s. -UnpackPackageInDolibarrRoot=חבילת קובץ לפרוק לתוך ספריית השורש של Dolibarr %s +UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: %s SetupIsReadyForUse=התקן הוא סיים Dolibarr מוכן לשימוש עם מרכיב חדש זה. 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).
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_ 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) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s RefreshPhoneLink=Refresh link @@ -540,8 +541,8 @@ 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 +Module39000Name=Product lot +Module39000Desc=Lot or serial number, eat-by and sell-by date management on products Module50000Name=PayBox Module50000Desc=מודול להציע בדף התשלום באינטרנט באמצעות כרטיס אשראי עם PayBox Module50100Name=נקודת מכירות @@ -558,8 +559,6 @@ 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=לקרוא חשבוניות של לקוחות Permission12=צור / לשנות חשבוניות של לקוחות Permission13=Unvalidate חשבוניות של לקוחות @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= שיעור RE כברירת מחדל בעת יצירת ה LocalTax2IsNotUsedDescES= כברירת מחדל IRPF המוצע הוא 0. קץ שלטון. LocalTax2IsUsedExampleES= בספרד, פרילנסרים ובעלי מקצוע עצמאיים המספקים שירותים וחברות אשר בחרו במערכת המס של מודולים. LocalTax2IsNotUsedExampleES= בספרד הם BUSSINES לא כפוף למערכת המס של מודולים. -CalcLocaltax=Reports -CalcLocaltax1ES=Sales - Purchases +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Sales - Purchases CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Purchases +CalcLocaltax2=Purchases CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Sales +CalcLocaltax3=Sales CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales LabelUsedByDefault=לייבל שימוש כברירת מחדל אם לא התרגום ניתן למצוא את קוד LabelOnDocuments=התווית על מסמכים @@ -1018,14 +1017,14 @@ NoEventOrNoAuditSetup=בשום מקרה לא ביטחון נרשמה עד כה. NoEventFoundWithCriteria=בשום מקרה לא ביטחון כבר מצאו criterias חיפוש כאלה. SeeLocalSendMailSetup=ראה הגדרת sendmail המקומי BackupDesc=כדי לבצע גיבוי מלא של Dolibarr, עליך: -BackupDesc2=* שמירת התוכן של ספריית מסמכים (%s) המכיל את כל הקבצים שנטענו שנוצר (אתה יכול לעשות zip למשל). -BackupDesc3=* שמירת התוכן של מסד הנתונים לתוך קובץ ה-dump. בשביל זה, אתה יכול להשתמש עוזר הבאה. +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=מדריך בארכיון יש לאחסן במקום בטוח. BackupDescY=קובץ dump שנוצר יש לאחסן במקום בטוח. BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one RestoreDesc=כדי לשחזר גיבוי Dolibarr, עליך: -RestoreDesc2=* שחזור קובץ ארכיון (קובץ zip למשל) של ספריית מסמכים כדי לחלץ עץ הקבצים בספריית המסמכים של ההתקנה Dolibarr חדש או לתוך זה מסמכים שוטפים directoy (%s). -RestoreDesc3=* לשחזר את הנתונים, מתוך קובץ ה-dump גיבוי, לתוך מסד הנתונים של ההתקנה Dolibarr חדש או לתוך מסד הנתונים של ההתקנה הנוכחית. אזהרה, פעם לשחזר נגמר, יש להשתמש כניסה / סיסמה, שהיה קיים כאשר הגיבוי נעשה, להתחבר שוב. כדי לשחזר מסד נתונים גיבוי לתוך ההתקנה הנוכחית, אתה יכול לעקוב אחר זה עוזר. +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= כלל זה הוא נאלץ %s ידי מודול מופעל PreviousDumpFiles=גיבוי מסד הנתונים זמינים קובצי dump @@ -1337,6 +1336,8 @@ LDAPFieldCountry=מדינה LDAPFieldCountryExample=דוגמה: c LDAPFieldDescription=תאור LDAPFieldDescriptionExample=דוגמה: תיאור +LDAPFieldNotePublic=Public Note +LDAPFieldNotePublicExample=Example : publicnote LDAPFieldGroupMembers= חברי הקבוצה LDAPFieldGroupMembersExample= דוגמה: uniqueMember LDAPFieldBirthdate=תאריך לידה @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= חשבון ברירת מחדל להשתמש כדי ל 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=הפוך ההתקנה מודול @@ -1616,3 +1617,8 @@ 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 +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" diff --git a/htdocs/langs/he_IL/banks.lang b/htdocs/langs/he_IL/banks.lang index ccc6050c6f132..ea9145b421e6b 100644 --- a/htdocs/langs/he_IL/banks.lang +++ b/htdocs/langs/he_IL/banks.lang @@ -163,3 +163,5 @@ LabelRIB=BAN Label NoBANRecord=No BAN record DeleteARib=Delete BAN record ConfirmDeleteRib=Are you sure you want to delete this BAN record ? +StartDate=Start date +EndDate=End date diff --git a/htdocs/langs/he_IL/boxes.lang b/htdocs/langs/he_IL/boxes.lang index 1afabaf8c8500..d61bc5502a31c 100644 --- a/htdocs/langs/he_IL/boxes.lang +++ b/htdocs/langs/he_IL/boxes.lang @@ -1,91 +1,97 @@ # 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 -# 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 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 -# BoxTitleLastCustomerBills=Last %s customer's invoices -# BoxTitleLastSupplierBills=Last %s supplier's invoices -# BoxTitleLastProspects=Last %s recorded prospects -# BoxTitleLastModifiedProspects=Last %s modified prospects -# BoxTitleLastProductsInContract=Last %s products/services in a contract -# BoxTitleLastModifiedMembers=Last %s modified members -# BoxTitleLastFicheInter=Last %s modified intervention -# BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer's invoices -# BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier's invoices -# BoxTitleCurrentAccounts=Opened account's balances -# BoxTitleSalesTurnover=Sales turnover -# BoxTitleTotalUnpaidCustomerBills=Unpaid customer's invoices -# BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier's 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=%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 -# ForCustomersInvoices=Customers invoices -# ForCustomersOrders=Customers orders +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=הצעות +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/he_IL/errors.lang b/htdocs/langs/he_IL/errors.lang index 52e9f6aeae473..dbafde2f6e546 100644 --- a/htdocs/langs/he_IL/errors.lang +++ b/htdocs/langs/he_IL/errors.lang @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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/langs/he_IL/interventions.lang b/htdocs/langs/he_IL/interventions.lang index b472c41f7a64c..2cb158d4ca300 100644 --- a/htdocs/langs/he_IL/interventions.lang +++ b/htdocs/langs/he_IL/interventions.lang @@ -50,4 +50,4 @@ 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 +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang index 54717d8915e0d..a9fd461226572 100644 --- a/htdocs/langs/he_IL/main.lang +++ b/htdocs/langs/he_IL/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 @@ -242,6 +243,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 +411,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 @@ -696,6 +701,8 @@ 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. +Deny=Deny +Denied=Denied # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/he_IL/orders.lang b/htdocs/langs/he_IL/orders.lang index ba84cae13441d..5b7a8ec16c2a8 100644 --- a/htdocs/langs/he_IL/orders.lang +++ b/htdocs/langs/he_IL/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/langs/he_IL/other.lang b/htdocs/langs/he_IL/other.lang index 5b9876272c77e..3b5c7913fb7e4 100644 --- a/htdocs/langs/he_IL/other.lang +++ b/htdocs/langs/he_IL/other.lang @@ -203,6 +203,7 @@ 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. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=Add entry in calendar %s diff --git a/htdocs/langs/he_IL/productbatch.lang b/htdocs/langs/he_IL/productbatch.lang index 452636819653f..85b1d27f3a611 100644 --- a/htdocs/langs/he_IL/productbatch.lang +++ b/htdocs/langs/he_IL/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use batch/serial number -ProductStatusOnBatch=Yes (Batch/serial required) -ProductStatusNotOnBatch=No (Batch/serial not used) +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/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 +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial 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 +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %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. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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/he_IL/projects.lang b/htdocs/langs/he_IL/projects.lang index 54d25b4ef24aa..314da1e365060 100644 --- a/htdocs/langs/he_IL/projects.lang +++ b/htdocs/langs/he_IL/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/langs/he_IL/stocks.lang b/htdocs/langs/he_IL/stocks.lang index 4cb004102f88d..5bc3d4952aeac 100644 --- a/htdocs/langs/he_IL/stocks.lang +++ b/htdocs/langs/he_IL/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Cancel sending DeleteSending=Delete sending Stock=Stock Stocks=מניות +StocksByLotSerial=Stock by lot/serial Movement=Movement Movements=Movements ErrorWarehouseRefRequired=Warehouse reference name is required @@ -78,6 +79,7 @@ IdWarehouse=Id warehouse DescWareHouse=Description warehouse LieuWareHouse=Localisation warehouse WarehousesAndProducts=Warehouses and products +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=Weighted average input price AverageUnitPricePMP=Weighted average input price SellPriceMin=Selling Unit Price @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/he_IL/suppliers.lang b/htdocs/langs/he_IL/suppliers.lang index e3f2c428379c6..1056674425a06 100644 --- a/htdocs/langs/he_IL/suppliers.lang +++ b/htdocs/langs/he_IL/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) +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/he_IL/trips.lang b/htdocs/langs/he_IL/trips.lang index 34b879b2751bb..0b3e72d78d47c 100644 --- a/htdocs/langs/he_IL/trips.lang +++ b/htdocs/langs/he_IL/trips.lang @@ -69,11 +69,9 @@ 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 @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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 2cdcce59866fc..ef57225d51c47 100644 --- a/htdocs/langs/hr_HR/admin.lang +++ b/htdocs/langs/hr_HR/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).
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_ 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) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s RefreshPhoneLink=Refresh link @@ -540,8 +541,8 @@ 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 +Module39000Name=Product lot +Module39000Desc=Lot 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 @@ -558,8 +559,6 @@ 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 @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, 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 +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Sales - Purchases CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Purchases +CalcLocaltax2=Purchases CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Sales +CalcLocaltax3=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 @@ -1018,14 +1017,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 @@ -1337,6 +1336,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 @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= Default account to use to receive payments by credit c 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot 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 @@ -1616,3 +1617,8 @@ 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 +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" diff --git a/htdocs/langs/hr_HR/banks.lang b/htdocs/langs/hr_HR/banks.lang index da71da227fb8f..4fe645a894970 100644 --- a/htdocs/langs/hr_HR/banks.lang +++ b/htdocs/langs/hr_HR/banks.lang @@ -163,3 +163,5 @@ LabelRIB=BAN Label NoBANRecord=No BAN record DeleteARib=Delete BAN record ConfirmDeleteRib=Are you sure you want to delete this BAN record ? +StartDate=Start date +EndDate=End date diff --git a/htdocs/langs/hr_HR/boxes.lang b/htdocs/langs/hr_HR/boxes.lang index d67c219ddc91e..6e0d4a388757c 100644 --- a/htdocs/langs/hr_HR/boxes.lang +++ b/htdocs/langs/hr_HR/boxes.lang @@ -12,6 +12,7 @@ BoxLastProspects=Posljednji izmijenjeni potencijalni kupci BoxLastCustomers=Posljednji izmijenjeni kupci BoxLastSuppliers=Posljednji izmijenjeni dobavljači BoxLastCustomerOrders=Najnovije narudžbe kupaca +BoxLastValidatedCustomerOrders=Last validated customer orders BoxLastBooks=Najnovije knjige BoxLastActions=Najnovije aktivnosti BoxLastContracts=Najnoviji ugovori @@ -27,26 +28,29 @@ BoxTitleNbOfCustomers=Broj klijenata BoxTitleLastRssInfos=Posljednjih %s vijesti iz %s BoxTitleLastProducts=Posljednjih %s izmijenjenih proizvoda / usluga BoxTitleProductsAlertStock=Proizvodi u skladištu - uzbuna -BoxTitleLastCustomerOrders=Posljdnjih %s izmijenjenih narudžba kupaca +BoxTitleLastCustomerOrders=Last %s customer orders +BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders BoxTitleLastSuppliers=Prošlogodišnjih %s spremljenih dobavljača BoxTitleLastCustomers=Posljednjih %s spremljenih kupaca BoxTitleLastModifiedSuppliers=Posljednjih %s izmijenjenih dobavljača BoxTitleLastModifiedCustomers=Posljednjih %s izmijenjenih kupaca -BoxTitleLastCustomersOrProspects=Posljednjih %s izmijenjenih kupaca ili potencijalnih kupaca -BoxTitleLastPropals=Posljednjih %s spremljenih ponuda +BoxTitleLastCustomersOrProspects=Last %s customers or prospects +BoxTitleLastPropals=Last %s proposals +BoxTitleLastModifiedPropals=Last %s modified proposals BoxTitleLastCustomerBills=Posljednjih %s računi kupaca +BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices BoxTitleLastSupplierBills=Posljednjih %s računi dobavljača -BoxTitleLastProspects=Posljednjih %s spremljenih potencijalnih kupaca +BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices BoxTitleLastModifiedProspects=Posljednjih %s izmijenjenih potencijalnih kupaca BoxTitleLastProductsInContract=Posljednjih %s proizvoda / usluga u ugovorima -BoxTitleLastModifiedMembers=Prošlogodišnji% s modificirani članovi +BoxTitleLastModifiedMembers=Last %s members BoxTitleLastFicheInter=Prošlogodišnji% s modificirani intervencija -BoxTitleOldestUnpaidCustomerBills=Najstariji% s neplaćene račune kupca -BoxTitleOldestUnpaidSupplierBills=Najstariji% s neplaćene račune dobavljača +BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices +BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices BoxTitleCurrentAccounts=Stanja otvorila korisničkog računa BoxTitleSalesTurnover=Promet -BoxTitleTotalUnpaidCustomerBills=Neplaćeni računi kupca -BoxTitleTotalUnpaidSuppliersBills=Neplaćeni računi dobavljača +BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices +BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices BoxTitleLastModifiedContacts=Prošlogodišnji% s modificirani kontakti / Adrese BoxMyLastBookmarks=Moja posljednja% s oznake BoxOldestExpiredServices=Najstariji aktivni istekli usluge @@ -76,7 +80,8 @@ NoContractedProducts=Nema proizvoda / usluge ugovorene NoRecordedContracts=Nema snimljene ugovori NoRecordedInterventions=Nema zabilježenih intervencija BoxLatestSupplierOrders=Najnoviji dobavljač narudžbe -BoxTitleLatestSupplierOrders=% s najnovijim narudžbe dobavljačima +BoxTitleLatestSupplierOrders=Last %s supplier orders +BoxTitleLatestModifiedSupplierOrders=Last %s modified supplier orders NoSupplierOrder=Ne bilježi dobavljač bi BoxCustomersInvoicesPerMonth=Korisnički računi mjesečno BoxSuppliersInvoicesPerMonth=Dobavljač računi mjesečno @@ -89,3 +94,4 @@ BoxProductDistributionFor=Raspodjela% s za% s ForCustomersInvoices=Kupci računi ForCustomersOrders=Kupci narudžbe ForProposals=Prijedlozi +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/hr_HR/errors.lang b/htdocs/langs/hr_HR/errors.lang index 52e9f6aeae473..dbafde2f6e546 100644 --- a/htdocs/langs/hr_HR/errors.lang +++ b/htdocs/langs/hr_HR/errors.lang @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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/langs/hr_HR/interventions.lang b/htdocs/langs/hr_HR/interventions.lang index c79da05364e61..67d4f61d9f15d 100644 --- a/htdocs/langs/hr_HR/interventions.lang +++ b/htdocs/langs/hr_HR/interventions.lang @@ -50,4 +50,4 @@ 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 +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang index 756360ff88a34..1bbb505b5b243 100644 --- a/htdocs/langs/hr_HR/main.lang +++ b/htdocs/langs/hr_HR/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 @@ -242,6 +243,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 +411,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 @@ -696,6 +701,8 @@ 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. +Deny=Deny +Denied=Denied # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/hr_HR/orders.lang b/htdocs/langs/hr_HR/orders.lang index 2561198dd90a8..c482335b687dc 100644 --- a/htdocs/langs/hr_HR/orders.lang +++ b/htdocs/langs/hr_HR/orders.lang @@ -79,7 +79,9 @@ NoOpenedOrders=Nema otvorenih narudžbi NoOtherOpenedOrders=Nema ostalih otvorenih narudžbi 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=Sve narudžbe diff --git a/htdocs/langs/hr_HR/other.lang b/htdocs/langs/hr_HR/other.lang index 9b2de3eeb9024..6b60f5eac9717 100644 --- a/htdocs/langs/hr_HR/other.lang +++ b/htdocs/langs/hr_HR/other.lang @@ -203,6 +203,7 @@ 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. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=Add entry in calendar %s diff --git a/htdocs/langs/hr_HR/productbatch.lang b/htdocs/langs/hr_HR/productbatch.lang index 452636819653f..85b1d27f3a611 100644 --- a/htdocs/langs/hr_HR/productbatch.lang +++ b/htdocs/langs/hr_HR/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use batch/serial number -ProductStatusOnBatch=Yes (Batch/serial required) -ProductStatusNotOnBatch=No (Batch/serial not used) +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/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 +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial 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 +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %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. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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/hr_HR/projects.lang b/htdocs/langs/hr_HR/projects.lang index 068aa55954a99..3af0f7966eb2c 100644 --- a/htdocs/langs/hr_HR/projects.lang +++ b/htdocs/langs/hr_HR/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=Novi projekt AddProject=Create project diff --git a/htdocs/langs/hr_HR/stocks.lang b/htdocs/langs/hr_HR/stocks.lang index 29706d1761545..c2b432d7f9b93 100644 --- a/htdocs/langs/hr_HR/stocks.lang +++ b/htdocs/langs/hr_HR/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Cancel sending DeleteSending=Delete sending Stock=Stock Stocks=Stocks +StocksByLotSerial=Stock by lot/serial Movement=Movement Movements=Movements ErrorWarehouseRefRequired=Warehouse reference name is required @@ -78,6 +79,7 @@ IdWarehouse=Id warehouse DescWareHouse=Description warehouse LieuWareHouse=Localisation warehouse WarehousesAndProducts=Warehouses and products +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=Weighted average input price AverageUnitPricePMP=Weighted average input price SellPriceMin=Selling Unit Price @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/hr_HR/suppliers.lang b/htdocs/langs/hr_HR/suppliers.lang index d9de79fe84dbc..e0552c064e8ce 100644 --- a/htdocs/langs/hr_HR/suppliers.lang +++ b/htdocs/langs/hr_HR/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) +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/hr_HR/trips.lang b/htdocs/langs/hr_HR/trips.lang index ba36fc9b07b6a..76b214abdb77f 100644 --- a/htdocs/langs/hr_HR/trips.lang +++ b/htdocs/langs/hr_HR/trips.lang @@ -69,11 +69,9 @@ 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 @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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 0c7daf61ed22c..0c6b123ea8477 100644 --- a/htdocs/langs/hu_HU/admin.lang +++ b/htdocs/langs/hu_HU/admin.lang @@ -1,84 +1,84 @@ # Dolibarr language file - Source file is en_US - admin -Foundation=Foundation -Version=Változat -VersionProgram=Verzió programja -VersionLastInstall=Verzió kezdeti telepítés -VersionLastUpgrade=Verzió utolsó frissítés +Foundation=Alapítvány +Version=Verzió +VersionProgram=Programverzió +VersionLastInstall=Kezdeti telepítés verziója +VersionLastUpgrade=Legutóbbi frissítés verziója VersionExperimental=Kísérleti -VersionDevelopment=Fejlesztés +VersionDevelopment=Fejlesztői VersionUnknown=Ismeretlen VersionRecommanded=Ajánlott FileCheck=Files Integrity -FilesMissing=Missing Files -FilesUpdated=Updated Files +FilesMissing=Hiányzó fájlok +FilesUpdated=Frissített fájlok 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ó -PurgeSessions=Purge ülések -ConfirmPurgeSessions=Do you really want to purge all sessions ? This will disconnect every user (except yourself). -NoSessionListWithThisHandler=Save session handler beállítva a PHP nem teszi lehetővé, hogy felsorolni az összes futó ülés. -LockNewSessions=Zár új kapcsolatok -ConfirmLockNewSessions=Biztos akarod, hogy korlátozza az új Dolibarr kapcsolatot magad. Csak a felhasználó %s képes lesz csatlakozni után. -UnlockNewSessions=Vegye csatlakozás zár -YourSession=Az ülésen -Sessions=Felhasználók session -WebUserGroup=Webszerver felhasználó / csoport -NoSessionFound=A PHP úgy tűnik, hogy nem engedi a lista aktív ülés. Directory mentéséhez használt ülés (%s) lehet védeni (Például úgy, hogy OS engedélyek vagy PHP direktíva open_basedir). -HTMLCharset=Charset a generált HTML oldalak -DBStoringCharset=Adatbázis karakterkészlet adatok tárolására -DBSortingCharset=Adatbázis karakterkészlet adatok rendezésének -WarningModuleNotActive=Modul %s engedélyezni kell -WarningOnlyPermissionOfActivatedModules=Csak az aktivált jogosultságok kapcsolódó modulok jelennek meg itt. Aktiválhatja többi modul a Home-> Beállítás-> modulok oldalon. -DolibarrSetup=Dolibarr telepítése vagy frissítése -DolibarrUser=Dolibarr felhasználó +SessionId=Munkamenet-azonosító +SessionSaveHandler=Munkamenet mentésének kezelője +SessionSavePath=Munkamenetek tárhelye +PurgeSessions=Munkamenetek beszüntetése +ConfirmPurgeSessions=Biztos benne, hogy szeretné beszüntetni az összes munkamanetet? Ezzel minden felhasználó kapcsolatát leállítja (az Önén kívül). +NoSessionListWithThisHandler=A PHP-ben beállított munkamenetmentés-kezelő nem teszi lehetővé az összes aktív munkamenet felsorolását. +LockNewSessions=Új kapcsolatok letiltása +ConfirmLockNewSessions=Biztosan szeretné, hogy az új kapcsolatok csak Önre legyenek korlátozva? Ezentúl csak a %s felhasználó lesz képes csatlakozni. +UnlockNewSessions=Új kapcsolatok engedélyezése +YourSession=Az Ön munkamenete +Sessions=Felhasználók munkamenetei +WebUserGroup=Webszerver felhasználója / csoportja +NoSessionFound=A PHP úgy tűnik, hogy nem engedi az aktív munkamenetek felsorolását. Lehet, hogy a munkamenetek tárhelyének (%s) hozzáférése korlátozott. (Például az operációs rendszer vagy a PHP open_basedir direktívája által). +HTMLCharset=A generált HTML oldalak karakterkészlete +DBStoringCharset=Az adatbázis adattárolási karakterkészlete +DBSortingCharset=Az adatbázis adatrendezési karakterkészlete +WarningModuleNotActive=A %s modult engedélyezni kell +WarningOnlyPermissionOfActivatedModules=Csak az aktivált modulokkal kacsolatos jogosultságok jelennek meg itt. A többi modul a Home->Beállítás->Modulok oldalon aktiválható. +DolibarrSetup=A Dolibarr telepítése vagy frissítése +DolibarrUser=A Dolibarr felhasználó InternalUser=Belső felhasználó ExternalUser=Külső felhasználó InternalUsers=Belső felhasználók ExternalUsers=Külső felhasználók GlobalSetup=Globális beállítás GUISetup=Kijelző -SetupArea=Beállítás területén -FormToTestFileUploadForm=Forma tesztelni fájlfeltöltés (beállítás szerint) -IfModuleEnabled=Megjegyzés: igen csak akkor eredményes, ha a modul engedélyezve van %s -RemoveLock=Fájl eltávolítása %s, ha az létezik, hogy használata a frissítő eszköz. -RestoreLock=Csere file %s, a csak olvasási engedéllyel, hogy kikapcsolt minden használat frissítő eszköz. +SetupArea=Beállítási terület +FormToTestFileUploadForm=A fájlfeltöltés tesztelésének űrlapja (beállítás szerint) +IfModuleEnabled=Megjegyzés: az 'igen' csak akkor eredményes, ha a %s modul engedélyezve van +RemoveLock=A frissítőeszköz használatához törölje a következő fájlt, ha létezik: %s +RestoreLock=Újítsa meg a %s fájlt csak olvasásra szóló engedéllyel, hogy megtiltsa a frissítőeszköz bármilyen használatát. SecuritySetup=Biztonsági beállítások -ErrorModuleRequirePHPVersion=Hiba történt, ez a modul a PHP verzió vagy újabb %s -ErrorModuleRequireDolibarrVersion=Hiba történt, ez a modul Dolibarr %s verzió vagy újabb -ErrorDecimalLargerThanAreForbidden=Hiba, a precíziós magasabb %s nem támogatott. -DictionarySetup=Dictionary setup -Dictionary=Dictionaries +ErrorModuleRequirePHPVersion=Hiba történt, ez a modul a PHP %s, vagy újabb verzióját igényli +ErrorModuleRequireDolibarrVersion=Hiba történt, ez a modul a Dolibarr %s, vagy újabb verzióját igényli +ErrorDecimalLargerThanAreForbidden=Hiba, nagyobb mint %s pontosság nem támogatott. +DictionarySetup=Szótár beállítása +Dictionary=Szótárak 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=Használja Ajax visszaigazolást popup +ErrorReservedTypeSystemSystemAuto=A "system" és a "systemauto" típusértékek foglaltak. Saját bejegyzés hozzáadására használhatja a "user" értéket. +ErrorCodeCantContainZero=A kód nem tartalmazhatja a 0 értéket +DisableJavascript=A Javascript és Ajax funkciók kikapcsolása. (Látássérültek számára, vagy szöveges böngészők használata esetén ajánlott) +ConfirmAjax=Ajax visszaigazoló ablakok használata 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= Hozzáadása lehetőséget, hogy a szűrő / elrejtése thirdparties, amelyek jelenleg a tevékenység megszűnt, vagy azt +UseSearchToSelectCompany=Automatikus kitöltés használata lista helyett a harmadik felek kiválasztásakor +ActivityStateToSelectCompany= Lehetővé tenni a harmadik felek szűrését tevékenységük jelenlegi állapota alapján (aktív / beszüntetett tevékenység) 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). +UseSearchToSelectContact=Automatikus kitöltés használata a kapcsolat kiválasztásakor (lista helyett) 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=Keresés szűrők lehetőségek -NumberOfKeyToSearch=NBR karakterek kiváltó keresés: %s -ViewFullDateActions=Mutasd a teljes időpontok események a harmadik lapra -NotAvailableWhenAjaxDisabled=Nem érhető el, ha tiltva Ajax -JavascriptDisabled=JavaScript tiltva +SearchFilter=Keresési szűrők beállítása +NumberOfKeyToSearch=Keresést kiváltó karakterek száma: %s +ViewFullDateActions=Az események teljes időpontjának ábrázolása a harmadik lapon +NotAvailableWhenAjaxDisabled=Nem érhető el, ha az Ajax le van tiltva +JavascriptDisabled=JavaScript letiltva UsePopupCalendar=Használja felugró dátumok bemeneti -UsePreviewTabs=Használja előnézet lapok +UsePreviewTabs=Előnézeti lapok használata ShowPreview=Előnézet megtekintése PreviewNotAvailable=Előnézet nem elérhető -ThemeCurrentlyActive=Téma aktív -CurrentTimeZone=TimeZone PHP (szerver) +ThemeCurrentlyActive=Jelenleg aktív téma +CurrentTimeZone=A PHP (szerver) időzónája 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=Hely -Table=Table -Fields=Fields +Table=Táblázat +Fields=Mezők Index=Index Mask=Maszk NextValue=Következő érték @@ -86,34 +86,34 @@ NextValueForInvoices=Következő érték (számlák) NextValueForCreditNotes=Következő érték (jóváírás) NextValueForDeposit=Next value (deposit) NextValueForReplacements=Next value (replacements) -MustBeLowerThanPHPLimit=Megjegyzés: A PHP minden fájlt feltölteni korlátozza a méretet %s %s, amit ez a paraméter értéke -NoMaxSizeByPHPLimit=Megjegyzés: No limit van beállítva a PHP konfigurációt -MaxSizeForUploadedFiles=Maximális méret a feltöltött fájlok (0 sem megengedő feltöltés) -UseCaptchaCode=Használható grafikus kód (CAPTCHA) a bejelentkezési oldalon -UseAvToScanUploadedFiles=Használja az anti-vírus átkutat feltöltött fájlok -AntiVirusCommand= Teljes elérési útvonal vírusirtó parancs -AntiVirusCommandExample= Példa ClamWin: c: \\ progra ~ 1 \\ ClamWin \\ bin \\ clamscan.exe
Példa a ClamAV: / usr / bin / clamscan -AntiVirusParam= További paraméterek parancssorban -AntiVirusParamExample= Példa ClamWin: - database = "C: \\ Program Files (x86) \\ ClamWin \\ lib" +MustBeLowerThanPHPLimit=Megjegyzés: A PHP minden fájlfeltöltést %s %s méretre korlátoz, függetlenül ennek a paraméternek az értékétől +NoMaxSizeByPHPLimit=Megjegyzés: A PHP konfigurációban nincs beállítva korlátozás +MaxSizeForUploadedFiles=A feltöltött fájlok maximális mérete (0 megtiltja a feltöltést) +UseCaptchaCode=Grafikus kód (CAPTCHA) használata a bejelentkezési oldalon +UseAvToScanUploadedFiles=Vírusellenőrzés végzése a feltöltött fájlokon +AntiVirusCommand= A vírusirtó parancs teljes elérési útvonala +AntiVirusCommandExample= Példa ClamWin esetére: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
Példa ClamAV esetére: /usr/bin/clamscan +AntiVirusParam= A parancssor további paraméterei +AntiVirusParamExample= Példa ClamWin esetére: -database="C:\\Program Files (x86)\\ClamWin\\lib" ComptaSetup=Számviteli modul beállítása UserSetup=Felhasználói beállítások kezelése -MenuSetup=Management Setup menü +MenuSetup=Menükezelés beállítása MenuLimits=Korlátok és pontosság MenuIdParent=Szülő menü ID -DetailMenuIdParent=Azonosítója szülő menü (0 a felső menü) -DetailPosition=Rendezés számot meghatározni menü pozícióját -PersonalizedMenusNotSupported=Személyre szabott menük nem támogatott +DetailMenuIdParent=Szülő menü azonosítója (a főmenü esetében üres) +DetailPosition=A menu sorrendjét meghatározó szám +PersonalizedMenusNotSupported=Személyre szabott menük nem támogatottak AllMenus=Minden -NotConfigured=Modul nincs konfigurálva +NotConfigured=A modul nincs konfigurálva Setup=Beállítás Activation=Aktiválás Active=Aktív SetupShort=Beállítás OtherOptions=Egyéb lehetőségek -OtherSetup=Egyéb beállítási +OtherSetup=Egyéb beállítások CurrentValueSeparatorDecimal=Tizedes elválasztó CurrentValueSeparatorThousand=Ezer elválasztó -Destination=Destination +Destination=Úticél IdModule=Module ID IdPermissions=Permissions ID Modules=Modulok @@ -122,35 +122,35 @@ ModulesOther=Egyéb modulok ModulesInterfaces=Interfész modulok ModulesSpecial=Nagyon speciális modulok ParameterInDolibarr=Paraméter %s -LanguageParameter=Nyelv paraméter %s +LanguageParameter=Nyelvi paraméter %s LanguageBrowserParameter=Paraméter %s -LocalisationDolibarrParameters=Lokalizáció paraméterek -ClientTZ=Client Time Zone (user) -ClientHour=Client time (user) -OSTZ=Server OS Time Zone -PHPTZ=Időzóna PHP szerver +LocalisationDolibarrParameters=Lokalizációs paraméterek +ClientTZ=Kliens időzónája (felhasználó) +ClientHour=Kliens ideje (felhasználó) +OSTZ=A szerver operációs rendszerének időzónája +PHPTZ=A PHP szerver időzónája PHPServerOffsetWithGreenwich=PHP szerver offset szélessége Greenwich (másodperc) ClientOffsetWithGreenwich=Client / Böngésző offset szélessége Greenwich (másodperc) -DaylingSavingTime=Nyári időszámítás (felhasználó) +DaylingSavingTime=Nyári időszámítás CurrentHour=PHP óra (szerver) -CompanyTZ=Időzóna cég (vállalat fő) -CompanyHour=Óra cég (vállalat fő) -CurrentSessionTimeOut=Jelenlegi munkamenet timeout +CompanyTZ=A cég időzónája (központ) +CompanyHour=A cég ideje (központ) +CurrentSessionTimeOut=Jelenlegi munkamenet lejárása 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 Környezetvédelem +OSEnv=Az operációs rendszer környezeti változói Box=Doboz Boxes=Dobozok -MaxNbOfLinesForBoxes=Max. sorok száma a dobozok +MaxNbOfLinesForBoxes=Sorok maximális száma a dobozokban PositionByDefault=Alapértelmezett sorrend -Position=Position +Position=Pozíció MenusDesc=Menük vezetők határozzák meg tartalmát, a 2 menüsorok (vízszintes és függőleges bar bar). MenusEditorDesc=A menü szerkesztő teszik, hogy megadjuk a menükben személyes bejegyzéseket. Használja óvatosan, hogy ne dolibarr instabil és menüpontok tartósan elérhetetlen.
Néhány modul bejegyzéseket a menükben (a menü Összes a legtöbb esetben). Ha eltávolította ezeket a bejegyzéseket néhány véletlenül, vissza tudja állítani őket, és letiltja reenabling a modul. MenuForUsers=Menü a felhasználók LangFile=File. Lang System=Rendszer -SystemInfo=Rendszer információk -SystemTools=Rendszer eszközök -SystemToolsArea=Rendszereszközök terület +SystemInfo=Rendszerinformációk +SystemTools=Rendszereszközök +SystemToolsArea=Rendszereszközök területe SystemToolsAreaDesc=Ez a terület ad adminisztrációs funkciókat. Használja a menüt a funkciót, amit keresel. Purge=Purge PurgeAreaDesc=Ez az oldal lehetővé teszi, hogy törölje az összes fájlt épített vagy tárolt Dolibarr (ideiglenes fájlokat vagy az összes fájl %s könyvtárban). A szolgáltatás használata nem szükséges. Ez biztosítja a felhasználók számára, akiknek Dolibarr ad otthont, amelyet a szolgáltató, amely nem kínál jogosultságokat törölni fájlokat épített a web szerver. @@ -181,19 +181,19 @@ ImportPostgreSqlDesc=Importálása backup fájlt, akkor kell használni pg_resto ImportMySqlCommand=%s %s <mybackupfile.sql ImportPostgreSqlCommand=%s %s mybackupfile.sql FileNameToGenerate=Fájlnév generálni -Compression=Compression +Compression=Tömörítés CommandsToDisableForeignKeysForImport=Paranccsal lehet letiltani a külföldi import kulcsok -CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later +CommandsToDisableForeignKeysForImportWarning=Kötelező, ha később szeretné visszaállítani a most elmentett adatokat. ExportCompatibility=Kompatibilitása generált export file MySqlExportParameters=MySQL export paraméterek -PostgreSqlExportParameters= PostgreSQL export parameters +PostgreSqlExportParameters= PostgreSQL export paraméterei UseTransactionnalMode=Használja tranzakciós mód FullPathToMysqldumpCommand=Teljes elérési útvonal mysqldump parancs FullPathToPostgreSQLdumpCommand=Teljes elérési útvonal paranccsal pg_dump ExportOptions=Export opciók AddDropDatabase=Add DROP DATABASE parancs AddDropTable=Add DROP TABLE parancs -ExportStructure=Structure +ExportStructure=Struktúra Datas=Adat NameColumn=Név oszlopok ExtendedInsert=Kiterjesztett INSERT @@ -297,15 +297,16 @@ MenuHandlers=Menü rakodók MenuAdmin=Menu Editor DoNotUseInProduction=Do not use in production ThisIsProcessToFollow=Ez a beállítási folyamat: +ThisIsAlternativeProcessToFollow=This is an alternative setup to process: StepNb=Step %s FindPackageFromWebSite=Keressen olyan csomag, amely biztosítja a kívánt funkciót (például a hivatalos honlapján %s). -DownloadPackageFromWebSite=Download package %s. -UnpackPackageInDolibarrRoot=Csomagolja csomag fájlt Dolibarr gyökérkönyvtárában %s +DownloadPackageFromWebSite=A %s csomag letöltése +UnpackPackageInDolibarrRoot=Bontsa ki a csomagfájlt a külső modulok számára fenntartott könyvtárba: %s SetupIsReadyForUse=Telepítése befejeződött, és Dolibarr kész, hogy ehhez az új alkatrész. -NotExistsDirect=The alternative root directory is not defined.
+NotExistsDirect=Nincs megadva az alternatív gyökérkönyvtár.
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: +YouCanSubmitFile=Válassza ki a modult: CurrentVersion=Dolibarr jelenlegi verzió CallUpdatePage=Lépjen arra az oldalra, amely frissíti az adatbázis szerkezetét és adatok: %s. LastStableVersion=Utolsó stabil verzió @@ -340,7 +341,7 @@ LanguageFilesCachedIntoShmopSharedMemory=Fájlok. Lang betöltve megosztott mem ExamplesWithCurrentSetup=Példák az aktuális telepítő futtatása ListOfDirectories=OpenDocument sablonok listája könyvtárak ListOfDirectoriesForModelGenODT=Listáját tartalmazó könyvtárak template fájlokat OpenDocument formátumban.

Tedd ide a teljes elérési út könyvtárat.
Add a kocsivissza között EAH könyvtárban.
Ahhoz, hogy egy könyvtárat a GED modul, add ide DOL_DATA_ROOT / ECM / yourdirectoryname.

Fájlok ezeket a könyvtárakat kell végződnie. ODT. -NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories +NumberOfModelFilesFound=Azon könyvtárakban talált ODT / ODS sablonok száma ExampleOfDirectoriesForModelGen=Példák a szintaxis:
c: \\ mydir
/ Home / mydir
DOL_DATA_ROOT / ECM / ecmdir FollowingSubstitutionKeysCanBeUsed=
Ha tudod, hogyan kell létrehozni a odt dokumentumsablonok, mielőtt tárolja őket azokra a könyvtárakra, olvasd el a wiki dokumentáció: FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template @@ -360,8 +361,8 @@ PDF=PDF PDFDesc=Beállíthatjuk, hogy az egyes globális kapcsolódó beállítások a PDF generáció PDFAddressForging=Szabályok kovácsolni címre dobozok HideAnyVATInformationOnPDF=Hide kapcsolatos minden információt áfa generált PDF -HideDescOnPDF=Hide products description on generated PDF -HideRefOnPDF=Hide products ref. on generated PDF +HideDescOnPDF=Termékleírás elrejtése a generált PDF fájlban +HideRefOnPDF=Termékreferencia elrejtése a generált PDF fájlban HideDetailsOnPDF=Hide products lines details on generated PDF Library=Könyvtár UrlGenerationParameters=URL paraméterek biztosítása @@ -377,17 +378,17 @@ String=Húr TextLong=Long text Int=Integer Float=Float -DateAndTime=Date and hour -Unique=Unique +DateAndTime=Dátum és idő +Unique=Egyedi Boolean=Boolean (Checkbox) ExtrafieldPhone = Telefon ExtrafieldPrice = Ár -ExtrafieldMail = Email +ExtrafieldMail = E-mail ExtrafieldSelect = Select list ExtrafieldSelectList = Select from table -ExtrafieldSeparator=Separator -ExtrafieldCheckBox=Checkbox -ExtrafieldRadio=Radio button +ExtrafieldSeparator=Elválasztó +ExtrafieldCheckBox=Jelölőnégyzet +ExtrafieldRadio=Választógomb 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 @@ -397,13 +398,13 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_ 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) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) 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=Hivatkozás frissítése LinkToTest=Clickable link generated for user %s (click phone number to test) -KeepEmptyToUseDefault=Keep empty to use default value -DefaultLink=Default link +KeepEmptyToUseDefault=Az alapérték használatához hagyja üresen +DefaultLink=Alapértelmezett hivatkozás 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 @@ -449,7 +450,7 @@ Module52Name=Készletek Module52Desc=Stock irányítása termékek Module53Name=Szolgáltatások Module53Desc=Szolgáltatás menedzsment -Module54Name=Contracts/Subscriptions +Module54Name=Szerződések / Előfizetések Module54Desc=Management of contracts (services or reccuring subscriptions) Module55Name=Vonalkódok Module55Desc=Vonalkód vezetése @@ -540,8 +541,8 @@ 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 +Module39000Name=Product lot +Module39000Desc=Lot or serial number, eat-by and sell-by date management on products Module50000Name=Paybox Module50000Desc=Modult kínál online fizetési oldalra bankkártyáját Paybox Module50100Name=Értékesítési @@ -558,8 +559,6 @@ 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=Olvassa vevői számlák Permission12=Létrehozza / módosítja vevői számlák Permission13=Unvalidate vevői számlák @@ -786,19 +785,19 @@ Permission2802=Use FTP client in write mode (delete or upload files) Permission50101=Use Point of sales Permission50201=Olvassa tranzakciók Permission50202=Import ügyletek -Permission54001=Print +Permission54001=Nyomtatás Permission55001=Read polls Permission55002=Create/modify polls Permission59001=Read commercial margins Permission59002=Define commercial margins Permission59003=Read every user margin -DictionaryCompanyType=Thirdparties type +DictionaryCompanyType=Harmadik felek típusai DictionaryCompanyJuridicalType=Juridical kinds of thirdparties DictionaryProspectLevel=Prospect potential level DictionaryCanton=State/Cantons -DictionaryRegion=Regions -DictionaryCountry=Countries -DictionaryCurrency=Currencies +DictionaryRegion=Régiók +DictionaryCountry=Országok +DictionaryCurrency=Pénznemek DictionaryCivility=Civility title DictionaryActions=Type of agenda events DictionarySocialContributions=Social contributions types @@ -806,18 +805,18 @@ DictionaryVAT=VAT Rates or Sales Tax Rates DictionaryRevenueStamp=Amount of revenue stamps DictionaryPaymentConditions=Payment terms DictionaryPaymentModes=Payment modes -DictionaryTypeContact=Contact/Address types +DictionaryTypeContact=Kapcsolat- és címtípusok DictionaryEcotaxe=Ecotax (WEEE) -DictionaryPaperFormat=Paper formats +DictionaryPaperFormat=Papírméretek DictionaryFees=Type of fees DictionarySendingMethods=Shipping methods DictionaryStaff=Staff DictionaryAvailability=Delivery delay -DictionaryOrderMethods=Ordering methods +DictionaryOrderMethods=Rendelés módjai DictionarySource=Origin of proposals/orders DictionaryAccountancyplan=Chart of accounts DictionaryAccountancysystem=Models for chart of accounts -DictionaryEMailTemplates=Emails templates +DictionaryEMailTemplates=E-mail sablonok SetupSaved=Beállítás mentett BackToModuleList=Visszalép a modulok listáját BackToDictionaryList=Back to dictionaries list @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= A RE mértéke alapesetben létrehozásakor kilátások, LocalTax2IsNotUsedDescES= Alapértelmezésben a javasolt IRPF 0. Vége a szabály. LocalTax2IsUsedExampleES= Spanyolországban, szabadúszók és független szakemberek, akik szolgáltatásokat nyújtanak és a vállalatok akik úgy döntöttek, az adórendszer a modulok. LocalTax2IsNotUsedExampleES= Spanyolországban vannak bussines nem adóköteles rendszer modulok. -CalcLocaltax=Reports -CalcLocaltax1ES=Sales - Purchases +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Sales - Purchases CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Purchases +CalcLocaltax2=Purchases CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Sales +CalcLocaltax3=Sales CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales LabelUsedByDefault=Label az alap, ha nincs fordítás megtalálható a kód LabelOnDocuments=Címke dokumentumok @@ -1018,14 +1017,14 @@ NoEventOrNoAuditSetup=Nincs biztonsági esemény lett felvéve még. Ez lehet no NoEventFoundWithCriteria=Nincs biztonsági esemény találtak ilyen keresési kritériumot. SeeLocalSendMailSetup=Nézze meg a helyi sendmail beállítása BackupDesc=Ahhoz, hogy egy teljes biztonsági mentést Dolibarr kell tennie: -BackupDesc2=* Mentsd dokumentumok tartalmának könyvtár (%s), amely tartalmazza az összes feltöltött és generált fájlok (lehet, hogy egy zip például). -BackupDesc3=* Mentse az adatbázis egy dump fájlt. Ehhez használhatod a következő asszisztens. +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=Archivált könyvtárban kell tárolni biztonságos helyen. BackupDescY=A generált dump fájlt kell tárolni biztonságos helyen. BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one RestoreDesc=Visszaállításához Dolibarr hát, ha kell: -RestoreDesc2=* Visszaállítása archív fájl (zip file például) a dokumentumok könyvtárat kivonat könyvtárakon a dokumentumok könyvtárban egy új létesítmény Dolibarr vagy oda ez a jelenlegi dokumentumok directoy (%s). -RestoreDesc3=* Az adatok visszaállítása, egy biztonsági mentésből memóriaképfájl, az adatbázisba az új létesítmény vagy Dolibarr az adatbázisba ennek a jelenleg telepített. Figyelem, ha helyreállítása befejeződött, használnod kell egy név / jelszó, hogy létezett, amikor a biztonsági másolat készült, hogy csatlakoztassa újra. Helyreállítani egy biztonsági adatbázis az aktuálisan telepített, akkor kövesse ezt asszisztens. +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= Ez a szabály arra kényszerül, hogy %s által aktivált modul PreviousDumpFiles=Elérhető adatbázis mentés fájlok kiírása @@ -1081,21 +1080,21 @@ 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 +YouUseBestDriver=A %s meghajtóprogram van használatban, ez a jelenleg elérhető legjobb. +YouDoNotUseBestDriver=A %s meghajtóprogram van használatban, de a %s ajánlott. +NbOfProductIsLowerThanNoPb=Az adatbázis csak %s terméket / szolgáltatást tartalmaz. Különösebb optimalizálásra nincs szükség. +SearchOptim=Keresés optimalizálása 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. +BrowserIsOK=A %s webböngészőt használja. Ez a böngésző a biztonság és a teljesítmény szempontjából is megfelel. +BrowserIsKO=A %s webböngészőt használja. Ez a böngésző közismerten rossz választás a biztonság, a teljesítmény és a megbízhatóság szempontjából. Javasoljuk, hogy használja a Firefox, Chrome, Opera vagy Safari böngészőket. +XDebugInstalled=XDebug betöltve. +XCacheInstalled=XCache betöltve. 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=%s mező szerkesztése 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. +EmptyNumRefModelDesc=A forráskód szabad / ingyenes, és bármikor megváltoztatható. ##### Module password generation PasswordGenerationStandard=Vissza a jelszót generált szerint Belső Dolibarr algoritmus: 8 karakter tartalmazó közös számokat és karaktereket kisbetűvel. PasswordGenerationNone=Nem utalnak semmilyen generált jelszót. Jelszót kell kézzel írja be. @@ -1196,7 +1195,7 @@ HideTreadedOrders=Hide the treated or cancelled orders in the list ValidOrderAfterPropalClosed=Ahhoz, hogy érvényesítse a megbízást, miután javaslat közelebb, lehetővé teszi, hogy ne lépjen az ideiglenes sorrendben FreeLegalTextOnOrders=Szabad szöveg rendelés WatermarkOnDraftOrders=Watermark on draft orders (none if empty) -ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable +ShippableOrderIconInList=Megrendelés szállíthatóságát jelző ikon hozzáadása a megrendelések listájához BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order ##### Clicktodial ##### ClickToDialSetup=Kattintson a Tárcsázás modul beállítása @@ -1337,6 +1336,8 @@ LDAPFieldCountry=Ország LDAPFieldCountryExample=Példa: c LDAPFieldDescription=Leírás LDAPFieldDescriptionExample=Példa: leírás +LDAPFieldNotePublic=Public Note +LDAPFieldNotePublicExample=Example : publicnote LDAPFieldGroupMembers= A csoport tagjai LDAPFieldGroupMembersExample= Példa: uniqueMember LDAPFieldBirthdate=Születésének @@ -1358,22 +1359,22 @@ LDAPDescMembers=Ez az oldal lehetővé teszi, hogy meghatározza az LDAP attrib LDAPDescValues=Példaértékek tervezték OpenLDAP az alábbi betöltött sémák: core.schema, cosine.schema, inetorgperson.schema). Ha a thoose értékek és az OpenLDAP, módosíthatja az LDAP konfigurációs file slapd.conf hogy minden thoose sémák betöltve. ForANonAnonymousAccess=A hitelesített hozzáférés (egy írási például) 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. +YouMayFindPerfAdviceHere=Ezen az oldalon a teljesítménnyel kapcsolatos tanácsok vagy ellenőrzések találhatók. +NotInstalled=Nincs telepítve, tehát nem lassítja le a szervert. 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 +HTTPCacheStaticResources=Statikus erőforrások (css, img, javascript) HTTP gyorsítótára +FilesOfTypeCached=A HTTP szerver a %s típusú fájlok esetében használja a gyorsítótárat. +FilesOfTypeNotCached=A HTTP szerver a %s típusú fájlok esetében nem használja a gyorsítótárat. +FilesOfTypeCompressed=A HTTP szerver a %s típusú fájlokat tömöríti. +FilesOfTypeNotCompressed=A HTTP szerver a %s típusú fájlokat nem tömöríti. CacheByServer=Cache by server CacheByClient=Cache by browser -CompressionOfResources=Compression of HTTP responses +CompressionOfResources=HTTP válaszok tömörítése TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### ProductSetup=Termékek modul beállítása @@ -1518,8 +1519,8 @@ Sell=Eladás InvoiceDateUsed=Számla dátuma használt YourCompanyDoesNotUseVAT=A cég már meg, hogy nem használja ÁFA-t (Home - Beállítás - Company / Alapítvány), így nincs lehetőség ÁFA telepíteni. AccountancyCode=Számviteli kód -AccountancyCodeSell=Sale account. code -AccountancyCodeBuy=Purchase account. code +AccountancyCodeSell=Eladás számviteli kódja +AccountancyCodeBuy=Vétel számviteli kódja ##### Agenda ##### AgendaSetup=Rendezvények és napirend modul beállítási PasswordTogetVCalExport=Főbb kiviteli engedélyezésének linket @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= Alapértelmezett fiók kezelhető készpénz kifizeté 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot 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 @@ -1593,9 +1594,9 @@ OpenFiscalYear=Open fiscal year CloseFiscalYear=Close fiscal year DeleteFiscalYear=Delete fiscal year ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? -Opened=Opened +Opened=Megnyitva Closed=Closed -AlwaysEditable=Can always be edited +AlwaysEditable=Mindig szerkeszthető 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 @@ -1604,7 +1605,7 @@ 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 +Format=Formátum 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 @@ -1616,3 +1617,8 @@ 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 +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" diff --git a/htdocs/langs/hu_HU/banks.lang b/htdocs/langs/hu_HU/banks.lang index 7f12abcf832db..5398c92d8dafd 100644 --- a/htdocs/langs/hu_HU/banks.lang +++ b/htdocs/langs/hu_HU/banks.lang @@ -163,3 +163,5 @@ LabelRIB=BAN Label NoBANRecord=No BAN record DeleteARib=Delete BAN record ConfirmDeleteRib=Are you sure you want to delete this BAN record ? +StartDate=Start date +EndDate=End date diff --git a/htdocs/langs/hu_HU/boxes.lang b/htdocs/langs/hu_HU/boxes.lang index b04f1941923a2..f91459aba543a 100644 --- a/htdocs/langs/hu_HU/boxes.lang +++ b/htdocs/langs/hu_HU/boxes.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - boxes BoxLastRssInfos=Rss Információk BoxLastProducts=Utolsó %s termék / szolgáltatás -# BoxProductsAlertStock=Products in stock alert +BoxProductsAlertStock=Products in stock alert BoxLastProductsInContract=Utolsó %s leszerződött termék / szolgáltatás BoxLastSupplierBills=Utolsó beszállítói számlák BoxLastCustomerBills=Utolsó ügyfél számlák @@ -12,13 +12,14 @@ BoxLastProspects=Utolsó kilátások BoxLastCustomers=Utolsó ügyfelek BoxLastSuppliers=Utolsó beszállítól BoxLastCustomerOrders=Utolsó ügyfél rendelések +BoxLastValidatedCustomerOrders=Last validated customer orders BoxLastBooks=Utosó könyvek BoxLastActions=Utolsó cselekvések BoxLastContracts=Utolsó szerződések BoxLastContacts=Utolsó kapcsolatok / címek BoxLastMembers=Utolsó tagok -# BoxFicheInter=Last interventions -# BoxCurrentAccounts=Opened accounts balance +BoxFicheInter=Last interventions +BoxCurrentAccounts=Opened accounts balance BoxSalesTurnover=Értékesítési forgalom BoxTotalUnpaidCustomerBills=Összes ki nem fizetett ügyfél számla BoxTotalUnpaidSuppliersBills=Összes ki nem fizetett beszállító számla @@ -26,27 +27,30 @@ BoxTitleLastBooks=Utolsó %s jegyzett könyvek BoxTitleNbOfCustomers=Ügyfelek száma BoxTitleLastRssInfos=Utolsó %s hír a(z) %s -ról BoxTitleLastProducts=Utolsó %s módosított termék / szolgáltatás -# BoxTitleProductsAlertStock=Products in stock alert -BoxTitleLastCustomerOrders=Utolsó %s módosított ügyfél rendelések +BoxTitleProductsAlertStock=Products in stock alert +BoxTitleLastCustomerOrders=Last %s customer orders +BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders BoxTitleLastSuppliers=Utolsó %s jegyzett beszállító BoxTitleLastCustomers=Utolsó %s jegyzett ügyfél BoxTitleLastModifiedSuppliers=Utolsó %s módosított beszállító BoxTitleLastModifiedCustomers=Utolsó %s módosított ügyfél -BoxTitleLastCustomersOrProspects=Utolsó %s módosított ügyfél vagy kilátás -BoxTitleLastPropals=Utolsó %s jegyzett ajánlat +BoxTitleLastCustomersOrProspects=Last %s customers or prospects +BoxTitleLastPropals=Last %s proposals +BoxTitleLastModifiedPropals=Last %s modified proposals BoxTitleLastCustomerBills=Utolsó %s ügyfél számla +BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices BoxTitleLastSupplierBills=Utolsó %s beszállító számla -BoxTitleLastProspects=Utolsó %s jegyzett kilátás +BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices BoxTitleLastModifiedProspects=Utolsó %s módosított kilátás BoxTitleLastProductsInContract=Utolsó %s termékek / szolgáltatások szerződésbe foglalva -BoxTitleLastModifiedMembers=Utolsó módosítás tagjai %s -# BoxTitleLastFicheInter=Last %s modified intervention -BoxTitleOldestUnpaidCustomerBills=Legrégebbi %s kifizetetlen ügyfél számla -BoxTitleOldestUnpaidSupplierBills=Legrégebbi %s kifizetetlen beszállító számla -# BoxTitleCurrentAccounts=Opened account's balances +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=Értékesítési forgalom -BoxTitleTotalUnpaidCustomerBills=Kifizetetlen ügyfél számla -BoxTitleTotalUnpaidSuppliersBills=Kifizetetlen beszállítói számla +BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices +BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices BoxTitleLastModifiedContacts=Utolsó módosítás %s kapcsolatok / címek BoxMyLastBookmarks=%s utolsó könyvjelzőim BoxOldestExpiredServices=Legrégebbi aktív lejárt szolgáltatások @@ -55,7 +59,7 @@ BoxTitleLastActionsToDo=Utolsó %s végrehatjtásra váró cselekvés BoxTitleLastContracts=Utolsó %s szerzősédesk BoxTitleLastModifiedDonations=Utolsó módosítás adományok %s BoxTitleLastModifiedExpenses=Utolsó módosítás költségeit %s -# BoxGlobalActivity=Global activity (invoices, proposals, orders) +BoxGlobalActivity=Global activity (invoices, proposals, orders) FailedToRefreshDataInfoNotUpToDate=Nem sikerült az RSS-t frissíteni. Az utolsó sikeres frissítés: %s LastRefreshDate=Utolsó frissítés NoRecordedBookmarks=Nincs könyvjezlő. Kattintson ide könyvjelző hozzáadásához. @@ -74,18 +78,20 @@ NoRecordedProducts=Nincs bejegyzett termék / szolgáltatás NoRecordedProspects=Nincs bejegyzett kilátás NoContractedProducts=Nincs szerződött termék / szolgáltatás NoRecordedContracts=Nincs bejegyzett szerződés -# 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 +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=Ügyfél számlák -# ForCustomersOrders=Customers orders +ForCustomersOrders=Customers orders ForProposals=Javaslatok +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/hu_HU/errors.lang b/htdocs/langs/hu_HU/errors.lang index 18243bd074fef..f40cf8a361517 100644 --- a/htdocs/langs/hu_HU/errors.lang +++ b/htdocs/langs/hu_HU/errors.lang @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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/langs/hu_HU/interventions.lang b/htdocs/langs/hu_HU/interventions.lang index 45ba17c149fcc..8195781e895bf 100644 --- a/htdocs/langs/hu_HU/interventions.lang +++ b/htdocs/langs/hu_HU/interventions.lang @@ -50,4 +50,4 @@ ArcticNumRefModelError=Sikertelen aktiválás PacificNumRefModelDesc1=Számot ad a következő formában: %syymm-nnnn ahol yy az év, mm a hónap és nnnn 4 szám 0-tól indúlva PacificNumRefModelError=Egy intervenciós kártya $syymm kezdéssel már létezik és nem kompatibilies ezzel a szekvencia modellel. Távolítsa el vagy nevezze át hogy aktiválhassa a modult. PrintProductsOnFichinter=Print products on intervention card -PrintProductsOnFichinterDetails=forinterventions generated from orders +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang index 9789a1797c2bb..ba2b0277b6c88 100644 --- a/htdocs/langs/hu_HU/main.lang +++ b/htdocs/langs/hu_HU/main.lang @@ -220,6 +220,7 @@ Next=Következő Cards=Kártáy Card=Kártya Now=Most +HourStart=Start hour Date=Dátum DateAndHour=Date and hour DateStart=Kezdés @@ -242,6 +243,8 @@ DatePlanShort=Dátum terv DateRealShort=dátuma real. DateBuild=Jelentés készítés dátuma DatePayment=Folyósításának időpontja +DateApprove=Approving date +DateApprove2=Approving date (second approval) DurationYear=év DurationMonth=hónap DurationWeek=hét @@ -408,6 +411,8 @@ OtherInformations=Egyéb információk Quantity=Mennyiség Qty=Menny. ChangedBy=Módosította +ApprovedBy=Approved by +ApprovedBy2=Approved by (second approval) ReCalculate=Recalculate ResultOk=Siker ResultKo=Sikerleteln @@ -696,6 +701,8 @@ 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. +Deny=Deny +Denied=Denied # Week day Monday=Hétfő Tuesday=Kedd diff --git a/htdocs/langs/hu_HU/orders.lang b/htdocs/langs/hu_HU/orders.lang index d6338ec744b1a..4246bddb08f03 100644 --- a/htdocs/langs/hu_HU/orders.lang +++ b/htdocs/langs/hu_HU/orders.lang @@ -79,7 +79,9 @@ NoOpenedOrders=Nem nyitott megrendelések NoOtherOpenedOrders=Nincs más nyitott megrendelések NoDraftOrders=No draft orders OtherOrders=Egyéb megrendelések -LastOrders=Utolsó %s megrendelések +LastOrders=Last %s customer orders +LastCustomerOrders=Last %s customer orders +LastSupplierOrders=Last %s supplier orders LastModifiedOrders=Utolsó módosítás %s megrendelések LastClosedOrders=Utolsó lezárt megrendelések %s AllOrders=Minden rendelés diff --git a/htdocs/langs/hu_HU/other.lang b/htdocs/langs/hu_HU/other.lang index f18813e846ac4..caee8f2a0d6bc 100644 --- a/htdocs/langs/hu_HU/other.lang +++ b/htdocs/langs/hu_HU/other.lang @@ -203,6 +203,7 @@ 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. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=Add bejegyzés a naptárban %s diff --git a/htdocs/langs/hu_HU/productbatch.lang b/htdocs/langs/hu_HU/productbatch.lang index 452636819653f..85b1d27f3a611 100644 --- a/htdocs/langs/hu_HU/productbatch.lang +++ b/htdocs/langs/hu_HU/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use batch/serial number -ProductStatusOnBatch=Yes (Batch/serial required) -ProductStatusNotOnBatch=No (Batch/serial not used) +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/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 +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial 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 +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %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. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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/hu_HU/projects.lang b/htdocs/langs/hu_HU/projects.lang index 8485f52743cbe..52e733b2e4701 100644 --- a/htdocs/langs/hu_HU/projects.lang +++ b/htdocs/langs/hu_HU/projects.lang @@ -14,6 +14,7 @@ MyTasksDesc=Ez a nézet azokra a projektekre van korlátozva amivel valamilyen 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. +AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. ProjectsArea=Projektek terület NewProject=Új projekt AddProject=Create project diff --git a/htdocs/langs/hu_HU/stocks.lang b/htdocs/langs/hu_HU/stocks.lang index c3570f47006d8..e3aefb8cb1c12 100644 --- a/htdocs/langs/hu_HU/stocks.lang +++ b/htdocs/langs/hu_HU/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Küldés megszakítása DeleteSending=Küldés törlése Stock=Készlet Stocks=Készletek +StocksByLotSerial=Stock by lot/serial Movement=Mozgás Movements=Mozgások ErrorWarehouseRefRequired=Raktár referencia név szükséges @@ -78,6 +79,7 @@ IdWarehouse=Raktár azon.# DescWareHouse=Raktár leírás LieuWareHouse=Raktár helye WarehousesAndProducts=Raktárak és termékek +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=Súlyozott átlag beviteli ár AverageUnitPricePMP=Súlyozott átlag beviteli ár SellPriceMin=Értékesítés Egységár @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/hu_HU/suppliers.lang b/htdocs/langs/hu_HU/suppliers.lang index 761f1450e6d52..2d5eebdf4eba2 100644 --- a/htdocs/langs/hu_HU/suppliers.lang +++ b/htdocs/langs/hu_HU/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) +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/hu_HU/trips.lang b/htdocs/langs/hu_HU/trips.lang index b1d1f636ca8ee..3932da4b2a2db 100644 --- a/htdocs/langs/hu_HU/trips.lang +++ b/htdocs/langs/hu_HU/trips.lang @@ -69,11 +69,9 @@ 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 @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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 ae4ea132bc1ae..32d5550706610 100644 --- a/htdocs/langs/id_ID/admin.lang +++ b/htdocs/langs/id_ID/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).
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_ 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) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s RefreshPhoneLink=Refresh link @@ -540,8 +541,8 @@ 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 +Module39000Name=Product lot +Module39000Desc=Lot 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 @@ -558,8 +559,6 @@ Module59000Name=Margin Module59000Desc=Module to manage margins Module60000Name=Komisi 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=Membaca Nota Pelanggan Permission12=Membuat/Merubah Nota Pelanggan Permission13=Unvalidate customer invoices @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, 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 +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Sales - Purchases CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Purchases +CalcLocaltax2=Purchases CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Sales +CalcLocaltax3=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 @@ -1018,14 +1017,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 @@ -1337,6 +1336,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 @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= Default account to use to receive payments by credit c 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot 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 @@ -1616,3 +1617,8 @@ 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 +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" diff --git a/htdocs/langs/id_ID/banks.lang b/htdocs/langs/id_ID/banks.lang index a2306950fb484..72639883e1ac2 100644 --- a/htdocs/langs/id_ID/banks.lang +++ b/htdocs/langs/id_ID/banks.lang @@ -163,3 +163,5 @@ LabelRIB=BAN Label NoBANRecord=No BAN record DeleteARib=Delete BAN record ConfirmDeleteRib=Are you sure you want to delete this BAN record ? +StartDate=Start date +EndDate=End date diff --git a/htdocs/langs/id_ID/boxes.lang b/htdocs/langs/id_ID/boxes.lang index e7e9da7dc1b80..c0180bebdaa46 100644 --- a/htdocs/langs/id_ID/boxes.lang +++ b/htdocs/langs/id_ID/boxes.lang @@ -12,6 +12,7 @@ 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 @@ -27,26 +28,29 @@ BoxTitleNbOfCustomers=Number of clients 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=Unpaid customer invoices +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 @@ -89,3 +94,4 @@ BoxProductDistributionFor=Distribution of %s for %s ForCustomersInvoices=Customers invoices ForCustomersOrders=Customers orders ForProposals=Proposals +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/id_ID/errors.lang b/htdocs/langs/id_ID/errors.lang index 52e9f6aeae473..dbafde2f6e546 100644 --- a/htdocs/langs/id_ID/errors.lang +++ b/htdocs/langs/id_ID/errors.lang @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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/langs/id_ID/interventions.lang b/htdocs/langs/id_ID/interventions.lang index c79da05364e61..67d4f61d9f15d 100644 --- a/htdocs/langs/id_ID/interventions.lang +++ b/htdocs/langs/id_ID/interventions.lang @@ -50,4 +50,4 @@ 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 +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang index 27779080dd085..c7c79e7f81605 100644 --- a/htdocs/langs/id_ID/main.lang +++ b/htdocs/langs/id_ID/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 @@ -242,6 +243,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 +411,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 @@ -696,6 +701,8 @@ 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. +Deny=Deny +Denied=Denied # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/id_ID/orders.lang b/htdocs/langs/id_ID/orders.lang index 3d4f381c40b4d..044bcc0eb0174 100644 --- a/htdocs/langs/id_ID/orders.lang +++ b/htdocs/langs/id_ID/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/langs/id_ID/other.lang b/htdocs/langs/id_ID/other.lang index a34983b009f7a..a212c579e78e9 100644 --- a/htdocs/langs/id_ID/other.lang +++ b/htdocs/langs/id_ID/other.lang @@ -203,6 +203,7 @@ 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. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=Add entry in calendar %s diff --git a/htdocs/langs/id_ID/productbatch.lang b/htdocs/langs/id_ID/productbatch.lang index 452636819653f..85b1d27f3a611 100644 --- a/htdocs/langs/id_ID/productbatch.lang +++ b/htdocs/langs/id_ID/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use batch/serial number -ProductStatusOnBatch=Yes (Batch/serial required) -ProductStatusNotOnBatch=No (Batch/serial not used) +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/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 +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial 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 +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %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. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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/id_ID/projects.lang b/htdocs/langs/id_ID/projects.lang index 03c11382a2d8b..eac0f41d321f1 100644 --- a/htdocs/langs/id_ID/projects.lang +++ b/htdocs/langs/id_ID/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/langs/id_ID/stocks.lang b/htdocs/langs/id_ID/stocks.lang index 29706d1761545..c2b432d7f9b93 100644 --- a/htdocs/langs/id_ID/stocks.lang +++ b/htdocs/langs/id_ID/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Cancel sending DeleteSending=Delete sending Stock=Stock Stocks=Stocks +StocksByLotSerial=Stock by lot/serial Movement=Movement Movements=Movements ErrorWarehouseRefRequired=Warehouse reference name is required @@ -78,6 +79,7 @@ IdWarehouse=Id warehouse DescWareHouse=Description warehouse LieuWareHouse=Localisation warehouse WarehousesAndProducts=Warehouses and products +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=Weighted average input price AverageUnitPricePMP=Weighted average input price SellPriceMin=Selling Unit Price @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/id_ID/suppliers.lang b/htdocs/langs/id_ID/suppliers.lang index 5ce0419ddf408..7fbe40785a5df 100644 --- a/htdocs/langs/id_ID/suppliers.lang +++ b/htdocs/langs/id_ID/suppliers.lang @@ -43,4 +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) +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/id_ID/trips.lang b/htdocs/langs/id_ID/trips.lang index ba36fc9b07b6a..76b214abdb77f 100644 --- a/htdocs/langs/id_ID/trips.lang +++ b/htdocs/langs/id_ID/trips.lang @@ -69,11 +69,9 @@ 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 @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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 74f0eb019d154..3d326fa5fb09a 100644 --- a/htdocs/langs/is_IS/admin.lang +++ b/htdocs/langs/is_IS/admin.lang @@ -297,10 +297,11 @@ MenuHandlers=Valmynd dýraþjálfari MenuAdmin=Valmynd ritstjóri DoNotUseInProduction=Do not use in production ThisIsProcessToFollow=Þetta er skipulag unnið: +ThisIsAlternativeProcessToFollow=This is an alternative setup to process: StepNb=Skref %s FindPackageFromWebSite=Finna pakki sem veitir lögun þú vilt (td á heimasíðu %s ). DownloadPackageFromWebSite=Download package %s. -UnpackPackageInDolibarrRoot=Taka upp pakka skrá inn í rót Dolibarr möppuna %s +UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: %s SetupIsReadyForUse=Setja er lokið og Dolibarr er tilbúinn til notkunar með þessu nýja hluti. 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).
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_ 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) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s RefreshPhoneLink=Refresh link @@ -540,8 +541,8 @@ 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 +Module39000Name=Product lot +Module39000Desc=Lot or serial number, eat-by and sell-by date management on products Module50000Name=PayBox Module50000Desc=Module til að bjóða upp á netinu greiðslu síðu með kreditkorti með PayBox Module50100Name=Point of sölu @@ -558,8 +559,6 @@ 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=Lesa reikningum Permission12=Búa til reikninga Permission13=Breyta/Staðfesta reikningum @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= RE hlutfall sjálfgefið þegar þú býrð til viðskipt LocalTax2IsNotUsedDescES= Sjálfgefið er fyrirhuguð IRPF er 0. Lok reglu. LocalTax2IsUsedExampleES= Á Spáni freelancers og sjálfstæða sérfræðinga sem veita þjónustu og fyrirtæki sem hafa valið skatt kerfi eininga. LocalTax2IsNotUsedExampleES= Á Spáni eru bussines ekki skattskyldar kerfi eininga. -CalcLocaltax=Reports -CalcLocaltax1ES=Sales - Purchases +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Sales - Purchases CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Purchases +CalcLocaltax2=Purchases CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Sales +CalcLocaltax3=Sales CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales LabelUsedByDefault=Merki notaður við vanræksla, ef ekki þýðingu er að finna í kóða LabelOnDocuments=Merki um skjöl @@ -1018,14 +1017,14 @@ NoEventOrNoAuditSetup=Nei öryggi atburður hefur verið skráð enn. Þetta get NoEventFoundWithCriteria=Nei öryggi atburður hefur fundist um slíka viðmiðun leit. SeeLocalSendMailSetup=Sjá sveitarfélaga sendmail uppsetningu BackupDesc=Til að ljúka öryggisafrit af Dolibarr, verður þú að: -BackupDesc2=* Vista innihaldi skjala skrá ( %s ), sem inniheldur allt hlaðið og mynda skrár (þú getur gert zip til dæmis). -BackupDesc3=* Vista innihaldi Skráð inn á sorphaugur skrá. fyrir þetta getur þú notað eftirfarandi aðstoðarmaður. +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=Eldri mappa ætti að vera geymd á öruggum stað. BackupDescY=The mynda sorphaugur skrá öxl vera geymd á öruggum stað. BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one RestoreDesc=Til að endurvekja a Dolibarr varabúnaður, verður þú að: -RestoreDesc2=* Setja skjalasafn skrá (zip skrá til dæmis) af skjölum skrá til að vinna úr tré af skrám í skjölum skrá nýja Dolibarr uppsetning eða inn í þetta núverandi gögn directoy ( %s ). -RestoreDesc3=* Endurheimta gögn frá varabúnaður sorphaugur skrá inn í gagnagrunninn á ný Dolibarr uppsetning eða inn í gagnagrunninn á þessum núverandi uppsetningu. Aðvörun, einu sinni aftur er lokið, verður þú að nota Innskráning / lykilorð, sem fyrir hendi þegar afrit var gert, til að tengja aftur. Til að endurheimta afrit gagnagrunnur í þessum núverandi uppsetningu er hægt að fylgja þessari aðstoðarmaður. +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= Þessi regla er þvinguð til %s með virkt mát PreviousDumpFiles=Laus gagnasafn afrit afrita skrár @@ -1337,6 +1336,8 @@ LDAPFieldCountry=Land LDAPFieldCountryExample=Dæmi: c LDAPFieldDescription=Lýsing LDAPFieldDescriptionExample=Dæmi: lýsing +LDAPFieldNotePublic=Public Note +LDAPFieldNotePublicExample=Example : publicnote LDAPFieldGroupMembers= Meðlimir hópsins LDAPFieldGroupMembersExample= Dæmi: uniqueMember LDAPFieldBirthdate=Fæðingardagur @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= Reikning til að nota til að taka á móti peningum g 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot 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 @@ -1616,3 +1617,8 @@ 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 +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" diff --git a/htdocs/langs/is_IS/banks.lang b/htdocs/langs/is_IS/banks.lang index 3b8b3123521e8..fdddb8321d979 100644 --- a/htdocs/langs/is_IS/banks.lang +++ b/htdocs/langs/is_IS/banks.lang @@ -163,3 +163,5 @@ LabelRIB=BAN Label NoBANRecord=No BAN record DeleteARib=Delete BAN record ConfirmDeleteRib=Are you sure you want to delete this BAN record ? +StartDate=Start date +EndDate=End date diff --git a/htdocs/langs/is_IS/boxes.lang b/htdocs/langs/is_IS/boxes.lang index 26d5b7abb4b22..b6200d0a78e84 100644 --- a/htdocs/langs/is_IS/boxes.lang +++ b/htdocs/langs/is_IS/boxes.lang @@ -12,6 +12,7 @@ BoxLastProspects=Síðasta horfur BoxLastCustomers=Síðasta viðskiptavina BoxLastSuppliers=Síðasta birgja BoxLastCustomerOrders=Síðasta viðskiptavina pantanir +BoxLastValidatedCustomerOrders=Last validated customer orders BoxLastBooks=Síðasta bók BoxLastActions=Síðasta aðgerð BoxLastContracts=Síðasta samninga @@ -27,26 +28,29 @@ BoxTitleNbOfCustomers=Nombre de viðskiptavinur BoxTitleLastRssInfos=Last %s fréttir frá %s BoxTitleLastProducts=Last %s breytt vörur / þjónustu BoxTitleProductsAlertStock=Products in stock alert -BoxTitleLastCustomerOrders=Last %s breytt viðskiptavina pantanir +BoxTitleLastCustomerOrders=Last %s customer orders +BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders BoxTitleLastSuppliers=Last %s skráð birgja BoxTitleLastCustomers=Last %s skráð viðskiptavini BoxTitleLastModifiedSuppliers=Síðast %s breytt birgja BoxTitleLastModifiedCustomers=Síðast %s breytt viðskiptavini -BoxTitleLastCustomersOrProspects=Last %s breytt viðskiptavini eða horfur -BoxTitleLastPropals=Last %s skráð tillögur +BoxTitleLastCustomersOrProspects=Last %s customers or prospects +BoxTitleLastPropals=Last %s proposals +BoxTitleLastModifiedPropals=Last %s modified proposals BoxTitleLastCustomerBills=Last %s reikninga viðskiptavina +BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices BoxTitleLastSupplierBills=Last %s reikningum birgis -BoxTitleLastProspects=Last %s skráð horfur +BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices BoxTitleLastModifiedProspects=Síðast %s breytt horfum BoxTitleLastProductsInContract=Last %s vörur / þjónustu í samningi -BoxTitleLastModifiedMembers=Síðustu %s breytt meðlimir +BoxTitleLastModifiedMembers=Last %s members BoxTitleLastFicheInter=Last %s modified intervention -BoxTitleOldestUnpaidCustomerBills=Elsta %s reikningum launalaust viðskiptavinar -BoxTitleOldestUnpaidSupplierBills=Elsta %s reikningum launalaust birgis +BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices +BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices BoxTitleCurrentAccounts=Opened account's balances BoxTitleSalesTurnover=Velta Velta -BoxTitleTotalUnpaidCustomerBills=reikningum ógreidd viðskiptavinar -BoxTitleTotalUnpaidSuppliersBills=reikningum ógreidd birgis +BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices +BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices BoxTitleLastModifiedContacts=Síðustu %s breytt tengiliðum / Vistfang BoxMyLastBookmarks=síðasta %s mín bókamerki BoxOldestExpiredServices=Elsta virkir útrunnin þjónustu @@ -76,7 +80,8 @@ NoContractedProducts=Engar vörur / þjónustu dróst NoRecordedContracts=Engin skrá samninga 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 @@ -89,3 +94,4 @@ BoxProductDistributionFor=Distribution of %s for %s ForCustomersInvoices=reikninga viðskiptavinar ForCustomersOrders=Customers orders ForProposals=Tillögur +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/is_IS/errors.lang b/htdocs/langs/is_IS/errors.lang index c0fdc7b7bd033..ca349e469247f 100644 --- a/htdocs/langs/is_IS/errors.lang +++ b/htdocs/langs/is_IS/errors.lang @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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/langs/is_IS/interventions.lang b/htdocs/langs/is_IS/interventions.lang index 35009d0e1e182..ba95ddc48d068 100644 --- a/htdocs/langs/is_IS/interventions.lang +++ b/htdocs/langs/is_IS/interventions.lang @@ -50,4 +50,4 @@ ArcticNumRefModelError=Ekki tókst að virkja PacificNumRefModelDesc1=Fara aftur numero með snið %s yymm-NNNN þar YY er ári, mm er mánuður og NNNN er röð án brot og ekki aftur snúið til 0 PacificNumRefModelError=Íhlutun kort sem byrjar á $ syymm er til nú þegar og er ekki með þessari tegund af röð. Fjarlægja hana eða gefa henni nýtt heiti þess að virkja þessa einingu. PrintProductsOnFichinter=Print products on intervention card -PrintProductsOnFichinterDetails=forinterventions generated from orders +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang index 370be13bc9988..7260b333a2c54 100644 --- a/htdocs/langs/is_IS/main.lang +++ b/htdocs/langs/is_IS/main.lang @@ -220,6 +220,7 @@ Next=Næsti Cards=Spil Card=Card Now=Nú +HourStart=Start hour Date=Dagsetning DateAndHour=Date and hour DateStart=Upphafsdagsetning @@ -242,6 +243,8 @@ DatePlanShort=Date flugvél DateRealShort=Date raunveruleg. DateBuild=Skýrsla byggja dagsetningu DatePayment=Dagsetning greiðslu +DateApprove=Approving date +DateApprove2=Approving date (second approval) DurationYear=ár DurationMonth=mánuður DurationWeek=viku @@ -408,6 +411,8 @@ OtherInformations=Aðrar upplýsingar Quantity=Magn Qty=Magn ChangedBy=Breytt af +ApprovedBy=Approved by +ApprovedBy2=Approved by (second approval) ReCalculate=Recalculate ResultOk=Velgengni ResultKo=Bilun @@ -696,6 +701,8 @@ 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. +Deny=Deny +Denied=Denied # 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 902d6f4050877..eefcdf2edba75 100644 --- a/htdocs/langs/is_IS/orders.lang +++ b/htdocs/langs/is_IS/orders.lang @@ -79,7 +79,9 @@ NoOpenedOrders=Nei opnaði pantanir NoOtherOpenedOrders=Engin önnur opnaði pantanir NoDraftOrders=No draft orders OtherOrders=Aðrar skipanir -LastOrders=Last %s pantanir +LastOrders=Last %s customer orders +LastCustomerOrders=Last %s customer orders +LastSupplierOrders=Last %s supplier orders LastModifiedOrders=Last %s breytt pantanir LastClosedOrders=Last %s lokuð fyrirmæla AllOrders=Allar pantanir diff --git a/htdocs/langs/is_IS/other.lang b/htdocs/langs/is_IS/other.lang index 9286b8bdd81a8..5355b9fe86963 100644 --- a/htdocs/langs/is_IS/other.lang +++ b/htdocs/langs/is_IS/other.lang @@ -203,6 +203,7 @@ 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. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=Bæta við færslu í dagbók %s diff --git a/htdocs/langs/is_IS/productbatch.lang b/htdocs/langs/is_IS/productbatch.lang index 452636819653f..85b1d27f3a611 100644 --- a/htdocs/langs/is_IS/productbatch.lang +++ b/htdocs/langs/is_IS/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use batch/serial number -ProductStatusOnBatch=Yes (Batch/serial required) -ProductStatusNotOnBatch=No (Batch/serial not used) +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/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 +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial 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 +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %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. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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/is_IS/projects.lang b/htdocs/langs/is_IS/projects.lang index 8a186277a99c9..5a923bd6b689f 100644 --- a/htdocs/langs/is_IS/projects.lang +++ b/htdocs/langs/is_IS/projects.lang @@ -14,6 +14,7 @@ MyTasksDesc=Þessi skoðun er takmörkuð við verkefni eða verkefni sem þú e 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). +AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. ProjectsArea=Verkefni area NewProject=Ný verkefni AddProject=Create project diff --git a/htdocs/langs/is_IS/stocks.lang b/htdocs/langs/is_IS/stocks.lang index 66d6b14f2600f..d47c132820717 100644 --- a/htdocs/langs/is_IS/stocks.lang +++ b/htdocs/langs/is_IS/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Hætta við að senda DeleteSending=Eyða sendingu Stock=Stock Stocks=Verðbréf +StocksByLotSerial=Stock by lot/serial Movement=Hreyfing Movements=Hreyfing ErrorWarehouseRefRequired=Lager tilvísun nafn er krafist @@ -78,6 +79,7 @@ IdWarehouse=Auðkenni vörugeymsla DescWareHouse=Lýsing vörugeymsla LieuWareHouse=Staðsetning lager WarehousesAndProducts=Vöruhús og vörur +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=Meðaltal inntak verð AverageUnitPricePMP=Meðaltal inntak verð SellPriceMin=Selja Unit verð @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/is_IS/suppliers.lang b/htdocs/langs/is_IS/suppliers.lang index 4176fa17e9d1d..6abb9995b6ef2 100644 --- a/htdocs/langs/is_IS/suppliers.lang +++ b/htdocs/langs/is_IS/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) +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/is_IS/trips.lang b/htdocs/langs/is_IS/trips.lang index ca49d8ad9aaa4..9561390dfb5c8 100644 --- a/htdocs/langs/is_IS/trips.lang +++ b/htdocs/langs/is_IS/trips.lang @@ -69,11 +69,9 @@ 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 @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang index 914be8b701224..b12cd515f633f 100644 --- a/htdocs/langs/it_IT/accountancy.lang +++ b/htdocs/langs/it_IT/accountancy.lang @@ -28,8 +28,8 @@ Validate=Convalida Addanaccount=Aggiungi un account di contabilità AccountAccounting=Account di contabilità Ventilation=Breakdown -ToDispatch=To dispatch -Dispatched=Dispatched +ToDispatch=Da spedire +Dispatched=Spedito CustomersVentilation=Breakdown customers SuppliersVentilation=Breakdown suppliers @@ -68,7 +68,7 @@ Lineofinvoice=Riga fattura VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTING_SEPARATORCSV=Column separator in export file +ACCOUNTING_SEPARATORCSV=Separatore delle colonne nel file di esportazione 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 @@ -103,7 +103,7 @@ Labelcompte=Etichetta account Debit=Debito Credit=Credito Amount=Importo -Sens=Sens +Sens=Verso Codejournal=Giornale DelBookKeeping=Delete the records of the general ledger @@ -143,7 +143,7 @@ Active=Statement NewFiscalYear=Nuovo anno fiscale DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers -TotalVente=Total turnover HT +TotalVente=Totale netto fatturato TotalMarge=Margine totale sulle vendite 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 diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang index 386fa3c17e41f..afa069aac529e 100644 --- a/htdocs/langs/it_IT/admin.lang +++ b/htdocs/langs/it_IT/admin.lang @@ -8,9 +8,9 @@ VersionExperimental=Sperimentale VersionDevelopment=Sviluppo VersionUnknown=Sconosciuta VersionRecommanded=Raccomandata -FileCheck=Files Integrity -FilesMissing=Missing Files -FilesUpdated=Updated Files +FileCheck=Integrità dei file +FilesMissing=File mancanti +FilesUpdated=File aggiornati FileCheckDolibarr=Check Dolibarr Files Integrity XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=ID di sessione @@ -84,8 +84,8 @@ Mask=Maschera NextValue=Prossimo valore NextValueForInvoices=Prossimo valore (fatture) NextValueForCreditNotes=Prossimo valore (note di credito) -NextValueForDeposit=Next value (deposit) -NextValueForReplacements=Next value (replacements) +NextValueForDeposit=Valore successivo (deposito) +NextValueForReplacements=Valore successivo (sostituzioni) MustBeLowerThanPHPLimit=Nota: il tuo PHP limita la dimensione di ogni file upload a %s %s, sebbene il valore del parametro sia NoMaxSizeByPHPLimit=Nota: Non è stato fissato nessun limite massimo nella configurazione del PHP MaxSizeForUploadedFiles=Dimensione massima dei file caricati (0 per disabilitare qualsiasi upload) @@ -297,10 +297,11 @@ MenuHandlers=Gestori menu MenuAdmin=Editor menu DoNotUseInProduction=Da non usare in produzione ThisIsProcessToFollow=Il procedimento da seguire è: +ThisIsAlternativeProcessToFollow=This is an alternative setup to process: StepNb=Passo %s FindPackageFromWebSite=Trova un pacchetto che fornisca la funzionalità desiderata (per esempio su %s). -DownloadPackageFromWebSite=Download package %s. -UnpackPackageInDolibarrRoot=Scompattare il pacchetto nella directory di root di Dolibarr %s +DownloadPackageFromWebSite=Scaricare il pacchetto %s. +UnpackPackageInDolibarrRoot=Scompatta il pacchetto nella directory dei moduli esterni: %s SetupIsReadyForUse=Installazione completata. Dolibarr è pronto ad utilizzare questo nuovo componente. NotExistsDirect=La directory root alternativa non è stata definita.
InfDirAlt=A partire dalla versione 3 è possibile definire una directory root alternativa. Ciò permette di archiviare plugin e template personalizzati nello stesso posto.
Basta creare una directory nella root di Dolibarr ( per esempio custom).
@@ -392,20 +393,20 @@ 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
... -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 +ExtrafieldParamHelpradio=La lista dei parametri deve rispettare il formato chiave,valore

per esempio:
1,valore1
2,valore2
3,valore3
... +ExtrafieldParamHelpsellist=La lista dei parametri viene da una tabella
Sintassi: table_name:label_field:id_field::filter
Per esempio: c_typent:libelle:id::filter

filter può essere un semplice test (tipo active=1 per mostrare solo valori attivi)
se vuoi filtrare per extrafield usa la sintassi extra.fieldcode=... (dove fieldcode è il codice del extrafield)

Per far dipendere la lista da un'altra usa:
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=Libreria utilizzata per generare 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) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS -LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s +LinkToTestClickToDial=Per testare l'indirizzo ClickToDial dell'utente %s, inserisci un numero di telefono RefreshPhoneLink=Link Aggiorna LinkToTest=Collegamento cliccabile generato per l'utente %s (clicca numero di telefono per testare) KeepEmptyToUseDefault=Lasciare vuoto per utilizzare il valore di default DefaultLink=Link predefinito ValueOverwrittenByUserSetup=Attenzione, questo valore potrebbe essere sovrascritto da un impostazione specifica dell'utente (ogni utente può settare il proprio url clicktodial) -ExternalModule=External module - Installed into directory %s +ExternalModule=Modulo esterno - Installato nella 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. @@ -449,8 +450,8 @@ Module52Name=Magazzino Module52Desc=Gestione magazzino prodotti Module53Name=Servizi Module53Desc=Gestione servizi -Module54Name=Contracts/Subscriptions -Module54Desc=Management of contracts (services or reccuring subscriptions) +Module54Name=Contratti/Abbonamenti +Module54Desc=Gestione contratti (servizi o abbonamenti) Module55Name=Codici a barre Module55Desc=Gestione codici a barre Module56Name=Telefonia @@ -495,7 +496,7 @@ 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 +Module520Name=Prestito Module520Desc=Management of loans Module600Name=Notifiche Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) @@ -511,14 +512,14 @@ Module1400Name=Contabilità avanzata Module1400Desc=Gestione contabilità per esperti (partita doppia) Module1520Name=Document Generation Module1520Desc=Mass mail document generation -Module1780Name=Tags/Categories +Module1780Name=Tag/categorie 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=Scheduled job management +Module2300Desc=Gestione delle operazioni pianificate Module2400Name=Ordine del giorno Module2400Desc=Gestione eventi/compiti e ordine del giorno Module2500Name=Gestione dei contenuti digitali @@ -533,15 +534,15 @@ Module2800Desc=Client FTP Module2900Name=GeoIPMaxmind Module2900Desc=Localizzazione degli accessi tramite GeoIP Maxmind Module3100Name=Skype -Module3100Desc=Add a Skype button into card of adherents / third parties / contacts +Module3100Desc=Aggiungi un pulsante Skype nella carta dei soci / soggetti terzi / contatti Module5000Name=Multiazienda Module5000Desc=Permette la gestione di diverse aziende Module6000Name=Flusso di lavoro Module6000Desc=Gestione flussi di lavoro -Module20000Name=Leave Requests management +Module20000Name=Gestione delle richieste di permesso Module20000Desc=Declare and follow employees leaves requests -Module39000Name=Product batch -Module39000Desc=Batch or serial number, eat-by and sell-by date management on products +Module39000Name=Product lot +Module39000Desc=Lot or serial number, eat-by and sell-by date management on products Module50000Name=PayBox Module50000Desc=Modulo per offrire il pagamento online con PayBox Module50100Name=Punti vendita @@ -551,15 +552,13 @@ Module50200Desc=Modulo per offrire il pagamento online con 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). +Module54000Desc=Stampa diretta (senza aprire i documenti) tramite l'interfaccia CUPS IPP (la stampante deve essere visibile dal server, e il server deve avere CUPS installato). Module55000Name=Sondaggio aperto Module55000Desc=Modulo per creare sondaggi online (Doodle, Studs, Rdvz o simili) Module59000Name=Margini Module59000Desc=Modulo per gestire margini Module60000Name=Commissioni Module60000Desc=Modulo per gestire commissioni -Module150010Name=Batch number, eat-by date and sell-by date -Module150010Desc=batch number, eat-by date and sell-by date management for product Permission11=Vedere le fatture attive Permission12=Creare fatture attive Permission13=Annullare le fatture attive @@ -589,7 +588,7 @@ Permission67=Esportare interventi Permission71=Vedere schede membri Permission72=Creare/modificare membri Permission74=Eliminare membri -Permission75=Setup types of membership +Permission75=Imposta i tipi di sottoscrizione Permission76=Esportare dati dei membri Permission78=Vedere le iscrizioni Permission79=Creare/modificare gli abbonamenti @@ -631,7 +630,7 @@ Permission152=Creare/modificare richieste di ordini permanenti Permission153=Trasmettere fatture ordini permanenti Permission154=Pagare/rifiutare fatture ordini permanenti Permission161=Read contracts/subscriptions -Permission162=Create/modify contracts/subscriptions +Permission162=Crea/modifica contratti/abbonamenti Permission163=Activate a service/subscription of a contract Permission164=Disable a service/subscription of a contract Permission165=Delete contracts/subscriptions @@ -736,10 +735,10 @@ 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 +Permission779=Esporta note spese Permission1001=Vedere magazzino -Permission1002=Create/modify warehouses -Permission1003=Delete warehouses +Permission1002=Crea/modifica magazzini +Permission1003=Elimina magazzini Permission1004=Vedere movimenti magazzino Permission1005=Creare/modificare movimenti magazzino Permission1101=Vedere documenti di consegna @@ -803,20 +802,20 @@ DictionaryCivility=Titoli civili DictionaryActions=Tipi di azioni/eventi DictionarySocialContributions=Social contributions types DictionaryVAT=Aliquote IVA o Tasse di vendita -DictionaryRevenueStamp=Amount of revenue stamps +DictionaryRevenueStamp=Ammontare dei valori bollati DictionaryPaymentConditions=Termini di pagamento DictionaryPaymentModes=Modalità di pagamento -DictionaryTypeContact=Contact/Address types +DictionaryTypeContact=Tipi di contatti/indirizzi DictionaryEcotaxe=Ecotassa (WEEE) DictionaryPaperFormat=Formati di carta DictionaryFees=Tipi di tasse DictionarySendingMethods=Metodi di spedizione DictionaryStaff=Personale -DictionaryAvailability=Delivery delay +DictionaryAvailability=Ritardo di consegna DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders -DictionaryAccountancyplan=Chart of accounts -DictionaryAccountancysystem=Models for chart of accounts +DictionaryAccountancyplan=Piano dei conti +DictionaryAccountancysystem=Modelli per piano dei conti DictionaryEMailTemplates=Emails templates SetupSaved=Impostazioni salvate BackToModuleList=Torna alla lista moduli @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= Il tasso di IRPF per impostazione predefinita segue la re LocalTax2IsNotUsedDescES= Per impostazione predefinita la proposta di IRPF è 0. Fine della regola. LocalTax2IsUsedExampleES= In Spagna, liberi professionisti e freelance che forniscono servizi e le aziende che hanno scelto il regime fiscale modulare. LocalTax2IsNotUsedExampleES= Vale per le imprese spagnole che non hanno optato per il sistema fiscale modulare. -CalcLocaltax=Reports -CalcLocaltax1ES=Vendite - Acquisti +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Acquisti-vendite CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Acquisti +CalcLocaltax2=Acquisti CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Vendite +CalcLocaltax3=Vendite CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales LabelUsedByDefault=Descrizione (utilizzata in tutti i documenti per cui non esiste la traduzione) LabelOnDocuments=Descrizione sul documento @@ -1018,14 +1017,14 @@ NoEventOrNoAuditSetup=Nessun evento di sicurezza registrato. Questo può essere NoEventFoundWithCriteria=Nessun evento di sicurezza trovato con i criteri di ricerca impostati. SeeLocalSendMailSetup=Controllare le impostazioni locali del server di posta (sendmail) BackupDesc=Per effettuare un backup completo di Dolibarr è necessario: -BackupDesc2=* Salvare il contenuto della directory dei documenti ( %s) che contiene tutti i file generati e caricati (è possibile creare un archivio zip, per esempio). -BackupDesc3=* Salvare il contenuto del database in un dump. È possibile utilizzare l'assistente. +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=L'archivio delle directory va conservato in un luogo sicuro. BackupDescY=Il file generato va conservato in un luogo sicuro. BackupPHPWarning=Il backup non può essere garantito con questo metodo. Preferito quello precedente RestoreDesc=Per ripristinare un backup Dolibarr, è necessario: -RestoreDesc2=* Ripristinare il contenuto della directory dei documenti (%s) dal file di archivio (.zip, per esempio). -RestoreDesc3=* Ripristinare i dati dal file di backup del database nel database del nuovo Dolibarr o dell'installazione corrente.
Attenzione: con questa operazione verranno ripristinate anche le password esistenti al momento del backup, può essere quindi necessaria una nuova autenticazione.

Per ripristinare un backup del database nell'installazione corrente è possibile seguire questo assistente. +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=Importa MySQL ForcedToByAModule= Questa regola è impsotata su %s da un modulo attivo PreviousDumpFiles=È disponibile il precedente backup del database (dump) @@ -1058,8 +1057,8 @@ ExtraFieldsThirdParties=Attributi complementari (terze parti) ExtraFieldsContacts=Attributi Complementari (contatti/indirizzi) ExtraFieldsMember=Attributi Complementari (membri) ExtraFieldsMemberType=Attributi Complementari (tipo di membro) -ExtraFieldsCustomerOrders=Complementary attributes (orders) -ExtraFieldsCustomerInvoices=Complementary attributes (invoices) +ExtraFieldsCustomerOrders=Attributi aggiuntivi (ordini) +ExtraFieldsCustomerInvoices=Attributi aggiuntivi (fatture) ExtraFieldsSupplierOrders=Attributi Complementari (ordini) ExtraFieldsSupplierInvoices=Attributi Complementari (fatture) ExtraFieldsProject=Attributi Complementari (progetti) @@ -1081,9 +1080,9 @@ YesInSummer=Si in estate OnlyFollowingModulesAreOpenedToExternalUsers=Nota, solo i seguenti moduli sono aperti agli utenti esterni (qualunque siano i permessi per questi utenti) SuhosinSessionEncrypt=Sessioni salvate con criptazione tramite Suhosin ConditionIsCurrently=La condizione corrente è %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. +YouUseBestDriver=Usi già il miglior driver attualmente disponibile: %s +YouDoNotUseBestDriver=Attualmente usi il driver %s , ma il driver raccomandato è il %s +NbOfProductIsLowerThanNoPb=Hai solo %s prodotti/servizi nel database. Non è richiesta alcuna ottimizzazione. SearchOptim=Ottimizzazione della ricerca 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=Stai utilizzando il browser %s. Questo browser è ok per sicurezza è performance. @@ -1337,6 +1336,8 @@ LDAPFieldCountry=Paese LDAPFieldCountryExample=Esempio: Italia LDAPFieldDescription=Descrizione LDAPFieldDescriptionExample=Esempio: descrizione +LDAPFieldNotePublic=Nota pubblica +LDAPFieldNotePublicExample=Esempio: questa è una nota pubblica LDAPFieldGroupMembers= Membri del gruppo LDAPFieldGroupMembersExample= Esempio: uniqueMember LDAPFieldBirthdate=Data di nascita @@ -1366,7 +1367,7 @@ MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found 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) +HTTPCacheStaticResources=Cache HTTP per le risorse statiche (css, img, javascript) FilesOfTypeCached=I file di tipo %s vengono serviti dalla cache del server HTTP FilesOfTypeNotCached=I file di tipo %s non vengono serviti dalla cache del server HTTP FilesOfTypeCompressed=I file di tipo %s vengono compressi dal server HTTP @@ -1466,7 +1467,7 @@ OSCommerceTestOk=Connessione al server ' %s' sul database' %s' con l'utente ' %s OSCommerceTestKo1=Connessione al server ' %s' riuscita, ma il database' %s' non è raggiungibile. OSCommerceTestKo2=Connessione al server ' %s' con l'utente' %s' fallita. ##### Stock ##### -StockSetup=Warehouse module setup +StockSetup=Impostazioni modulo magazzino 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 ##### @@ -1533,14 +1534,14 @@ ClickToDialDesc=Questo modulo aggiunge una icona accanto ai numeri telefonici de ##### Point Of Sales (CashDesk) ##### CashDesk=Punto vendita CashDeskSetup=Impostazioni modulo punto vendita -CashDeskThirdPartyForSell=Default generic third party to use for sells +CashDeskThirdPartyForSell=Soggetto terzo predefinito per le vendite 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 (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 +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot 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 @@ -1581,7 +1582,7 @@ ProjectsModelModule=Modelli dei rapporti dei progetti TasksNumberingModules=Tasks numbering module TaskModelModule=Tasks reports document model ##### ECM (GED) ##### -ECMSetup = GED Setup +ECMSetup = Impostazioni GED ECMAutoTree = Automatic tree folder and document ##### Fiscal Year ##### FiscalYears=Anni fiscali @@ -1607,7 +1608,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 +ExpenseReportsSetup=Impostazioni del modulo note spese 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. @@ -1616,3 +1617,8 @@ 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 +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" diff --git a/htdocs/langs/it_IT/banks.lang b/htdocs/langs/it_IT/banks.lang index b83707e59dfd1..9940d5106e043 100644 --- a/htdocs/langs/it_IT/banks.lang +++ b/htdocs/langs/it_IT/banks.lang @@ -8,7 +8,7 @@ FinancialAccount=Conto FinancialAccounts=Conti BankAccount=Conto bancario BankAccounts=Conti bancari -ShowAccount=Show Account +ShowAccount=Mostra conto AccountRef=Rif. conto AccountLabel=Etichetta conto CashAccount=Conto di cassa @@ -33,11 +33,11 @@ AllTime=Dall'inizio Reconciliation=Riconciliazione RIB=Coordinate bancarie IBAN=Codice IBAN -IbanValid=IBAN is Valid -IbanNotValid=IBAN is Not Valid +IbanValid=Il codice IBAN è valido +IbanNotValid=Il codice IBAN non è valido BIC=Codice BIC (Swift) -SwiftValid=BIC/SWIFT is Valid -SwiftNotValid=BIC/SWIFT is Not Valid +SwiftValid=Il codice BIC/SWIFT è valido +SwiftNotValid=Il codice BIC/SWIFT non è valido StandingOrders=Mandati di incasso StandingOrder=Mandato di incasso Withdrawals=Prelievi @@ -152,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=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD +InputReceiptNumber=Scegliere l'estratto conto collegato alla conciliazione. Utilizzare un valore numerico ordinabile: AAAAMM o AAAAMMGG EventualyAddCategory=Infine, specificare una categoria in cui classificare i record ToConciliate=Da conciliare? ThenCheckLinesAndConciliate=Controlla tutte le informazioni prima di cliccare @@ -163,3 +163,5 @@ LabelRIB=Etichetta BAN NoBANRecord=Nessun BAN DeleteARib=Cancella il BAN ConfirmDeleteRib=Vuoi davvero cancellare questo BAN? +StartDate=Data di inizio +EndDate=Data di fine diff --git a/htdocs/langs/it_IT/bills.lang b/htdocs/langs/it_IT/bills.lang index 0f4132f016200..9e679d6379acf 100644 --- a/htdocs/langs/it_IT/bills.lang +++ b/htdocs/langs/it_IT/bills.lang @@ -1,16 +1,16 @@ # Dolibarr language file - Source file is en_US - bills Bill=Fattura Bills=Fatture -BillsCustomers=Customers invoices -BillsCustomer=Customers invoice -BillsSuppliers=Suppliers invoices -BillsCustomersUnpaid=Unpaid customers invoices +BillsCustomers=Fatture attive +BillsCustomer=Fattura attive +BillsSuppliers=Fatture fornitori +BillsCustomersUnpaid=Fatture attive non pagate BillsCustomersUnpaidForCompany=Fatture attive non pagate per %s BillsSuppliersUnpaid=Fatture dei fornitori non pagate BillsSuppliersUnpaidForCompany=Fatture dei fornitori non pagate per %s BillsLate=Ritardi nei pagamenti -BillsStatistics=Customers invoices statistics -BillsStatisticsSuppliers=Suppliers invoices statistics +BillsStatistics=Statistiche fatture attive +BillsStatisticsSuppliers=Statistiche fatture passive DisabledBecauseNotErasable=Disabilitate perché non cancellabili InvoiceStandard=Fattura Standard InvoiceStandardAsk=Fattura Standard @@ -74,9 +74,9 @@ PaymentsAlreadyDone=Pagamenti già fatti PaymentsBackAlreadyDone=Rimborso già effettuato PaymentRule=Regola pagamento PaymentMode=Tipo di pagamento -PaymentTerm=Payment term -PaymentConditions=Payment terms -PaymentConditionsShort=Payment terms +PaymentTerm=Termine di pagamento +PaymentConditions=Condizioni di pagamento +PaymentConditionsShort=Condizioni di pagamento PaymentAmount=Importo del pagamento ValidatePayment=Convalidare questo pagamento? PaymentHigherThanReminderToPay=Pagamento superiore alla rimanenza da pagare @@ -294,10 +294,11 @@ 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 +RelatedCustomerInvoices=Fatture attive correlate +RelatedSupplierInvoices=Fatture fornitori correlate LatestRelatedBill=Ultima fattura correlata WarningBillExist=Attenzione, una o più fatture già esistenti +MergingPDFTool=Strumento di fusione dei PDF # PaymentConditions PaymentConditionShortRECEP=Immediato @@ -351,7 +352,7 @@ ChequeNumber=Assegno N° ChequeOrTransferNumber=Assegno/Bonifico N° ChequeMaker=Traente dell'assegno ChequeBank=Banca emittente -CheckBank=Check +CheckBank=Controllo NetToBePaid=Netto a pagare PhoneNumber=Tel FullPhoneNumber=Telefono @@ -392,7 +393,7 @@ DisabledBecausePayments=Impossibile perché ci sono dei pagamenti CantRemovePaymentWithOneInvoicePaid=Impossibile rimuovere il pagamento. C'è almeno una fattura classificata come pagata ExpectedToPay=Pagamento previsto PayedByThisPayment=Pagato con questo pagamento -ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid. +ClosePaidInvoicesAutomatically=Classifica come "pagate" tutte le fatture standard, ad avanzamento lavori e le note di credito e di debito interamente saldate. ClosePaidCreditNotesAutomatically=Classifica come "Pagata" tutte le note di credito interamente rimborsate AllCompletelyPayedInvoiceWillBeClosed=Tutte le fatture totalmente pagate saranno automaticamente chiuse allo stato "Pagato". ToMakePayment=Paga @@ -415,19 +416,19 @@ TypeContact_invoice_supplier_external_BILLING=Contatto del fornitore per la fatt TypeContact_invoice_supplier_external_SHIPPING=Contatto spedizioni fornitori TypeContact_invoice_supplier_external_SERVICE=Contatto servizio fornitori # 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) +InvoiceFirstSituationAsk=Prima fattura di avanzamento lavori +InvoiceFirstSituationDesc=La fatturazione ad avanzamento lavori è collegata a una progressione e a un avanzamento dello stato del lavoro, ad esempio la progressione di una costruzione. Ogni avanzamento lavori è legato a una fattura. +InvoiceSituation=Fattura ad avanzamento lavori +InvoiceSituationAsk=Fattura a seguito di avanzamento lavori +InvoiceSituationDesc=Crea un nuovo avanzamento lavori a seguito di uno già esistente +SituationAmount=Importo della fattura di avanzamento lavori (al netto delle imposte) 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 +Progress=Avanzamento +ModifyAllLines=Modifica tutte le righe +CreateNextSituationInvoice=Crea il prossimo avanzamento lavori +NotLastInCycle=Questa fattura non è l'ultima del ciclo e non deve essere modificato. +DisabledBecauseNotLastInCycle=Il prossimo avanzamento lavori esiste già +DisabledBecauseFinal=Questo è l'avanzamento lavori finale +CantBeLessThanMinPercent=Il valore dell'avanzamento non può essere inferiore al valore precedente. +NoSituations=Nessun avanzamento lavori aperto +InvoiceSituationLast=Fattura a conclusione lavori diff --git a/htdocs/langs/it_IT/boxes.lang b/htdocs/langs/it_IT/boxes.lang index d2add20dc8222..953dfc497c22d 100644 --- a/htdocs/langs/it_IT/boxes.lang +++ b/htdocs/langs/it_IT/boxes.lang @@ -8,10 +8,11 @@ BoxLastCustomerBills=Ultime fatture attive BoxOldestUnpaidCustomerBills=Fatture attive non pagate più vecchie BoxOldestUnpaidSupplierBills=Fatture passive più vecchie non pagate BoxLastProposals=Ultime proposte commerciali -BoxLastProspects=Ultimi potenziali clienti -BoxLastCustomers=Ultimi clienti -BoxLastSuppliers=Ultimi fornitori +BoxLastProspects=Ultimi potenziali clienti modificati +BoxLastCustomers=Ultimi clienti modificati +BoxLastSuppliers=Ultimi fornitori modificati BoxLastCustomerOrders=Ultimi ordini dei clienti +BoxLastValidatedCustomerOrders=Ultimi ordini clienti convalidati BoxLastBooks=Ultimi libri BoxLastActions=Ultime azioni BoxLastContracts=Ultimi contratti @@ -27,26 +28,29 @@ BoxTitleNbOfCustomers=Numero clienti BoxTitleLastRssInfos=Ultime %s notizie da %s BoxTitleLastProducts=Ultimi %s prodotti/servizi modificati BoxTitleProductsAlertStock=Prodotti in allerta scorte -BoxTitleLastCustomerOrders=Ultimi %s ordini dei clienti modificati +BoxTitleLastCustomerOrders=Ultimi %s ordini dei clienti +BoxTitleLastModifiedCustomerOrders=Ultimi %s ordini cliente modificati BoxTitleLastSuppliers=Ultimi %s fornitori registrati BoxTitleLastCustomers=Ultimi %s clienti registrati BoxTitleLastModifiedSuppliers=Ultimi %s fornitori modificati BoxTitleLastModifiedCustomers=Ultimi %s clienti modificati -BoxTitleLastCustomersOrProspects=Ultimi %s clienti o potenziali clienti registrati -BoxTitleLastPropals=Ultime %s proposte registrate +BoxTitleLastCustomersOrProspects=Ultimi %s clienti o potenziali clienti +BoxTitleLastPropals=Ultime %s proposte +BoxTitleLastModifiedPropals=Ultime %s proposte modificate BoxTitleLastCustomerBills=Ultime %s fatture attive +BoxTitleLastModifiedCustomerBills=Ultime %s fatture clienti modificate BoxTitleLastSupplierBills=Ultime %s fatture passive -BoxTitleLastProspects=Ultimi %s potenziali clienti registrati +BoxTitleLastModifiedSupplierBills=Ultime %s fatture fornitori modificate BoxTitleLastModifiedProspects=Ultimi %s potenziali clienti modificati BoxTitleLastProductsInContract=Ultimi %s prodotti/servizi a contratto -BoxTitleLastModifiedMembers=Ultimi %s membri modificati +BoxTitleLastModifiedMembers=Ultimi %s membri BoxTitleLastFicheInter=Ultimi %s interventi modificati -BoxTitleOldestUnpaidCustomerBills=%s fatture attive più vecchie non pagate -BoxTitleOldestUnpaidSupplierBills=%s fatture passive più vecchie non pagate +BoxTitleOldestUnpaidCustomerBills=Ultime %s fatture clienti non pagate +BoxTitleOldestUnpaidSupplierBills=Ultime %s fatture fornitori non pagate BoxTitleCurrentAccounts=Bilancio dei conti aperti BoxTitleSalesTurnover=Fatturato -BoxTitleTotalUnpaidCustomerBills=Fatture attive non pagate -BoxTitleTotalUnpaidSuppliersBills=Fatture passive non pagate +BoxTitleTotalUnpaidCustomerBills=Fatture clienti non pagate +BoxTitleTotalUnpaidSuppliersBills=Fatture fornitori non pagate BoxTitleLastModifiedContacts=Ultimi %s contatti/indirizzi registrati BoxMyLastBookmarks=Ultimi %s segnalibri BoxOldestExpiredServices=Servizi scaduti da più tempo ancora attivi @@ -76,7 +80,8 @@ NoContractedProducts=Nessun prodotto/servizio a contratto NoRecordedContracts=Nessun contratto registrato NoRecordedInterventions=Non ci sono interventi registrati BoxLatestSupplierOrders=Ultimi ordini fornitore -BoxTitleLatestSupplierOrders=ultimi %s ordini fornitore +BoxTitleLatestSupplierOrders=Ultimi %s ordini fornitori +BoxTitleLatestModifiedSupplierOrders=Ultimi %s ordini fornitori modificati NoSupplierOrder=Nessun ordine fornitore registrato BoxCustomersInvoicesPerMonth=Fatture attive al mese BoxSuppliersInvoicesPerMonth=Fatture passive al mese @@ -89,3 +94,4 @@ BoxProductDistributionFor=Distribuzione di %s per %s ForCustomersInvoices=Fatture attive ForCustomersOrders=Ordini dei clienti ForProposals=Proposte +LastXMonthRolling=Ultimi %s mesi diff --git a/htdocs/langs/it_IT/categories.lang b/htdocs/langs/it_IT/categories.lang index 806156a82a4d8..3273f8e1cae23 100644 --- a/htdocs/langs/it_IT/categories.lang +++ b/htdocs/langs/it_IT/categories.lang @@ -1,60 +1,60 @@ # Dolibarr language file - Source file is en_US - categories -Rubrique=Tag/Category -Rubriques=Tags/Categories -categories=tags/categories -TheCategorie=The tag/category +Rubrique=Tag/Categoria +Rubriques=Tag/Categorie +categories=tag/categorie +TheCategorie=Tag/categoria NoCategoryYet=No tag/category of this type created In=In AddIn=Aggiungi a modify=modifica Classify=Classifica -CategoriesArea=Tags/Categories area +CategoriesArea=Area tag/categorie 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 +MainCats=Tag/categorie principali SubCats=Sub-categorie CatStatistics=Statistiche -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 +CatList=Lista delle tag/categorie +AllCats=Tutte le tag/categorie +ViewCat=Mostra tag/categorie +NewCat=Aggiungi tag/categoria +NewCategory=Nuova tag/categoria +ModifCat=Modifica tag/categoria +CatCreated=Tag/categoria creata +CreateCat=Crea tag/categoria +CreateThisCat=Crea questa tag/categoria ValidateFields=Convalidare i campi NoSubCat=Nessuna sottocategoria SubCatOf=Sottocategoria -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 +FoundCats=Tag/categorie trovate +FoundCatsForName=Tag/categorie trovate per questo nome: +FoundSubCatsIn=Sottocategorie appartenenti alla tag/categoria +ErrSameCatSelected=Hai selezionato più volte la stessa tag/categoria +ErrForgotCat=Hai dimenticato di scegliere la tag/categoria ErrForgotField=Hai dimenticato di indicare i campi ErrCatAlreadyExists=La categoria esiste già -AddProductToCat=Add this product to a tag/category? -ImpossibleAddCat=Impossible to add the tag/category +AddProductToCat=Aggiungere il prodotto ad una tag/categoria +ImpossibleAddCat=Non è possibile aggiungere la tag/categoria ImpossibleAssociateCategory=Impossible to associate the tag/category to WasAddedSuccessfully= %s aggiunta con successo -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 +ObjectAlreadyLinkedToCategory=L'elemento è già collegato a questa tag/categoria +CategorySuccessfullyCreated=Tag/categoria %s aggiunta con successo +ProductIsInCategories=Il prodotto è collegato alle seguenti tag/categorie +SupplierIsInCategories=Il soggetto terzo è collegato alle seguenti tag/categorie +CompanyIsInCustomersCategories=Questo soggetto è collegato alle seguenti tag/categorie di clienti +CompanyIsInSuppliersCategories=Il soggetto è collegato alle seguenti tag/categorie di fornitori +MemberIsInCategories=Il membro è collegato alle seguenti tag/categorie 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 +ProductHasNoCategory=Questo prodotto/servizio non è collegato ad alcuna tag/categoria +SupplierHasNoCategory=Questo fornitore non è collegato ad alcuna tag/categoria +CompanyHasNoCategory=Questa azienda non è collegata ad alcuna tag/categoria +MemberHasNoCategory=Questo membro non è collegato ad alcuna tag/categoria ContactHasNoCategory=This contact is not in any tags/categories -ClassifyInCategory=Classify in tag/category +ClassifyInCategory=Aggiungi a tag/categoria NoneCategory=Nessuna NotCategorized=Without tag/category CategoryExistsAtSameLevel=Questa categoria esiste già allo stesso livello @@ -65,20 +65,20 @@ ContentsVisibleByAll=I contenuti saranno visibili a tutti gli utenti ContentsVisibleByAllShort=Contenuti visibili a tutti ContentsNotVisibleByAllShort=Contenuti non visibili a tutti CategoriesTree=Tags/categories tree -DeleteCategory=Delete tag/category -ConfirmDeleteCategory=Are you sure you want to delete this tag/category ? +DeleteCategory=Elimina tag/categoria +ConfirmDeleteCategory=Vuoi davvero eliminare questa tag/categoria? 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 +SuppliersCategoryShort=Tag/categoria fornitori +CustomersCategoryShort=Tag/categoria clienti +ProductsCategoryShort=Tag/categoria prodotti +MembersCategoryShort=Tag/categoria membri +SuppliersCategoriesShort=Tag/categorie fornitori +CustomersCategoriesShort=Tag/categorie clienti CustomersProspectsCategoriesShort=Categorie clienti potenziali -ProductsCategoriesShort=Products tags/categories -MembersCategoriesShort=Members tags/categories +ProductsCategoriesShort=Tag/categorie prodotti +MembersCategoriesShort=Tag/categorie membri ContactCategoriesShort=Contacts tags/categories ThisCategoryHasNoProduct=Questa categoria non contiene alcun prodotto ThisCategoryHasNoSupplier=Questa categoria non contiene alcun fornitore @@ -89,22 +89,22 @@ AssignedToCustomer=Assegnato ad un cliente AssignedToTheCustomer=Assegnato al cliente InternalCategory=Categoria interna 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 +CategId=ID Tag/categoria +CatSupList=Lista della tag/categorie fornitori +CatCusList=Lista della tag/categorie clienti +CatProdList=Lista della tag/categorie prodotti +CatMemberList=Lista della tag/categorie membri 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 +CatSupLinks=Collegamenti tra fornitori e tag/categorie +CatCusLinks=Collegamenti tra clienti e tag/categorie +CatProdLinks=Collegamenti tra prodotti/servizi e tag/categorie +CatMemberLinks=Collegamenti tra membri e tag/categorie DeleteFromCat=Remove from tags/category DeletePicture=Foto cancellata ConfirmDeletePicture=Confermi l'eliminazione della foto? ExtraFieldsCategories=Campi extra -CategoriesSetup=Tags/categories setup -CategorieRecursiv=Link with parent tag/category automatically +CategoriesSetup=Impostazioni Tag/categorie +CategorieRecursiv=Collega automaticamente alla tag/categoria padre 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 tag/category +ShowCategory=Mostra tag/categoria diff --git a/htdocs/langs/it_IT/commercial.lang b/htdocs/langs/it_IT/commercial.lang index 3478754d9ddcc..c374b67476197 100644 --- a/htdocs/langs/it_IT/commercial.lang +++ b/htdocs/langs/it_IT/commercial.lang @@ -62,7 +62,7 @@ LastProspectContactDone=Ultimo contatto effettuato DateActionPlanned=Data prevista per l'azione DateActionDone=Data compimento azione ActionAskedBy=Azione richiesta da -ActionAffectedTo=Event assigned to +ActionAffectedTo=Azione/compito assegnato a 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 64ae0e1cbea7a..8bf0966da6d8d 100644 --- a/htdocs/langs/it_IT/contracts.lang +++ b/htdocs/langs/it_IT/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Area contratti ListOfContracts=Elenco dei contratti -LastModifiedContracts=Last %s modified contracts +LastModifiedContracts=Ultimi %s contratti modificati AllContracts=Tutti i contratti ContractCard=Scheda contratto ContractStatus=Stato contratto @@ -19,7 +19,7 @@ ServiceStatusLateShort=Scaduto ServiceStatusClosed=Chiuso ServicesLegend=Legenda servizi Contracts=Contratti -ContractsAndLine=Contracts and line of contracts +ContractsAndLine=Contratti e righe di contratto Contract=Contratto NoContracts=Nessun contratto MenuServices=Servizi @@ -54,7 +54,7 @@ ListOfRunningContractsLines=Elenco delle righe di contratto in esecuzione ListOfRunningServices=Elenco dei servizi in esecuzione NotActivatedServices=Servizi non attivati (con contratti convalidati) BoardNotActivatedServices=Servizi da attivare con contratti convalidati -LastContracts=Last %s contracts +LastContracts=Ultimi %s contratti LastActivatedServices=Ultimi %s servizi attivati LastModifiedServices=Ultimi %s servizi modificati EditServiceLine=Modifica riga del servizio @@ -92,7 +92,7 @@ ListOfServicesToExpire=Lista dei servizi in scadenza NoteListOfYourExpiredServices=Questa lista contiene i servizi relativi a contratti di terze parti per le quali siete collegati come rappresentanti commerciali. StandardContractsTemplate=Template standard per i contratti ContactNameAndSignature=Per %s, Nome e firma: -OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. +OnlyLinesWithTypeServiceAreUsed=Verranno clonate solo le righe di tipo "servizio" ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Contatto interno per la firma del contratto diff --git a/htdocs/langs/it_IT/cron.lang b/htdocs/langs/it_IT/cron.lang index f0fa432c9855c..49e9aba0dae75 100644 --- a/htdocs/langs/it_IT/cron.lang +++ b/htdocs/langs/it_IT/cron.lang @@ -14,11 +14,11 @@ URLToLaunchCronJobs=URL che lancia i job di cron OrToLaunchASpecificJob=O per lanciare un job specifico KeyForCronAccess=Chiave di sicurezza per l'URL che lancia i job di cron FileToLaunchCronJobs=Comando per lanciare i job di 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=In ambienti Unix per lanciare il comando ogni 5 minuti dovresti usare la seguente riga di crontab +CronExplainHowToRunWin=In ambienti Microsoft(tm) Windows per lanciare il comando ogni 5 minuti dovresti usare le operazioni pianificate # Menu CronJobs=Azioni pianificate -CronListActive=List of active/scheduled jobs +CronListActive=Lista dei job attivi/programmati CronListInactive=Lista dei job disabilitati # Page list CronDateLastRun=Ultimo avvio @@ -26,13 +26,13 @@ CronLastOutput=Output dell'ultimo avvio CronLastResult=Codice del risultato dell'ultima esecuzione CronListOfCronJobs=Lista dei job programmati CronCommand=Comando -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 +CronList=Job programmati +CronDelete=Cancella i job programmati +CronConfirmDelete=Vuoi davvero cancellare i job? +CronExecute=Lanca i job programmati +CronConfirmExecute=Sei sicuro di voler eseguire ora questi job programmati? +CronInfo=Il modulo per i job programmati permette di eseguire operazioni definite in anticipoi +CronWaitingJobs=Job in attesa CronTask=Azione CronNone=Nessuno CronDtStart=Data di inizio @@ -75,7 +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 +CronCreateJob=Crea nuovo job programmato # Info CronInfoPage=Informazioni # Common @@ -85,4 +85,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 +TaskDisabled=Job disattivato diff --git a/htdocs/langs/it_IT/dict.lang b/htdocs/langs/it_IT/dict.lang index ca173d1c1ba9e..06c8af32068d7 100644 --- a/htdocs/langs/it_IT/dict.lang +++ b/htdocs/langs/it_IT/dict.lang @@ -253,7 +253,6 @@ CivilityMR=Sig. CivilityMLE=Signora CivilityMTRE=Signor CivilityDR=Dottore - ##### Currencies ##### Currencyeuros=Euro CurrencyAUD=Dollari Australiani @@ -290,10 +289,10 @@ CurrencyXOF=Franchi CFA BCEAO CurrencySingXOF=Franco CFA BCEAO CurrencyXPF=Franchi CFP CurrencySingXPF=Franco CFP - CurrencyCentSingEUR=centesimo +CurrencyCentINR=paisa +CurrencyCentSingINR=paise CurrencyThousandthSingTND=Millesimo - #### Input reasons ##### DemandReasonTypeSRC_INTE=Internet DemandReasonTypeSRC_CAMP_MAIL=Posta @@ -306,7 +305,6 @@ DemandReasonTypeSRC_WOM=Passaparola DemandReasonTypeSRC_PARTNER=Partner DemandReasonTypeSRC_EMPLOYEE=Dipendente DemandReasonTypeSRC_SPONSORING=Sponsorship - #### Paper formats #### PaperFormatEU4A0=Formato 4A0 PaperFormatEU2A0=Formato 2A0 diff --git a/htdocs/langs/it_IT/donations.lang b/htdocs/langs/it_IT/donations.lang index 67c45f72dba15..d4809b8394bfe 100644 --- a/htdocs/langs/it_IT/donations.lang +++ b/htdocs/langs/it_IT/donations.lang @@ -6,7 +6,7 @@ Donor=Donatore Donors=Donatori AddDonation=Crea donazione NewDonation=Nuova donazione -DeleteADonation=Delete a donation +DeleteADonation=Elimina una donazione ConfirmDeleteADonation=Are you sure you want to delete this donation ? ShowDonation=Visualizza donazione DonationPromise=Donazione promessa @@ -23,8 +23,8 @@ DonationStatusPaid=Donazione ricevuta DonationStatusPromiseNotValidatedShort=Bozza DonationStatusPromiseValidatedShort=Promessa convalidata DonationStatusPaidShort=Ricevuta -DonationTitle=Donation receipt -DonationDatePayment=Payment date +DonationTitle=Ricevuta di donazione +DonationDatePayment=Data di pagamento ValidPromess=Convalida promessa DonationReceipt=Ricevuta per donazione BuildDonationReceipt=Genera ricevuta donazione diff --git a/htdocs/langs/it_IT/ecm.lang b/htdocs/langs/it_IT/ecm.lang index 9f720492f97ce..9db118a44c295 100644 --- a/htdocs/langs/it_IT/ecm.lang +++ b/htdocs/langs/it_IT/ecm.lang @@ -43,8 +43,8 @@ ECMDocsByContracts=Documenti collegati ai contratti ECMDocsByInvoices=Documenti collegati alle fatture attive ECMDocsByProducts=Documenti collegati ai prodotti ECMDocsByProjects=Documenti collegati ai progetti -ECMDocsByUsers=Documents linked to users -ECMDocsByInterventions=Documents linked to interventions +ECMDocsByUsers=Documenti collegati agli utenti +ECMDocsByInterventions=Documenti collegati agli interventi ECMNoDirectoryYet=Nessuna directory creata ShowECMSection=Visualizza la directory DeleteSection=Eliminare la directory diff --git a/htdocs/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang index 61c8dcff47709..2dfbe732001c1 100644 --- a/htdocs/langs/it_IT/errors.lang +++ b/htdocs/langs/it_IT/errors.lang @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' +ErrorGlobalVariableUpdater2=Parametro mancante: '%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=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 3934188165448..dfd16c717fbd6 100644 --- a/htdocs/langs/it_IT/install.lang +++ b/htdocs/langs/it_IT/install.lang @@ -155,8 +155,8 @@ MigrationFinished=Migrazione completata LastStepDesc=Ultimo passo: Indicare qui login e password che si prevede di utilizzare per la connessione al software. Non dimenticare questi dati perché è l'unico account in grado di amminsitrare tutti gli altri. 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) +WarningUpgrade=Attenzione: \nHai eseguito un backup del database prima di procedere? Questo è altamente raccomandato, a causa di bug presenti in alcune versioni di database server (per esempio mysql versione 5.5.40) alcuni dati o tabelle possono essere persi durante questo processo.\nPerciò è vi consigliamo di avere un dump completo del database prima di avviare il processo di migrazione. \n\nFare clic su OK per avviare il processo di migrazione ... +ErrorDatabaseVersionForbiddenForMigration=La tua versione del database è %s. Essa soffre di un bug critico se si cambia la struttura del database, come è richiesto dal processo di migrazione. Per questa ragione non sarà consentita la migrazione fino a quando non verrà aggiornato il database a una versione stabile più recente (elenco delle versioni probleematiche: %s) ######### # upgrade @@ -208,7 +208,7 @@ MigrationProjectTaskTime=Aggiorna tempo trascorso in secondi MigrationActioncommElement=Aggiornare i dati sulle azioni MigrationPaymentMode=Migrazione dei dati delle modalità di pagamento MigrationCategorieAssociation=Migrazione delle categorie -MigrationEvents=Migration of events to add event owner into assignement table +MigrationEvents=Migrazione degli eventi per aggiungere i proprietari nella tabella degli utilizzatori assegnati ShowNotAvailableOptions=Mostra opzioni non disponibili HideNotAvailableOptions=Nascondi opzioni non disponibili diff --git a/htdocs/langs/it_IT/interventions.lang b/htdocs/langs/it_IT/interventions.lang index 3257a4c01cd04..3c015c0096555 100644 --- a/htdocs/langs/it_IT/interventions.lang +++ b/htdocs/langs/it_IT/interventions.lang @@ -31,14 +31,14 @@ RelatedInterventions=Interventi correlati ShowIntervention=Mostra intervento SendInterventionRef=Invio di intervento %s SendInterventionByMail=Invia intervento via 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=Intervento %s creato +InterventionValidatedInDolibarr=Intervento %s convalidato +InterventionModifiedInDolibarr=Intervento %s modificato +InterventionClassifiedBilledInDolibarr=Intervento %s classificato come fatturato +InterventionClassifiedUnbilledInDolibarr=Intervento %s classificato come non fatturato +InterventionSentByEMail=Intervento %s inviato via email +InterventionDeletedInDolibarr=Intervento %s eliminato +SearchAnIntervention=Cerca un intervento ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Responsabile follow-up per l'intervento TypeContact_fichinter_internal_INTERVENING=Intervento effettuato da @@ -50,4 +50,4 @@ ArcticNumRefModelError=Impossibile attivare PacificNumRefModelDesc1=Restituisce un numero nel formato %syymm-nnnn dove yy è l'anno, mm è il mese e nnnn è una sequenza senza pausa e che non ritorna a 0 PacificNumRefModelError=Un modello di numerazione degli interventi che inizia con $syymm è già esistente e non è compatibile con questo modello di sequenza. Rimuovere o rinominare per attivare questo modulo. PrintProductsOnFichinter=Stampa prodotti sulla scheda di intervento -PrintProductsOnFichinterDetails=Per interventi generati da ordini +PrintProductsOnFichinterDetails=interventi generati da ordini diff --git a/htdocs/langs/it_IT/languages.lang b/htdocs/langs/it_IT/languages.lang index 5acce4857de8e..66b279df52fa6 100644 --- a/htdocs/langs/it_IT/languages.lang +++ b/htdocs/langs/it_IT/languages.lang @@ -13,7 +13,7 @@ Language_de_AT=Tedesco (Austria) Language_de_CH=Tedesco (Svizzera) Language_el_GR=Greco Language_en_AU=Inglese (Australia) -Language_en_CA=English (Canada) +Language_en_CA=Inglese (Canada) Language_en_GB=English (Gran Bretagna) Language_en_IN=Inglese (India) Language_en_NZ=Inglese (Nuova Zelanda) diff --git a/htdocs/langs/it_IT/mails.lang b/htdocs/langs/it_IT/mails.lang index a99f261e44f62..c380f52467b85 100644 --- a/htdocs/langs/it_IT/mails.lang +++ b/htdocs/langs/it_IT/mails.lang @@ -115,7 +115,7 @@ SentBy=Inviato da MailingNeedCommand=Per motivi di sicurezza è preveribile inviare mail di massa da linea di comando. Se possibile chiedi all amministratore del server di eseguire il seguente comando per inivare le mail a tutti i destinatari: MailingNeedCommand2=Puoi inviare comunque online aggiungendo il parametro MAILING_LIMIT_SENDBYWEB impostato al valore massimo corrispondente al numero di email che si desidera inviare durante una sessione. ConfirmSendingEmailing=Se non puoi o preferisci inviarle dal tuo browser web, perfavore confermi che sei sicuro che vuoi inviare adesso le mail dal tuo 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. +LimitSendingEmailing=Nota: L'invio di email è soggetto a limitazioni per ragioni di sicurezza e di timeout a %s destinatari per ogni sessione di invio TargetsReset=Cancella elenco ToClearAllRecipientsClickHere=Per cancellare l'elenco destinatari per questa email, cliccare sul pulsante ToAddRecipientsChooseHere=Per aggiungere i destinatari, scegliere da questi elenchi @@ -136,8 +136,8 @@ SomeNotificationsWillBeSent=%s notifiche saranno inviate via email AddNewNotification=Attiva una nuova richiesta di notifica via email ListOfActiveNotifications=Mostra tutte le richieste di notifica via email attive 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 +MailSendSetupIs=La configurazione della posta elettronica di invio è stata impostata alla modalità '%s'. Questa modalità non può essere utilizzata per inviare mail di massa. +MailSendSetupIs2=Con un account da amministratore è necessario cliccare su %sHome -> Setup -> EMails%s e modificare il parametro '%s' per usare la modalità '%s'. Con questa modalità è possibile inserire i dati del server SMTP di elezione e usare Il "Mass Emailing" +MailSendSetupIs3=Se hai domande su come configurare il tuo server SMTP chiedi a %s. +YouCanAlsoUseSupervisorKeyword=È inoltre possibile aggiungere la parola chiave __SUPERVISOREMAIL__ per inviare email al supervisore dell'utente (funziona solo se è definita una email per suddetto supervisor) +NbOfTargetedContacts=Numero di indirizzi di posta elettronica di contatti mirati diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang index 699cb4296bd7d..e24c70f9c4886 100644 --- a/htdocs/langs/it_IT/main.lang +++ b/htdocs/langs/it_IT/main.lang @@ -62,7 +62,7 @@ ErrorFailedToSaveFile=Errore, file non salvato. SetDate=Imposta data SelectDate=Seleziona una data SeeAlso=Vedi anche %s -SeeHere=See here +SeeHere=Vedi qui BackgroundColorByDefault=Colore di sfondo predefinito FileNotUploaded=Il file non è stato caricato FileUploaded=Il file è stato caricato con successo @@ -141,7 +141,7 @@ Cancel=Annulla Modify=Modifica Edit=Modifica Validate=Convalida -ValidateAndApprove=Validate and Approve +ValidateAndApprove=Convalida e approva ToValidate=Convalidare Save=Salva SaveAs=Salva con nome @@ -159,7 +159,7 @@ Search=Ricerca SearchOf=Cerca Valid=Convalida Approve=Approva -Disapprove=Disapprove +Disapprove=Non approvare ReOpen=Riapri Upload=Invia file ToLink=Link @@ -173,7 +173,7 @@ User=Utente Users=Utenti Group=Gruppo Groups=Gruppi -NoUserGroupDefined=No user group defined +NoUserGroupDefined=Gruppo non definito Password=Password PasswordRetype=Ridigita la password NoteSomeFeaturesAreDisabled=Nota bene: In questo demo alcune funzionalità e alcuni moduli sono disabilitati. @@ -220,8 +220,9 @@ Next=Successivo Cards=Schede Card=Scheda Now=Adesso +HourStart=Ora di inizio Date=Data -DateAndHour=Date and hour +DateAndHour=Data e ora DateStart=Data inizio DateEnd=Data fine DateCreation=Data di creazione @@ -242,6 +243,8 @@ DatePlanShort=Data prev. DateRealShort=Data reale DateBuild=Data di creazione del report DatePayment=Data pagamento +DateApprove=Approvato in data +DateApprove2=Data di approvazione (seconda approvazione) DurationYear=anno DurationMonth=mese DurationWeek=settimana @@ -264,7 +267,7 @@ days=giorni Hours=Ore Minutes=Minuti Seconds=Secondi -Weeks=Weeks +Weeks=Settimane Today=Oggi Yesterday=Ieri Tomorrow=Domani @@ -298,7 +301,7 @@ UnitPriceHT=Prezzo unitario (netto) UnitPriceTTC=Prezzo unitario (lordo) PriceU=P.U. PriceUHT=P.U.(netto) -AskPriceSupplierUHT=P.U. HT Requested +AskPriceSupplierUHT=P.U. HT Richiesto PriceUTTC=P.U.(lordo) Amount=Importo AmountInvoice=Importo della fattura @@ -352,7 +355,7 @@ Status=Stato Favorite=Preferito ShortInfo=Info. Ref=Rif. -ExternalRef=Ref. extern +ExternalRef=Rif. esterno RefSupplier=Rif. fornitore RefPayment=Rif. pagamento CommercialProposalsShort=Preventivi/Proposte commerciali @@ -376,7 +379,7 @@ ActionsOnCompany=Azioni sul soggetto terzo ActionsOnMember=Azioni su questo membro NActions=%s azioni NActionsLate=%s azioni in ritardo -RequestAlreadyDone=Request already recorded +RequestAlreadyDone=Richiesta già registrata Filter=Filtro RemoveFilter=Rimuovi filtro ChartGenerated=Grafico generato @@ -395,8 +398,8 @@ Available=Disponibile NotYetAvailable=Non ancora disponibile NotAvailable=Non disponibile Popularity=Popularità -Categories=Tags/categories -Category=Tag/category +Categories=Tag/categorie +Category=Tag/categoria By=Per From=Da to=a @@ -408,6 +411,8 @@ OtherInformations=Altre informazioni Quantity=Quantità Qty=Qtà ChangedBy=Cambiato da +ApprovedBy=Approvato da +ApprovedBy2=Approvato da (seconda approvazione) ReCalculate=Ricalcola ResultOk=Successo ResultKo=Fallimento @@ -526,7 +531,7 @@ DateFromTo=Da %s a %s DateFrom=Da %s DateUntil=Fino a %s Check=Controllo -Uncheck=Uncheck +Uncheck=Deseleziona Internal=Interno External=Esterno Internals=Interni @@ -693,9 +698,11 @@ XMoreLines=%s linea(e) nascoste PublicUrl=URL pubblico 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. +PrintFile=Stampa il file %s +ShowTransaction=Mostra la transazione +GoIntoSetupToChangeLogo=Vai in Home -> Impostazioni -> Società per cambiare il logo o in Home - Setup -> display per nasconderlo. +Deny=Rifiuta +Denied=Rifiutata # Week day Monday=Lunedì Tuesday=Martedì diff --git a/htdocs/langs/it_IT/margins.lang b/htdocs/langs/it_IT/margins.lang index 11a01215607a6..b8d1c820d802d 100644 --- a/htdocs/langs/it_IT/margins.lang +++ b/htdocs/langs/it_IT/margins.lang @@ -16,7 +16,7 @@ MarginDetails=Specifiche del margine ProductMargins=Margini per prodotto CustomerMargins=Margini per cliente SalesRepresentativeMargins=Margini di vendita del rappresentante -UserMargins=User margins +UserMargins=Margini per utente ProductService=Prodotto o servizio AllProducts=Tutti i prodotti e servizi ChooseProduct/Service=Scegli prodotto o servizio @@ -42,4 +42,4 @@ AgentContactType=Tipo di contatto per i mandati di vendita AgentContactTypeDetails=Definisci quali tipi di contatto (collegati alle fatture) saranno utilizzati per i report per ciascun rappresentante di vendita rateMustBeNumeric=Il rapporto deve essere un numero markRateShouldBeLesserThan100=Il rapporto deve essere inferiore a 100 -ShowMarginInfos=Show margin infos +ShowMarginInfos=Mostra informazioni sui margini diff --git a/htdocs/langs/it_IT/members.lang b/htdocs/langs/it_IT/members.lang index 638f17657e1a4..4211f89127cc1 100644 --- a/htdocs/langs/it_IT/members.lang +++ b/htdocs/langs/it_IT/members.lang @@ -203,4 +203,4 @@ MembersByNature=Membri per natura VATToUseForSubscriptions=Aliquota IVA in uso per le sottoscrizioni NoVatOnSubscription=Nessuna IVA per gli abbonamenti MEMBER_PAYONLINE_SENDEMAIL=Email di avviso quando Dolibarr riceve la conferma della validazione di un pagamento per adesione -ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Prodotto utilizzato per la riga dell'abbonamento in fattura: %s diff --git a/htdocs/langs/it_IT/orders.lang b/htdocs/langs/it_IT/orders.lang index ceec549856149..934fe56693150 100644 --- a/htdocs/langs/it_IT/orders.lang +++ b/htdocs/langs/it_IT/orders.lang @@ -59,7 +59,7 @@ MenuOrdersToBill=Ordini spediti MenuOrdersToBill2=Ordini fatturabili SearchOrder=Ricerca ordine SearchACustomerOrder=Cerca un ordine cliente -SearchASupplierOrder=Search a supplier order +SearchASupplierOrder=Ricerca un ordine fornitore ShipProduct=Spedisci prodotto Discount=Sconto CreateOrder=Crea ordine @@ -79,7 +79,9 @@ NoOpenedOrders=Nessun ordine aperto NoOtherOpenedOrders=Nessun altro ordine aperto NoDraftOrders=Nessuna bozza d'ordine OtherOrders=Altri ordini -LastOrders=Ultimi %s ordini +LastOrders=Last %s customer orders +LastCustomerOrders=Last %s customer orders +LastSupplierOrders=Last %s supplier orders LastModifiedOrders=Ultimi %s ordini modificati LastClosedOrders=Ultimi %s ordini chiusi AllOrders=Tutti gli ordini diff --git a/htdocs/langs/it_IT/other.lang b/htdocs/langs/it_IT/other.lang index dd2e00eb50861..77e78cfbdf12e 100644 --- a/htdocs/langs/it_IT/other.lang +++ b/htdocs/langs/it_IT/other.lang @@ -203,6 +203,7 @@ NewKeyWillBe=Le tue nuove credenziali per loggare al software sono ClickHereToGoTo=Clicca qui per andare a %s YouMustClickToChange=Devi cliccare sul seguente link per validare il cambio della password ForgetIfNothing=Se non hai richiesto questo cambio, lascia perdere questa mail. Le tue credenziali sono mantenute al sicuro. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=Aggiungi evento al calendario %s diff --git a/htdocs/langs/it_IT/printipp.lang b/htdocs/langs/it_IT/printipp.lang index 7c597de10e121..dd6c2dd584b2b 100644 --- a/htdocs/langs/it_IT/printipp.lang +++ b/htdocs/langs/it_IT/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=Server di stampa +PrintIPPSetup=Impostazioni modulo Direct Print +PrintIPPDesc=Questo modulo aggiunge un pulsante per la stampa diretta dei documenti. Funziona solo su Linux con sistema di stampa CUPS. +PRINTIPP_ENABLED=Mostra icona "Stampa diretta" nella lista dei documenti +PRINTIPP_HOST=Server PRINTIPP_PORT=Porta PRINTIPP_USER=Login PRINTIPP_PASSWORD=Password NoPrinterFound=Nessuna stampante trovata (controlla la tua installazione di CUPS) -FileWasSentToPrinter=File %s was sent to printer -NoDefaultPrinterDefined=No default printer defined -DefaultPrinter=Default printer -Printer=Printer -CupsServer=CUPS Server +FileWasSentToPrinter=Il file %s è stato inviato alla stampante +NoDefaultPrinterDefined=Non è presente una stampante predefinita +DefaultPrinter=Stampante predefinita +Printer=Stampante +CupsServer=Server CUPS diff --git a/htdocs/langs/it_IT/productbatch.lang b/htdocs/langs/it_IT/productbatch.lang index 147b856f35dff..183d0d588030f 100644 --- a/htdocs/langs/it_IT/productbatch.lang +++ b/htdocs/langs/it_IT/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use batch/serial number -ProductStatusOnBatch=Yes (Batch/serial required) -ProductStatusNotOnBatch=No (Batch/serial not used) -ProductStatusOnBatchShort=Yes +ManageLotSerial=Usa lotto/numero di serie +ProductStatusOnBatch=Sì (è richiesto il lotto/numero di serie) +ProductStatusNotOnBatch=No (è richiesto il lotto/numero di serie) +ProductStatusOnBatchShort=Sì 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 +Batch=Lotto/numero di serie +atleast1batchfield=Data di scadenza o lotto/numero di serie +batch_number=Lotto/numero di serie +BatchNumberShort=Lotto/numero di serie +l_eatby=Data di scadenza +l_sellby=Data limite per la vendita +DetailBatchNumber=dettagli lotto/numero di serie +DetailBatchFormat=Lotto/numero di serie: %s - Consumare entro: %s - Da vendere entro: %s (Quantità: %d) +printBatch=Lotto/numero di serie: %s +printEatby=Consumare entro: %s +printSellby=Da vendere entro: %s printQty=Quantità: %d -AddDispatchBatchLine=Add a line for Shelf Life dispatching +AddDispatchBatchLine=Aggiungi una riga per la durata a scaffale BatchDefaultNumber=Non definito -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 +WhenProductBatchModuleOnOptionAreForced=When module Lot/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=Questo prodotto non usa lotto/numero di serie diff --git a/htdocs/langs/it_IT/products.lang b/htdocs/langs/it_IT/products.lang index 950d8dc38ef35..29c7e29220560 100644 --- a/htdocs/langs/it_IT/products.lang +++ b/htdocs/langs/it_IT/products.lang @@ -22,16 +22,16 @@ ProductAccountancySellCode=Codice contabilità (vendita) ProductOrService=Prodotto o servizio ProductsAndServices=Prodotti e Servizi ProductsOrServices=Prodotti o servizi -ProductsAndServicesOnSell=Products and Services for sale or for purchase -ProductsAndServicesNotOnSell=Products and Services out of sale +ProductsAndServicesOnSell=Prodotti e servizi in vendita +ProductsAndServicesNotOnSell=Prodotti e Servizi esauriti ProductsAndServicesStatistics=Statistiche Prodotti e Servizi ProductsStatistics=Statistiche Prodotti -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=Prodotto in vendit +ProductsNotOnSell=Prodotto esaurito +ProductsOnSellAndOnBuy=Prodotti in vendit +ServicesOnSell=Servizi in vendit +ServicesNotOnSell=Servizi esauriti +ServicesOnSellAndOnBuy=Servizi in vendita InternalRef=Riferimento interno LastRecorded=Ultimi prodotti/servizi in vendita registrati LastRecordedProductsAndServices=Ultimi %s prodotti/servizi registrati @@ -198,7 +198,7 @@ HelpAddThisServiceCard=Questa opzione permette la creazione o la clonazione di u CurrentProductPrice=Prezzo corrente AlwaysUseNewPrice=Usa sempre il prezzo corrente di un prodotto/servizio AlwaysUseFixedPrice=Usa prezzo non negoziabile -PriceByQuantity=Different prices by quantity +PriceByQuantity=Prezzi diversi in base alla quantità PriceByQuantityRange=Intervallo della quantità ProductsDashboard=Riepilogo prodotti/servizi UpdateOriginalProductLabel=Modifica l'etichetta originale @@ -234,36 +234,36 @@ DefinitionOfBarCodeForThirdpartyNotComplete=La definizione del tipo o valore del BarCodeDataForProduct=Informazioni codice a barre del prodotto %s : BarCodeDataForThirdparty=Informazioni codice a barre della terza parte %s : ResetBarcodeForAllRecords=Definisci il valore del codice a barre per tutti quelli inseriti (questo resetta anche i valori già definiti dei codice a barre con nuovi valori) -PriceByCustomer=Different price for each customer +PriceByCustomer=Prezzi diversi in base al cliente PriceCatalogue=Prezzo unico per prodotto/servizio -PricingRule=Rules for customer prices +PricingRule=Regole dei prezzi al cliente AddCustomerPrice=Aggiungi un prezzo per cliente ForceUpdateChildPriceSoc=Imposta lo stesso prezzo per i clienti sussidiari PriceByCustomerLog=Prezzo per log cliente MinimumPriceLimit=Il prezzo minimo non può essere inferiore di %s 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 #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=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 +PriceExpressionEditor=Editor della formula del prezzo +PriceExpressionSelected=Formula del prezzo selezionata +PriceExpressionEditorHelp1=usare "prezzo = 2 + 2" o "2 + 2" per definire il prezzo. Usare ";" per separare le espressioni +PriceExpressionEditorHelp2=È possibile accedere agli ExtraFields tramite variabili come #extrafield_myextrafieldkey# e variabili globali come #global_mycode# +PriceExpressionEditorHelp3=Nel prezzo dei prodotti e servizi e in quello dei fornitori sono disponibili le seguenti variabili:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min# +PriceExpressionEditorHelp4=Solamente nel prezzo di prodotti e servizi: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# +PriceExpressionEditorHelp5=Valori globali disponibili: +PriceMode=Modalità di prezzo +PriceNumeric=Numero +DefaultPrice=Prezzo predefinito +ComposedProductIncDecStock=Aumenta e Diminuisci le scorte alla modifica del prodotto padre +ComposedProduct=Sottoprodotto +MinSupplierPrice=Prezzo fornitore minimo +DynamicPriceConfiguration=Configurazione dinamica dei prezzi +GlobalVariables=Variabili globali +GlobalVariableUpdaters=Aggiornamento variabili globali +GlobalVariableUpdaterType0=Dati JSON +GlobalVariableUpdaterHelp0=Esegue il parsing dei dati JSON da uno specifico indirizzo URL, VALUE (valore) specifica la posizione di valori rilevanti +GlobalVariableUpdaterHelpFormat0=il frmato è: {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"} +GlobalVariableUpdaterType1=Dati del WebService +GlobalVariableUpdaterHelp1=Effettua il parsing dei dati del WebService da uno specifico indirizzo URL.\nNS: il namespace\nVALUE: la posizione di dati rilevanti\nDATA: contiene i dati da inviare\nMETHOD: il metodo WS da richiamare +GlobalVariableUpdaterHelpFormat1=il formato è: {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}} +UpdateInterval=Frequenza di aggiornamento (in minuti) +LastUpdated=Ultimo aggiornamento +CorrectlyUpdated=Aggiornato correttamente diff --git a/htdocs/langs/it_IT/projects.lang b/htdocs/langs/it_IT/projects.lang index d12ac2a4ad0d6..5491e5950a683 100644 --- a/htdocs/langs/it_IT/projects.lang +++ b/htdocs/langs/it_IT/projects.lang @@ -3,17 +3,18 @@ RefProject=Rif. progetto ProjectId=Id progetto Project=Progetto Projects=Progetti -ProjectStatus=Project status +ProjectStatus=Stato del progetto 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. +ProjectsPublicTaskDesc=Questa prospettiva presenta tutti i progetti e le attività a cui è permesso accedere. 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). +OnlyOpenedProject=Sono visibili solamente i progetti aperti, i progetti con stato di bozza o chiusi non sono visibili. 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). +AllTaskVisibleButEditIfYouAreAssigned=Tutti i compiti per questo progetto sono visibili ma è possibile inserire del tempo impiegato solo per compiti a cui sei assegnato. ProjectsArea=Area progetti NewProject=Nuovo progetto AddProject=Crea progetto @@ -31,8 +32,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 +TimeSpentByYou=Tempo impiegato da te +TimeSpentByUser=Tempo impiegato dall'utente TimesSpent=Tempo lavorato RefTask=Rif. compito LabelTask=Etichetta compito @@ -40,8 +41,8 @@ TaskTimeSpent=Tempo speso sulle attività TaskTimeUser=Utente TaskTimeNote=Nota TaskTimeDate=Data -TasksOnOpenedProject=Tasks on opened projects -WorkloadNotDefined=Workload not defined +TasksOnOpenedProject=Compiti relativi a progetti aperti +WorkloadNotDefined=Carico di lavoro non definito NewTimeSpent=Aggiungi tempo lavorato MyTimeSpent=Il mio tempo lavorato MyTasks=I miei compiti @@ -60,8 +61,8 @@ MyActivities=I miei compiti / operatività MyProjects=I miei progetti DurationEffective=Durata effettiva Progress=Avanzamento -ProgressDeclared=Progresso dichiarato -ProgressCalculated=Progresso calcolato +ProgressDeclared=Avanzamento dichiarato +ProgressCalculated=Avanzamento calcolato Time=Tempo ListProposalsAssociatedProject=Elenco delle proposte commerciali associate al progetto ListOrdersAssociatedProject=Elenco degli ordini associati al progetto @@ -71,8 +72,8 @@ 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 -ListExpenseReportsAssociatedProject=List of expense reports associated with the project -ListDonationsAssociatedProject=List of donations associated with the project +ListExpenseReportsAssociatedProject=Lista delle note spese associate con il progetto +ListDonationsAssociatedProject=Lista delle donazioni associate al progetto ListActionsAssociatedProject=Elenco delle azioni associate al progetto ActivityOnProjectThisWeek=Operatività sul progetto questa settimana ActivityOnProjectThisMonth=Operatività sul progetto questo mese @@ -108,7 +109,7 @@ CloneContacts=Clona contatti CloneNotes=Clona note CloneProjectFiles=Clona progetto con file collegati CloneTaskFiles=Clona i file collegati alle(a) attività (se le(a) attività sono clonate) -CloneMoveDate=Update project/tasks dates from now ? +CloneMoveDate=Vuoi davvero aggiornare le date di progetti e compiti a partire da oggi? ConfirmCloneProject=Vuoi davvero clonare il progetto? ProjectReportDate=Cambia la data del compito a seconda della data di inizio progetto ErrorShiftTaskDate=Impossibile cambiare la data del compito a seconda della data di inizio del progetto @@ -132,14 +133,14 @@ UnlinkElement=Rimuovi collegamento # Documents models DocumentModelBaleine=Modello per il report di un progetto completo (logo, etc..) PlannedWorkload=Carico di lavoro previsto -PlannedWorkloadShort=Workload -WorkloadOccupation=Workload assignation +PlannedWorkloadShort=Carico di lavoro +WorkloadOccupation=Assegnazione carico di lavoro 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 -InputPerDay=Input per day -InputPerWeek=Input per week -InputPerAction=Input per action -TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s +InputPerDay=Input per giorno +InputPerWeek=Input per settimana +InputPerAction=Input per azione +TimeAlreadyRecorded=Tempo impiegato e già registrato per questo compito/giorno e questo utente %s diff --git a/htdocs/langs/it_IT/resource.lang b/htdocs/langs/it_IT/resource.lang index ec76b19187376..bdf97e063ce71 100644 --- a/htdocs/langs/it_IT/resource.lang +++ b/htdocs/langs/it_IT/resource.lang @@ -1,7 +1,7 @@ MenuResourceIndex=Risorse MenuResourceAdd=Nuova risorsa -MenuResourcePlanning=Resource planning +MenuResourcePlanning=Pianificazione delle risorse DeleteResource=Elimina risorsa ConfirmDeleteResourceElement=Confirm delete the resource for this element NoResourceInDatabase=Nessuna risorsa nel database @@ -17,7 +17,7 @@ ResourceFormLabel_description=Descrizione della risorsa ResourcesLinkedToElement=Risorse collegate all'elemento -ShowResourcePlanning=Show resource planning +ShowResourcePlanning=Visualizza pianificazione delle risorse GotoDate=Go to date ResourceElementPage=Risorse dell'elemento diff --git a/htdocs/langs/it_IT/stocks.lang b/htdocs/langs/it_IT/stocks.lang index 51c52f31d8ebe..83573b12c6027 100644 --- a/htdocs/langs/it_IT/stocks.lang +++ b/htdocs/langs/it_IT/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Annulla spedizione DeleteSending=Elimina spedizione Stock=Scorte Stocks=Scorte +StocksByLotSerial=Scorte per lotto/numero di serie Movement=Movimento Movements=Movimenti ErrorWarehouseRefRequired=Riferimento magazzino mancante @@ -23,7 +24,7 @@ ErrorWarehouseLabelRequired=Etichetta del magazzino mancante CorrectStock=Variazione manuale scorte ListOfWarehouses=Elenco magazzini ListOfStockMovements=Elenco movimenti delle scorte -StocksArea=Warehouses area +StocksArea=Area magazzino e scorte Location=Ubicazione LocationSummary=Ubicazione abbreviata NumberOfDifferentProducts=Numero di differenti prodotti @@ -47,10 +48,10 @@ 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 +IndependantSubProductStock=Le scorte del prodotto e del sottoprodotto sono indipendenti QtyDispatched=Quantità spedita -QtyDispatchedShort=Qty dispatched -QtyToDispatchShort=Qty to dispatch +QtyDispatchedShort=Quantità spedita +QtyToDispatchShort=Quantità da spedire OrderDispatch=Spedizione dell'ordine RuleForStockManagementDecrease=Regola per la gestione della diminuzione delle scorte RuleForStockManagementIncrease=Regola per la gestione dell'aumento delle scorte @@ -62,11 +63,11 @@ ReStockOnValidateOrder=Aumenta scorte effettive alla convalida dell'ordine ReStockOnDispatchOrder=Incrementa scorte effettive alla consegna manuale in magazzino, dopo il ricevimento dell'ordine fornitore ReStockOnDeleteInvoice=Aumenta scorte effettive alla cancellazione della fattura OrderStatusNotReadyToDispatch=Lo stato dell'ordine non ne consente la spedizione dei prodotti a magazzino. -StockDiffPhysicTeoric=Explanation for difference between physical and theoretical stock -NoPredefinedProductToDispatch=Per l'oggetto non ci sono prodotti impostati. Quindi non è necessario alterare le scorte. +StockDiffPhysicTeoric=Motivo della differenza tra scorte effettive e teoriche +NoPredefinedProductToDispatch=Per l'oggetto non ci sono prodotti predefiniti. Quindi non è necessario alterare le scorte. DispatchVerb=Spedizione StockLimitShort=Limite per segnalazioni -StockLimit=Limite minimo scorte per avvertimenti +StockLimit=Limite minimo scorte (per gli avvisi) PhysicalStock=Scorte fisiche RealStock=Scorte reali VirtualStock=Scorte virtuali @@ -78,6 +79,7 @@ IdWarehouse=Id magazzino DescWareHouse=Descrizione magazzino LieuWareHouse=Ubicazione magazzino WarehousesAndProducts=Magazzini e prodotti +WarehousesAndProductsBatchDetail=Magazzini e prodotti (con indicazione dei lotti/numeri di serie) AverageUnitPricePMPShort=Media prezzi scorte AverageUnitPricePMP=Media dei prezzi delle scorte SellPriceMin=Prezzo di vendita unitario @@ -111,7 +113,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=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=Questa è una lista di tutti gli ordini fornitore aperti che includono prodotti predefiniti. Qui sono visibili solo gli ordini aperti che contengano prodotti predefiniti. 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) @@ -119,16 +121,19 @@ MassMovement=Movimentazione di massa MassStockMovement=Movimentazione di massa delle giacenze SelectProductInAndOutWareHouse=Seleziona un prodotto, una quantità, un magazzino di origine ed uno di destinazione, poi clicca "%s". Una volta terminato, per tutte le movimentazioni da effettuare, clicca su "%s". RecordMovement=Registra trasferimento -ReceivingForSameOrder=Receipts for this order +ReceivingForSameOrder=Ricevuta per questo ordine StockMovementRecorded=Movimentazione di scorte registrata RuleForStockAvailability=Regole sulla fornitura delle scorte StockMustBeEnoughForInvoice=Il livello delle scorte deve essere sufficiente per aggiungere un prodotto/servizio alla fattura StockMustBeEnoughForOrder=Il livello delle scorte deve essere sufficiente per aggiungere un prodotto/servizio all'ordine StockMustBeEnoughForShipment= Il livello delle scorte deve essere sufficiente per aggiungere un prodotto/servizio alla spedizione -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. +MovementLabel=Etichetta per lo spostamento di magazzino +InventoryCode=Codice di inventario o di spostamento +IsInPackage=Contenuto nel pacchetto +ShowWarehouse=Mostra magazzino +MovementCorrectStock=Correzione delle scorte del prodotto %s +MovementTransferStock=Trasferisci scorte del prodotto %s in un altro magazzino +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Deve essere definito un "magazzino sorgente" quando il modulo "lotti" è attivo. \nSarà utilizzato per elencare quale lotto o seriale è disponibile per il prodotto che necessita un lotto/numero seriale per lo spostamento. Se si desidera inviare i prodotti da diversi magazzini, basta effettuare la spedizione in più fasi. +InventoryCodeShort=Codice di inventario o di spostamento +NoPendingReceptionOnSupplierOrder=Non ci sono ricezioni incomplete a causa di ordini fornitori non chiusi +ThisSerialAlreadyExistWithDifferentDate=Questo lotto/numero seriale (%s) esiste già con una differente data di scadenza o di validità (trovata %s, inserita %s ) diff --git a/htdocs/langs/it_IT/suppliers.lang b/htdocs/langs/it_IT/suppliers.lang index 49343fbc66e48..263603b318212 100644 --- a/htdocs/langs/it_IT/suppliers.lang +++ b/htdocs/langs/it_IT/suppliers.lang @@ -41,6 +41,6 @@ NoneOrBatchFileNeverRan=Nessuno batch file o %s non eseguito di recente SentToSuppliers=Inviato ai fornitori ListOfSupplierOrders=Elenco ordini fornitori MenuOrdersSupplierToBill=Ordini fornitori in fatture -NbDaysToDelivery=Delivery delay in days +NbDaysToDelivery=Giorni di ritardo per la consegna 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) +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/it_IT/trips.lang b/htdocs/langs/it_IT/trips.lang index bc73c8119be3e..d96ee874190f4 100644 --- a/htdocs/langs/it_IT/trips.lang +++ b/htdocs/langs/it_IT/trips.lang @@ -1,126 +1,102 @@ # 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=Nota spese +ExpenseReports=Note spese +Trip=Nota spese +Trips=Note spese +TripsAndExpenses=Note spese +TripsAndExpensesStatistics=Statistiche note spese +TripCard=Scheda nota spese +AddTrip=Crea nota spese +ListOfTrips=Lista delle note spese ListOfFees=Elenco delle tariffe -NewTrip=New expense report +NewTrip=Nuova nota spese CompanyVisited=Società/Fondazione visitata Kilometers=Kilometri FeesKilometersOrAmout=Tariffa kilometrica o importo -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=Elimina nota spese +ConfirmDeleteTrip=Vuoi davvero eliminare questa nota spese? +ListTripsAndExpenses=Lista delle note spese +ListToApprove=In attesa di approvazione +ExpensesArea=Area note spese +SearchATripAndExpense=Ricerca una nota spese 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 +ExpenseReportWaitingForApproval=È stata inserita una nuova nota spese da approvare +ExpenseReportWaitingForApprovalMessage=È stata inserita una nuova nota spese da approvare.\n- Utente: %s\n- Periodo: %s\nClicca qui per approvarla: %s +TripId=ID nota spese +AnyOtherInThisListCanValidate=Persona da informare per la convalida +TripSociete=Informazioni azienda +TripSalarie=Informazioni utente +TripNDF=Informazioni nota spese +DeleteLine=Cancella una riga della nota spese +ConfirmDeleteLine=Vuoi davvero eliminare questa riga? +PDFStandardExpenseReports=Template standard per la generazione dei PDF delle not spese +ExpenseReportLine=Riga di nota spese TF_OTHER=Altro -TF_TRANSPORTATION=Transportation +TF_TRANSPORTATION=Trasporto TF_LUNCH=Pranzo TF_METRO=Metro -TF_TRAIN=Train +TF_TRAIN=Treno TF_BUS=Bus -TF_CAR=Car -TF_PEAGE=Toll -TF_ESSENCE=Fuel -TF_HOTEL=Hostel +TF_CAR=Auto +TF_PEAGE=Pedaggio +TF_ESSENCE=Carburante +TF_HOTEL=Hotel 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=Hai già inviata una nota spese per il periodo selezionato +ListTripsAndExpenses=Lista delle note spese +AucuneNDF=Nessuna nota spese trovata +AucuneLigne=Non ci sono ancora note spese +AddLine=Aggiungi una riga +AddLineMini=Aggiungi -Date_DEBUT=Period date start -Date_FIN=Period date end -ModePaiement=Payment mode -Note=Note -Project=Project +Date_DEBUT=Data di inizio +Date_FIN=Data di fine +ModePaiement=Modalità di pagamento +Note=Nota +Project=Progetto -VALIDATOR=User to inform for approbation -VALIDOR=Approved by -AUTHOR=Recorded by -AUTHORPAIEMENT=Paied by -REFUSEUR=Denied by -CANCEL_USER=Canceled by +VALIDATOR=Utente responsabile dell'approvazione +VALIDOR=Approvata da +AUTHOR=Registrata da +AUTHORPAIEMENT=Liquidata da +REFUSEUR=Rifiutata da +CANCEL_USER=Eliminata da -MOTIF_REFUS=Reason -MOTIF_CANCEL=Reason +MOTIF_REFUS=Motivo +MOTIF_CANCEL=Motivo -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=Rifiutata in data +DATE_SAVE=Convalidata in data +DATE_VALIDE=Convalidata in data +DATE_CANCEL=Eliminata in data +DATE_PAIEMENT=Liquidata in data -Deny=Deny -TO_PAID=Pay -BROUILLONNER=Reopen -SendToValid=Sent to approve -ModifyInfoGen=Edit -ValidateAndSubmit=Validate and submit for approval +TO_PAID=Liquida +BROUILLONNER=Riapri +SendToValid=Invia per l'approvazione +ModifyInfoGen=Modifica +ValidateAndSubmit=Convalida e proponi per l'approvazione -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=Non sei autorizzato ad approvare questa nota spese +NOT_AUTHOR=Non sei l'autore di questa nota spese. Operazione annullata. -RefuseTrip=Deny an expense report -ConfirmRefuseTrip=Are you sure you want to deny this expense report ? +RefuseTrip=Rifiuta una nota spese +ConfirmRefuseTrip=Vuoi davvero rifiutare questa nota spese? -ValideTrip=Approve expense report -ConfirmValideTrip=Are you sure you want to approve this expense report ? +ValideTrip=Approva la nota spese +ConfirmValideTrip=Vuoi davvero approvare questa nota spese? -PaidTrip=Pay an expense report -ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? +PaidTrip=Liquida una nota spese +ConfirmPaidTrip=Vuoi davvero modificare lo stato di questa nota spese in "liquidata"? -CancelTrip=Cancel an expense report -ConfirmCancelTrip=Are you sure you want to cancel this expense report ? +CancelTrip=Elimina una nota spese +ConfirmCancelTrip=Vuoi davvero eliminare questa nota spese? -BrouillonnerTrip=Move back expense report to status "Draft"n -ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? +BrouillonnerTrip=Riporta la nota spese allo stato "bozza" +ConfirmBrouillonnerTrip=Vuoi davvero riportare questa nota spese allo stato "bozza"? -SaveTrip=Validate expense report -ConfirmSaveTrip=Are you sure you want to validate this expense report ? +SaveTrip=Convalida la nota spese +ConfirmSaveTrip=Vuoi davvero convalidare questa nota spese? -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. +NoTripsToExportCSV=Nessuna nota spese da esportare per il periodo diff --git a/htdocs/langs/it_IT/users.lang b/htdocs/langs/it_IT/users.lang index 2f75b5f6094b1..38049071f7621 100644 --- a/htdocs/langs/it_IT/users.lang +++ b/htdocs/langs/it_IT/users.lang @@ -102,7 +102,7 @@ UserDisabled=Utente %s disattivato UserEnabled=Utente %s attivato UserDeleted=Utente %s rimosso NewGroupCreated=Gruppo %s creato -GroupModified=Group %s modified +GroupModified=Gruppo %s modificato con successo GroupDeleted=Gruppo %s rimosso ConfirmCreateContact=Vuoi davvero creare un account Dolibarr per questo contatto? ConfirmCreateLogin=Vuoi davvero creare l'account? diff --git a/htdocs/langs/it_IT/workflow.lang b/htdocs/langs/it_IT/workflow.lang index 26dbbc93ff71a..ab36ea1277fca 100644 --- a/htdocs/langs/it_IT/workflow.lang +++ b/htdocs/langs/it_IT/workflow.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - admin WorkflowSetup=Impostazioni flusso di lavoro -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=Questo modulo è progettatto per modificare il comportamento delle azioni automatizzate del programma. Il flusso di lavoro è aperto per impostazione predefinita (puoi compiere le azioni nell'ordine che preferisci). Puoi scegliere di attivare solo le azioni automatizzate che ti interessano. ThereIsNoWorkflowToModify=Non vi è alcun flusso di lavoro modificabile per il modulo. descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Creare automaticamente un ordine cliente alla firma di una proposta commerciale descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Creare automaticamente una fattura attiva alla firma di una proposta commerciale diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang index a2a0af90f9371..b0eb764934aa7 100644 --- a/htdocs/langs/ja_JP/admin.lang +++ b/htdocs/langs/ja_JP/admin.lang @@ -297,10 +297,11 @@ MenuHandlers=メニューハンドラ MenuAdmin=メニューエディタ DoNotUseInProduction=Do not use in production ThisIsProcessToFollow=これは、プロセスのセットアップです。 +ThisIsAlternativeProcessToFollow=This is an alternative setup to process: StepNb=ステップ%s FindPackageFromWebSite=（公式ウェブサイト%sの例の場合）必要な機能を提供するパッケージを検索します。 DownloadPackageFromWebSite=Download package %s. -UnpackPackageInDolibarrRoot=Dolibarrのルートディレクトリにアンパック%sパッケージファイル +UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: %s SetupIsReadyForUse=インストールが終了しDolibarrは、この新しいコンポーネントで使用できる状態になっています。 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).
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_ 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) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s RefreshPhoneLink=Refresh link @@ -540,8 +541,8 @@ 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 +Module39000Name=Product lot +Module39000Desc=Lot or serial number, eat-by and sell-by date management on products Module50000Name=切符売り場 Module50000Desc=切符売り場でクレジットカードによるオンライン決済のページを提供するモジュール Module50100Name=売上高のポイント @@ -558,8 +559,6 @@ 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=顧客の請求書をお読みください Permission12=顧客の請求書を作成/変更 Permission13=顧客の請求書をUnvalidate @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= 見通し、請求書を作成し、デフォルトでは LocalTax2IsNotUsedDescES= デフォルトでは、提案されたIRPFは0です。ルールの終わり。 LocalTax2IsUsedExampleES= スペインでは、フリーランサーとサービスモジュールの税制を選択した企業に提供する独立した専門家。 LocalTax2IsNotUsedExampleES= スペインでは彼らは、モジュールの税制の対象になりませんbussinesがあります。 -CalcLocaltax=Reports -CalcLocaltax1ES=Sales - Purchases +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Sales - Purchases CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Purchases +CalcLocaltax2=Purchases CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Sales +CalcLocaltax3=Sales CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales LabelUsedByDefault=ない翻訳がコードに見つからない場合、デフォルトで使用されるラベル LabelOnDocuments=ドキュメントのラベル @@ -1018,14 +1017,14 @@ NoEventOrNoAuditSetup=は、セキュリティイベントがまだ記録され NoEventFoundWithCriteria=は、セキュリティイベントは、このような検索のcriterias見つかりませんされています。 SeeLocalSendMailSetup=ローカルのsendmailの設定を参照してください。 BackupDesc=Dolibarrの完全なバックアップを作成するには、以下を行う必要があります。 -BackupDesc2=*（あなたは、例えば、zipファイルを作ることができる）は、すべてのアップロードされ、生成されたファイルが含まれるドキュメントディレクトリ（%s）の内容を保存します。 -BackupDesc3=*ダンプ·ファイルにデータベースの内容を保存します。このためには、次のアシスタントを使用することができます。 +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=アーカイブディレクトリは安全な場所に格納する必要があります。 BackupDescY=生成されたダンプ·ファイルは安全な場所に格納する必要があります。 BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one RestoreDesc=Dolibarrのバックアップを復元するには、以下を行う必要があります。 -RestoreDesc2=*新しいDolibarrインストールのドキュメントディレクトリまたはdirectoyこの現在の文書（%s）にファイルのツリーを抽出するディレクトリのドキュメントのアーカイブファイル（たとえばzipファイル）をリストアします。 -RestoreDesc3=*バックアップダンプファイルから、新しいDolibarrインストールのデータベースに、またはこの現在のインストールのデータベースに、データを復元します。警告は、終了したら復元するには、再度接続するには、バックアップが作成されたときに存在してログイン名/パスワードを使用する必要があります。この現在のインストールにバックアップデータベースを復元するには、このアシスタントに従うことができます。 +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= このルールがアクティブ化モジュールによって%sに強制されます。 PreviousDumpFiles=使用可能なデータベース·バックアップ·ダンプ·ファイル @@ -1337,6 +1336,8 @@ LDAPFieldCountry=国 LDAPFieldCountryExample=例：c LDAPFieldDescription=説明 LDAPFieldDescriptionExample=例：説明 +LDAPFieldNotePublic=Public Note +LDAPFieldNotePublicExample=Example : publicnote LDAPFieldGroupMembers= グループメンバー LDAPFieldGroupMembersExample= 例：のuniqueMember LDAPFieldBirthdate=誕生日 @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= クレジットカードでの現金支払いを受け 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=モジュールのセットアップをブックマーク @@ -1616,3 +1617,8 @@ 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 +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" diff --git a/htdocs/langs/ja_JP/banks.lang b/htdocs/langs/ja_JP/banks.lang index 415d74642e7f2..c7ed52bc8c86e 100644 --- a/htdocs/langs/ja_JP/banks.lang +++ b/htdocs/langs/ja_JP/banks.lang @@ -163,3 +163,5 @@ LabelRIB=BAN Label NoBANRecord=No BAN record DeleteARib=Delete BAN record ConfirmDeleteRib=Are you sure you want to delete this BAN record ? +StartDate=Start date +EndDate=End date diff --git a/htdocs/langs/ja_JP/boxes.lang b/htdocs/langs/ja_JP/boxes.lang index 0a2d3c0f7bb38..79aac820e739f 100644 --- a/htdocs/langs/ja_JP/boxes.lang +++ b/htdocs/langs/ja_JP/boxes.lang @@ -12,6 +12,7 @@ BoxLastProspects=最終更新の見通し BoxLastCustomers=最終更新日の顧客 BoxLastSuppliers=最終更新サプライヤー BoxLastCustomerOrders=最後に、顧客の注文 +BoxLastValidatedCustomerOrders=Last validated customer orders BoxLastBooks=最後の書籍 BoxLastActions=最後のアクション BoxLastContracts=最後の契約 @@ -27,26 +28,29 @@ BoxTitleNbOfCustomers=クライアントの数 BoxTitleLastRssInfos=%s %sからの最後のニュース BoxTitleLastProducts=最後%sは、製品/サービスを変更 BoxTitleProductsAlertStock=Products in stock alert -BoxTitleLastCustomerOrders=最後%sは、顧客の注文を変更 +BoxTitleLastCustomerOrders=Last %s customer orders +BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders BoxTitleLastSuppliers=最後%sのサプライヤーを記録 BoxTitleLastCustomers=最後%s記録された顧客 BoxTitleLastModifiedSuppliers=最後%sのサプライヤーを変更 BoxTitleLastModifiedCustomers=最後に変更されたお客様の%s -BoxTitleLastCustomersOrProspects=最後%s変更顧客や見込み客 -BoxTitleLastPropals=最後%s記録された提案 +BoxTitleLastCustomersOrProspects=Last %s customers or prospects +BoxTitleLastPropals=Last %s proposals +BoxTitleLastModifiedPropals=Last %s modified proposals BoxTitleLastCustomerBills=最後%s顧客の請求書 +BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices BoxTitleLastSupplierBills=最後%sサプライヤの請求書 -BoxTitleLastProspects=最後%sは見通しを記録 +BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices BoxTitleLastModifiedProspects=最後%sは、見通しを修正 BoxTitleLastProductsInContract=契約の最後の%s製品/サービス -BoxTitleLastModifiedMembers=最後に変更されたメンバー%s +BoxTitleLastModifiedMembers=Last %s members BoxTitleLastFicheInter=Last %s modified intervention -BoxTitleOldestUnpaidCustomerBills=古い%s未払いの顧客の請求書 -BoxTitleOldestUnpaidSupplierBills=古い%s未払いの仕入先の請求書 +BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices +BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices BoxTitleCurrentAccounts=Opened account's balances BoxTitleSalesTurnover=販売額 -BoxTitleTotalUnpaidCustomerBills=未払いの顧客の請求書 -BoxTitleTotalUnpaidSuppliersBills=未払いの仕入先の請求書 +BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices +BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices BoxTitleLastModifiedContacts=最後%sは変更された連絡先/アドレス BoxMyLastBookmarks=私の最後の%sブックマーク BoxOldestExpiredServices=最も古いアクティブな期限切れのサービス @@ -76,7 +80,8 @@ NoContractedProducts=ない製品/サービスは、契約しない NoRecordedContracts=全く記録された契約をしない 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 @@ -89,3 +94,4 @@ BoxProductDistributionFor=Distribution of %s for %s ForCustomersInvoices=顧客の請求書 ForCustomersOrders=Customers orders ForProposals=提案 +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang index 609e4764bfea6..0f69477c23c39 100644 --- a/htdocs/langs/ja_JP/errors.lang +++ b/htdocs/langs/ja_JP/errors.lang @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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/langs/ja_JP/interventions.lang b/htdocs/langs/ja_JP/interventions.lang index 2f5656a644a19..7401b370b9370 100644 --- a/htdocs/langs/ja_JP/interventions.lang +++ b/htdocs/langs/ja_JP/interventions.lang @@ -50,4 +50,4 @@ ArcticNumRefModelError=アクティブ化に失敗 PacificNumRefModelDesc1=yyは年である%syymm - nnnnの形式でニュメロを返す、mmは月ですと、nnnnはなく休憩と0〜ノーリターンでシーケンスです。 PacificNumRefModelError=$ syymmで始まる介入のカードは、すでに存在し、シーケンスのこのモデルと互換性がありません。それを削除するか、このモジュールをアクティブにするには、その名前を変更。 PrintProductsOnFichinter=Print products on intervention card -PrintProductsOnFichinterDetails=forinterventions generated from orders +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang index 0b44e77f1ef16..62a5a2589a466 100644 --- a/htdocs/langs/ja_JP/main.lang +++ b/htdocs/langs/ja_JP/main.lang @@ -220,6 +220,7 @@ Next=次の Cards=カード Card=カード Now=現在 +HourStart=Start hour Date=日付 DateAndHour=Date and hour DateStart=開始日 @@ -242,6 +243,8 @@ DatePlanShort=日付かんな DateRealShort=実際の日付を記入してください。 DateBuild=日付をビルドレポート DatePayment=支払日 +DateApprove=Approving date +DateApprove2=Approving date (second approval) DurationYear=年 DurationMonth=月 DurationWeek=週 @@ -408,6 +411,8 @@ OtherInformations=その他の情報 Quantity=量 Qty=個数 ChangedBy=によって変更され +ApprovedBy=Approved by +ApprovedBy2=Approved by (second approval) ReCalculate=Recalculate ResultOk=成功 ResultKo=失敗 @@ -696,6 +701,8 @@ 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. +Deny=Deny +Denied=Denied # Week day Monday=月曜日 Tuesday=火曜日 diff --git a/htdocs/langs/ja_JP/orders.lang b/htdocs/langs/ja_JP/orders.lang index 797306821d685..113c59964a901 100644 --- a/htdocs/langs/ja_JP/orders.lang +++ b/htdocs/langs/ja_JP/orders.lang @@ -79,7 +79,9 @@ NoOpenedOrders=いいえ開かれたオーダーがない NoOtherOpenedOrders=他の注文を開かれていません NoDraftOrders=No draft orders OtherOrders=他の注文 -LastOrders=最後%s受注 +LastOrders=Last %s customer orders +LastCustomerOrders=Last %s customer orders +LastSupplierOrders=Last %s supplier orders LastModifiedOrders=最後%s注文を変更 LastClosedOrders=最後%sは、受注を閉じた AllOrders=すべての注文 diff --git a/htdocs/langs/ja_JP/other.lang b/htdocs/langs/ja_JP/other.lang index af1c98b5cf3f0..87ebc28f41663 100644 --- a/htdocs/langs/ja_JP/other.lang +++ b/htdocs/langs/ja_JP/other.lang @@ -203,6 +203,7 @@ 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. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=カレンダー%sにエントリを追加します。 diff --git a/htdocs/langs/ja_JP/productbatch.lang b/htdocs/langs/ja_JP/productbatch.lang index 452636819653f..85b1d27f3a611 100644 --- a/htdocs/langs/ja_JP/productbatch.lang +++ b/htdocs/langs/ja_JP/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use batch/serial number -ProductStatusOnBatch=Yes (Batch/serial required) -ProductStatusNotOnBatch=No (Batch/serial not used) +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/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 +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial 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 +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %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. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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/ja_JP/projects.lang b/htdocs/langs/ja_JP/projects.lang index 84f8113a5e41f..5526c92b708ee 100644 --- a/htdocs/langs/ja_JP/projects.lang +++ b/htdocs/langs/ja_JP/projects.lang @@ -14,6 +14,7 @@ MyTasksDesc=このビューは、連絡先の（種類は何でも）がプロ OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=このビューには、読み取りを許可されているすべてのプロジェクトやタスクを示します。 TasksDesc=このビューは、すべてのプロジェクトとタスク（あなたのユーザー権限はあなたに全てを表示する権限を付与）を提示します。 +AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. ProjectsArea=プロジェクトエリア NewProject=新しいプロジェクト AddProject=Create project diff --git a/htdocs/langs/ja_JP/stocks.lang b/htdocs/langs/ja_JP/stocks.lang index 45f66be1a158a..c395689231ce3 100644 --- a/htdocs/langs/ja_JP/stocks.lang +++ b/htdocs/langs/ja_JP/stocks.lang @@ -16,6 +16,7 @@ CancelSending=送信キャンセル DeleteSending=送信削除 Stock=株式 Stocks=ストック +StocksByLotSerial=Stock by lot/serial Movement=運動 Movements=動作 ErrorWarehouseRefRequired=ウェアハウスの参照名を指定する必要があります @@ -78,6 +79,7 @@ IdWarehouse=イド倉庫 DescWareHouse=説明倉庫 LieuWareHouse=ローカリゼーション倉庫 WarehousesAndProducts=倉庫と製品 +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=加重平均の入力価格 AverageUnitPricePMP=加重平均の入力価格 SellPriceMin=販売単価 @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/ja_JP/suppliers.lang b/htdocs/langs/ja_JP/suppliers.lang index 8b71d67b2ab5a..5e99086f0edb4 100644 --- a/htdocs/langs/ja_JP/suppliers.lang +++ b/htdocs/langs/ja_JP/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) +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/ja_JP/trips.lang b/htdocs/langs/ja_JP/trips.lang index 273382c38a934..6a53035c5c6d5 100644 --- a/htdocs/langs/ja_JP/trips.lang +++ b/htdocs/langs/ja_JP/trips.lang @@ -69,11 +69,9 @@ 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 @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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 3df78528d98f1..e823d364258a3 100644 --- a/htdocs/langs/ka_GE/admin.lang +++ b/htdocs/langs/ka_GE/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).
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_ 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) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s RefreshPhoneLink=Refresh link @@ -540,8 +541,8 @@ 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 +Module39000Name=Product lot +Module39000Desc=Lot 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 @@ -558,8 +559,6 @@ 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 @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, 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 +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Sales - Purchases CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Purchases +CalcLocaltax2=Purchases CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Sales +CalcLocaltax3=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 @@ -1018,14 +1017,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 @@ -1337,6 +1336,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 @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= Default account to use to receive payments by credit c 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot 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 @@ -1616,3 +1617,8 @@ 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 +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" diff --git a/htdocs/langs/ka_GE/banks.lang b/htdocs/langs/ka_GE/banks.lang index a2306950fb484..72639883e1ac2 100644 --- a/htdocs/langs/ka_GE/banks.lang +++ b/htdocs/langs/ka_GE/banks.lang @@ -163,3 +163,5 @@ LabelRIB=BAN Label NoBANRecord=No BAN record DeleteARib=Delete BAN record ConfirmDeleteRib=Are you sure you want to delete this BAN record ? +StartDate=Start date +EndDate=End date diff --git a/htdocs/langs/ka_GE/boxes.lang b/htdocs/langs/ka_GE/boxes.lang index bf118b9b88ed0..c0180bebdaa46 100644 --- a/htdocs/langs/ka_GE/boxes.lang +++ b/htdocs/langs/ka_GE/boxes.lang @@ -94,3 +94,4 @@ BoxProductDistributionFor=Distribution of %s for %s ForCustomersInvoices=Customers invoices ForCustomersOrders=Customers orders ForProposals=Proposals +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/ka_GE/errors.lang b/htdocs/langs/ka_GE/errors.lang index 52e9f6aeae473..dbafde2f6e546 100644 --- a/htdocs/langs/ka_GE/errors.lang +++ b/htdocs/langs/ka_GE/errors.lang @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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/langs/ka_GE/interventions.lang b/htdocs/langs/ka_GE/interventions.lang index c79da05364e61..67d4f61d9f15d 100644 --- a/htdocs/langs/ka_GE/interventions.lang +++ b/htdocs/langs/ka_GE/interventions.lang @@ -50,4 +50,4 @@ 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 +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/ka_GE/main.lang b/htdocs/langs/ka_GE/main.lang index 4b393ec50c5fc..9a32ee6f1ea5a 100644 --- a/htdocs/langs/ka_GE/main.lang +++ b/htdocs/langs/ka_GE/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 @@ -242,6 +243,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 +411,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 @@ -696,6 +701,8 @@ 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. +Deny=Deny +Denied=Denied # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/ka_GE/orders.lang b/htdocs/langs/ka_GE/orders.lang index 3d4f381c40b4d..044bcc0eb0174 100644 --- a/htdocs/langs/ka_GE/orders.lang +++ b/htdocs/langs/ka_GE/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/langs/ka_GE/other.lang b/htdocs/langs/ka_GE/other.lang index 9b2de3eeb9024..6b60f5eac9717 100644 --- a/htdocs/langs/ka_GE/other.lang +++ b/htdocs/langs/ka_GE/other.lang @@ -203,6 +203,7 @@ 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. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=Add entry in calendar %s diff --git a/htdocs/langs/ka_GE/productbatch.lang b/htdocs/langs/ka_GE/productbatch.lang index 452636819653f..85b1d27f3a611 100644 --- a/htdocs/langs/ka_GE/productbatch.lang +++ b/htdocs/langs/ka_GE/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use batch/serial number -ProductStatusOnBatch=Yes (Batch/serial required) -ProductStatusNotOnBatch=No (Batch/serial not used) +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/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 +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial 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 +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %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. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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/ka_GE/projects.lang b/htdocs/langs/ka_GE/projects.lang index 03c11382a2d8b..eac0f41d321f1 100644 --- a/htdocs/langs/ka_GE/projects.lang +++ b/htdocs/langs/ka_GE/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/langs/ka_GE/stocks.lang b/htdocs/langs/ka_GE/stocks.lang index 29706d1761545..c2b432d7f9b93 100644 --- a/htdocs/langs/ka_GE/stocks.lang +++ b/htdocs/langs/ka_GE/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Cancel sending DeleteSending=Delete sending Stock=Stock Stocks=Stocks +StocksByLotSerial=Stock by lot/serial Movement=Movement Movements=Movements ErrorWarehouseRefRequired=Warehouse reference name is required @@ -78,6 +79,7 @@ IdWarehouse=Id warehouse DescWareHouse=Description warehouse LieuWareHouse=Localisation warehouse WarehousesAndProducts=Warehouses and products +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=Weighted average input price AverageUnitPricePMP=Weighted average input price SellPriceMin=Selling Unit Price @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/ka_GE/suppliers.lang b/htdocs/langs/ka_GE/suppliers.lang index d9de79fe84dbc..e0552c064e8ce 100644 --- a/htdocs/langs/ka_GE/suppliers.lang +++ b/htdocs/langs/ka_GE/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) +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/ka_GE/trips.lang b/htdocs/langs/ka_GE/trips.lang index ba36fc9b07b6a..76b214abdb77f 100644 --- a/htdocs/langs/ka_GE/trips.lang +++ b/htdocs/langs/ka_GE/trips.lang @@ -69,11 +69,9 @@ 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 @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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/admin.lang b/htdocs/langs/kn_IN/admin.lang index 3df78528d98f1..e823d364258a3 100644 --- a/htdocs/langs/kn_IN/admin.lang +++ b/htdocs/langs/kn_IN/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).
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_ 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) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s RefreshPhoneLink=Refresh link @@ -540,8 +541,8 @@ 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 +Module39000Name=Product lot +Module39000Desc=Lot 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 @@ -558,8 +559,6 @@ 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 @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, 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 +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Sales - Purchases CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Purchases +CalcLocaltax2=Purchases CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Sales +CalcLocaltax3=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 @@ -1018,14 +1017,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 @@ -1337,6 +1336,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 @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= Default account to use to receive payments by credit c 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot 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 @@ -1616,3 +1617,8 @@ 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 +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" diff --git a/htdocs/langs/kn_IN/banks.lang b/htdocs/langs/kn_IN/banks.lang index a2306950fb484..72639883e1ac2 100644 --- a/htdocs/langs/kn_IN/banks.lang +++ b/htdocs/langs/kn_IN/banks.lang @@ -163,3 +163,5 @@ LabelRIB=BAN Label NoBANRecord=No BAN record DeleteARib=Delete BAN record ConfirmDeleteRib=Are you sure you want to delete this BAN record ? +StartDate=Start date +EndDate=End date diff --git a/htdocs/langs/kn_IN/boxes.lang b/htdocs/langs/kn_IN/boxes.lang index bf118b9b88ed0..c0180bebdaa46 100644 --- a/htdocs/langs/kn_IN/boxes.lang +++ b/htdocs/langs/kn_IN/boxes.lang @@ -94,3 +94,4 @@ BoxProductDistributionFor=Distribution of %s for %s ForCustomersInvoices=Customers invoices ForCustomersOrders=Customers orders ForProposals=Proposals +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/kn_IN/errors.lang b/htdocs/langs/kn_IN/errors.lang index 52e9f6aeae473..dbafde2f6e546 100644 --- a/htdocs/langs/kn_IN/errors.lang +++ b/htdocs/langs/kn_IN/errors.lang @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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/langs/kn_IN/interventions.lang b/htdocs/langs/kn_IN/interventions.lang index c79da05364e61..67d4f61d9f15d 100644 --- a/htdocs/langs/kn_IN/interventions.lang +++ b/htdocs/langs/kn_IN/interventions.lang @@ -50,4 +50,4 @@ 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 +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/kn_IN/main.lang b/htdocs/langs/kn_IN/main.lang index 4b393ec50c5fc..9a32ee6f1ea5a 100644 --- a/htdocs/langs/kn_IN/main.lang +++ b/htdocs/langs/kn_IN/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 @@ -242,6 +243,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 +411,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 @@ -696,6 +701,8 @@ 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. +Deny=Deny +Denied=Denied # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/kn_IN/orders.lang b/htdocs/langs/kn_IN/orders.lang index 3d4f381c40b4d..044bcc0eb0174 100644 --- a/htdocs/langs/kn_IN/orders.lang +++ b/htdocs/langs/kn_IN/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/langs/kn_IN/other.lang b/htdocs/langs/kn_IN/other.lang index 9b2de3eeb9024..6b60f5eac9717 100644 --- a/htdocs/langs/kn_IN/other.lang +++ b/htdocs/langs/kn_IN/other.lang @@ -203,6 +203,7 @@ 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. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=Add entry in calendar %s diff --git a/htdocs/langs/kn_IN/productbatch.lang b/htdocs/langs/kn_IN/productbatch.lang index 452636819653f..85b1d27f3a611 100644 --- a/htdocs/langs/kn_IN/productbatch.lang +++ b/htdocs/langs/kn_IN/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use batch/serial number -ProductStatusOnBatch=Yes (Batch/serial required) -ProductStatusNotOnBatch=No (Batch/serial not used) +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/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 +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial 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 +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %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. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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/projects.lang b/htdocs/langs/kn_IN/projects.lang index 03c11382a2d8b..eac0f41d321f1 100644 --- a/htdocs/langs/kn_IN/projects.lang +++ b/htdocs/langs/kn_IN/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/langs/kn_IN/stocks.lang b/htdocs/langs/kn_IN/stocks.lang index 29706d1761545..c2b432d7f9b93 100644 --- a/htdocs/langs/kn_IN/stocks.lang +++ b/htdocs/langs/kn_IN/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Cancel sending DeleteSending=Delete sending Stock=Stock Stocks=Stocks +StocksByLotSerial=Stock by lot/serial Movement=Movement Movements=Movements ErrorWarehouseRefRequired=Warehouse reference name is required @@ -78,6 +79,7 @@ IdWarehouse=Id warehouse DescWareHouse=Description warehouse LieuWareHouse=Localisation warehouse WarehousesAndProducts=Warehouses and products +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=Weighted average input price AverageUnitPricePMP=Weighted average input price SellPriceMin=Selling Unit Price @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/kn_IN/suppliers.lang b/htdocs/langs/kn_IN/suppliers.lang index d9de79fe84dbc..e0552c064e8ce 100644 --- a/htdocs/langs/kn_IN/suppliers.lang +++ b/htdocs/langs/kn_IN/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) +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/kn_IN/trips.lang b/htdocs/langs/kn_IN/trips.lang index ba36fc9b07b6a..76b214abdb77f 100644 --- a/htdocs/langs/kn_IN/trips.lang +++ b/htdocs/langs/kn_IN/trips.lang @@ -69,11 +69,9 @@ 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 @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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 a554ac64ee7e0..5cae3e542820c 100644 --- a/htdocs/langs/ko_KR/admin.lang +++ b/htdocs/langs/ko_KR/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).
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_ 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) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s RefreshPhoneLink=Refresh link @@ -540,8 +541,8 @@ 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 +Module39000Name=Product lot +Module39000Desc=Lot 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 @@ -558,8 +559,6 @@ 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 @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, 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 +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Sales - Purchases CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Purchases +CalcLocaltax2=Purchases CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Sales +CalcLocaltax3=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 @@ -1018,14 +1017,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 @@ -1337,6 +1336,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 @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= Default account to use to receive payments by credit c 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot 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 @@ -1616,3 +1617,8 @@ 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 +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" diff --git a/htdocs/langs/ko_KR/banks.lang b/htdocs/langs/ko_KR/banks.lang index a2306950fb484..72639883e1ac2 100644 --- a/htdocs/langs/ko_KR/banks.lang +++ b/htdocs/langs/ko_KR/banks.lang @@ -163,3 +163,5 @@ LabelRIB=BAN Label NoBANRecord=No BAN record DeleteARib=Delete BAN record ConfirmDeleteRib=Are you sure you want to delete this BAN record ? +StartDate=Start date +EndDate=End date diff --git a/htdocs/langs/ko_KR/boxes.lang b/htdocs/langs/ko_KR/boxes.lang index 0596d677c46ad..c0180bebdaa46 100644 --- a/htdocs/langs/ko_KR/boxes.lang +++ b/htdocs/langs/ko_KR/boxes.lang @@ -1,91 +1,97 @@ # 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 -# 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 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 -# BoxTitleLastCustomerBills=Last %s customer's invoices -# BoxTitleLastSupplierBills=Last %s supplier's invoices -# BoxTitleLastProspects=Last %s recorded prospects -# BoxTitleLastModifiedProspects=Last %s modified prospects -# BoxTitleLastProductsInContract=Last %s products/services in a contract -# BoxTitleLastModifiedMembers=Last %s modified members -# BoxTitleLastFicheInter=Last %s modified intervention -# BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer's invoices -# BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier's invoices -# BoxTitleCurrentAccounts=Opened account's balances -# BoxTitleSalesTurnover=Sales turnover -# BoxTitleTotalUnpaidCustomerBills=Unpaid customer's invoices -# BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier's 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=%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 -# ForCustomersInvoices=Customers invoices -# ForCustomersOrders=Customers orders -# ForProposals=Proposals +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 +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/ko_KR/errors.lang b/htdocs/langs/ko_KR/errors.lang index 636e4ed9ef1de..8faefb13837f9 100644 --- a/htdocs/langs/ko_KR/errors.lang +++ b/htdocs/langs/ko_KR/errors.lang @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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/langs/ko_KR/interventions.lang b/htdocs/langs/ko_KR/interventions.lang index c79da05364e61..67d4f61d9f15d 100644 --- a/htdocs/langs/ko_KR/interventions.lang +++ b/htdocs/langs/ko_KR/interventions.lang @@ -50,4 +50,4 @@ 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 +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang index 2f1e4633ebec4..b3f54f1d1c4e0 100644 --- a/htdocs/langs/ko_KR/main.lang +++ b/htdocs/langs/ko_KR/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 @@ -242,6 +243,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 +411,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 @@ -696,6 +701,8 @@ 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. +Deny=Deny +Denied=Denied # Week day Monday=월요일 Tuesday=화요일 diff --git a/htdocs/langs/ko_KR/orders.lang b/htdocs/langs/ko_KR/orders.lang index 3d4f381c40b4d..044bcc0eb0174 100644 --- a/htdocs/langs/ko_KR/orders.lang +++ b/htdocs/langs/ko_KR/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/langs/ko_KR/other.lang b/htdocs/langs/ko_KR/other.lang index bcee06dd11b3e..8b695b497bb74 100644 --- a/htdocs/langs/ko_KR/other.lang +++ b/htdocs/langs/ko_KR/other.lang @@ -203,6 +203,7 @@ 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. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=Add entry in calendar %s diff --git a/htdocs/langs/ko_KR/productbatch.lang b/htdocs/langs/ko_KR/productbatch.lang index 452636819653f..85b1d27f3a611 100644 --- a/htdocs/langs/ko_KR/productbatch.lang +++ b/htdocs/langs/ko_KR/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use batch/serial number -ProductStatusOnBatch=Yes (Batch/serial required) -ProductStatusNotOnBatch=No (Batch/serial not used) +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/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 +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial 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 +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %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. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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/ko_KR/projects.lang b/htdocs/langs/ko_KR/projects.lang index 03c11382a2d8b..eac0f41d321f1 100644 --- a/htdocs/langs/ko_KR/projects.lang +++ b/htdocs/langs/ko_KR/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/langs/ko_KR/stocks.lang b/htdocs/langs/ko_KR/stocks.lang index d27622136279a..6a54af62d5c1e 100644 --- a/htdocs/langs/ko_KR/stocks.lang +++ b/htdocs/langs/ko_KR/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Cancel sending DeleteSending=Delete sending Stock=Stock Stocks=Stocks +StocksByLotSerial=Stock by lot/serial Movement=Movement Movements=Movements ErrorWarehouseRefRequired=Warehouse reference name is required @@ -78,6 +79,7 @@ IdWarehouse=Id warehouse DescWareHouse=Description warehouse LieuWareHouse=Localisation warehouse WarehousesAndProducts=Warehouses and products +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=Weighted average input price AverageUnitPricePMP=Weighted average input price SellPriceMin=Selling Unit Price @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/ko_KR/suppliers.lang b/htdocs/langs/ko_KR/suppliers.lang index d9de79fe84dbc..e0552c064e8ce 100644 --- a/htdocs/langs/ko_KR/suppliers.lang +++ b/htdocs/langs/ko_KR/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) +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/ko_KR/trips.lang b/htdocs/langs/ko_KR/trips.lang index ba36fc9b07b6a..76b214abdb77f 100644 --- a/htdocs/langs/ko_KR/trips.lang +++ b/htdocs/langs/ko_KR/trips.lang @@ -69,11 +69,9 @@ 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 @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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/admin.lang b/htdocs/langs/lo_LA/admin.lang index 3df78528d98f1..e823d364258a3 100644 --- a/htdocs/langs/lo_LA/admin.lang +++ b/htdocs/langs/lo_LA/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).
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_ 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) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s RefreshPhoneLink=Refresh link @@ -540,8 +541,8 @@ 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 +Module39000Name=Product lot +Module39000Desc=Lot 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 @@ -558,8 +559,6 @@ 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 @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, 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 +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Sales - Purchases CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Purchases +CalcLocaltax2=Purchases CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Sales +CalcLocaltax3=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 @@ -1018,14 +1017,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 @@ -1337,6 +1336,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 @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= Default account to use to receive payments by credit c 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot 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 @@ -1616,3 +1617,8 @@ 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 +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" diff --git a/htdocs/langs/lo_LA/banks.lang b/htdocs/langs/lo_LA/banks.lang index 5893c36a4f6db..fb5ec74abfd0a 100644 --- a/htdocs/langs/lo_LA/banks.lang +++ b/htdocs/langs/lo_LA/banks.lang @@ -163,3 +163,5 @@ LabelRIB=BAN Label NoBANRecord=No BAN record DeleteARib=Delete BAN record ConfirmDeleteRib=Are you sure you want to delete this BAN record ? +StartDate=Start date +EndDate=End date diff --git a/htdocs/langs/lo_LA/boxes.lang b/htdocs/langs/lo_LA/boxes.lang index bf118b9b88ed0..c0180bebdaa46 100644 --- a/htdocs/langs/lo_LA/boxes.lang +++ b/htdocs/langs/lo_LA/boxes.lang @@ -94,3 +94,4 @@ BoxProductDistributionFor=Distribution of %s for %s ForCustomersInvoices=Customers invoices ForCustomersOrders=Customers orders ForProposals=Proposals +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/lo_LA/errors.lang b/htdocs/langs/lo_LA/errors.lang index 52e9f6aeae473..dbafde2f6e546 100644 --- a/htdocs/langs/lo_LA/errors.lang +++ b/htdocs/langs/lo_LA/errors.lang @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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/langs/lo_LA/interventions.lang b/htdocs/langs/lo_LA/interventions.lang index c79da05364e61..67d4f61d9f15d 100644 --- a/htdocs/langs/lo_LA/interventions.lang +++ b/htdocs/langs/lo_LA/interventions.lang @@ -50,4 +50,4 @@ 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 +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/lo_LA/main.lang b/htdocs/langs/lo_LA/main.lang index 4b393ec50c5fc..9a32ee6f1ea5a 100644 --- a/htdocs/langs/lo_LA/main.lang +++ b/htdocs/langs/lo_LA/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 @@ -242,6 +243,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 +411,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 @@ -696,6 +701,8 @@ 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. +Deny=Deny +Denied=Denied # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/lo_LA/orders.lang b/htdocs/langs/lo_LA/orders.lang index 3d4f381c40b4d..044bcc0eb0174 100644 --- a/htdocs/langs/lo_LA/orders.lang +++ b/htdocs/langs/lo_LA/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/langs/lo_LA/other.lang b/htdocs/langs/lo_LA/other.lang index 9b2de3eeb9024..6b60f5eac9717 100644 --- a/htdocs/langs/lo_LA/other.lang +++ b/htdocs/langs/lo_LA/other.lang @@ -203,6 +203,7 @@ 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. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=Add entry in calendar %s diff --git a/htdocs/langs/lo_LA/productbatch.lang b/htdocs/langs/lo_LA/productbatch.lang index 452636819653f..85b1d27f3a611 100644 --- a/htdocs/langs/lo_LA/productbatch.lang +++ b/htdocs/langs/lo_LA/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use batch/serial number -ProductStatusOnBatch=Yes (Batch/serial required) -ProductStatusNotOnBatch=No (Batch/serial not used) +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/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 +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial 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 +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %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. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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/projects.lang b/htdocs/langs/lo_LA/projects.lang index 03c11382a2d8b..eac0f41d321f1 100644 --- a/htdocs/langs/lo_LA/projects.lang +++ b/htdocs/langs/lo_LA/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/langs/lo_LA/stocks.lang b/htdocs/langs/lo_LA/stocks.lang index 29706d1761545..c2b432d7f9b93 100644 --- a/htdocs/langs/lo_LA/stocks.lang +++ b/htdocs/langs/lo_LA/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Cancel sending DeleteSending=Delete sending Stock=Stock Stocks=Stocks +StocksByLotSerial=Stock by lot/serial Movement=Movement Movements=Movements ErrorWarehouseRefRequired=Warehouse reference name is required @@ -78,6 +79,7 @@ IdWarehouse=Id warehouse DescWareHouse=Description warehouse LieuWareHouse=Localisation warehouse WarehousesAndProducts=Warehouses and products +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=Weighted average input price AverageUnitPricePMP=Weighted average input price SellPriceMin=Selling Unit Price @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/lo_LA/suppliers.lang b/htdocs/langs/lo_LA/suppliers.lang index d9de79fe84dbc..e0552c064e8ce 100644 --- a/htdocs/langs/lo_LA/suppliers.lang +++ b/htdocs/langs/lo_LA/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) +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/lo_LA/trips.lang b/htdocs/langs/lo_LA/trips.lang index ba36fc9b07b6a..76b214abdb77f 100644 --- a/htdocs/langs/lo_LA/trips.lang +++ b/htdocs/langs/lo_LA/trips.lang @@ -69,11 +69,9 @@ 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 @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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/accountancy.lang b/htdocs/langs/lt_LT/accountancy.lang index 9ca41bce1f951..b13d1aba60083 100644 --- a/htdocs/langs/lt_LT/accountancy.lang +++ b/htdocs/langs/lt_LT/accountancy.lang @@ -3,148 +3,148 @@ CHARSET=UTF-8 Accounting=Apskaita Globalparameters=Bendrieji parametrai -Chartofaccounts=Chart of accounts +Chartofaccounts=Sąskaitų planas Fiscalyear=Fiskaliniai metai Menuaccount=Apskaitos sąskaitos -Menuthirdpartyaccount=Thirdparty accounts +Menuthirdpartyaccount=Trečios šalies sąskaitos MenuTools=Įrankiai -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 +ConfigAccountingExpert=Apskaitos eksperto modulio konfigūracija +Journaux=Žurnalai +JournalFinancial=Finansiniai žurnalai +Exports=Eksportas +Export=Eksportas +Modelcsv=Eksporto modelis +OptionsDeactivatedForThisExportModel=Šiam eksporto modeliui opcijos išjungtos +Selectmodelcsv=Pasirinkite eksporto modelį +Modelcsv_normal=Klasikinis eksportas +Modelcsv_CEGID=Eksportas į CEGID ekspertą +BackToChartofaccounts=Grįžti į sąskaitų planą +Back=Grįžti + +Definechartofaccounts=Nustatyti sąskaitų planą +Selectchartofaccounts=Pasirinkite sąskaitų planą +Validate=Patvirtinti +Addanaccount=Pridėti apskaitos sąskaitą +AccountAccounting=Apskaitos sąskaita +Ventilation=Schema +ToDispatch=Išsiųsti +Dispatched=Išsiųsta + +CustomersVentilation=Schemos klientai +SuppliersVentilation=Schemos tiekėjai +TradeMargin=Prekybos marža +Reports=Ataskaitos +ByCustomerInvoice=Pagal sąskaitų-faktūrų klientus +ByMonth=Pagal mėnesį +NewAccount=Nauja apskaitos sąskaita +Update=Atnaujinimas +List=Sąrašas +Create=Sukurti +UpdateAccount=Apskaitos sąskaitos modifikavimas +UpdateMvts=Judėjimo modifikavimas +WriteBookKeeping=Įrašyti sąskaitas Didžiąją knygą +Bookkeeping=Didžioji knyga +AccountBalanceByMonth=Sąskaitos balansas pagal mėnesį + +AccountingVentilation=Aapskaitos schema +AccountingVentilationSupplier=Apskaitos tiekėjo schema +AccountingVentilationCustomer=Apskaitos kliento schema +Line=Eilutė + +CAHTF=Iš viso pirkimas iš tiekėjų HT +InvoiceLines=Sąskaitos eilutės, kurios turi būti apsvarstytos +InvoiceLinesDone=Svarstomos eilutės sąskaitoje-faktūroje +IntoAccount=Apskaitos sąskaitoje + +Ventilate=Svarstyti +VentilationAuto=Automatinis paskirstymas + +Processing=Apdorojimas +EndProcessing=Apdorojimo pabaiga +AnyLineVentilate=Bet kurios eilutės apsvarstymui +SelectedLines=Pasirinktos eilutės +Lineofinvoice=Sąskaitos-faktūros eilutė +VentilatedinAccount=Sėkmingai persvarstyta apskaitos sąskaitoje +NotVentilatedinAccount=Nepersvarstyta apskaitos sąskaitoje + +ACCOUNTING_SEPARATORCSV=Kolonėlės skyriklis eksporto faile 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 +AccountLength=Apskaitos sąskaitų, parodytų Dolibarr, ilgis 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_LENGTH_GACCOUNT=Bendrųjų sąskaitų ilgis +ACCOUNTING_LENGTH_AACCOUNT=Trečiųjų šalių sąskaitų ilgis -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=Pardavimų žurnalas +ACCOUNTING_PURCHASE_JOURNAL=Pirkimų žurnalas +ACCOUNTING_BANK_JOURNAL=Banko žurnalas +ACCOUNTING_CASH_JOURNAL=Pinigų žurnalas +ACCOUNTING_MISCELLANEOUS_JOURNAL=Įvairiarūšis žurnalas +ACCOUNTING_SOCIAL_JOURNAL=Socialinis žurnalas -ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Operacijų sąskaita +ACCOUNTING_ACCOUNT_SUSPENSE=Laukimo sąskaita 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 +Doctype=Dokumento tipas +Docdate=Data +Docref=Nuoroda +Numerocompte=Sąskaita +Code_tiers=Trečioji Šalis +Labelcompte=Sąskaitos etiketė +Debit=Debetas +Credit=Kreditas +Amount=Suma Sens=Sens -Codejournal=Journal +Codejournal=Žurnalas -DelBookKeeping=Delete the records of the general ledger +DelBookKeeping=Panaikinti Didžiosios knygos įrašus -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=Pardavimų žurnalas +PurchasesJournal=Pirkimų žurnalas +DescSellsJournal=Pardavimų žurnalas +DescPurchasesJournal=Pirkimų žurnalas +BankJournal=Banko žurnalas +DescBankJournal=Banko žurnale įtraukiami visų tipų mokėjimai, išskyrus grynais pinigais +CashJournal=Pinigų žurnalas +DescCashJournal=Pinigų žurnale įtraukiami mokėjimai grynaisiais pinigais -CashPayment=Cash Payment +CashPayment=Mokėjimai grynaisiais pinigais -SupplierInvoicePayment=Payment of invoice supplier -CustomerInvoicePayment=Payment of invoice customer +SupplierInvoicePayment=Tiekėjo sąskaitos-faktūros apmokėjimas +CustomerInvoicePayment=Kliento sąskaitos-faktūros apmokėjimas -ThirdPartyAccount=Thirdparty account +ThirdPartyAccount=Trečios šalies sąskaita -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=Naujas judėjimas +NumMvts=Judėjimų skaičius +ListeMvts=Judėjimų sąrašas +ErrorDebitCredit=Debetas ir Kreditas negali turėti reikšmę tuo pačiu metu, -ReportThirdParty=List thirdparty account +ReportThirdParty=Trečios šalies sąskaitų sąrašas DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts -ListAccounts=List of the accounting accounts +ListAccounts=Apskaitos sąskaitų sąrašas -Pcgversion=Version of the plan -Pcgtype=Class of account -Pcgsubtype=Under class of account -Accountparent=Root of the account -Active=Statement +Pcgversion=Plano versija +Pcgtype=Sąskaitų klasė +Pcgsubtype=Sąskaitų poklasis +Accountparent=Sąskaitos šaknys +Active=Ataskaita -NewFiscalYear=New fiscal year +NewFiscalYear=Nauji fiskaliniai metai DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers -TotalVente=Total turnover HT -TotalMarge=Total sales margin +TotalVente=Bendra apyvarta HT +TotalMarge=Iš viso pardavimų marža 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,8 +153,8 @@ 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=Patvirtinti automatiškai ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used -FicheVentilation=Breakdown card +FicheVentilation=Suskirstymo kortelė diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang index 9ab50d7e82a2b..2fb9ee1a3bd3d 100644 --- a/htdocs/langs/lt_LT/admin.lang +++ b/htdocs/langs/lt_LT/admin.lang @@ -8,11 +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 +FileCheck=Failų vientisumas +FilesMissing=Trūkstami failai +FilesUpdated=Atnaujinti failai +FileCheckDolibarr=Patikrinkite Dolibarr failų vientisumą +XmlNotFound=Dolibarr vientisumo XML failas nerastas SessionId=Sesijos ID SessionSaveHandler=Vedlys, sesijai išsaugoti SessionSavePath=Talpinimo sesijos lokalizavimas @@ -50,17 +50,17 @@ ErrorModuleRequireDolibarrVersion=Klaida, šiam moduliui reikalinga Dolibarr ver ErrorDecimalLargerThanAreForbidden=Klaida, tikslumas viršyjantis %s nėra palaikomas. DictionarySetup=Žodyno nustatymas Dictionary=Žodynai -Chartofaccounts=Chart of accounts -Fiscalyear=Fiscal years +Chartofaccounts=Sąskaitų schema +Fiscalyear=Fiskaliniai metai ErrorReservedTypeSystemSystemAuto=Vertės 'system' ir 'systemauto' yra rezervuotos šiam tipui. Galite naudoti 'user' vertę, jei norite įvesti savo įrašą ErrorCodeCantContainZero=Kode negali būti vertės 0 -DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) +DisableJavascript=Išjungti JavaScript ir Ajax funkcijas (Rekomenduojama aklam žmogui ar teksto naršyklėms) ConfirmAjax=Naudokite Ajax patvirtinimo langus 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. +UseSearchToSelectCompany=Naudokite Automatinį laukų užpildymą trečiųjų šalių pasirinkimui vietoje sąrašo laukelio naudojimo. ActivityStateToSelectCompany= Parodyti/paslėpti trečiasias šalis vykdančias ar nutraukusias veiklą, pridėkite filtro pasirinkimą 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). +UseSearchToSelectContact=Naudokite Automatinį laukų užpildymą kontakto pasirinkimui (vietoj sąrašas langelio naudojimo). 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=Paieškos filtrų nustatymai @@ -74,7 +74,7 @@ ShowPreview=Rodyti apžiūrą PreviewNotAvailable=Apžiūra negalima ThemeCurrentlyActive=Tema yra veikli CurrentTimeZone=Laiko juostos PHP (serveris) -MySQLTimeZone=TimeZone MySql (database) +MySQLTimeZone=TimeZone MySQL (duomenų bazės) 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=Erdvė Table=Lentelė @@ -115,7 +115,7 @@ CurrentValueSeparatorDecimal=Dešimtainis skyriklis CurrentValueSeparatorThousand=Tūkstančių skyriklis Destination=Paskirties vieta IdModule=Modulio ID -IdPermissions=Permissions ID +IdPermissions=Leidimų ID Modules=Moduliai ModulesCommon=Pagrindiniai moduliai ModulesOther=Kiti moduliai @@ -127,7 +127,7 @@ LanguageBrowserParameter=Parametro %-as LocalisationDolibarrParameters=Vietos parametrai ClientTZ=Kliento Laiko Juosta (vartotojas) ClientHour=Kliento laikas (vartotojas) -OSTZ=Server OS Time Zone +OSTZ=Serverio OS laiko zona PHPTZ=PHP serverio Laiko Juosta PHPServerOffsetWithGreenwich=PHP serverio nuokrypis nuo Grinvičo (sekundės) ClientOffsetWithGreenwich=Kliento/Brauzerio nuokrypis nuo Grinvičo (sekundės) @@ -142,7 +142,7 @@ Box=Dėžutė Boxes=Dėžutės MaxNbOfLinesForBoxes=Maks. eilučių skaičius dėžutėje PositionByDefault=Numatytoji paraiška -Position=Position +Position=Pozicija MenusDesc=Meniu tvarkytojas nustato 2 meniu juostelių turinį (horizonatalų ir vertikalų) MenusEditorDesc=Meniu redaktorius leidžia nustatyti asmeninius meniu įrašus. Naudoti atsargiai, nes dolibarr gali tapti nestabilus ir meniu punktai nepasiekiami.
Kai kurie moduliai prideda įrašų į meniu (meniu Visi daugeliu atvejų). Jeigu netyčia ištrynėte meniu įrašą, galite jį atstatyti išjungdami ir vėl įjungdami modulį. MenuForUsers=Vartotojų meniu @@ -227,7 +227,7 @@ AutomaticIfJavascriptDisabled=Automatiškai, jei Javascript yra išjungtas AvailableOnlyIfJavascriptNotDisabled=Galimas tik tuomet, kai JavaScript neišjungtas AvailableOnlyIfJavascriptAndAjaxNotDisabled=Galimas tik tuomet, kai JavaScript neišjungtas Required=Reikalingas -UsedOnlyWithTypeOption=Used by some agenda option only +UsedOnlyWithTypeOption=Naudojamas tik kai kuriose darbotvarkės opcijose Security=Saugumas Passwords=Slaptažodžiai DoNotStoreClearPassword=Nesaugokite aiškių slaptažodžių duomenų bazėje, laikykite tik užšifruotus (Activated recomended) @@ -246,9 +246,9 @@ OfficialWebSiteFr=Prancūzijos oficiali interneto svetainė OfficialWiki=Dolibarr dokumentai Wiki OfficialDemo=Dolibarr tiesioginis demo OfficialMarketPlace=Oficiali išorinių Modulių/papildinių parduotuvė -OfficialWebHostingService=Referenced web hosting services (Cloud hosting) -ReferencedPreferredPartners=Preferred Partners -OtherResources=Autres ressources +OfficialWebHostingService=Nurodomos Web prieglobos (hosting) paslaugos (Debesų priegloba (Cloud hosting)) +ReferencedPreferredPartners=Privilegijuoti partneriai +OtherResources=Kiti resursai ForDocumentationSeeWiki=Vartotojo arba kūrėjo dokumentacijos (doc, DUK ...)
ieškoti Dolibarr Wiki:
%s ForAnswersSeeForum=Dėl kitų klausimų/pagalbos galite kreiptis į Dolibarr forumą:
%s HelpCenterDesc1=Ši sritis gali padėti jums gauti Dolibarr Help žinyno palaikymo paslaugą @@ -268,9 +268,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS host (neapibrėžtas PH MAIN_MAIL_EMAIL_FROM=Siuntėjo el. paštas automatiniams laiškams (pagal nutylėjimą php.ini: %s) MAIN_MAIL_ERRORS_TO=Siuntėjo el. paštas naudojamas siunčiamų laiškų klaidų pranešimams MAIN_MAIL_AUTOCOPY_TO= Sistemingai siųsti visų išsiųstų laiškų paslėptas kopijas BCC į -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= Sistemingai siųsti pasiūlymų, išsiųstų el. paštu, kopijas +MAIN_MAIL_AUTOCOPY_ORDER_TO= Sistemingai siųsti užsakymų, išsiųstų el. paštu, kopijas +MAIN_MAIL_AUTOCOPY_INVOICE_TO= Sistemingai siųsti sąskaitų-faktūrų, išsiųstų el. paštu, kopijas MAIN_DISABLE_ALL_MAILS=Išjungti visus el. pašto siuntimus (bandymo ar demo tikslais) MAIN_MAIL_SENDMODE=El. pašto siuntimui naudoti metodą MAIN_MAIL_SMTPS_ID=SMTP ID, jei reikalingas autentiškumo patvirtinimas @@ -297,10 +297,11 @@ MenuHandlers=Meniu prižiūrėtojai MenuAdmin=Meniu redaktorius DoNotUseInProduction=Nenaudoti gamyboje ThisIsProcessToFollow=Tai yra nustatymo eiga: +ThisIsAlternativeProcessToFollow=Tai nustatymų procesui alternatyva: StepNb=Žingsnis %s FindPackageFromWebSite=Ieškoti paketo, kuris suteikia norimą funkciją (pavyzdžiui oficialioje interneto svetainėje %s). -DownloadPackageFromWebSite=Download package %s. -UnpackPackageInDolibarrRoot=Išpakuokite paketo failą į Dolibarr pagrindinį katalogą %s +DownloadPackageFromWebSite=Užkrauti paketą %s. +UnpackPackageInDolibarrRoot=Išpakuoti failą į katalogą, skirtą išoriniams moduliams: %s SetupIsReadyForUse=Diegimas baigtas ir Dolibarr yra paruoštas naudoti su šiuo nauju komponentu. NotExistsDirect=Alternatyvus pagrindinis katalogas nėra apibrėžtas.
InfDirAlt=Nuo 3 versijos galimanustatyti alternatyvų pagrindinį katalogą.Tai leis saugoti vienoje vietoje papildinius (plug-ins) ir vartotojo šablonus.
Tiesiog sukurkite katalogą Dolibarr pagrindiniame kataloge (pvz.: custom).
@@ -309,7 +310,7 @@ YouCanSubmitFile=Pasirinkite modulį: CurrentVersion=Dolibarr dabartinė versija CallUpdatePage=Eiti į puslapį, kuriame atnaujinamos duomenų bazės struktūra ir duomenys:%s. LastStableVersion=Paskutinė stabili versija -UpdateServerOffline=Update server offline +UpdateServerOffline=Atnaujinti serverį offline GenericMaskCodes=Galite įvesti bet kokį užmaskuotą numeravimą. Šiame maskavime naudojamos sekančios žymės:
{000000} atitinka skaičių, kuris bus padidinamas vienetu kiekvienam%s. Įveskite nulių iki pageidaujamo skaitiklio ilgio. Skaitiklis bus užpildomas nuliais iš kairės iki pilno skaitiklio ilgio.
{000000+000} toks kaip paskutinis, bet nuokrypis atitinkantis numerį dešinėje už + ženklo taikomas pradedant pirmu %s.
{000000@x} toks pat kaip ankstesnis, bet skaitiklis apnulinamas, kai pasiekiamas mėnuo x (x tarp 1 ir 12, arba naudojamas 0 pirmaisiais fiskalinių metų mėnesiais kaip aprašyta konfigūracijoje, arba 99 apnulinimui kiekvieną mėnesį). Jei ši opcija yra naudojama ir x yra 2 ar didesnis, tada seka {yy}{mm} arba {yyyy}{mm} taip pat reikalinga.
{dd} diena (nuo 01 iki 31).
{mm} mėnuo (nuo 01 iki 12).
{yy}, {yyyy} arba {y} metai, 2, 4 arba 1 skaitmenys.
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=Visi kiti simboliai maskuotėje išliks nepakitę.
Tarpai neleidžiami.
@@ -388,8 +389,8 @@ ExtrafieldSelectList = Pasirinkite iš lentelės ExtrafieldSeparator=Separatorius ExtrafieldCheckBox=Žymimasis langelis ("paukščiukas") ExtrafieldRadio=Opcijų mygtukai -ExtrafieldCheckBoxFromList= Checkbox from table -ExtrafieldLink=Link to an object +ExtrafieldCheckBoxFromList= Žymės langelis iš lentelės +ExtrafieldLink=Nuoroda į objektą, 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
... @@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parametrų sąrašas ateina iš lentelės
Sintaks 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=Biblioteka naudojama sukurti PDF WarningUsingFPDF=Įspėjimas: Jūsų conf.php yra ribojanti direktyva dolibarr_pdf_force_fpdf=1. Tai reiškia, kad jūs naudojate FPDF biblioteką PDF failų generavimui. Ši biblioteka yra sena ir nepalaiko daug funkcijų (Unicode, vaizdo skaidrumo, kirilicos, arabų ir Azijos kalbų, ...), todėl galite patirti klaidų generuojant PDF.
Norėdami išspręsti šią problemą ir turėti visapusišką palaikymą generuojant PDF, atsisiųskite TCPDF library , tada pažymėkite (comment) arba pašalinkite eilutę $dolibarr_pdf_force_fpdf=1 ir įdėkite vietoje jos $dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir' -LocalTaxDesc=Kai kurios šalys taiko 2 arba 3 mokesčius kiekvienai sąskaitos eilutei. Tokiu atveju pasirinkite 2-jo ir 3-jo mokesčio tipą ir jo tarifą. Galimi tipai yra:
1: vietinis mokestis taikomas produktams ir paslaugoms be PVM (PVM nėra taikomas vietiniams mokesčiams)
2: vietinis mokestis taikomas produktams ir paslaugoms iki PVM (PVM skaičiuojamas nuo sumos + vietinis mokestis)
3: vietos mokestis taikomas produktams be PVM (PVM nėra taikomas vietiniams mokesčiams)
4: vietos mokestis taikomas produktams iki PVM (PVM skaičiuojamas nuo sumos + vietinis mokestis)
5: vietos mokestis taikomas paslaugoms be PVM (PVM nėra taikomas vietiniams mokesčiams)
6: vietiniai mokesčiai taikomi paslaugoms iki PVM (PVM skaičiuojamas nuo sumos + vietiniai mokesčiai) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Įveskite telefono numerį, kuriuo skambinsite norėdami parodyti vartotojui nuorodą ClickToDial URL testavimui %s RefreshPhoneLink=Atnaujinti nuorodą @@ -449,8 +450,8 @@ Module52Name=Atsargos Module52Desc=Atsargų valdymas (produktai) Module53Name=Paslaugos Module53Desc=Paslaugų valdymas -Module54Name=Contracts/Subscriptions -Module54Desc=Management of contracts (services or reccuring subscriptions) +Module54Name=Sutartys / Abonentai +Module54Desc=Sutarčių valdymas (servisas arba periodinis abonementas) Module55Name=Brūkšniniai kodai Module55Desc=Brūkšninių kodų valdymas Module56Name=Telefonija @@ -487,46 +488,46 @@ Module320Name=RSS mechanizmas Module320Desc=Pridėti RSS mechanizmą Dolibarr ekrano puslapių viduje Module330Name=Žymekliai Module330Desc=Žymeklių valdymas -Module400Name=Projects/Opportunities/Leads +Module400Name=Projektai / Galimybės / Iniciatyvos 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=Web kalendorius Module410Desc=Web kalendoriaus integracija Module500Name=Specialiosios išlaidos (mokesčiai, socialinės įmokos, dividendai) 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 +Module510Desc=Darbuotojų darbo užmokesčio ir išmokų valdymas +Module520Name=Paskola +Module520Desc=Paskolų valdymas 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 +Module770Name=Išlaidų ataskaita +Module770Desc=Valdymo ir pretenzijų išlaidų ataskaitos (transportas, maistas, ...) +Module1120Name=Tiekėjo komercinis pasiūlymas +Module1120Desc=Prašyti tiekėjo komercinio pasiūlymo ir kainų Module1200Name=Mantis Module1200Desc=Mančio integracija Module1400Name=Apskaita Module1400Desc=Apskaitos valdymas (dvivietės šalys) -Module1520Name=Document Generation -Module1520Desc=Mass mail document generation -Module1780Name=Tags/Categories -Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members) +Module1520Name=Dokumento generavimas +Module1520Desc=Masinis pašto dokumentų generavimas +Module1780Name=Žymės / Kategorijos +Module1780Desc=Sukurti žymes/kategorijas (produktai, klientai, tiekėjai, kontaktai ar nariai) 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 +Module2200Name=Dinaminės kainos +Module2200Desc=Nustatyti matematinių išraiškų naudojimą kainose Module2300Name=Cron -Module2300Desc=Scheduled job management +Module2300Desc=Planinių darbų valdymas Module2400Name=Darbotvarkė Module2400Desc=Renginių/užduočių ir darbotvarkės valdymas Module2500Name=Elektroninis Turinio Valdymas Module2500Desc=Išsaugoti dokumentus ir dalintis jais Module2600Name=WebServices Module2600Desc=Įjungti Dolibarr interneto paslaugas serveryje -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 (kliento) +Module2650Desc=Nustatyti Dolibarr interneto paslaugų klientą (Gali būti naudojamas perkelti Duomenis / Prašymus į išorės serverius. Tiekėjo užsakymai palaikomi tik šiuo metu) Module2700Name=Gravatar Module2700Desc=Naudokite Gravatar interneto paslaugą (www.gravatar.com) kad parodyti nuotrauką vartotojams/nariams (surandami prie jų laiškų). Reikalinga interneto prieiga. Module2800Desc=FTP klientas @@ -538,18 +539,18 @@ Module5000Name=Multi įmonė Module5000Desc=Jums leidžiama valdyti kelias įmones Module6000Name=Darbo eiga Module6000Desc=Darbo eigos valdymas -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 +Module20000Name=Leidimų valdymas +Module20000Desc=Darbuotojų leidimai +Module39000Name=Prekių partija +Module39000Desc=Partija ar serijos numeris, produktų galiojimo ar pardavimo terminų valdymas Module50000Name=Paybox Module50000Desc=Modulis siūlo internetinio mokėjimo kreditine kortele per Paybox puslapį Module50100Name=Pardavimų taškas Module50100Desc=Pardavimų taško modulis Module50200Name=PayPal Module50200Desc=Modulis siūlo internetinio mokėjimo kreditine kortele per PayPal puslapį -Module50400Name=Accounting (advanced) -Module50400Desc=Accounting management (double parties) +Module50400Name=Apskaita (Išankstinė) +Module50400Desc=Apskaitos tvarkymas (sudvejintas) 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=Atidaryti apklausą @@ -558,8 +559,6 @@ Module59000Name=Paraštės Module59000Desc=Paraščių valdymo modulis Module60000Name=Komisiniai Module60000Desc=Komisinių valdymo modulis -Module150010Name=Partijos numeris, eat-by data ir sel-by data -Module150010Desc=Partijos numeris, produkto eat-by data ir sell-by data valdymas Permission11=Skaityti klientų sąskaitas Permission12=Sukurti/keisti klientų sąskaitas Permission13=Nepatvirtinti klientų sąskaitos @@ -589,7 +588,7 @@ Permission67=Eksportuoti intervencijas Permission71=Skaityti narius Permission72=Sukurti/keisti narius Permission74=Ištrinti narius -Permission75=Setup types of membership +Permission75=Narystės tipų nustatymas Permission76=Eksportuoti duomenis Permission78=Skaityti prenumeratas Permission79=Sukurti/pakeisti prenumeratas @@ -612,8 +611,8 @@ Permission106=Eksportuoti siuntinius Permission109=Ištrinti siuntinius Permission111=Skaityti finansines ataskaitas Permission112=Sukurti/keisti/trinti ir palyginti sandorius/transakcijas -Permission113=Setup financial accounts (create, manage categories) -Permission114=Reconciliate transactions +Permission113=Finansinių sąskaitų nustatymas (sukurti, valdyti kategorijas) +Permission114=Operacijų suderinimas Permission115=Eksportuoti sandorius/transakcijas ir sąskaitos išrašus Permission116=Pervedimai tarp sąskaitų Permission117=Valdyti čekių atlikimą/įvykdymą @@ -630,22 +629,22 @@ Permission151=Skaityti pastovius užsakymus Permission152=Sukurti/pakeisti pastovių uždsakymų prašymus Permission153=Pastovių užsakymų pajamų perdavimas Permission154=Pastovių užsakymų pajamų kreditas/atmetimas -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=Skaityti sutartis / pasirašymus +Permission162=Sukurti / keisti sutartis / pasirašymus +Permission163=Aktyvuoti sutarties aptarnavimą / pasirašymą +Permission164=Išjungti sutarties aptarnavimą / pasirašymą +Permission165=Panaikinti sutartis / pasirašymus +Permission171=Skaityti komandiruotes ir išlaidas (nuosavas ir subordinuotas) +Permission172=sukurti / keisti komandiruotes ir išlaidas +Permission173=Panaikinti komandiruotes ir išlaidas +Permission174=Skaityti visas keliones ir išlaidas +Permission178=Eksportuoti komandiruotes ir išlaidas Permission180=Skaityti tiekėjus 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=Order or cancel supplier orders +Permission185=Užsakyti arba nutraukti tiekėjo užsakymus Permission186=Gauti tiekėjo užsakymus Permission187=Uždaryti tiekėjo užsakymus Permission188=Nutraukti tiekėjo užsakymus @@ -696,7 +695,7 @@ Permission300=Skaityti brūkšninius kodus Permission301=Sukurti/keisti brūkšninius kodus Permission302=Ištrinti brūkšninius kodus Permission311=Skaityti paslaugas -Permission312=Assign service/subscription to contract +Permission312=Priskirti servisą / prenumeratą prie sutarties Permission331=Skaityti žymes Permission332=Sukurti/keisti žymes Permission333=Ištrinti žymes @@ -713,15 +712,15 @@ Permission401=Skaityti nuolaidas Permission402=Sukurti/keisti nuolaidas Permission403=Patvirtinti nuolaidas Permission404=Ištrinti nuolaidas -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 +Permission510=Skaityti atlyginimus +Permission512=Sukurti / redaguoti atlyginimus +Permission514=Ištrinti atlyginimus +Permission517=Eksportuoti atlyginimus +Permission520=Skaityti Paskolas +Permission522=Sukurti / redaguoti paskolas +Permission524=Ištrinti paskolas +Permission525=Paskolos skaičiuoklė +Permission527=Eksportuoti paskolas Permission531=Skaityti paslaugas Permission532=Sukurti/keisti paslaugas Permission534=Ištrinti paslaugas @@ -730,16 +729,16 @@ 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 +Permission771=Skaityti išlaidų ataskaitas (nuosavų ir subordinuotų) +Permission772=Sukurti / redaguoti išlaidų ataskaitas +Permission773=Ištrinti išlaidų ataskaitas +Permission774=Skaityti visas išlaidų ataskaitas (net nepalald-iam vartotojui) +Permission775=Patvirtinti išlaidų ataskaitas +Permission776=Mokamų išlaidų ataskaitos +Permission779=Eksportuoti išlaidų ataskaitas Permission1001=Skaityti atsargas -Permission1002=Create/modify warehouses -Permission1003=Delete warehouses +Permission1002=Sukurti / keisti sandėlius +Permission1003=Panaikinti sandėlius Permission1004=Skaityti atsargų judėjimą Permission1005=Sukurti/keisti atsargų judėjimą Permission1101=Skaityti pristatymo užsakymus @@ -754,7 +753,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 +Permission1190=Patvirtinti tiekėjo užsakymus (antrasis patvirtinimas) Permission1201=Gauti eksporto rezultatą Permission1202=Sukurti/keisti eksportą Permission1231=Skaityti tiekėjo sąskaitas-faktūras @@ -767,10 +766,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=Read Scheduled job -Permission23002=Create/update Scheduled job -Permission23003=Delete Scheduled job -Permission23004=Execute Scheduled job +Permission23001=Skaityti planinį darbą +Permission23002=sukurti / atnaujinti planinį darbą +Permission23003=Panaikinti planinį darbą +Permission23004=Vykdyti planinį darbą 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 @@ -791,7 +790,7 @@ Permission55001=Skaityti apklausas Permission55002=Sukurti/keisti apklausas Permission59001=Skaityti komercines maržas Permission59002=Apibrėžti komercines maržas -Permission59003=Read every user margin +Permission59003=Skaityti kiekvieną vartotojo maržą DictionaryCompanyType=Trečios šalies tipas DictionaryCompanyJuridicalType=Trečiųjų šalių juridinės rūšys DictionaryProspectLevel=Perspektyvinio plano potencialo lygis @@ -817,7 +816,7 @@ DictionaryOrderMethods=Užsakymų metodai DictionarySource=Pasiūlymų/užsakymų kilmė DictionaryAccountancyplan=Sąskaitų planas DictionaryAccountancysystem=Sąskaitų plano modeliai -DictionaryEMailTemplates=Emails templates +DictionaryEMailTemplates=El.pašto pranešimų šablonai SetupSaved=Nustatymai išsaugoti BackToModuleList=Atgal į modulių sąrašą BackToDictionaryList=Atgal į žodynų sąrašą @@ -828,7 +827,7 @@ VATIsNotUsedDesc=Pagal nutylėjimą siūloma PVM yra 0, kuris gali būti naudoja VATIsUsedExampleFR=Prancūzijoje, įmonėms ar organizacijoms, turinčioms realią fiskalinę sistemą (normalią arba supaprastintą), kurioje PVM yra deklaruojamas. VATIsNotUsedExampleFR=Prancūzijoje, asociacijos, kurios nedeklaruoja PVM, ar įmonės, organizacijos ar laisvųjų profesijų atstovai, kurie pasirinko mikro įmonės fiskalinę sistemą (frančizės PVM) ir mokamas franšizės PVM be PVM deklaravimo. Šis pasirinkimas bus rodomas sąskaitose-faktūrose: "Netaikoma PVM - CGI art-293B". ##### Local Taxes ##### -LTRate=Rate +LTRate=Norma LocalTax1IsUsed=Naudokite antrą mokestį LocalTax1IsNotUsed=Nenaudokite antro mokesčio LocalTax1IsUsedDesc=Naudokite antro tipo mokesčių (išskyrus PVM) @@ -853,13 +852,13 @@ LocalTax2IsUsedDescES= RE tarifas pagal nutylėjimą, kuriant planus, sąskaitas LocalTax2IsNotUsedDescES= Pagal nutylėjimą siūloma IRPF yra 0. Taisyklės pabaiga. LocalTax2IsUsedExampleES= Ispanijoje, laisvai samdomi ir nepriklausomi specialistai, kurie teikia paslaugas ir įmonės, kurios pasirinko modulių mokesčių sistemą. LocalTax2IsNotUsedExampleES= Ispanijoje jie yra verslas, kuriam netaikoma modulių mokesčių sistema. -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=Ataskaitos apie vietinius mokesčius +CalcLocaltax1=Pardavimai - Pirkimai +CalcLocaltax1Desc=Vietinių mokesčių ataskaitos apskaičiuojamas kaip skirtumas tarp pardavimo vietinių mokesčių ir pirkimo vietinių mokesčių +CalcLocaltax2=Pirkimai +CalcLocaltax2Desc=Vietinių mokesčių ataskaitos yra pirkimo vietinių mokesčių suma iš viso +CalcLocaltax3=Pardavimai +CalcLocaltax3Desc=Vietinių mokesčių ataskaitos yra pardavimo vietinių mokesčių suma iš viso LabelUsedByDefault=Etiketė naudojamas pagal nutylėjimą, jei kodui nerandamas vertimas LabelOnDocuments=Dokumentų etiketė NbOfDays=Dienų skaičius @@ -972,14 +971,14 @@ EventsSetup=Įvykių žurnalo nuostatos LogEvents=Saugumo audito įvykiai Audit=Auditas InfoDolibarr=Dolibarr informacija -InfoBrowser=Infos Browser +InfoBrowser=Informacijos Naršyklė InfoOS=Operacinės sistemos OS informacija InfoWebServer=Web serverio informacija InfoDatabase=Duomenų bazės informacija InfoPHP=PHP informacija InfoPerf=Informacijos charakteristikos -BrowserName=Browser name -BrowserOS=Browser OS +BrowserName=Naršyklės pavadinimas +BrowserOS=Naršyklės OS ListEvents=Audito įvykiai ListOfSecurityEvents=Dolibarr saugumo įvykių sąrašas SecurityEventsPurged=Saugumo įvykiai išvalyti @@ -1018,14 +1017,14 @@ NoEventOrNoAuditSetup=Dar nėra užfiksuotų saugumo įvykių. Tai yra normalu, NoEventFoundWithCriteria=Saugumo įvykių pagal užduotus paieškos kriterijus nerasta. SeeLocalSendMailSetup=Žiūrėti į vietinio el. pašto konfigūraciją BackupDesc=Norint padaryti pilną atsarginę Dolibarr kopiją, reikia: -BackupDesc2=* Išsaugoti dokumentų katalogo (%s) turinį, kuriame yra visi įkelti ir sugeneruoti failai (galite padaryti archyvą, pvz.: zip). -BackupDesc3=* Išsaugoti savo duomenų bazės turinį į sandėlio failą. Tam galite naudoti sekantį asistentą +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=Suarchyvuotas katalogas turi būti laikomas saugioje vietoje. BackupDescY=Sukurtas sandėlio failas turi būti laikomas saugioje vietoje. BackupPHPWarning=Atsarginės kopijos sukūrimas negarantuojamas naudojant šį metodą. Teikite pirmenybę ankstesniam metodui. RestoreDesc=Norėdami atkurti Dolibarr iš atsarginės kopijos, turite: -RestoreDesc2=* Atkurti dokumentų katalogo archyvo failą ir failų medį (pvz.:zip), atliekant naują Dolibarr diegimą arba į šios dabartinės Dolibarr programos dokumentų katalogą (%s). -RestoreDesc3=* Atkurti duomenis iš atsarginės kopijos failo į naujai įdiegtos Dolibarr duomenų bazę arba į šios dabartinės Dolibarr duomenų bazę. ĮSPĖJIMAS, kai atkūrimas bus baigtas, jūs turite prisijungti iš naujo su vartotojo vardu/slaptažodžiu, kurie egzistavo, kai buvo sukurta atsarginė kopija. Norėdami atkurti atsarginę duomenų bazę į šią dabartinę programą, jūs galite vadovautis šiuo asistentu. +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 duomenų importas ForcedToByAModule= Ši taisyklė yra priverstinė %s pagal aktyvuotą modulį PreviousDumpFiles=Yra duomenų bazės atsarginės kopijos failai @@ -1052,8 +1051,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) +ExtraFieldsSupplierOrdersLines=Papildomos savybės (užsakymo eilutės) +ExtraFieldsSupplierInvoicesLines=Papildomos savybės (sąskaitos-faktūros eilutės) ExtraFieldsThirdParties=Papildomi požymiai (trečiosios šalys) ExtraFieldsContacts=Papildomi požymiai (kontaktas/adresas) ExtraFieldsMember=Papildomi požymiai (narys) @@ -1064,7 +1063,7 @@ ExtraFieldsSupplierOrders=Papildomi požymiai (užsakymai) ExtraFieldsSupplierInvoices=Papildomi požymiai (sąskaitos-faktūros) ExtraFieldsProject=Papildomi požymiai (projektai) ExtraFieldsProjectTask=Papildomi požymiai (užduotys) -ExtraFieldHasWrongValue=Attribute %s has a wrong value. +ExtraFieldHasWrongValue=Požymis %s turi klaidingą reikšmę. AlphaNumOnlyCharsAndNoSpace=Tik raidiniai skaitmeniniai simboliai be tarpų AlphaNumOnlyLowerCharsAndNoSpace=Tik raidiniai-skaitmeniniai simboliai, mažosiomis raidėmis, be tarpų SendingMailSetup=El. pašto siuntinių nuostatos @@ -1082,13 +1081,13 @@ OnlyFollowingModulesAreOpenedToExternalUsers=Atkreipkite dėmesį, kad tik šie SuhosinSessionEncrypt=Sesijų saugykla užšifruota Suhosin ConditionIsCurrently=Dabartinė būklė yra %s YouUseBestDriver=Jūs naudojate tvarkyklę %s, kuri yra geriausia tvarkyklė prieinama šiuo metu. -YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. +YouDoNotUseBestDriver=Jūs naudojate diską %s, bet rekomenduojama tvarkyklė (driver) %s. NbOfProductIsLowerThanNoPb=Turite tik %s produktus/paslaugas duomenų bazėje. Tam nereikia jokio ypatingo optimizavimo. SearchOptim=Paieškos optimizavimas YouHaveXProductUseSearchOptim=Jūs turite %s produktą duomenų bazėje. Jums reikia pridėti konstantą PRODUCT_DONOTSEARCH_ANYWHERE prie 1 į Pagrindinis-Nustatymai-Kiti. Jūs apribojate paiešką eilutės pradžia ir nustatote galimybę duomenų bazėjė naudoti indeksą ir jūs turėtumėte gauti greitesnius atsakymus į paieškos užklausas. BrowserIsOK=Jūs naudojate interneto naršyklę %s. Ši naršyklė yra gera saugumo ir charakteristikų požiūriu. BrowserIsKO=Jūs naudojate interneto naršyklę %s. Ši naršyklė yra žinoma, kaip blogas pasirinkimas saugumo, charakteristikų ir patikimumo požiūriu. Mes recommanduojame Jums Firefox, Chrome, Opera ar Safari. -XDebugInstalled=XDebug is loaded. +XDebugInstalled=XDebug yraužkrautas. XCacheInstalled=Xcache yra įkelta. 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=Lauko %s redagavimas @@ -1120,7 +1119,7 @@ NotificationsDesc=EMails notifications feature allows you to silently send autom ModelModules=Dokumentų šablonai DocumentModelOdt=Sukurti dokumentus pagal OpenDocuments šablonus (.ODT arba .OAM failus OpenOffice, KOffice, TextEdit, ...) WatermarkOnDraft=Vandens ženklas ant dokumento projekto -JSOnPaimentBill=Activate feature to autofill payment lines on payment form +JSOnPaimentBill=Aktyvuoti automatinio mokėjimo eilučių užpildymo mokėjimo formoje funkciją CompanyIdProfChecker=Profesionalių IDS taisyklės MustBeUnique=Turi būti unikalus? MustBeMandatory=Privaloma sukurti trečiąsias šalis ? @@ -1180,24 +1179,24 @@ AddDeliveryAddressAbility=Pridėti galimą pristatymo datą UseOptionLineIfNoQuantity=Produkto/paslaugos linija su nuline suma yra laikoma galima opcija 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 +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Klausti pasiūlyme esančios banko sąskaitos paskirties ##### 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=Tiekėjų modulyje kainos prašymo nustatymas +AskPriceSupplierNumberingModules=Tiekėjų modulyje kainos prašymų numeracijos modeliai +AskPriceSupplierPDFModules=Tiekėjų modulyje kainos prašymų dokumentų modeliai +FreeLegalTextOnAskPriceSupplier=Laisvas tekstas kainos prašymuose +WatermarkOnDraftAskPriceSupplier=Vandens ženklas ant kainų prašymų tiekėjų (nėra jei tuščias) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Klausti banko sąskaitos paskirties ant kainos užklausos ##### Orders ##### OrdersSetup=Užsakymų valdymo nuostatos OrdersNumberingModules=Užsakymų numeracijos modeliai OrdersModelModule=Užsakymo dokumentų modeliai -HideTreadedOrders=Hide the treated or cancelled orders in the list +HideTreadedOrders=Paslėpti sąraše apdorotus ar nutrauktus užsakymus ValidOrderAfterPropalClosed=Patvirtinti užsakymą, kuriam komercinis pasiūlymas jau pasibaigęs, leidžia be laikino užsakymo. FreeLegalTextOnOrders=Laisvas tekstas užsakymuose WatermarkOnDraftOrders=Vandens ženklas užsakymų projektuose (nėra, jei lapas tuščias) -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 +ShippableOrderIconInList=Pridėti piktogramą į Užsakymų sąrašą, kuri nurodo, ar užsakymas yra tinkamas siuntimui +BANK_ASK_PAYMENT_BANK_DURING_ORDER=Klausti užsakyme esančios banko sąskaitos paskirties ##### Clicktodial ##### ClickToDialSetup=Click To Dial modulio nuostatos ClickToDialUrlDesc=Paspaudus telefono piktogramą kviečiamas URL. Galima naudoti žymes
__PHONETO__, tam, kad pakeisti asmens, kuriam skambinama, telefono numeriu
__PHONEFROM__, tam, kad pakeisti asmens, kuris skambina, telefono numeriu (Jūsų)
__LOGIN__, tam, kad pakeisti Jūsų ClickToDial prisijungimo vardu (nustatytu vartotojo kortelėje)
__PASS__, tam, kad pakeisti Jūsų ClickToDial slaptažodį (nustatytą vartotojo kortelėje). @@ -1210,7 +1209,7 @@ FicheinterNumberingModules=Intervencijų numeracijos modeliai TemplatePDFInterventions=Intervencija kortelių dokumentų modeliai WatermarkOnDraftInterventionCards=Vandens ženklas ant intervencijų kortelės dokumentų (nėra, jei lapas tuščias) ##### Contracts ##### -ContractsSetup=Contracts/Subscriptions module setup +ContractsSetup=Sutarčių / abonentų modulio nustatymai ContractsNumberingModules=Sutarčių numeracijos moduliai TemplatePDFContracts=Sutarčių dokumentų modeliai FreeLegalTextOnContracts=Laisvas tekstas sutartyse @@ -1291,7 +1290,7 @@ LDAPTCPConnectOK=TCP prisijungimas prie LDAP serverio sėkmingas (Server=%s, Por LDAPTCPConnectKO=TCP prisijungimas prie LDAP serverio nepavyko (Server=%s, Port=%s) LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s) LDAPBindKO=Prisijungimas/Patvirtinimas prie LDAP serverio nepavyko (Server=%s, Port=%s, Admin=%s, Password=%s) -LDAPUnbindSuccessfull=Disconnect successful +LDAPUnbindSuccessfull=Atsijungimas sėkmingas LDAPUnbindFailed=Atsijungimas nepavyko LDAPConnectToDNSuccessfull=Prisijungimas prie DN (%s) sėkmingas LDAPConnectToDNFailed=Prisijungimas prie DN (%s) nepavyko @@ -1337,6 +1336,8 @@ LDAPFieldCountry=Šalis LDAPFieldCountryExample=Pavyzdys: c LDAPFieldDescription=Aprašymas LDAPFieldDescriptionExample=Pavyzdys: description +LDAPFieldNotePublic=Viešas pranešimas +LDAPFieldNotePublicExample=Pavyzdys: publicnote LDAPFieldGroupMembers= Grupės nariai LDAPFieldGroupMembersExample= Pavyzdys: uniqueMember LDAPFieldBirthdate=Gimimo data @@ -1348,7 +1349,7 @@ LDAPFieldSidExample=Pavyzdys: objectsid LDAPFieldEndLastSubscription=Prenumeratos pabaigos data LDAPFieldTitle=Pareigos/Funkcijos LDAPFieldTitleExample=Pavyzdys: title -LDAPParametersAreStillHardCoded=LDAP parameters are still hardcoded (in contact class) +LDAPParametersAreStillHardCoded=LDAP parametrai vis dar kietai užkoduoti (kontaktų klasėje) LDAPSetupNotComplete=LDAP nuostatos nėra pilnos (eiti prie kitų laukelių) LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Nėra pateiktas administratorius arba slaptažodžis. LDAP prieiga bus anoniminė ir tik skaitymo režimu. LDAPDescContact=Šis puslapis leidžia Jums nustatyti LDAP atributų vardą LDAP medyje kiekvienam iš duomenų rastam Dolibarr adresatų sąraše. @@ -1374,7 +1375,7 @@ FilesOfTypeNotCompressed=%s tipo failai nėra suspausti HTTP serveryje CacheByServer=Laikoma serverio atmintyje CacheByClient=Laikoma naršyklės atmintyje CompressionOfResources=HTTP atsakymų suspaudimas -TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers +TestNotPossibleWithCurrentBrowsers=Toks automatinis aptikimas negalimas su naudojama naršykle ##### Products ##### ProductSetup=Produktų modulio nuostatos ServiceSetup=Paslaugų modulio nuostatos @@ -1385,7 +1386,7 @@ ModifyProductDescAbility=Produkto aprašymų formose personalizavimas ViewProductDescInFormAbility=Produktų aprašymų vizualizavimas formose (kitu būdu per "iššokantį" langą) ViewProductDescInThirdpartyLanguageAbility=Produktų aprašymų vizualizavimas trečios šalies kalba 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). +UseSearchToSelectProduct=Naudokite paieškos formą norint pasirinkti produktą (o ne iškrentantį sąrašą). UseEcoTaxeAbility=Palaikyti Eco-Taxe (WEEE) SetDefaultBarcodeTypeProducts=Brūkšninio kodo tipas produktams pagal nutylėjimą SetDefaultBarcodeTypeThirdParties=Brūkšninio kodo tipas trečiosioms šalims pagal nutylėjimą @@ -1433,19 +1434,19 @@ RSSUrlExample=Įdomus RSS feed MailingSetup=E-pašto modulio nuostatos MailingEMailFrom=Siuntėjo e-paštas (nuo) e-laiškams, siunčiamiems per e-pašto modulį MailingEMailError=Grąžinamas e-paštas (Errors-to) klaidingiems e-laiškams -MailingDelay=Seconds to wait after sending next message +MailingDelay=Keletą sekundžių palaukti po sekančio pranešimo išsiuntimo ##### Notification ##### -NotificationSetup=EMail notification module setup +NotificationSetup=Email pranešimų modulio nustatymas NotificationEMailFrom=Siuntėjo e-paštas (nuo) e-laiškams siunčiamiems perspėjimams 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 +FixedEmailTarget=Fiksuota el. pašto užduotis ##### Sendings ##### SendingsSetup=Siuntimo modulio nuostatos SendingsReceiptModel=Įplaukų siuntimo modelis SendingsNumberingModules=Siuntinių numeravimo modulis -SendingsAbility=Support shipment sheets for customer deliveries +SendingsAbility=Palaikyti siutų dokumentus klientų pristatymams NoNeedForDeliveryReceipts=Daugeliu atvejų, siuntinių kvitai naudojami tiek pristatymo klientams žiniaraščiams (produktų sąrašas siuntimui), tiek gaunamiems žiniaraščiams pasirašytiems klientų. Taigi produkto pristatymo kvitai yra dubliuojanti funkcija ir retai aktyvuota. -FreeLegalTextOnShippings=Free text on shipments +FreeLegalTextOnShippings=Laisvas tekstas siuntų dokumentuose ##### Deliveries ##### DeliveryOrderNumberingModules=Produktų pristatymo kvitų numeravimo modulis DeliveryOrderModel=Produktų pristatymo kvito modelis @@ -1466,8 +1467,8 @@ OSCommerceTestOk=Prisijungimas prie serverio '%s' duomenų bazėje "%s" su varto OSCommerceTestKo1=Prisijungimas prie serverio '%s' pavyko, bet duomenų bazė "%s" nepasiekiama. OSCommerceTestKo2=Prisijungimas prie serverio '%s' su vartotoju '%s' nepavyko. ##### Stock ##### -StockSetup=Warehouse module setup -UserWarehouse=Use user personal warehouses +StockSetup=Sandėlio modulio nustatymai +UserWarehouse=Naudokite vartotojo asmeninį sandėlį 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=Meniu ištrintas @@ -1503,11 +1504,11 @@ ConfirmDeleteLine=Ar tikrai norite ištrinti šią eilutę? ##### Tax ##### TaxSetup=Mokesčių, socialinio draudimo išmokų ir dividendų modulio nustatymai OptionVatMode=Mokėtinas PVM -OptionVATDefault=Cash basis -OptionVATDebitOption=Accrual basis +OptionVATDefault=Grynųjų pinigų principas +OptionVATDebitOption=Kaupimo principas OptionVatDefaultDesc=PVM atsiranda:
- prekėms - nuo pristatymo (mes naudojame sąskaitos-faktūros datą)
- paslaugoms - nuo apmokėjimo OptionVatDebitOptionDesc=PVM atsiranda:
- prekėms - nuo pristatymo (mes naudojame sąskaito-faktūros datą)
- paslaugoms - nuo sąskaitos-fakrtūros datos -SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option: +SummaryOfVatExigibilityUsedByDefault=Laikas PVM išieškojimui pagal nutylėjimą pagal pasirinktą variantą: OnDelivery=Pristatymo metu OnPayment=Apmokėjimo metu OnInvoice=Sąskaitos-faktūros pateikimo metu @@ -1525,23 +1526,23 @@ AgendaSetup=Įvykių ir operacijų modulio nustatymas PasswordTogetVCalExport=Eksporto sąsajos leidimo mygtukas PastDelayVCalExport=Neeksportuoti įvykių senesnių nei 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_DEFAULT_FILTER_TYPE=Nustatyti automatiškai šio įvykio tipą paieškos filtrui darbotvarkėje +AGENDA_DEFAULT_FILTER_STATUS=Nustatyti automatiškai šio įvykio būklę paieškos filtrui darbotvarkėje +AGENDA_DEFAULT_VIEW=Kurią kortelę norite atidaryti pagal nutylėjimą renkantis meniu Darbotvarkė ##### ClickToDial ##### ClickToDialDesc=Šis modulis leidžia pridėti ikoną už telefono numerio. Šios ikonos paspaudimas leis kreiptis į serverį su konkrečiu URL adresu Jūsų aprašytu žemiau. Tai gali būti naudojama pvz.: skambinti iš Dolibarr į skambučių centro sistemą, kad paskambinti telefono numeriu per SIP sistemą. ##### Point Of Sales (CashDesk) ##### CashDesk=Pardavimų taškas CashDeskSetup=Pardavimų taško modulio nustatymas -CashDeskThirdPartyForSell=Default generic third party to use for sells +CashDeskThirdPartyForSell=Bendras pagal nutylėjimą trečiajai šaliai naudoti pardavimams 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 (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. +CashDeskIdWareHouse=Sulaikyti ir apriboti sandėlio naudojimą atsargų sumažėjimui +StockDecreaseForPointOfSaleDisabled=Atsargų sumažėjimas Pardavimo taške (Point of Sale) išjungtas +StockDecreaseForPointOfSaleDisabledbyBatch=Atsargų sumažėjimas POS nesuderinamas su partijos valdymu +CashDeskYouDidNotDisableStockDecease=Jūs neišjungiate atsargų sumažėjimo parduodami Pardavimo taške (Point of Sale). Taigi reikalingas sandėlis. ##### Bookmark ##### BookmarkSetup=Žymeklių modulio nustatymas BookmarkDesc=Šis modulis leidžia valdyti žymeklius. Taip pat galite pridėti trumpąsias nuorodas į bet kurį Dolibarr puslapį ar išorinį web tinklalapį Jūsų kairiajame meniu. @@ -1584,35 +1585,40 @@ TaskModelModule=Užduočių ataskaitų dokumento modelis ECMSetup = GED nustatymas ECMAutoTree = Automatinis medžio aplankas ir dokumentas ##### 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 +FiscalYears=Fiskaliniai metai +FiscalYear=Fiskaliniai metai +FiscalYearCard=Fiskalinių metų kortelė +NewFiscalYear=Nauji fiskaliniai metai +EditFiscalYear=Redaguoti fiskalinius metus +OpenFiscalYear=Atidaryti fiskalinius metus +CloseFiscalYear=Uždaryti fiskalinius metus +DeleteFiscalYear=Panaikinti fiskalinius metus +ConfirmDeleteFiscalYear=Ar tikrai panaikinti šiuos fiskalinius metus ? +Opened=Atidaryta +Closed=Uždaryta +AlwaysEditable=Visada gali būti redaguojama +MAIN_APPLICATION_TITLE=Taikyti matomą aplikacijos vardą (įspėjimas: Jūsų nuosavo vardo nustatymas gali nutraukti automatinio prisijungimo funkciją naudojant DoliDroid mobiliąją aplikaciją) +NbMajMin=Minimalus didžiųjų simbolių skaičius +NbNumMin=Minimalus skaitmeninių simbolių skaičius +NbSpeMin=Minimalus specialiųjų simbolių skaičius +NbIteConsecutive=Maksimalus pasikartojančių simbolių skaičius +NoAmbiCaracAutoGeneration=Nenaudokite dviprasmiškų simbolių ("1", "L", "aš", "|", "0", "O") automatinei generacijai +SalariesSetup=Atlyginimų modulio nustatymai +SortOrder=Rūšiavimo tvarka +Format=Forma, pobūdis +TypePaymentDesc=0: Kliento mokėjimo tipas, 1: Tiekėjo mokėjimo tipas, 2: Abiejų kliento ir tiekėjo mokėjimo tipas +IncludePath=Įtraukti kelią (kaip apibrėžta kintamojo %s) +ExpenseReportsSetup=Išlaidų ataskaitų modulio nustatymai +TemplatePDFExpenseReports=Šablonai Išlaidų ataskaitų generavimui 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 +ListOfNotificationsPerContact=Pranešimų kontaktui sąrašas* +ListOfFixedNotifications=Fiksuotų pranešimų sąrašas GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses -Threshold=Threshold +Threshold=Slenkstis +BackupDumpWizard=Duomenų bazės atsarginės kopijos failo kūrimo vedlys +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" diff --git a/htdocs/langs/lt_LT/agenda.lang b/htdocs/langs/lt_LT/agenda.lang index 53d5804edd27c..1de038b38be7a 100644 --- a/htdocs/langs/lt_LT/agenda.lang +++ b/htdocs/langs/lt_LT/agenda.lang @@ -49,9 +49,9 @@ 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 -OrderDeliveredInDolibarr=Order %s classified delivered +OrderDeliveredInDolibarr=Užsakymas %s klasifikuojamas kaip pristatytas OrderCanceledInDolibarr=Užsakymas %s atšauktas -OrderBilledInDolibarr=Order %s classified billed +OrderBilledInDolibarr=Užsakymas %s klasifikuojamas kaip su išrašyta sąskaita-faktūra OrderApprovedInDolibarr=Užsakymas %s patvirtintas OrderRefusedInDolibarr=Užsakymas %s atmestas OrderBackToDraftInDolibarr=Užsakymas %s grąžintas į projektinę būklę @@ -94,5 +94,5 @@ WorkingTimeRange=Darbo laiko sritis WorkingDaysRange=Darbo dienų sritis AddEvent=Sukurti įvykį MyAvailability=Mano eksploatacinė parengtis -ActionType=Event type -DateActionBegin=Start event date +ActionType=Įvykio tipas +DateActionBegin=Pradėti įvykio datą diff --git a/htdocs/langs/lt_LT/banks.lang b/htdocs/langs/lt_LT/banks.lang index d471ea6ac55b8..beeeaa90f1d76 100644 --- a/htdocs/langs/lt_LT/banks.lang +++ b/htdocs/langs/lt_LT/banks.lang @@ -8,7 +8,7 @@ FinancialAccount=Sąskaita FinancialAccounts=Sąskaitos BankAccount=Banko sąskaita BankAccounts=Banko sąskaitos -ShowAccount=Show Account +ShowAccount=Rodyti sąskaitą AccountRef=Finansinės sąskaitos nuoroda AccountLabel=Finansinės sąskaitos etiketė CashAccount=Grynųjų pinigų sąskaita @@ -33,11 +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 +IbanValid=IBAN galiojantis +IbanNotValid=IBAN negalioja BIC=BIC/SWIFT numeris -SwiftValid=BIC/SWIFT is Valid -SwiftNotValid=BIC/SWIFT is Not Valid +SwiftValid=BIC / SWIFT galiojantis +SwiftNotValid=BIC / SWIFT negalioja StandingOrders=Pastovūs užsakymai StandingOrder=Pastovus užsakymas Withdrawals=Išėmimai @@ -138,7 +138,7 @@ CashBudget=Grynųjų pinigų biudžetas PlannedTransactions=Planuotos operacijos Graph=Grafika ExportDataset_banque_1=Banko operacijos ir sąskaitos suvestinė -ExportDataset_banque_2=Deposit slip +ExportDataset_banque_2=Įmokos kvitas TransactionOnTheOtherAccount=Operacijos kitoje sąskaitoje TransactionWithOtherAccount=Sąskaitos pervedimas PaymentNumberUpdateSucceeded=Mokėjimo numeris atnaujintas sėkmingai @@ -152,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=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD +InputReceiptNumber=Pasirinkti banko ataskaitą, susijusią su taikymu. Naudokite rūšiuojamą skaitmeninę reikšmę: YYYYMM arba YYYYMMDD EventualyAddCategory=Nurodyti kategoriją, kurioje klasifikuoti įrašus ToConciliate=Taikyti ? ThenCheckLinesAndConciliate=Tada patikrinkite linijas, esančias banko suvestinėje ir paspauskite @@ -163,3 +163,5 @@ LabelRIB=BAN etiketė NoBANRecord=Nėra BAN įrašų DeleteARib=Ištrinti BAN įrašą ConfirmDeleteRib=Ar tikrai norite ištrinti šį BAN įrašą? +StartDate=Pradžios data +EndDate=Pabaigos data diff --git a/htdocs/langs/lt_LT/boxes.lang b/htdocs/langs/lt_LT/boxes.lang index 0596d677c46ad..d8e71dae52c99 100644 --- a/htdocs/langs/lt_LT/boxes.lang +++ b/htdocs/langs/lt_LT/boxes.lang @@ -1,91 +1,97 @@ # 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 -# 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 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 -# BoxTitleLastCustomerBills=Last %s customer's invoices -# BoxTitleLastSupplierBills=Last %s supplier's invoices -# BoxTitleLastProspects=Last %s recorded prospects -# BoxTitleLastModifiedProspects=Last %s modified prospects -# BoxTitleLastProductsInContract=Last %s products/services in a contract -# BoxTitleLastModifiedMembers=Last %s modified members -# BoxTitleLastFicheInter=Last %s modified intervention -# BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer's invoices -# BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier's invoices -# BoxTitleCurrentAccounts=Opened account's balances -# BoxTitleSalesTurnover=Sales turnover -# BoxTitleTotalUnpaidCustomerBills=Unpaid customer's invoices -# BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier's 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=%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 -# ForCustomersInvoices=Customers invoices -# ForCustomersOrders=Customers orders -# ForProposals=Proposals +BoxLastRssInfos=Rss informacija +BoxLastProducts=Paskutiniai %s produktai/paslaugos +BoxProductsAlertStock=Atsargų sandėlyje parengti produktai +BoxLastProductsInContract=Paskutiniai %s rezervuoti produktai/paslaugos +BoxLastSupplierBills=Paskutines tiekėjo sąskaitos-faktūros +BoxLastCustomerBills=Paskutinės kliento sąskaitos-faktūros +BoxOldestUnpaidCustomerBills=Seniausios neapmokėtos kliento sąskaitos-faktūros +BoxOldestUnpaidSupplierBills=Seniausios neapmokėtos tiekėjo sąskaitos-faktūros +BoxLastProposals=Paskutiniai komerciniai pasiūlymai +BoxLastProspects=Paskutiniai modifikuoti planai +BoxLastCustomers=Paskutiniai modifikuoti klientai +BoxLastSuppliers=Paskutiniai modifikuoti tiekėjai +BoxLastCustomerOrders=Paskutiniai kliento užsakymai +BoxLastValidatedCustomerOrders=Paskutiniai patvirtinti kliento užsakymai +BoxLastBooks=Paskutinės knygos +BoxLastActions=Paskutiniai veiksmai +BoxLastContracts=Paskutinės sutartys +BoxLastContacts=Paskutiniai kontaktai/adresai +BoxLastMembers=Paskutiniai nariai +BoxFicheInter=Paskutinės intervencijos +BoxCurrentAccounts=Atidarytų sąskaitų balansas +BoxSalesTurnover=Pardavimų apyvarta +BoxTotalUnpaidCustomerBills=Visos nesumokėtos kliento sąskaitos-faktūros +BoxTotalUnpaidSuppliersBills=Visos nesumokėtos tiekėjo sąskaitos-faktūros +BoxTitleLastBooks=Paskutinės %s įrašytos knygos +BoxTitleNbOfCustomers=Klientų skaičius +BoxTitleLastRssInfos=Paskutinės %s naujienos iš %s +BoxTitleLastProducts=Paskutiniai %s modifikuoti produktai/paslaugos +BoxTitleProductsAlertStock=Atsargų sandėlyje paruošti produktai +BoxTitleLastCustomerOrders=Paskutiniai %s kliento užsakymai +BoxTitleLastModifiedCustomerOrders=Paskutiniai %s modifikuoti kliento užsakymai +BoxTitleLastSuppliers=Paskutiniai %s įrašyti tiekėjai +BoxTitleLastCustomers=Paskutiniai %s įregistruoti klientai +BoxTitleLastModifiedSuppliers=Paskutiniai %s modifikuoti tiekėjai +BoxTitleLastModifiedCustomers=Paskutiniai %s modifikuoti klientai +BoxTitleLastCustomersOrProspects=Paskutiniai %s klientai ir prospektai +BoxTitleLastPropals=Paskutiniai %s pasiūlymai +BoxTitleLastModifiedPropals=Paskutiniai %s modifikuoti pasiūlymai +BoxTitleLastCustomerBills=Paskutinės %s kliento sąskaitos-faktūros +BoxTitleLastModifiedCustomerBills=Paskutinės %s modifikuotos kliento sąskaitos-faktūros +BoxTitleLastSupplierBills=Paskutinės %s tiekėjo sąskaitos-faktūras +BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices +BoxTitleLastModifiedProspects=Paskutiniai %s modifikuoti planai +BoxTitleLastProductsInContract=Paskutiniai %s produktai/paslaugos sutartyse +BoxTitleLastModifiedMembers=Paskutiniai %s nariai +BoxTitleLastFicheInter=Paskutinės %s pakeistos intervencijos +BoxTitleOldestUnpaidCustomerBills=Seniausios %s neapmokėtos kliento sąskaitos +BoxTitleOldestUnpaidSupplierBills=Seniausios %s neapmokėtos tiekėjo sąskaitos +BoxTitleCurrentAccounts=Atidarytų sąskaitų balansas +BoxTitleSalesTurnover=Pardavimų apyvarta +BoxTitleTotalUnpaidCustomerBills=Neapmokėtos kliento sąskaitos +BoxTitleTotalUnpaidSuppliersBills=Neapmokėtos tiekėjo sąskaitos +BoxTitleLastModifiedContacts=Paskutiniai %s pakeisti kontaktai/adresai +BoxMyLastBookmarks=Mano paskutiniai %s žymekliai +BoxOldestExpiredServices=Seniausios aktyvios pasibaigusios paslaugos +BoxLastExpiredServices=Paskutiniai %s seniausi adresatai su aktyviomis pasibaigusiomis paslaugomis +BoxTitleLastActionsToDo=Paskutiniai %s veiksmai, kuriuos reikia padaryti +BoxTitleLastContracts=Paskutinės %s sutartys +BoxTitleLastModifiedDonations=Paskutinės %s pakeistos aukos +BoxTitleLastModifiedExpenses=Paskutinės %s pakeistos išlaidos +BoxGlobalActivity=Visuminė veikla (sąskaitos-faktūros, pasiūlymai, užsakymai) +FailedToRefreshDataInfoNotUpToDate=Nepavyko atnaujinti RSS srauto. Paskutinio sėkmingo atnaujinimo data: %s +LastRefreshDate=Paskutinio atnaujinimo data +NoRecordedBookmarks=Nėra apibrėžtų žymeklių +ClickToAdd=Spauskite čia, norėdami pridėti. +NoRecordedCustomers=Nėra įrašytų klientų +NoRecordedContacts=Nėra įrašytų adresatų +NoActionsToDo=Nėra veiksmų, kuriuos reikia padaryti +NoRecordedOrders=Nėra įrašytų kliento užsakymų +NoRecordedProposals=Nėra įrašytų pasiūlymų +NoRecordedInvoices=Nėra įrašytų kliento sąskaitų-faktūrų +NoUnpaidCustomerBills=Nėra neapmokėtų kliento sąskaitų-faktūrų +NoRecordedSupplierInvoices=Nėra įrašytų tiekėjo sąskaitų-faktūrų +NoUnpaidSupplierBills=Nėra neapmokėtų tiekėjo sąskaitų-faktūrų +NoModifiedSupplierBills=Nėra įrašytų tiekėjo sąskaitų-faktūrų +NoRecordedProducts=Nėra įrašytų produktų/paslaugų +NoRecordedProspects=Nėra įrašytų planų +NoContractedProducts=Nėra sutartinių produktų/paslaugų +NoRecordedContracts=Nėra įrašytų sutarčių +NoRecordedInterventions=Nėra įrašytų intervencijų +BoxLatestSupplierOrders=Naujausi tiekėjo užsakymai +BoxTitleLatestSupplierOrders=Paskutiniai %s tiekėjo užsakymai +BoxTitleLatestModifiedSupplierOrders=Last %s modified supplier orders +NoSupplierOrder=Nėra įrašyto tiekėjo užsakymo +BoxCustomersInvoicesPerMonth=Kliento sąskaitų-faktūrų per mėnesį +BoxSuppliersInvoicesPerMonth=Tiekėjo sąskaitų-faktūrų per mėnesį +BoxCustomersOrdersPerMonth=Kliento užsakymai per mėnesį +BoxSuppliersOrdersPerMonth=Tiekėjo užsakymai per mėnesį +BoxProposalsPerMonth=Pasiūlymai per mėnesį +NoTooLowStockProducts=Nėra produkto su minimalia ribine atsarga sandėlyje +BoxProductDistribution=Produktų/paslaugų distribucija +BoxProductDistributionFor=Distribucija: %s %s +ForCustomersInvoices=Klientų sąskaitos-faktūros +ForCustomersOrders=Klientų užsakymai +ForProposals=Pasiūlymai +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/lt_LT/commercial.lang b/htdocs/langs/lt_LT/commercial.lang index 1c66d76a7afc6..5d869b8b93053 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=Create event/task -AddAnAction=Create an event/task -AddActionRendezVous=Create a Rendez-vous event +AddAction=Sukurti įvykį / užduotį +AddAnAction=Sukurti įvykį / užduotį +AddActionRendezVous=Sukurti susitikimo (Rendez-vous) įvykį 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=Submission of commercial proposal %s -SendOrderRef=Submission of order %s +SendPropalRef=Komercinio pasiūlymo %s pateikimas +SendOrderRef=Užsakymo %s pateikimas 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=Event assigned to +ActionAffectedTo=Įvykis priskiriamas 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%%. @@ -71,7 +71,7 @@ ActionAC_FAX=Siųsti faksu ActionAC_PROP=Siųsti pasiūlymą paštu ActionAC_EMAIL=Siųsti e-laišką ActionAC_RDV=Susitikimai -ActionAC_INT=Intervention on site +ActionAC_INT=Intervencija tinklapyje ActionAC_FAC=Siųsti kliento sąskaitą-faktūrą paštu ActionAC_REL=Siųsti kliento sąskaitą-faktūrą paštu (priminimas) ActionAC_CLO=Uždaryti diff --git a/htdocs/langs/lt_LT/companies.lang b/htdocs/langs/lt_LT/companies.lang index 96086bc442f49..52d13af1833da 100644 --- a/htdocs/langs/lt_LT/companies.lang +++ b/htdocs/langs/lt_LT/companies.lang @@ -91,9 +91,9 @@ LocalTax2IsUsedES= IRPF naudojamas (Ispanijos fizinių asmenų pajamų mokestis) LocalTax2IsNotUsedES= IRPF nenaudojamas LocalTax1ES=RE LocalTax2ES=IRPF -TypeLocaltax1ES=RE Type -TypeLocaltax2ES=IRPF Type -TypeES=Type +TypeLocaltax1ES=RE tipas +TypeLocaltax2ES=IRPF tipas +TypeES=Tipas ThirdPartyEMail=%s WrongCustomerCode=Klaidingas kliento kodas WrongSupplierCode=Klaidingas tiekėjo kodas @@ -259,8 +259,8 @@ AvailableGlobalDiscounts=Galimos absoliutinės nuolaidos DiscountNone=Nė vienas Supplier=Tiekėjas CompanyList=Įmonių sąrašas -AddContact=Pridėti adresatą -AddContactAddress=Pridėti kontaktą/adresą +AddContact=Sukurti kontaktą +AddContactAddress=Sukurti kontaktą / adresą EditContact=Redaguoti adresatą EditContactAddress=Redaguoti kontaktą/adresą Contact=Kontaktas @@ -268,8 +268,8 @@ ContactsAddresses=Kontaktai/Adresai NoContactDefinedForThirdParty=Trečiajai šaliai nenustatyta jokio kontakto NoContactDefined=Nėra nustatytų kontaktų DefaultContact=Kontaktas/adresas pagal nutylėjimą -AddCompany=Pridėti įmonę -AddThirdParty=Pridėti trečiąją šalį +AddCompany=Sukurti įmonę +AddThirdParty=Sukurti trečią šalį DeleteACompany=Ištrinti įmonę PersonalInformations=Asmeniniai duomenys AccountancyCode=Apskaitos kodeksas @@ -379,8 +379,8 @@ DeliveryAddressLabel=Pristatymo adreso etiketė DeleteDeliveryAddress=Ištrinti pristatymo adresą ConfirmDeleteDeliveryAddress=Ar tikrai norite ištrinti šį pristatymo adresą ? NewDeliveryAddress=Naujas pristatymo adresas -AddDeliveryAddress=Pridėti adresą -AddAddress=Pridėti adresą +AddDeliveryAddress=Sukurti adresą +AddAddress=Sukurti adresą NoOtherDeliveryAddress=Joks alternatyvaus pristatymo adreso nėra nustatyta SupplierCategory=Tiekėjo kategorija JuridicalStatus200=Nepriklausoma @@ -397,18 +397,18 @@ YouMustCreateContactFirst=Pirmiausia Jūs turite sukurti kontaktus e-laiškams t ListSuppliersShort=Tiekėjų sąrašas ListProspectsShort=Numatomų klientų sąrašas ListCustomersShort=Klientų sąrašas -ThirdPartiesArea=Third parties and contact area +ThirdPartiesArea=Trečių šalių ir kontaktų sritis LastModifiedThirdParties=Paskutinės %s modifikuotos trečiosios šalys UniqueThirdParties=Viso unikalių trečiųjų šalių InActivity=Atviras ActivityCeased=Uždarytas ActivityStateFilter=Aktyvumas statusas -ProductsIntoElements=List of products into %s +ProductsIntoElements=Prekių sąrašas %s CurrentOutstandingBill=Dabartinė neapmokėta sąskaita-faktūra OutstandingBill=Neapmokėtų sąskaitų-faktūrų maksimumas OutstandingBillReached=Pasiekė neapmokėtų sąskaitų-faktūrų maksimumą MonkeyNumRefModelDesc=Gražinimo numeris formatu %syymm-nnnn kliento kodui ir %syymm-nnnn tiekėjo kodui, kur yy yra metai, mm yra mėnuo ir nnnn yra seka be pertrūkių ir be grąžinimo į 0. LeopardNumRefModelDesc=Kodas yra nemokamas. Šis kodas gali būti modifikuotas bet kada. ManagingDirectors=Vadovo (-ų) pareigos (Vykdantysis direktorius (CEO), direktorius, prezidentas ...) -SearchThirdparty=Search thirdparty -SearchContact=Search contact +SearchThirdparty=Ieškoti trečios šalies +SearchContact=Ieškoti kontakto diff --git a/htdocs/langs/lt_LT/contracts.lang b/htdocs/langs/lt_LT/contracts.lang index cf070570ff637..071d552c3f770 100644 --- a/htdocs/langs/lt_LT/contracts.lang +++ b/htdocs/langs/lt_LT/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Sutarčių sritis ListOfContracts=Sutarčių sąrašas -LastModifiedContracts=Last %s modified contracts +LastModifiedContracts=Paskutinės %s pakeistos sutartys AllContracts=Visos sutartys ContractCard=Sutarties kortelė ContractStatus=Sutarties būklė @@ -19,7 +19,7 @@ ServiceStatusLateShort=Pasibaigęs ServiceStatusClosed=Uždarytas ServicesLegend=Paslaugų legenda Contracts=Sutartys -ContractsAndLine=Contracts and line of contracts +ContractsAndLine=Sutartys ir sutarčių eilutė Contract=Sutartis NoContracts=Nėra sutarčių MenuServices=Paslaugos @@ -28,7 +28,7 @@ MenuRunningServices=Veikiančios paslaugas MenuExpiredServices=Pasibaigusios paslaugos MenuClosedServices=Uždarytos paslaugos NewContract=Nauja sutartis -AddContract=Create contract +AddContract=Sukurti sutartį SearchAContract=Ieškoti sutarties DeleteAContract=Ištrinti sutartį CloseAContract=Uždaryti sutartį @@ -54,7 +54,7 @@ ListOfRunningContractsLines=Veikiančių sutarčių eilučių sąrašas ListOfRunningServices=Veikiančių paslaugų sąrašas NotActivatedServices=Neaktyvios paslaugos (tarp patvirtintų sutarčių) BoardNotActivatedServices=Paslaugos aktyvavimui iš patvirtintų sutarčių -LastContracts=Last %s contracts +LastContracts=Paskutinės %s sutartys LastActivatedServices=Paskutinės %s aktyvuotos paslaugos LastModifiedServices=Paskutinės %s modifikuotos paslaugos EditServiceLine=Redaguoti paslaugos eilutę @@ -90,9 +90,9 @@ ListOfServicesToExpireWithDuration=Paslaugų, kurios baigsis už %s dienų, sąr ListOfServicesToExpireWithDurationNeg=Paslaugų, kurios pasibaigė daugiau kaip prieš %s dienų, sąrašas ListOfServicesToExpire=Paslaugų, kurios baigiasi, sąrašas NoteListOfYourExpiredServices=Šiame sąraše yra tik paslaugos sutarčių trečiosioms šalims, su kuriom Jūs susijęs kaip pardavimo atstovas. -StandardContractsTemplate=Standard contracts template -ContactNameAndSignature=For %s, name and signature: -OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. +StandardContractsTemplate=Standartinės sutarties forma +ContactNameAndSignature=%s, vardas ir parašas: +OnlyLinesWithTypeServiceAreUsed=Padauginamos tik "Service" tipo eilutės ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Pardavimų atstovas pasirašantis sutartį diff --git a/htdocs/langs/lt_LT/deliveries.lang b/htdocs/langs/lt_LT/deliveries.lang index 07461b4a0005f..43816813e666f 100644 --- a/htdocs/langs/lt_LT/deliveries.lang +++ b/htdocs/langs/lt_LT/deliveries.lang @@ -1,26 +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 +Delivery=Pristatymas +Deliveries=Pristatymai +DeliveryCard=Pristatymo kortelė +DeliveryOrder=Pristatymo užsakymas +DeliveryOrders=Pristatymo užsakymai +DeliveryDate=Pristatymo data +DeliveryDateShort=Pristatymo data +CreateDeliveryOrder=Sukurti pristatymo užsakymą +QtyDelivered=Pristatytas Kiekis +SetDeliveryDate=Nustatyti pakrovimo datą +ValidateDeliveryReceipt=Patvirtinti pristatymo kvitą +ValidateDeliveryReceiptConfirm=Ar tikrai norite patvirtinti šitą pristatymo kvitą ? +DeleteDeliveryReceipt=Ištrinti pristatymo kvitą +DeleteDeliveryReceiptConfirm=Ar tikrai norite ištrinti pristatymo kvitą %s ? +DeliveryMethod=Pristatymo būdas +TrackingNumber=Sekimo numeris +DeliveryNotValidated=Pristatymas nepatvirtintas # 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 +NameAndSignature=Vardas, Pavardė ir parašas: +ToAndDate=Kam___________________________________ nuo ____ / _____ / __________ +GoodStatusDeclaration=Prekes, nurodytas aukščiau, gavome geros būklės, +Deliverer=Pristatė: +Sender=Siuntėjas +Recipient=Gavėjas +ErrorStockIsNotEnough=Nėra pakankamai atsargų +Shippable=Pristatomas +NonShippable=Nepristatomas diff --git a/htdocs/langs/lt_LT/ecm.lang b/htdocs/langs/lt_LT/ecm.lang index 353af41000c34..5ce2723153cf9 100644 --- a/htdocs/langs/lt_LT/ecm.lang +++ b/htdocs/langs/lt_LT/ecm.lang @@ -43,8 +43,8 @@ ECMDocsByContracts=Dokumentai, susiję su sutartimis ECMDocsByInvoices=Dokumentai, susiję su klientų sąskaitomis-faktūromis ECMDocsByProducts=Dokumentai, susiję su produktais ECMDocsByProjects=Dokumentai, susiję su projektais -ECMDocsByUsers=Documents linked to users -ECMDocsByInterventions=Documents linked to interventions +ECMDocsByUsers=Dokumentai susiję su vartotojais +ECMDocsByInterventions=Dokumentai, susiję su intervencijomis ECMNoDirectoryYet=Nėra sukurta katalogo ShowECMSection=Rodyti katalogą DeleteSection=Pašalinti katalogą diff --git a/htdocs/langs/lt_LT/errors.lang b/htdocs/langs/lt_LT/errors.lang index 8112a8f674ac2..ed8e2deae4751 100644 --- a/htdocs/langs/lt_LT/errors.lang +++ b/htdocs/langs/lt_LT/errors.lang @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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=Privalomi nustatymų parametrai dar nėra apibrėžti diff --git a/htdocs/langs/lt_LT/exports.lang b/htdocs/langs/lt_LT/exports.lang index 255138f655b19..5f5da5832d794 100644 --- a/htdocs/langs/lt_LT/exports.lang +++ b/htdocs/langs/lt_LT/exports.lang @@ -8,7 +8,7 @@ ImportableDatas=Importuojamų duomenų rinkinys SelectExportDataSet=Pasirinkite duomenų rinkinį, kurį norite eksportuoti ... SelectImportDataSet=Pasirinkite duomenų rinkinį, kurį norite importuoti ... SelectExportFields=Pasirinkite laukus, kuriuos norite eksportuoti, arba pasirinkite iš anksto apibrėžtą eksporto profilį -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=Pasirinkti šaltinio failo laukus, kuriuos norite importuoti ir jų tikslo lauką duomenų bazėje, judinant juos aukštyn-žemyn inkaru %s, arba pasirinkti išanksto nustatytą importo profilį: NotImportedFields=Šaltinio failo laukai nesuimportuoti SaveExportModel=Išsaugoti šį eksporto profilį, jei jūs planuojate pakartotinai naudoti jį vėliau ... SaveImportModel=Išsaugoti šį importo profilį, jei jūs planuojate pakartotinai naudoti jį vėliau ... @@ -81,7 +81,7 @@ DoNotImportFirstLine=Neimportuoti šaltinio failo pirmosios eilutės NbOfSourceLines=Šaltinio failo eilučių skaičius NowClickToTestTheImport=Patikrinkite importo parametrus, kuriuos nustatėte. Jeigu jie teisingi, spauskite mygtuką "%s" pradėti importo proceso simuliaciją (jokie duomenys nebus pakeisti duomenų bazėje, tai tik simuliacija) RunSimulateImportFile=Pradėti importo simuliaciją -FieldNeedSource=This field requires data from the source file +FieldNeedSource=Šis laukas reikalauja duomenų iš šaltinio failo SomeMandatoryFieldHaveNoSource=Kai kurie privalomi laukai neturi šaltinio iš duomenų failo InformationOnSourceFile=Šaltinio failo informacija InformationOnTargetTables=Duomenų adresatų informacija @@ -125,7 +125,7 @@ BankAccountNumber=Sąskaitos numeris BankAccountNumberKey=Raktas SpecialCode=Specialusis kodas ExportStringFilter=%% leidžia pakeisti vieną ar daugiau simbolių tekste -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 +ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filtruoja paeiliui metai/mėnuo/diena
YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filtruoja diapazone metai/mėnesiai/dienos
> YYYY, > YYYYMM, > YYYYMMDD : filtruoja visus sekančius metai/mėnesiai/dienos
< YYYY, < YYYYMM, < YYYYMMDD : filtruoja visus ankstesnius metai/mėnesiai/dienos ExportNumericFilter='NNNNN' filtruos pagal vieną reikšmę
'NNNNN+NNNNN' filtruos diapazono reikšmes
'>NNNNN' filtruos mažesnes reikšmes
'>NNNNN' filtruos didesnes reikšmes. ## filters SelectFilterFields=Jei norite filtruoti pagal kai kokias reikšmes, įveskite reikšmes čia. diff --git a/htdocs/langs/lt_LT/install.lang b/htdocs/langs/lt_LT/install.lang index c674023e51286..a8551d4f356fe 100644 --- a/htdocs/langs/lt_LT/install.lang +++ b/htdocs/langs/lt_LT/install.lang @@ -156,7 +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) +ErrorDatabaseVersionForbiddenForMigration=Jūsų duomenų bazės versija yra %s. Gali būti kritinė situacija su duomenų praradimu, jeigu pakeisite duomenų bazės struktūrą, kaip reikalaujama perkėlimo proceso metu. Šiuo tikslu perkėlimas nebus leidžiamas, kol nebus atliktas duomenų bazės programos atnaujinimas į aukštesnę versiją (žinomų klaidingų versijų sąrašas: %s) ######### # upgrade @@ -208,7 +208,7 @@ MigrationProjectTaskTime=Atnaujinti praleistą laiką sekundėmis MigrationActioncommElement=Atnaujinti veiksmų duomenis MigrationPaymentMode=Duomenų perkėlimas mokėjimo būdui MigrationCategorieAssociation=Kategorijų perkėlimas -MigrationEvents=Migration of events to add event owner into assignement table +MigrationEvents=Įvykių migracija pridedant įvykio savininką į užduočių lentelę -ShowNotAvailableOptions=Show not available options -HideNotAvailableOptions=Hide not available options +ShowNotAvailableOptions=Parodyti negalimas opcijas +HideNotAvailableOptions=Paslėpti negalimas opcijas diff --git a/htdocs/langs/lt_LT/interventions.lang b/htdocs/langs/lt_LT/interventions.lang index f50261243a894..55d2599ab6bfd 100644 --- a/htdocs/langs/lt_LT/interventions.lang +++ b/htdocs/langs/lt_LT/interventions.lang @@ -50,4 +50,4 @@ ArcticNumRefModelError=Nepavyko suaktyvinti PacificNumRefModelDesc1=Grąžinti numerį su formatu %syymm-nnnn, kur yy yra metai, mm mėnuo ir nnnn yra seka be pertrūkių ir be grąžinimo į 0 PacificNumRefModelError=Intervencijos kortelė pradedant $syymm jau egzistuoja ir yra nesuderinama su šios sekos modeliu. Pašalinti ją arba pakeisti vardą šio modulio aktyvavimui. PrintProductsOnFichinter=Spausdinti produktus intervencinėje kortelėje -PrintProductsOnFichinterDetails=Intervencijoms, sukurtoms iš užsakymų +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang index f3b8fc5263e8d..75b35baf4f786 100644 --- a/htdocs/langs/lt_LT/main.lang +++ b/htdocs/langs/lt_LT/main.lang @@ -220,6 +220,7 @@ Next=Sekantis Cards=Kortelės Card=Kortelė Now=Dabar +HourStart=Start hour Date=Data DateAndHour=Date and hour DateStart=Pradžios data @@ -242,6 +243,8 @@ DatePlanShort=Suplanuota data DateRealShort=Reali data DateBuild=Ataskaitos sudarymo data DatePayment=Mokėjimo data +DateApprove=Approving date +DateApprove2=Approving date (second approval) DurationYear=metai DurationMonth=mėnuo DurationWeek=savaitė @@ -408,6 +411,8 @@ OtherInformations=Kita informacija Quantity=Kiekis Qty=Kiekis ChangedBy=Pakeitė +ApprovedBy=Approved by +ApprovedBy2=Approved by (second approval) ReCalculate=Perskaičiuoti ResultOk=Sėkmė ResultKo=Nesėkmė @@ -696,6 +701,8 @@ 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. +Deny=Deny +Denied=Denied # Week day Monday=Pirmadienis Tuesday=Antradienis diff --git a/htdocs/langs/lt_LT/members.lang b/htdocs/langs/lt_LT/members.lang index ac6e97831b854..5169ac2887daf 100644 --- a/htdocs/langs/lt_LT/members.lang +++ b/htdocs/langs/lt_LT/members.lang @@ -85,7 +85,7 @@ SubscriptionLateShort=Vėlai SubscriptionNotReceivedShort=Niekada negautas ListOfSubscriptions=Pasirašymų sąrašas SendCardByMail=Siųsti kortelę E-paštu -AddMember=Create member +AddMember=Sukurti narį NoTypeDefinedGoToSetup=Nė apibrėžtų nario tipų. Eiti į meniu "Narių tipai" NewMemberType=Naujas nario tipas WelcomeEMail=Sveikinimo e-laiškas @@ -125,7 +125,7 @@ Date=Data DateAndTime=Data ir laikas PublicMemberCard=Nario vieša kortelė MemberNotOrNoMoreExpectedToSubscribe=Narys, kurio pasirašymo nėra ir daugiau nesitikima -AddSubscription=Create subscription +AddSubscription=Sukurti abonementą ShowSubscription=Rodyti pasirašymą MemberModifiedInDolibarr=Narys modifikuotas Dolibarr SendAnEMailToMember=Nusiųsti informacinį e-laišką nariui @@ -203,4 +203,4 @@ MembersByNature=Nariai pagal kilmę VATToUseForSubscriptions=Pasirašymams naudojamas PVM tarifas NoVatOnSubscription=Pasirašymams nėra PVM MEMBER_PAYONLINE_SENDEMAIL=Įspėti, kai Dolibarr gauna patvirtinimą apie mokėjimą už pasirašymą, nusiunčiant e-laišką -ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Prekė naudojama abonementinei eilutei sąskaitoje-faktūroje: %s diff --git a/htdocs/langs/lt_LT/orders.lang b/htdocs/langs/lt_LT/orders.lang index 6ad2ae7c62cc9..ccbf633869e36 100644 --- a/htdocs/langs/lt_LT/orders.lang +++ b/htdocs/langs/lt_LT/orders.lang @@ -16,20 +16,20 @@ SupplierOrder=Tiekėjo užsakymas SuppliersOrders=Tiekėjų užsakymai SuppliersOrdersRunning=Dabartiniai tiekėjų užsakymai CustomerOrder=Kliento užsakymas -CustomersOrders=Customers orders +CustomersOrders=Klientų užsakymai CustomersOrdersRunning=Dabartiniai klientų užsakymai CustomersOrdersAndOrdersLines=Klientų užsakymai ir užsakymų eilės -OrdersToValid=Customers orders to validate -OrdersToBill=Customers orders delivered -OrdersInProcess=Customers orders in process -OrdersToProcess=Customers orders to process +OrdersToValid=Klientų užsakymai patvirtinimui +OrdersToBill=Klientų užsakymai pristatyti +OrdersInProcess=Klientų užsakymai vykdomi šiuo metu +OrdersToProcess=Klientų užsakymai vykdymui SuppliersOrdersToProcess=Tiekėjų užsakymai vykdymui StatusOrderCanceledShort=Atšauktas StatusOrderDraftShort=Projektas StatusOrderValidatedShort=Patvirtintas StatusOrderSentShort=Vykdomas StatusOrderSent=Gabenimas vykdomas -StatusOrderOnProcessShort=Ordered +StatusOrderOnProcessShort=Užsakyta StatusOrderProcessedShort=Apdorotas StatusOrderToBillShort=Pristatyta StatusOrderToBill2Short=Pateikti sąskaitą-faktūrą @@ -41,8 +41,8 @@ StatusOrderReceivedAllShort=Viskas gauta StatusOrderCanceled=Atšauktas StatusOrderDraft=Projektas (turi būti patvirtintas) StatusOrderValidated=Patvirtintas -StatusOrderOnProcess=Ordered - Standby reception -StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation +StatusOrderOnProcess=Užsakyta - Laukiama gavimo +StatusOrderOnProcessWithValidation=Užsakyta - Laukiama gavimo ar patvirtinimo StatusOrderProcessed=Apdorotas StatusOrderToBill=Pristatyta StatusOrderToBill2=Pateikti sąskaitą-faktūrą @@ -51,26 +51,26 @@ StatusOrderRefused=Atmesta StatusOrderReceivedPartially=Dalinai gauta StatusOrderReceivedAll=Viskas gauta ShippingExist=Gabenimas vyksta -ProductQtyInDraft=Product quantity into draft orders -ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered +ProductQtyInDraft=Prekių kiekis preliminariuose užsakymuose +ProductQtyInDraftOrWaitingApproved=Prekių kiekis preliminariuose ar patvirtintuose užsakymuose, bet dar neužsakytas DraftOrWaitingApproved=Projektas arba patvirtintas, bet dar nebuvo užsakymo DraftOrWaitingShipped=Projektas arba patvirtintas, bet dar negabenamas MenuOrdersToBill=Pristatyti užsakymai -MenuOrdersToBill2=Billable orders +MenuOrdersToBill2=Mokami užsakymai SearchOrder=Ieškoti užsakymo SearchACustomerOrder=Ieškoti kliento užsakymo -SearchASupplierOrder=Search a supplier order +SearchASupplierOrder=Ieškoti tiekėjo užsakymo ShipProduct=Gabenti produktą Discount=Nuolaida CreateOrder=Sukurti Užsakymą RefuseOrder=Atmesti užsakymą -ApproveOrder=Approve order -Approve2Order=Approve order (second level) +ApproveOrder=Patvirtinti užsakymą +Approve2Order=Patvirtinti užsakymą (2-as lygis) ValidateOrder=Patvirtinti užsakymą UnvalidateOrder=Nepatvirtinti užsakymo DeleteOrder=Ištrinti užsakymą CancelOrder=Atšaukti užsakymą -AddOrder=Create order +AddOrder=Sukurti užsakymą AddToMyOrders=Įtraukti į mano užsakymus AddToOtherOrders=Įtraukti į kitų užsakymus AddToDraftOrders=Pridėti į užsakymo projektą @@ -79,7 +79,9 @@ NoOpenedOrders=Nėra atidarytų užsakymų NoOtherOpenedOrders=Nėra kitų atidarytų užsakymų NoDraftOrders=Nėra užsakymų projektų OtherOrders=Kiti užsakymai -LastOrders=Paskutiniai %s užsakymai +LastOrders=Paskutinio %s kliento užsakymai +LastCustomerOrders=Paskutinio %s kliento užsakymai +LastSupplierOrders=Paskutinio %s tiekėjo užsakymai LastModifiedOrders=Paskutiniai %s modifikuoti užsakymai LastClosedOrders=Paskutiniai %s uždaryti užsakymai AllOrders=Visi užsakymai @@ -103,8 +105,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 +RelatedCustomerOrders=Susiję kliento užsakymai +RelatedSupplierOrders=Susiję tiekėjo užsakymai OnProcessOrders=Apdorojami užsakymai RefOrder=Užsakymo nuoroda RefCustomerOrder=Kliento užsakymo nuoroda @@ -121,7 +123,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 +FirstApprovalAlreadyDone=Pirmas patvirtinimas jau atliktas ##### 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 0dcd8e7f10667..b982fa0521a53 100644 --- a/htdocs/langs/lt_LT/other.lang +++ b/htdocs/langs/lt_LT/other.lang @@ -203,6 +203,7 @@ NewKeyWillBe=Jūsų naujas prisijungimo prie programos raktas bus ClickHereToGoTo=Spauskite čia norėdami pereiti į %s YouMustClickToChange=Pirmiausia turite paspausti ant šios nuorodos ir patvirtinti šį slaptažodžio pakeitimą ForgetIfNothing=Jei neprašėte šio pakeitimo, tiesiog pamirškite šį pranešimą. Jūsų mandatai yra saugūs. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=Pridėti įrašą kalendoriuje %s diff --git a/htdocs/langs/lt_LT/productbatch.lang b/htdocs/langs/lt_LT/productbatch.lang index 452636819653f..85b1d27f3a611 100644 --- a/htdocs/langs/lt_LT/productbatch.lang +++ b/htdocs/langs/lt_LT/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use batch/serial number -ProductStatusOnBatch=Yes (Batch/serial required) -ProductStatusNotOnBatch=No (Batch/serial not used) +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/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 +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial 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 +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %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. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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/lt_LT/projects.lang b/htdocs/langs/lt_LT/projects.lang index 385638c087f58..98c53e1f45298 100644 --- a/htdocs/langs/lt_LT/projects.lang +++ b/htdocs/langs/lt_LT/projects.lang @@ -14,6 +14,7 @@ MyTasksDesc=Šis vaizdas yra ribotas projektams ar užduotims, kuriems Jūs esat 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ą). +AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. ProjectsArea=Projektų sritis NewProject=Naujas projektas AddProject=Create project diff --git a/htdocs/langs/lt_LT/propal.lang b/htdocs/langs/lt_LT/propal.lang index da9848b740fdb..606961e68f3dc 100644 --- a/htdocs/langs/lt_LT/propal.lang +++ b/htdocs/langs/lt_LT/propal.lang @@ -16,7 +16,7 @@ Prospect=Numatomas klientas ProspectList=Numatomų klientų sąrašas DeleteProp=Ištrinti komercinį pasiūlymą ValidateProp=Patvirtinti komercinį pasiūlymą -AddProp=Pridėti pasiūlymą +AddProp=Sukurti pasiūlymą ConfirmDeleteProp=Ar tikrai norite ištrinti šį komercinį pasiūlymą ? ConfirmValidateProp=Ar tikrai norite patvirtinti šį komercinį pasiūlymą su pavadinimu %s ? LastPropals=Paskutiniai %s pasiūlymai @@ -55,8 +55,6 @@ NoOpenedPropals=Neatidaryti komerciniai pasiūlymai NoOtherOpenedPropals=Nėra kitų atidarytų komercinių pasiūlymų RefProposal=Komercinio pasiūlymo nuoroda SendPropalByMail=Siųsti komercinį pasiūlymą paštu -FileNotUploaded=Failas nebuvo įkeltas -FileUploaded=Failas buvo sėkmingai įkeltas AssociatedDocuments=Dokumentai, susiję su pasiūlymu: ErrorCantOpenDir=Nepavyko atidaryti aplanko DatePropal=Pasiūlymo data diff --git a/htdocs/langs/lt_LT/resource.lang b/htdocs/langs/lt_LT/resource.lang index 32bdd92f88478..d6bff413ffe7e 100644 --- a/htdocs/langs/lt_LT/resource.lang +++ b/htdocs/langs/lt_LT/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=Resursai +MenuResourceAdd=Naujas resursas +MenuResourcePlanning=Resursų planavimas +DeleteResource=Panaikinti resursą +ConfirmDeleteResourceElement=Patvirtinti resurso panaikinimą šiam elementui +NoResourceInDatabase=Duomenų bazėje resurso nėra +NoResourceLinked=Nėra susijusių resursų -ResourcePageIndex=Resources list -ResourceSingular=Resource -ResourceCard=Resource card -AddResource=Create a resource -ResourceFormLabel_ref=Resource name -ResourceType=Resource type -ResourceFormLabel_description=Resource description +ResourcePageIndex=Resursų sąrašas +ResourceSingular=Resursas +ResourceCard=Resurso korelė +AddResource=Sukurti resursą +ResourceFormLabel_ref=Resurso pavadinimas +ResourceType=Resurso tipas +ResourceFormLabel_description=Resurso aprašymas -ResourcesLinkedToElement=Resources linked to element +ResourcesLinkedToElement=Resursai susiję su elementu -ShowResourcePlanning=Show resource planning -GotoDate=Go to date +ShowResourcePlanning=Parodyti resurso planavimą +GotoDate=Eiti į datą -ResourceElementPage=Element resources -ResourceCreatedWithSuccess=Resource successfully created -RessourceLineSuccessfullyDeleted=Resource line successfully deleted -RessourceLineSuccessfullyUpdated=Resource line successfully updated -ResourceLinkedWithSuccess=Resource linked with success +ResourceElementPage=Elemento resursai +ResourceCreatedWithSuccess=Resursas sėkmingai sukurtas +RessourceLineSuccessfullyDeleted=Resurso eilutė sėkmingai panaikinta +RessourceLineSuccessfullyUpdated=Resurso eilutė sėkmingai atnaujinta +ResourceLinkedWithSuccess=Resursas sėkmingai susietas -TitleResourceCard=Resource card -ConfirmDeleteResource=Confirm to delete this resource -RessourceSuccessfullyDeleted=Resource successfully deleted -DictionaryResourceType=Type of resources +TitleResourceCard=Resurso kortelė +ConfirmDeleteResource=Patvirtinti resurso panaikinimą +RessourceSuccessfullyDeleted=Resursas sėkmingai panaikintas +DictionaryResourceType=Resursų tipas -SelectResource=Select resource +SelectResource=Pasirinkti resursą diff --git a/htdocs/langs/lt_LT/stocks.lang b/htdocs/langs/lt_LT/stocks.lang index 4f773f2b5b55e..8f51f32a95962 100644 --- a/htdocs/langs/lt_LT/stocks.lang +++ b/htdocs/langs/lt_LT/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Atšaukti siuntimą DeleteSending=Ištrinti siuntimą Stock=Atsargos Stocks=Atsargos +StocksByLotSerial=Stock by lot/serial Movement=Judėjimas Movements=Judesiai ErrorWarehouseRefRequired=Sandėlio nuorodos pavadinimas yra būtinas @@ -78,6 +79,7 @@ IdWarehouse=Sandėlio ID DescWareHouse=Sandėlio aprašymas LieuWareHouse=Sandėlio vieta WarehousesAndProducts=Sandėliai ir produktai +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=Vidutinė svertinė įvedimo kaina AverageUnitPricePMP=Vidutinė svertinė įvedimo kaina SellPriceMin=Vieneto pardavimo kaina @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/lt_LT/suppliers.lang b/htdocs/langs/lt_LT/suppliers.lang index c1510a3b5de45..808c1872a49d2 100644 --- a/htdocs/langs/lt_LT/suppliers.lang +++ b/htdocs/langs/lt_LT/suppliers.lang @@ -29,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=Deny this order +DenyingThisOrder=Atmesti šį užsakymą ConfirmDenyingThisOrder=Ar tikrai norite atsisakyti šio užsakymo s? ConfirmCancelThisOrder=Ar tikrai norite atšaukti šį užsakymą %s ? AddCustomerOrder=Sukurti kliento užsakymą @@ -43,4 +43,4 @@ 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) +UseDoubleApproval=Naudoti dvigubą patvirtinimą (antras patvirtinimas gali būti atliktas bet kurio vartotojo su priskirtais tam leidimais) diff --git a/htdocs/langs/lt_LT/trips.lang b/htdocs/langs/lt_LT/trips.lang index 640346bb6f615..9f477edc8be84 100644 --- a/htdocs/langs/lt_LT/trips.lang +++ b/htdocs/langs/lt_LT/trips.lang @@ -1,126 +1,102 @@ # 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=Išlaidų ataskaita +ExpenseReports=Išlaidų ataskaitos +Trip=Išlaidų ataskaita +Trips=Išlaidų ataskaitos +TripsAndExpenses=Išlaidų ataskaitos +TripsAndExpensesStatistics=Išlaidų ataskaitų statistika +TripCard=Išlaidų ataskaitos kortelė +AddTrip=Sukurti išlaidų ataskaitą +ListOfTrips=Išlaidų ataskaitų sąrašas ListOfFees=Įmokų sąrašas -NewTrip=New expense report -CompanyVisited=aplankyta įmonė/organizacija +NewTrip=Nauja išlaidų ataskaita +CompanyVisited=Aplankyta įmonė/organizacija Kilometers=Kilometrų -FeesKilometersOrAmout=Kilometrų kiekis -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 +FeesKilometersOrAmout=Suma arba Kilometrai +DeleteTrip=Ištrinti išlaidų ataskaitą +ConfirmDeleteTrip=Ar tikrai norite ištrinti šią išlaidų ataskaitą ? +ListTripsAndExpenses=Išlaidų ataskaitų sąrašas +ListToApprove=Laukiama patvirtinimo +ExpensesArea=Išlaidų ataskaitų sritis +SearchATripAndExpense=Išlaidų ataskaitos paieška +ClassifyRefunded=Klasifikuoti "Grąžinta" +ExpenseReportWaitingForApproval=Nauja išlaidų ataskaita buvo pateikta patvirtinimui +ExpenseReportWaitingForApprovalMessage=Nauja išlaidų ataskaita buvo pateikta ir laukia patvirtinimo.\n- Vartotojas: %s\n- Laikotarpis:%s \nSpauskite čia norėdami patvirtinti: %s +TripId=Išlaidų ataskaitos ID +AnyOtherInThisListCanValidate=Asmuo informuojamas patvirtinimui. +TripSociete=Informacijos įmonė +TripSalarie=Informacijos vartotojas +TripNDF=Informacijos išlaidų ataskaiata +DeleteLine=Ištrinti išlaidų taskaitos eilutę +ConfirmDeleteLine=Ar tikrai norite ištrinti šią eilutę ? +PDFStandardExpenseReports=Standartinis šablonas PDF dokumento išlaidų ataskaitoje generavimui +ExpenseReportLine=Išlaidų ataskaitos eilutė TF_OTHER=Kitas -TF_TRANSPORTATION=Transportation +TF_TRANSPORTATION=Transportas 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. +TF_TRAIN=Traukinys +TF_BUS=Autobusas +TF_CAR=Automobilis +TF_PEAGE=Mokamas +TF_ESSENCE=Kuras +TF_HOTEL=Hostelis +TF_TAXI=Taksi + +ErrorDoubleDeclaration=Jūs deklaravote kitą išlaidų ataskaitą panašiame laiko periode. +ListTripsAndExpenses=Išlaidų ataskaitų sąrašas +AucuneNDF=Pagal šį kriterijų nerasta išlaidų ataskaitos +AucuneLigne=Dar nėra deklaruotos išlaidų ataskaitos +AddLine=Pridėti eilutę +AddLineMini=Pridėti + +Date_DEBUT=Laikotarpio pradžia +Date_FIN=Laikotarpio pabaiga +ModePaiement=Mokėjimo būdas +Note=Pranešimas +Project=Projektas + +VALIDATOR=Vartotojas patvirtinimo informavimui +VALIDOR=Patvirtinta +AUTHOR=Įrašyta +AUTHORPAIEMENT=Apmokėta +REFUSEUR=Atmesta +CANCEL_USER=Nutraukta + +MOTIF_REFUS=Priežastis +MOTIF_CANCEL=Priežastis + +DATE_REFUS=Atmetimo data +DATE_SAVE=Patvirtinimo data +DATE_VALIDE=Patvirtinimo data +DATE_CANCEL=Nutraukimo data +DATE_PAIEMENT=Mokėjimo data + +TO_PAID=Mokėti +BROUILLONNER=Atidaryti iš naujo +SendToValid=Siųsti patvirtinimui +ModifyInfoGen=Redaguoti +ValidateAndSubmit=Įvertinti ir pateikti tvirtinimui + +NOT_VALIDATOR=Jums neleidžiama patvirtinti šią išlaidų ataskaitą +NOT_AUTHOR=Jūs nesate šios išlaidų ataskaitos autorius. Operacija nutraukta. + +RefuseTrip=Atmesti išlaidų ataskaitą +ConfirmRefuseTrip=Ar tikrai norite atmesti šią išlaidų ataskaitą ? + +ValideTrip=Patvirtinti išlaidų ataskaitą +ConfirmValideTrip=Ar tikrai norite patvirtinti šią išlaidų ataskaitą ? + +PaidTrip=Apmokėti išlaidų ataskaitą +ConfirmPaidTrip=Ar tikrai norite pakeisti šios išlaidų ataskaitos būklę į "Apmokėta" ? + +CancelTrip=Nutraukti išlaidų ataskaitą +ConfirmCancelTrip=Ar tikrai norite nutraukti šią išlaidų ataskaitą ? + +BrouillonnerTrip=Išlaidų ataskaitos būklę grąžinti į "Projektas" +ConfirmBrouillonnerTrip=Ar tikrai norite grąžinti šios išlaidų ataskaitos būklę į "Projektas" ? + +SaveTrip=Patvirtinti išlaidų ataskaitą +ConfirmSaveTrip=Ar tikrai norite patvirtinti šią išlaidų ataskaitą ? + +NoTripsToExportCSV=Už šį laikotarpį nėra išlaidų ataskaitų eksportui diff --git a/htdocs/langs/lt_LT/users.lang b/htdocs/langs/lt_LT/users.lang index f463e8e7216b9..7dedd9cf1e76c 100644 --- a/htdocs/langs/lt_LT/users.lang +++ b/htdocs/langs/lt_LT/users.lang @@ -1,5 +1,5 @@ # Dolibarr language file - Source file is en_US - users -HRMArea=HRM area +HRMArea=HRM sritis UserCard=Vartotojo kortelė ContactCard=Adresato kortelė GroupCard=Grupės kortelė @@ -86,7 +86,7 @@ MyInformations=Mano duomenys ExportDataset_user_1=Dolibarr vartotojai ir savybės DomainUser=Domeno Vartotojas %s Reactivate=Atgaivinti -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=Ši forma leidžia sukurti Jūsų įmonės vidinį vartotoją. Norėdami sukurti išorinį vartotoją (klientą, tiekėją, ...), naudokite "Sukurti Dolibarr vartotoją" per trečių šalių kontaktų kortelių meniu. InternalExternalDesc=Vidinis vartotojas yra vartotojas, kuris yra Jūsų įmonės/ organizacijos dalis.
Išorinis vartotojas yra klientas, tiekėjas ar kitas.

Abiem atvejais leidimai apibrėžia teises Dolibarr, taip pat išorinis vartotojas gali turėti skirtingą meniu valdiklį, negu vidinis vartotojas (žr. Pagrindinis-Nustatymai-Ekranas) PermissionInheritedFromAGroup=Leidimas suteiktas, nes paveldėtas iš vieno grupės vartotojų Inherited=Paveldėtas @@ -102,7 +102,7 @@ UserDisabled=Vartotojas %s išjungtas UserEnabled=Vartotojas %s aktyvuotas UserDeleted=Vartotojas %s pašalintas NewGroupCreated=Grupė %s sukurta -GroupModified=Group %s modified +GroupModified=Grupė %s pakeista GroupDeleted=Grupė %s pašalinta ConfirmCreateContact=Ar tikrai norite sukurti Dolibarr sąskaitą šiam adresui ? ConfirmCreateLogin=Ar tikrai norite sukurti Dolibarr sąskaitą šiam nariui ? @@ -113,10 +113,10 @@ YourRole=Jūsų vaidmenys YourQuotaOfUsersIsReached=Jūsų aktyvių vartotojų kvota išnaudota ! NbOfUsers=Vartotojų skaičius DontDowngradeSuperAdmin=Tik superadministratorius gali sumažinti kito superadministratoriaus teises -HierarchicalResponsible=Supervisor +HierarchicalResponsible=Prižiūrėtojas HierarchicView=Hierarchinis vaizdas UseTypeFieldToChange=Pakeitimui naudoti laukelio tipą OpenIDURL=OpenID URL LoginUsingOpenID=Prisijungimui naudoti OpenID -WeeklyHours=Weekly hours -ColorUser=Color of the user +WeeklyHours=Savaitės valandos +ColorUser=Vartotojo spalva diff --git a/htdocs/langs/lt_LT/withdrawals.lang b/htdocs/langs/lt_LT/withdrawals.lang index efa5946534953..a2f6ea5a72000 100644 --- a/htdocs/langs/lt_LT/withdrawals.lang +++ b/htdocs/langs/lt_LT/withdrawals.lang @@ -14,9 +14,9 @@ WithdrawalReceiptShort=Kvitas LastWithdrawalReceipts=Paskutinio %s išėmimo įplaukos WithdrawedBills=Panaikintos sąskaitos-faktūros WithdrawalsLines=Atšaukimo eilutės -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=Prašymas apdoroti laukiantį užsakymą +RequestStandingOrderTreated=Prašymas apdorotiems užsakymams +NotPossibleForThisStatusOfWithdrawReceiptORLine=Dar negalima. Išėmimo būklė turi būti nustatyta "kredituota" prieš spec. eilučių atmetimo deklaravimą. CustomersStandingOrders=Kliento periodiniai užsakymai CustomerStandingOrder=Kliento periodiniai užsakymai NbOfInvoiceToWithdraw=Sąskaitos-faktūros su atsiėmimo prašymu numeris @@ -47,7 +47,7 @@ RefusedData=Atmetimo data RefusedReason=Atmetimo priežastis RefusedInvoicing=Atmetimo apmokestinimas NoInvoiceRefused=Neapmokestinti atmetimo -InvoiceRefused=Invoice refused (Charge the rejection to customer) +InvoiceRefused=Sąskaita-faktūra atmesta (apmokestinti kliento atmetimą) Status=Būklė StatusUnknown=Nežinomas StatusWaiting=Laukiama @@ -76,14 +76,14 @@ WithBankUsingRIB=Banko sąskaitoms, naudojančioms RIB WithBankUsingBANBIC=Banko sąskaitoms, naudojančioms IBAN / BIC / SWIFT BankToReceiveWithdraw=Banko sąskaita išėmimų gavimui CreditDate=Kreditą -WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) +WithdrawalFileNotCapable=Negalima sugeneruoti pajamų gavimo failo Jūsų šaliai %s (Šalis nepalaikoma programos) ShowWithdraw=Rodyti Išėmimą IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Jei sąskaita-faktūra turi mažiausiai vieną išėmimo mokėjimą dar apdorojamą, tai nebus nustatyta kaip apmokėta, kad pirmiausia leisti išėmimo valdymą. -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=Ši kortelė leidžia Jums prašyti laukiančio užsakymo. Įvykdžius jį eiti į meniu Bankas->Išėmimas ir valdyti užsakymą. Kada laukiantis užsakymas uždarytas, sąskaitos apmokėjimas automatiškai įrašomas ir sąskaita-faktūra uždaroma jei nėra priminimų apmokėti. WithdrawalFile=Išėmimo failas SetToStatusSent=Nustatyti būklę "Failas išsiųstas" ThisWillAlsoAddPaymentOnInvoice=Tai taip pat taikoma sąskaitų-faktūrų mokėjimams ir jų priskyrimui "Apmokėtos" -StatisticsByLineStatus=Statistics by status of lines +StatisticsByLineStatus=Eilučių būklės statistika ### Notifications InfoCreditSubject=Periodinio užsakymo %s banko mokėjimas diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang index 26bdce05e84ff..55ccf723ab36b 100644 --- a/htdocs/langs/lv_LV/admin.lang +++ b/htdocs/langs/lv_LV/admin.lang @@ -297,10 +297,11 @@ MenuHandlers=Izvēlnes manipulatori MenuAdmin=Izvēlnes redaktors DoNotUseInProduction=Neizmantot produkcijā ThisIsProcessToFollow=Tas ir setup, lai process: +ThisIsAlternativeProcessToFollow=This is an alternative setup to 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=Lejupielādēt paku %s -UnpackPackageInDolibarrRoot=Izkravāt paketi failu Dolibarr saknes direktorijā %s +UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: %s SetupIsReadyForUse=Instalēšana ir pabeigta, un Dolibarr ir gatavs lietošanai ar šo jauno komponentu. NotExistsDirect=Alternatīva saknes direktorijs nav definēta.
InfDirAlt=Kopš 3 versijas, ir iespējams noteikt alternatīvu sakne directory.Tas ļauj jums saglabāt, tajā pašā vietā, papildinājumus un pielāgotas veidnes.
Jums tikai jāizveido direktoriju Dolibarr saknē (piemēram: custom).
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_ 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) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Ievadiet tālruņa numuru, uz kuru zvanīt, lai parādītu saiti, lai pārbaudītu Nospied lai zvanītu url lietotājam %s RefreshPhoneLink=Atsvaidzināt @@ -540,8 +541,8 @@ Module6000Name=Darba plūsma Module6000Desc=Plūsmas vadība 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 +Module39000Name=Product lot +Module39000Desc=Lot or serial number, eat-by and sell-by date management on products Module50000Name=Paybox Module50000Desc=Modulis piedāvā tiešsaistes maksājumu lapā, ar kredītkarti, ar Paybox Module50100Name=Tirdzniecības punkts @@ -558,8 +559,6 @@ Module59000Name=Malas Module59000Desc=Moduli, lai pārvaldītu peļņu Module60000Name=Komisijas Module60000Desc=Modulis lai pārvaldītu komisijas -Module150010Name=Batch number, eat-by date and sell-by date -Module150010Desc=batch number, eat-by date and sell-by date management for product Permission11=Lasīt klientu rēķinus Permission12=Izveidot / mainīt klientu rēķinus Permission13=Neapstiprināti klientu rēķini @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= RE līmenis pēc noklusējuma, veidojot izredzes, rēķin LocalTax2IsNotUsedDescES= Pēc noklusējuma ierosinātā IRPF ir 0. Beigas varu. LocalTax2IsUsedExampleES= Spānijā, ārštata un neatkarīgi profesionāļi, kas sniedz pakalpojumus un uzņēmumiem, kuri ir izvēlējušies nodokļu sistēmu moduļus. LocalTax2IsNotUsedExampleES= Spānijā tie Bussines neattiecas uz nodokļu sistēmas moduļiem. -CalcLocaltax=Atskaites -CalcLocaltax1ES=Pārdošana - Iepirkumi +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Sales - Purchases CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Pirkumi +CalcLocaltax2=Purchases CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Pārdošana +CalcLocaltax3=Sales CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales LabelUsedByDefault=Label izmantots pēc noklusējuma, ja nav tulkojuma var atrast kodu LabelOnDocuments=Dokumentu marķējums @@ -1018,14 +1017,14 @@ NoEventOrNoAuditSetup=Nav drošības pasākums ir ierakstīta vēl. Tas var būt NoEventFoundWithCriteria=Nav drošības pasākums ir atzīts par šādiem meklēšanas kritērijiem ir. SeeLocalSendMailSetup=Skatiet sendmail iestatījumus BackupDesc=Lai izveidotu pilnu Dolibarr rezerves kopiju jums ir: -BackupDesc2=* Saglabājiet saturs Dokumentu direktorijā (%s), kas ietver visu augšupielādēto un rada failus (jūs varat zip piemēram). -BackupDesc3=* Saglabājiet saturu jūsu datubāzi dump failu. Lai to izdarītu, jūs varat izmantot šo palīgs. +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=Arhivēto katalogs jāglabā drošā vietā. BackupDescY=Radītais dump fails jāglabā drošā vietā. BackupPHPWarning=Rezerves nevar būt guaranted ar šo metodi. Dod iepriekšējo RestoreDesc=Lai atjaunotu Dolibarr rezeves kopiju jums ir: -RestoreDesc2=* Atjaunot arhīva failu (zip fails piemēram) dokumentu direktoriju, lai iegūtu koku failus dokumentu direktoriju jaunu Dolibarr iekārtu vai uz šiem pašreizējiem dokumentiem directoy (%s). -RestoreDesc3=* Atjaunot datus, no backup dump failu, datu bāzē jaunās Dolibarr iekārtai vai datu bāzē uz šo pašreizējo uzstādīšana. Brīdinājums, kad atjaunot ir pabeigta, jums ir jāizmanto login / paroli, kas pastāvēja tad, kad rezerves tika veikts, lai izveidotu savienojumu vēlreiz. Lai atjaunotu rezerves datubāzi šo pašreizējo uzstādīšanas, jūs varat sekot šo palīgu. +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 imports ForcedToByAModule= Šis noteikums ir spiests %s ar aktivēto modulis PreviousDumpFiles=Pieejamās datu bāzes rezerves kopijas faili @@ -1337,6 +1336,8 @@ LDAPFieldCountry=Valsts LDAPFieldCountryExample=Piemērs: c LDAPFieldDescription=Apraksts LDAPFieldDescriptionExample=Piemērs: apraksts +LDAPFieldNotePublic=Public Note +LDAPFieldNotePublicExample=Example : publicnote LDAPFieldGroupMembers= Grupas dalībnieki LDAPFieldGroupMembersExample= Piemērs: uniqueMember LDAPFieldBirthdate=Dzimšanas diena @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= Noklusējuma konts, lai izmantotu, lai saņemtu maksā 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot 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 @@ -1616,3 +1617,8 @@ 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 +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" diff --git a/htdocs/langs/lv_LV/banks.lang b/htdocs/langs/lv_LV/banks.lang index 3c7dfa65ec17c..01851c44132fd 100644 --- a/htdocs/langs/lv_LV/banks.lang +++ b/htdocs/langs/lv_LV/banks.lang @@ -33,8 +33,8 @@ AllTime=No sākuma Reconciliation=Samierināšanās RIB=Bankas konta numurs IBAN=IBAN numurs -IbanValid=IBAN is Valid -IbanNotValid=IBAN is Not Valid +IbanValid=IBAN ir pareizs +IbanNotValid=IBAN nav pareizs BIC=BIC / SWIFT numurs SwiftValid=BIC/SWIFT is Valid SwiftNotValid=BIC/SWIFT is Not Valid @@ -163,3 +163,5 @@ LabelRIB=BAN Label NoBANRecord=No BAN record DeleteARib=Delete BAN record ConfirmDeleteRib=Are you sure you want to delete this BAN record ? +StartDate=Start date +EndDate=End date diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang index 51186618520be..9b92efa06f35b 100644 --- a/htdocs/langs/lv_LV/bills.lang +++ b/htdocs/langs/lv_LV/bills.lang @@ -298,6 +298,7 @@ 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ē +MergingPDFTool=Merging PDF tool # PaymentConditions PaymentConditionShortRECEP=Tūlītēja diff --git a/htdocs/langs/lv_LV/boxes.lang b/htdocs/langs/lv_LV/boxes.lang index 48eed47a28032..2dd27d774c7ec 100644 --- a/htdocs/langs/lv_LV/boxes.lang +++ b/htdocs/langs/lv_LV/boxes.lang @@ -12,6 +12,7 @@ BoxLastProspects=Pēdējās modificēti perspektīvas BoxLastCustomers=Pēdējie labotie klienti BoxLastSuppliers=Pēdējie labotie piegādātāji BoxLastCustomerOrders=Pēdējie klientu pasūtījumi +BoxLastValidatedCustomerOrders=Pēdējais apstiprinātais klienta pasūtījums BoxLastBooks=Pēdējie grāmatojumi BoxLastActions=Pēdējās darbības BoxLastContracts=Pēdējie līgumi @@ -27,26 +28,29 @@ BoxTitleNbOfCustomers=Klientu skaits BoxTitleLastRssInfos=Pēdējās %s ziņas no %s BoxTitleLastProducts=Pēdējie %s labotie produkti/pakalpojumi BoxTitleProductsAlertStock=Produktu un krājumu brīdinājumi -BoxTitleLastCustomerOrders=Pēdējie %s labotie klientu pasūtījumi +BoxTitleLastCustomerOrders=Pēdējie %s klientu pasutījumi +BoxTitleLastModifiedCustomerOrders=Pēdējie %s labotais klienta pasūtījums BoxTitleLastSuppliers=Pēdējie %s reģistrētie piegādātāji BoxTitleLastCustomers=Pēdējie %s reģistrētie klienti BoxTitleLastModifiedSuppliers=Pēdējie %s labotie piegādātāji BoxTitleLastModifiedCustomers=Pēdējie %s labotie klienti -BoxTitleLastCustomersOrProspects=Pēdējie %s labotie klienti vai izredzes -BoxTitleLastPropals=Pēdējās %s ierakstītie priekšlikumi +BoxTitleLastCustomersOrProspects=Pēdējie %s kienti vai piedāvājumi +BoxTitleLastPropals=Pēdējie %s piedāvājumi +BoxTitleLastModifiedPropals=Pēdējie %s labotais piedāvājums BoxTitleLastCustomerBills=Pēdējie %s klienta'u rēķini +BoxTitleLastModifiedCustomerBills=Pēdējie %s labotie klienta rēķini BoxTitleLastSupplierBills=Pēdējie %s piegādātāju rēķini -BoxTitleLastProspects=Pēdējās %s reģistrē izredzes +BoxTitleLastModifiedSupplierBills=Pēdējie %s labotie piegādātāja rēķini BoxTitleLastModifiedProspects=Pēdējās %s modificēta perspektīvas BoxTitleLastProductsInContract=Pēdējie %s produkti/pakalpojumi līgumā -BoxTitleLastModifiedMembers=Pēdējie %s labotie dalībnieki +BoxTitleLastModifiedMembers=Pēdējie %s dalībnieki BoxTitleLastFicheInter=Pēdējās %s modificēts iejaukšanās -BoxTitleOldestUnpaidCustomerBills=Vecākais %s neapmaksātais klienta'u rēķins -BoxTitleOldestUnpaidSupplierBills=Vecākie %s neapmaksātie piegādātāja'u rēķini +BoxTitleOldestUnpaidCustomerBills=Vecākie %s neapmaksātie klientu rēķini +BoxTitleOldestUnpaidSupplierBills=Vecākie %s neapmaksātie piegādātāju rēķini BoxTitleCurrentAccounts=Atvērto kontu bilances BoxTitleSalesTurnover=Apgrozījums -BoxTitleTotalUnpaidCustomerBills=Nesamaksātie klienta(-u) rēķini -BoxTitleTotalUnpaidSuppliersBills=Neapmaksātie piegādātāja -u rēķini +BoxTitleTotalUnpaidCustomerBills=Neapmaksātie klientu rēķini +BoxTitleTotalUnpaidSuppliersBills=Neapmaksātie piegādātāju rēķini BoxTitleLastModifiedContacts=Pēdējās %s labotās kontakti/adreses BoxMyLastBookmarks=Manas pēdējās %s grāmatzīmes BoxOldestExpiredServices=Vecākais aktīvais beidzies pakalpojums @@ -76,7 +80,8 @@ NoContractedProducts=Nav produktu / pakalpojumu līgumi NoRecordedContracts=Nav saglabātu līgumu NoRecordedInterventions=Nav ierakstītie pasākumi BoxLatestSupplierOrders=Jaunākie piegādātāja pasūtījumi -BoxTitleLatestSupplierOrders=%s jaunākie piegādātāju pasūtījumi +BoxTitleLatestSupplierOrders=Pēdējie %s piegādātāju pasūtījumi +BoxTitleLatestModifiedSupplierOrders=Pēdējie %s labotie piegādātāja rēķini NoSupplierOrder=Nav ierakstītu piegādātāju pasūtījumu BoxCustomersInvoicesPerMonth=Klientu rēķini mēnesī BoxSuppliersInvoicesPerMonth=Piegādātājs rēķini mēnesī @@ -89,3 +94,4 @@ BoxProductDistributionFor=Izplatīšana %s par %s ForCustomersInvoices=Klientu rēķini ForCustomersOrders=Klientu pasūtījumi ForProposals=Priekšlikumi +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang index 916ac4676a6a1..4d6591c25697d 100644 --- a/htdocs/langs/lv_LV/errors.lang +++ b/htdocs/langs/lv_LV/errors.lang @@ -159,14 +159,17 @@ ErrorPriceExpression22=Negatīvs rezultāts '%s' 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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=Obligātie uzstādīšanas parametri vēl nav definētas diff --git a/htdocs/langs/lv_LV/interventions.lang b/htdocs/langs/lv_LV/interventions.lang index 2b5798ca1982a..d50b3dd48fb6a 100644 --- a/htdocs/langs/lv_LV/interventions.lang +++ b/htdocs/langs/lv_LV/interventions.lang @@ -50,4 +50,4 @@ ArcticNumRefModelError=Neizdevās aktivizēt PacificNumRefModelDesc1=Atgriešanās Numero ar formātu %syymm-NNNN kur yy ir gads, MM ir mēnesis, un nnnn ir secība bez pārtraukuma un bez atgriešanos 0 PacificNumRefModelError=Iejaukšanās karte sākot ar syymm $ jau pastāv un nav saderīgs ar šo modeli secību. Noņemt to vai pārdēvēt to aktivizētu šo moduli. PrintProductsOnFichinter=Drukāt produktus intervences kartes -PrintProductsOnFichinterDetails=forinterventions iegūti no pasūtījumiem +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang index c080d22c7080a..6dd995c2a18da 100644 --- a/htdocs/langs/lv_LV/main.lang +++ b/htdocs/langs/lv_LV/main.lang @@ -220,6 +220,7 @@ Next=Nākamais Cards=Kartes Card=Karte Now=Tagad +HourStart=Start hour Date=Datums DateAndHour=Datums un laiks DateStart=Sākuma datums @@ -242,6 +243,8 @@ DatePlanShort=Plānotais datums DateRealShort=Reālais datums DateBuild=Ziņojuma veidošanas datums DatePayment=Maksājuma datums +DateApprove=Approving date +DateApprove2=Approving date (second approval) DurationYear=gads DurationMonth=mēnesis DurationWeek=nedēļa @@ -408,6 +411,8 @@ OtherInformations=Citas informācija Quantity=Daudzums Qty=Daudz ChangedBy=Labojis +ApprovedBy=Approved by +ApprovedBy2=Approved by (second approval) ReCalculate=Pārrēķināt ResultOk=Veiksmīgi ResultKo=Neveiksme @@ -696,6 +701,8 @@ SelectElementAndClickRefresh=Izvēlieties elementu un nospiediet atjaunot PrintFile=Print File %s ShowTransaction=Rādīt transakcijas GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide. +Deny=Deny +Denied=Denied # Week day Monday=Pirmdiena Tuesday=Otrdiena diff --git a/htdocs/langs/lv_LV/orders.lang b/htdocs/langs/lv_LV/orders.lang index c53ed262d23b0..5fa4c7b43f560 100644 --- a/htdocs/langs/lv_LV/orders.lang +++ b/htdocs/langs/lv_LV/orders.lang @@ -79,7 +79,9 @@ NoOpenedOrders=Nav atvērti pasūtījumi NoOtherOpenedOrders=Nav neviens cits atvērts pasūtījumus NoDraftOrders=Nav projektu pasūtījumi OtherOrders=Citi rīkojumi -LastOrders=Pēdējie %s pasūtījumi +LastOrders=Last %s customer orders +LastCustomerOrders=Last %s customer orders +LastSupplierOrders=Last %s supplier orders LastModifiedOrders=Pēdējie %s labotie pasūtījumi LastClosedOrders=Pēdējie %s slēgtie pasūtījumi AllOrders=Visi pasūtījumi diff --git a/htdocs/langs/lv_LV/other.lang b/htdocs/langs/lv_LV/other.lang index fa1e46bc8e26c..93c60274205e4 100644 --- a/htdocs/langs/lv_LV/other.lang +++ b/htdocs/langs/lv_LV/other.lang @@ -203,6 +203,7 @@ NewKeyWillBe=Jūsu jaunais galvenais, lai pieteiktos uz programmatūru, būs ClickHereToGoTo=Klikšķiniet šeit, lai dotos uz %s YouMustClickToChange=Jums ir Taču vispirms noklikšķiniet uz šīs saites, lai apstiprinātu šo paroles maiņa ForgetIfNothing=Ja Jums nav lūgt šīs izmaiņas, vienkārši aizmirst šo e-pastu. Jūsu akreditācijas dati tiek glabāti drošībā. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=Pievienot ierakstu kalendārā %s diff --git a/htdocs/langs/lv_LV/productbatch.lang b/htdocs/langs/lv_LV/productbatch.lang index 97e10b129ff07..589569835562a 100644 --- a/htdocs/langs/lv_LV/productbatch.lang +++ b/htdocs/langs/lv_LV/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use batch/serial number -ProductStatusOnBatch=Yes (Batch/serial required) -ProductStatusNotOnBatch=No (Batch/serial not used) +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/serial not used) ProductStatusOnBatchShort=Jā ProductStatusNotOnBatchShort=Nē -Batch=Batch/Serial -atleast1batchfield=Eat-by date or Sell-by date or Batch number -batch_number=Batch/Serial number +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial 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 +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %s printEatby=Eat-by: %s printSellby=Sell-by: %s printQty=Daudz.: %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. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang index 4ea82dbcfbd5d..0bed0f2a3b4ff 100644 --- a/htdocs/langs/lv_LV/products.lang +++ b/htdocs/langs/lv_LV/products.lang @@ -264,6 +264,6 @@ GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson 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 +UpdateInterval=Atjaunošanās intervāls (minūtes) +LastUpdated=Pēdējo reizi atjaunots CorrectlyUpdated=Correctly updated diff --git a/htdocs/langs/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang index 534102353d37b..a1b50e232d955 100644 --- a/htdocs/langs/lv_LV/projects.lang +++ b/htdocs/langs/lv_LV/projects.lang @@ -14,6 +14,7 @@ MyTasksDesc=Šis skats ir tikai uz projektiem vai uzdevumus, jums ir kontakts (k 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). +AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. ProjectsArea=Projektu sadaļa NewProject=Jauns projekts AddProject=Izveidot projektu diff --git a/htdocs/langs/lv_LV/stocks.lang b/htdocs/langs/lv_LV/stocks.lang index dc0003b69ddb8..dbd7a6ae2401d 100644 --- a/htdocs/langs/lv_LV/stocks.lang +++ b/htdocs/langs/lv_LV/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Atcelt sūtīšanu DeleteSending=Dzēst nosūtot Stock=Krājums Stocks=Krājumi +StocksByLotSerial=Stock by lot/serial Movement=Kustība Movements=Kustības ErrorWarehouseRefRequired=Noliktava nosaukums ir obligāts @@ -78,6 +79,7 @@ IdWarehouse=Id noliktava DescWareHouse=Apraksts noliktava LieuWareHouse=Lokālā noliktava WarehousesAndProducts=Noliktavas un produkti +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=Vidējais svērtais ieejas cena AverageUnitPricePMP=Vidējais svērtais ieejas cena SellPriceMin=Pārdošanas Vienības cena @@ -131,4 +133,7 @@ IsInPackage=Contained into package 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/lv_LV/suppliers.lang b/htdocs/langs/lv_LV/suppliers.lang index 5cdb13ce298ab..4bd84c29eb204 100644 --- a/htdocs/langs/lv_LV/suppliers.lang +++ b/htdocs/langs/lv_LV/suppliers.lang @@ -43,4 +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) +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/lv_LV/trips.lang b/htdocs/langs/lv_LV/trips.lang index 27f569e1b83ca..9987251d363f2 100644 --- a/htdocs/langs/lv_LV/trips.lang +++ b/htdocs/langs/lv_LV/trips.lang @@ -35,49 +35,47 @@ TF_OTHER=Cits TF_TRANSPORTATION=Transportation TF_LUNCH=Pusdienas TF_METRO=Metro -TF_TRAIN=Train -TF_BUS=Bus -TF_CAR=Car +TF_TRAIN=Vilciens +TF_BUS=Autobuss +TF_CAR=Automašīna TF_PEAGE=Toll -TF_ESSENCE=Fuel -TF_HOTEL=Hostel -TF_TAXI=Taxi +TF_ESSENCE=Degviela +TF_HOTEL=Hostelis +TF_TAXI=Taksis 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 +AddLineMini=Pievienot Date_DEBUT=Period date start Date_FIN=Period date end -ModePaiement=Payment mode -Note=Note -Project=Project +ModePaiement=Maksājuma veids +Note=Piezīme +Project=Projekts VALIDATOR=User to inform for approbation -VALIDOR=Approved by +VALIDOR=Apstiprinājis AUTHOR=Recorded by -AUTHORPAIEMENT=Paied by +AUTHORPAIEMENT=Samaksājis REFUSEUR=Denied by -CANCEL_USER=Canceled by +CANCEL_USER=Atcelts -MOTIF_REFUS=Reason -MOTIF_CANCEL=Reason +MOTIF_REFUS=Iemesls +MOTIF_CANCEL=Iemesls DATE_REFUS=Deny date DATE_SAVE=Validation date DATE_VALIDE=Validation date -DateApprove=Approving date DATE_CANCEL=Cancelation date -DATE_PAIEMENT=Payment date +DATE_PAIEMENT=Maksājuma datums -Deny=Deny -TO_PAID=Pay -BROUILLONNER=Reopen +TO_PAID=Samaksāt +BROUILLONNER=Atvērt pa jaunu SendToValid=Sent to approve -ModifyInfoGen=Edit +ModifyInfoGen=Labot ValidateAndSubmit=Validate and submit for approval NOT_VALIDATOR=You are not allowed to approve this expense report @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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 3df78528d98f1..e823d364258a3 100644 --- a/htdocs/langs/mk_MK/admin.lang +++ b/htdocs/langs/mk_MK/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).
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_ 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) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s RefreshPhoneLink=Refresh link @@ -540,8 +541,8 @@ 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 +Module39000Name=Product lot +Module39000Desc=Lot 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 @@ -558,8 +559,6 @@ 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 @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, 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 +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Sales - Purchases CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Purchases +CalcLocaltax2=Purchases CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Sales +CalcLocaltax3=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 @@ -1018,14 +1017,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 @@ -1337,6 +1336,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 @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= Default account to use to receive payments by credit c 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot 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 @@ -1616,3 +1617,8 @@ 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 +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" diff --git a/htdocs/langs/mk_MK/banks.lang b/htdocs/langs/mk_MK/banks.lang index a2306950fb484..72639883e1ac2 100644 --- a/htdocs/langs/mk_MK/banks.lang +++ b/htdocs/langs/mk_MK/banks.lang @@ -163,3 +163,5 @@ LabelRIB=BAN Label NoBANRecord=No BAN record DeleteARib=Delete BAN record ConfirmDeleteRib=Are you sure you want to delete this BAN record ? +StartDate=Start date +EndDate=End date diff --git a/htdocs/langs/mk_MK/boxes.lang b/htdocs/langs/mk_MK/boxes.lang index 0596d677c46ad..c0180bebdaa46 100644 --- a/htdocs/langs/mk_MK/boxes.lang +++ b/htdocs/langs/mk_MK/boxes.lang @@ -1,91 +1,97 @@ # 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 -# 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 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 -# BoxTitleLastCustomerBills=Last %s customer's invoices -# BoxTitleLastSupplierBills=Last %s supplier's invoices -# BoxTitleLastProspects=Last %s recorded prospects -# BoxTitleLastModifiedProspects=Last %s modified prospects -# BoxTitleLastProductsInContract=Last %s products/services in a contract -# BoxTitleLastModifiedMembers=Last %s modified members -# BoxTitleLastFicheInter=Last %s modified intervention -# BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer's invoices -# BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier's invoices -# BoxTitleCurrentAccounts=Opened account's balances -# BoxTitleSalesTurnover=Sales turnover -# BoxTitleTotalUnpaidCustomerBills=Unpaid customer's invoices -# BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier's 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=%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 -# ForCustomersInvoices=Customers invoices -# ForCustomersOrders=Customers orders -# ForProposals=Proposals +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 +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/mk_MK/errors.lang b/htdocs/langs/mk_MK/errors.lang index 52e9f6aeae473..dbafde2f6e546 100644 --- a/htdocs/langs/mk_MK/errors.lang +++ b/htdocs/langs/mk_MK/errors.lang @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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/langs/mk_MK/interventions.lang b/htdocs/langs/mk_MK/interventions.lang index c79da05364e61..67d4f61d9f15d 100644 --- a/htdocs/langs/mk_MK/interventions.lang +++ b/htdocs/langs/mk_MK/interventions.lang @@ -50,4 +50,4 @@ 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 +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang index 27779080dd085..c7c79e7f81605 100644 --- a/htdocs/langs/mk_MK/main.lang +++ b/htdocs/langs/mk_MK/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 @@ -242,6 +243,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 +411,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 @@ -696,6 +701,8 @@ 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. +Deny=Deny +Denied=Denied # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/mk_MK/orders.lang b/htdocs/langs/mk_MK/orders.lang index 3d4f381c40b4d..044bcc0eb0174 100644 --- a/htdocs/langs/mk_MK/orders.lang +++ b/htdocs/langs/mk_MK/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/langs/mk_MK/other.lang b/htdocs/langs/mk_MK/other.lang index 9b2de3eeb9024..6b60f5eac9717 100644 --- a/htdocs/langs/mk_MK/other.lang +++ b/htdocs/langs/mk_MK/other.lang @@ -203,6 +203,7 @@ 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. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=Add entry in calendar %s diff --git a/htdocs/langs/mk_MK/productbatch.lang b/htdocs/langs/mk_MK/productbatch.lang index 452636819653f..85b1d27f3a611 100644 --- a/htdocs/langs/mk_MK/productbatch.lang +++ b/htdocs/langs/mk_MK/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use batch/serial number -ProductStatusOnBatch=Yes (Batch/serial required) -ProductStatusNotOnBatch=No (Batch/serial not used) +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/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 +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial 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 +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %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. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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/mk_MK/projects.lang b/htdocs/langs/mk_MK/projects.lang index 03c11382a2d8b..eac0f41d321f1 100644 --- a/htdocs/langs/mk_MK/projects.lang +++ b/htdocs/langs/mk_MK/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/langs/mk_MK/stocks.lang b/htdocs/langs/mk_MK/stocks.lang index 29706d1761545..c2b432d7f9b93 100644 --- a/htdocs/langs/mk_MK/stocks.lang +++ b/htdocs/langs/mk_MK/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Cancel sending DeleteSending=Delete sending Stock=Stock Stocks=Stocks +StocksByLotSerial=Stock by lot/serial Movement=Movement Movements=Movements ErrorWarehouseRefRequired=Warehouse reference name is required @@ -78,6 +79,7 @@ IdWarehouse=Id warehouse DescWareHouse=Description warehouse LieuWareHouse=Localisation warehouse WarehousesAndProducts=Warehouses and products +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=Weighted average input price AverageUnitPricePMP=Weighted average input price SellPriceMin=Selling Unit Price @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/mk_MK/suppliers.lang b/htdocs/langs/mk_MK/suppliers.lang index d9de79fe84dbc..e0552c064e8ce 100644 --- a/htdocs/langs/mk_MK/suppliers.lang +++ b/htdocs/langs/mk_MK/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) +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/mk_MK/trips.lang b/htdocs/langs/mk_MK/trips.lang index ba36fc9b07b6a..76b214abdb77f 100644 --- a/htdocs/langs/mk_MK/trips.lang +++ b/htdocs/langs/mk_MK/trips.lang @@ -69,11 +69,9 @@ 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 @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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 bd5c4996e2a43..db250d8d39a62 100644 --- a/htdocs/langs/nb_NO/admin.lang +++ b/htdocs/langs/nb_NO/admin.lang @@ -17,7 +17,7 @@ SessionId=Økt ID SessionSaveHandler=Handler for å lagre sessions SessionSavePath=Lagring økt lokalisering PurgeSessions=Utrenskning av øktene -ConfirmPurgeSessions=Har du virkelig ønsker å rense alle økter? Dette vil koble fra alle brukere (bortsett fra deg selv). +ConfirmPurgeSessions=Ønsker du virkelig å rense alle økter? Dette vil koble fra alle brukere (bortsett fra deg selv). NoSessionListWithThisHandler=Lagre session behandleren konfigurert i PHP ikke tillater å vise alle kjører økter. LockNewSessions=Lås nye tilkoblinger ConfirmLockNewSessions=Er du sikker på at du vil begrense eventuelle nye Dolibarr tilkobling til deg selv. Bare brukeren %s vil kunne koble til etter det. @@ -297,10 +297,11 @@ MenuHandlers=Menyhåndtering MenuAdmin=Menyredigering DoNotUseInProduction=Ikke bruk i produksjon ThisIsProcessToFollow=Dette er instillinger for: +ThisIsAlternativeProcessToFollow=This is an alternative setup to process: StepNb=Trinn %s FindPackageFromWebSite=Finn en pakke som inneholder funksjonen du vil bruke (for eksempel på nettsider %s). -DownloadPackageFromWebSite=Download package %s. -UnpackPackageInDolibarrRoot=Pakk ut filen i Dolibarrs rotmappe %s +DownloadPackageFromWebSite=Last ned pakke %s +UnpackPackageInDolibarrRoot=Pakk ut filen i katalogen for eksterne moduler: %s SetupIsReadyForUse=Installasjonen er ferdig og Dolibarr er klar til bruk med den nye modulen. NotExistsDirect=Alternativ rotkatalog er ikke definert.
InfDirAlt=Etter versjon 3 er det mulig å definere en alternativ rotkatalog. Dette lar deg lagre plug-ins og egendefinerte maler på samme sted.
Bare lag en katalog i roten av Dolibarr (f.eks: egendefinert).
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_ 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=Bibliotek som brukes til å bygge 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) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Angi et telefonnummer å ringe for å vise en link for å teste ClickToDial url for bruker%s RefreshPhoneLink=Oppdater kobling @@ -540,15 +541,15 @@ Module6000Name=Arbeidsflyt 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 +Module39000Name=Product lot +Module39000Desc=Lot or serial number, eat-by and sell-by date management on products Module50000Name=PAYBOX Module50000Desc=Modul å tilby en online betaling side med kredittkort med PAYBOX Module50100Name=Kassaapparat Module50100Desc=Kassaapparatmodul Module50200Name=Paypal Module50200Desc=Modul å tilby en online betaling side med kredittkort med Paypal -Module50400Name=Accounting (advanced) +Module50400Name=Regnskap (avansert) 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). @@ -558,8 +559,6 @@ Module59000Name=Marginer Module59000Desc=Modul for å administrere marginer Module60000Name=Provisjoner Module60000Desc=Modul for å administrere provisjoner -Module150010Name=Batch number, eat-by date and sell-by date -Module150010Desc=batch number, eat-by date and sell-by date management for product Permission11=Vise fakturaer Permission12=Lage/Endre fakturaer Permission13=Unvalidate fakturaer @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= RE rate som standard når du oppretter utsikter, fakturae LocalTax2IsNotUsedDescES= Som standard den foreslåtte IRPF er 0. Slutt på regelen. LocalTax2IsUsedExampleES= I Spania, frilansere og selvstendige fagfolk som leverer tjenester og bedrifter som har valgt skattesystemet til moduler. LocalTax2IsNotUsedExampleES= I Spania er de bussines ikke skattepliktig system av moduler. -CalcLocaltax=Rapporter -CalcLocaltax1ES=Sales - Purchases +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Sales - Purchases CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Purchases +CalcLocaltax2=Purchases CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Sales +CalcLocaltax3=Sales CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales LabelUsedByDefault=Etiketten som brukes som standard hvis ingen oversettelse kan bli funnet for kode LabelOnDocuments=Etiketten på dokumenter @@ -972,14 +971,14 @@ EventsSetup=Innstillinger for hendelseslogger LogEvents=Hendelser relatert til sikkerhet Audit=Revisjon InfoDolibarr=Infos Dolibarr -InfoBrowser=Infos Browser +InfoBrowser=Info om nettleser InfoOS=Info om OS InfoWebServer=Infos webserver InfoDatabase=Infos database InfoPHP=Infos PHP InfoPerf=Infos performances -BrowserName=Browser name -BrowserOS=Browser OS +BrowserName=Navn på nettleser +BrowserOS=Nettleserens operativsystem ListEvents=Hendelsesrevisjon ListOfSecurityEvents=Oversikt over sikkerhetshendelser i Dolibarr SecurityEventsPurged=Sikkerhetshendelser renset @@ -1018,14 +1017,14 @@ NoEventOrNoAuditSetup=Ingen sikkerhetsinnstillinger er registrert ennå. Dette k NoEventFoundWithCriteria=Ingen søketreff i sikkerhetshendelser. SeeLocalSendMailSetup=Se lokalt sendmail-oppsett BackupDesc=Å lage en komplett sikkerhetskopi av Dolibarr, må du: -BackupDesc2=* Lagre innholdet av dokumenter katalogen (%s) som inneholder alle lastet opp og genererte filer (du kan lage en zip for eksempel). -BackupDesc3=* Lagre innholdet i databasen din til en fylling arkiv. for dette, kan du bruke følgende assistent. +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=Arkiverte katalogen skal oppbevares på et trygt sted. BackupDescY=Den genererte dumpfil bør oppbevares på et trygt sted. BackupPHPWarning=Backup kan ikke garanteres med denne metoden. Foretrekker forrige RestoreDesc=Hvis du vil gjenopprette en sikkerhetskopi Dolibarr, må du: -RestoreDesc2=* Gjenopprett arkivet fil (zip-fil for eksempel) av dokumenter katalog for å pakke ut tre av filer i katalogen dokumenter av en ny Dolibarr installasjon eller inn i denne aktuelle dokumenter directoy (%s). -RestoreDesc3=* Gjenopprette data fra en sikkerhetskopi dumpfil inn i databasen til den nye Dolibarr installasjonen eller inn i databasen for denne installasjonen. Advarsel, når gjenopprettingen er ferdig, må du bruke en login / passord, som eksisterte da sikkerhetskopien ble laget, å koble til igjen. Hvis du vil gjenopprette en sikkerhetskopi database inn i denne aktuelle installasjonen, kan du følge denne assistent. +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= Denne regelen er tvunget til å %s av en aktivert modul PreviousDumpFiles=Tilgjengelig database backup dump filer @@ -1058,8 +1057,8 @@ ExtraFieldsThirdParties=Komplementære attributter (thirdparty) ExtraFieldsContacts=Komplementære attributter (kontakt / adresse) ExtraFieldsMember=Komplementære attributter (medlem) ExtraFieldsMemberType=Komplementære attributter (medlem type) -ExtraFieldsCustomerOrders=Complementary attributes (orders) -ExtraFieldsCustomerInvoices=Complementary attributes (invoices) +ExtraFieldsCustomerOrders=Tilleggsattributter (ordre) +ExtraFieldsCustomerInvoices=Tilleggsattributter (faktura) ExtraFieldsSupplierOrders=Komplementære attributter (ordre) ExtraFieldsSupplierInvoices=Komplementære attributter (fakturaer) ExtraFieldsProject=Komplementære attributter (prosjekter) @@ -1084,7 +1083,7 @@ ConditionIsCurrently=Tilstand er for øyeblikket %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 +SearchOptim=Forbedre søket 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. @@ -1337,6 +1336,8 @@ LDAPFieldCountry=Country LDAPFieldCountryExample=Example : c LDAPFieldDescription=Description LDAPFieldDescriptionExample=Example : description +LDAPFieldNotePublic=Public Note +LDAPFieldNotePublicExample=Example : publicnote LDAPFieldGroupMembers= Gruppemedlemmer LDAPFieldGroupMembersExample= Eksempel: uniqueMember LDAPFieldBirthdate=Birthdate @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= Konto som skal brukes til å motta kontant betaling me 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot 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 @@ -1584,17 +1585,17 @@ TaskModelModule=Tasks reports document model 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 +FiscalYears=Regnskapsår +FiscalYear=Regnskapsår +FiscalYearCard=Kort for regnskapsår +NewFiscalYear=Nytt regnskapsår +EditFiscalYear=Endre regnskapsår +OpenFiscalYear=Åpne regnskapsår +CloseFiscalYear=Lukk regnskapsår +DeleteFiscalYear=Slett regnskapsår +ConfirmDeleteFiscalYear=Er du sikker på at du vil slette dette regnskapsåret? +Opened=Åpnet +Closed=Lukket 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 @@ -1616,3 +1617,8 @@ 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 +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" diff --git a/htdocs/langs/nb_NO/banks.lang b/htdocs/langs/nb_NO/banks.lang index 754164a0f6981..ff4fb1bc722ea 100644 --- a/htdocs/langs/nb_NO/banks.lang +++ b/htdocs/langs/nb_NO/banks.lang @@ -163,3 +163,5 @@ LabelRIB=BAN Etikett NoBANRecord=Ingen BAN kort DeleteARib=BAN-kort slettet ConfirmDeleteRib=Er du sikker på at du vil slette dette BAN-kortet? +StartDate=Start date +EndDate=End date diff --git a/htdocs/langs/nb_NO/boxes.lang b/htdocs/langs/nb_NO/boxes.lang index 91a6b66cb78dd..0b64eab725aee 100644 --- a/htdocs/langs/nb_NO/boxes.lang +++ b/htdocs/langs/nb_NO/boxes.lang @@ -94,3 +94,4 @@ BoxProductDistributionFor=Fordeling av %s for %s ForCustomersInvoices=Kundens fakturaer ForCustomersOrders=Kundeordrer ForProposals=Tilbud +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang index 4c05c7e2f260b..304d4fa1b3ec4 100644 --- a/htdocs/langs/nb_NO/errors.lang +++ b/htdocs/langs/nb_NO/errors.lang @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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/langs/nb_NO/interventions.lang b/htdocs/langs/nb_NO/interventions.lang index e43b62b6a7141..cd64f8484af8e 100644 --- a/htdocs/langs/nb_NO/interventions.lang +++ b/htdocs/langs/nb_NO/interventions.lang @@ -50,4 +50,4 @@ ArcticNumRefModelError=Feil ved aktivering PacificNumRefModelDesc1=Gir et nummer med formatet %sååmm-nnnn hvor åå er året, mm er måneden og nnnn er et løpenummer som ikke settes tilbake til null PacificNumRefModelError=Det finnes allerede et intervensjonskort som starter med $sååmm, og dette er ikke kompatibelt med denne nummereringsmodellen. Du må fjerne denne for å aktivere denne modellen. PrintProductsOnFichinter=Print products on intervention card -PrintProductsOnFichinterDetails=forinterventions generated from orders +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang index bcbad4f6d7251..53e4bb76867b9 100644 --- a/htdocs/langs/nb_NO/main.lang +++ b/htdocs/langs/nb_NO/main.lang @@ -220,6 +220,7 @@ Next=Neste Cards=Kort Card=Kort Now=Nå +HourStart=Start hour Date=Dato DateAndHour=Date and hour DateStart=Startdato @@ -242,6 +243,8 @@ DatePlanShort=Planlagt dato DateRealShort=Virkelig dato DateBuild=Rapport bygge dato DatePayment=Dato for betaling +DateApprove=Approving date +DateApprove2=Approving date (second approval) DurationYear=år DurationMonth=måned DurationWeek=uke @@ -408,6 +411,8 @@ OtherInformations=Annen informasjon Quantity=Antall Qty=Ant ChangedBy=Endret av +ApprovedBy=Approved by +ApprovedBy2=Approved by (second approval) ReCalculate=Rekalkuler ResultOk=Success ResultKo=Feil @@ -696,6 +701,8 @@ 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. +Deny=Deny +Denied=Denied # Week day Monday=Mandag Tuesday=Tirsdag diff --git a/htdocs/langs/nb_NO/orders.lang b/htdocs/langs/nb_NO/orders.lang index e013d9b79c959..f09adadfcef95 100644 --- a/htdocs/langs/nb_NO/orders.lang +++ b/htdocs/langs/nb_NO/orders.lang @@ -79,7 +79,9 @@ NoOpenedOrders=Ingen åpne ordre NoOtherOpenedOrders=Ingen andre åpne ordre NoDraftOrders=Ingen ordreutkast OtherOrders=Andre ordre -LastOrders=Siste %s ordre +LastOrders=Last %s customer orders +LastCustomerOrders=Last %s customer orders +LastSupplierOrders=Last %s supplier orders LastModifiedOrders=Siste %s endrede ordre LastClosedOrders=Siste %s lukkede ordre AllOrders=Alle ordre diff --git a/htdocs/langs/nb_NO/other.lang b/htdocs/langs/nb_NO/other.lang index 1fa27e70bac68..9f7d9fb26ccc9 100644 --- a/htdocs/langs/nb_NO/other.lang +++ b/htdocs/langs/nb_NO/other.lang @@ -203,6 +203,7 @@ NewKeyWillBe=Your new key to login to software will be ClickHereToGoTo=Klikk her for å gå til %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. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=Legg oppføring til kalender %s diff --git a/htdocs/langs/nb_NO/productbatch.lang b/htdocs/langs/nb_NO/productbatch.lang index 452636819653f..85b1d27f3a611 100644 --- a/htdocs/langs/nb_NO/productbatch.lang +++ b/htdocs/langs/nb_NO/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use batch/serial number -ProductStatusOnBatch=Yes (Batch/serial required) -ProductStatusNotOnBatch=No (Batch/serial not used) +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/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 +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial 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 +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %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. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang index 62a33832a1002..ec9d88be647d3 100644 --- a/htdocs/langs/nb_NO/projects.lang +++ b/htdocs/langs/nb_NO/projects.lang @@ -14,6 +14,7 @@ MyTasksDesc=Denne visningen er begrenset til prosjekter eller oppgaver du er en 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). +AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. ProjectsArea=Prosjektområde NewProject=Nytt prosjekt AddProject=Create project diff --git a/htdocs/langs/nb_NO/sendings.lang b/htdocs/langs/nb_NO/sendings.lang index 60d7aa4c22ada..954684d1e159e 100644 --- a/htdocs/langs/nb_NO/sendings.lang +++ b/htdocs/langs/nb_NO/sendings.lang @@ -53,7 +53,7 @@ DocumentModelSimple=ENkel dokumentmodell DocumentModelMerou=Merou A5 modell WarningNoQtyLeftToSend=Advarsel, ingen produkter venter sendes. StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). -DateDeliveryPlanned=Høvlet levering +DateDeliveryPlanned=Planlagt levering innen DateReceived=Dato levering mottatt SendShippingByEMail=Send forsendelse via e-post SendShippingRef=Submission of shipment %s diff --git a/htdocs/langs/nb_NO/stocks.lang b/htdocs/langs/nb_NO/stocks.lang index 988c8729d87eb..bdaedd32a9984 100644 --- a/htdocs/langs/nb_NO/stocks.lang +++ b/htdocs/langs/nb_NO/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Avbryt levering DeleteSending=Slett levering Stock=Lagerbeholdning Stocks=Lagerbeholdning +StocksByLotSerial=Stock by lot/serial Movement=Bevegelse Movements=Bevegelser ErrorWarehouseRefRequired=Du må angi et navn på lageret @@ -78,6 +79,7 @@ IdWarehouse=Id lager DescWareHouse=Beskrivelse av lager LieuWareHouse=Lagerlokasjon WarehousesAndProducts=Lager og varer +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=Veid gjennomsnittlig inngang pris AverageUnitPricePMP=Veid gjennomsnittlig inngang pris SellPriceMin=Selge Enhetspris @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/nb_NO/suppliers.lang b/htdocs/langs/nb_NO/suppliers.lang index 329b4134696ad..3c0b6c7b4c25f 100644 --- a/htdocs/langs/nb_NO/suppliers.lang +++ b/htdocs/langs/nb_NO/suppliers.lang @@ -43,4 +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) +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/nb_NO/trips.lang b/htdocs/langs/nb_NO/trips.lang index 03337d82ee623..8d455d35fc4c1 100644 --- a/htdocs/langs/nb_NO/trips.lang +++ b/htdocs/langs/nb_NO/trips.lang @@ -69,11 +69,9 @@ 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 @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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/bills.lang b/htdocs/langs/nl_BE/bills.lang index 3e9c2a738d8b5..eac85d2b8f2cb 100644 --- a/htdocs/langs/nl_BE/bills.lang +++ b/htdocs/langs/nl_BE/bills.lang @@ -29,8 +29,6 @@ PaymentsReportsForYear=Betalingsrapporten voor %s PaymentsReports=Betalingsrapporten PaymentsAlreadyDone=Reeds gedane betalingen PaymentMode=Betalingswijze -PaymentConditions=Betalingsvoorwaarden -PaymentConditionsShort=Betalingsvoorwaarden PaymentAmount=Bedrag betaling PaymentHigherThanReminderToPay=Bedrag hoger dan wat nog moet betaald worden ClassifyPaid=Classifiseer 'Betaald' diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang index 4eb15ee7988a8..f9146e16840c6 100644 --- a/htdocs/langs/nl_NL/admin.lang +++ b/htdocs/langs/nl_NL/admin.lang @@ -8,11 +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 +FileCheck=Bestand Integriteit +FilesMissing=Ontbrekende bestanden +FilesUpdated=Bijgewerkte bestanden +FileCheckDolibarr=Controleer Dolibarr Bestanden Integriteit +XmlNotFound=XML-bestand van Dolibarr Integriteit niet gevonden SessionId=Sessie-ID SessionSaveHandler=Wijze van sessieopslag SessionSavePath=Sessie opslaglocatie @@ -50,8 +50,8 @@ ErrorModuleRequireDolibarrVersion=Fout, deze module vereist Dolibarr versie %s o ErrorDecimalLargerThanAreForbidden=Fout, een nauwkeurigheid van meer dan %s wordt niet ondersteund. DictionarySetup=Woordenboek setup Dictionary=Woordenboeken -Chartofaccounts=Chart of accounts -Fiscalyear=Fiscal years +Chartofaccounts=Rekeningschema +Fiscalyear=Boekjaren ErrorReservedTypeSystemSystemAuto=De waarde 'system' en 'systemauto' als type zijn voorbehouden voor het systeem. Je kan 'user' als waarde gebruiken om je eigen gegevens-record toe te voegen. ErrorCodeCantContainZero=Code mag geen 0 bevatten DisableJavascript=JavaScript en Ajax functies uitzetten (Aanbevolen voor blinden of tekst browsers) @@ -227,7 +227,7 @@ AutomaticIfJavascriptDisabled=Automatisch als Javascript is uitgeschakeld AvailableOnlyIfJavascriptNotDisabled=Alleen beschikbaar als JavaScript niet is uitgeschakeld AvailableOnlyIfJavascriptAndAjaxNotDisabled=Alleen beschikbaar als JavaScript en AJAX niet zijn uitgeschakeld Required=Verplicht -UsedOnlyWithTypeOption=Used by some agenda option only +UsedOnlyWithTypeOption=Alleen gebruikt door sommige agenda opties Security=Beveiliging Passwords=Wachtwoorden DoNotStoreClearPassword=Geen onversleutelde wachtwoorden opslaan in de database, maar alleen versleutelde (Activering aanbevolen) @@ -268,9 +268,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS-host (Niet gedefiniee MAIN_MAIL_EMAIL_FROM=E-mailafzender voor automatische e-mails (Standaard in php.ini: %s) MAIN_MAIL_ERRORS_TO=Afzender e-mail gebruikt voor error rendementen e-mails verzonden MAIN_MAIL_AUTOCOPY_TO= Stuur systematisch een verborgen zogenoemde 'Carbon-Copy' van alle verzonden e-mails naar -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= Stuur systematisch een verborgen zogenoemde 'Carbon-Copy' van alle offertes via e-mails naar +MAIN_MAIL_AUTOCOPY_ORDER_TO= Stuur systematisch een verborgen zogenoemde 'Carbon-Copy' van alle bestellingen via e-mails naar +MAIN_MAIL_AUTOCOPY_INVOICE_TO= Stuur systematisch een verborgen zogenoemde 'Carbon-Copy' van alle facturen via e-mails naar MAIN_DISABLE_ALL_MAILS=Schakel alle e-mailverzendingen uit (voor testdoeleinden of demonstraties) MAIN_MAIL_SENDMODE=Te gebruiken methode om e-mails te verzenden MAIN_MAIL_SMTPS_ID=SMTP-gebruikersnaam indien verificatie vereist @@ -297,10 +297,11 @@ MenuHandlers=Menuverwerkers MenuAdmin=Menu wijzigen DoNotUseInProduction=Niet in productie gebruiken ThisIsProcessToFollow=Dit is ingesteld op de verwerking van: +ThisIsAlternativeProcessToFollow=Dit is een alternatieve instelling te verwerken: StepNb=Stap %s FindPackageFromWebSite=Vind een pakket die u de functionaliteit geeft die u wilt (bijvoorbeeld op de officiële website van %s). -DownloadPackageFromWebSite=Download package %s. -UnpackPackageInDolibarrRoot=Pak het pakketbestand uit in Dolibarr's root map %s +DownloadPackageFromWebSite=Download pakket %s. +UnpackPackageInDolibarrRoot=Pak het pakketbestand uit in Dolibarr's map bestemd voor externe modules: %s SetupIsReadyForUse=Installatie is voltooid en Dolibarr is gereed voor het gebruik van de nieuwe functionaliteit. NotExistsDirect=De alternatieve root directory is niet bepaald.
InfDirAlt=Vanaf versie 3 is het mogelijk om een alternatieve root directory te definiëren. Dit laat je toe om op dezelfde plaats zowel plug-ins als eigen templates te bewaren.
Maak gewoon een directory op het niveau van de root van Dolibarr (bv met de naam: aanpassing).
@@ -309,7 +310,7 @@ YouCanSubmitFile=Kies module: CurrentVersion=Huidige versie van Dolibarr CallUpdatePage=Ga naar de pagina die de databasestructuur en gegevens bijwerkt: %s. LastStableVersion=Laatste stabiele versie -UpdateServerOffline=Update server offline +UpdateServerOffline=Updateserver offline GenericMaskCodes=U kunt elk gewenst maskernummer invoeren. In dit masker, kunnen de volgende tags worden gebruikt:
{000000} correspondeert met een nummer welke vermeerderd zal worden op elke %s. Voer zoveel nullen in als de gewenste lengte van de teller. De teller wordt aangevuld met nullen vanaf links zodat er zoveel nullen zijn als in het masker.
{000000+000} hetzelfde als voorgaand maar een offset corresponderend met het nummer aan de rechterkant van het + teken is toegevoegd startend op de eerste %s.
{000000@x} hetzelfde als voorgaande maar de teller wordt gereset naar nul, wanneer maand x is bereikt (x tussen 1 en 12). Als deze optie is gebruikt en x is 2 of hoger, dan is de volgorde {yy}{mm} of {yyyy}{mm} ook vereist.
{dd} dag (01 t/m 31).
{mm} maand (01 t/m 12).
{yy}, {yyyy} of {y} jaat over 2, 4 of 1 nummer(s).
GenericMaskCodes2={Cccc} de klant code op n tekens
{} Cccc000 de klant code op n tekens gevolgd door een teller speciaal voor de klant. Deze teller speciaal voor de klant wordt teruggezet op hetzelfde moment dan globale teller.
{Tttt} De code van relatie soort van n tekens (zie relatie contanten).
GenericMaskCodes3=Alle andere karakters in het masker zullen intact blijven.
Spaties zijn niet toegestaan.
@@ -389,10 +390,10 @@ ExtrafieldSeparator=Scheidingsteken ExtrafieldCheckBox=Aanvink-vak ExtrafieldRadio=Radioknop ExtrafieldCheckBoxFromList= Checkbox from table -ExtrafieldLink=Link to an object +ExtrafieldLink=Link naar een 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
... +ExtrafieldParamHelpradio=Lijst van parameters moet bestaan uit sleutel,waarde

bv:
1,waarde
2,waarde2
3,waarde3
... ExtrafieldParamHelpsellist=Een parameterlijst afkomstig van een tabel
Syntax : table_name:label_field:id_field::filter
Bijvoorbeeld : c_typent:libelle:id::filter

filter kan een envoudige test zijn (bv active=1) om alleen active waarden te tonen
als u wilt filteren op extra velden gebruik syntax extra.fieldcode=... (waar fieldcode de code is van extrafield)

Om de lijst afhankelijk te maken van een andere lijst:
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=Bibliotheek om PDF's te maken @@ -495,38 +496,38 @@ 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 +Module520Name=Lening +Module520Desc=Het beheer van de leningen 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 +Module770Name=Onkostennota's +Module770Desc=Management en vordering onkostennota's (vervoer, maaltijden, ...) +Module1120Name=Leverancier commerciële voorstel +Module1120Desc=Leverancier verzoek commerciële voorstel en prijzen Module1200Name=Mantis Module1200Desc=Mantis integratie Module1400Name=Boekhouden Module1400Desc=Boekhoudkundig beheer van deskundigen (dubbel partijen) -Module1520Name=Document Generation -Module1520Desc=Mass mail document generation -Module1780Name=Tags/Categories -Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members) +Module1520Name=Documenten genereren +Module1520Desc=Massa mail document generen +Module1780Name=Labels/Categorien +Module1780Desc=Label/categorie maken (producten, klanten, leveranciers, contacten of leden) Module2000Name=Fckeditor Module2000Desc=Een WYSIWYG editor -Module2200Name=Dynamic Prices -Module2200Desc=Enable the usage of math expressions for prices +Module2200Name=Dynamische prijzen +Module2200Desc=Het gebruik van wiskundige uitdrukkingen voor prijzen mogelijk te maken Module2300Name=Cron -Module2300Desc=Scheduled job management +Module2300Desc=Beheer taakplanning Module2400Name=Agenda Module2400Desc=Acties-, taken- en agendabeheer Module2500Name=Electronic Content Management Module2500Desc=Opslaan en delen van documenten Module2600Name=Webdiensten Module2600Desc=Activeer de Dolibarr webdienstenserver -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=Webdiensten +Module2650Desc=Schakel de Dolibarr webservices client aan (Kan worden gebruikt om gegevens en / of aanvragen duwen naar externe servers. Leverancier bestellingen alleen ondersteund voor het moment) Module2700Name=Gravatar Module2700Desc=Gebruik de online dienst 'Gravatar' (www.gravatar.com) voor het posten van afbeeldingen van gebruikers / leden (gevonden door hun e-mails). Internet toegang vereist. Module2800Desc=FTP Client @@ -540,26 +541,24 @@ Module6000Name=Workflow Module6000Desc=Workflow beheer Module20000Name=Beheer van verlofverzoeken Module20000Desc=Bevestig en volg verlofverzoeken van medewerkers -Module39000Name=Product batch -Module39000Desc=Batch or serial number, eat-by and sell-by date management on products +Module39000Name=Product lot +Module39000Desc=Lot of serienummer, vervaldatum en de uiterste verkoopdatum beheer van producten Module50000Name=Paybox Module50000Desc=Module om een ​​online betaling pagina te bieden door creditcard met Paybox Module50100Name=Verkooppunt Module50100Desc=Kassamodule Module50200Name=Paypal Module50200Desc=Module om een ​​online betaling pagina te bieden per credit card met Paypal -Module50400Name=Accounting (advanced) -Module50400Desc=Accounting management (double parties) +Module50400Name=Boekhouding +Module50400Desc=Boekhoudkundig beheer 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 +Module54000Desc=Direct print (zonder het openen van de documenten) met behulp van Cups IPP-interface (Printer moet zichtbaar zijn vanaf de server zijn, en CUPS moet geinstalleerd zijn op de server). +Module55000Name=Poll Module55000Desc=Module om online polls (zoals Doodle, Studs, Rdvz, ...) te maken Module59000Name=Marges Module59000Desc=Module om de marges te beheren Module60000Name=Commissies Module60000Desc=Module om commissies te beheren -Module150010Name=Batchnummer, consumptie en de houdbaarheidsdatum -Module150010Desc=batchnummer, consumptie en de houdbaarheidsdatum beheer voor product Permission11=Bekijk afnemersfacturen Permission12=Creëer / wijzigen afnemersfacturen Permission13=Invalideer afnemersfacturen @@ -589,7 +588,7 @@ Permission67=Exporteer interventies Permission71=Bekijk leden Permission72=Creëer / wijzigen leden Permission74=Verwijder leden -Permission75=Setup types of membership +Permission75=Instelling lidsoorten en -attributen Permission76=Exporteer datas Permission78=Bekijk abonnementen Permission79=Creëer / wijzigen abonnementen @@ -612,8 +611,8 @@ Permission106=Export zendingen Permission109=Verwijder verzendingen Permission111=Bekijk de financiële rekeningen Permission112=Creëer / wijzig / verwijder en vergelijk transacties -Permission113=Setup financial accounts (create, manage categories) -Permission114=Reconciliate transactions +Permission113=Stel financiële rekeningen in (creëer, beheer, categoriseer) +Permission114=Afstemming overboekingen Permission115=Exporteer transacties en rekeningafschriften Permission116=Overschrijvingen tussen rekeningen Permission117=Beheer cheques verzending @@ -635,17 +634,17 @@ Permission162=Creëren/aanpassen contracten/abonnementen Permission163=Een dienst/abonnement van een contract activeren Permission164=Een dienst/abonnement van een contract uitschakelen Permission165=Verwijderen contracten/abonnementen -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 +Permission171=Lees reis- en onkosten (eigen en bijbehorenden) +Permission172=Creëren / bewerken reis- en onkosten +Permission173=Verwijder reis- en onkosten +Permission174=Lees alle reis en onkosten +Permission178=Exporteer reis- en onkosten Permission180=Bekijk leveranciers Permission181=Bekijk leverancier opdrachten Permission182=Creëren / wijzigen leverancier opdrachten Permission183=Valideer leveranciersopdrachten Permission184=Goedkeuren leveranciersopdrachten -Permission185=Order or cancel supplier orders +Permission185=Bestel of annuleer leverancieropdrachten Permission186=Ontvang leveranciersopdrachten Permission187=Sluiten leverancieropdrachten Permission188=Annuleren leverancieropdrachten @@ -696,7 +695,7 @@ Permission300=Bekijk streepjescodes Permission301=Creëren / wijzigen streepjescodes Permission302=Verwijderen streepjescodes Permission311=Diensten inzien -Permission312=Assign service/subscription to contract +Permission312=Dienst/abonnement aan het contract toevoegen Permission331=Bekijk weblinks Permission332=Creëren / wijzigen weblinks Permission333=Verwijderen weblinks @@ -717,11 +716,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 +Permission520=Lees Leningen +Permission522=Creëer/wijzigen leningen +Permission524=Verwijderen leningen +Permission525=Toegang lening calculator +Permission527=Export leningen Permission531=Diensten inzien Permission532=Creëren / wijzigen van diensten Permission534=Diensten verwijderen @@ -730,16 +729,16 @@ 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 +Permission771=Lees onkostennota's (eigen en zijn ondergeschikten) +Permission772=Creëer / wijzigen onkostennota's +Permission773=Verwijderen onkostennota's +Permission774=Lees alle onkostennota's (ook voor de gebruiker niet ondergeschikten) +Permission775=Goedkeuren onkostennota's +Permission776=Betalen onkostennota's +Permission779=Export onkostennota's Permission1001=Bekijk voorraden -Permission1002=Create/modify warehouses -Permission1003=Delete warehouses +Permission1002=Toevoegen/wijzigen van een magazijn +Permission1003=Verwijder magazijnen Permission1004=Bekijk voorraadmutaties Permission1005=Creëren / wijzigen voorraadmutaties Permission1101=Bekijk levering opdrachten @@ -754,7 +753,7 @@ Permission1185=Goedkeuren leveranciersopdrachten Permission1186=Bestel leveranciersopdrachten Permission1187=Bevestigt de ontvangst van de leveranciersopdrachten Permission1188=Sluiten leverancier opdrachten -Permission1190=Approve (second approval) supplier orders +Permission1190=Goedkeuren (tweede goedkeuring) leverancier bestellingen Permission1201=Geef het resultaat van een uitvoervergunning Permission1202=Creëren/wijzigen een uitvoervergunning Permission1231=Bekijk leveranciersfacturen @@ -767,10 +766,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=Read Scheduled job -Permission23002=Create/update Scheduled job -Permission23003=Delete Scheduled job -Permission23004=Execute Scheduled job +Permission23001=Lees geplande taak +Permission23002=Maak/wijzig geplande taak +Permission23003=Verwijder geplande taak +Permission23004=Voer geplande taak uit 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 @@ -817,7 +816,7 @@ DictionaryOrderMethods=Bestel methodes DictionarySource=Oorsprong van offertes / bestellingen DictionaryAccountancyplan=Rekeningschema DictionaryAccountancysystem=Modellen voor rekeningschema -DictionaryEMailTemplates=Emails templates +DictionaryEMailTemplates=Email documentensjablonen SetupSaved=Instellingen opgeslagen BackToModuleList=Terug naar moduleoverzicht BackToDictionaryList=Terug naar de woordenboeken lijst @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= Het standaard RE tarief bij het aanmaken van prospecten, LocalTax2IsNotUsedDescES= Standaard is de voorgestelde IRPF 0. Einde van de regel. LocalTax2IsUsedExampleES= In Spanje, freelancers en onafhankelijke professionals die diensten aanbieden alsmede bedrijven die voor het belastingsysteem van modules hebben gekozen. LocalTax2IsNotUsedExampleES= In Spanje zijn zij bedrijven die niet onderworpen zijn aan het belastingsysteem van modules. -CalcLocaltax=Rapporten -CalcLocaltax1ES=Verkopen - Aankopen +CalcLocaltax=Rapporten over lokale belastingen +CalcLocaltax1=Verkopen - Aankopen CalcLocaltax1Desc=Lokale belastings rapporten worden berekend met het verschil tussen verkopen en aankopen -CalcLocaltax2ES=Aankopen +CalcLocaltax2=Aankopen CalcLocaltax2Desc=Lokale Belastingen rapporten zijn het totaal van balastingen aankopen -CalcLocaltax3ES=Verkoop +CalcLocaltax3=Verkopen CalcLocaltax3Desc=Lokale Belastingen rapporten zijn het totaal van belastingen verkoop LabelUsedByDefault=Standaard te gebruiken label indien er geen vertaling kan worden gevonden voor de code LabelOnDocuments=Etiket op documenten @@ -972,13 +971,13 @@ EventsSetup=Instellingen voor gebeurtenissenlog LogEvents=Veiligheidsauditgebeurtenissen Audit=Audit InfoDolibarr=Dolibarr gegevens -InfoBrowser=Infos Browser +InfoBrowser=Browser gegevens InfoOS=OS gegevens InfoWebServer=Webserver gegevens InfoDatabase=Databank gegevens InfoPHP=PHP gegevens InfoPerf=Gegevens uitvoerings-efficiëntie -BrowserName=Browser name +BrowserName=Browser naam BrowserOS=Browser OS ListEvents=Auditgebeurtenissen ListOfSecurityEvents=Lijst van Dolibarr veiligheidgebeurtenisen @@ -1052,8 +1051,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) +ExtraFieldsSupplierOrdersLines=Complementaire attributen (orderregels) +ExtraFieldsSupplierInvoicesLines=Complementaire attributen (factuurregels) ExtraFieldsThirdParties=Aanvullende kenmerken (relaties) ExtraFieldsContacts=Aanvullende kenmerken (contact / adres) ExtraFieldsMember=Aanvullende kenmerken (lid) @@ -1071,26 +1070,26 @@ SendingMailSetup=Instellen van verzendingen via e-mail SendmailOptionNotComplete=Waarschuwing, op sommige Linux-systemen, e-mail verzenden vanaf uw e-mail, sendmail uitvoering setup moet conatins optie-ba (parameter mail.force_extra_parameters in uw php.ini-bestand). Als sommige ontvangers nooit e-mails ontvangen, probeer dit PHP parameter bewerken met mail.force_extra_parameters =-ba). PathToDocuments=Pad naar documenten PathDirectory=Map -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=Feature om e-mails met behulp van methode "PHP mail direct" te sturen zal een e-mailbericht dat niet goed zou kunnen worden ontleed door sommige het ontvangen van e-mailservers. Resultaat is dat sommige mails niet kunnen worden gelezen door mensen gehost door thoose afgeluisterd platforms. Het is het geval voor sommige Internet providers (Ex: Orange in Frankrijk). Dit is geen probleem in Dolibarr noch in PHP, maar op het ontvangen van e-mailserver. U kunt de optie MAIN_FIX_FOR_BUGGED_MTA echter toe te voegen aan 1 in setup - andere om Dolibarr wijzigen om dit te voorkomen. Echter, kunnen er problemen met andere servers dat opzicht strikt de SMTP-standaard. De andere oplossing (aanbevolen) is het gebruik van de methode "SMTP-socket bibliotheek" dat er geen nadelen heeft. TranslationSetup=Instelling van de taal TranslationDesc=Keuze taal zichtbaar op het scherm kan worden gewijzigd:
* Wereldwijd van Home-menu - Instellingen - Scherm
* Voor de gebruiker enkel van het tabblad Gebruiker weergave van de gebruiker kaart (klik op login op de top van het scherm). TotalNumberOfActivatedModules=Totaal aantal geactiveerde modules: %s YouMustEnableOneModule=Je moet minstens 1 module aktiveren -ClassNotFoundIntoPathWarning=Class %s not found into PHP path +ClassNotFoundIntoPathWarning=Classe %s niet gevonden in PHP pad YesInSummer=Ja in de zomer OnlyFollowingModulesAreOpenedToExternalUsers=Let op, alleen volgende modules worden opengesteld voor externe gebruikers (ongeacht de rechten van zulke gebruikers): -SuhosinSessionEncrypt=Session storage encrypted by Suhosin +SuhosinSessionEncrypt=Sessie opslag geencrypteerd door Suhosin ConditionIsCurrently=Voorwaarde is momenteel %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. +YouUseBestDriver=U gebruikt driver %s die momenteel meest geschikt is. +YouDoNotUseBestDriver=U gebruikt driver %s, maar driver %s is aangeraden +NbOfProductIsLowerThanNoPb=U hebt enkel %s producten/diensten in de database. Er is geen optimalisatie nodig. SearchOptim=Zoekmachine optimalisatie -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. +YouHaveXProductUseSearchOptim=U hebt %s producten in de database. U kan best de constante PRODUCT_DONOTSEARCH_ANYWHERE op 1 zetten in Home-instellingen-andere, u beperkt het zoeken tot begin van strings, waardoor de database een index kan gebruiken en een onmiddelijk resultaat geeft. BrowserIsOK=U gebruikt de webbrowser %s. Deze browser is in orde voor beveiliging en prestaties. BrowserIsKO=U gebruikt de webbrowser %s. Deze browser is een slechte keuze voor veiligheid, prestaties en betrouwbaarheid. Wij raden u aan Firefox, Chrome, Opera of Safari gebruiken. -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". +XDebugInstalled=Xdebug is geladen. +XCacheInstalled=Xcache is geladen. +AddRefInList=Weergave klant / leverancier ref in lijst (lijst of combobox) en de meeste van hyperlink. Relaties verschijnen met de naam "CC12345 - SC45678 - Het groot bedrijf coorp", in plaats van "Het groot bedrijf coorp". FieldEdition=Wijziging van het veld %s FixTZ=TimeZone fix FillThisOnlyIfRequired=Voorbeeld: +2 (alleen invullen als tijdzone offset problemen worden ervaren) @@ -1116,11 +1115,11 @@ 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 contact at time.
* or by setting global target email addresses in module setup page. +NotificationsDesc=De e-mailkennisgevingenfunctionaliteit stelt u in staat om automatisch e-mails naar derden te versturen voor sommige Dolibarr akties. Bestemmelingen voor kennisgevingen kunnen worden ingesteld:
per relatie contact (klanten of leveranciers),
of door een globaal doeladres in te stellen. ModelModules=Documentensjablonen DocumentModelOdt=Genereer documenten uit OpenDocuments sjablonen (. ODT of. ODS-bestanden voor OpenOffice, KOffice, TextEdit, ...) WatermarkOnDraft=Watermerk op conceptdocumenten -JSOnPaimentBill=Activate feature to autofill payment lines on payment form +JSOnPaimentBill=Activeert functie om de betalingslijnen op betalingsformulieren automatisch aan te vullen CompanyIdProfChecker=Professionele Id unieke MustBeUnique=Moet uniek zijn? MustBeMandatory=Verplicht om relaties te creëren? @@ -1180,14 +1179,14 @@ AddDeliveryAddressAbility=Voeg mogelijke leverdatum toe 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 +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Vraag naar bankrekening bestemming van het voorstel ##### 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=Prijsaanvragen leveranciers module instelling +AskPriceSupplierNumberingModules=Prijsaanvragen leveranciers nummering modellen +AskPriceSupplierPDFModules=Prijsaanvragen leveranciers documenten modellen +FreeLegalTextOnAskPriceSupplier=Vrije tekst op leveranciers prijsaanvragen +WatermarkOnDraftAskPriceSupplier=Watermerk op ontwerp leveranciers prijsaanvraag ​​(geen als leeg) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Vraag naar bankrekening bestemming van prijsaanvraag ##### Orders ##### OrdersSetup=Opdrachtenbeheerinstellingen OrdersNumberingModules=Opdrachtennummeringmodules @@ -1196,7 +1195,7 @@ HideTreadedOrders=Verberg de behandelde of geannuleerde orders in de lijst ValidOrderAfterPropalClosed=Om de opdracht te valideren na sluiting van de offerte, maakt het mogelijk om (TODO franse vertaling erbij pakken) FreeLegalTextOnOrders=Vrije tekst op opdrachten WatermarkOnDraftOrders=Watermerk op ontwerp-orders (geen indien leeg) -ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable +ShippableOrderIconInList=Voeg een icoon toe aan de lijst Bestellingen die aangeeft wanneer leverbaar BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order ##### Clicktodial ##### ClickToDialSetup='Click-To-Dial' moduleinstellingen @@ -1210,7 +1209,7 @@ FicheinterNumberingModules=Interventienummeringsmodules TemplatePDFInterventions=Interventiekaartdocumentensjablonen WatermarkOnDraftInterventionCards=Watermerk op interventiekaart documenten (geen indien leeg) ##### Contracts ##### -ContractsSetup=Contracts/Subscriptions module setup +ContractsSetup=Contracten/Abonnementen instellingen ContractsNumberingModules=Contracten nummering modules TemplatePDFContracts=Modeldocumenten contracten FreeLegalTextOnContracts=Vrije tekst op contracten @@ -1289,9 +1288,9 @@ LDAPSynchroKO=Synchronisatietest mislukt LDAPSynchroKOMayBePermissions=Synchronisatie test mislukt. Controleer of de verbinding met de server correct is ingesteld en LDAP udpates toestaat. LDAPTCPConnectOK=TCP verbinding met de LDAP-server succesvol (Server=%s, Port=%s) LDAPTCPConnectKO=TCP verbinding met de LDAP-server mislukt (Server=%s, Port=%s) -LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s) +LDAPBindOK=Verbinden en autorisatie met LDAP server geslaagd (Server=%s, Port=%s, Admin=%s, Password=%s) LDAPBindKO=Verbinden en autoriseren met LDAP server mislukt (Server=%s, Port=%s, Admin=%s, Password=%s) -LDAPUnbindSuccessfull=Disconnect successful +LDAPUnbindSuccessfull=Verbinding succesvol verbroken LDAPUnbindFailed=Verbreken verbinding mislukt LDAPConnectToDNSuccessfull=Verbinding met DN (%s) geslaagd LDAPConnectToDNFailed=Verbinding met DN (%s) mislukt @@ -1337,6 +1336,8 @@ LDAPFieldCountry=Land LDAPFieldCountryExample=Voorbeeld: c LDAPFieldDescription=Omschrijving LDAPFieldDescriptionExample=Voorbeeld: omschrijving +LDAPFieldNotePublic=Openbare Nota +LDAPFieldNotePublicExample=Voorbeeld: publicnote LDAPFieldGroupMembers= Groepsleden LDAPFieldGroupMembersExample= Voorbeeld : uniqueMember LDAPFieldBirthdate=Geboortedatum @@ -1348,7 +1349,7 @@ LDAPFieldSidExample=Voorbeeld: objectsid LDAPFieldEndLastSubscription=Datum van abonnementseinde LDAPFieldTitle=Functie LDAPFieldTitleExample=Voorbeeld: title -LDAPParametersAreStillHardCoded=LDAP parameters are still hardcoded (in contact class) +LDAPParametersAreStillHardCoded=LDAP instellngen staat nog ingesteld ('hardcoded') in de PHP klasse contact LDAPSetupNotComplete=LDAP instellingen niet compleet (ga naar de andere tabbladen) LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Geen beheerder of wachtwoord opgegeven. LDAP toegang zal anoniem zijn en in alleen-lezen modus. LDAPDescContact=Deze pagina maakt het u mogelijk LDAP-waarden in de LDAP structuur te koppelen aan elk gegeven in de Dolibarr contactpersonen @@ -1357,10 +1358,10 @@ LDAPDescGroups=Deze pagina maakt het u mogelijk LDAP-waarden in de LDAP structuu LDAPDescMembers=Deze pagina maakt het u mogelijk LDAP-waarden in de LDAP structuur te koppelen aan elk gegeven in de Dolibarr ledenmodule LDAPDescValues=Voorbeeldwaarden zijn ingesteld voor OpenLDAP geladen met de volgende schema's: TODO {VAR INSTELLEN?)core.schema, cosine.schema, inetorgperson.schema). Als udie waarden gebruikt en OpenLDAP, wijzigen dan uw LDAP 'config'-bestand slapd.conf om alle die schema's te laden. ForANonAnonymousAccess=Voor een geautoriseerde verbinding (bijvoorbeeld om over schrijfrechten te beschikken) -PerfDolibarr=Performance setup/optimizing report +PerfDolibarr=Prestaties setup / optimaliseren rapport YouMayFindPerfAdviceHere=U vindt op deze pagina een aantal controles of adviezen met betrekking tot de prestaties. NotInstalled=Niet geïnstalleerd, zodat uw server niet vertraagt -ApplicativeCache=Applicative cache +ApplicativeCache=Applicatieve 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. @@ -1374,7 +1375,7 @@ 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 +TestNotPossibleWithCurrentBrowsers=Automatische detectie niet mogelijk ##### Products ##### ProductSetup=Productenmoduleinstellingen ServiceSetup=Services module setup @@ -1419,7 +1420,7 @@ BarcodeDescUPC=Streepjescodetype UPC BarcodeDescISBN=Streepjescodetype ISBN BarcodeDescC39=Streepjescodetype C39 BarcodeDescC128=Streepjescodetype 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=Opdrachtregelprogramma voor streepjescodegeneratie (gebruikt door interne generator voor sommige barcode types). Moet compatible zijn met "genbarcode".
vb: /usr/local/bin/genbarcode BarcodeInternalEngine=Internal engine BarCodeNumberManager=Beheerder om automatisch barcode nummers te bepalen. ##### Prelevements ##### @@ -1435,17 +1436,17 @@ MailingEMailFrom=E-mailafzender (Van) voor e-mails die verstuurd worden door de MailingEMailError=Retoure-mailadres (Errors-to) voor e-mails met fouten MailingDelay=Seconds to wait after sending next message ##### Notification ##### -NotificationSetup=EMail notification module setup +NotificationSetup=Moduleinstellingen voor kennisgeving door e-mail NotificationEMailFrom=E-mailafzender (van) voor e-mails die verstuurd worden voor kennisgevingen -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=Lijst van akties waarvoor een kennisgeving kan gegeven worden, voor elke relatie (ga naar relatie instellingen) of door een vast email in te stellen (lijst is afhangkelijk van geaktiveerde modules). +FixedEmailTarget=Vaste email bestemmeling ##### Sendings ##### SendingsSetup=Verzendingsmoduleinstellingen SendingsReceiptModel=Verzendontvangstsjabloon SendingsNumberingModules=Verzendingen nummering modules -SendingsAbility=Support shipment sheets for customer deliveries +SendingsAbility=Ondersteun verzendingsbrieven voor afnemersleveringen NoNeedForDeliveryReceipts=In de meeste gevallen worden de verzendingsbrieven gebruikt als brieven voor de afnemersleveringen (lijst van te verzenden producten ) evenals voor ontvangstbewijzen ondertekend door de afnemer. Derhalve zijn ontvangstbevestigingen een dubbele functionaliteit en worden deze zelden geactiveerd. -FreeLegalTextOnShippings=Free text on shipments +FreeLegalTextOnShippings=Vrije tekst op verzendingen ##### Deliveries ##### DeliveryOrderNumberingModules=ontvangstbevestigingennummeringsmodule DeliveryOrderModel=ontvangstbevestigingensjablonen @@ -1456,7 +1457,7 @@ AdvancedEditor=Geavanceerde editor ActivateFCKeditor=Activeer FCKeditor voor: FCKeditorForCompany=WYSIWIG creatie / bewerking van bedrijfsomschrijving en notities FCKeditorForProduct=WYSIWIG creatie / bewerking van product- / dienstomschrijving en notities -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 creatie / bewerking van produktdetailregels voor alle entiteiten (Offertes, opdrachten, facturen, etc)
Waarschuwing: Gebruik van deze optie, voor dit doeleinde, wordt sterk afgeraden, omdat het problemen kan geven met speciale karakters en de paginaopmaak wanneer er PDF bestanden worden gegenereerd van deze gegevens. FCKeditorForMailing= WYSIWIG creatie / bewerking van mailings FCKeditorForUserSignature=WYSIWIG creatie /aanpassing van ondertekening FCKeditorForMail=WYSIWIG creatie / aanpassing voor alle email berichten (behalve mailings) @@ -1466,9 +1467,9 @@ OSCommerceTestOk=Verbinding met de server '%s' en database '%s' met gebruiker '% OSCommerceTestKo1=Verbinding met de server '%s' gelukt maar de database '%s' kon niet worden bereikt. OSCommerceTestKo2=Verbinding met server '%s' met gebruiker '%s' mislukt. ##### 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=Magazijnen instellingen +UserWarehouse=Gebruik persoonlijke voorraden van gebruiker +IfYouUsePointOfSaleCheckModule=Als u de verkooppunt module (de standaard POS module of een andere externe module) gebruikt, kan deze setup worden genegeerd door uw verkooppunt module. De meeste verkooppunt modules zijn ontworpen om onmiddellijk een factuur te creëren en het standaard verlagen van voorraad. Dus, als je ja of nee een voorraad daling nodig hebt om bij het registreren van een verkoop op uw verkooppunt, controleer ook uw POS-module instellingen. ##### Menu ##### MenuDeleted=Menu verwijderd TreeMenu=Menustructuur @@ -1503,8 +1504,8 @@ ConfirmDeleteLine=Weet u zeker dat u deze regel wilt verwijderen? ##### Tax ##### TaxSetup=Moduleinstellingen voor belastingen, sociale bijdragen en dividenden OptionVatMode=BTW verplicht -OptionVATDefault=Cash basis -OptionVATDebitOption=Accrual basis +OptionVATDefault=Kasbasis +OptionVATDebitOption=Transactiebasis OptionVatDefaultDesc=BTW is verplicht:
- op levering / betalingen van goederen (wij gebruiken de factuurdatum)
- op betalingen van diensten OptionVatDebitOptionDesc=BTW is verplicht:
- op levering / betalingen van goederen
- op factuur (debet) voor diensten SummaryOfVatExigibilityUsedByDefault=Tijd van BTW opeisbaarheid standaard volgens gekozen optie: @@ -1533,15 +1534,15 @@ ClickToDialDesc=Deze module maakt het mogelijk om een icoontje te tonen achter h ##### Point Of Sales (CashDesk) ##### CashDesk=Verkooppunten CashDeskSetup=Verkooppuntenmoduleinstellingen -CashDeskThirdPartyForSell=Default generic third party to use for sells +CashDeskThirdPartyForSell=Algemene Klant te gebruiken bij verkopen 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 (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=Uitschakelen voorraad daling bij een verkoop via verkooppunt (indien "Nee", stock daling wordt gedaan voor elke verkoope gedaan via POS, wat er ook in de opties ingesteld staat in de module Stock). +CashDeskIdWareHouse=Kies magazijn te gebruiken voor voorraad daling +StockDecreaseForPointOfSaleDisabled=Stock daling van verkooppunt uitgeschakeld +StockDecreaseForPointOfSaleDisabledbyBatch=De stock afname van POS is niet compatibel met lot/serienummer beheer +CashDeskYouDidNotDisableStockDecease=Je hebt voorraad daling bij het maken van een verkoop via verkooppunt niet uitgeschakeld. Dus een magazijn is vereist. ##### Bookmark ##### BookmarkSetup=Weblinkmoduleinstellingen BookmarkDesc=Deze module maakt het u mogelijk 'weblinks' te beheren. U kunt ook verwijzingen naar elke Dolibarr pagina of externe website in uw linker menu zetten. @@ -1566,7 +1567,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 +IfSetToYesDontForgetPermission=Indien ingesteld op ja, vergeet dan niet om machtigingen te verlenen aan groepen of gebruikers ​​voor het toestaan van de tweede goedkeuring ##### 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 @@ -1595,24 +1596,29 @@ DeleteFiscalYear=Verwijder het boekjaar ConfirmDeleteFiscalYear=Weet u zeker dat u dit boekjaar wilt verwijderen? Opened=Geopend Closed=Gesloten -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 +AlwaysEditable=Kan altijd worden bewerkt +MAIN_APPLICATION_TITLE=Forceer zichtbare naam van de toepassing (waarschuwing: het instellen van uw eigen naam hier kan het automatisch aanvullen van de inlog functie breken wanneer gebruik wordt van de mobiele applicatie DoliDroid) +NbMajMin=Minimum aantal hoofdletters +NbNumMin=Minimum aantal numerieke tekens +NbSpeMin=Minimum aantal speciale tekens +NbIteConsecutive=Maximum aantal repeterende dezelfde karakters +NoAmbiCaracAutoGeneration=Voor het automatisch genereren, gebruik geen dubbelzinnige tekens ("1","l","i","|","0","O") +SalariesSetup=Setup van module salarissen +SortOrder=Sorteervolgorde 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. -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 +TypePaymentDesc=0: Klant betalingswijze, 1: Leverancier betalingswijze 2: Zowel klanten en leveranciers betaalwijze +IncludePath=Include path (gedefinieerd in de variabele %s) +ExpenseReportsSetup=Setup van module onkostennota's +TemplatePDFExpenseReports=Document sjablonen om onkostennota's document te genereren +NoModueToManageStockDecrease=Geen module in staat om automatische voorraad daling te beheren is geactiveerd. Stock daling zal worden gedaan via handmatige invoer. +NoModueToManageStockIncrease=Geen module in staat om automatische voorraad toename beheren is geactiveerd. Stock verhoging zal worden gedaan via handmatige invoer. +YouMayFindNotificationsFeaturesIntoModuleNotification=U kunt opties voor e-mailberichten door het inschakelen en configureren van de module "Meldingen " te vinden. +ListOfNotificationsPerContact=Lijst van meldingen per contact* +ListOfFixedNotifications=Lijst met vaste meldingen +GoOntoContactCardToAddMore=Ga naar het tabblad 'Meldingen' van een relatie contact om meldingen voor contacten/adressen toe te voegen of te verwijderen +Threshold=Drempel +BackupDumpWizard=Wizard om database backup dump bestand op te bouwen +SomethingMakeInstallFromWebNotPossible=Installatie van externe module is niet mogelijk via de webinterface om de volgende reden: +SomethingMakeInstallFromWebNotPossible2=Om deze reden, is het upgrade process hier beschreven alleen in handmatige stappen door een bevoorrechte gebruiker te doen. +InstallModuleFromWebHasBeenDisabledByFile=Installeren van externe module van toepassing is uitgeschakeld door uw beheerder. Je moet hem vragen om het bestand %s te verwijderen om deze functie mogelijk te maken. +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" diff --git a/htdocs/langs/nl_NL/agenda.lang b/htdocs/langs/nl_NL/agenda.lang index 9f0115bc97f13..5508ad1be0f80 100644 --- a/htdocs/langs/nl_NL/agenda.lang +++ b/htdocs/langs/nl_NL/agenda.lang @@ -7,10 +7,10 @@ Agendas=Agenda's Calendar=Kalender Calendars=Kalenders LocalAgenda=Interne kalender -ActionsOwnedBy=Event owned by +ActionsOwnedBy=Actie gevraagd door AffectedTo=Geaffecteerden DoneBy=Gedaan door -Event=Event +Event=Actie Events=Gebeurtenissen EventsNb=Aantal gebeurtenissen MyEvents=Mijn evenementen @@ -29,14 +29,14 @@ ActionsToDoBy=Acties toegewezen aan ActionsDoneBy=Acties gedaan door ActionsForUser=Evenementen voor gebruiker ActionsForUsersGroup=Evenementen voor alle gebruikers van de groep -ActionAssignedTo=Event assigned to +ActionAssignedTo=Taken toegewezen aan AllMyActions= Al mijn acties / taken AllActions= Alle acties / taken ViewList=Bekijk de lijst ViewCal=Bekijk kalender ViewDay=Dag te bekijken ViewWeek=Weekweergave -ViewPerUser=Per user view +ViewPerUser=Per gebruiker weergave ViewWithPredefinedFilters= Bekijk met voorgedefinieerde filters AutoActions= Automatisch invullen van de agenda AgendaAutoActionDesc= Stel hier de gebeurtenissen in waarvoor u wilt dat Dolibarr automatische een afspraak in de agenda creëert. Als er niets is aangevinkt (standaard), zullen alleen handmatige acties worden opgenomen in de agenda. @@ -45,13 +45,13 @@ AgendaExtSitesDesc=Op deze pagina kunt configureren externe agenda. ActionsEvents=Gebeurtenissen waarvoor Dolibarr automatisch een item zal maken in de agenda PropalValidatedInDolibarr=Voorstel %s gevalideerd InvoiceValidatedInDolibarr=Factuur %s gevalideerd -InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS +InvoiceValidatedInDolibarrFromPos=Factuur %s gevalideerd in verkooppunt InvoiceBackToDraftInDolibarr=Factuur %s ga terug naar ontwerp van de status van InvoiceDeleteDolibarr=Factuur %s verwijderd OrderValidatedInDolibarr=Opdracht %s gevalideerd -OrderDeliveredInDolibarr=Order %s classified delivered +OrderDeliveredInDolibarr=Bestelling %s is geleverd OrderCanceledInDolibarr=Bestel %s geannuleerd -OrderBilledInDolibarr=Order %s classified billed +OrderBilledInDolibarr=Bestelling %s is gefactureerd OrderApprovedInDolibarr=Bestel %s goedgekeurd OrderRefusedInDolibarr=Order %s is geweigerd OrderBackToDraftInDolibarr=Bestel %s terug te gaan naar ontwerp-status @@ -61,9 +61,9 @@ OrderSentByEMail=Afnemersopdracht %s verzonden per e-mail InvoiceSentByEMail=Afnemersfactuur %s verzonden per e-mail SupplierOrderSentByEMail=Leveranciersopdracht %s verzonden per e-mail SupplierInvoiceSentByEMail=Leveranciersfactuur %s verzonden per e-mail -ShippingSentByEMail=Shipment %s sent by EMail -ShippingValidated= Shipment %s validated -InterventionSentByEMail=Intervention %s sent by EMail +ShippingSentByEMail=Stuur verzending %s per e-mail +ShippingValidated= Verzending %s gevalideerd +InterventionSentByEMail=Interventie %s via mail verzonden NewCompanyToDolibarr= Derde aangemaakt DateActionPlannedStart= Geplande startdatum DateActionPlannedEnd= Geplande einddatum @@ -72,27 +72,27 @@ DateActionDoneEnd= Daadwerkelijke einddatum DateActionStart= Startdatum DateActionEnd= Einddatum AgendaUrlOptions1=U kunt ook de volgende parameters gebruiken om te filteren: -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 om uitvoer van acties gecreëerd door, toegewezen aan of gedaan door gebruiker %s te beperken. +AgendaUrlOptions3=login=%s om uitvoer van acties gedaan door gebruiker %s te beperken. AgendaUrlOptions4=login=%s om uitvoer van acties toegewezen aan gebruiker %s te beperken. AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. AgendaShowBirthdayEvents=Toon verjaardagen van contacten AgendaHideBirthdayEvents=Verberg verjaardagen van contacten Busy=Bezig ExportDataset_event1=Lijst van agenda-gebeurtenissen -DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6) -DefaultWorkingHours=Default working hours in day (Example: 9-18) +DefaultWorkingDays=Standaard werkdagen reeks in week (voorbeeld: 1-5, 1-6) +DefaultWorkingHours=Default werkuren in dag (Voorbeeld: 9-18) # External Sites ical ExportCal=Export kalender ExtSites=Externe agenda -ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users. +ExtSitesEnableThisTool=Toon externe kalenders (gedefinieerd in de globale setup) in de agenda. Heeft geen invloed op de externe agenda's gedefinieerd door gebruikers. ExtSitesNbOfAgenda=Aantal kalenders AgendaExtNb=Kalender nb %s ExtSiteUrlAgenda=URL aan. Ical bestand te openen ExtSiteNoLabel=Geen omschrijving -WorkingTimeRange=Working time range -WorkingDaysRange=Working days range -AddEvent=Create event -MyAvailability=My availability -ActionType=Event type -DateActionBegin=Start event date +WorkingTimeRange=Werktijd +WorkingDaysRange=Werkdagen +AddEvent=Creëer gebeurtenis/taak +MyAvailability=Beschikbaarheid +ActionType=Taak type +DateActionBegin=Begindatum diff --git a/htdocs/langs/nl_NL/banks.lang b/htdocs/langs/nl_NL/banks.lang index 8e8b94df0d2de..7cb1835e4aac7 100644 --- a/htdocs/langs/nl_NL/banks.lang +++ b/htdocs/langs/nl_NL/banks.lang @@ -8,7 +8,7 @@ FinancialAccount=Rekening FinancialAccounts=Rekeningen BankAccount=Bankrekening BankAccounts=Bankrekeningen -ShowAccount=Show Account +ShowAccount=Toon rekening AccountRef=Financiële rekening referentie AccountLabel=Financiële rekening label CashAccount=Kasrekening @@ -33,11 +33,11 @@ AllTime=Vanaf het begin Reconciliation=Overeenstemming RIB=Bankrekeningnummer IBAN=IBAN-nummer -IbanValid=IBAN is Valid -IbanNotValid=IBAN is Not Valid +IbanValid=IBAN is geldig +IbanNotValid=IBAN is niet geldig BIC=BIC- / SWIFT-nummer -SwiftValid=BIC/SWIFT is Valid -SwiftNotValid=BIC/SWIFT is Not Valid +SwiftValid=BIC / SWIFT is geldig +SwiftNotValid=BIC / SWIFT is niet geldig StandingOrders=Periodieke overboekingen StandingOrder=Periodieke overboeking Withdrawals=Opnames @@ -152,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=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD +InputReceiptNumber=Kies het bankafschrift in verband met de bemiddeling. Gebruik een sorteerbaar numerieke waarde: YYYYMM of 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 @@ -163,3 +163,5 @@ LabelRIB=BAN label NoBANRecord=Geen BAN gegeven DeleteARib=Verwijderen BAN gegeven ConfirmDeleteRib=Ben je zeker dat je dit BAN gegeven wil verwijderen? +StartDate=Begindatum +EndDate=Einddatum diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang index 51364e08de8bf..5619ad5f95498 100644 --- a/htdocs/langs/nl_NL/bills.lang +++ b/htdocs/langs/nl_NL/bills.lang @@ -1,16 +1,16 @@ # Dolibarr language file - Source file is en_US - bills Bill=Factuur Bills=Facturen -BillsCustomers=Customers invoices -BillsCustomer=Customers invoice -BillsSuppliers=Suppliers invoices -BillsCustomersUnpaid=Unpaid customers invoices +BillsCustomers=Afnemersfacturen +BillsCustomer=Afnemersfactuur +BillsSuppliers=Leveranciersfacturen +BillsCustomersUnpaid=Onbetaalde afnemersfacturen BillsCustomersUnpaidForCompany=Onbetaalde afnemersfacturen voor %s BillsSuppliersUnpaid=Onbetaalde leveranciersfacturen BillsSuppliersUnpaidForCompany=Onbetaalde leveranciersfacturen voor %s BillsLate=Betalingsachterstand -BillsStatistics=Customers invoices statistics -BillsStatisticsSuppliers=Suppliers invoices statistics +BillsStatistics=Statistieken afnemersfacturen +BillsStatisticsSuppliers=Statistieken leveranciersfacturen DisabledBecauseNotErasable=Uitgeschakeld omdat niet verwijderd kan worden InvoiceStandard=Standaardfactuur InvoiceStandardAsk=Standaardfactuur @@ -28,8 +28,8 @@ InvoiceAvoir=Creditnota InvoiceAvoirAsk=Creditnota te corrigeren factuur InvoiceAvoirDesc=De creditnota is een negatieve factuur die gebruikt wordt wanneer op een factuur het bedrag verschilt van het werkelijk betaalde bedrag (bijvoorbeeld omdat door de afnemer per abuis te veel is betaald of een aantal producten zijn geretouneerd).

Opmerking: de originele factuur moet worden gesloten (en geclassificeerd als zijnde 'betaald' of 'gedeeltelijk betaald') om een creditnota te kunnen aanmaken. invoiceAvoirWithLines=Maak Credit Nota met lijnen van de oorsprongkelijke factuur -invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice -invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount +invoiceAvoirWithPaymentRestAmount=Maak Creditnota van resterend onbetaald bedrag van herkomst factuur +invoiceAvoirLineWithPaymentRestAmount=Credit Nota voor de resterende openstaande bedrag ReplaceInvoice=Vervangen factuur %s ReplacementInvoice=Vervangingsfactuur ReplacedByInvoice=Vervangen door factuur %s @@ -74,9 +74,9 @@ PaymentsAlreadyDone=Betalingen gedaan PaymentsBackAlreadyDone=Terugbetaling al gedaan PaymentRule=Betalingsvoorwaarde PaymentMode=Betalingstype -PaymentTerm=Payment term -PaymentConditions=Payment terms -PaymentConditionsShort=Payment terms +PaymentTerm=Betalingstermijn +PaymentConditions=Betalingsvoorwaarden +PaymentConditionsShort=Betalingsvoorwaarden PaymentAmount=Betalingsbedrag ValidatePayment=Valideer deze betaling PaymentHigherThanReminderToPay=Betaling hoger dan herinnering te betalen @@ -86,9 +86,9 @@ ClassifyPaid=Klassificeer 'betaald' ClassifyPaidPartially=Classificeer 'gedeeltelijk betaald' ClassifyCanceled=Classificeer 'verlaten' ClassifyClosed=Classificeer 'Gesloten' -ClassifyUnBilled=Classify 'Unbilled' +ClassifyUnBilled=Classificeren 'Nog niet gefactureerd' CreateBill=Creëer Factuur -AddBill=Create invoice or credit note +AddBill=Toevoegen factuur of creditnota AddToDraftInvoices=Toevoegen aan aanmaak factuur DeleteBill=Verwijderen factuur SearchACustomerInvoice=Zoek een afnemersfactuur @@ -100,7 +100,7 @@ DoPaymentBack=Doe een terugbetaling ConvertToReduc=Omzetten in een toekomstige korting EnterPaymentReceivedFromCustomer=Voer een ontvangen betaling van afnemer in EnterPaymentDueToCustomer=Voer een betaling te doen aan afnemer in -DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero +DisabledBecauseRemainderToPayIsZero=Uitgeschakeld omdat restant te betalen gelijk is aan nul Amount=Hoeveelheid PriceBase=Basisprijs BillStatus=Factuurstatus @@ -155,9 +155,9 @@ ConfirmCancelBill=Weet u zeker dat ufactuur %s wilt annuleren? ConfirmCancelBillQuestion=Waarom zou u deze rekening als 'verlaten' willen classificeren ? ConfirmClassifyPaidPartially=Weet u zeker dat u factuur %s naar status betaald wilt wijzigen? ConfirmClassifyPaidPartiallyQuestion=Deze factuur is nog niet volledig betaald. Wat zijn redenen om deze factuur af te sluiten? -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=Aan restant te betalen (%s %s) wordt een korting toegekend, omdat de betaling werd gedaan vóór de termijn. Ik regulariseer de BTW met een creditnota. +ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Aan restant te betalen (%s %s) wordt een korting toegekend, omdat de betaling werd verricht vóór de termijn. Ik accepteer de BTW te verliezen op deze korting. +ConfirmClassifyPaidPartiallyReasonDiscountVat=Aan restant te betalen (%s %s) wordt een korting toegekend, omdat de betaling werd verricht vóór de termijn. Ik vorder de BTW terug van deze korting, zonder een credit nota. ConfirmClassifyPaidPartiallyReasonBadCustomer=Slechte afnemer ConfirmClassifyPaidPartiallyReasonProductReturned=Producten gedeeltelijk teruggegeven ConfirmClassifyPaidPartiallyReasonOther=Claim verlaten om andere redenen @@ -190,15 +190,15 @@ AlreadyPaid=Reeds betaald AlreadyPaidBack=Reeds terugbetaald AlreadyPaidNoCreditNotesNoDeposits=Reeds betaald (zonder creditnota's en stortingen's) Abandoned=Verlaten -RemainderToPay=Remaining unpaid -RemainderToTake=Remaining amount to take -RemainderToPayBack=Remaining amount to pay back +RemainderToPay=Resterend onbetaald +RemainderToTake=Resterende bedrag over te nemen +RemainderToPayBack=Resterende bedrag terug te betalen Rest=Hangende AmountExpected=Gevorderde bedrag ExcessReceived=Overbetaling EscompteOffered=Korting aangeboden (betaling vóór termijn) -SendBillRef=Submission of invoice %s -SendReminderBillRef=Submission of invoice %s (reminder) +SendBillRef=Stuur factuur %s +SendReminderBillRef=Stuur factuur %s (herinnering) StandingOrders=Doorlopende opdrachten StandingOrder=Doorlopende opdracht NoDraftBills=Geen conceptfacturen @@ -223,13 +223,13 @@ NonPercuRecuperable=Niet-terugvorderbare SetConditions=Stel betalingsvoorwaarden in SetMode=Stel betalingswijze in Billed=Gefactureerd -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=Sjabloon factuur +RepeatableInvoices=Sjabloon facturen +Repeatable=Sjabloon +Repeatables=Sjablonen +ChangeIntoRepeatableInvoice=Omzetten in sjabloon factuur +CreateRepeatableInvoice=Maak sjabloon factuur +CreateFromRepeatableInvoice=Maak van sjabloon factuur CustomersInvoicesAndInvoiceLines=Afnemersfacturen en factuurregels CustomersInvoicesAndPayments=Afnemersfacturen en betalingen ExportDataset_invoice_1=Afnemersfacturen en factuurregels @@ -294,10 +294,11 @@ 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 +RelatedCustomerInvoices=Verwante klantenfacturen +RelatedSupplierInvoices=Verwante leveranciersfacturen +LatestRelatedBill=Laatste gerelateerde factuur +WarningBillExist=Waarschuwing één of meer facturen bestaan reeds +MergingPDFTool=Samenvoeging PDF-tool # PaymentConditions PaymentConditionShortRECEP=Direct @@ -351,7 +352,7 @@ ChequeNumber=Chequenummer ChequeOrTransferNumber=Cheque / Transfernummer ChequeMaker=Chequezender ChequeBank=Bank van cheque -CheckBank=Check +CheckBank=Controleer NetToBePaid=Netto te betalen PhoneNumber=Tel FullPhoneNumber=Telefoonnummer @@ -392,7 +393,7 @@ DisabledBecausePayments=Niet beschikbaar omdat er betalingen bestaan CantRemovePaymentWithOneInvoicePaid=Verwijder onmogelijk wanneer er minstens een factuur betaald is ingedeeld. ExpectedToPay=Verwachte betaling PayedByThisPayment=Betaald door deze betaling -ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid. +ClosePaidInvoicesAutomatically=Classeer standaard, situatie of vervang facturen naar status "Betaald". ClosePaidCreditNotesAutomatically=Classeer terugbetaalde creditnotas automatisch naar status "Betaald". AllCompletelyPayedInvoiceWillBeClosed=Alle betaalde facturen zullen automatisch worden gesloten naar status "Betaald". ToMakePayment=Betaal @@ -415,19 +416,19 @@ TypeContact_invoice_supplier_external_BILLING=Leverancier factureringscontact TypeContact_invoice_supplier_external_SHIPPING=Leverancier leveringscontact TypeContact_invoice_supplier_external_SERVICE=Leverancier servicecontact # 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=Eerste situatie factuur +InvoiceFirstSituationDesc=De situatie facturen worden gebonden aan situaties met betrekking tot voortgang, bijvoorbeeld de voortgang van een bouwproject. Elke situatie is verbonden met een factuur. +InvoiceSituation=Situatie factuur +InvoiceSituationAsk=Factuur die de situatie volgt +InvoiceSituationDesc=Maak een nieuwe situatie van een reeds bestaande +SituationAmount=Situatie factuurbedrag (netto) +SituationDeduction=Situatie vermindering +Progress=Voortgang +ModifyAllLines=Wijzigen van alle lijnen +CreateNextSituationInvoice=Maak de volgende situatie +NotLastInCycle=Deze factuur niet de laatste in de cyclus en mag niet worden gewijzigd. +DisabledBecauseNotLastInCycle=De volgende situatie bestaat al. +DisabledBecauseFinal=Deze situatie is definitief. +CantBeLessThanMinPercent=De voortgang kan niet kleiner zijn dan de waarde in de voorgaande situatie. +NoSituations=Geen geopend situaties +InvoiceSituationLast=Finale en algemene factuur diff --git a/htdocs/langs/nl_NL/boxes.lang b/htdocs/langs/nl_NL/boxes.lang index e2ef2c0f95ee2..1d2bcc4305b50 100644 --- a/htdocs/langs/nl_NL/boxes.lang +++ b/htdocs/langs/nl_NL/boxes.lang @@ -12,6 +12,7 @@ BoxLastProspects=Laatste prospecten BoxLastCustomers=Laatste afnemers BoxLastSuppliers=Laatste leveranciers BoxLastCustomerOrders=Laatste afnemersopdrachten +BoxLastValidatedCustomerOrders=Laatste gevalideerde klantbestelling BoxLastBooks=Laatste boekingen BoxLastActions=Laatste acties BoxLastContracts=Laatste contracten @@ -27,25 +28,28 @@ BoxTitleNbOfCustomers=Aantal afnemers BoxTitleLastRssInfos=Laatste %s nieuws uit %s BoxTitleLastProducts=Laatste %s gewijzigde producten / diensten BoxTitleProductsAlertStock=Waarschuwing voor producten in voorraad -BoxTitleLastCustomerOrders=Laatste %s bewerkte afnemersopdrachten +BoxTitleLastCustomerOrders=Laatste %s klantbestellingen +BoxTitleLastModifiedCustomerOrders=Laatste %s gewijzigde klantbestellingen BoxTitleLastSuppliers=Laatste %s geregistreerde leveranciers BoxTitleLastCustomers=Laatste %s geregistreerde afnemers BoxTitleLastModifiedSuppliers=Laatste %s bewerkte leveranciers BoxTitleLastModifiedCustomers=Laatste %s bewerkte afnemers -BoxTitleLastCustomersOrProspects=Laatste %s geregistreerde afnemers of prospecten -BoxTitleLastPropals=Laatste %s geregistreerd offertes +BoxTitleLastCustomersOrProspects=Laatste %s klanten of prospecten +BoxTitleLastPropals=Laatste %s offertes +BoxTitleLastModifiedPropals=Laatste %s gewijzigde offertes BoxTitleLastCustomerBills=Laatste %s afnemersfacturen +BoxTitleLastModifiedCustomerBills=Laatste %s gewijzigde klantenfacturen BoxTitleLastSupplierBills=Laatste %s leveranciersfacturen -BoxTitleLastProspects=Laatste %s geregistreerde prospecten +BoxTitleLastModifiedSupplierBills=Laatste %s gewijzigde leveranciersfacturen BoxTitleLastModifiedProspects=Laatste %s bewerkte prospecten BoxTitleLastProductsInContract=Laatste %s producten / diensten in een contract -BoxTitleLastModifiedMembers=Laatst gewijzigd %s leden +BoxTitleLastModifiedMembers=Laatste %s leden BoxTitleLastFicheInter=Laatste tussenkomst %e aanpassingen -BoxTitleOldestUnpaidCustomerBills=Oudste %s onbetaalde afnemersfacturen +BoxTitleOldestUnpaidCustomerBills=Oudste %s onbetaalde klant facturen BoxTitleOldestUnpaidSupplierBills=Oudste %s onbetaalde leveranciersfacturen BoxTitleCurrentAccounts=Saldo van de geopende rekeningen\n BoxTitleSalesTurnover=Omzet -BoxTitleTotalUnpaidCustomerBills=Onbetaalde afnemersfacturen +BoxTitleTotalUnpaidCustomerBills=Onbetaalde klant facturen BoxTitleTotalUnpaidSuppliersBills=Onbetaalde leveranciersfacturen BoxTitleLastModifiedContacts=Laatst gewijzigd %s contacten / adressen BoxMyLastBookmarks=Mijn laatste %s weblinks @@ -76,7 +80,8 @@ NoContractedProducts=Geen gecontracteerde producten / diensten NoRecordedContracts=Geen geregistreerde contracten NoRecordedInterventions=Geen tussenkomsten geregistreerd BoxLatestSupplierOrders=Laatste bestellingen bij leveranciers -BoxTitleLatestSupplierOrders=%S van laatste bestellingen bij leveranciers +BoxTitleLatestSupplierOrders=Laatste leveranciersfacturen +BoxTitleLatestModifiedSupplierOrders=Laatste %s bewerkte leveranciers bestellingen NoSupplierOrder=Geen bestelling bij leverancier geregistreerd BoxCustomersInvoicesPerMonth=Klantenfacturatie per maand BoxSuppliersInvoicesPerMonth=Leveranciersfacturatie per maand @@ -89,3 +94,4 @@ BoxProductDistributionFor=Verdelinge van %s voor %s ForCustomersInvoices=Afnemersfacturen ForCustomersOrders=Klantenbestellingen ForProposals=Zakelijke voorstellen / Offertes +LastXMonthRolling=De laatste %s maand overschrijdende diff --git a/htdocs/langs/nl_NL/categories.lang b/htdocs/langs/nl_NL/categories.lang index 1391402e8f35c..aac03a49e403a 100644 --- a/htdocs/langs/nl_NL/categories.lang +++ b/htdocs/langs/nl_NL/categories.lang @@ -1,62 +1,62 @@ # 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=Tag / Categorie +Rubriques=Tags / Categorieën +categories=tags / categorieën +TheCategorie=De tag / categorie +NoCategoryYet=Geen tag / categorie van dit type gemaakt In=In AddIn=Invoegen in categorie modify=wijzigen Classify=Classificeren -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 +CategoriesArea=Tags / Categorieën omgeving +ProductsCategoriesArea=Producten/Diensten tags/categorieën omgeving +SuppliersCategoriesArea=Leveranciers tags/categorieën omgeving +CustomersCategoriesArea=Klanten tags / categorieën omgeving +ThirdPartyCategoriesArea=Relaties tags / categorieën omgeving +MembersCategoriesArea=Leden tags / categorieën omgeving +ContactsCategoriesArea=Contacten tags / categorieën omgeving +MainCats=Hoofd tags / categorieën SubCats=Subcategorieën CatStatistics=Statistieken -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 +CatList=Lijst van tags / categorieën +AllCats=Alle tags / categorieën +ViewCat=Bekijk tag / categorie +NewCat=Toevoegen tag / categorie +NewCategory=Nieuw tag / categorie +ModifCat=Wijzigen tag / categorie +CatCreated=Tag / categorie gecreëerd +CreateCat=Maak tag / categorie +CreateThisCat=Maak deze tag / categorie ValidateFields=Valideer de velden NoSubCat=Geen subcategorie. SubCatOf=Subcategorie -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 +FoundCats=Gevonden tags / categorieën +FoundCatsForName=Tags / categorieën gevonden voor de naam: +FoundSubCatsIn=Subcategorieën gevonden in de tag / categorie +ErrSameCatSelected=U heeft dezelfde tag/categorie meerdere malen geselecteerd +ErrForgotCat=U bent vergeten om de tag / categorie kiezen ErrForgotField=U vergat velden in te vullen ErrCatAlreadyExists=Deze naam wordt al gebruikt -AddProductToCat=Add this product to a tag/category? -ImpossibleAddCat=Impossible to add the tag/category -ImpossibleAssociateCategory=Impossible to associate the tag/category to +AddProductToCat=Voeg dit product toe aan een tag / categorie? +ImpossibleAddCat=Onmogelijk om de tag / categorie toe te voegen +ImpossibleAssociateCategory=Onmogelijk om de tag / categorie koppelen aan WasAddedSuccessfully=%s is succesvol toegevoegd. -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 +ObjectAlreadyLinkedToCategory=Element is al verbonden met deze tag / categorie. +CategorySuccessfullyCreated=Deze tag / categorie %s is toegevoegd met succes. +ProductIsInCategories=Product/dienst behoort tot volgende tags / categorieën +SupplierIsInCategories=Relatie behoort tot volgende leveranciers tags / categorieën +CompanyIsInCustomersCategories=Deze relatie behoort tot volgende klanten/prospects tags/categorieën +CompanyIsInSuppliersCategories=Deze relatie behoort tot volgende leveranciers tags / categorieën +MemberIsInCategories=Dit lid behoort tot volgende leden tags / categorieën +ContactIsInCategories=Dit contact behoort tot volgende contacten tags / categorieën +ProductHasNoCategory=Dit product / dienst staat niet in tags / categorieën +SupplierHasNoCategory=Deze leverancier staat in geen enkele tags / categorieën +CompanyHasNoCategory=Dit bedrijf staat in geen tags / categorieën +MemberHasNoCategory=Dit lid staat in geen tags / categorieën +ContactHasNoCategory=Dit contact staat in geen tags / categorieën +ClassifyInCategory=Classificeer in tag / categorie NoneCategory=Geen -NotCategorized=Without tag/category +NotCategorized=Zonder tag / categorie CategoryExistsAtSameLevel=Deze categorie bestaat al op hetzelfde niveau ReturnInProduct=Terug naar product- / dienstdetails ReturnInSupplier=Terug naar leverancierdetails @@ -64,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=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 +CategoriesTree=Tags / categorieën boom +DeleteCategory=Delete tag / categorie +ConfirmDeleteCategory=Weet je zeker dat je deze tag / categorie wilt verwijderen? +RemoveFromCategory=Verwijder koppeling met tag / categorie +RemoveFromCategoryConfirm=Weet u zeker dat u wilt verband tussen de transactie en de tag / categorie verwijderen? +NoCategoriesDefined=Geen tag / categorie gedefinieerd +SuppliersCategoryShort=Leveranciers tags / categorie +CustomersCategoryShort=Klanten tags / categorie +ProductsCategoryShort=Producten tags / categorie +MembersCategoryShort=Leden tags / categorie +SuppliersCategoriesShort=Leveranciers tags / categorieën +CustomersCategoriesShort=Klanten tags / categorieën CustomersProspectsCategoriesShort=Afnemers- / Prospectencategorie -ProductsCategoriesShort=Products tags/categories -MembersCategoriesShort=Members tags/categories -ContactCategoriesShort=Contacts tags/categories +ProductsCategoriesShort=Producten tags / categorieën +MembersCategoriesShort=Leden tags / categorieën +ContactCategoriesShort=Contacten tags / categorieën ThisCategoryHasNoProduct=Deze categorie bevat geen producten. ThisCategoryHasNoSupplier=Deze categorie bevat geen enkele leverancier. ThisCategoryHasNoCustomer=Deze categorie bevat geen enkele afnemer. @@ -88,23 +88,23 @@ ThisCategoryHasNoContact=Deze categorie bevat geen enkel contact. AssignedToCustomer=Toegewezen aan een afnemer AssignedToTheCustomer=Toegewezen aan de afnemer InternalCategory=Interne 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 +CategoryContents=Inhoud tag / categorie +CategId=Tag / categorie id +CatSupList=Lijst van leverancier tags / categorieën +CatCusList=Lijst van de klant/prospect tags/categorieën +CatProdList=Lijst van producten tags / categorieën +CatMemberList=Lijst leden tags / categorieën +CatContactList=Lijst van contact tags / categorieën en contact +CatSupLinks=Koppelingen tussen leveranciers en tags / categorieën +CatCusLinks=Koppelingen tussen klanten / prospects en tags / categorieën +CatProdLinks=Koppelingen tussen producten / diensten en tags / categorieën +CatMemberLinks=Koppelingen tussen leden en tags / categorieën +DeleteFromCat=Verwijderen uit tags / categorie DeletePicture=Afbeelding verwijderen ConfirmDeletePicture=Bevestig verwijderen afbeelding ExtraFieldsCategories=Complementaire kenmerken -CategoriesSetup=Tags/categories setup -CategorieRecursiv=Link with parent tag/category automatically +CategoriesSetup=Tags / categorieën instelling +CategorieRecursiv= Automatische koppeling met bovenliggende tag / categorie 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=Show tag/category +ShowCategory=Toon tag / categorie diff --git a/htdocs/langs/nl_NL/companies.lang b/htdocs/langs/nl_NL/companies.lang index ba55536c1593f..feff1443af9a4 100644 --- a/htdocs/langs/nl_NL/companies.lang +++ b/htdocs/langs/nl_NL/companies.lang @@ -18,7 +18,7 @@ NewCompany=Nieuwe bedrijf (prospect, afnemer, leverancier) NewThirdParty=Nieuwe Klant (prospect, afnemer, leverancier) NewSocGroup=Nieuwe bedrijfsgroep NewPrivateIndividual=Nieuwe particulier (prospect, afnemer, leverancier) -CreateDolibarrThirdPartySupplier=Create a third party (supplier) +CreateDolibarrThirdPartySupplier=Creëer een relatie (leverancier) ProspectionArea=Prospectenoverzicht SocGroup=Bedrijfsgroep IdThirdParty=ID Klant @@ -259,8 +259,8 @@ AvailableGlobalDiscounts=Beschikbare kortingsbedrag DiscountNone=Geen Supplier=Leverancier CompanyList=Bedrijvenoverzicht -AddContact=Contactpersoon toevoegen -AddContactAddress=Contact/adres toevoegen +AddContact=Nieuwe contactpersoon +AddContactAddress=Nieuw contact/adres EditContact=Bewerk contact / adres EditContactAddress=Wijzig contact/adres Contact=Contactpersoon @@ -268,8 +268,8 @@ ContactsAddresses=Contacpersonen / adressen NoContactDefinedForThirdParty=Geen contact opgegeven voor deze derde partij NoContactDefined=Geen contactpersoon ingesteld voor deze Klant DefaultContact=Standaard contactpersoon -AddCompany=Bedrijf toevoegen -AddThirdParty=Klant toevoegen +AddCompany=Nieuw bedrijf +AddThirdParty=Nieuwe relatie DeleteACompany=Bedrijf verwijderen PersonalInformations=Persoonlijke gegevens AccountancyCode=Boekhoudkundige code @@ -379,7 +379,7 @@ DeliveryAddressLabel=Afleveradres label DeleteDeliveryAddress=Verwijder een afleveradres ConfirmDeleteDeliveryAddress=Weet u zeker dat u dit afleveradres wilt verwijderen? NewDeliveryAddress=Nieuw afleveradres -AddDeliveryAddress=Afleveradres toevoegen +AddDeliveryAddress=Adres toevoegen AddAddress=Adres toevoegen NoOtherDeliveryAddress=Geen alternatief afleveradres ingesteld SupplierCategory=Leverancierscategorie @@ -397,18 +397,18 @@ YouMustCreateContactFirst=U dient voor de Klant eerst contactpersonen met een e- ListSuppliersShort=Leveranciersoverzicht ListProspectsShort=Prospectenoverzicht ListCustomersShort=Afnemersoverzicht -ThirdPartiesArea=Third parties and contact area +ThirdPartiesArea=Relaties en contactpersonen LastModifiedThirdParties=Laatste %s bewerkte derde partijen UniqueThirdParties=Totaal aantal unieke derde partijen InActivity=Open ActivityCeased=Gesloten ActivityStateFilter=Activiteitsstatus -ProductsIntoElements=List of products into %s +ProductsIntoElements=Lijst van producten in %s CurrentOutstandingBill=Huidige openstaande rekening OutstandingBill=Max. voor openstaande rekening OutstandingBillReached=Maximum bereikt voor openstaande rekening MonkeyNumRefModelDesc=Geeft een nummer als %syymm-nnnn voor afnemerscodes en %sjjmm-nnnn voor leverancierscodes waar jj het jaar is, mm de maand en nnnn een opeenvolgend nummer vanaf 0. LeopardNumRefModelDesc=Afnemers- / leverancierscode is vrij. Deze code kan te allen tijde worden gewijzigd. -ManagingDirectors=Manager(s) name (CEO, director, president...) -SearchThirdparty=Search thirdparty -SearchContact=Search contact +ManagingDirectors=Manager(s) Naam (CEO, directeur, voorzitter ...) +SearchThirdparty=Zoek relatie +SearchContact=Zoek contactpersoon diff --git a/htdocs/langs/nl_NL/compta.lang b/htdocs/langs/nl_NL/compta.lang index 58672964bbe6a..f5f521d6edf53 100644 --- a/htdocs/langs/nl_NL/compta.lang +++ b/htdocs/langs/nl_NL/compta.lang @@ -29,7 +29,7 @@ ReportTurnover=Omzet PaymentsNotLinkedToInvoice=Betalingen niet gekoppeld aan een factuur, dus niet gekoppeld aan een derde partij PaymentsNotLinkedToUser=Betalingen niet gekoppeld aan een gebruiker Profit=Winst -AccountingResult=Accounting result +AccountingResult=Boekhoudkundig resultaat Balance=Saldo Debit=Debet Credit=Credit @@ -47,11 +47,11 @@ LT1SummaryES=RE Balance VATPaid=Betaalde BTW SalaryPaid=Salaris betaald LT2PaidES=IRPF Betaalde -LT1PaidES=RE Paid +LT1PaidES=RE Betaald LT2CustomerES=IRPF verkoop LT2SupplierES=IRPF aankopen -LT1CustomerES=RE sales -LT1SupplierES=RE purchases +LT1CustomerES=RE verkoop +LT1SupplierES=RE aankopen VATCollected=Geïnde BTW ToPay=Te betalen ToGet=Om terug te komen @@ -84,11 +84,11 @@ DateStartPeriod=Startdatum periode DateEndPeriod=Einddatum periode NewVATPayment=Nieuwe BTW-betaling newLT2PaymentES=Nieuwe IRPF betaling -newLT1PaymentES=New RE payment +newLT1PaymentES=Nieuwe RE betaling LT2PaymentES=IRPF betaling LT2PaymentsES=IRPF Betalingen -LT1PaymentES=RE Payment -LT1PaymentsES=RE Payments +LT1PaymentES=RE Betaling +LT1PaymentsES=RE Betalingen VATPayment=BTW-betaling VATPayments=BTW-betalingen SocialContributionsPayments=Betalingen van sociale bijdragen @@ -109,7 +109,7 @@ ErrorWrongAccountancyCodeForCompany=Onjuiste boekhoudkundige afnemerscode voor % SuppliersProductsSellSalesTurnover=De omzet gegenereerd door de verkoop van leveranciersproducten. CheckReceipt=Controleer stortingen CheckReceiptShort=Controleer stortingen -LastCheckReceiptShort=Last %s check receipts +LastCheckReceiptShort=Laatste %s controles ontvangsten NewCheckReceipt=Nieuwe korting NewCheckDeposit=Nieuwe chequestorting NewCheckDepositOn=Creeer een kwitantie voor de storting op rekening: %s @@ -125,7 +125,7 @@ CalcModeVATDebt=Mode %sBTW op verbintenissenboekhouding %s. CalcModeVATEngagement=Mode %sBTW op de inkomens-uitgaven %s. CalcModeDebt=Mode %sClaims-Schulden%s zei verbintenis boekhouding. CalcModeEngagement=Mode %sIncomes-kosten%s zei kas boekhouding -CalcModeLT1= Mode %sRE on customer invoices - suppliers invoices%s +CalcModeLT1= Modus %s RE op klant- leveranciers facturen %s CalcModeLT1Debt=Mode %sRE on customer invoices%s CalcModeLT1Rec= Mode %sRE on suppliers invoices%s CalcModeLT2= Mode %sIRPF on customer invoices - suppliers invoices%s @@ -189,7 +189,7 @@ AccountancyDashboard=Boekhouding samenvatting ByProductsAndServices=Volgens producten en diensten RefExt=Externe ref ToCreateAPredefinedInvoice=Om een ​​vooraf gedefinieerde factuur maken, maakt een standaard factuur dan, zonder te valideren, klikt u op de knop "Converteer naar voorgedefinieerde factuur". -LinkedOrder=Link to order +LinkedOrder=gekoppeld aan bestelling ReCalculate=Herberekenen Mode1=Methode 1 Mode2=Methode 2 @@ -197,11 +197,11 @@ CalculationRuleDesc=Om de totale BTW te berekenen, zij er twee methoden:
Me CalculationRuleDescSupplier=volgens de leverancier, kiest u geschikte methode om dezelfde berekenings regel toe te passen en krijg hetzelfde resultaat verwacht door uw leverancier. TurnoverPerProductInCommitmentAccountingNotRelevant=Omzet rapport per product, bij gebruik van een kas boukhoudings-modus is dit niet relevant. Dit rapport is alleen beschikbaar bij gebruik van betrokkenheid accountancy-modus (zie setup van boukhoud module). CalculationMode=Berekeningswijze -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 +AccountancyJournal=Dagboek van financiële rekening +ACCOUNTING_VAT_ACCOUNT=Standaard boekhoud code van te vorderen BTW +ACCOUNTING_VAT_BUY_ACCOUNT=Standaard boekhoud code voor te betalen van btw +ACCOUNTING_ACCOUNT_CUSTOMER=Standaard boekhoudkundige code voor klant relaties +ACCOUNTING_ACCOUNT_SUPPLIER=Standaard boekhoudkundige code voor leverancier relaties +CloneTax=Kloon een sociale bijdrage +ConfirmCloneTax=Bevestig het klonen van een sociale bijdrage +CloneTaxForNextMonth=Kloon het voor volgende maand diff --git a/htdocs/langs/nl_NL/contracts.lang b/htdocs/langs/nl_NL/contracts.lang index 88aab0ea14dfb..8ad4cbca6ceed 100644 --- a/htdocs/langs/nl_NL/contracts.lang +++ b/htdocs/langs/nl_NL/contracts.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Contractenoverzicht ListOfContracts=Contractenlijst -LastModifiedContracts=Last %s modified contracts +LastModifiedContracts=Laatste %s gewijzigde contracten AllContracts=Alle contracten ContractCard=Contractendetails ContractStatus=Contractstatus @@ -19,7 +19,7 @@ ServiceStatusLateShort=verlopen ServiceStatusClosed=Gesloten ServicesLegend=Dienstenlegenda Contracts=Contracten -ContractsAndLine=Contracts and line of contracts +ContractsAndLine=Contracten en lijn van de contracten Contract=Contract NoContracts=Geen contracten MenuServices=Diensten @@ -28,7 +28,7 @@ MenuRunningServices=Actieve diensten MenuExpiredServices=Verlopen diensten MenuClosedServices=Gesloten diensten NewContract=Nieuw contract -AddContract=Create contract +AddContract=Nieuw contract SearchAContract=Zoek een contract DeleteAContract=Verwijder een contract CloseAContract=Sluit een contract @@ -54,7 +54,7 @@ ListOfRunningContractsLines=Lijst van de lopende contractregels ListOfRunningServices=Lijst van lppende diensten NotActivatedServices=Inactieve diensten (onder gevalideerde contracten) BoardNotActivatedServices=Diensten te activeren onder gevalideerde contracten -LastContracts=Last %s contracts +LastContracts=Laatste %s contracten LastActivatedServices=Laatste %s geactiveerd diensten LastModifiedServices=Laatste %s bewerkte diensten EditServiceLine=Bewerk dienstenregel @@ -92,7 +92,7 @@ ListOfServicesToExpire=Lijst van Diensten te vervallen NoteListOfYourExpiredServices=Deze lijst bevat alleen de diensten van contracten voor relatiesdie zijn gekoppeld aan een vertegenwoordiger. StandardContractsTemplate=Standaard contracten sjabloon ContactNameAndSignature=Voor %s, naam en handtekening: -OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. +OnlyLinesWithTypeServiceAreUsed=Alleen lijnen met type "Service" zullen worden gekloond. ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Vertegenwoordiger ondertekening contract diff --git a/htdocs/langs/nl_NL/deliveries.lang b/htdocs/langs/nl_NL/deliveries.lang index 45d5724ef6903..8fda4869d4dbd 100644 --- a/htdocs/langs/nl_NL/deliveries.lang +++ b/htdocs/langs/nl_NL/deliveries.lang @@ -24,3 +24,5 @@ Deliverer=Bezorger: Sender=Afzender Recipient=Ontvanger ErrorStockIsNotEnough=Er is niet genoeg voorraad +Shippable=Zendklaar +NonShippable=Niet verzendbaar diff --git a/htdocs/langs/nl_NL/donations.lang b/htdocs/langs/nl_NL/donations.lang index a3470f88df7aa..28a79d9b721cc 100644 --- a/htdocs/langs/nl_NL/donations.lang +++ b/htdocs/langs/nl_NL/donations.lang @@ -4,10 +4,10 @@ Donations=Donaties DonationRef=Gift ref. Donor=Donor Donors=Donoren -AddDonation=Create a donation +AddDonation=Nieuwe donatie NewDonation=Nieuwe donatie -DeleteADonation=Delete a donation -ConfirmDeleteADonation=Are you sure you want to delete this donation ? +DeleteADonation=Verwijder een donatie +ConfirmDeleteADonation=Bent u zeker dat u deze donatie wilt verwijderen? ShowDonation=Toon gift DonationPromise=Donatie toezegging PromisesNotValid=Niet gevalideerde toezegging @@ -23,8 +23,8 @@ DonationStatusPaid=Donatie ontvangen DonationStatusPromiseNotValidatedShort=Voorlopig DonationStatusPromiseValidatedShort=Gevalideerd DonationStatusPaidShort=Ontvangen -DonationTitle=Donation receipt -DonationDatePayment=Payment date +DonationTitle=Donatiebevestiging +DonationDatePayment=Betaaldatum ValidPromess=Bevestig de toezegging DonationReceipt=Gift ontvangstbewijs BuildDonationReceipt=Creëer donatieontvangstbewijs @@ -34,10 +34,10 @@ SearchADonation=Zoek een donatie DonationRecipient=Gift ontvanger ThankYou=Dank u IConfirmDonationReception=De ontvanger verklaart ontvangst als gift van het volgende bedrag -MinimumAmount=Minimum amount is %s -FreeTextOnDonations=Free text to show in footer -FrenchOptions=Options for France +MinimumAmount=Minimum bedrag is %s +FreeTextOnDonations=Vrije tekst om te laten zien in de voettekst +FrenchOptions=Opties voor Frankrijk 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 +DonationPayment=Donatie betaling diff --git a/htdocs/langs/nl_NL/ecm.lang b/htdocs/langs/nl_NL/ecm.lang index e1ff7c60a1823..52f6582bfbe88 100644 --- a/htdocs/langs/nl_NL/ecm.lang +++ b/htdocs/langs/nl_NL/ecm.lang @@ -43,8 +43,8 @@ ECMDocsByContracts=Documenten gekoppeld aan contracten ECMDocsByInvoices=Documenten gekoppeld aan afnemersfacturen ECMDocsByProducts=Documenten gekoppeld aan producten ECMDocsByProjects=Documenten gekoppeld aan projecten -ECMDocsByUsers=Documents linked to users -ECMDocsByInterventions=Documents linked to interventions +ECMDocsByUsers=Documenten gerelateerd met gebruikers +ECMDocsByInterventions=Documenten gerelateerd aan interventies ECMNoDirectoryYet=Geen map aangemaakt ShowECMSection=Toon map DeleteSection=Verwijder map diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang index 5b331399e82dd..5d263dc1e5812 100644 --- a/htdocs/langs/nl_NL/errors.lang +++ b/htdocs/langs/nl_NL/errors.lang @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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=Verplichte setup parameters zijn nog niet gedefinieerd diff --git a/htdocs/langs/nl_NL/exports.lang b/htdocs/langs/nl_NL/exports.lang index c35d6a65dbccf..f7ac08fe8c363 100644 --- a/htdocs/langs/nl_NL/exports.lang +++ b/htdocs/langs/nl_NL/exports.lang @@ -8,7 +8,7 @@ ImportableDatas=Importeerbare gegevensgroep SelectExportDataSet=Kies de gegevensgroep welke u wilt exporteren SelectImportDataSet=Kies de gegevensgroep welke u wilt importeren SelectExportFields=Kies velden die u wilt exporteren, of selecteer een voorgedefinieerde exporteerprofiel -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=Kies bronbestandvelden die u wilt importeren en hun doelvelden in database door hen op en neer te verplaatsen met anker %s, of selecteer een voorgedefinieerde importeerprofiel: NotImportedFields=Niet geïmporteerde velden van bronbestand SaveExportModel=Bewaar dit exporteerprofiel als u van plan bent om het later nog een keer te gebruiken SaveImportModel=Bewaar dit importeerprofiel als u van plan bent om het later nog een keer te gebruiken @@ -81,7 +81,7 @@ DoNotImportFirstLine=Eerste regel van het bronbestand niet importeren NbOfSourceLines=Aantal regels in het bronbestand NowClickToTestTheImport=Controleer de importeerinstellingen die u heeft opgegegeven. Als deze correct zijn, klik u u de knop "%s" om een simulatie van het importeerproces te starten (Op dit moment veranderen er nog geen gegevens in uw database, het is enkel een simulatie) RunSimulateImportFile=Start de importeersimulatie -FieldNeedSource=This field requires data from the source file +FieldNeedSource=Dit veld heeft gegevens uit het bronbestand nodig SomeMandatoryFieldHaveNoSource=Sommige verplichte velden hebben geen bronveld uit het gegevensbestand InformationOnSourceFile=Informatie over het bronbestand InformationOnTargetTables=Informatie over doelvelden @@ -123,10 +123,10 @@ BankCode=Bankcode DeskCode=Bankcode BankAccountNumber=Rekeningnummer BankAccountNumberKey=Sleutel -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=Speciale code +ExportStringFilter=%% laat het vervangen toe van één of meer tekens in de tekst +ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filtert met één jaar/maand/dag
YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD: filtert over een reeks van jaren/maanden/dagen
> YYYY,> YYYYMM, > YYYYMMDD: filtert op alle volgende jaren/maanden/dagen
< YYYY, 'NNNNN+NNNNN' filtert over een bereik van waarden
'>NNNNN' filtert door lagere waarden
'>NNNNN' filtert door hogere waarden ## filters SelectFilterFields=Vul hier de waarden in waarop je wil filteren. FilterableFields=Filtervelden diff --git a/htdocs/langs/nl_NL/externalsite.lang b/htdocs/langs/nl_NL/externalsite.lang index 47a463d99cf9b..e3cb3ba9869b9 100644 --- a/htdocs/langs/nl_NL/externalsite.lang +++ b/htdocs/langs/nl_NL/externalsite.lang @@ -2,4 +2,4 @@ ExternalSiteSetup=Setup link naar externe website ExternalSiteURL=Externe Site URL ExternalSiteModuleNotComplete=Module ExternalSite werd niet correct geconfigureerd. -ExampleMyMenuEntry=My menu entry +ExampleMyMenuEntry=Mijn menu-item diff --git a/htdocs/langs/nl_NL/help.lang b/htdocs/langs/nl_NL/help.lang index 3caa1d3dc233e..0e1bab67e0c10 100644 --- a/htdocs/langs/nl_NL/help.lang +++ b/htdocs/langs/nl_NL/help.lang @@ -24,5 +24,5 @@ BackToHelpCenter=Klik anders hier om terug te gaan naar de hoofdpa LinkToGoldMember=U kunt een van de, vooraf door Dolibarr geselecteerde, coaches voor uw taal bellen (%s) door te klikken op zijn Widget (status en de maximale prijs worden automatisch bijgewerkt): PossibleLanguages=Ondersteunde talen MakeADonation=Help het Dolibarr project door een donatie te doen -# SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation -# SeeOfficalSupport=For official Dolibarr support in your language:
%s +SubscribeToFoundation=Help het Dolibarr project, wordt lid van de stichting +SeeOfficalSupport=Voor officiële Dolibarr ondersteuning in uw taal:
%s diff --git a/htdocs/langs/nl_NL/install.lang b/htdocs/langs/nl_NL/install.lang index 5575250b11259..9d73ad2717a54 100644 --- a/htdocs/langs/nl_NL/install.lang +++ b/htdocs/langs/nl_NL/install.lang @@ -155,8 +155,8 @@ MigrationFinished=Migratie voltooid LastStepDesc=Laatste stap: Definieer hier de login en het wachtwoord die u wilt gebruiken om verbinding te maken software. Niet los dit als het is de rekening voor alle anderen te beheren. 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) +WarningUpgrade=Waarschuwing: Heb je een database back-up uitgevoerd? Dit is zeer aanbevolen, als gevolg van een aantal bugs in databases systemen (bijvoorbeeld mysql versie 5.5.40), bepaalde gegevens of tabellen kunnen tijdens dit proces verloren kunnen gaan, dus het is zeer aan te bevelen om een ​​complete dump van je database voordat je de migratie start. Klik op OK om de migratie te starten ... +ErrorDatabaseVersionForbiddenForMigration=Uw database versie is %s en heeft een kritieke bug die gegevensverlies veroorzaakt als je structuur verandering uitvoert op uw database, welke gedaan worden door het migratieproces. Voor deze reden, zal de migratie niet worden toegestaan ​​totdat u uw database upgrade naar een hogere versie (lijst van gekende versies met bug: %s). ######### # upgrade @@ -208,7 +208,7 @@ MigrationProjectTaskTime=Verstreken tijd van de update in seconden MigrationActioncommElement=Bijwerken van gegevens over acties MigrationPaymentMode=Data migratie voor de betaling mode MigrationCategorieAssociation=Overzetten van categoriën -MigrationEvents=Migration of events to add event owner into assignement table +MigrationEvents=Migratie van taken om taak eigenaar toe te voegen in toekennings tabel ShowNotAvailableOptions=Toon niet beschikbare opties HideNotAvailableOptions=Verberg niet beschikbare opties diff --git a/htdocs/langs/nl_NL/interventions.lang b/htdocs/langs/nl_NL/interventions.lang index 8a77c50fad0a2..0c710aa288b85 100644 --- a/htdocs/langs/nl_NL/interventions.lang +++ b/htdocs/langs/nl_NL/interventions.lang @@ -3,7 +3,7 @@ Intervention=Interventie Interventions=Interventies InterventionCard=Interventiedetails NewIntervention=Nieuwe interventie -AddIntervention=Create intervention +AddIntervention=Nieuwe interventie ListOfInterventions=Interventielijst EditIntervention=Interventie bewerken ActionsOnFicheInter=Acties bij interventie @@ -24,21 +24,21 @@ NameAndSignatureOfInternalContact=Naam en handtekening van de uitvoerder: NameAndSignatureOfExternalContact=Naam en handtekening van de afnemer: DocumentModelStandard=Standaard modeldocument voor interventies InterventionCardsAndInterventionLines=Inteventiebladen en -regels -InterventionClassifyBilled=Classify "Billed" -InterventionClassifyUnBilled=Classify "Unbilled" +InterventionClassifyBilled=Classificeer "gefactureerd" +InterventionClassifyUnBilled=Classificeer "Nog niet gefactureerd" StatusInterInvoiced=Gefactureerd RelatedInterventions=Interventies ShowIntervention=Tonen tussenkomst -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=Indiening van de interventie %s +SendInterventionByMail=Stuur intervemtie per e-mail +InterventionCreatedInDolibarr=Interventie %s gecreëerd +InterventionValidatedInDolibarr=Interventie %s gevalideerd +InterventionModifiedInDolibarr=Interventie %s gewijzigd +InterventionClassifiedBilledInDolibarr=Interventie %s als gefactureerd geclassificeerd +InterventionClassifiedUnbilledInDolibarr=Interventie %s als nog niet gefactureerd geclassificeerd +InterventionSentByEMail=Interventie %s per e-mail verstuurd +InterventionDeletedInDolibarr=Interventie %s verwijderd +SearchAnIntervention=Zoek een interventie ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Vertegenwoordiger die de nabehandeling van de interventie doet TypeContact_fichinter_internal_INTERVENING=Tussenliggende @@ -50,4 +50,4 @@ ArcticNumRefModelError=Activeren mislukt PacificNumRefModelDesc1=Geef nummer met het formaat %sjjmm-nnnn terug waarbij jj het jaar is, mm de maand en nnnn een opeenvolgende oplopende reeks waarbij niet naar 0 teruggekeerd wordt PacificNumRefModelError=Een interventiedetailkaart beginnend met %s sjjmm bestaat al en is niet verenigbaar met deze reeksinstelling. Verwijder of hernoem het om deze module te activeren. PrintProductsOnFichinter=Printproducten op interventie fiche -PrintProductsOnFichinterDetails=Voor interventies gegenereerd uit opdrachten +PrintProductsOnFichinterDetails=Interventies gegenereerd op basis van bestellingen diff --git a/htdocs/langs/nl_NL/languages.lang b/htdocs/langs/nl_NL/languages.lang index 2a0c0ace2aa02..040b3d643228a 100644 --- a/htdocs/langs/nl_NL/languages.lang +++ b/htdocs/langs/nl_NL/languages.lang @@ -13,7 +13,7 @@ Language_de_AT=Duits (Oostenrijk) Language_de_CH=Duits (Zwitserland) Language_el_GR=Grieks Language_en_AU=Engels (Australië) -Language_en_CA=English (Canada) +Language_en_CA=Engels (Canada) Language_en_GB=Engels (Groot Brittannië) Language_en_IN=Engels (India) Language_en_NZ=Engels (Nieuw Zeeland) diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang index 613de2e85985c..1d3f1e6aef424 100644 --- a/htdocs/langs/nl_NL/main.lang +++ b/htdocs/langs/nl_NL/main.lang @@ -20,7 +20,7 @@ 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 %I:%M:%S %p FormatDateHourTextShort=%d %b %Y %H:%M FormatDateHourText=%d %B %Y %H:%M DatabaseConnection=Databaseverbinding @@ -62,10 +62,10 @@ ErrorFailedToSaveFile=Fout, bestand opslaan mislukt. SetDate=Stel datum in SelectDate=Selecteer een datum SeeAlso=Zie ook %s -SeeHere=See here +SeeHere=Zie hier BackgroundColorByDefault=Standaard achtergrondkleur -FileNotUploaded=The file was not uploaded -FileUploaded=The file was successfully uploaded +FileNotUploaded=Het bestand is niet geüpload +FileUploaded=Het bestand is geüpload FileWasNotUploaded=Een bestand is geselecteerd als bijlage, maar is nog niet geupload. Klik hiervoor op "Bevestig dit bestand". NbOfEntries=Aantal invoeringen GoToWikiHelpPage=Bekijk de online hulp (internettoegang vereist) @@ -141,7 +141,7 @@ Cancel=Annuleren Modify=Wijzigen Edit=Bewerken Validate=Valideer -ValidateAndApprove=Validate and Approve +ValidateAndApprove=Valideren en goedkeuren ToValidate=Te valideren Save=Opslaan SaveAs=Opslaan als @@ -159,7 +159,7 @@ Search=Zoeken SearchOf=Zoeken Valid=Geldig Approve=Goedkeuren -Disapprove=Disapprove +Disapprove=Afkeuren ReOpen=Heropenen Upload=Upload ToLink=Link @@ -173,7 +173,7 @@ User=Gebruiker Users=Gebruikers Group=Groep Groups=Groepen -NoUserGroupDefined=No user group defined +NoUserGroupDefined=Geen gebruikersgroep gedefinieerd Password=Wachtwoord PasswordRetype=Herhaal uw wachtwoord NoteSomeFeaturesAreDisabled=Let op, veel functionaliteiten / modules zijn uitgeschakeld in deze demonstratie. @@ -220,8 +220,9 @@ Next=Volgende Cards=Kaarten Card=Kaart Now=Nu +HourStart=Start uur Date=Datum -DateAndHour=Date and hour +DateAndHour=Datum en uur DateStart=Begindatum DateEnd=Einddatum DateCreation=Aanmaakdatum @@ -242,6 +243,8 @@ DatePlanShort=Datum gepland DateRealShort=Datum haalbaar DateBuild=Datum van rapportgeneratie DatePayment=Datum van betaling +DateApprove=Goedkeurings datum +DateApprove2=Goedkeurings datum (tweede goedkeuring) DurationYear=jaar DurationMonth=maand DurationWeek=week @@ -264,7 +267,7 @@ days=dagen Hours=Uur Minutes=Minuten Seconds=Seconden -Weeks=Weeks +Weeks=Weken Today=Vandaag Yesterday=Gisteren Tomorrow=Morgen @@ -298,7 +301,7 @@ UnitPriceHT=Eenheidsprijs (netto) UnitPriceTTC=Eenheidsprijs (bruto) PriceU=E.P. PriceUHT=EP (netto) -AskPriceSupplierUHT=P.U. HT Requested +AskPriceSupplierUHT=E.P. excl aangevraagd PriceUTTC=EP (bruto) Amount=Hoeveelheid AmountInvoice=Factuurbedrag @@ -349,7 +352,7 @@ FullList=Volledig overzicht Statistics=Statistieken OtherStatistics=Andere statistieken Status=Status -Favorite=Favorite +Favorite=Favoriet ShortInfo=Info. Ref=Referentie ExternalRef=Ref. extern @@ -376,7 +379,7 @@ ActionsOnCompany=Acties voor bedrijf ActionsOnMember=Events over dit lid NActions=%s acties NActionsLate=%s is laat -RequestAlreadyDone=Request already recorded +RequestAlreadyDone=Aanvraag reeds opgenomen Filter=Filter RemoveFilter=Verwijder filter ChartGenerated=Grafiek gegenereerd @@ -395,8 +398,8 @@ Available=Beschikbaar NotYetAvailable=Nog niet beschikbaar NotAvailable=Niet beschikbaar Popularity=Populariteit -Categories=Tags/categories -Category=Tag/category +Categories=Tags / categorieën +Category=Tag / categorie By=Door From=Van to=aan @@ -408,6 +411,8 @@ OtherInformations=Overige informatie Quantity=Hoeveelheid Qty=Aantal ChangedBy=Veranderd door +ApprovedBy=Goedgekeurd door +ApprovedBy2=Goedgekeurd door (tweede goedkeuring) ReCalculate=Herberekenen ResultOk=Succes ResultKo=Mislukking @@ -526,7 +531,7 @@ DateFromTo=Van %s naar %s DateFrom=Vanaf %s DateUntil=Tot %s Check=Controleren -Uncheck=Uncheck +Uncheck=Haal het vinkje weg Internal=Interne External=Extern Internals=Internen @@ -658,7 +663,7 @@ OptionalFieldsSetup=Extra attributen instellen URLPhoto=Url van foto / logo SetLinkToThirdParty=Link naar een andere derde CreateDraft=Maak een ontwerp -SetToDraft=Back to draft +SetToDraft=Terug naar ontwerp ClickToEdit=Klik om te bewerken ObjectDeleted=Object %s verwijderd ByCountry=Per land @@ -677,7 +682,7 @@ ModulesSystemTools=Modules gereedschappen Test=Test Element=Element NoPhotoYet=Nog geen fotos beschikbaar -HomeDashboard=Home summary +HomeDashboard=Home samenvatting Deductible=Aftrekbaar from=van toward=richting @@ -686,16 +691,18 @@ HelpCopyToClipboard=Gebruik Ctrl + C om te kopiëren naar het klembord SaveUploadedFileWithMask=Sla het bestand op de server met de naam "%s" (anders "%s") OriginFileName=Oorspronkelijke bestandsnaam SetDemandReason=Stel bron in -SetBankAccount=Define Bank Account -AccountCurrency=Account Currency +SetBankAccount=Definieer Bank Rekening +AccountCurrency=Rekening Valuta ViewPrivateNote=Notities bekijken XMoreLines=%s regel(s) verborgen PublicUrl=Openbare URL -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. +AddBox=Box toevoegen +SelectElementAndClickRefresh=Selecteer een element en klik op nernieuwen +PrintFile=Bestand afdrukken %s +ShowTransaction=Toon transactie +GoIntoSetupToChangeLogo=Ga naar Home - Setup - Bedrijf om logo te wijzigen of ga naar Home - Instellingen - Scherm om te verbergen. +Deny=Wijgeren +Denied=Gewijgerd # Week day Monday=Maandag Tuesday=Dinsdag diff --git a/htdocs/langs/nl_NL/margins.lang b/htdocs/langs/nl_NL/margins.lang index 75f05c0d88253..3f86ef5cc189e 100644 --- a/htdocs/langs/nl_NL/margins.lang +++ b/htdocs/langs/nl_NL/margins.lang @@ -16,7 +16,7 @@ MarginDetails=Marge details ProductMargins=Product marge CustomerMargins=Klant marges SalesRepresentativeMargins=Vertegenwoordiger marges -UserMargins=User margins +UserMargins=Gebruiker marges ProductService=Trainning of Dienst AllProducts=Alle Trainingen en Diensten ChooseProduct/Service=Kies Training of Dienst @@ -39,7 +39,7 @@ BuyingCost=Kostprijs UnitCharges=Unit toeslag Charges=Toeslag AgentContactType=Contact type used voor commissie -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 +AgentContactTypeDetails=Definiëren welk contact type (gekoppeld aan facturen) zal worden gebruikt voor het marge rapport per verkoop vertegenwoordiger +rateMustBeNumeric=Tarief moet een numerieke waarde zijn +markRateShouldBeLesserThan100=Markeer tarief moet lager zijn dan 100 zijn +ShowMarginInfos=Toon marge info diff --git a/htdocs/langs/nl_NL/orders.lang b/htdocs/langs/nl_NL/orders.lang index 08686be5296be..7ea72e817097c 100644 --- a/htdocs/langs/nl_NL/orders.lang +++ b/htdocs/langs/nl_NL/orders.lang @@ -16,20 +16,20 @@ SupplierOrder=Leveranciersopdracht SuppliersOrders=Leveranciersopdrachten SuppliersOrdersRunning=Huidige leveranciersopdrachten CustomerOrder=Afnemersopdracht -CustomersOrders=Customers orders +CustomersOrders=Klant bestellingen CustomersOrdersRunning=Lopende afnemersopdrachten CustomersOrdersAndOrdersLines=Afnemersopdrachten en opdrachtregels -OrdersToValid=Customers orders to validate -OrdersToBill=Customers orders delivered -OrdersInProcess=Customers orders in process -OrdersToProcess=Customers orders to process +OrdersToValid=Klant bestellingen te valideren +OrdersToBill=Klant bestellingen geleverd +OrdersInProcess=Klant bestellingen in uitvoering +OrdersToProcess=Klant bestellingen te verwerken SuppliersOrdersToProcess=Te verwerken leveranciersopdrachten StatusOrderCanceledShort=Geannuleerd StatusOrderDraftShort=Concept StatusOrderValidatedShort=Gevalideerd StatusOrderSentShort=In proces StatusOrderSent=In verzending -StatusOrderOnProcessShort=Ordered +StatusOrderOnProcessShort=Besteld StatusOrderProcessedShort=Verwerkt StatusOrderToBillShort=Te factureren StatusOrderToBill2Short=Te factureren @@ -41,8 +41,8 @@ StatusOrderReceivedAllShort=Alles ontvangen StatusOrderCanceled=Geannuleerd StatusOrderDraft=Concept (moet worden gevalideerd) StatusOrderValidated=Gevalideerd -StatusOrderOnProcess=Ordered - Standby reception -StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation +StatusOrderOnProcess=Besteld - Standby-ontvangst +StatusOrderOnProcessWithValidation=Besteld - Standby-ontvangst of validatie StatusOrderProcessed=Verwerkt StatusOrderToBill=Te factureren StatusOrderToBill2=Te factureren @@ -51,26 +51,26 @@ StatusOrderRefused=Geweigerd StatusOrderReceivedPartially=Gedeeltelijk ontvangen StatusOrderReceivedAll=Alles ontvangen ShippingExist=Een zending bestaat -ProductQtyInDraft=Product quantity into draft orders -ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered +ProductQtyInDraft=Hoeveelheid producten in de ontwerp bestellingen +ProductQtyInDraftOrWaitingApproved=Hoeveelheid product in het ontwerp of de goedgekeurde bestellingen, nog niet besteld DraftOrWaitingApproved=Concept of nog niet goedgekeurd DraftOrWaitingShipped=Concept of nog niet verzonden MenuOrdersToBill=Te factureren opdrachten -MenuOrdersToBill2=Billable orders +MenuOrdersToBill2=Factureerbare bestellingen SearchOrder=Zoekopdracht SearchACustomerOrder=Zoek een klant bestelling -SearchASupplierOrder=Search a supplier order +SearchASupplierOrder=Zoek een leveranciers bestelling ShipProduct=Verzend product Discount=Korting CreateOrder=Creeer opdracht RefuseOrder=Wijger opdracht -ApproveOrder=Approve order -Approve2Order=Approve order (second level) +ApproveOrder=Goedkeuren bestelling +Approve2Order=Goedkeuren bestelling (tweede niveau) ValidateOrder=Valideer opdracht UnvalidateOrder=Unvalidate order DeleteOrder=Verwijder opdracht CancelOrder=Annuleer opdracht -AddOrder=Create order +AddOrder=Nieuwe bestelling AddToMyOrders=Toevoegen aan mijn opdrachten AddToOtherOrders=Toevoegen aan andere opdrachten AddToDraftOrders=Voeg toe aan order in aanmaak @@ -79,7 +79,9 @@ NoOpenedOrders=Geen lopende opdrachten NoOtherOpenedOrders=Geen enkele andere opdracht geopend NoDraftOrders=Geen orders in aanmaak OtherOrders=Andere opdrachten -LastOrders=Laatste %s opdrachten +LastOrders=Laatste %s klantbestellingen +LastCustomerOrders=Laatste %s klantbestellingen +LastSupplierOrders=Laatste %s leverancier bestellingen LastModifiedOrders=Laatste %s aangepaste opdrachten LastClosedOrders=Laatste %s gesloten opdrachten AllOrders=Alle opdrachten @@ -103,8 +105,8 @@ ClassifyBilled=Classificeer "gefactureerd" ComptaCard=Boekhoudingsoverzicht DraftOrders=Conceptopdrachten RelatedOrders=Gerelateerde opdrachten -RelatedCustomerOrders=Related customer orders -RelatedSupplierOrders=Related supplier orders +RelatedCustomerOrders=Verwante klantbestellingen +RelatedSupplierOrders=Verwante leverancier bestellingen OnProcessOrders=Opdrachten in behandeling RefOrder=Ref. Opdracht RefCustomerOrder=Ref. afnemersopdracht @@ -121,7 +123,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 +FirstApprovalAlreadyDone=Eerste goedkeuring al gedaan ##### 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 0c20da6fc3f35..1e013a5b4f5d2 100644 --- a/htdocs/langs/nl_NL/other.lang +++ b/htdocs/langs/nl_NL/other.lang @@ -203,6 +203,7 @@ NewKeyWillBe=Uw nieuwe sleutel in te loggen zal zijn ClickHereToGoTo=Klik hier om naar %s YouMustClickToChange=Je moet echter wel eerst klikken op de volgende link om de wachtwoord wijziging te valideren ForgetIfNothing=Als u deze wijziging niet heeft aangevraagd, negeer deze e-mail. Uw referenties blijven veilig bewaard. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=Nieuwe vermelding in de agenda %s diff --git a/htdocs/langs/nl_NL/productbatch.lang b/htdocs/langs/nl_NL/productbatch.lang index 452636819653f..60e1403e2002f 100644 --- a/htdocs/langs/nl_NL/productbatch.lang +++ b/htdocs/langs/nl_NL/productbatch.lang @@ -1,21 +1,22 @@ # 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=Gebruik lot / serienummer +ProductStatusOnBatch=Ja (lot / serienummer vereist) +ProductStatusNotOnBatch=Nee (lot / serial niet gebruikt) +ProductStatusOnBatchShort=Ja +ProductStatusNotOnBatchShort=Nee +Batch=Lot / Serienummer +atleast1batchfield=Vervaldatum of uiterste verkoopdatum of Lot / Serienummer +batch_number=Lot / Serienummer +BatchNumberShort=Lot / Serienummer +l_eatby=Vervaldatum +l_sellby=Uiterste verkoop datum +DetailBatchNumber=Lot / Serienummer informatie +DetailBatchFormat=Lot / Ser: % s - Verval: %s - Verkoop: %s (Aantal: %d) +printBatch=Lot / Ser: %s +printEatby=Verval: %s +printSellby=Verkoop: %s +printQty=Aantal: %d +AddDispatchBatchLine=Voeg een regel toe voor houdbaarheids ontvangst +BatchDefaultNumber=Onbepaald +WhenProductBatchModuleOnOptionAreForced=Als module Lot / Serienummer actief is, verhogen/verlagen voorraad modus wordt geforceerd en kan niet worden bewerkt. Andere opties kunnen worden gedefinieerd als u wilt. +ProductDoesNotUseBatchSerial=Dit product is niet lot/serienummer ingesteld diff --git a/htdocs/langs/nl_NL/products.lang b/htdocs/langs/nl_NL/products.lang index 0b99eadd66c29..c1eba78b7540d 100644 --- a/htdocs/langs/nl_NL/products.lang +++ b/htdocs/langs/nl_NL/products.lang @@ -13,25 +13,25 @@ NewProduct=Nieuw product NewService=Nieuwe dienst ProductCode=Productcode ServiceCode=Dienstcode -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. +ProductVatMassChange=BTW verandering in massa +ProductVatMassChangeDesc=Deze pagina kan worden gebruikt om een ​​BTW-tarief gedefinieerd op producten of diensten van een waarde naar een ander te wijzigen. Waarschuwing, deze verandering gebeurt op alle 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. +MassBarcodeInitDesc=Deze pagina kan worden gebruikt om een ​​streepjescode op objecten die geen streepjescode hebben gedefinieerd. Controleer voor dat setup van de module barcode is ingesteld. ProductAccountancyBuyCode=Inkoopcode ProductAccountancySellCode=Verkoopcode ProductOrService=Product of Dienst ProductsAndServices=Producten en Diensten ProductsOrServices=Producten of diensten -ProductsAndServicesOnSell=Products and Services for sale or for purchase -ProductsAndServicesNotOnSell=Products and Services out of sale +ProductsAndServicesOnSell=Producten en diensten voor verkoop of aankoop +ProductsAndServicesNotOnSell=Producten en diensten niet voor verkoop ProductsAndServicesStatistics=Producten- en dienstenstatistieken ProductsStatistics=Productenstatistieken -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=Product voor verkoop of aankoop +ProductsNotOnSell=Product niet voor verkoop en niet voor aankoop +ProductsOnSellAndOnBuy=Producten voor verkoop en aankoop +ServicesOnSell=Diensten voor verkoop of aankoop +ServicesNotOnSell=Diensten niet voor verkoop +ServicesOnSellAndOnBuy=Diensten voor verkoop en aankoop InternalRef=Interne referentie LastRecorded=Laatste geregistreerde verkochte producten / diensten LastRecordedProductsAndServices=Laatste %s geregistreerde producten / diensten @@ -72,20 +72,20 @@ PublicPrice=Adviesprijs CurrentPrice=Huidige prijs NewPrice=Nieuwe prijs MinPrice=Minimum verkoopprijs -MinPriceHT=Minim. selling price (net of tax) -MinPriceTTC=Minim. selling price (inc. tax) +MinPriceHT=Min. verkoopprijs (na belastingen) +MinPriceTTC=Min. verkoopprijs (incl. BTW) CantBeLessThanMinPrice=De verkoopprijs kan niet lager zijn dan de minimumprijs voor dit product ( %s zonder belasting) ContractStatus=Contractstatus ContractStatusClosed=Gesloten ContractStatusRunning=Lopende ContractStatusExpired=Verstreken ContractStatusOnHold=Niet actief -ContractStatusToRun=To get running +ContractStatusToRun=Lopende maken ContractNotRunning=Dit contract is niet actief ErrorProductAlreadyExists=Een product met verwijzing %s bestaat reeds. ErrorProductBadRefOrLabel=Verkeerde waarde voor de referentie of label. ErrorProductClone=Er was een probleem bij het clonen van het product of de dienst. -ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price. +ErrorPriceCantBeLowerThanMinPrice=Fout, prijs kan niet lager zijn dan minimumprijs. Suppliers=Leveranciers SupplierRef=Leveranciersreferentie ShowProduct=Toon product @@ -114,15 +114,15 @@ BarcodeValue=Waarde streepjescode NoteNotVisibleOnBill=Notitie (niet zichtbaar op facturen, offertes, etc) CreateCopy=Creëer kopie ServiceLimitedDuration=Als product een dienst is met een beperkte houdbaarheid: -MultiPricesAbility=Several level of prices per product/service +MultiPricesAbility=Verschillende prijs niveaus product/dienst MultiPricesNumPrices=Aantal prijzen MultiPriceLevelsName=Prijscategorieën -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=Activeer de pakket functie +AssociatedProducts=Pakket product +AssociatedProductsNumber=Aantal producten waaruit dit pakket product bestaat +ParentProductsNumber=Aantal ouder pakket producten +IfZeroItIsNotAVirtualProduct=Als 0, dit product is geenl pakket product +IfZeroItIsNotUsedByVirtualProduct=Als 0, wordt dit product niet gebruikt door een pakket product EditAssociate=Associatie Translation=Vertaling KeywordFilter=Trefwoord filter @@ -132,7 +132,7 @@ AddDel=Toevoegen / verwijderen Quantity=Hoeveelheid NoMatchFound=Geen resultaten gevonden ProductAssociationList=Lijst van gerelateerde producten / diensten: naam van het product / de dienst (hoeveelheid geaffecteerd) -ProductParentList=List of package products/services with this product as a component +ProductParentList=Lijst van pakket producten met dit product als onderdeel ErrorAssociationIsFatherOfThis=Een van de geselecteerde product is de ouder van het huidige product DeleteProduct=Verwijderen een product / dienst ConfirmDeleteProduct=Weet u zeker dat u dit product / deze dienst wilt verwijderen? @@ -161,12 +161,12 @@ NoSupplierPriceDefinedForThisProduct=Geen leveranciersprijs / -hoeveelheid voor RecordedProducts=Geregistreerde producten RecordedServices=Geregistreerde diensten RecordedProductsAndServices=Geregistreerde producten / diensten -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=Vooraf gedefinieerde producten voor verkoop +PredefinedServicesToSell=Voorgedefinieerde services voor verkoop +PredefinedProductsAndServicesToSell=Voorgedefinieerde producten/diensten voor koop +PredefinedProductsToPurchase=Voorgedefinieerde product voor aankoop +PredefinedServicesToPurchase=Voorgedefinieerde services voor aankoop +PredefinedProductsAndServicesToPurchase=Voorgedefinieerde producten/diensten voor aankoop GenerateThumb=Genereer voorvertoning ProductCanvasAbility=Gebruik speciale "canvas" addons ServiceNb=Dienst nummer %s @@ -179,12 +179,12 @@ CloneProduct=Kopieer product of dienst ConfirmCloneProduct=Weet u zeker dat u het product of de dienst %s wilt klonen? CloneContentProduct=Kloon alle hoofdinformatie van het product / de dienst ClonePricesProduct=Kloon hoofdinformatie en prijzen -CloneCompositionProduct=Clone packaged product/services +CloneCompositionProduct=Kloon pakket product/diensten ProductIsUsed=Dit product wordt gebruikt NewRefForClone=Referentie naar nieuw produkt / dienst CustomerPrices=Consumentenprijs SuppliersPrices=Leveranciersprijs -SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services) +SuppliersPricesOfProductsOrServices=Leverancier prijzen (van producten of diensten) CustomCode=Code op maat CountryOrigin=Land van herkomst HiddenIntoCombo=Verborgen in selectielijsten @@ -198,7 +198,7 @@ HelpAddThisServiceCard=Optie om een dienst te maken of één te kopieren als het CurrentProductPrice=Huidige prijs AlwaysUseNewPrice=Gebruik altijd huidige product/diensten prijs AlwaysUseFixedPrice=Gebruik vaste prijs -PriceByQuantity=Different prices by quantity +PriceByQuantity=Verschillende prijzen per hoeveelheid PriceByQuantityRange=Aantal bereik ProductsDashboard=Product/dienst samenvatting UpdateOriginalProductLabel=Wijzig oorspronkelijk label @@ -214,7 +214,7 @@ CostPmpHT=Netto VWAP totaal ProductUsedForBuild=Automatisch opgebruiken bij productie ProductBuilded=Productie klaar ProductsMultiPrice=Multi-prijs product -ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices) +ProductsOrServiceMultiPrice=Klant prijzen (van producten of diensten, multi-prijzen) ProductSellByQuarterHT=VWAP kwartaalomzet producten ServiceSellByQuarterHT=VWAP kwartaalomzet diensten Quarter1=1e kwartaal @@ -233,37 +233,37 @@ DefinitionOfBarCodeForProductNotComplete=Onvolledige definitie van type of code DefinitionOfBarCodeForThirdpartyNotComplete=Onvolledige definitie van het type of de code van de barcode voor derde partij %s. BarCodeDataForProduct=Barcodegegevens voor product %s : BarCodeDataForThirdparty=Barcodegegevens van derde partij %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 #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 +ResetBarcodeForAllRecords=Definieer streepjescode waarde voor alle records (dit zal ook de streepjescode waarde al gedefinieerd resetten met nieuwe waarden) +PriceByCustomer=Verschillende prijs voor elke klant +PriceCatalogue=Unieke prijs per product/dienst +PricingRule=Regels voor prijzen klant +AddCustomerPrice=Prijs per klant toevoegen +ForceUpdateChildPriceSoc=Stel dezelfde prijs in dochterondernemingen klant +PriceByCustomerLog=Prijs per klant log +MinimumPriceLimit=Minimumprijs niet lager kan zijn dan %s +MinimumRecommendedPrice=Minimaal aanbevolen prijs is:% s +PriceExpressionEditor=Prijs expressie editor +PriceExpressionSelected=Geselecteerde prijs uitdrukking +PriceExpressionEditorHelp1="Prijs = 2 + 2" of "2 + 2" voor het instellen van de prijs. Gebruik ; om uitdrukkingen te scheiden +PriceExpressionEditorHelp2=U kunt ExtraFields benaderen met variabelen zoals #extrafield_myextrafieldkey# en globale variabelen met #global_mycode # +PriceExpressionEditorHelp3=In beide product/dienst en leverancier prijzen zijn er deze variabelen beschikbaar:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min# +PriceExpressionEditorHelp4=In de product/dienst prijs alleen:#supplier_min_price#
In leverancier prijzen alleen: #supplier_quantity# and #supplier_tva_tx# +PriceExpressionEditorHelp5=Beschikbare globale waarden: +PriceMode=Prijs-modus +PriceNumeric=Nummer +DefaultPrice=Standaard prijs +ComposedProductIncDecStock=Verhogen/verlagen voorraad bij de ouder verandering ComposedProduct=Sub-product -MinSupplierPrice=Minimum supplier price -DynamicPriceConfiguration=Dynamic price configuration -GlobalVariables=Global variables -GlobalVariableUpdaters=Global variable updaters +MinSupplierPrice=Minimum leverancier prijs +DynamicPriceConfiguration=Dynamische prijs configuratie +GlobalVariables=Globale variabelen +GlobalVariableUpdaters=Globale variabele aanpassers 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 +GlobalVariableUpdaterHelp0=Ontleedt JSON gegevens van opgegeven URL, VALUE bepaalt de locatie van de relevante waarde, +GlobalVariableUpdaterHelpFormat0=formaat is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"} +GlobalVariableUpdaterType1=WebService gegevens +GlobalVariableUpdaterHelp1=Ontleedt WebService gegevens van opgegeven URL, NS geeft de namespace, VALUE bepaalt de locatie van de relevante waarde, DATA moeten de te sturen gegevens bevatten en de METHOD is de te roepen WS methode +GlobalVariableUpdaterHelpFormat1=formaat is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}} +UpdateInterval=Update-interval (minuten) +LastUpdated=Laatst bijgewerkt +CorrectlyUpdated=Correct bijgewerkt diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang index bddf7fe85d7b5..967492753ab49 100644 --- a/htdocs/langs/nl_NL/projects.lang +++ b/htdocs/langs/nl_NL/projects.lang @@ -8,15 +8,16 @@ 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. +ProjectsPublicTaskDesc=Deze weergave toont alle projecten en taken die je mag lezen. 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). +OnlyOpenedProject=Alleen geopende projecten zijn zichtbaar (projecten met een ontwerp of gesloten status worden niet zichtbaar). 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). +AllTaskVisibleButEditIfYouAreAssigned=Alle taken voor een dergelijk project zijn zichtbaar, maar je kunt de tijd alleen ingeven voor de taak die u zijn toegewezen. ProjectsArea=Projectenoverzicht NewProject=Nieuw project -AddProject=Create project +AddProject=Nieuw project DeleteAProject=Project verwijderen DeleteATask=Taak verwijderen ConfirmDeleteAProject=Weet u zeker dat u dit project wilt verwijderen? @@ -31,27 +32,27 @@ 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 +TimeSpentByYou=Uw tijdsbesteding +TimeSpentByUser=Gebruikers tijdsbesteding TimesSpent=Bestede tijd RefTask=Ref. taak LabelTask=Label taak -TaskTimeSpent=Time spent on tasks -TaskTimeUser=User -TaskTimeNote=Note -TaskTimeDate=Date -TasksOnOpenedProject=Tasks on opened projects -WorkloadNotDefined=Workload not defined +TaskTimeSpent=Tijd besteed aan taken +TaskTimeUser=Gebruiker +TaskTimeNote=Notitie +TaskTimeDate=Datum +TasksOnOpenedProject=Taken op geopende projecten +WorkloadNotDefined=Workload niet gedefinieerd NewTimeSpent=Nieuwe bestede tijd MyTimeSpent=Mijn bestede tijd MyTasks=Mijn taken Tasks=Taken Task=Taak -TaskDateStart=Task start date -TaskDateEnd=Task end date -TaskDescription=Task description +TaskDateStart=Taak startdatum +TaskDateEnd=Taak einddatum +TaskDescription=Taakomschrijving NewTask=Nieuwe taak -AddTask=Create task +AddTask=Nieuwe taak AddDuration=Duur toevoegen Activity=Activiteit Activities=Taken / activiteiten @@ -60,8 +61,8 @@ MyActivities=Mijn taken / activiteiten MyProjects=Mijn projecten DurationEffective=Effectieve duur Progress=Voortgang -ProgressDeclared=Declared progress -ProgressCalculated=Calculated progress +ProgressDeclared=Ingegeven voorgang +ProgressCalculated=Berekende voorgang Time=Tijd ListProposalsAssociatedProject=Lijst van aan het project verbonden offertes ListOrdersAssociatedProject=Lijst van aan het project verbonden afnemersopdrachten @@ -71,8 +72,8 @@ 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 -ListExpenseReportsAssociatedProject=List of expense reports associated with the project -ListDonationsAssociatedProject=List of donations associated with the project +ListExpenseReportsAssociatedProject=Lijst van onkostennota's in verband met het project +ListDonationsAssociatedProject=Lijst van donaties in verband met het project ListActionsAssociatedProject=Lijst van aan het project verbonden acties ActivityOnProjectThisWeek=Projectactiviteit in deze week ActivityOnProjectThisMonth=Projectactiviteit in deze maand @@ -92,54 +93,54 @@ ActionsOnProject=Acties in het project YouAreNotContactOfProject=U bent geen contactpersoon van dit privé project DeleteATimeSpent=Verwijder gespendeerde tijd ConfirmDeleteATimeSpent=Weet u zeker dat u de gespendeerde tijd wilt verwijderen? -DoNotShowMyTasksOnly=See also tasks not assigned to me -ShowMyTasksOnly=View only tasks assigned to me +DoNotShowMyTasksOnly=Bekijk ook taken niet aan mij toegewezen +ShowMyTasksOnly=Bekijk alleen taken die aan mij toegewezen TaskRessourceLinks=Bronnen ProjectsDedicatedToThisThirdParty=Projecten gewijd aan deze derde partij NoTasks=Geen taken voor dit project LinkedToAnotherCompany=Gekoppeld aan een andere derde partij -TaskIsNotAffectedToYou=Task not assigned to you +TaskIsNotAffectedToYou=Taak niet aan u toegewezen ErrorTimeSpentIsEmpty=Gespendeerde tijd is leeg ThisWillAlsoRemoveTasks=Deze actie zal ook alle taken van het project (%s taken op het moment) en alle ingangen van de tijd doorgebracht. IfNeedToUseOhterObjectKeepEmpty=Als sommige objecten (factuur, order, ...), die behoren tot een andere derde, moet worden gekoppeld aan het project te maken, houden deze leeg naar het project dat met meerdere derden. -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=Kloon project +CloneTasks=Kloon taken +CloneContacts=Kloon contacten +CloneNotes=Kloon notities +CloneProjectFiles=Kloon project samengevoegde bestanden +CloneTaskFiles=Kloon taak(en) samengevoegde bestanden (als taak(en) gekloond) +CloneMoveDate=Update Project/taken datums vanaf nu? +ConfirmCloneProject=Weet je zeker dat dit project te klonen? +ProjectReportDate=Wijziging datum taak volgens startdatum van het project +ErrorShiftTaskDate=Onmogelijk taak datum te verschuiven volgens de nieuwe startdatum van het project +ProjectsAndTasksLines=Projecten en taken +ProjectCreatedInDolibarr=Project %s gecreëerd +TaskCreatedInDolibarr=Taak %s gecreëerd +TaskModifiedInDolibarr=Taak %s gewijzigd +TaskDeletedInDolibarr=Taak %s verwijderd ##### Types de contacts ##### TypeContact_project_internal_PROJECTLEADER=Projectmanager TypeContact_project_external_PROJECTLEADER=Projectleider -TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributor -TypeContact_project_external_PROJECTCONTRIBUTOR=Contributor +TypeContact_project_internal_PROJECTCONTRIBUTOR=Inzender +TypeContact_project_external_PROJECTCONTRIBUTOR=Inzender TypeContact_project_task_internal_TASKEXECUTIVE=Verantwoordelijke TypeContact_project_task_external_TASKEXECUTIVE=Verantwoordelijke -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=Inzender +TypeContact_project_task_external_TASKCONTRIBUTOR=Inzender +SelectElement=Kies een element +AddElement=Koppeling naar element +UnlinkElement=Ontkoppel element # Documents models DocumentModelBaleine=Een compleet projectrapportagemodel (logo, etc) -PlannedWorkload=Planned workload +PlannedWorkload=Geplande 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 +WorkloadOccupation=Workload toekenning +ProjectReferers=Verwijzende objecten +SearchAProject=Zoek een project +ProjectMustBeValidatedFirst=Project moet eerst worden gevalideerd +ProjectDraft=Ontwerp projecten +FirstAddRessourceToAllocateTime=Associëer een resource om tijd toe te wijzen +InputPerDay=Input per dag InputPerWeek=Input per week -InputPerAction=Input per action -TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s +InputPerAction=Input per actie +TimeAlreadyRecorded=Tijd besteed reeds opgenomen voor deze taak / dag en gebruiker %s diff --git a/htdocs/langs/nl_NL/propal.lang b/htdocs/langs/nl_NL/propal.lang index a48b3e8b98170..98509c106d0d0 100644 --- a/htdocs/langs/nl_NL/propal.lang +++ b/htdocs/langs/nl_NL/propal.lang @@ -16,7 +16,7 @@ Prospect=Prospect ProspectList=Prospectenlijst DeleteProp=Offerte verwijderen ValidateProp=Offerte valideren -AddProp=Offerte toevoegen +AddProp=Nieuwe offerte ConfirmDeleteProp=Weet u zeker dat u deze offerte wilt verwijderen? ConfirmValidateProp=Weet u zeker dat u deze offerte wilt valideren? LastPropals=Laatste %s offertes @@ -55,8 +55,6 @@ NoOpenedPropals=Aantal openstaande offertes NoOtherOpenedPropals=Geen enkel andere openstaande offerte RefProposal=Offertereferentie SendPropalByMail=Stuur offerte per e-mail -FileNotUploaded=Het bestand is niet geüpload -FileUploaded=Het bestand is geüpload AssociatedDocuments=Documenten gelinkt aan de offerte: ErrorCantOpenDir=Kan map niet openen DatePropal=Offertedatum @@ -70,8 +68,8 @@ ErrorPropalNotFound=Offerte %s niet gevonden Estimate=Raming: EstimateShort=Raming OtherPropals=Andere offertes -# AddToDraftProposals=Add to draft proposal -# NoDraftProposals=No draft proposals +AddToDraftProposals=Toevoegen aan ontwerp offerte +NoDraftProposals=Geen ontwerpoffertes CopyPropalFrom=Maak offerte door het kopiëren van een bestaande offerte CreateEmptyPropal=Creëer een lege offerte of uit de lijst van producten / diensten DefaultProposalDurationValidity=Standaardgeldigheid offerte (in dagen) @@ -97,6 +95,6 @@ TypeContact_propal_external_CUSTOMER=Afnemerscontactpersoon follow-up voorstel # Document models DocModelAzurDescription=Een compleet offertemodel (logo, etc) DocModelJauneDescription=Jaune offertemodel -# 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=Standaard model aanmaken +DefaultModelPropalToBill=Standaard sjabloon bij het sluiten van een zakelijk voorstel (te factureren) +DefaultModelPropalClosed=Standaard sjabloon bij het sluiten van een zakelijk voorstel (nog te factureren) diff --git a/htdocs/langs/nl_NL/resource.lang b/htdocs/langs/nl_NL/resource.lang index 2f498d486b88a..c7b3480ae84b0 100644 --- a/htdocs/langs/nl_NL/resource.lang +++ b/htdocs/langs/nl_NL/resource.lang @@ -22,8 +22,8 @@ GotoDate=Ga naar datum ResourceElementPage=Element resources ResourceCreatedWithSuccess=Resource met succes gecreeerd -RessourceLineSuccessfullyDeleted=Resource line successfully deleted -RessourceLineSuccessfullyUpdated=Resource line successfully updated +RessourceLineSuccessfullyDeleted=Resource lijn succesvol verwijderd +RessourceLineSuccessfullyUpdated=Resource lijn succesvol bijgewerkt ResourceLinkedWithSuccess=Resource met succes gekoppeld TitleResourceCard=Resource kaart diff --git a/htdocs/langs/nl_NL/salaries.lang b/htdocs/langs/nl_NL/salaries.lang index 28c21adfad3bf..b408d12196064 100644 --- a/htdocs/langs/nl_NL/salaries.lang +++ b/htdocs/langs/nl_NL/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 -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 +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Boekhoudkundige code voor salarissen betalingen +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=boekhoudkundige code voor financiële last +Salary=Salaris +Salaries=Salarissen +Employee=Werknemer +NewSalaryPayment=Nieuwe salarisbetaling +SalaryPayment=Salarisbetaling +SalariesPayments=Salarissen betalingen +ShowSalaryPayment=Toon salarisbetaling +THM=Gemiddelde uurprijs +TJM=Gemiddelde dagprijs +CurrentSalary=Huidige salaris diff --git a/htdocs/langs/nl_NL/sendings.lang b/htdocs/langs/nl_NL/sendings.lang index 42dbd16a12f38..e83b25e092c86 100644 --- a/htdocs/langs/nl_NL/sendings.lang +++ b/htdocs/langs/nl_NL/sendings.lang @@ -2,11 +2,11 @@ RefSending=Referentie verzending Sending=Verzending Sendings=Verzendingen -AllSendings=All Shipments +AllSendings=Alle zendingen Shipment=Verzending Shipments=Verzendingen -ShowSending=Show Sending -Receivings=Receipts +ShowSending=Toon te versturen +Receivings=Ontvangsten SendingsArea=Zendingenoverzicht ListOfSendings=Verzendlijst SendingMethod=Verzendwijze @@ -16,7 +16,7 @@ SearchASending=Zoek een zending StatisticsOfSendings=Verzendingsstatistieken NbOfSendings=Aantal zendingen NumberOfShipmentsByMonth=Aantal verzendingen per maand -SendingCard=Shipment card +SendingCard=Verzendings kaart NewSending=Nieuwe verzending CreateASending=Creëer een verzending CreateSending=Creëer verzending @@ -24,7 +24,7 @@ QtyOrdered=Aantal besteld QtyShipped=Aantal verzonden QtyToShip=Aantal te verzenden QtyReceived=Aantal ontvangen -KeepToShip=Remain to ship +KeepToShip=Resterend te verzenden OtherSendingsForSameOrder=Andere verzendingen voor deze opdracht DateSending=Datum versturing opdracht DateSendingShort=Datum versturing opdracht @@ -39,7 +39,7 @@ StatusSendingCanceledShort=Geannuleerd StatusSendingDraftShort=Concept StatusSendingValidatedShort=Gevalideerd StatusSendingProcessedShort=Verwerkt -SendingSheet=Shipment sheet +SendingSheet=Verzendings blad Carriers=Vervoerders Carrier=Vervoerder CarriersArea=verzendersoverzicht @@ -56,19 +56,19 @@ StatsOnShipmentsOnlyValidated=Statistiek op verzendingen die bevestigd zijn. Da DateDeliveryPlanned=Geplande leveringsdatum DateReceived=Datum leveringsonvangst SendShippingByEMail=Stuur verzending per e-mail -SendShippingRef=Submission of shipment %s +SendShippingRef=Indiening van de zending %s ActionsOnShipping=Acions op verzendkosten LinkToTrackYourPackage=Link naar uw pakket ShipmentCreationIsDoneFromOrder=Op dit moment, is oprichting van een nieuwe zending gedaan van de volgorde kaart. -RelatedShippings=Related shipments +RelatedShippings=Verwante verzendingen ShipmentLine=Verzendingslijn CarrierList=Lijst van transporteurs -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=Product uit bestelde klantbestellingen +SuppliersReceiptRunning=Product van bestelde leverancier bestellingen +ProductQtyInCustomersOrdersRunning=Hoeveelheid producte in geopende klant bestellingen +ProductQtyInSuppliersOrdersRunning=Hoeveelheid producten in geopende leveranciers bestellingen +ProductQtyInShipmentAlreadySent=Hoeveelheid producten uit open bestelling van de klant al verstuurd +ProductQtyInSuppliersShipmentAlreadyRecevied=Hoeveelheid producte uit geopende leverancier bestelling reeds ontvangen # Sending methods SendingMethodCATCH=Afhalen door de afnemer @@ -82,5 +82,5 @@ SumOfProductVolumes=Som van alle productvolumes SumOfProductWeights=Som van product-gewichten # warehouse details -DetailWarehouseNumber= Warehouse details -DetailWarehouseFormat= W:%s (Qty : %d) +DetailWarehouseNumber= Magazijn informatie +DetailWarehouseFormat= W:%s (Aantal : %d) diff --git a/htdocs/langs/nl_NL/stocks.lang b/htdocs/langs/nl_NL/stocks.lang index 8dec2f9aca916..614c5693bceb7 100644 --- a/htdocs/langs/nl_NL/stocks.lang +++ b/htdocs/langs/nl_NL/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Annuleer verzending DeleteSending=Verwijder verzending Stock=Voorraad Stocks=Voorraden +StocksByLotSerial=Voorraad door lot/serienummer Movement=Mutatie Movements=Mutaties ErrorWarehouseRefRequired=Magazijnreferentienaam is verplicht @@ -23,7 +24,7 @@ ErrorWarehouseLabelRequired=Magazijnlable is vereist CorrectStock=Corrigeer voorraad ListOfWarehouses=Magazijnenlijst ListOfStockMovements=Voorraadmutatielijst -StocksArea=Warehouses area +StocksArea=Magazijnen Location=Locatie LocationSummary=Korte naam locatie NumberOfDifferentProducts=Aantal verschillende producten @@ -47,10 +48,10 @@ 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 +IndependantSubProductStock=Product voorraad en subproduct voorraad zijn onafhankelijk QtyDispatched=Hoeveelheid verzonden -QtyDispatchedShort=Qty dispatched -QtyToDispatchShort=Qty to dispatch +QtyDispatchedShort=Aantal verzonden +QtyToDispatchShort=Aantal te verzenden OrderDispatch=Voorraadverzending RuleForStockManagementDecrease=Regel voor voorraadbeheerafname RuleForStockManagementIncrease=Regel voor voorraadbeheertoename @@ -62,11 +63,11 @@ ReStockOnValidateOrder=Verhoog de echte voorraad na het valideren van leverancie ReStockOnDispatchOrder=Verhoog de echte voorraad na het handmatig verzenden naar magazijnen, nadat de leveranciersopdracht ontvangst ReStockOnDeleteInvoice=Verhoog echte voorraad bij verwijderen factuur OrderStatusNotReadyToDispatch=Opdracht heeft nog geen, of niet langer, een status die het verzenden van producten naar een magazijn toestaat. -StockDiffPhysicTeoric=Explanation for difference between physical and theoretical stock +StockDiffPhysicTeoric=Reden voor het verschil tussen de feitelijke en theoretische voorraad NoPredefinedProductToDispatch=Geen vooraf ingestelde producten voor dit object. Daarom is verzending in voorraad niet vereist. DispatchVerb=Verzending -StockLimitShort=Limit for alert -StockLimit=Stock limit for alert +StockLimitShort=Alarm limiet +StockLimit=Alarm voorraadlimiet PhysicalStock=Fysieke voorraad RealStock=Werkelijke voorraad VirtualStock=Virtuele voorraad @@ -78,6 +79,7 @@ IdWarehouse=Magazijn-ID DescWareHouse=Beschrijving magazijn LieuWareHouse=Localisatie magazijn WarehousesAndProducts=Magazijn en producten +WarehousesAndProductsBatchDetail=Magazijnen en producten (met detail per lot/serieenummer) AverageUnitPricePMPShort=Gewogen gemiddelde inkoopprijs AverageUnitPricePMP=Gewogen gemiddelde inkoopprijs SellPriceMin=Verkopen Prijs per Eenheid @@ -97,38 +99,41 @@ DesiredStock=Gewenste voorraad StockToBuy=Te bestellen Replenishment=Bevoorrading ReplenishmentOrders=Bevoorradingsorder -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 +VirtualDiffersFromPhysical=Volgens verhogen/verlagen stock opties, fysieke voorraad en virtuele voorraad (fysieke + lopende bestellingen) kan verschilllen +UseVirtualStockByDefault=Gebruik virtuele voorraad standaard, in plaats van de fysieke voorraad, voor de aanvul functie +UseVirtualStock=Gebruik virtuele voorraad +UsePhysicalStock=Gebruik fysieke voorraad +CurentSelectionMode=Huidige selectie modus +CurentlyUsingVirtualStock=Virtual voorraad +CurentlyUsingPhysicalStock=Fysieke voorraad RuleForStockReplenishment=Regels voor bevoorrading SelectProductWithNotNullQty=Kies minstens één aanwezig product dat een leverancier heeft AlertOnly= Enkel waarschuwingen WarehouseForStockDecrease=De voorraad van magazijn %s zal verminderd worden 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=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. +ReplenishmentStatusDesc=Dit is een lijst van alle productgroepen met een voorraad lager dan gewenst voorraad (of lager dan de alarm waarde als checkbox "alleen alarm" is aangevinkt), aan te raden dat je een leverancier bestelling maakt om het verschil aan te vullen. +ReplenishmentOrdersDesc=Dit is de lijst van alle geopende leverancier bestellingen met inbegrip van vooraf gedefinieerde producten. Alleen geopend bestellingen met vooraf gedefinieerde producten, dus bestellingen die voorraden beinvloeden, zijn zichtbaar hier. 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) -MassMovement=Mass movement +MassMovement=Volledige verplaatsing MassStockMovement=Globale voorraadbeweging SelectProductInAndOutWareHouse=Kies een product, een aantal, een van-magazijn, een naar-magazijn, en klik "%s". Als alle nodige bewegingen zijn aangeduid, klik op "%s". RecordMovement=Kaart overbrengen -ReceivingForSameOrder=Receipts for this order +ReceivingForSameOrder=Ontvangsten voor deze bestelling StockMovementRecorded=Geregistreerde voorraadbewegingen -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. +RuleForStockAvailability=Regels op voorraad vereisten +StockMustBeEnoughForInvoice=Stock niveau moet voldoende zijn om het product/dienst toe te voegen aan de factuur +StockMustBeEnoughForOrder=Voorraadniveau moet genoeg zijn om het product/dienst toe te voegen aan order. +StockMustBeEnoughForShipment= Stock niveau moet voldoende zijn om het product/dienst toe te voegen aan de verzending +MovementLabel=Label van de verplaatsing +InventoryCode=Verplaatsing of inventaris code +IsInPackage=Vervat in pakket +ShowWarehouse=Toon magazijn +MovementCorrectStock=Stock correctie voor product %s +MovementTransferStock=Voorraad overdracht van het product %s in een ander magazijn +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Bron magazijn moet hier worden gedefinieerd als "Product lot" module is ingeschakeld. Het zal worden gebruikt om een ​​lijst van welke partij / serial is beschikbaar voor product dat veel / seriële data die nodig zijn voor beweging. Als u wilt sturen producten uit verschillende magazijnen, gewoon de zending in verschillende stappen. +InventoryCodeShort=Inv./Verpl. code +NoPendingReceptionOnSupplierOrder=Geen wachtende ontvangsten als gevolg van openstaande leverancier bestelling +ThisSerialAlreadyExistWithDifferentDate=Deze lot/serienummer (%s) bestaat al, maar met verschillende verval of verkoopen voor datum (gevonden %s maar u gaf in%s). diff --git a/htdocs/langs/nl_NL/suppliers.lang b/htdocs/langs/nl_NL/suppliers.lang index 8983b90f53364..f8a4dfe16bdb7 100644 --- a/htdocs/langs/nl_NL/suppliers.lang +++ b/htdocs/langs/nl_NL/suppliers.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Leveranciers -AddSupplier=Create a supplier +AddSupplier=Nieuwe leverancier SupplierRemoved=Leverancier verwijderd SuppliersInvoice=Leveranciersfactuur NewSupplier=Nieuwe leverancier @@ -29,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=Deny this order +DenyingThisOrder=Wijger deze bestelling 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 @@ -39,8 +39,8 @@ AddSupplierInvoice=Voeg leveranciersfactuur toe ListOfSupplierProductForSupplier=Lijst van producten en de prijzen van de leverancier %s NoneOrBatchFileNeverRan=Geen of bundel (batch) %s niet recentelijk gedraaid SentToSuppliers=Stuur naar leveranciers -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) +ListOfSupplierOrders=Lijst van leverancier bestellingen +MenuOrdersSupplierToBill=Leverancier bestellingen te factureren +NbDaysToDelivery=Levering vertraging in de dagen +DescNbDaysToDelivery=De langste levertermijn van de producten besteld in deze opdracht. +UseDoubleApproval=Gebruik dubbele goedkeuring (de tweede goedkeuring kan worden gedaan door elke gebruiker met de speciale toestemming) diff --git a/htdocs/langs/nl_NL/trips.lang b/htdocs/langs/nl_NL/trips.lang index 789566f321417..a3dea0dad7c7d 100644 --- a/htdocs/langs/nl_NL/trips.lang +++ b/htdocs/langs/nl_NL/trips.lang @@ -69,11 +69,9 @@ 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 @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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_NL/users.lang b/htdocs/langs/nl_NL/users.lang index 4b3028ac6f5c1..f279694a06f6c 100644 --- a/htdocs/langs/nl_NL/users.lang +++ b/htdocs/langs/nl_NL/users.lang @@ -1,5 +1,5 @@ # Dolibarr language file - Source file is en_US - users -HRMArea=HRM area +HRMArea=HRM sectie UserCard=Gebruikersdetails ContactCard=Contactdetails GroupCard=Groepsdetails @@ -86,7 +86,7 @@ MyInformations=Mijn gegevens ExportDataset_user_1=Dolibarr's gebruikers en eigenschappen DomainUser=Domeingebruikersaccount %s Reactivate=Reactiveren -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=Met dit formulier kunt u een gebruiker intern in uw bedrijf / stichting te creëren. Om een ​​externe gebruiker (klant, leverancier, ...), gebruik dan de knop te maken 'Nieuwe Dolibarr gebruiker' van klanten contactkaart. InternalExternalDesc=Een interne gebruiker is een gebruiker die deel uitmaakt van uw bedrijf.
Een externe gebruiker is een afnemer, leverancier of andere.

In beide gevallen kunnen de rechten binnen Dolibarr ingesteld worden. Ook kan een externe gebruiker over een ander menuverwerker beschikken dan een interne gebruiker (Zie Home->Instellingen->Scherm) PermissionInheritedFromAGroup=Toestemming verleend, omdat geërfd van een bepaalde gebruikersgroep. Inherited=Overgeërfd @@ -102,7 +102,7 @@ UserDisabled=Gebruiker %s uitgeschakeld UserEnabled=Gebruiker %s geactiveerd UserDeleted=Gebruiker %s verwijderd NewGroupCreated=Groep %s gemaakt -GroupModified=Group %s modified +GroupModified=Groep %s gewijzigd GroupDeleted=Groep %s verwijderd ConfirmCreateContact=Weet u zeker dat u een Dolibarr account wilt maken voor deze contactpersoon? ConfirmCreateLogin=Weet u zeker dat u een Dolibarr account wilt maken voor dit lid? @@ -113,10 +113,10 @@ YourRole=Uw rollen YourQuotaOfUsersIsReached=Uw quotum van actieve gebruikers is bereikt! NbOfUsers=Nb van gebruikers DontDowngradeSuperAdmin=Alleen een superadmin kan downgrade een superadmin -HierarchicalResponsible=Supervisor +HierarchicalResponsible=Opzichter HierarchicView=Hiërarchisch schema UseTypeFieldToChange=Gebruik het veld Type om te veranderen OpenIDURL=OpenID URL LoginUsingOpenID=Gebruik OpenID om in te loggen -WeeklyHours=Weekly hours -ColorUser=Color of the user +WeeklyHours=Uren per week +ColorUser=Kleur van de gebruiker diff --git a/htdocs/langs/nl_NL/workflow.lang b/htdocs/langs/nl_NL/workflow.lang index a69c45d685d4c..ed9a7f22b8553 100644 --- a/htdocs/langs/nl_NL/workflow.lang +++ b/htdocs/langs/nl_NL/workflow.lang @@ -1,11 +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. +WorkflowDesc=Deze module is ontworpen om het gedrag van automatische acties te wijzigen. Standaard is de workflow open (je eigen volgorde). U kunt de automatische acties die voor u interessant zijn te activeren. ThereIsNoWorkflowToModify=Er is geen workflow die u kunt aanpassen aan je module hebt geactiveerd. descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatisch een bestelling van de klant na een commerciële voorstel is ondertekend descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatisch een factuur klant na een commerciële voorstel is ondertekend descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatisch een factuur nadat de klant een contract is gevalideerd descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatisch een factuur klant na een bestelling van de klant wordt gesloten -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=Classificeer gekoppelde bron offerte om gefactureerd te worden wanneer bestelling van de klant is ingesteld op betaald +descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classificeer gekoppelde bron klant bestelling(en) gefactureerd wanneer de klant factuur is ingesteld op betaald +descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classificeer gekoppelde bron klantbestelling(en) gefactureerd wanneer de klantfactuur wordt gevalideerd diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang index a72d650399049..351a72235941d 100644 --- a/htdocs/langs/pl_PL/admin.lang +++ b/htdocs/langs/pl_PL/admin.lang @@ -57,26 +57,26 @@ 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=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 +UseSearchToSelectCompany=Użyj auto uzupełniania pól by wybrać części trzecie zamiast pól listy. +ActivityStateToSelectCompany= Dodaj filtr opcję aby pokazać / ukryć częsci trzecie, które są aktualnie w działalności lub wygasłe 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). +UseSearchToSelectContact=Użyj pól auto uzupełniania 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 -NotAvailableWhenAjaxDisabled=Niedostępne podczas Ajax niepełnosprawnych -JavascriptDisabled=JavaScript niepełnosprawnych +SearchFilter=Opcje z filtrami wyszukiwania +NumberOfKeyToSearch=Liczba znaków do wyszukiwania: %s +ViewFullDateActions=Pokaż pełne daty wydarzeń w trzecim arkuszu +NotAvailableWhenAjaxDisabled=Niedostępne kiedy Ajax nie działa +JavascriptDisabled=JavaScript wyłączony UsePopupCalendar=Użyj popup do daty wejścia UsePreviewTabs=Użyj podgląd karty ShowPreview=Pokaż podgląd PreviewNotAvailable=Podgląd niedostępny -ThemeCurrentlyActive=Theme obecnie aktywnych -CurrentTimeZone=Aktualna Timezone +ThemeCurrentlyActive=Temat obecnie aktywny +CurrentTimeZone=Strefa czasowa PHP (server) 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 +Space=Przestrzeń Table=Tabela Fields=Pola Index=Indeks @@ -94,278 +94,279 @@ UseAvToScanUploadedFiles=Użyj programu antywirusowego do skanowania przesłanyc 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 -UserSetup=Użytkownicy zarządzania konfiguracją +AntiVirusParamExample= Przykład dla ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib" +ComptaSetup=Konfiguracja modułu rachunkowości +UserSetup=Zarządzanie konfiguracją użytkowników MenuSetup=Menu zarządzania konfiguracją MenuLimits=Granice i dokładność -MenuIdParent=Rodzic menu ID -DetailMenuIdParent=ID rodzica menu (0 na górnym menu) -DetailPosition=Sortuj numer zdefiniować pozycję menu -PersonalizedMenusNotSupported=Spersonalizowane menu nie jest obsługiwana +MenuIdParent=ID Rodzica menu +DetailMenuIdParent=ID menu rodzica (pusty dla górnego menu) +DetailPosition=Sortuj numer do zdefiniowania pozycji menu +PersonalizedMenusNotSupported=Spersonalizowane menu nie jest obsługiwane AllMenus=Wszyscy -NotConfigured=Nie skonfigurowano +NotConfigured=Moduł nie skonfigurowano Setup=Konfiguracja Activation=Aktywacja Active=Aktywne SetupShort=Konfiguracja OtherOptions=Inne opcje -OtherSetup=Inne konfiguracji -CurrentValueSeparatorDecimal=Separator -CurrentValueSeparatorThousand=Tysiąc separatora +OtherSetup=Inne konfiguracje +CurrentValueSeparatorDecimal=Separator dziesiętny +CurrentValueSeparatorThousand=Separator tysięczny Destination=Miejsce przeznaczenia IdModule=Identyfikator modułu IdPermissions=Uprawnienia ID Modules=Moduły -ModulesCommon=Wspólne modules +ModulesCommon=Główne modules ModulesOther=Inne moduły ModulesInterfaces=Interfejsy modułów -ModulesSpecial=Specjalne moduły +ModulesSpecial=Specyficzne moduły ParameterInDolibarr=Parametr %s -LanguageParameter=Język parametr %s +LanguageParameter=Język parametru %s LanguageBrowserParameter=Parametr %s -LocalisationDolibarrParameters=Lokalizacja parametry +LocalisationDolibarrParameters=Parametry lokalizacji ClientTZ=Strefa Czasowa Klienta (użytkownik) ClientHour=Czas klienta (użytkownik) 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) +PHPServerOffsetWithGreenwich=Przesunięcie szerokości Greenwich (w sekundach ) w serwerze PHP +ClientOffsetWithGreenwich=Klient / Przeglądarka przesunięcie szerokości Greenwich (sekund) DaylingSavingTime=Czas letni (użytkownik) CurrentHour=Aktualna godzina CompanyTZ=Strefa czasowa spółki (główne firmy) CompanyHour=Godzina spółki (główne firmy) -CurrentSessionTimeOut=Obecna sesja czasu +CurrentSessionTimeOut=Obecna sesja wygasła 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 +OSEnv=Środowisko OS Box=Box Boxes=Pulpity informacyjne -MaxNbOfLinesForBoxes=Maksymalna liczba linii na polach -PositionByDefault=Domyślna kolejność +MaxNbOfLinesForBoxes=Maksymalna liczba linii na boxach +PositionByDefault=Domyślny porządek 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. +MenusDesc=Menu menedżerów określa zawartość pasków menu 2 ( pozioma i pionowa linia) . +MenusEditorDesc=Edytor menu pozwala określić indywidualną pozycje wejścia w menu. Używaj go ostrożnie, aby uniknąć podejmowania przez dolibarr stałych niestabilnych wyników.
Niektóre moduły dodają 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 wyłączenie modułu. MenuForUsers=Menu dla użytkowników LangFile=Plik. Lang System=System -SystemInfo=System informacji +SystemInfo=Informację systemowe SystemTools=Narzędzia systemowe -SystemToolsArea=Narzędzia systemowe obszarze -SystemToolsAreaDesc=Obszar ten stanowi administracji funkcji. Użyj menu, aby wybrać tę funkcję, którego szukasz. +SystemToolsArea=Obszar narzędzi systemowych +SystemToolsAreaDesc=Obszar ten stanowi funkcję administracyjne. Użyj menu, aby wybrać tę funkcję, której szukasz. Purge=Czyszczenie -PurgeAreaDesc=Ta strona pozwala na usunięcie wszystkich plików zbudowany lub przechowywane przez Dolibarr (pliki tymczasowe lub wszystkie pliki w katalogu %s). Korzystanie z tej funkcji nie jest konieczne. To jest dla użytkowników, których gospodarzem jest Dolibarr przez usługodawcę, że nie daje uprawnień do usuwania plików zbudowany przez serwer WWW. -PurgeDeleteLogFile=Usuwanie pliku %s zdefiniowane dla Syslog modułu (bez ryzyka stracić danych) -PurgeDeleteTemporaryFiles=Usuń wszystkie pliki tymczasowe (nie ma ryzyka stracić danych) -PurgeDeleteAllFilesInDocumentsDir=Usuń wszystkie pliki w katalogu %s. Pliki tymczasowe, ale również pliki dołączone do elementów (strony trzecie, faktur, ...) i przesłane do ECM modułu zostaną usunięte. -PurgeRunNow=Purge teraz -PurgeNothingToDelete=nie ma katalogu do usunięcia. +PurgeAreaDesc=Ta strona pozwala na usunięcie wszystkich plików zbudowanych lub przechowywanych przez Dolibarr (pliki tymczasowe lub wszystkie pliki w katalogu %s). Korzystanie z tej funkcji nie jest konieczne. Zalecana jest dla użytkowników, których aplikacja Dolibarr jest hostowana przez usługodawcę nie zezwalającego na usuwanie plików utworzonych przez serwer WWW. +PurgeDeleteLogFile=Usuwanie pliku rejestru %s zdefiniowanego dla modułu Syslog (nie ma ryzyka utraty danych) +PurgeDeleteTemporaryFiles=Usuń wszystkie pliki tymczasowe (nie ma ryzyka utraty danych) +PurgeDeleteAllFilesInDocumentsDir=Usuń wszystkie pliki w katalogu %s. Pliki tymczasowe, jak również kopie zapasowe baz danych oraz pliki dołączone do elementów (strony trzecie, faktury ...) i przesłane do modułu ECM zostaną usunięte. +PurgeRunNow=Czyść teraz +PurgeNothingToDelete=Nie ma katalogu lub pliku do usunięcia. PurgeNDirectoriesDeleted= %s pliki lub katalogi usunięte. -PurgeAuditEvents=Purge wszystkie wydarzenia -ConfirmPurgeAuditEvents=Czy na pewno chcesz purge wszystkich zdarzeń bezpieczeństwa? Wszystkie dzienniki bezpieczeństwa zostaną usunięte, nie ma innych danych, które zostaną usunięte. -NewBackup=Nowe zapasowej +PurgeAuditEvents=Czyść wszystkie wydarzenia +ConfirmPurgeAuditEvents=Czy na pewno chcesz wyczyścić wszystkie informacje o zdarzeniach związanych z bezpieczeństwem? Wszystkie dzienniki bezpieczeństwa zostaną usunięte, pozostałe dane zostaną nienaruszone. +NewBackup=Nowa kopia zapasowa GenerateBackup=Generowanie kopii zapasowej Backup=Kopia zapasowa Restore=Przywróć -RunCommandSummary=Kopia zapasowa zostanie wykonana za pomocą następującego polecenia -RunCommandSummaryToLaunch=Kopia zapasowa może być uruchomiony za pomocą następującego polecenia -WebServerMustHavePermissionForCommand=Twój serwer WWW musi mieć pozwolenie na uruchomienie takiego polecenia -BackupResult=Backup wynik -BackupFileSuccessfullyCreated=Tworzenie kopii zapasowych plików generowanych pomyślnie -YouCanDownloadBackupFile=Wygenerowane pliki mogą być teraz pobierane -NoBackupFileAvailable=Nr kopii zapasowych plików. -ExportMethod=Eksport metody -ImportMethod=Import metody -ToBuildBackupFileClickHere=To build a backup file, click tutaj. -ImportMySqlDesc=Aby zaimportować plik kopii zapasowej, należy użyć polecenia mysql z wiersza polecenia: +RunCommandSummary=Wykonywanie kopii zapasowej zostało uruchomione z wykorzystaniem następującego polecenia +RunCommandSummaryToLaunch=Wykonywanie kopii zapasowej może być uruchomione za pomocą następującego polecenia +WebServerMustHavePermissionForCommand=Twój serwer WWW musi mieć pozwolenie na uruchomienie tego polecenia +BackupResult=Wynik procesu tworzenia kopii zapasowej +BackupFileSuccessfullyCreated=Pliki zapasowe zostały pomyślnie wygenreowane +YouCanDownloadBackupFile=Wygenerowane pliki mogą być teraz pobrane +NoBackupFileAvailable=Brak plików kopii zapasowej +ExportMethod=Sposób eksportu +ImportMethod=Sposób importu +ToBuildBackupFileClickHere=Aby utworzyć kopię zapasową, wybierz tutaj. +ImportMySqlDesc=Aby zaimportować plik kopii zapasowej, należy użyć polecenia mysql z wiersza poleceń: ImportPostgreSqlDesc=Aby zaimportować plik kopii zapasowej, należy użyć polecenia pg_restore z linii poleceń: -ImportMySqlCommand=%s %s <mybackupfile.sql +ImportMySqlCommand=%s %s aktywne moduły są widoczne. -ModulesDesc=Dolibarr modules określić funkcje, które jest włączone w oprogramowaniu. Niektóre moduły wymagają uprawnień należy przyznać użytkownikom, po włączeniu modułu. -ModulesInterfaceDesc=W Dolibarr modules interfejs umożliwia dodawanie funkcji w zależności od zewnętrznego oprogramowania, systemów lub usług. -ModulesSpecialDesc=Specjalne moduły są bardzo specyficzne i rzadko używane moduły. -ModulesJobDesc=Biznes moduły zapewniają prostą konfigurację predefiniowanych Dolibarr dla danej firmy. -ModulesMarketPlaceDesc=Mogą Państwo znaleźć więcej modułów do pobrania na zewnętrznych stron internetowych w internecie ... +BoxesDesc=Pulpity informacyjne są obszarami ekranu pokazującymi informacje na niektórych stronach. Możesz zdecydować się na włączenie pulpitów, wybierając stronę docelową i klikając 'Activate' lub wyłączyć je klikając na ikonę pojemnika na śmieci. +OnlyActiveElementsAreShown=Tylko elementy z aktywnych modułów są widoczne. +ModulesDesc=Moduły Dolibarr określają które funkcje są aktywne w oprogramowaniu. Niektóre moduły wymagają uprawnień nadanych użytkownikom, po włączeniu modułu. Wybierz przycisk on/off w kolumnie "Status", aby włączyć moduł/funkcję. +ModulesInterfaceDesc=Interfejs modułów Dolibarr umożliwia dodawanie funkcji w zależności od zewnętrznego oprogramowania, systemów lub usług. +ModulesSpecialDesc=Specjalne moduły są bardzo specyficzne lub rzadko używanymi modułami. +ModulesJobDesc=Moduły biznesowe zapewniają proste, predefiniowane ustawienia Dolibarr dla konkretnej gałęzi biznesu. +ModulesMarketPlaceDesc=Więcej modułów możesz ściągnąć z zewnętrznych stron internetowych ... ModulesMarketPlaces=Więcej modułów ... -DoliStoreDesc=DoliStore, urzędowy rynek dla Dolibarr ERP / CRM modułów zewnętrznych +DoliStoreDesc=DoliStore, oficjalny kanał dystrybucji zewnętrznych modułów Dolibarr ERP / CRM 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 ... +WebSiteDesc=Dostawcy treści internetowych, u których możesz znaleźć więcej modułów... URL=Łącze -BoxesAvailable=Pola dostępne -BoxesActivated=Pola aktywowany -ActivateOn=Uaktywnij na -ActiveOn=Aktywowany na +BoxesAvailable=Dostępne pola +BoxesActivated=Pola aktywowane +ActivateOn=Uaktywnij +ActiveOn=Aktywowany SourceFile=Plik źródłowy 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 +AvailableOnlyIfJavascriptNotDisabled=Dostępne tylko wtedy, gdy JavaScript jest wyłączony +AvailableOnlyIfJavascriptAndAjaxNotDisabled=Dostępne tylko wtedy, gdy JavaScript jest wyłączony Required=Wymagany 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 -MainDbPasswordFileConfEncrypted=Baza hasło zaszyfrowane w conf.php -InstrucToEncodePass=Się, że hasło zakodowane w conf.php pliku, zamienić linię
$ Dolibarr_main_db_pass ="..."
przez
$ Dolibarr_main_db_pass = "zaszyfrowane: %s" -InstrucToClearPass=Do hasła zdekodowane (jasne) do conf.php pliku, zamienić linię
$ Dolibarr_main_db_pass = "zaszyfrowane :..."
przez
$ Dolibarr_main_db_pass = "%s" -ProtectAndEncryptPdfFiles=Ochrona generowanych plików PDF (nie recommandd, przerwy masowego generowania pdf) -ProtectAndEncryptPdfFilesDesc=Ochrona dokument PDF utrzymuje dostępne do odczytu i druku PDF z dowolnej przeglądarki. Jednakże, edycję i kopiowanie nie jest już możliwe. Należy pamiętać, że korzystając z tej funkcji dokonać budowy globalnego kumulowana pdf nie działa (np. niezapłaconych faktur). +DoNotStoreClearPassword=Nie przechowuj w bazie danych niezakodowanych haseł. Przechowuj jedynie hasła zakodowane. +MainDbPasswordFileConfEncrypted=Hasło bazy danych zakodowane w conf.php +InstrucToEncodePass=Aby zakodować hasło w pliku conf.php , zamień linię
$ Dolibarr_main_db_pass ="..."
przez
$ Dolibarr_main_db_pass = "zaszyfrowane: %s" +InstrucToClearPass=Aby odkodować hasło (wyczyścić) w pliku conf.php, zamień linię
$ Dolibarr_main_db_pass = "zaszyfrowane :..."
przez
$ Dolibarr_main_db_pass = "%s" +ProtectAndEncryptPdfFiles=Ochrona generowanych plików PDF (Aktywowany nie jest zalecany, przerwa masowe generowanie plików pdf) +ProtectAndEncryptPdfFilesDesc=Ochrona dokument PDF udostępnia go do odczytu i druku z wykorzystaniem dowolnej przeglądarki plików PDF. Jednakże, edycja i kopiowanie nie jest już możliwe. Należy pamiętać, że korzystając z tej funkcji, budowa globalnego, skumulowanego pliku PDF nie jest możliwa (np. zestawienie niezapłaconych faktur). Feature=Funkcja DolibarrLicense=Licencja -DolibarrProjectLeader=Project Leader -Developpers=Programiści / współpracowników -OtherDeveloppers=Inne Deweloperzy / współpracowników -OfficialWebSite=Międzynarodowy oficjalnej strony www -OfficialWebSiteFr=Francuski oficjalnej strony www +DolibarrProjectLeader=Kierownik projektu +Developpers=Programiści / Współpracownicy +OtherDeveloppers=Inni Deweloperzy / Współpracownicy +OfficialWebSite=Międzynarodowa, oficjalna strona Dolibarr +OfficialWebSiteFr=Francuska strona oficjalna OfficialWiki=Dolibarr Wiki OfficialDemo=Dolibarr online demo -OfficialMarketPlace=Dziennik rynku zewnętrznych modułów / addons -OfficialWebHostingService=Odwołuje usług hostingowych (cloud hosting) +OfficialMarketPlace=Oficjalne miejsce dystrybucji zewnętrznych modułów / dodatków +OfficialWebHostingService=Opisywane usługi hostingowe (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. -HelpCenterDesc2=Niektóre części tego serwisu są dostępne tylko w języku angielskim. -CurrentTopMenuHandler=Aktualna górnym menu obsługi -CurrentLeftMenuHandler=Aktualna lewym menu obsługi -CurrentMenuHandler=Aktualny obsługi menu -CurrentSmartphoneMenuHandler=Aktualny smartphone obsługi menu +ForDocumentationSeeWiki=Aby zapoznać się z dokumentacją użytkownika lub dewelopera (Doc, FAQ ...),
zajrzyj do Dolibarr Wiki:
%s +ForAnswersSeeForum=Aby znaleźć odpowiedzi na pytania / uzyskać dodatkową pomoc, możesz skorzystać z forum Dolibarr :
%s +HelpCenterDesc1=Obszar ten może pomóc w uzyskaniu wsparcia dla usługi Dolibarr. +HelpCenterDesc2=Niektóre elementy tej usługi są dostępne tylko w języku angielskim. +CurrentTopMenuHandler=Aktualne górne menu obsługi +CurrentLeftMenuHandler=Aktualne lewe menu obsługi +CurrentMenuHandler=Aktualne menu obsługi +CurrentSmartphoneMenuHandler=Aktualne menu obsługi smartphone MeasuringUnit=Jednostki pomiarowe Emails=E-maile -EMailsSetup=E-maile z konfiguracją -EMailsDesc=Ta strona pozwala na nadpisanie PHP parametry wysyłania e-maili. W większości przypadków na systemie Unix / Linux, PHP konfiguracja jest prawidłowa i te parametry są bezużyteczne. +EMailsSetup=Konfiguracja E-maila +EMailsDesc=Ta strona pozwala na nadpisanie parametrów PHP dla wysyłania e-maili. W większości przypadków w systemie Unix / Linux, konfiguracja PHP jest prawidłowa i te parametry są bezużyteczne. MAIN_MAIL_SMTP_PORT=Port SMTP (domyślnie w php.ini: %s) MAIN_MAIL_SMTP_SERVER=Host SMTP (domyślnie w php.ini: %s) -MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Port SMTP (Nie zdefiniowany w PHP, takich jak systemy Unix) -MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Host SMTP (Nie zdefiniowany w PHP, takich jak systemy Unix) -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_SMTP_PORT_NotAvailableOnLinuxLike=Port SMTP (Nie zdefiniowany w PHP dla systemów z rodziny Unix) +MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Host SMTP (Nie zdefiniowany w PHP dla systemów z rodziny Unix) +MAIN_MAIL_EMAIL_FROM=E-mail nadawcy do automatycznego przetwarzania wiadomości e-mail (domyślnie w php.ini: %s) +MAIN_MAIL_ERRORS_TO=E-mail nadawcy używany do błędnych wiadomości nadawczych +MAIN_MAIL_AUTOCOPY_TO= Wysyłaj systematycznie ukryte kopie wszystkich wysłanych e-maili do 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 -MAIN_MAIL_SMTPS_PW=SMTP uwierzytelniania hasła, jeżeli wymagane -MAIN_MAIL_EMAIL_TLS= Użyj TLS (SSL) szyfrowania -MAIN_DISABLE_ALL_SMS=Wyłącz wszystkie sendings SMS (dla celów badawczych lub dema) +MAIN_DISABLE_ALL_MAILS=Wyłącz wysyłanie wszystkich maili (do celów badań lub testowych) +MAIN_MAIL_SENDMODE=Metoda używana do wysłania E-maili +MAIN_MAIL_SMTPS_ID=Identyfikator SMTP, jeżeli wymaga uwierzytelniania +MAIN_MAIL_SMTPS_PW=Hasło SMTP , jeżeli wymagane uwierzytelniania +MAIN_MAIL_EMAIL_TLS= Użyj szyfrowania TLS (SSL) +MAIN_DISABLE_ALL_SMS=Wyłącz wysyłanie wszystkich SMS (do celów badawczych lub testowych) MAIN_SMS_SENDMODE=Metoda służy do wysyłania wiadomości SMS MAIN_MAIL_SMS_FROM=Nadawca domyślny numer telefonu wysyłaniu SMS-ów FeatureNotAvailableOnLinux=Cechy te nie są dostępne w systemach Unix, takich jak. Przetestuj swój program sendmail lokalnie. -SubmitTranslation=Jeżeli tłumaczenie na ten język nie jest kompletny lub znajdują się błędy, można rozwiązać poprzez edycję plików w katalogu langs / %s i złożyć zmodyfikowane pliki na www.dolibarr.org forum. +SubmitTranslation=Jeżeli tłumaczenie nie jest kompletne lub znajdują się w nim jakieś błędy, możesz skorygować je poprzez edycję plików w katalogu langs / %s i przesłać zmodyfikowane pliki na forum www.dolibarr.org. ModuleSetup=Moduł konfiguracji ModulesSetup=Moduły konfiguracji ModuleFamilyBase=System -ModuleFamilyCrm=Klient Ressource Management (CRM) -ModuleFamilyProducts=Produkty Management +ModuleFamilyCrm=Zarządzanie relacjami z klientem (CRM) +ModuleFamilyProducts=Zarządzanie produktami ModuleFamilyHr=Zarządzanie zasobami ludzkimi -ModuleFamilyProjects=Projekty / współpracy -ModuleFamilyOther=Inny -ModuleFamilyTechnic=Multi-modules narzędzia -ModuleFamilyExperimental=Eksperymentalne modules -ModuleFamilyFinancial=Moduły finansowe (Księgowość / Skarbu) +ModuleFamilyProjects=Projekty / Praca zespołowa +ModuleFamilyOther=Inne +ModuleFamilyTechnic=Narzędzia dla wielu modłułów +ModuleFamilyExperimental=Eksperymentalne moduły +ModuleFamilyFinancial=Moduły finansowe (Księgowość) ModuleFamilyECM=ECM MenuHandlers=Menu obsługi -MenuAdmin=Menu edytor +MenuAdmin=Edytor menu DoNotUseInProduction=Nie używaj w produkcji ThisIsProcessToFollow=Jest to proces konfiguracji do: +ThisIsAlternativeProcessToFollow=To jest alternatywna konfiguracja do procesu: StepNb=Krok %s -FindPackageFromWebSite=Znaleźć pakiet, który zapewnia funkcję chcesz (np. na oficjalnej stronie internetowej %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.
-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. +FindPackageFromWebSite=Odnajdź pakiet, który zapewnia wybraną przez Ciebię funkcję (np. na oficjalnej stronie internetowej %s). +DownloadPackageFromWebSite=Pobierz paczkę %s +UnpackPackageInDolibarrRoot=Wypakuj pliki paczki do katalogu przeznaczonego dla zewnętrznych modułów: %s +SetupIsReadyForUse=Instalacja została zakończona. Dolibarr jest gotowy do użycia z nowym elementem. +NotExistsDirect=Alternatywna ścieżka główna nie została zdefiniowana.
+InfDirAlt=Od wersji 3, możliwe jest zdefiniowanie alternatywnego katalogu głównego.Pozwala to na przechowywanie wtyczek i szablonów niestandardowych.
Wystarczy utworzyć katalog w katalogu głównym Dolibarr (np: na zamówienie).
+InfDirExample=
Następnie deklarowany w pliku conf.php
$ Dolibarr_main_url_root_alt = "http: // myserver / custom"
$ Dolibarr_main_document_root_alt = "/ ścieżka / z / Dolibarr / htdocs / obyczaju"
* Linie te są skomentowane z "#", aby usunąć komentarz należy jedynie usunąć znak. YouCanSubmitFile=Wybierz moduł: -CurrentVersion=Dolibarr aktualnej wersji +CurrentVersion=Aktualna wersja Dolibarr CallUpdatePage=Wejdź na stronę aktualizacji struktury bazy danych i danych %s. LastStableVersion=Ostatnia wersja stabilna 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).
+GenericMaskCodes2=Cccc} {kod klienta na n znaków
{Cccc000}po kodzie klienta na n znaków występuje licznik dedykowany klientowi. Licznik poświęcony klientowi jest resetowany w tym samym czasie, co licznik globalny.
{Tttt} kod strony trzeciej na n znaków (patrz słownik stron trzecich).
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:
-GenericMaskCodes4c=Przykład oparty na produktach utworzonych 2007-03-01:
+GenericMaskCodes4a=Przykład na 99-cie %s strony trzeciej TheCompany utworzony 2007-01-31:
+GenericMaskCodes4b=Przykład strony trzeciej utworzony w dniu 2007-03-01:
+GenericMaskCodes4c=Przykład produktu utworzony 2007-03-01:
GenericMaskCodes5=ABC{yy}{mm}-{000000} wygeneruje ABC0701-000099
{0000+100@1}-ZZZ/{dd}/XXX wygeneruje 0199-ZZZ/31/XXX -GenericNumRefModelDesc=Zwrotu dostosowywalne numer zgodnie z definicją maska. +GenericNumRefModelDesc=Zwraca edytowalny numer zgodnie z definicją maska. ServerAvailableOnIPOrPort=Serwer dostępny jest pod adresem %s na porcie %s ServerNotAvailableOnIPOrPort=Serwer nie jest dostępna pod adresem %s na porcie %s -DoTestServerAvailability=Test serwera łączność -DoTestSend=Test wysyłanie -DoTestSendHTML=Test wysyłania HTML +DoTestServerAvailability=Test łączności z serwerem +DoTestSend=Test przesyłania +DoTestSendHTML=Test przesyłania HTML 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. +ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Błąd, nie można użyć opcji @ jeżeli sekwencja {rr}{mm} lub {yyyy}{mm} nie jest elementem maski. +UMask=Parametr Umask dla nowych plików systemów Unix / Linux / BSD / Mac. 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. -SeeWikiForAllTeam=Zapraszamy na stronę wiki pełna lista wszystkich uczestników i ich organizacji -UseACacheDelay= Delay dla buforowania odpowiedzi eksportu w sekundach (0 lub puste nie Wikisłowniku) +SeeWikiForAllTeam=Zapraszamy na stronę wiki dla zapoznania się z pełną listą wszystkich uczestników i ich organizacji +UseACacheDelay= Opóźnienie dla buforowania odpowiedzi eksportu w sekundach (0 lub puste pole oznacza brak buforowania) DisableLinkToHelpCenter=Ukryj link "Potrzebujesz pomocy lub wsparcia" na stronie logowania -DisableLinkToHelp=Ukryj link " %s Pomoc online" na lewym menu -AddCRIfTooLong=Nie ma automatycznego pakowania, więc jeśli linia jest obecnie na stronie dokumenty, ponieważ zbyt długo, należy dodać sobie powrotu karetki w textarea. -ModuleDisabled=Moduł niepełnosprawnych -ModuleDisabledSoNoEvent=Moduł niepełnosprawnych przypadku tak nie utworzonych -ConfirmPurge=Czy na pewno chcesz wykonać ten purge?
To spowoduje usunięcie wszystkich plików z pewnością dane z żaden sposób, aby przywrócić im (ECM pliki załączone pliki ...). +DisableLinkToHelp=Ukryj link " %s Pomoc online" w lewym menu +AddCRIfTooLong=Brak automatycznego zawijania. Jeśli linia znajduje się poza dokumentem, należy dodać znak powrotu w polu tekstowym. +ModuleDisabled=Moduł wyłączony +ModuleDisabledSoNoEvent=Moduł wyłączony lub zdarzenie nie zostało utworzone +ConfirmPurge=Czy na pewno chcesz wykonać czyszczenie?
To spowoduje usunięcie wszystkich plików bez możliwości ich przywrócenia (pliki ECM, załączoniki...). MinLength=Minimalna długość -LanguageFilesCachedIntoShmopSharedMemory=Plików. Lang załadowany w pamięci współdzielonej +LanguageFilesCachedIntoShmopSharedMemory=Pliki. Lang załadowane do pamięci współdzielonej ExamplesWithCurrentSetup=Przykłady z obecnie działającą konfiguracją -ListOfDirectories=Lista katalogów OpenDocument szablony +ListOfDirectories=Lista katalogów szablonów OpenDocument ListOfDirectoriesForModelGenODT=Lista katalogów zawierających pliki szablonów format OpenDocument.

Umieść tutaj pełną ścieżkę katalogów.
Dodaj powrotu karetki między ee katalogu.
Aby dodać katalog GED modułu dodać, DOL_DATA_ROOT / ECM / yourdirectoryname.

Pliki z tych katalogów może kończyć się na. Odt. NumberOfModelFilesFound=Liczba plików szablonów ODT/ODS znalezionych we wskazanych katalogach ExampleOfDirectoriesForModelGen=Przykłady składni:
c: \\ mydir
/ Home / mydir
DOL_DATA_ROOT / ECM / ecmdir -FollowingSubstitutionKeysCanBeUsed=
Aby dowiedzieć się jak stworzyć odt szablonów dokumentów, przed zapisaniem ich w tych spisach, czytać dokumentację wiki: +FollowingSubstitutionKeysCanBeUsed=
Aby dowiedzieć się jak stworzyć szablony dokumentów odt, przed zapisaniem ich w katalogach, zapoznaj się z dokumentacją wiki: FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template -FirstnameNamePosition=Stanowisko Imię / nazwa +FirstnameNamePosition=Pozycja Imienia / Nazwiska DescWeather=Poniższe piktogramy pojawią się na pulpicie informacyjnym, kiedy liczba opóźnień osiągnie następujące wartości: KeyForWebServicesAccess=Kluczem do korzystania z usług internetowych (parametr "dolibarrkey" w webservices) -TestSubmitForm=Formularz testowy wejście +TestSubmitForm=Formularz testowy wprowadzania ThisForceAlsoTheme=Za pomocą tego menedżera menu będzie wykorzystywać własne temat cokolwiek jest wybór użytkownika. Również w tym kierownik menu specjalizuje dla smartfonów nie działa na wszystkich smartphone. Użyj innego menedżera menu, jeśli masz problemy na Ciebie. -ThemeDir=Katalog Skins -ConnectionTimeout=Timeout Connexion -ResponseTimeout=Timeout odpowiedź -SmsTestMessage=Komunikat z testów PHONEFROM__ __ do __ PHONETO__ +ThemeDir=Katalog Skórek +ConnectionTimeout=Przekroczony czas połączenia +ResponseTimeout=Przekroczony czas odpowiedzi +SmsTestMessage=Wiadomość testowa z PHONEFROM__ __ do __ PHONETO__ ModuleMustBeEnabledFirst=%s moduł musi być włączony przed użyciem tej funkcji. -SecurityToken=Kluczem do bezpiecznego URL -NoSmsEngine=Żaden menedżer nie nadawca SMS dostępna. SMS Sender menedżer nie są instalowane z dystrybucji domyślnym (bo zależy od dostawcy zewnętrznego), ale można znaleźć jedne na http://www.dolistore.com +SecurityToken=Klucz do bezpiecznego URL +NoSmsEngine=Brak menedżera SMSów nadawczych. Menedżer SMSów nadawczych nie jest instalowany z domyślną dystrybucją (dystrybucje zależne są od dostawcy zewnętrznego). Menedżera można znaleźć pod adresem http://www.dolistore.com PDF=PDF -PDFDesc=Można ustawić każda globalna opcje związane z PDF generacji -PDFAddressForging=Zasady na kuźnia pola adresowe -HideAnyVATInformationOnPDF=Ukryj wszystkie informacje dotyczące podatku VAT od wygenerowanego pliku PDF -HideDescOnPDF=Ukryj opis produktów na wygenerowanych PDF -HideRefOnPDF=Ukryj numer referencyjny produktów w generowanych PDF -HideDetailsOnPDF=Ukryj szczegóły linii produktów w generowanych PDF +PDFDesc=Można ustawić każdą opcję globalną związaną z generowaniem PDF +PDFAddressForging=Zasady złączania pól adresowych +HideAnyVATInformationOnPDF=Ukryj wszystkie informacje dotyczące podatku VAT w wygenerowanym pliku PDF +HideDescOnPDF=Ukryj opis produktów w wygenerowanych plikach PDF +HideRefOnPDF=Ukryj numer referencyjny produktów w generowanych plikach PDF +HideDetailsOnPDF=Ukryj szczegóły linii produktów w generowanych plikach PDF Library=Biblioteka -UrlGenerationParameters=Parametry zabezpieczyć URL -SecurityTokenIsUnique=Użyj unikalny parametr securekey dla każdego adresu +UrlGenerationParameters=Parametry do zabezpiecznie adresu URL +SecurityTokenIsUnique=Użyj unikalnego klucza zabezpieczeń dla każdego adresu EnterRefToBuildUrl=Wprowadź odwołanie do obiektu %s GetSecuredUrl=Pobierz obliczony adres URL ButtonHideUnauthorized=Ukryj przyciski wyłączone ze względu na brak autoryzacji @@ -373,10 +374,10 @@ OldVATRates=Poprzednia stawka VAT NewVATRates=Nowa stawka VAT PriceBaseTypeToChange=Zmiana dla cen opartych na wartości referencyjnej ustalonej na MassConvert=Przekształć zbiorowo -String=String +String=Ciąg znaków TextLong=Długi tekst Int=Liczba całkowita -Float=Zmiana +Float=Liczba zmiennoprzecinkowa DateAndTime=Data i godzina Unique=Unikalny Boolean=Typ logiczny (pole wyboru) @@ -389,22 +390,22 @@ ExtrafieldSeparator=Separator ExtrafieldCheckBox=Pole wyboru ExtrafieldRadio=Przełącznik 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 +ExtrafieldLink=Link do obiektu +ExtrafieldParamHelpselect=Lista parametrów musi być zgodna z wartością klucza

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

W celu uzyskania listy zależnej:
1, wartość1 | 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) +LibraryToBuildPDF=Biblioteka wykorzystana do generowania plików PDF +WarningUsingFPDF=Uwaga: Twój conf.php zawiera dyrektywę dolibarr_pdf_force_fpdf = 1. Oznacza to, że korzystasz z biblioteki FPDF do generowania plików PDF. Ta biblioteka jest nieaktualna i nie obsługuje wielu funkcji (Unicode, przejrzystości obrazu, cyrylicy, czcionek arabskich oraz azjatyckich ...), więc mogą wystąpić błędy podczas generowania pliku PDF.
Aby rozwiązać ten problem i mieć pełne wsparcie przy generowaniu plików PDF, należy pobrać bibliotekę TCPDF , następnie linię umieścić wewnątrz komentarza lub usunąć $ dolibarr_pdf_force_fpdf = 1, i dodać zamiast $ dolibarr_lib_TCPDF_PATH = "path_to_TCPDF_dir" +LocalTaxDesc=Niektóre państwa do każdej pozycji na fakturze dodają 2 lub 3 stawki podatkowe. Jeżeli w tym leży problem, wybierz typ dla drugiego i trzeciego podatku oraz ich wysokość. Prawdopodobne typy to:
1 : podatek lokalny należny od produktów i usług bez podatku VAT (podatek lokalny jest naliczany na podstawie ilości bez uwzględnienia podatku)... SMS=SMS -LinkToTestClickToDial=Wprowadź numer telefonu, aby zadzwonić, aby zobaczyć link do przetestowania url ClickToDial dla użytkownika% s +LinkToTestClickToDial=Wprowadź numer telefonu, aby zobaczyć link do przetestowania url ClickToDial dla użytkownika% s RefreshPhoneLink=Odśwież link -LinkToTest=Klikalny link wygenerowany dla użytkownika% s (kliknij, numer telefonu, aby sprawdzić) +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=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) +ValueOverwrittenByUserSetup=Uwaga, ta wartość może być zastąpiona przez specyficzną konfiguracją użytkownika (każdy użytkownik może ustawić własny 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 @@ -418,136 +419,136 @@ NoRecordWithoutBarcodeDefined=Brak zapisu bez wartości kodów kreskowych zdefin # Modules Module0Name=Użytkownicy i grupy -Module0Desc=Użytkownicy i grupy zarządzania +Module0Desc=Zarządzanie użytkownikami oraz grupami Module1Name=Strony trzecie -Module1Desc=Firmy i kontaktów zarządzania -Module2Name=Komercyjne -Module2Desc=Zarządzanie +Module1Desc=Zarządzanie firmami oraz kontaktami (klienci, prospekty...) +Module2Name=Reklama +Module2Desc=Zarządzanie reklamą Module10Name=Księgowość -Module10Desc=Prosta księgowość zarządzania (faktura wysyłki i płatności) +Module10Desc=Raporty księgowości podstawowej (dzienniki, zwroty) generowane w oparciu o zawartość bazy danych. Bez wysyłek. Module20Name=Propozycje -Module20Desc=Commercial propozycje zarządzania -Module22Name=E-mailing -Module22Desc=E-mailing zarządzania +Module20Desc=Zarządzanie propozycjami reklam +Module22Name=Masowe wysyłanie E-maili +Module22Desc=Zarządzanie masową wysyłką E-maili Module23Name= Energia Module23Desc= Monitorowanie zużycia energii Module25Name=Zamówienia klientów -Module25Desc=Zamówień zarządzania +Module25Desc=Zarządzanie zamówieniami klienta Module30Name=Faktury -Module30Desc=Faktur i not kredytowych zarządzania dla klientów. Faktury zarządzania dla dostawców +Module30Desc=Zarządzanie fakturami oraz notami kredytowymi klientów. Zarządzanie fakturami dostawców Module40Name=Dostawcy -Module40Desc=Dostawcy zarządzania i zakupu (zamówienia i faktury) +Module40Desc=Zarządzanie dostawcami oraz zakupami (zamówienia i faktury) Module42Name=Syslog Module42Desc=Rejestrowanie urządzenia (syslog) -Module49Name=Redakcja -Module49Desc=Redakcja "zarządzania +Module49Name=Edytory +Module49Desc=Zarządzanie edytorem Module50Name=Produkty -Module50Desc=Produkty zarządzania -Module51Name=Mass mailing -Module51Desc=Masa papieru mailingowych zarządzania +Module50Desc=Zarządzanie produktami +Module51Name=Masowe wysyłanie poczty +Module51Desc=Zarządzanie masowym wysyłaniem poczty papierowej Module52Name=Zapasy -Module52Desc=Zapasy zarządzania produktów +Module52Desc=Zarządzanie zapasami (produkty) Module53Name=Usługi -Module53Desc=Usługi zarządzania -Module54Name=Kontakty/Subskrypcje -Module54Desc=Zarządzanie umowami (usług lub subskrypcji Reccuring) +Module53Desc=Zarządzanie usługami +Module54Name=Kontrakty/Subskrypcje +Module54Desc=Zarządzanie umowami (usług lub subskrypcji) Module55Name=Kody kreskowe Module55Desc=Kody kreskowe zarządzania Module56Name=Telefonia -Module56Desc=Telefonia integracji +Module56Desc=Integracja telefonii Module57Name=Zlecenia stałe -Module57Desc=Zleceń stałych oraz zarządzanie wypłaty. Również obejmuje generowanie pliku SEPA dla krajów europejskich. +Module57Desc=Zarządzanie zleceniami stałymi oraz zleceniami wycofanymi. Obejmuje również generowanie pliku SEPA dla krajów europejskich. Module58Name=ClickToDial -Module58Desc=ClickToDial integracji +Module58Desc=Integracja systemu ClickToDial (Asterisk,...) Module59Name=Bookmark4u -Module59Desc=Dodawanie funkcji do generowania Bookmark4u konto z konta Dolibarr +Module59Desc=Dodawanie funkcji do generowania konta Bookmark4u z konta Dolibarr Module70Name=Interwencje -Module70Desc=Interwencje zarządzania +Module70Desc=Zarządzanie interwencjami Module75Name=Koszty wyjazdów i notatki -Module75Desc=Wydatki i wycieczki zauważa zarządzania -Module80Name=Sendings -Module80Desc=Sendings zamówienia na dostawy i zarządzania -Module85Name=Banki i gotówki -Module85Desc=Zarządzanie bankiem lub Rachunki -Module100Name=ExternalSite -Module100Desc=Obejmuje zewnętrznych stronie internetowej w menu Dolibarr i wyświetlać go w ramy Dolibarr -Module105Name=Mailman i Sip -Module105Desc=Listonosz lub SPIP interfejs modułu członka +Module75Desc=Zarządzanie kosztami wyjazdów oraz notatkami +Module80Name=Wysyłki +Module80Desc=Zarządzanie wysyłkami oraz kolejnością zamówień +Module85Name=Banki oraz gotówka +Module85Desc=Zarządzanie kontami bankowymi lub gotówkowymi +Module100Name=Strona zewnętrzna +Module100Desc=Moduł ten umieszcza zewnętrzną stronę internetową w menu Dolibarr i wyświetla ją w ramce Dolibarr +Module105Name=Mailman i SPIP +Module105Desc=Interfejs Mailman lub SPIP dla członka modułu Module200Name=LDAP Module200Desc=Synchronizacji katalogu LDAP Module210Name=PostNuke -Module210Desc=PostNuke integracji -Module240Name=Dane eksportu -Module240Desc=Narzędzie do eksportu Dolibarr danych (z asystentami) -Module250Name=Dane przywóz -Module250Desc=Narzędzie do importowania danych w Dolibarr (z asystentami) +Module210Desc=Integracja PostNuke +Module240Name=Eksport danych +Module240Desc=Narzędzie do eksportu danych Dolibarr (z asystentami) +Module250Name=Import danych +Module250Desc=Narzędzie do importowania danych Dolibarr (z asystentami) Module310Name=Członkowie -Module310Desc=Fundacja użytkowników zarządzania +Module310Desc=Zarządzanie członkami fundacji Module320Name=RSS Feed -Module320Desc=Dodaj kanał RSS Dolibarr wewnątrz ekranu stron +Module320Desc=Dodaj kanał RSS Dolibarr wewnątrz stron Module330Name=Zakładki -Module330Desc=Zakładki zarządzania -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. +Module330Desc=Zarządzanie zakładkami +Module400Name=Projekty / Możliwości / Wskazówki +Module400Desc=Zarządzanie projektami, możliwości lub wskazówki. Następnie możesz przypisać dowolny element (faktury, zamówienia, propozycje, interwencje, ...) do projektu i uzyskać widok poprzeczny z widoku projektu. Module410Name=Webcalendar -Module410Desc=Webcalendar integracji -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 +Module410Desc=Integracja Webcalendar +Module500Name=Koszty specjalne (podatek, składki na ubezpieczenie zdrowotne, dywidendy) +Module500Desc=Zarządzanie kosztami specjalnymi takimi jak podatki, składki na ubezpieczenie zdrowotne, dywidend i wynagrodzenia Module510Name=Wynagrodzenia Module510Desc=Zarządzanie pracownikami wynagrodzenia i płatności -Module520Name=Loan -Module520Desc=Management of loans +Module520Name=Pożyczka +Module520Desc=Zarządzanie kredytów Module600Name=Powiadomienia -Module600Desc=Wyślij informację, na niektórych zdarzeń gospodarczych do Dolibarr kontaktów zewnętrznych (ustawienia zdefiniowane na każdej thirdparty) +Module600Desc=Wyślij informację poprzez e-mail odnośnie niektórych zdarzeń biznesowych związanych z Dolibarr do stron trzecich (ustawienia zdefiniowane dla każdej strony trzeciej) Module700Name=Darowizny -Module700Desc=Darowizny zarządzania +Module700Desc=Zarządzanie darowiznami 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) +Module1200Desc=Integracja Mantis +Module1400Name=Księgowość +Module1400Desc=Zarządzanie księgowością (podwójne strony) 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 +Module1780Name=Tagi / Kategorie +Module1780Desc=Tworzenie tagów / kategorii (produktów, klientów, dostawców, kontaktów lub członków) +Module2000Name=Edytor WYSIWYG +Module2000Desc=Zezwala na edycję pola tekstowego za pomocą zaawansowanego edytora Module2200Name=Dynamiczne Ceny Module2200Desc=Włącz użycie wyrażeń matematycznych dla cen Module2300Name=Cron -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 +Module2300Desc=Zaplanowane zarządzanie zadaniami +Module2400Name=Agenda +Module2400Desc=Zarządzanie zdarzeniami / zadaniami oraz agendą +Module2500Name=Zarządzanie zawartością elektroniczną (ECM) +Module2500Desc=Zapisz i udostępnij dokumenty Module2600Name=WebServices Module2600Desc=Włącz serwer usług internetowych Dolibarr 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 +Module2700Desc=Użyj usług online Gravatar (www.gravatar.com), aby pokazać zdjęcia użytkowników / członków (dopasowanych na podstawie e-maili). Wymagany jest dostęp do Internetu Module2800Desc=FTP Client Module2900Name=GeoIPMaxmind -Module2900Desc=GeoIP możliwości konwersji Maxmind +Module2900Desc=Możliwości konwersji GeoIP Maxmind Module3100Name=Skype Module3100Desc=Dodaj przycisk Skype do karty zwolenników / osób trzecich / kontaktów -Module5000Name=Multi-firma +Module5000Name=Multi-company Module5000Desc=Pozwala na zarządzanie wieloma firmami Module6000Name=Workflow 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 +Module20000Name=Zarządzanie "Pozostaw Żądanie" +Module20000Desc=Zadeklaruj oraz nadzoruj wnioski pracowników dotyczące wyjść z pracy +Module39000Name=Partia produktów +Module39000Desc=Partia lub numer seryjny, zarządzanie według daty ważności lub daty sprzedaży poroduktów Module50000Name=Paybox -Module50000Desc=Moduł oferują online strony płatności za pomocą karty kredytowej z Paybox -Module50100Name=Kasa -Module50100Desc=Kasa modułu +Module50000Desc=Moduł oferujący płatność online za pomocą karty kredytowej z Paybox +Module50100Name=Punkt sprzedaży +Module50100Desc=Moduł punktu sprzedaży Module50200Name=Paypal -Module50200Desc=Moduł oferują online strony płatności za pomocą karty kredytowej z Paypal +Module50200Desc=Moduł oferujący płatność online za pomocą karty kredytowej z Paypal Module50400Name=Rachunkowość (zaawansowane) Module50400Desc=Rachunkowości zarządczej (podwójne strony) Module54000Name=PrintIPP @@ -555,181 +556,179 @@ Module54000Desc=Druk bezpośredni (bez otwierania dokumentów) za pomocą interf Module55000Name=Otwórz Sonda Module55000Desc=Moduł do ankiet internetowych (jak Doodle, Szpilki, Rdvz, ...) Module59000Name=Marże -Module59000Desc=Moduł do zarządzania marże +Module59000Desc=Moduł do zarządzania marżami 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 -Permission14=Validate faktur -Permission15=Wysyłanie faktur e-mailem -Permission16=Tworzenie płatności za faktury -Permission19=Usuń faktur -Permission21=Czytaj propozycji -Permission22=Tworzenie / zmodyfikować propozycji -Permission24=Validate propozycji -Permission25=Wyślij propozycji -Permission26=Zamknij propozycji -Permission27=Usuń propozycji -Permission28=Eksport propozycji -Permission31=Czytaj produktów / usług -Permission32=Tworzenie / modyfikowania produktów / usług -Permission34=Usuwanie produktów / usług -Permission36=Eksport produktów / usług +Module60000Desc=Moduł do zarządzania prowizjami +Permission11=Czytaj faktur klientów +Permission12=Tworzenie/modyfikacja faktur klientów +Permission13=Unieważnianie faktur klienta +Permission14=Walidacja faktur klienta +Permission15=Wyślij fakturę klienta poprzez e-mail. +Permission16=Tworzenie płatności za faktury klienta +Permission19=Usuń faktury klienta +Permission21=Czytaj oferty reklam +Permission22=Tworzenie / modyfikacja ofert reklam +Permission24=Walidacja oferty reklam +Permission25=Wyślij ofertę reklamy +Permission26=Zamknij ofertę reklamy +Permission27=Usuń oferty reklam +Permission28=Eksportuj oferty reklam +Permission31=Czytaj produkty +Permission32=Tworzenie / modyfikacja produktów +Permission34=Usuwanie produktów +Permission36=Podejrzyj / zarządzaj ukrytymi produktami Permission38=Eksport produktów -Permission41=Czytaj projektów i zadań -Permission42=Tworzenie / modyfikacji projektów, edytowanie zadań dla moich projektów -Permission44=Usuwanie projektów -Permission61=Czytaj interwencji -Permission62=Tworzenie / zmodyfikować interwencji -Permission64=Usuń interwencji +Permission41=Czytaj projekty (projekty współdzielone oraz projekty, w których biorę udział) +Permission42=Tworzenie / modyfikacja projektów (projekty współdzielone oraz projekty, w których biorę udział) +Permission44=Usuwanie projektów (projekty współdzielone oraz projekty, w których biorę udział) +Permission61=Czytaj interwencje +Permission62=Tworzenie / modyfikacja interwencji +Permission64=Usuwanie interwencji Permission67=Eksport interwencji Permission71=Czytaj użytkowników -Permission72=Tworzenie / modyfikować użytkowników +Permission72=Tworzenie / modyfikacja użytkowników Permission74=Usuwanie użytkowników -Permission75=Typy konfiguracji członkostwa +Permission75=Konfiguracja typów członkostwa Permission76=Eksport danych Permission78=Czytaj subskrypcje -Permission79=Tworzenie / zmodyfikować subskrypcje -Permission81=Czytaj zleceń klientów -Permission82=Tworzenie / modyfikować zleceń klientów -Permission84=Validate zleceń klientów -Permission86=Wyślij zleceń klientów -Permission87=Zamknij zleceń klientów -Permission88=Zrezygnuj zleceń klientów -Permission89=Usuń zleceń klientów -Permission91=Czytaj składek na ubezpieczenia społeczne i podatku VAT -Permission92=Tworzenie / modyfikacji składek na ubezpieczenia społeczne i podatku VAT -Permission93=Usuń składek na ubezpieczenia społeczne i podatku VAT -Permission94=Eksport składek na ubezpieczenia społeczne +Permission79=Tworzenie / modyfikacja subskrypcji +Permission81=Czytaj zamówienia klientów +Permission82=Tworzenie / modyfikacja zamówień klientów +Permission84=Walidacja zamówień klientów +Permission86=Wyślij zamówienia klientów +Permission87=Zamknij zamówienia klientów +Permission88=Anuluj zamówienia klientów +Permission89=Usuń zamówienia klientów +Permission91=Czytaj składki na ubezpieczenie zdrowotne i podatek VAT +Permission92=Tworzenie / modyfikacja składek na ubezpieczenie zdrowotne i podatek VAT +Permission93=Usuń składki na ubezpieczenie zdrowotne i podatek VAT +Permission94=Eksport składek na ubezpieczenie zdrowotne Permission95=Przeczytaj raporty -Permission101=Czytaj sendings -Permission102=Utwórz / Modyfikuj sendings -Permission104=Validate sendings -Permission106=Sendings eksport -Permission109=Usuń sendings -Permission111=Czytaj finansowych -Permission112=Tworzenie / modyfikować / usuwać i porównać transakcji -Permission113=Sprawozdania finansowe konfiguracji (tworzenie, zarządzanie kategoriami) -Permission114=Reconciliate transakcji -Permission115=Transakcji eksportowych i konta +Permission101=Czytaj ustawienia +Permission102=Utwórz / modyfikuj ustawienia +Permission104=Walidacja ustawień +Permission106=Eksportuj wysyłki +Permission109=Usuń wysyłki +Permission111=Czytaj raporty finansowe +Permission112=Tworzenie / modyfikacja / usuwanie oraz porównywanie transakcji +Permission113=Konfiguracja sprawozdań finansowych (tworzenie, zarządzanie kategoriami) +Permission114=Skonsoliduj transakcje +Permission115=Eksport transakcji oraz oświadczeń obrachunkowych Permission116=Przelewy pomiędzy rachunkami -Permission117=Zarządzanie czeków wysyłkowe -Permission121=Czytaj trzecich związanych z użytkowników -Permission122=Tworzenie / zmodyfikować trzecich związane z użytkownikiem -Permission125=Usuń trzecich związane z użytkownikiem +Permission117=Zarządzanie wysyłką czeków +Permission121=Czytaj strony trzecie związane z użytkownikiem +Permission122=Tworzenie / modyfikacja stron trzecich związanych z użytkownikiem +Permission125=Usuń strony trzecie związane z użytkownikiem Permission126=Eksport stron trzecich -Permission141=Przeczytaj zadań -Permission142=Tworzyć / modyfikować zadania -Permission144=Delegować zadania +Permission141=Czytaj projekty (również prywatne, których nie jestem uczestnikiem) +Permission142=Tworzenie / modyfikacja projektów (również prywatnych, których nie jestem uczestnikiem) +Permission144=Usuwanie projektów (również prywatnych, których nie jestem uczestnikiem) Permission146=Czytaj dostawców Permission147=Czytaj statystyki -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=Czytaj zamówień / subskrypcjami -Permission162=Tworzenie / modyfikacja zamówień / subskrypcjami +Permission151=Czytaj zlecenia stałe +Permission152=Tworzenie / modyfikacja żądań stałych zleceń +Permission153=Przenoszenie wpływów zleceń stałych +Permission154=Uznaj / odrzuć wpływy zleceń stałych +Permission161=Czytaj umowy / subskrypcje +Permission162=Tworzenie / modyfikacja umowy / subskrypcji 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 +Permission164=Wyłączanie usługi / subskrypcji umowy +Permission165=Usuń umowy / subskrypcje +Permission171=Czytaj wyjazdy i koszty (własne i swoich podwładnych) +Permission172=Tworzenie / modyfikacja wyjazdów i kosztów Permission173=Usuń wyjazdy i wydatki Permission174=Przeczytaj wszystkie wycieczki i koszty -Permission178=Eksport wycieczki i koszty +Permission178=Eksport wyjazdówi i kosztów 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=Zamówić lub anulować zamówienia dostawca -Permission186=Odbiór dostawcy zamówienia -Permission187=Zamknij dostawcy zamówienia -Permission188=Zrezygnuj dostawcy zamówienia +Permission181=Czytaj zamówienia dostawców +Permission182=Tworzenie / modyfikacja zamówień dostawców +Permission183=Walidacja zmówień dostawców +Permission184=Zatwierdź zamówienia dostawców +Permission185=Zamówienie lub anulowanie zamówień dostawcy +Permission186=Odbiór zamówienia dostawcy +Permission187=Zamknij zamówienie dostawcy +Permission188=Anuluj zamówienie dostawcy Permission192=Tworzenie linii -Permission193=Zrezygnuj linie -Permission194=Przeczytaj przepustowość linii +Permission193=Zlikwiduj linię +Permission194=Czytaj przepustowość linii Permission202=Tworzenie połączenia ADSL -Permission203=Postanowienie połączenia zamówień -Permission204=Postanowienie połączeń +Permission203=Zamów połączenie zamówień +Permission204=Zamów połączenia Permission205=Zarządzanie połączeniami -Permission206=Czytaj połączeń -Permission211=Czytaj Telefonia -Permission212=Linii -Permission213=Uaktywnij linii +Permission206=Czytaj połączenia +Permission211=Czytaj Telefonię +Permission212=Zamów linie +Permission213=Uaktywnij linię Permission214=Konfiguracja Telefonii Permission215=Konfiguracja dostawców -Permission221=Czytaj emailings -Permission222=Utwórz / Modyfikuj emailings (tematu odbiorców ...) -Permission223=Validate emailings (umożliwia wysyłanie) -Permission229=Usuń emailings -Permission237=Zobacz odbiorców i informacji -Permission238=Ręczne wysyłanie mailingów +Permission221=Czytaj listy emailowe +Permission222=Tworzenie / modyfikacja list emailowych (tematów, odbiorców ...) +Permission223=Walidacja list emailowych (umożliwia wysyłanie) +Permission229=Usuń listy emailowe +Permission237=Zobacz odbiorców oraz informacje +Permission238=Ręczne wysyłanie list emailowych Permission239=Usuń wysyłki po zatwierdzeniu lub wysłany -Permission241=Czytaj kategorii +Permission241=Czytaj kategorie Permission242=Tworzenie / modyfikowanie kategorii Permission243=Usuwanie kategorii Permission244=Zobacz zawartość ukrytych kategorii -Permission251=Czytaj innych użytkowników i grup -PermissionAdvanced251=Przeczytaj inne użytkowników -Permission252=Tworzenie / modyfikować innych użytkowników, grup i twoje permisssions -Permission253=Modyfikowanie innych użytkowników hasła -PermissionAdvanced253=Tworzyć / modyfikować wewnętrznych / zewnętrznych użytkowników i uprawnień -Permission254=Usunąć lub wyłączyć innych użytkowników -Permission255=Tworzenie / zmodyfikować własną informacje o użytkowniku -Permission256=Zmienić własną hasło -Permission262=Rozszerzenie dostępu do wszystkich stron trzecich (nie tylko te związane z użytkowników). Nie skuteczne dla użytkowników zewnętrznych (zawsze ograniczona do siebie). +Permission251=Czytaj innych użytkowników i grupy +PermissionAdvanced251=Czytaj innych użytkowników +Permission252=Czytaj uprawnienia innych użytkowników +Permission253=Tworzenie / modyfikacja innych użytkowników, grup i uprawnień +PermissionAdvanced253=Tworzenie / modyfikacja wewnętrznych / zewnętrznych użytkowników i uprawnień +Permission254=Tworzenie / modyfikacja jedynie zewnętrznych użytkowników +Permission255=Modyfikacja haseł innych użytkowników +Permission256=Usuń lub dezaktywuj innych użytkowników +Permission262=Rozszerzenie dostępu do wszystkich stron trzecich (nie tylko tych związanych z użytkownikiem). Nie skuteczne dla użytkowników zewnętrznych (zawsze ograniczone do ich samych). Permission271=Czytaj CA -Permission272=Czytaj faktur -Permission273=Wystawienie faktury -Permission281=Czytaj kontaktów -Permission282=Tworzenie / zmodyfikować kontakty -Permission283=Usuń kontakty -Permission286=Eksportuj kontakty -Permission291=Czytaj taryf +Permission272=Czytaj faktury +Permission273=Wystawienie faktur +Permission281=Czytaj kontakty +Permission282=Tworzenie / modyfikacja kontaktów +Permission283=Usuwanie kontaktów +Permission286=Eksport kontaktów +Permission291=Czytaj taryfy Permission292=Ustaw uprawnienia dotyczące taryf -Permission293=Modyfikuj klientom taryfy +Permission293=Modyfikuj taryfy klientów Permission300=Odczyt kodów kreskowych -Permission301=Tworzenie / modyfikować kody kreskowe +Permission301=Tworzenie / modyfikacja kodów kreskowych Permission302=Usuwanie kodów kreskowych -Permission311=Czytaj usług -Permission312=Przypisywanie usługi / subskrypcja do umowy -Permission331=Czytaj zakładek -Permission332=Utwórz / Modyfikuj zakładki -Permission333=Usuwanie zakładki -Permission341=Przeczytaj swoje uprawnienia -Permission342=Tworzyć / modyfikować własne dane użytkownika -Permission343=Modyfikować swoje hasło -Permission344=Modyfikuj swoje uprawnienia -Permission351=Przeczytaj grupy -Permission352=Przeczytaj grup uprawnień -Permission353=Tworzyć / modyfikować grupy -Permission354=Usunąć lub wyłączyć grupy -Permission358=Użytkownicy Eksport -Permission401=Czytaj zniżki -Permission402=Tworzenie / modyfikować rabaty -Permission403=Sprawdź rabaty -Permission404=Usuń zniżki +Permission311=Czytaj usługi +Permission312=Przypisywanie usługi / subskrypcji do umowy +Permission331=Czytaj zakładki +Permission332=Tworzenie / modyfikacja zakładek +Permission333=Usuwanie zakładek +Permission341=Odczytaj swoje uprawnienia +Permission342=Tworzenie / modyfikacja własnych danych użytkownika +Permission343=Modyfikacja swojego hasła +Permission344=Modyfikacja swoich uprawnień +Permission351=Odczytaj grupy +Permission352=Odczytaj uprawnienia grupy +Permission353=Tworzenie / modyfikacja grup +Permission354=Usuwanie lub deaktywacja grup +Permission358=Eksport użytkowników +Permission401=Odczytaj zniżki +Permission402=Tworzenie / modyfikacja zniżek +Permission403=Walidacja zniżek +Permission404=Usuwanie zniżek 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 +Permission520=Czytaj Kredyty +Permission522=Tworzenie / modyfikacja kredytów +Permission524=Usuń kredyty +Permission525=Kalkulator kredytowy Dostęp +Permission527=Kredyty eksportowe +Permission531=Cztaj usługi +Permission532=Tworzenie / modyfikacja usług Permission534=Usuwanie usług -Permission536=Zobacz / zarządzania usługami ukrytymi +Permission536=Zobacz / zarządzaj ukrytymi usługami Permission538=Eksport usług -Permission701=Czytaj darowizn -Permission702=Tworzenie / zmodyfikować darowizn -Permission703=Usuń darowizn +Permission701=Zobacz darowizny +Permission702=Tworzenie / modyfikacja darowizn +Permission703=Usuń darowizny Permission771=Raporty Czytaj wydatków (własne i jego podwładni) Permission772=Tworzenie / modyfikacja raportów wydatków Permission773=Usuń raporty wydatków @@ -737,28 +736,28 @@ Permission774=Przeczytaj wszystkie raporty wydatków (nawet dla użytkowników n Permission775=Zatwierdzanie raportów wydatków Permission776=Zapłać raporty wydatków Permission779=Raporty wydatków Export -Permission1001=Czytaj zapasów -Permission1002=Tworzenie / modyfikacja magazyny +Permission1001=Zobacz zasoby +Permission1002=Tworzenie / modyfikacja magazynów Permission1003=Usuń magazyny -Permission1004=Czytaj stanie ruchów -Permission1005=Tworzenie / zmodyfikować stanie ruchów -Permission1101=Przeczytaj zamówienia na dostawy -Permission1102=Tworzenie / modyfikacji zamówienia na dostawy -Permission1104=Validate zamówienia na dostawy +Permission1004=Zobacz przemieszczanie zasobów +Permission1005=Tworzenie / modyfikacja przemieszczania zasobów +Permission1101=Zobacz zamówienia na dostawy +Permission1102=Tworzenie / modyfikacja zamówień na dostawy +Permission1104=Walidacja zamówienia na dostawy Permission1109=Usuń zamówienia na dostawy Permission1181=Czytaj dostawców -Permission1182=Czytaj dostawcy zamówienia -Permission1183=Tworzenie dostawcy zamówienia -Permission1184=Validate dostawcy zamówienia -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 -Permission1232=Tworzenie faktury dostawcy +Permission1182=Czytaj zamówienia dostawców +Permission1183=Tworzenie / modyfikacja zamówień dostawców +Permission1184=Walidacja zamówień dostawców +Permission1185=Zatwierdź zamówienia dostawcy +Permission1186=Zamów zamówienia dostawcy +Permission1187=Potwierdź otrzymanie zamówienia dostawcy +Permission1188=Zamknij zamówienia dostawcy +Permission1190=Zatwierdź (druga zlecenia dostawca homologacji) +Permission1201=Wygeneruj wyniki eksportu +Permission1202=Utwórz / modyfikuj eksport +Permission1231=Czytaj faktury dostawcy +Permission1232=Tworzenie / modyfikacja faktur dostawcy Permission1233=Sprawdź dostawcę faktur Permission1234=Usuń dostawcy faktur Permission1235=Wyślij faktury dostawców za pośrednictwem poczty elektronicznej @@ -767,10 +766,10 @@ 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 job -Permission23002=Create/update Scheduled job -Permission23003=Delete Scheduled job -Permission23004=Execute Scheduled job +Permission23001=Czytaj Zaplanowane zadania +Permission23002=Tworzenie / aktualizacja Zaplanowane zadania +Permission23003=Usuwanie zaplanowanego zadania +Permission23004=Wykonanie zaplanowanego zadania 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 @@ -853,12 +852,12 @@ 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=Raporty -CalcLocaltax1ES=Sprzedaż - Zakupy +CalcLocaltax=Raporty odnośnie podatków lokalnych +CalcLocaltax1=Sprzedaż - Zakupy CalcLocaltax1Desc=Lokalne raporty Podatki są obliczane z różnicy między sprzedażą localtaxes i localtaxes zakupów -CalcLocaltax2ES=Zakupy +CalcLocaltax2=Zakupy CalcLocaltax2Desc=Lokalne raporty Podatki są łącznie localtaxes zakupów -CalcLocaltax3ES=Obroty +CalcLocaltax3=Sprzedaż 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 @@ -1018,14 +1017,14 @@ NoEventOrNoAuditSetup=Nr bezpieczeństwa zdarzenie zostało jeszcze zarejestrowa NoEventFoundWithCriteria=Nr bezpieczeństwa zdarzenie zostało znalezionych dla takich kryteriów wyszukiwania. SeeLocalSendMailSetup=Zobacz lokalnej konfiguracji sendmaila BackupDesc=Aby wykonać pełną kopię zapasową Dolibarr, musisz: -BackupDesc2=* Zapisz zawartość dokumentów katalog ( %s), który zawiera wszystkie upload i generowanych plików (można dokonać np. ZIP). -BackupDesc3=* Zapisz zawartość bazy danych z zrzutu. do tego, możesz użyć następujących asystenta. +BackupDesc2=Zapisz zawartość dokumentów katalogu ( %s), który zawiera wszystkie przesłane i wygenerowane pliki (można np. utworzyć archiwum ZIP). +BackupDesc3=Zapisz zawartość Twojej bazy danych (%s) do kopi zapasowej. Aby tego dokonać, możesz użyć asystenta. BackupDescX=Zarchiwizowane katalogu należy przechowywać w bezpiecznym miejscu. BackupDescY=Wygenerowany plik zrzutu powinny być przechowywane w bezpiecznym miejscu. 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. +RestoreDesc2=Przywróć pliki archiwalny (np. ZIP) katalogu dokumentów, aby wyodrębnić drzewa plików w katalogu dokumentów do nowej instalacji Dolibarr lub do bieżącego katalogu dokumentów ( %s). +RestoreDesc3=Przywróć dane z pliku kopii zapasowej, do bazy danych nowej instalacji Dolibarr lub do bazy danych tej bieżącej instalacji (%s). Uwaga, gdy przywracanie zostanie zakończone, należy użyć loginu i hasła, które istniały, gdy kopia zapasowa została utworzona, aby połączyć się ponownie. Aby przywrócić kopię zapasową bazy danych do bieżącej instalacji, można użyć tego asystenta. RestoreMySQL=Import MySQL ForcedToByAModule= Ta zasada jest zmuszona do %s przez aktywowany modułu PreviousDumpFiles=Dump bazy danych dostępne pliki kopii zapasowej @@ -1116,7 +1115,7 @@ 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 contact at time.
* or by setting global target email addresses in module setup page. +NotificationsDesc=Wiadomości e-mail powiadomienia funkcja pozwala na automatyczne wysyłanie poczty w milczeniu, na niektórych imprezach na Dolibarr. Cele zgłoszeń można zdefiniować:
* Na OSOBAMI kontakty (klientów i dostawców), jeden kontakt w czasie.
* Lub ustawienie globalne adresy e-mail celem w stronie konfiguracji modułu. ModelModules=Szablony dokumentów DocumentModelOdt=Generowanie dokumentów z szablonów (.odt OpenDocuments lub ods pliki dla OpenOffice, KOffice, TextEdit, ...) WatermarkOnDraft=Znak wodny w sprawie projektu dokumentu @@ -1337,6 +1336,8 @@ LDAPFieldCountry=Kraj LDAPFieldCountryExample=Przykład: c LDAPFieldDescription=Opis LDAPFieldDescriptionExample=Przykład: opis +LDAPFieldNotePublic=Notatka publiczna +LDAPFieldNotePublicExample=Przykład: notatka publiczna LDAPFieldGroupMembers= Członkowie grupy LDAPFieldGroupMembersExample= Przykład: uniqueMember LDAPFieldBirthdate=Data urodzenia @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= Chcesz używać do przyjmowania płatności gotówkowy 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Zmniejszenie liczby zapasów w POS nie jest kompatybilne z systemem 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 @@ -1566,7 +1567,7 @@ SuppliersSetup=Dostawca konfiguracji modułu SuppliersCommandModel=Kompletny szablon zamówienia dostawcy (logo. ..) SuppliersInvoiceModel=Kompletny szablon faktury dostawcy (logo. ..) 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 +IfSetToYesDontForgetPermission=Jeśli jest ustawiona na yes, nie zapomnij, aby zapewnić uprawnień do grup lub użytkowników dopuszczonych do drugiego zatwierdzenia ##### GeoIPMaxmind ##### GeoIPMaxmindSetup=GeoIP Maxmind konfiguracji modułu 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 @@ -1611,8 +1612,13 @@ 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 +YouMayFindNotificationsFeaturesIntoModuleNotification=Możesz znaleźć opcje powiadomień e-mail, dzięki czemu i konfiguracji modułu "zgłoszenie". +ListOfNotificationsPerContact=Lista zgłoszeń na kontakt * +ListOfFixedNotifications=Lista stałych powiadomień +GoOntoContactCardToAddMore=Przejdź na zakładkę "Powiadomienia" o thirdparty kontaktu, aby dodać lub usunąć powiadomienia dla kontaktów / adresów +Threshold=Próg +BackupDumpWizard=Konfigurator wykonywania kopii zapasowej bazy danych +SomethingMakeInstallFromWebNotPossible=Instalacja zewnętrznych modułów za pomocą interfejsu sieciowego nie jest możliwa z powodu następujących przyczyn: +SomethingMakeInstallFromWebNotPossible2=Z tego powodu, proces uaktualnienia tutaj opisany jest jednie krokiem manualnym, który wykonać może uprawniony użytkownik. +InstallModuleFromWebHasBeenDisabledByFile=Instalacja zewnętrznych modułów z poziomu aplikacji została wyłączona przez administratora. Musisz poprosić go o usunięcie pliku %s aby włączyć odpowiednią funkcję. +ConfFileMuseContainCustom=Instalacja zewnętrznego modułu z poziomu aplikacji, zapisuje pliki w katlogu %s. Abu katalog ten był przetwarzany przez Dolibarr, musisz skonfigurować Twój plik conf/conf.phpby w opcji
- $dolibarr_main_url_root_alt ustawić wartość $dolibarr_main_url_root_alt="/custom"
- $dolibarr_main_document_root_alt ustawić wartość "%s/custom" diff --git a/htdocs/langs/pl_PL/banks.lang b/htdocs/langs/pl_PL/banks.lang index da57536fb74d5..567010eb2122d 100644 --- a/htdocs/langs/pl_PL/banks.lang +++ b/htdocs/langs/pl_PL/banks.lang @@ -27,7 +27,7 @@ BalanceMinimalDesired=Minimalne saldo pożądane InitialBankBalance=Saldo początkowe EndBankBalance=Saldo końcowe CurrentBalance=Saldo bieżące -FutureBalance=Przyszłość równowagi +FutureBalance=Przyszłe saldo ShowAllTimeBalance=Pokaż saldo od początku AllTime=Od początku Reconciliation=Pojednanie @@ -52,7 +52,7 @@ BankAccountDomiciliation=Konto adres BankAccountCountry=Konto kraju BankAccountOwner=Nazwa właściciela konta BankAccountOwnerAddress=Adres właściciela konta -RIBControlError=Sprawdza integralność wartości się nie powiedzie. Oznacza to, że informacje na ten numer konta nie są kompletne lub błędne (sprawdź liczbowe, IBAN). +RIBControlError=Sprawdza integralność wartości, które się niepowiedziodły. Oznacza to, że informacje o tym numerze konta nie są kompletne lub błędne (sprawdź liczbowe, IBAN). CreateAccount=Załóż konto NewAccount=Nowe konto NewBankAccount=Nowe konto bankowe @@ -79,7 +79,7 @@ Account=Konto ByCategories=Według kategorii ByRubriques=Według kategorii BankTransactionByCategories=Bank transakcji według kategorii -BankTransactionForCategory=Bank transakcji kategorii %s +BankTransactionForCategory=Transakcje bankowe dla kategorii %s RemoveFromRubrique=Usuń powiązanie z kategorii RemoveFromRubriqueConfirm=Czy na pewno chcesz usunąć związek między transakcją i kategorii? ListBankTransactions=Lista transakcji bankowych @@ -119,18 +119,18 @@ BankTransfer=Przelew bankowy BankTransfers=Przelewy bankowe TransferDesc=Przeniesienie z jednego konta do drugiego, Dolibarr napisze dwa rekordy (ujemne w źródle konta i kredytu w rachunku docelowego, o tej samej kwocie. Te same etykiety i daty będą stosowane w odniesieniu do tej transakcji) TransferFrom=Od -TransferTo=By -TransferFromToDone=Przeniesienie z %s do %s %s% s została zapisana. -CheckTransmitter=Nadajnik -ValidateCheckReceipt=Validate otrzymania tej kontroli? +TransferTo=Do +TransferFromToDone=Transfer z %s do %s %s %s został zapisany. +CheckTransmitter=Nadawca +ValidateCheckReceipt=Sprawdź ten czek? ConfirmValidateCheckReceipt=Czy na pewno chcesz, aby potwierdzić odbiór tej kontroli, nie będzie można zmienić raz to zrobić? -DeleteCheckReceipt=Usuń to sprawdzić odbiór? +DeleteCheckReceipt=Usuń ten czek? ConfirmDeleteCheckReceipt=Czy na pewno chcesz usunąć to sprawdzić odbiór? BankChecks=Czeki bankowe BankChecksToReceipt=Czeki czeka na depozyt ShowCheckReceipt=Pokaż sprawdzić otrzymania wpłaty -NumberOfCheques=Nb czeków -DeleteTransaction=Usuń transakcji +NumberOfCheques=Nr czeku +DeleteTransaction=Usuń transakcje ConfirmDeleteTransaction=Czy na pewno chcesz usunąć tę transakcję? ThisWillAlsoDeleteBankRecord=Spowoduje to również usunięcie generowane transakcje bankowe BankMovements=Ruchy @@ -139,27 +139,29 @@ PlannedTransactions=Planowane transakcje Graph=Grafika ExportDataset_banque_1=Bank transakcji i konta ExportDataset_banque_2=Odcinek wpłaty -TransactionOnTheOtherAccount=Transakcji na inne konta +TransactionOnTheOtherAccount=Transakcja 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 +PaymentNumberUpdateSucceeded=Liczba płatności zaktualizowana pomyślnie +PaymentNumberUpdateFailed=Liczba płatności nie mogła zostać zaktualizowana. +PaymentDateUpdateSucceeded=Data płatności zaktualizowana pomyślnie PaymentDateUpdateFailed=Data płatności nie mogą być aktualizowane Transactions=Transakcje -BankTransactionLine=Bank transakcji +BankTransactionLine=Transakcje bankowe AllAccounts=Wszystkie bank / Rachunki BackToAccount=Powrót do konta ShowAllAccounts=Pokaż wszystkich rachunków -FutureTransaction=Transakcja w futur. Nie da się pogodzić. +FutureTransaction=Transakcja w przyszłości. Nie da się pogodzić. SelectChequeTransactionAndGenerate=Wybierz / filtr sprawdza, to do otrzymania depozytu wyboru i kliknij przycisk "Utwórz". -InputReceiptNumber=Wybierz wyciągu bankowego związanego z postępowania pojednawczego. Użyj sortable wartość liczbową: RRRRMM lub RRRRMMDD +InputReceiptNumber=Wybierz wyciąg bankowy związany z postępowania pojednawczego. Użyj schematu: 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=Nie rekord BAN +LabelRIB=Etykieta BAN +NoBANRecord=Brak rekordu BAN DeleteARib=Usuń rekord BAN ConfirmDeleteRib=Czy na pewno chcesz usunąć ten rekord BAN? +StartDate=Data rozpoczęcia +EndDate=Koniec diff --git a/htdocs/langs/pl_PL/bills.lang b/htdocs/langs/pl_PL/bills.lang index 4072ad3de2fc7..9c9ed95b5578e 100644 --- a/htdocs/langs/pl_PL/bills.lang +++ b/htdocs/langs/pl_PL/bills.lang @@ -5,73 +5,73 @@ 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 +BillsCustomersUnpaidForCompany=Nie zapłacone faktury klientów dla %s +BillsSuppliersUnpaid=Nie zapłacone faktury dostawców +BillsSuppliersUnpaidForCompany=Nie zapłacone faktury dostawców dla %s BillsLate=Opóźnienia w płatnościach -BillsStatistics=Klienci faktury statystyki -BillsStatisticsSuppliers=Dostawcy faktury statystyki +BillsStatistics=Statystyki faktur klientów +BillsStatisticsSuppliers=Statystyki faktur dostawców DisabledBecauseNotErasable=Wyłączone, ponieważ nie mogą być skasowane -InvoiceStandard=Standard faktury -InvoiceStandardAsk=Standard faktury -InvoiceStandardDesc=Tego rodzaju faktury jest wspólnym faktury. +InvoiceStandard=Standardowa faktura +InvoiceStandardAsk=Standardowa faktura +InvoiceStandardDesc=Tego rodzaju faktura jest powszechną fakturą. InvoiceDeposit=Depozyt faktury InvoiceDepositAsk=Depozyt faktury -InvoiceDepositDesc=Tego rodzaju faktury jest wykonywane wtedy, gdy depozyt została odebrana. +InvoiceDepositDesc=Tego rodzaju faktura jest wystawiana, gdy została dana zaliczka/zadatek InvoiceProForma=Proforma faktury InvoiceProFormaAsk=Proforma faktury -InvoiceProFormaDesc=Proforma fakturze jest obraz prawdziwy faktury, ale nie ma wartości księgowych. +InvoiceProFormaDesc=Faktura proforma jest obrazem prawdziwej faktury, ale nie ma jeszcze wartości księgowych. InvoiceReplacement=Zastąpienie faktury InvoiceReplacementAsk=Zastąpienie faktury do faktury -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". +InvoiceReplacementDesc=Zastąpienie faktury służy do anulowania i/lub całkowitego zastąpienia faktury dla, której nie odnotowano wpłaty.

Uwaga: Można zastąpić tylko faktury bez zapłaty. Jeżeli korekta nie jest jeszcze zamknięta/ukończona, zostanie ona automatycznie zamknięta i przeniesiona do "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. +InvoiceAvoirAsk=Edytuj notatkę do skorygowania faktury +InvoiceAvoirDesc=Nota kredytowa jest negatywną fakturą/korektą wykorzystywaną do rozwiązania w przypadku gdy na fakturze jest kwota, która różni się od kwoty faktycznie wypłaconej (ponieważ klient wypłacił przez pomyłkę zbyt dużo, będzie wypłacona w całości, lub zwrócił niektóre produkty).

Uwaga: oryginał faktury musi być już zamknięty ( "wpłacona" lub "częściowo wpłacana") w celu umożliwienia stworzenia noty kredytowej na jej temat. 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 -ReplacementByInvoice=Otrzymuje fakturę -CorrectInvoice=Poprawny faktury %s +ReplaceInvoice=Zastąp fakturę %s +ReplacementInvoice=Faktura zastępcza +ReplacedByInvoice=Zastąpine przez fakturę %s +ReplacementByInvoice=Zastąpione przez fakturę +CorrectInvoice=Skoryguj fakturę %s CorrectionInvoice=Korekta faktury UsedByInvoice=Służy do zapłaty faktury %s -ConsumedBy=Zużywanej przez -NotConsumed=Nie zużywanej -NoReplacableInvoice=Nr replacable faktur -NoInvoiceToCorrect=Nr faktury do skorygowania -InvoiceHasAvoir=Poprawione przez jedną lub kilka faktur -CardBill=Faktura karty +ConsumedBy=Zużyto przez +NotConsumed=Nie zużyto +NoReplacableInvoice=Brak faktur zastępczych +NoInvoiceToCorrect=Brak faktury do skorygowania +InvoiceHasAvoir=Skorygowane przez jedną lub kilka faktur +CardBill=Karta faktury PredefinedInvoices=Predefiniowane Faktury Invoice=Faktura Invoices=Faktury -InvoiceLine=Faktura linii -InvoiceCustomer=Klient faktury -CustomerInvoice=Klient faktury +InvoiceLine=Pole faktury +InvoiceCustomer=Faktura klienta +CustomerInvoice=Faktura klienta CustomersInvoices=Faktury Klientów -SupplierInvoice=Dostawca faktury -SuppliersInvoices=Dostawców faktur -SupplierBill=Dostawca faktury -SupplierBills=dostawców faktur +SupplierInvoice=Faktura Dostawcy +SuppliersInvoices=Faktura Dostawców +SupplierBill=Faktura Dostawcy +SupplierBills=Faktury Dostawców Payment=Płatność -PaymentBack=Płatność powrót +PaymentBack=Płatność zwrotna Payments=Płatności -PaymentsBack=Płatności powrót +PaymentsBack=Zwroty płatności PaidBack=Spłacona DatePayment=Data płatności DeletePayment=Usuń płatności ConfirmDeletePayment=Czy na pewno chcesz usunąć tę płatność? -ConfirmConvertToReduc=Czy chcesz przekonwertować tego kredytu notatkę do absolutnej zniżki?
Kwota kredytu będzie więc notatki zapisane wśród wszystkich zniżek i mogą być wykorzystane jako zniżki dla obecnych lub przyszłych faktur dla tego klienta. +ConfirmConvertToReduc=Czy chcesz przemienić tą notę kredytu do absolutnej zniżki?
Kwota kredytu będzie zapisana wśród wszystkich zniżek i będzie możliwe wykorzystanie ich jako zniżki dla obecnych lub przyszłych faktur dla tego klienta. SupplierPayments=Dostawcy płatności -ReceivedPayments=Odebrane płatności +ReceivedPayments=Otrzymane płatności ReceivedCustomersPayments=Zaliczki otrzymane od klientów 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=Płatności powrotem już zrobione +ReceivedCustomersPaymentsToValid=Odebrane płatności klientów do potwierdzenia +PaymentsReportsForYear=Raporty płatności dla %s +PaymentsReports=Raporty płatności +PaymentsAlreadyDone=Płatności już wykonane +PaymentsBackAlreadyDone=Zwroty płatności już wykonane PaymentRule=Zasady płatności PaymentMode=Typ płatności PaymentTerm=Termin płatności @@ -80,87 +80,87 @@ PaymentConditionsShort=Warunki płatności PaymentAmount=Kwota płatności 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. +HelpPaymentHigherThanReminderToPay=Uwaga, płatność kwoty jednego lub więcej rachunków jest wyższa potrzeba.
Wprowadź edycje wpisu lub potwierdź i pomyśl o stworzeniu noty kredytowej dla nadwyżki otrzymanych z nadpłaty faktur. 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" +ClassifyPaid=Klasyfikacja "wpłacono" +ClassifyPaidPartially=Klasyfikacja "wpłacono częściowo" +ClassifyCanceled=Klasyfikacja "Porzucono" +ClassifyClosed=Klasyfikacja "zamknięte" ClassifyUnBilled=Sklasyfikować "Unbilled" CreateBill=Utwórz fakturę -AddBill=Tworzenie faktury lub kredytową wiadomości +AddBill=Tworzenie faktury lub noty kredytowej AddToDraftInvoices=Dodaj do sporządzenia faktury -DeleteBill=Usuń faktury +DeleteBill=Usuń fakturę SearchACustomerInvoice=Szukaj klienta faktury -SearchASupplierInvoice=Szukaj dostawcy fakturę +SearchASupplierInvoice=Szukaj dostawcy faktury CancelBill=Anulowanie faktury -SendRemindByMail=EMail przypomnienie -DoPayment=Czy płatności -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=Wyłączona, ponieważ nieopłacone jest zero +SendRemindByMail=Wyślij przypomnienie / ponaglenie mailem +DoPayment=Wykonaj płatność +DoPaymentBack=Zwróć płatność +ConvertToReduc=Zamień na przyszły rabat +EnterPaymentReceivedFromCustomer=Wprowadź płatności otrzymane od klienta +EnterPaymentDueToCustomer=Dokonaj płatności dla klienta +DisabledBecauseRemainderToPayIsZero=Nieaktywne, ponieważ upływająca nieopłacona kwota wynosi zero Amount=Ilość -PriceBase=Cena podstawy -BillStatus=Faktura statusu +PriceBase=Cena podstawowa +BillStatus=Status faktury BillStatusDraft=Projekt (musi zostać zatwierdzone) -BillStatusPaid=Paid -BillStatusPaidBackOrConverted=Paid lub przekonwertowany do zniżki -BillStatusConverted=Przeliczone na zniżki +BillStatusPaid=Płatność +BillStatusPaidBackOrConverted=Płatność lub konwersja do zniżki +BillStatusConverted=Płatność (gotowe do finalnej faktury) BillStatusCanceled=Opuszczony -BillStatusValidated=Zatwierdzona (powinna być wypłacana) +BillStatusValidated=Zatwierdzona (trzeba zapłacić) BillStatusStarted=Rozpoczęcie -BillStatusNotPaid=Nie paid -BillStatusClosedUnpaid=Zamknięte (bezpłatne) -BillStatusClosedPaidPartially=Paid (częściowo) +BillStatusNotPaid=Brak zapłaty +BillStatusClosedUnpaid=Zamknięte (nie zapłacone) +BillStatusClosedPaidPartially=Opłacone (częściowo) BillShortStatusDraft=Szkic -BillShortStatusPaid=Paid +BillShortStatusPaid=Płatność BillShortStatusPaidBackOrConverted=Przetworzone BillShortStatusConverted=Przetworzone -BillShortStatusCanceled=Opuszczony -BillShortStatusValidated=Zatwierdzona +BillShortStatusCanceled=Opuszczone +BillShortStatusValidated=Zatwierdzone BillShortStatusStarted=Rozpoczęcie -BillShortStatusNotPaid=Nie paid +BillShortStatusNotPaid=Brak wpłaty BillShortStatusClosedUnpaid=Zamknięte -BillShortStatusClosedPaidPartially=Paid (częściowo) -PaymentStatusToValidShort=Aby potwierdzić -ErrorVATIntraNotConfigured=Numer VAT Intracommunautary jeszcze nie zdefiniowano -ErrorNoPaiementModeConfigured=Nr domyślny tryb płatności określone. Idź do faktury moduł do konfiguracji to naprawić. -ErrorCreateBankAccount=Utwórz konto bankowe, a następnie przejść do panelu konfiguracji modułu faktury do zdefiniowania sposobów płatności +BillShortStatusClosedPaidPartially=Opłacono (częściowo) +PaymentStatusToValidShort=Do potwierdzenia +ErrorVATIntraNotConfigured=Stopa Vat niezdefiniowana +ErrorNoPaiementModeConfigured=Brak zdefiniowanego domyślnego trybu płatności. Przejdź do modułu faktur by naprawić to. +ErrorCreateBankAccount=Utwórz konto bankowe, a następnie przejść do panelu konfiguracji modułu faktury by zdefiniować sposób płatności ErrorBillNotFound=Faktura %s nie istnieje -ErrorInvoiceAlreadyReplaced=Błąd można spróbować zweryfikować faktury zastąpić faktury %s. Ale ten już otrzymuje fakturę %s. -ErrorDiscountAlreadyUsed=Błąd, zniżki już używany +ErrorInvoiceAlreadyReplaced=Błąd, próbujesz zweryfikować fakturę by zastąpić fakturę %s. Niestety została ona już zastąpiona przez fakturę %s. +ErrorDiscountAlreadyUsed=Błąd, zniżka już używana ErrorInvoiceAvoirMustBeNegative=Błąd, korekty faktury muszą mieć negatywny kwotę -ErrorInvoiceOfThisTypeMustBePositive=Błąd ten typ faktury musi mieć dodatni kwoty -ErrorCantCancelIfReplacementInvoiceNotValidated=Błąd, nie można anulować fakturę, która została zastąpiona przez inną fakturę, że projekt jest nadal w stanie +ErrorInvoiceOfThisTypeMustBePositive=Błąd ten typ faktury musi mieć dodatnią wartość +ErrorCantCancelIfReplacementInvoiceNotValidated=Błąd, nie można anulować faktury, która została zastąpiona przez inną fakturę, będącą ciągle w stanie projektu. BillFrom=Od -BillTo=Bill do +BillTo=Do ActionsOnBill=Działania na fakturze -NewBill=Nowe faktury +NewBill=Nowa faktura LastBills=Ostatnia %s faktur LastCustomersBills=Ostatnia %s odbiorców faktur LastSuppliersBills=Ostatnia %s dostawców faktur AllBills=Wszystkie faktury -OtherBills=Inne faktur +OtherBills=Inne faktury DraftBills=Projekt faktur -CustomersDraftInvoices=Klienci projektu faktur -SuppliersDraftInvoices=Dostawcy projektu faktur +CustomersDraftInvoices=Projekt faktury klienta +SuppliersDraftInvoices=Projekt faktury dostawcy Unpaid=Należne wpłaty ConfirmDeleteBill=Czy na pewno chcesz usunąć tę fakturę? -ConfirmValidateBill=Czy na pewno chcesz, aby potwierdzić tę fakturę w odniesieniu %s? -ConfirmUnvalidateBill=Czy na pewno chcesz zmienić status faktury %s do projektu? -ConfirmClassifyPaidBill=Czy na pewno chcesz zmienić fakturę %s do statusu wypłatę? -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=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 +ConfirmValidateBill=Czy na pewno chcesz potwierdzić tę fakturę w odniesieniu do %s? +ConfirmUnvalidateBill=Czy na pewno chcesz zmienić status faktury %s do stanu projektu? +ConfirmClassifyPaidBill=Czy na pewno chcesz zmienić fakturę %s do statusu zapłaconej? +ConfirmCancelBill=Czy na pewno chcesz anulować fakturę %s? +ConfirmCancelBillQuestion=Dlaczego chcesz zaklasyfikować tę fakturę do "opuszczonych"? +ConfirmClassifyPaidPartially=Czy na pewno chcesz zmienić fakturę %s do statusu wpłaconej? +ConfirmClassifyPaidPartiallyQuestion=Niniejsza faktura nie została całkowicie wpłacona. Jakie są powody, aby zamknąć tę fakturę? +ConfirmClassifyPaidPartiallyReasonAvoir=Upływającym nieopłaconym (%s %s) jest przyznana zniżka, ponieważ płatność została dokonana przed terminem. Uregulowano podatku VAT do faktury korygującej. +ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Upływające nieopłacone (%s %s) jest przyznana zniżka, ponieważ płatność została dokonana przed terminem. Akceptuję stracić VAT na tej zniżce. +ConfirmClassifyPaidPartiallyReasonDiscountVat=Upływające nieopłacone (% s% s) mają przyznaną zniżkę, ponieważ płatność została dokonana przed terminem. Odzyskano VAT od tej zniżki bez noty kredytowej. +ConfirmClassifyPaidPartiallyReasonBadCustomer=Zły klient ConfirmClassifyPaidPartiallyReasonProductReturned=Produkty częściowo zwrócone -ConfirmClassifyPaidPartiallyReasonOther=Kwota porzucił dla innej przyczyny +ConfirmClassifyPaidPartiallyReasonOther=Kwota porzucona z innej przyczyny ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Wybór ten jest możliwe, jeżeli faktury zostały wyposażone w odpowiedni komentarz. (Przykład "Tylko podatku odpowiadającej cenie, które zostały faktycznie zapłacone daje prawa do odliczenia") ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=W niektórych krajach ten wybór może być możliwe tylko wówczas, gdy na fakturze zawiera prawidłowe notatki. ConfirmClassifyPaidPartiallyReasonAvoirDesc=Użyj tego wyboru, jeśli wszystkie inne nie odpowiadają @@ -294,10 +294,11 @@ 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 -RelatedCustomerInvoices=Related customer invoices -RelatedSupplierInvoices=Related supplier invoices +RelatedCustomerInvoices=Powiązane z: faktury klienta +RelatedSupplierInvoices=Pozwiązane z: faktura dostawca LatestRelatedBill=Ostatnie pokrewne faktury WarningBillExist=Ostrzeżenie, jeden lub więcej faktur istnieje +MergingPDFTool=Narzędzie do dzielenia PDF # PaymentConditions PaymentConditionShortRECEP=Natychmiastowe diff --git a/htdocs/langs/pl_PL/boxes.lang b/htdocs/langs/pl_PL/boxes.lang index 86f10513d1ab3..4b7d3b9e1c26c 100644 --- a/htdocs/langs/pl_PL/boxes.lang +++ b/htdocs/langs/pl_PL/boxes.lang @@ -1,96 +1,97 @@ # Dolibarr language file - Source file is en_US - boxes -BoxLastRssInfos=Rss informacji -BoxLastProducts=Ostatnie produkty / usługi -BoxProductsAlertStock=Produkty w alercie magazynie -BoxLastProductsInContract=Ostatnia zakontraktowanych produktów / usług -BoxLastSupplierBills=Ostatnia dostawcy faktur -BoxLastCustomerBills=Ostatnia klienta faktury +BoxLastRssInfos=Informacje Rss +BoxLastProducts=Ostatnie %s produkty / usługi +BoxProductsAlertStock=Produkty w alercie magazynowym +BoxLastProductsInContract=Ostatnich %s zakontraktowanych produktów / usług +BoxLastSupplierBills=Ostatnie faktury dostawców +BoxLastCustomerBills=Ostatnie faktury klienta BoxOldestUnpaidCustomerBills=Najstarsze niezapłacone faktury -BoxOldestUnpaidSupplierBills=Najstarszy dostawcy niezapłaconych faktur -BoxLastProposals=Ostatnia propozycji +BoxOldestUnpaidSupplierBills=Najstarsze niezapłacone faktury dostawcy +BoxLastProposals=Ostatnia oferta propozycji BoxLastProspects=Ostatnie modyfikowani potencjalni klienci -BoxLastCustomers=Ostatnia klientów -BoxLastSuppliers=Ostatnia dostawców -BoxLastCustomerOrders=Ostatnia zamówień +BoxLastCustomers=Ostatni zmodyfikowani klienci +BoxLastSuppliers=Ostatni zmodyfikowani dostawcy +BoxLastCustomerOrders=Ostatnie zamówienia klienta BoxLastValidatedCustomerOrders=Ostatnie potwierdzone zamówienia klientów BoxLastBooks=Ostatnie książki BoxLastActions=Ostatnie działania -BoxLastContracts=Siste kontrakter +BoxLastContracts=Ostatnia umowa/kontrakt BoxLastContacts=Ostatnie kontakty / adresy -BoxLastMembers=Ostatnie użytkowników +BoxLastMembers=Ostatni użytkownicy BoxFicheInter=Ostatnie interwencje -BoxCurrentAccounts=Saldo konta otwarte +BoxCurrentAccounts=Saldo otwartych kont BoxSalesTurnover=Obrót BoxTotalUnpaidCustomerBills=Suma niezapłaconych faktur przez klientów BoxTotalUnpaidSuppliersBills=Suma niezapłaconych faktur dostawcy -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=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 +BoxTitleLastBooks=Ostatnie %s rejestrowane książki +BoxTitleNbOfCustomers=Liczba klientów +BoxTitleLastRssInfos=Ostatnie %s wieści z %s +BoxTitleLastProducts=Ostatnie %s zmodyfikowanych produktów / usług +BoxTitleProductsAlertStock=Produkty w alercie magazynowym +BoxTitleLastCustomerOrders=Ostatnie %s zamówień klientów +BoxTitleLastModifiedCustomerOrders=Ostatnich %s zmodyfikowanych zamówień klientów +BoxTitleLastSuppliers=Ostatni %s zarejestrowani dostawcy +BoxTitleLastCustomers=Ostatni %s zarejestrowani klienci +BoxTitleLastModifiedSuppliers=%s ostatnio zmodyfikowanych dostawców BoxTitleLastModifiedCustomers=%s ostatnio zmodyfikowanych klientów -BoxTitleLastCustomersOrProspects=W ostatnim% s klienci lub perspektywy -BoxTitleLastPropals=W ostatnim% s propozycje -BoxTitleLastModifiedPropals=W ostatnim% s zmodyfikowane propozycje +BoxTitleLastCustomersOrProspects=Ostatni %s klienci lub prospekty +BoxTitleLastPropals=Ostatnie %s propozycje +BoxTitleLastModifiedPropals=Ostatnich %s zmodyfikowanych propozycji BoxTitleLastCustomerBills=%s ostatnich faktur klientów -BoxTitleLastModifiedCustomerBills=W ostatnim% s zmodyfikowane faktury klienta -BoxTitleLastSupplierBills=Ostatnia %s dostawcy faktur -BoxTitleLastModifiedSupplierBills=W ostatnim% s zmodyfikowane faktur dostawca +BoxTitleLastModifiedCustomerBills=Ostatnich %s zmodyfikowanych faktur klienta +BoxTitleLastSupplierBills=Ostatnich %s dostawców faktur +BoxTitleLastModifiedSupplierBills=Ostatnich %s zmodyfikowanych faktur dostawcy BoxTitleLastModifiedProspects=%s ostatnio zmodyfikowanych potencjalnych klientów -BoxTitleLastProductsInContract=Ostatnie %s produktów / usług w umowie -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 +BoxTitleLastProductsInContract=Ostatnich %s produktów / usług w umowie +BoxTitleLastModifiedMembers=Ostatnich %s użytkowników +BoxTitleLastFicheInter=Ostatnich %s zmodyfikowanych interwencji +BoxTitleOldestUnpaidCustomerBills=Najstarszych %s niezapłaconych faktur klienta +BoxTitleOldestUnpaidSupplierBills=Najstarszych %s niezapłaconych faktur dostawcy +BoxTitleCurrentAccounts=Otworzone salda na koncie +BoxTitleSalesTurnover=Obrót sprzedaży BoxTitleTotalUnpaidCustomerBills=Niezapłacone faktury klienta -BoxTitleTotalUnpaidSuppliersBills=Niezapłacone faktury dostawca +BoxTitleTotalUnpaidSuppliersBills=Niezapłacone faktury dostawcy BoxTitleLastModifiedContacts=%s ostatnio zmodyfikowanych kontaktów / adresów BoxMyLastBookmarks=Moje ostatnie %s zakładek -BoxOldestExpiredServices=Najstarszy aktywny minął usługi -BoxLastExpiredServices=Ostatnie %s Najstarsze kontakty z aktywnymi przeterminowanych usług -BoxTitleLastActionsToDo=Ostatnia %s do działania -BoxTitleLastContracts=Siste %s kontrakter -BoxTitleLastModifiedDonations=Ostatnie %s modyfikowane darowizn +BoxOldestExpiredServices=Najstarsze aktywne przeterminowane usługi +BoxLastExpiredServices=Ostatnich %s najstarszych kontaktów z aktywnymi przeterminowanymi usługami +BoxTitleLastActionsToDo=Ostatnie %s akcji do zrobienia +BoxTitleLastContracts=Ostatni %s kontrakt +BoxTitleLastModifiedDonations=Ostatnich %s modyfikowanch darowizn BoxTitleLastModifiedExpenses=Ostatnie %s modyfikowane wydatki 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. +FailedToRefreshDataInfoNotUpToDate=Nie można odświeżyć RSS. Ostatnie udane odświeżenie dnia: %s +LastRefreshDate=Ostatnia data odświeżania +NoRecordedBookmarks=Brak zdefiniowanych zakładek ClickToAdd=Kliknij tutaj, aby dodać. -NoRecordedCustomers=Nr zarejestrowanych klientów +NoRecordedCustomers=Brak zarejestrowanych klientów NoRecordedContacts=Brak zapisanych kontaktów -NoActionsToDo=Brak działań do -NoRecordedOrders=Nr rejestrowane klienta zamówienia -NoRecordedProposals=Nr zarejestrowanych wniosków +NoActionsToDo=Brak działań do wykonania +NoRecordedOrders=Brak zarejestrowanych zamówień klientów +NoRecordedProposals=Brak zarejestrowanych wniosków NoRecordedInvoices=Brak zarejestrowanych faktur klientów NoUnpaidCustomerBills=Brak niezapłaconych faktur -NoRecordedSupplierInvoices=Nr rejestrowane dostawcy faktur -NoUnpaidSupplierBills=Nr dostawcy niezapłaconych faktur -NoModifiedSupplierBills=Ingen registrert leverandørens faktura -NoRecordedProducts=Nr zarejestrowane produkty / usługi +NoRecordedSupplierInvoices=Brak zarejestrowanych faktur dostawców +NoUnpaidSupplierBills=Brak niezapłaconych faktur dostawców +NoModifiedSupplierBills=Brak zarejestrowanych faktur dostawców +NoRecordedProducts=Brak zarejestrowanych produktów / usług NoRecordedProspects=Brak potencjalnyc klientów -NoContractedProducts=Brak produktów / usług zakontraktowanych -NoRecordedContracts=Ingen registrert kontrakter -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 +NoContractedProducts=Brak produktów/usług zakontraktowanych +NoRecordedContracts=Brak zarejestrowanych kontraktów +NoRecordedInterventions=Brak zapisanych interwencji +BoxLatestSupplierOrders=Ostatnie zamówienia dla dostawcy +BoxTitleLatestSupplierOrders=Ostatnie %s zamówień dla dostawcy +BoxTitleLatestModifiedSupplierOrders=Ostatnich %s zmodyfikowanych zamówień dla dostawcy +NoSupplierOrder=Brak zarejestrowanych zamówień dla dostawców BoxCustomersInvoicesPerMonth=Ilość faktur w skali miesiąca -BoxSuppliersInvoicesPerMonth=Faktur dostawca miesięcznie +BoxSuppliersInvoicesPerMonth=Faktury dostawcy na miesiąc BoxCustomersOrdersPerMonth=Zamówienia klientów miesięcznie -BoxSuppliersOrdersPerMonth=Zamówienia dostawca miesięcznie +BoxSuppliersOrdersPerMonth=Zamówienia dla dostawców miesięcznie BoxProposalsPerMonth=Propozycje na miesiąc -NoTooLowStockProducts=Brak produktów w dolnej granicy magazynie -BoxProductDistribution=Produkty / Usługi dystrybucji -BoxProductDistributionFor=Dystrybucja% s% s +NoTooLowStockProducts=Brak produktów z niską ilością w magazynie +BoxProductDistribution=Produkty / Usługi +BoxProductDistributionFor=Dystrybucja z %s dla %s ForCustomersInvoices=Faktury Klientów ForCustomersOrders=Zamówienia klientów ForProposals=Propozycje +LastXMonthRolling=Ostnich %s w ubiegłym miesiącu diff --git a/htdocs/langs/pl_PL/deliveries.lang b/htdocs/langs/pl_PL/deliveries.lang index f279018bf7655..26fea8580f618 100644 --- a/htdocs/langs/pl_PL/deliveries.lang +++ b/htdocs/langs/pl_PL/deliveries.lang @@ -1,28 +1,28 @@ # Dolibarr language file - Source file is en_US - deliveries Delivery=Dostawa Deliveries=Dostawy -DeliveryCard=Dostępność kart -DeliveryOrder=Dostawa celu -DeliveryOrders=Zamówienia na dostawy +DeliveryCard=Karta dostawy +DeliveryOrder=Zamówienie dostawy +DeliveryOrders=Zamówień na dostawy DeliveryDate=Data dostawy -DeliveryDateShort=Deliv. data +DeliveryDateShort=Data dostarczenia CreateDeliveryOrder=Generowanie zamówienia dostawy -QtyDelivered=Ilość wydana +QtyDelivered=Ilość dostarczona SetDeliveryDate=Ustaw datę wysyłki -ValidateDeliveryReceipt=Validate otrzymania dostawy +ValidateDeliveryReceipt=Potwierdzenie otrzymania dostawy ValidateDeliveryReceiptConfirm=Czy na pewno chcesz, aby potwierdzić dostawę otrzymania? DeleteDeliveryReceipt=Usuń potwierdzenia dostarczenia DeleteDeliveryReceiptConfirm=Czy na pewno chcesz usunąć %s potwierdzenia dostarczenia? DeliveryMethod=Metoda dostawy -TrackingNumber=Numer -DeliveryNotValidated=Dostawa nie zatwierdzone +TrackingNumber=Numer przesyłki +DeliveryNotValidated=Dostawa nie zatwierdzona # merou PDF model NameAndSignature=Nazwisko i podpis: ToAndDate=To___________________________________ na ____ / _____ / __________ -GoodStatusDeclaration=Czy otrzymane towary powyżej w dobrym stanie, +GoodStatusDeclaration=Otrzymano towary w dobrym stanie, Deliverer=Dostawca: Sender=Nadawca Recipient=Odbiorca -ErrorStockIsNotEnough=Nie wystarczy Zdjęcie -Shippable=Shippable -NonShippable=Nie shippable +ErrorStockIsNotEnough=Nie wystarczająco w magazynie +Shippable=Możliwa wysyłka +NonShippable=Nie do wysyłki diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang index 907f1887ab838..d1df79a635c49 100644 --- a/htdocs/langs/pl_PL/errors.lang +++ b/htdocs/langs/pl_PL/errors.lang @@ -11,7 +11,7 @@ ErrorBadUrl=Url %s jest nie tak ErrorLoginAlreadyExists=Zaloguj %s już istnieje. ErrorGroupAlreadyExists=Grupa %s już istnieje. ErrorRecordNotFound=Rekord nie został znaleziony. -ErrorFailToCopyFile=Nie udało się skopiować pliku '%s "na" %s strony'. +ErrorFailToCopyFile=Nie udało się skopiować pliku '%s do %s. ErrorFailToRenameFile=Nie można zmienić nazwy pliku '%s "na" %s strony'. ErrorFailToDeleteFile=Nie można usunąć pliku " %s". ErrorFailToCreateFile=Nie można utworzyć pliku ' %s'. @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Błąd, próbowano przemieścić magazyn bez informacji lot / seriala, na produkt wymagający informację lot / serial. +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Wszystkie zarejestrowane przyjęcia muszą najpierw zostać zweryfikowane (zatwierdzone lub odrzucone) przed dopuszczeniem ich do wykonania tej akcji +ErrorCantSetReceptionToTotalDoneWithReceptionDenied=Wszystkie zarejestrowane przyjęcia muszą najpierw zostać zweryfikowane (zatwierdzone) przed dopuszczeniem ich do wykonania tej akcji +ErrorGlobalVariableUpdater0=Żądanie HTTP nie powiodło się z powodu błędu '% s' +ErrorGlobalVariableUpdater1=Nieprawidłowy format JSON '% s' +ErrorGlobalVariableUpdater2=Brakuje parametru '% s' +ErrorGlobalVariableUpdater3=Wymagane dane nie stwierdzono w wyniku +ErrorGlobalVariableUpdater4=Klient SOAP nie powiodło się z powodu błędu '% s' +ErrorGlobalVariableUpdater5=Globalna zmienna wybrana +ErrorFieldMustBeANumeric=Pole %s musi mieć wartość numeryczną +ErrorFieldMustBeAnInteger=Pole %s musi być liczbą całkowitą # Warnings WarningMandatorySetupNotComplete=Parametry konfiguracyjne obowiązkowe nie są jeszcze określone diff --git a/htdocs/langs/pl_PL/interventions.lang b/htdocs/langs/pl_PL/interventions.lang index 1bd9519089d62..2c92dda48b351 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=Interwencje generowane z zamówień diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang index 28fd1461784ed..fcf5afdd545d9 100644 --- a/htdocs/langs/pl_PL/main.lang +++ b/htdocs/langs/pl_PL/main.lang @@ -220,6 +220,7 @@ Next=Następny Cards=Kartki Card=Karta Now=Teraz +HourStart=Godzina startu Date=Data DateAndHour=Data i godzina DateStart=Data rozpoczęcia @@ -242,6 +243,8 @@ DatePlanShort=Planowana data DateRealShort=Rzeczywista data DateBuild=Raport stworzenia daty DatePayment=Data płatności +DateApprove=Data zatwierdzania +DateApprove2=Termin zatwierdzania (drugie zatwierdzenie) DurationYear=rok DurationMonth=miesiąc DurationWeek=tydzień @@ -298,7 +301,7 @@ UnitPriceHT=Cena jednostkowa (netto) UnitPriceTTC=Cena jednostkowa PriceU=cen/szt. PriceUHT=cen/szt (netto) -AskPriceSupplierUHT=PU HT Zamówiony +AskPriceSupplierUHT=Zapytanie P.U HT PriceUTTC=cena/szt. Amount=Ilość AmountInvoice=Kwota faktury @@ -352,7 +355,7 @@ Status=Stan Favorite=Ulubiony ShortInfo=Info. Ref=Nr ref. -ExternalRef=Ref. extern +ExternalRef=Ref. zewnętrzny RefSupplier=Nr ref. Dostawca RefPayment=Nr ref. płatności CommercialProposalsShort=Propozycje komercyjne @@ -395,8 +398,8 @@ Available=Dostępny NotYetAvailable=Nie są jeszcze dostępne NotAvailable=Niedostępne Popularity=Popularność -Categories=Tags/categories -Category=Tag/category +Categories=Tagi / kategorie +Category=Tag / kategoria By=Przez From=Od to=do @@ -408,6 +411,8 @@ OtherInformations=Inne informacje Quantity=Ilość Qty=Ilosc ChangedBy=Zmieniona przez +ApprovedBy=Zatwierdzony przez +ApprovedBy2=Zatwierdzony przez (drugie zatwierdzenie) ReCalculate=Przelicz ResultOk=Sukces ResultKo=Porażka @@ -526,7 +531,7 @@ DateFromTo=Z %s do %s DateFrom=Z %s DateUntil=Dopuki %s Check=Sprawdzić -Uncheck=Usuń zaznaczenie pola wyboru +Uncheck=Odznacz Internal=Wewnętrzne External=Zewnętrzne Internals=Wewnętrzne @@ -694,8 +699,10 @@ PublicUrl=Publiczny URL AddBox=Dodaj skrzynke SelectElementAndClickRefresh=Zaznacz element i kliknij Odśwież PrintFile=Wydrukuj plik %s -ShowTransaction=Pokaż transakcji -GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide. +ShowTransaction=Pokaż transakcje +GoIntoSetupToChangeLogo=Wejdź w Strona główna - Ustawienia- Firma by zmienić logo lub przejdź do Strona główna- Ustawienia - Wyświetl do ukrycia. +Deny=Zabraniać +Denied=Zabroniony # Week day Monday=Poniedziałek Tuesday=Wtorek diff --git a/htdocs/langs/pl_PL/orders.lang b/htdocs/langs/pl_PL/orders.lang index 2839701ef3c15..1e65fc4772b0e 100644 --- a/htdocs/langs/pl_PL/orders.lang +++ b/htdocs/langs/pl_PL/orders.lang @@ -64,8 +64,8 @@ ShipProduct=Statek produktu Discount=Rabat CreateOrder=Tworzenie Zamówienie RefuseOrder=Odmówić celu -ApproveOrder=Approve order -Approve2Order=Approve order (second level) +ApproveOrder=Zatwierdź zamówienie +Approve2Order=Zatwierdza porządek (drugi poziom) ValidateOrder=Sprawdź zamówienie UnvalidateOrder=Unvalidate zamówienie DeleteOrder=Usuń zamówienie @@ -79,7 +79,9 @@ NoOpenedOrders=Nie otworzył zamówień NoOtherOpenedOrders=Żadne inne otwarte zamówienia NoDraftOrders=Brak projektów zamówienia OtherOrders=Inne zamówienia -LastOrders=Ostatnia %s zamówień +LastOrders=Ostatnie %s zamówień klienta +LastCustomerOrders=Ostatnie %s zamówień klienta +LastSupplierOrders=Ostatnie %s zamówień dla dostawcy LastModifiedOrders=Ostatnia %s zmodyfikowane zamówień LastClosedOrders=Ostatnia %s zamkniętych zleceń AllOrders=Wszystkie zlecenia @@ -89,7 +91,7 @@ OrdersStatisticsSuppliers=Dostawca zamówień statystyk NumberOfOrdersByMonth=Liczba zleceń przez miesiąc AmountOfOrdersByMonthHT=Ilość zamówień na miesiąc (po odliczeniu podatku) ListOfOrders=Lista zamówień -CloseOrder=Zamknij celu +CloseOrder=Zamknij zamówienie ConfirmCloseOrder=Czy na pewno chcesz zamknąć to zamówienie? Gdy zamówienie jest zamknięta, to może być rozliczone. ConfirmCloseOrderIfSending=Czy na pewno chcesz zamknąć to zamówienie? Musisz zamknąć zamówienie tylko wtedy, gdy wszystkie wysyłki są zrobione. ConfirmDeleteOrder=Czy na pewno chcesz usunąć to zamówienie? @@ -103,8 +105,8 @@ ClassifyBilled=Klasyfikacja "obciążonego" ComptaCard=Księgowość karty DraftOrders=Projekt zamówień RelatedOrders=Podobne zamówienia -RelatedCustomerOrders=Related customer orders -RelatedSupplierOrders=Related supplier orders +RelatedCustomerOrders=Podobne zamówienia klientów +RelatedSupplierOrders=Podobne zlecenia dostawca OnProcessOrders=Na proces zamówienia RefOrder=Nr ref. porządek RefCustomerOrder=Nr ref. zamówieniem @@ -121,7 +123,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 +FirstApprovalAlreadyDone=Pierwsze zatwierdzenie już zrobione ##### Types de contacts ##### TypeContact_commande_internal_SALESREPFOLL=Przedstawiciela w ślad za zamówienie klienta TypeContact_commande_internal_SHIPPING=Przedstawiciela w ślad za koszty diff --git a/htdocs/langs/pl_PL/other.lang b/htdocs/langs/pl_PL/other.lang index 3ab98cdaba6c2..bea44f2a00840 100644 --- a/htdocs/langs/pl_PL/other.lang +++ b/htdocs/langs/pl_PL/other.lang @@ -12,7 +12,7 @@ Notify_FICHINTER_VALIDATE=Validate interwencji Notify_FICHINTER_SENTBYMAIL=Interwencja wysyłane pocztą Notify_BILL_VALIDATE=Sprawdź rachunki Notify_BILL_UNVALIDATE=Faktura klienta nie- zwalidowane -Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded +Notify_ORDER_SUPPLIER_VALIDATE=Kolejność Dostawca rejestrowane Notify_ORDER_SUPPLIER_APPROVE=Dostawca celu zatwierdzone Notify_ORDER_SUPPLIER_REFUSE=Dostawca odmówił celu Notify_ORDER_VALIDATE=Zamówienie Klienta potwierdzone @@ -29,7 +29,7 @@ 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=Supplier order recorded +Notify_ORDER_SUPPLIER_VALIDATE=Kolejność Dostawca rejestrowane Notify_ORDER_SUPPLIER_SENTBYMAIL=Aby dostawca wysłane pocztą Notify_BILL_SUPPLIER_VALIDATE=Faktura dostawca zatwierdzone Notify_BILL_SUPPLIER_PAYED=Dostawca zapłaci faktury @@ -48,7 +48,7 @@ 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 +SeeModuleSetup=Zobacz konfigurację modułu% s NbOfAttachedFiles=Liczba załączonych plików / dokumentów TotalSizeOfAttachedFiles=Całkowita wielkość załączonych plików / dokumentów MaxSize=Maksymalny rozmiar @@ -171,7 +171,7 @@ 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. +EMailTextOrderValidatedBy=Kolejność% s został nagrany przez% s. EMailTextOrderApprovedBy=Zamówienie zatwierdzone przez %s %s EMailTextOrderRefused=Postanowienie %s odmówił EMailTextOrderRefusedBy=Postanowienie %s %s odmawia @@ -203,6 +203,7 @@ 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. +IfAmountHigherThan=Jeśli kwota wyższa niż %s ##### Calendar common ##### AddCalendarEntry=Dodaj wpis w kalendarzu %s diff --git a/htdocs/langs/pl_PL/productbatch.lang b/htdocs/langs/pl_PL/productbatch.lang index 4455da495cd6d..6ce701c1288df 100644 --- a/htdocs/langs/pl_PL/productbatch.lang +++ b/htdocs/langs/pl_PL/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Użyj plik/wsad/numer seryjny -ProductStatusOnBatch=Tak ('plik/wsad//nr seryjny' wymagany) -ProductStatusNotOnBatch=Nie ('plik/wsad//nr seryjny' nie użyty) +ManageLotSerial=Użyj lot / numer seryjny +ProductStatusOnBatch=Tak (lot / numer seryjny wymagany) +ProductStatusNotOnBatch=Nie (lot / numer seryjny nie wykorzystany) 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 +Batch=Lot/Serial +atleast1batchfield=Data wykorzystania lub data sprzedaży lub Lot / Numer seryjny +batch_number=Lot/ Numer seryjny +BatchNumberShort=Lot/ Nr. 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 +DetailBatchNumber=Lot/Serial detale +DetailBatchFormat=Lot/Serial: %s - Wykorzystano: %s - Sprzedano: %s (Qty : %d) +printBatch=Lot/Serial: %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 . +WhenProductBatchModuleOnOptionAreForced=Gdy moduł lot / numer seryjny jest aktywny, zwiększenie / zmniejszenie Tryb magazynowy jest wymuszony 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 aee3672e474e2..904b8cd697d0c 100644 --- a/htdocs/langs/pl_PL/products.lang +++ b/htdocs/langs/pl_PL/products.lang @@ -245,25 +245,25 @@ 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# +PriceExpressionEditorHelp2=Możesz uzyskać dostęp ExtraFields ze zmiennymi jak # extrafield_myextrafieldkey # i zmiennych globalnych z # 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: +PriceExpressionEditorHelp5=Dostępne wartości globalne: 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 +MinSupplierPrice=Cena minimalna dostawca +DynamicPriceConfiguration=Dynamiczna konfiguracja cena +GlobalVariables=Zmienne globalne +GlobalVariableUpdaters=Globalne zmienne updaters +GlobalVariableUpdaterType0=Danych JSON +GlobalVariableUpdaterHelp0=Analizuje dane JSON z określonego adresu URL, wartość określa położenie odpowiedniej wartości, +GlobalVariableUpdaterHelpFormat0=Format jest {"URL": "http://example.com/urlofjson", "wartość": "array1, tablica2, targetvalue"} +GlobalVariableUpdaterType1=Dane WebService +GlobalVariableUpdaterHelp1=Przetwarza dane WebService z określonego adresu URL, NS określa przestrzeń nazw, wartość określa położenie odpowiedniej wartości, dane powinny zawierać dane do wysyłania i metoda jest wywołanie metody WS +GlobalVariableUpdaterHelpFormat1=Format jest {"URL": "http://example.com/urlofws", "wartość": "tablica, targetvalue", "NS": "http://example.com/urlofns", "metoda": " myWSMethod "," DATA ": {" swoje ":" dane ", do": "Wyślij"}} +UpdateInterval=Aktualizacja co (min) +LastUpdated=Ostatnia aktualizacja +CorrectlyUpdated=Poprawnie zaktualizowane diff --git a/htdocs/langs/pl_PL/projects.lang b/htdocs/langs/pl_PL/projects.lang index 0baab0048f4c9..7d20faf8d6efb 100644 --- a/htdocs/langs/pl_PL/projects.lang +++ b/htdocs/langs/pl_PL/projects.lang @@ -4,142 +4,143 @@ ProjectId=Projekt Id Project=Project Projects=Projekty 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). +SharedProject=Wszyscy +PrivateProject=Kontakty z projektu +MyProjectsDesc=Ten widok jest ograniczony do projektów dla których jesteś kontaktem (cokolwiek jest w typie). ProjectsPublicDesc=Ten widok przedstawia wszystkie projekty, które możesz przeczytać. -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=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 +ProjectsPublicTaskDesc=Ten widok przedstawia wszystkie projekty i zadania, które są dozwolone do czytania. +ProjectsDesc=Ten widok przedstawia wszystkie projekty (twoje uprawnienia użytkownika pozwalają wyświetlać wszystko). +MyTasksDesc=Ten widok jest ograniczony do projektów lub zadań, dla których jesteś kontaktem (cokolwiek jest w typie). +OnlyOpenedProject=Tylko otwarte projekty są widoczne (projekty z szkicu lub stanu zamkniętego nie są widoczne). +TasksPublicDesc=Ten widok przedstawia wszystkie projekty i zadania, które możesz przeczytać. +TasksDesc=Ten widok przedstawia wszystkie projekty i zadania (twoje uprawnienia mają dostępu do wglądu we wszystko). +AllTaskVisibleButEditIfYouAreAssigned=Wszystkie zadania dla takiego projektu są widoczne, ale można wprowadzić czas tylko do zadań do których jesteś przypisany. +ProjectsArea=Obszar projektów NewProject=Nowy projekt AddProject=Tworzenie projektu -DeleteAProject=Usuń projektu +DeleteAProject=Usuń projekt DeleteATask=Usuń zadanie ConfirmDeleteAProject=Czy na pewno chcesz usunąć ten projekt? ConfirmDeleteATask=Czy na pewno chcesz usunąć to zadanie? OfficerProject=Oficer projektu LastProjects=Ostatnia %s projektów -AllProjects=Wszystkich projektów +AllProjects=Wszystkie projekty ProjectsList=Lista projektów ShowProject=Pokaż projekt -SetProject=Ustaw projektu -NoProject=Projekt zdefiniowane -NbOpenTasks=Nb otwartych zadań -NbOfProjects=Nb projektów +SetProject=Ustaw projekt +NoProject=Żadny projekt niezdefiniowany lub nie jest twoją własnością +NbOpenTasks=Liczba otwartych zadań +NbOfProjects=Liczba projektów TimeSpent=Czas spędzony 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 +RefTask=Nr ref. zadania +LabelTask=Etykieta zadania TaskTimeSpent=Czas spędzony na zadaniach TaskTimeUser=Użytkownik TaskTimeNote=Uwaga TaskTimeDate=Data -TasksOnOpenedProject=Zadania na otwartych projektów -WorkloadNotDefined=Obciążenie nie zdefiniowano +TasksOnOpenedProject=Zadania na otwartych projektach +WorkloadNotDefined=Czas pracy nie zdefiniowany NewTimeSpent=Nowy czas spędzony MyTimeSpent=Mój czas spędzony MyTasks=Moje zadania Tasks=Zadania Task=Zadanie -TaskDateStart=Zadanie data rozpoczęcia +TaskDateStart=Data rozpoczęcia zadania TaskDateEnd=Data zakończenia zadania TaskDescription=Opis zadania NewTask=Nowe zadania AddTask=Tworzenie zadania AddDuration=Dodaj czas Activity=Aktywność -Activities=Zadania / działania +Activities=Zadania / aktywności MyActivity=Moja aktywność -MyActivities=Moje zadania / działania +MyActivities=Moje zadania / aktywności MyProjects=Moje projekty DurationEffective=Efektywny czas trwania Progress=Postęp -ProgressDeclared=Deklarowana postęp -ProgressCalculated=Obliczone postęp +ProgressDeclared=Deklarowany postęp +ProgressCalculated=Obliczony postęp Time=Czas -ListProposalsAssociatedProject=Lista komercyjne propozycje związane z projektem -ListOrdersAssociatedProject=Lista zamówień związanych z projektem -ListInvoicesAssociatedProject=Lista faktur związanych z projektem -ListPredefinedInvoicesAssociatedProject=Lista klientów gotowych faktur związanych z projektem -ListSupplierOrdersAssociatedProject=Lista dostawców zamówień związanych z projektem -ListSupplierInvoicesAssociatedProject=Lista dostawców faktur związanych z projektem +ListProposalsAssociatedProject=Lista komercyjnych propozycji związanych z projektem +ListOrdersAssociatedProject=Lista zamówień klienta związanych z projektem +ListInvoicesAssociatedProject=Lista faktur klienta związanych z projektem +ListPredefinedInvoicesAssociatedProject=Lista klientów predefinowanych faktur związanych z projektem +ListSupplierOrdersAssociatedProject=Lista zamówień dostawców związanych z projektem +ListSupplierInvoicesAssociatedProject=Lista faktur dostawców związanych z projektem ListContractAssociatedProject=Wykaz umów związanych z projektem ListFichinterAssociatedProject=Wykaz interwencji związanych z projektem ListExpenseReportsAssociatedProject=Lista raportów o wydatkach związanych z projektem -ListDonationsAssociatedProject=List of donations associated with the project +ListDonationsAssociatedProject=Lista dotacji związanych z projektem ListActionsAssociatedProject=Wykaz działań związanych z projektem -ActivityOnProjectThisWeek=Aktywność na projekt w tym tygodniu -ActivityOnProjectThisMonth=Aktywność w sprawie projektu w tym miesiącu -ActivityOnProjectThisYear=Aktywność na projekt w tym roku +ActivityOnProjectThisWeek=Aktywność w projekcie w tym tygodniu +ActivityOnProjectThisMonth=Aktywność na projekcie w tym miesiącu +ActivityOnProjectThisYear=Aktywność na projekcie w tym roku ChildOfTask=Dziecko projektu / zadania -NotOwnerOfProject=Nie prywatnego właściciela tego projektu -AffectedTo=Affected do -CantRemoveProject=Ten projekt nie może zostać usunięty, ponieważ jest do których odwołują się inne obiekty (faktury, zamówienia lub innych). Zobacz odsyłających tab. +NotOwnerOfProject=Brak właściciela tego prywatnego projektu +AffectedTo=Przypisane do +CantRemoveProject=Ten projekt nie może zostać usunięty dopóki inne obiekty się odwołują (faktury, zamówienia lub innych). Zobacz odsyłających tab. ValidateProject=Sprawdź projet -ConfirmValidateProject=Czy na pewno chcesz sprawdzić tego projektu? -CloseAProject=Projekt Zamknij +ConfirmValidateProject=Czy na pewno chcesz sprawdzić ten projekt? +CloseAProject=Zamknij Projekt ConfirmCloseAProject=Czy na pewno chcesz zamknąć ten projekt? -ReOpenAProject=Projekt Open +ReOpenAProject=Otwórz projekt ConfirmReOpenAProject=Czy na pewno chcesz ponownie otworzyć ten projekt? -ProjectContact=Kontakt Project +ProjectContact=Kontakty projektu 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=Zobacz również zadania powierzone mi nie +YouAreNotContactOfProject=Nie jestes kontaktem tego prywatnego projektu +DeleteATimeSpent=Usuń czas spędzony +ConfirmDeleteATimeSpent=Czy na pewno chcesz usunąć ten spędzony czas? +DoNotShowMyTasksOnly=Zobacz również zadania nie przypisane do mnie ShowMyTasksOnly=Wyświetl tylko zadania przypisane do mnie TaskRessourceLinks=Zasoby -ProjectsDedicatedToThisThirdParty=Projekty poświęcone tej trzeciej +ProjectsDedicatedToThisThirdParty=Projekty poświęcone tej stronie trzeciej NoTasks=Brak zadań dla tego projektu -LinkedToAnotherCompany=Powiązane z innymi trzeciej +LinkedToAnotherCompany=Powiązane z innymą częścią trzecią 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=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? +ThisWillAlsoRemoveTasks=To działanie także usunie wszystkie zadania projektu (%s zadania w tej chwili) i wszystkie dane wejścia czasu spędzonego. +IfNeedToUseOhterObjectKeepEmpty=Jeżeli pewne obiekty (faktura, zamówienie, ...), należące do innej części trzeciej, muszą być związane z projektem tworzenia, zachowaj to puste by projekt był wielowątkowy -(wiele części trzecich). +CloneProject=Sklonuj projekt +CloneTasks=Sklonuj zadania +CloneContacts=Sklonuj kontakty +CloneNotes=Sklonuj notatki +CloneProjectFiles=Sklonuj pliki przynależne do projektu +CloneTaskFiles=Połączone pliki sklonowanych zadań (jeśli zadania sklonowano) +CloneMoveDate=Aktualizacja projektu / zadania od teraz? ConfirmCloneProject=Czy na pewno chcesz sklonować ten projekt? -ProjectReportDate=Zmień datę zadaniem data rozpoczęcia według projektu +ProjectReportDate=Zmień datę zadana nawiązując do daty rozpoczęcia 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 +ProjectCreatedInDolibarr=Projekt %s utworzony +TaskCreatedInDolibarr=Zadanie %s utworzono +TaskModifiedInDolibarr=Zadań %s zmodyfikowano +TaskDeletedInDolibarr=Zadań %s usunięto ##### Types de contacts ##### TypeContact_project_internal_PROJECTLEADER=Kierownik projektu -TypeContact_project_external_PROJECTLEADER=Kierownik projektu +TypeContact_project_external_PROJECTLEADER=Lider projektu 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_TASKEXECUTIVE=Wykonawca zadania +TypeContact_project_task_external_TASKEXECUTIVE=Wykonawca zadania TypeContact_project_task_internal_TASKCONTRIBUTOR=Współpracownik TypeContact_project_task_external_TASKCONTRIBUTOR=Współpracownik -SelectElement=Wybierz elementem +SelectElement=Wybierz element AddElement=Link do elementu -UnlinkElement=Rozłącz elementem +UnlinkElement=Rozłącz element # Documents models -DocumentModelBaleine=Kompletny model projektu sprawozdania (logo. ..) +DocumentModelBaleine=Kompletny raport modelu projektu (logo. ..) PlannedWorkload=Planowany nakład pracy PlannedWorkloadShort=Nakład pracy -WorkloadOccupation=Nakład pracy przypisanie -ProjectReferers=Odnosząc obiektów +WorkloadOccupation=Nakład pracy przypisany +ProjectReferers=Odnoszących się 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 +ProjectMustBeValidatedFirst=Projekt musi być najpierw zatwierdzony +ProjectDraft=Szkic projekty +FirstAddRessourceToAllocateTime=Skojarze zasoby do przeznaczonego czasu +InputPerDay=Wejścia na dzień +InputPerWeek=Wejścia w tygodniu +InputPerAction=Wejścia na działanie +TimeAlreadyRecorded=Czas spędzony (zarejestrowany do tej pory) dla tego zadanie / dzień i użytkownik %s diff --git a/htdocs/langs/pl_PL/stocks.lang b/htdocs/langs/pl_PL/stocks.lang index e1f06e833fdec..9772d213f2457 100644 --- a/htdocs/langs/pl_PL/stocks.lang +++ b/htdocs/langs/pl_PL/stocks.lang @@ -1,26 +1,27 @@ # Dolibarr language file - Source file is en_US - stocks -WarehouseCard=Magazyn karty +WarehouseCard=Karta magazynu Warehouse=Magazyn Warehouses=Magazyny -NewWarehouse=Nowy magazyn / Stock obszarze -WarehouseEdit=Modyfikacja składu +NewWarehouse=Nowy magazyn / obszar magazynowania +WarehouseEdit=Modyfikacja magazynu MenuNewWarehouse=Nowy magazyn WarehouseOpened=Magazyn otwarty WarehouseClosed=Magazyn zamknięte WarehouseSource=Źródło magazynu WarehouseSourceNotDefined=Nie zdefiniowano magazynu, AddOne=Dodaj jedną -WarehouseTarget=Docelowe magazynie +WarehouseTarget=Docelowy magazynie ValidateSending=Usuń wysyłanie CancelSending=Anuluj wysyłanie DeleteSending=Usuń wysyłanie -Stock=Zasób -Stocks=Zapasy +Stock=Stan +Stocks=Stany +StocksByLotSerial=Magazynowane wg. lotu/ serialu Movement=Ruch Movements=Ruchy -ErrorWarehouseRefRequired=Magazyn referencyjnego Wymagana jest nazwa +ErrorWarehouseRefRequired=Nazwa referencyjna magazynu wymagana ErrorWarehouseLabelRequired=Magazyn etykiecie jest wymagane -CorrectStock=Poprawny stanie +CorrectStock=Popraw stan ListOfWarehouses=Lista magazynów ListOfStockMovements=Wykaz stanu magazynowego StocksArea=Powierzchnia magazynów @@ -67,24 +68,25 @@ NoPredefinedProductToDispatch=Nie gotowych produktów dla tego obiektu. Więc ni DispatchVerb=Wysyłka StockLimitShort=Limit dla wpisu StockLimit=Zdjęcie do wpisu limitu -PhysicalStock=Fizyczne zapasy -RealStock=Real Stock +PhysicalStock=Fizyczne stany +RealStock=Realny magazyn VirtualStock=Wirtualne stanie MininumStock=Minimum stock StockUp=Stanie się -MininumStockShort=Stock min +MininumStockShort=Magazyn minimum StockUpShort=Stanie się IdWarehouse=Identyfikator magazynu DescWareHouse=Opis składu LieuWareHouse=Lokalizacja hurtowni WarehousesAndProducts=Magazyny i produktów +WarehousesAndProductsBatchDetail=Magazyny i produkty (z detalami na lot / serial) AverageUnitPricePMPShort=Średnia cena wejścia AverageUnitPricePMP=Średnia cena wejścia SellPriceMin=Cena sprzedaży jednostki EstimatedStockValueSellShort=Wartość sprzedaży EstimatedStockValueSell=Wartość sprzedaży EstimatedStockValueShort=Szacunkowa wartość zapasów -EstimatedStockValue=Szacunkowa wartość zapasów +EstimatedStockValue=Szacunkowa wartość magazynu DeleteAWarehouse=Usuń magazyn ConfirmDeleteWarehouse=Czy na pewno chcesz usunąć %s magazynie? PersonalStock=Osobowych %s czas @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Źródło magazynu musi być zdefiniowane tutaj kiedy "Lot produktu" jest włączony. Zostanie wykorzystany do wylistowania który lot / serial jest dostępny dla produktu który wymaga lot /serial daty przesunięcia. Jeśli chcesz wysłać produkty z różnych magazynów, zrób wysyłkę w kilku krokach - etapach nie pogubisz się. +InventoryCodeShort=Kod Fv/ Przesunięcia +NoPendingReceptionOnSupplierOrder=Brak oczekujących odbiorów podczas otwartych zamówień produktów. +ThisSerialAlreadyExistWithDifferentDate=Ten lot/numer seryjny (%s) już istnieje ale z inna data do wykorzystania lub sprzedania (znaleziono %s a wszedłeś w %s) diff --git a/htdocs/langs/pl_PL/suppliers.lang b/htdocs/langs/pl_PL/suppliers.lang index d27163f41e48f..2c42cf0d161cc 100644 --- a/htdocs/langs/pl_PL/suppliers.lang +++ b/htdocs/langs/pl_PL/suppliers.lang @@ -43,4 +43,4 @@ 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) +UseDoubleApproval=Użyj podwójnego zatwierdzenia (drugie zezwolenie może być wykonane przez dowolnego użytkownika z dedykowanymi uprawnieniami) diff --git a/htdocs/langs/pl_PL/trips.lang b/htdocs/langs/pl_PL/trips.lang index 336aa514dc49c..5b8f620d066da 100644 --- a/htdocs/langs/pl_PL/trips.lang +++ b/htdocs/langs/pl_PL/trips.lang @@ -69,11 +69,9 @@ MOTIF_CANCEL=Powód 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=Zaprzeczać TO_PAID=Płacić BROUILLONNER=Otworzyć na nowo SendToValid=Wysłany do zatwierdzenia @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Czy na pewno chcesz przenieść ten raport wydatków do SaveTrip=Weryfikacja raportu wydatków ConfirmSaveTrip=Czy na pewno chcesz, aby potwierdzić ten raport wydatków? -Synchro_Compta=NDF <-> Compte - -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 Sur de vouloir intégrer cette pamiętać de frais dans le compte courant? -ndfToAccount=Uwaga de frais - integracja - -ConfirmAccountToNdf=Êtes-vous Sur de vouloir retirer cette note de compte courant frais du? -AccountToNdf=Uwaga de frais - Retrait - -LINE_NOT_ADDED=Ligne nie ajoutée: -NO_PROJECT=Aucun projet sélectionné. -NO_DATE=Aucune data sélectionnée. -NO_PRICE=Aucun prix Indique. - -TripForValid=à Valider -TripForPaid=Płatnik -TripPaid=Odbiorca płatności - NoTripsToExportCSV=Nie raport z wydatków na eksport za ten okres. diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang index 4db200257e390..e54cb96a5ec49 100644 --- a/htdocs/langs/pt_BR/admin.lang +++ b/htdocs/langs/pt_BR/admin.lang @@ -175,7 +175,6 @@ OfficialDemo=Demo online ERP OfficialMarketPlace=Loja Oficial para módulos / addons externos OfficialWebHostingService=Serviços de hospedagem web referenciados (Hospedagem em nuvem) ReferencedPreferredPartners=Parceiro preferido -OtherResources=Outros recursos ForDocumentationSeeWiki=Para a documentação de usuário, programador ou Perguntas Frequentes (FAQ), consulte o wiki do ERP:
%s ForAnswersSeeForum=Para outras questões ou realizar as suas próprias consultas, pode utilizar o fórum do ERP:
%s HelpCenterDesc1=Esta área permite ajudá-lo a obter um serviço de suporte do ERP. @@ -211,6 +210,8 @@ 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=Baixar pacote %s +UnpackPackageInDolibarrRoot=Descompactar o pacote na pasta dedicada aos módulos externos: %s 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)
@@ -290,7 +291,6 @@ ExtrafieldParamHelpradio=Lista de parâmetros tem que ser como chave, valor por ExtrafieldParamHelpsellist=Lista Parâmetros vem de uma tabela
Sintaxe: table_name: label_field: id_field :: filtro
Exemplo: c_typent: libelle: id :: filtro

filtro pode ser um teste simples (por exemplo, ativo = 1) para exibir apenas o valor ativo
se você deseja filtrar extrafields usar syntaxt extra.fieldcode = ... (onde código de campo é o código de extrafield)

A fim de ter a lista dependendo outro:
c_typent: libelle: id: parent_list_code | parent_column: Filtro LibraryToBuildPDF=Biblioteca utilizada para criar o PDF WarningUsingFPDF=Atenção: Seu conf.php contém dolibarr_pdf_force_fpdf directiva = 1. Isto significa que você usar a biblioteca FPDF para gerar arquivos PDF. Esta biblioteca é velho e não suporta um monte de recursos (Unicode, a transparência da imagem, cirílicos, árabes e asiáticos, ...), por isso podem ocorrer erros durante a geração de PDF.
Para resolver isso e ter um apoio total de geração de PDF, faça o download da biblioteca TCPDF , em seguida, comentar ou remover a linha $ dolibarr_pdf_force_fpdf = 1, e adicione ao invés $ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir' -LocalTaxDesc=Alguns países aplicam 2 ou 3 impostos sobre cada linha de nota fiscal. Se este for o caso, escolha o tipo de segundo e terceiro imposto e sua taxa. Tipos possíveis são:
1: impostos locais, aplicar sobre produtos e serviços, sem IVA (IVA não é aplicado sobre o imposto local)
2: impostos locais, aplicar sobre produtos e serviços antes de IVA (IVA é calculado sobre o montante + localtax)
3: impostos locais, aplicar em produtos sem IVA (IVA não é aplicado sobre o imposto local)
4: impostos locais, aplicadas aos produtos antes de IVA (IVA é calculado sobre o montante + localtax)
5: impostos locais, aplicar em serviços sem IVA (IVA não é aplicado sobre o imposto local)
6: impostos locais, aplicar em serviços antes de IVA (IVA é calculado sobre o montante + localtax) SMS=Mensagem de texto LinkToTestClickToDial=Digite um número de telefone para ligar para mostrar um link para testar a url ClickToDial para o usuário% s LinkToTest=Link clicável gerado para o usuário% s (clique número de telefone para testar) @@ -347,6 +347,8 @@ Module105Desc=Mailman ou interface SPIP para o módulo membro Module200Desc=sincronização com um anuário LDAP Module310Desc=Administração de Membros de uma associação Module330Desc=Administração de Favoritos +Module400Name=Projetos/Oportunidades/Contatos +Module400Desc=Gerenciamento de Projetos, oportunidades ou contatos. Você pode associar qualquer elemento (invoice, ordem, propostas, intervenções, etc...) para um projeto e ter uma visão transversal da visualização de projeto. Module410Desc=Interface com calendário Webcalendar 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 @@ -355,6 +357,7 @@ 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) +Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members) Module2000Name=Editor WYSIWYG Module2000Desc=Permitir editar alguma área de texto usando um editor avançado Module2400Desc=Administração da agenda e das ações @@ -371,7 +374,6 @@ Module5000Name=Multi-Empresa 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 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 @@ -382,8 +384,6 @@ Module55000Desc=Módulo para fazer pesquisas on-line (como Doodle, Studs, Rdvz . Module59000Name=Margems Module59000Desc=Módulo para gerenciar as margens Module60000Desc=Módulo para gerenciar comissões -Module150010Name=Número do lote, de comer por data e data de validade -Module150010Desc=Número do lote, prazo de validade de venda gestão de data para o produto Permission11=Consultar faturas Permission12=Criar/Modificar faturas Permission13=Faturas de clientes Unvalidate @@ -511,7 +511,6 @@ DictionaryCompanyJuridicalType=Tipos jurídicos de thirdparties DictionaryProspectLevel=Nível potencial Prospect DictionaryCanton=Estado / cantões DictionaryCivility=Título Civilidade -DictionaryActions=Tipo de eventos da agenda DictionarySocialContributions=Contribuições Sociais tipos DictionaryVAT=Taxas de VAT ou imposto sobre vendas de moeda DictionaryRevenueStamp=Quantidade de selos fiscais @@ -552,7 +551,6 @@ LocalTax2IsUsedDescES=A taxa de RE por padrão ao criar perspectivas, notas fisc 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 CalcLocaltax1Desc=Relatorios de taxas locais são calculados pela differença entre taxas locais de venda e taxas locais de compra CalcLocaltax2Desc=Relatorio de taxas locais e o total de taxas locais nas compras CalcLocaltax3Desc=Relatorio de taxas locais e o total de taxas locais de vendas @@ -658,14 +656,10 @@ ParameterActiveForNextInputOnly=parâmetro efetivo somente a partir das próxima NoEventOrNoAuditSetup=não são registrado eventos de segurança. Esto pode ser normal sim a auditoría não ha sido habilitado na página "configuração->segurança->auditoría". NoEventFoundWithCriteria=não são encontrado eventos de segurança para tais criterios de pesquisa. BackupDesc=Para realizar uma Cópia de segurança completa de Dolibarr, voçê deve: -BackupDesc2=* Guardar o conteúdo da pasta de documentos (%s) que contém todos os Arquivos enviados o gerados (em um zip, por Exemplo). -BackupDesc3=* Guardar o conteúdo de a sua base de dados em um Arquivo de despejo. Para ele pode utilizar o assistente a continuação. BackupDescX=O Arquivo gerado deverá localizar-se em um lugar seguro. BackupDescY=O arquivo gerado devevrá ser colocado em local seguro. BackupPHPWarning=Backup não pode ser garantida com este método. Prefere uma anterior RestoreDesc=Para restaurar uma Cópia de segurança de Dolibarr, voçê deve: -RestoreDesc2=* Tomar o Arquivo (Arquivo zip, por Exemplo) da pasta dos documentos e Descompactá-lo na pasta dos documentos de uma Nova Instalação de Dolibarr diretorio o na pasta dos documentos desta Instalação (%s). -RestoreDesc3=* Recargar o Arquivo de despejo guardado na base de dados de uma Nova Instalação de Dolibarr o desta Instalação. Atenção, uma vez realizada a Restaurar, deverá utilizar um login/senha de administrador existente ao momento da Cópia de segurança para conectarse. Para restaurar a base de dados na Instalação atual, pode utilizar o assistente a continuação. RestoreMySQL=importar do MySQL ForcedToByAModule=Esta regra é forçado a por um módulo ativado PreviousDumpFiles=Arquivos de despejo de backup de banco de dados disponível diff --git a/htdocs/langs/pt_BR/banks.lang b/htdocs/langs/pt_BR/banks.lang index c111878d3d65c..45a0691d45b4f 100644 --- a/htdocs/langs/pt_BR/banks.lang +++ b/htdocs/langs/pt_BR/banks.lang @@ -103,7 +103,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/boxes.lang b/htdocs/langs/pt_BR/boxes.lang index 1dfd31bd357a6..5d8843ce5236b 100644 --- a/htdocs/langs/pt_BR/boxes.lang +++ b/htdocs/langs/pt_BR/boxes.lang @@ -1,9 +1,15 @@ # Dolibarr language file - Source file is en_US - boxes +BoxLastRssInfos=Links de informação RSS BoxProductsAlertStock=Produtos em alerta de estoque BoxLastSupplierBills=Últimas faturas de Fornecedores BoxLastCustomerBills=Últimas faturas a Clientes BoxOldestUnpaidCustomerBills=Primeira fatura pendente do cliente BoxOldestUnpaidSupplierBills=Primeira fatura pendentes do fornecedor +BoxLastProspects=Últimos clientes potenciais +BoxLastCustomers=Últimos clientes +BoxLastSuppliers=Últimos Fornecedores +BoxLastCustomerOrders=Últimos pedidos +BoxLastValidatedCustomerOrders=Últimos pedidos de clientes validados BoxLastActions=Últimas ações BoxLastContracts=Últimos contratos BoxLastContacts=Últimos contatos/endereços @@ -13,15 +19,22 @@ BoxTotalUnpaidSuppliersBills=Total de faturas pendentes de fornecedores BoxTitleLastRssInfos=As %s últimas Infos de %s BoxTitleLastProducts=Os %s últimos Produtos/Serviços Registados BoxTitleProductsAlertStock=Produtos em alerta de estoque +BoxTitleLastCustomerOrders=Últimos %s Pedidos de clientes +BoxTitleLastModifiedCustomerOrders=Os %s últimos pedidos de clientes modificados BoxTitleLastModifiedSuppliers=Últimos %s fornecedores modificados BoxTitleLastModifiedCustomers=Últimos clientes +BoxTitleLastCustomersOrProspects=Os %s clientes ou orçamentos +BoxTitleLastPropals=Os %s últimos Orçamentos +BoxTitleLastModifiedPropals=As últimas %s propostas modificadas BoxTitleLastCustomerBills=As %s últimas faturas a clientes registradas +BoxTitleLastModifiedCustomerBills=As %s últimas faturas a clientes alteadas BoxTitleLastSupplierBills=As %s últimas faturas de Fornecedores registradas +BoxTitleLastModifiedSupplierBills=As %s últimas faturas de Fornecedores alteradas BoxTitleLastModifiedProspects=Últimos clientes potenciais modificados -BoxTitleLastModifiedMembers=os %s últimos Membros modificados +BoxTitleLastModifiedMembers=Últimos %s Membros BoxTitleLastFicheInter=As últimas % s intervenções modificadas -BoxTitleOldestUnpaidCustomerBills=Primeira %s fatura pendente do cliente -BoxTitleOldestUnpaidSupplierBills=Primeira %s fatura pendente do fornecedor +BoxTitleOldestUnpaidCustomerBills=As %s faturas mais antigas de clientes pendente de cobrança +BoxTitleOldestUnpaidSupplierBills=As %s faturas mais antigas de fornecedores pendente de pagamento BoxTitleCurrentAccounts=Abrir saldo das contas BoxTitleTotalUnpaidCustomerBills=Faturas de Clientes Pendentes de Cobrança BoxTitleTotalUnpaidSuppliersBills=Faturas de Fornecedores Pendentes de Pagamento @@ -49,7 +62,8 @@ NoContractedProducts=Nenhum Produto/Serviço contratado NoRecordedContracts=Nenhum contrato registrado NoRecordedInterventions=Não há intervenções gravadas BoxLatestSupplierOrders=Últimos pedidos a forcecedores -BoxTitleLatestSupplierOrders=%s últimos pedidos a forcecedores +BoxTitleLatestSupplierOrders=Os %s últimos Pedidos a Fornecedores +BoxTitleLatestModifiedSupplierOrders=Últimos %s pedidos a fornecedores alterados NoSupplierOrder=Nenhum pedido a fornecedor registrado BoxCustomersInvoicesPerMonth=Faturas de cliente por mês BoxSuppliersInvoicesPerMonth=Faturas de fornecedor por mês diff --git a/htdocs/langs/pt_BR/interventions.lang b/htdocs/langs/pt_BR/interventions.lang index bfd7757fb23a3..391a68486cd05 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 @@ -17,4 +28,3 @@ ArcticNumRefModelError=Ativação Impossível PacificNumRefModelDesc1=Devolve o número com o formato %syymm-nnnn onde yy é o ano, mm. O mês e nnnn um contador seq�êncial sem ruptura e sem ficar a 0 PacificNumRefModelError=Uma fatura que começa por # $$syymm existe na base e é incompativel com esta numeração. Eliminia ou renomea-la para ativar este módulo. PrintProductsOnFichinter=Imprimi produtos na ficha de intervento -PrintProductsOnFichinterDetails=para intervençoes geradas dos pedidos diff --git a/htdocs/langs/pt_BR/margins.lang b/htdocs/langs/pt_BR/margins.lang index aad281078303d..c47d5c64b573e 100644 --- a/htdocs/langs/pt_BR/margins.lang +++ b/htdocs/langs/pt_BR/margins.lang @@ -12,8 +12,6 @@ ProductMargins=Margem de produtos CustomerMargins=Margems de clientes SalesRepresentativeMargins=Tolerância aos representante de vendas ProductService=Produto ou serviço -StartDate=Data inicio -EndDate=Data fim Launch=Inicio ForceBuyingPriceIfNull=Forcar preço de compra se nulo ForceBuyingPriceIfNullDetails=Se "ATIVADO" a margem sera zero na linha (preço de compra = preço de venda), se nao ("DESATIVADO"), margem sera igual ao preço de venda (preço de compra = 0) diff --git a/htdocs/langs/pt_BR/productbatch.lang b/htdocs/langs/pt_BR/productbatch.lang deleted file mode 100644 index add0736381307..0000000000000 --- a/htdocs/langs/pt_BR/productbatch.lang +++ /dev/null @@ -1,3 +0,0 @@ -# Dolibarr language file - Source file is en_US - productbatch -ProductStatusOnBatchShort=Sim -ProductStatusNotOnBatchShort=Não diff --git a/htdocs/langs/pt_BR/stocks.lang b/htdocs/langs/pt_BR/stocks.lang index 62b718a2a79bc..d8c9cec47ea12 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,7 +94,6 @@ 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 diff --git a/htdocs/langs/pt_BR/suppliers.lang b/htdocs/langs/pt_BR/suppliers.lang index 747ddb02476d5..7df119d9f451d 100644 --- a/htdocs/langs/pt_BR/suppliers.lang +++ b/htdocs/langs/pt_BR/suppliers.lang @@ -12,6 +12,7 @@ ExportDataset_fournisseur_1=Faturas de Fornecedores e Linhas de Fatura ExportDataset_fournisseur_2=Faturas Fornecedores e Pagamentos ExportDataset_fournisseur_3=Ordems de fornecedor e linhas de ordem ConfirmApproveThisOrder=Tem certeza que quer aprovar este pedido? +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Tem certeza que quer negar este pedido? ConfirmCancelThisOrder=Tem certeza que quer cancelar este pedido? AddCustomerInvoice=Criar Fatura para o Cliente diff --git a/htdocs/langs/pt_BR/trips.lang b/htdocs/langs/pt_BR/trips.lang index 8af39e7001d74..6909727bff73a 100644 --- a/htdocs/langs/pt_BR/trips.lang +++ b/htdocs/langs/pt_BR/trips.lang @@ -1,16 +1,13 @@ # 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 +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +ListOfTrips=List of expense report +NewTrip=New expense report 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 +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports ClassifyRefunded=Classificar 'Rembolsado' diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang index 748c36ddb11cf..cb8efe3ac9a93 100644 --- a/htdocs/langs/pt_PT/admin.lang +++ b/htdocs/langs/pt_PT/admin.lang @@ -248,7 +248,7 @@ OfficialDemo=Demo em linha ERP/CRM OfficialMarketPlace=Mercado Oficial externo para os módulos / addons OfficialWebHostingService=Referenced web hosting services (Cloud hosting) ReferencedPreferredPartners=Parceiros Preferidos -OtherResources=Autres ressources +OtherResources=Outros recursos ForDocumentationSeeWiki=Para a documentação de utilizador, programador ou Perguntas Frequentes (FAQ), consulte o wiki do ERP:
%s +UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: %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.
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).
@@ -362,7 +363,7 @@ PDFAddressForging=Regras para forjar caixas de endereço HideAnyVATInformationOnPDF=Ocultar todas as informações relativas ao IVA em PDF gerado HideDescOnPDF=Ocultar a descrição dos produtos no PDF gerado HideRefOnPDF=Ocultar a referência dos produtos no PDF gerado -HideDetailsOnPDF=Hide products lines details on generated PDF +HideDetailsOnPDF=Ocultar os detalhes das linhas dos produtos no PDF gerado Library=Biblioteca UrlGenerationParameters=Parâmetros para garantir URLs SecurityTokenIsUnique=Use um parâmetro securekey exclusivo para cada URL @@ -371,7 +372,7 @@ GetSecuredUrl=Obter URL seguro ButtonHideUnauthorized=Ocultar botões para ações não autorizadas em vez de mostrar os botões desactivados OldVATRates=Taxa de IVA antiga NewVATRates=Nova Taxa de IVA -PriceBaseTypeToChange=Modify on prices with base reference value defined on +PriceBaseTypeToChange=Modificar nos preços com base no valor de referência definido em MassConvert=Launch mass convert String=Cadeia TextLong=Texto longo @@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_ 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=Biblioteca usada para gerar 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) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s RefreshPhoneLink=Atualizar link @@ -511,14 +512,14 @@ Module1400Name=Perito de Contabilidade Module1400Desc=Perido de gestão da Contabilidade (dupla posição) Module1520Name=Document Generation Module1520Desc=Mass mail document generation -Module1780Name=Tags/Categories -Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members) +Module1780Name=Etiquetas/Categorias +Module1780Desc=Criar etiquetas/categoria (produtos, clientes, fornecedores, contactos ou membros) Module2000Name=FCKeditor Module2000Desc=Editor WYSIWYG Module2200Name=Dynamic Prices Module2200Desc=Enable the usage of math expressions for prices Module2300Name=Cron -Module2300Desc=Scheduled job management +Module2300Desc=Gestão de trabalho agendado Module2400Name=Agenda Module2400Desc=Gestão da agenda e das acções Module2500Name=Gestão Electrónica de Documentos @@ -540,8 +541,8 @@ Module6000Name=Fluxo de Trabalho Module6000Desc=Gestão do fluxo de trabalho 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 +Module39000Name=Product lot +Module39000Desc=Lot or serial number, eat-by and sell-by date management on products Module50000Name=Paybox Module50000Desc=Módulo para oferecer uma página de pagamento online por cartão de crédito com paybox Module50100Name=Caixa @@ -558,8 +559,6 @@ Module59000Name=Margens Module59000Desc=Módulo para gerir as margens Module60000Name=Comissões Module60000Desc=Módulo para gerir comissões -Module150010Name=Batch number, eat-by date and sell-by date -Module150010Desc=batch number, eat-by date and sell-by date management for product Permission11=Consultar facturas Permission12=Criar/Modificar facturas Permission13=Facturas não validadas @@ -612,7 +611,7 @@ Permission106=Exportar envios Permission109=Eliminar envios Permission111=Consultar contas financeiras (contas bancarias, caixas) Permission112=Criar/Modificar quantidade/eliminar registos bancarios -Permission113=Setup financial accounts (create, manage categories) +Permission113=Configurar as contas ficnanceiras (criar, gerir categorias) Permission114=Reconciliar transações Permission115=Exportar transacções e extractos Permission116=Captar transferencias entre contas @@ -645,7 +644,7 @@ Permission181=Consultar pedidos a Fornecedores Permission182=Criar/Modificar pedidos a Fornecedores Permission183=Confirmar pedidos a Fornecedores Permission184=Aprovar pedidos a Fornecedores -Permission185=Order or cancel supplier orders +Permission185=Encomendar ou cancelar ordens do fornecedor Permission186=Receber pedidos de Fornecedores Permission187=Fechar pedidos a Fornecedores Permission188=Anular pedidos a Fornecedores @@ -713,7 +712,7 @@ Permission401=Consultar activos Permission402=Criar/Modificar activos Permission403=Confirmar activos Permission404=Eliminar activos -Permission510=Read Salaries +Permission510=Ler Salários Permission512=Criar/modificar salários Permission514=Apagar salários Permission517=Exportar salários @@ -763,14 +762,14 @@ Permission1233=Confirmar facturas de Fornecedores Permission1234=Eliminar facturas de Fornecedores Permission1235=Enviar facturas de fornecedores por e-mail Permission1236=Exportar facturas de Fornecedores, atributos e pagamentos -Permission1237=Export supplier orders and their details +Permission1237=Exportar as encomendas do fornecedor e os seus ddetalhes 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=Read Scheduled job -Permission23002=Create/update Scheduled job -Permission23003=Delete Scheduled job -Permission23004=Execute Scheduled job +Permission23001=Ler trabalho agendado +Permission23002=Criar/atualizar trabalho agendado +Permission23003=Apagar Trabalho Agendado +Permission23004=Executar Trabalho Agendado 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 @@ -800,7 +799,7 @@ DictionaryRegion=Regiões DictionaryCountry=Países DictionaryCurrency=Moedas DictionaryCivility=Civility title -DictionaryActions=Type of agenda events +DictionaryActions=Tipo de eventos da agenda DictionarySocialContributions=Tipos de contribuições sociais DictionaryVAT=VAT Rates or Sales Tax Rates DictionaryRevenueStamp=Amount of revenue stamps @@ -828,7 +827,7 @@ VATIsNotUsedDesc=O tipo de IVA proposto por defeito é 0. Este é o caso de asso VATIsUsedExampleFR=Em França, trata-se de sociedades ou organismos que elegem um regime fiscal general (Geral simplificado ou Geral normal), regime ao qual se declara o IVA. VATIsNotUsedExampleFR=Em França, trata-se de associações ou sociedades isentas de IVA, organismos o profissionais liberais que escolheram o régime fiscal de módulos (IVA em franquia), pagando um IVA em franquia sem fazer declarações de IVA. Esta eleição faz aparecer a anotação "IVA não aplicavel" nas facturas. ##### Local Taxes ##### -LTRate=Rate +LTRate=Taxa LocalTax1IsUsed=Utilizar um segundo imposto LocalTax1IsNotUsed=Não utilizar um segundo imposto LocalTax1IsUsedDesc=Utilizar um segundo tipo de imposto (não IVA) @@ -853,12 +852,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=Relatórios -CalcLocaltax1ES=Vendas - Compras +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Sales - Purchases CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Compras +CalcLocaltax2=Purchases CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Vendas +CalcLocaltax3=Sales 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 @@ -1018,14 +1017,14 @@ NoEventOrNoAuditSetup=Não registraram eventos de segurança. Pode ser normal se NoEventFoundWithCriteria=Não se encontraram eventos de segurança para os criterios de pesquisa. SeeLocalSendMailSetup=Ver a configuração local de sendmail BackupDesc=Para realizar uma Cópia de segurança completa do ERP, deve: -BackupDesc2=* Guardar o conteudo da pasta de documentos (%s) que contem todos os Ficheiros enviados ou gerados (em zip, por Exemplo). -BackupDesc3=* Guardar o conteúdo da sua base de dados num Ficheiro dedicado. Para este poder utilizar o assistente de continuação. +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=O ficheiro gerado deverá ser guardado num lugar seguro. BackupDescY=O arquivo gerado deve ser armazenado em local seguro. BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one RestoreDesc=Para restaurar uma Cópia de segurança do ERP/CRM, você deve: -RestoreDesc2=* Selecciona o ficheiro (Ficheiro zip, por Exemplo) da pasta dos documentos e descompacta para a pasta dos documentos de uma Nova Instalação do ERP/CRM na pasta dos documentos de esta Instalação (%s). -RestoreDesc3=* Recargar o Ficheiro de volcado guardado na base de dados de uma Nova Instalação de Dolibarr o de esta Instalação. Atenção, uma vez realizada a Restaurar, deverá utilizar um login/palavra-passe de administrador existente ao momento da Cópia de segurança para conectarse. Para restaurar a base de dados na Instalação actual, pode utilizar o assistente a continuación. +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=Importação MySQL ForcedToByAModule= Esta regra é forçada a %s activada por um módulo PreviousDumpFiles=Cópia de segurança disponível, base de dados de arquivos @@ -1337,6 +1336,8 @@ LDAPFieldCountry=País LDAPFieldCountryExample=Exemplo : c LDAPFieldDescription=Descrição LDAPFieldDescriptionExample=Exemplo : descrição +LDAPFieldNotePublic=Public Note +LDAPFieldNotePublicExample=Example : publicnote LDAPFieldGroupMembers= Os membros do grupo LDAPFieldGroupMembersExample= Exemplo: Membro único LDAPFieldBirthdate=Data de nascimento @@ -1443,9 +1444,9 @@ FixedEmailTarget=Fixed email target SendingsSetup=Configuração do módulos envíos SendingsReceiptModel=Modelo da ficha de expedição SendingsNumberingModules=Envios módulos numerados -SendingsAbility=Support shipment sheets for customer deliveries +SendingsAbility=Suporte para as folhas de expedição para as entregas do cliente NoNeedForDeliveryReceipts=Na maioria dos casos, as entregas utilizam a nota de entregas ao cliente (lista de produtos a enviar), quando recebido assinam pelo cliente. Portanto, a hora de entregas de produtos é uma operação duplicada sendo rara a vez que é ativada. -FreeLegalTextOnShippings=Free text on shipments +FreeLegalTextOnShippings=Texto livre nas expedições ##### Deliveries ##### DeliveryOrderNumberingModules=Módulo de numeração dos envios a clientes DeliveryOrderModel=Modelo de ordem de envío @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= Conta a ser usada para receber pagamentos em dinheiro 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot 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 @@ -1616,3 +1617,8 @@ 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 +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" diff --git a/htdocs/langs/pt_PT/banks.lang b/htdocs/langs/pt_PT/banks.lang index aefc7e59618c2..83cf407b1e6e7 100644 --- a/htdocs/langs/pt_PT/banks.lang +++ b/htdocs/langs/pt_PT/banks.lang @@ -163,3 +163,5 @@ LabelRIB=Etiqueta BAN NoBANRecord=Nenhum registro de BAN DeleteARib=Excluir registro BAN ConfirmDeleteRib=Tem certeza de que deseja excluir este registro BAN? +StartDate=Start date +EndDate=End date diff --git a/htdocs/langs/pt_PT/boxes.lang b/htdocs/langs/pt_PT/boxes.lang index 7c35e34c5e4c3..28d7fd114583f 100644 --- a/htdocs/langs/pt_PT/boxes.lang +++ b/htdocs/langs/pt_PT/boxes.lang @@ -94,3 +94,4 @@ BoxProductDistributionFor=Distribuição de %s para %s ForCustomersInvoices=Facturas de Clientes ForCustomersOrders=Encomendas de clientes ForProposals=Orçamentos +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang index 871b9d90af053..1915d8200c94e 100644 --- a/htdocs/langs/pt_PT/errors.lang +++ b/htdocs/langs/pt_PT/errors.lang @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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=Os parâmetros de configuração obrigatórios ainda não estão definidos diff --git a/htdocs/langs/pt_PT/interventions.lang b/htdocs/langs/pt_PT/interventions.lang index 1d827400a027e..c394009885416 100644 --- a/htdocs/langs/pt_PT/interventions.lang +++ b/htdocs/langs/pt_PT/interventions.lang @@ -50,4 +50,4 @@ ArcticNumRefModelError=Activação Impossivel PacificNumRefModelDesc1=Devolve o número com o formato %syymm-nnnn dónde yy é o ano, mm. O mês e nnnn um contador sequêncial sem ruptura e sem ficar a 0 PacificNumRefModelError=Uma factura que começa por # $$syymm existe na base e é incompativel com esta numeração. Eliminia ou renomea-la para activar este módulo. PrintProductsOnFichinter=Imprimir produtos no cartão intervenção -PrintProductsOnFichinterDetails=para intervenções geradas a partir de ordens +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang index f010590cf30cf..eedee0c086f1e 100644 --- a/htdocs/langs/pt_PT/main.lang +++ b/htdocs/langs/pt_PT/main.lang @@ -62,7 +62,7 @@ ErrorFailedToSaveFile=Erro, o registo do ficheiro falhou. SetDate=Definir data SelectDate=Seleccionar uma data SeeAlso=Ver também %s -SeeHere=See here +SeeHere=Veja aqui BackgroundColorByDefault=Cor de fundo por omissão FileNotUploaded=O ficheiro não foi enviado FileUploaded=O ficheiro foi enviado com sucesso @@ -141,7 +141,7 @@ Cancel=Cancelar Modify=Modificar Edit=Editar Validate=Validar -ValidateAndApprove=Validate and Approve +ValidateAndApprove=Validar e Aprovar ToValidate=Para validar Save=Guardar SaveAs=Guardar Como @@ -159,7 +159,7 @@ Search=Procurar SearchOf=Procurar Valid=Confirmar Approve=Aprovar -Disapprove=Disapprove +Disapprove=Desaprovar ReOpen=Reabrir Upload=Enviar Ficheiro ToLink=Link @@ -173,7 +173,7 @@ User=Utilizador Users=Utilizadores Group=Grupo Groups=Grupos -NoUserGroupDefined=No user group defined +NoUserGroupDefined=Nenhum grupo de utilizador definido Password=Senha PasswordRetype=Contrassenha NoteSomeFeaturesAreDisabled=Note que estão desativados muitos módulos/funções nesta demonstração. @@ -220,8 +220,9 @@ Next=Seguinte Cards=Fichas Card=Ficha Now=Ahora +HourStart=Start hour Date=Data -DateAndHour=Date and hour +DateAndHour=Data e Hora DateStart=Data de Início DateEnd=Data de Fim DateCreation=Data de Criação @@ -242,6 +243,8 @@ DatePlanShort=Data Planif. DateRealShort=Data Real DateBuild=Data da geração do Relatório DatePayment=Data de pagamento +DateApprove=Approving date +DateApprove2=Approving date (second approval) DurationYear=Ano DurationMonth=Mês DurationWeek=Semana @@ -264,7 +267,7 @@ days=dias Hours=Horas Minutes=Minutos Seconds=Segundos -Weeks=Weeks +Weeks=Semanas Today=Hoje Yesterday=Ontem Tomorrow=Amanhã @@ -298,7 +301,7 @@ UnitPriceHT=Preço Base (base) UnitPriceTTC=Preço Unitário PriceU=P.U. PriceUHT=P.U. (base) -AskPriceSupplierUHT=P.U. HT Requested +AskPriceSupplierUHT=P.U. HT Solicitado PriceUTTC=P.U. Amount=Montante AmountInvoice=Montante da Fatura @@ -352,7 +355,7 @@ Status=Estado Favorite=Favoritos ShortInfo=Informação Ref=Ref. -ExternalRef=Ref. extern +ExternalRef=Ref. externa RefSupplier=Ref. fornecedor RefPayment=Ref. pagamento CommercialProposalsShort=Orçamentos @@ -395,8 +398,8 @@ Available=Disponível NotYetAvailable=Ainda não disponivel NotAvailable=Não disponivel Popularity=Popularidade -Categories=Tags/categories -Category=Tag/category +Categories=Etiquetas/Categorias +Category=Etiqueta/Categoria By=Por From=De to=Para @@ -408,6 +411,8 @@ OtherInformations=Outras Informações Quantity=quantidade Qty=Quant. ChangedBy=Modificado por +ApprovedBy=Approved by +ApprovedBy2=Approved by (second approval) ReCalculate=Recalcular ResultOk=Éxito ResultKo=Erro @@ -526,7 +531,7 @@ DateFromTo=De %s a %s DateFrom=A partir de %s DateUntil=Até %s Check=Verificar -Uncheck=Uncheck +Uncheck=Não verificado Internal=Interno External=Externo Internals=Internos @@ -693,9 +698,11 @@ XMoreLines=%s linhas(s) ocultas PublicUrl=URL público 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. +PrintFile=Imprimir Ficheiro %s +ShowTransaction=Mostrar transação +GoIntoSetupToChangeLogo=Vá Início - Configurar - Empresa para alterar o logótipo ou vá a Início - Configurar - Exibir para ocultar. +Deny=Deny +Denied=Denied # 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 a361d438b1efb..07e2d6604ef74 100644 --- a/htdocs/langs/pt_PT/orders.lang +++ b/htdocs/langs/pt_PT/orders.lang @@ -79,7 +79,9 @@ NoOpenedOrders=Nenhum pedido em aberto NoOtherOpenedOrders=Nenhum outro pedido aberto NoDraftOrders=No draft orders OtherOrders=Outros Pedidos -LastOrders=Os %s últimos pedidos +LastOrders=Last %s customer orders +LastCustomerOrders=Last %s customer orders +LastSupplierOrders=Last %s supplier orders LastModifiedOrders=Os %s últimos pedidos modificados LastClosedOrders=Os Ultimos %s Pedidos AllOrders=Todos os Pedidos diff --git a/htdocs/langs/pt_PT/other.lang b/htdocs/langs/pt_PT/other.lang index 058cd2eca8ea5..dfe61017de8d0 100644 --- a/htdocs/langs/pt_PT/other.lang +++ b/htdocs/langs/pt_PT/other.lang @@ -203,6 +203,7 @@ NewKeyWillBe=Your new key to login to software will be ClickHereToGoTo=Clique aqui para ir para %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. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=Adicionar entrada ao calendario diff --git a/htdocs/langs/pt_PT/productbatch.lang b/htdocs/langs/pt_PT/productbatch.lang index c65bb2b7247bc..c86b0a42606db 100644 --- a/htdocs/langs/pt_PT/productbatch.lang +++ b/htdocs/langs/pt_PT/productbatch.lang @@ -1,21 +1,22 @@ # 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=Lote/Série -atleast1batchfield=Eat-by date or Sell-by date or Batch number -batch_number=Número de Lote/Série +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/serial not used) +ProductStatusOnBatchShort=Sim +ProductStatusNotOnBatchShort=Não +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial l_eatby=Eat-by date l_sellby=Sell-by date -DetailBatchNumber=Detalhes de Lote/Série -DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) -printBatch=Lote: %s +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %s printEatby=Eat-by: %s printSellby=Sell-by: %s printQty=Qt.: %d AddDispatchBatchLine=Add a line for Shelf Life dispatching BatchDefaultNumber=Não Definido -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. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang index b4bf887b4dd2c..c138fd4739f4c 100644 --- a/htdocs/langs/pt_PT/projects.lang +++ b/htdocs/langs/pt_PT/projects.lang @@ -14,6 +14,7 @@ MyTasksDesc=Esta visualização está limitada aos projetos ou tarefas em que é 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). +AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. ProjectsArea=Área de Projetos NewProject=Novo Projeto AddProject=Criar Projeto diff --git a/htdocs/langs/pt_PT/stocks.lang b/htdocs/langs/pt_PT/stocks.lang index d3fda31b63ef5..6225f7517c29d 100644 --- a/htdocs/langs/pt_PT/stocks.lang +++ b/htdocs/langs/pt_PT/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Cancelar Envío DeleteSending=Eliminar Envío Stock=Stock Stocks=Stocks +StocksByLotSerial=Stock by lot/serial Movement=Movimento Movements=Movimentos ErrorWarehouseRefRequired=O nome de referencia do armazem é obrigatório @@ -78,6 +79,7 @@ IdWarehouse=Id. armazem DescWareHouse=Descrição armazem LieuWareHouse=Localização armazem WarehousesAndProducts=Armazens e produtos +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=Média dos preços de entrada AverageUnitPricePMP=Média dos preços de entrada SellPriceMin=Vendendo Preço unitário @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/pt_PT/suppliers.lang b/htdocs/langs/pt_PT/suppliers.lang index 81944fcd5a302..6daa756f054ed 100644 --- a/htdocs/langs/pt_PT/suppliers.lang +++ b/htdocs/langs/pt_PT/suppliers.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Fornecedores -AddSupplier=Create a supplier +AddSupplier=Crie um fornecedor SupplierRemoved=Fornecedor Eliminado SuppliersInvoice=Facturas do Fornecedor NewSupplier=Novo Fornecedor @@ -29,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=Deny this order +DenyingThisOrder=Negar esta encomenda ConfirmDenyingThisOrder=Está seguro de querer negar este pedido? ConfirmCancelThisOrder=Está seguro de querer cancelar este pedido? AddCustomerOrder=Criar Pedido do Cliente @@ -39,8 +39,8 @@ AddSupplierInvoice=Criar Factura do Fornecedor ListOfSupplierProductForSupplier=Lista de produtos e preços do fornecedor %s NoneOrBatchFileNeverRan=Nenhum lote ou %s não executou recentemente SentToSuppliers=Enviado para os fornecedores -ListOfSupplierOrders=List of supplier orders -MenuOrdersSupplierToBill=Supplier orders to invoice +ListOfSupplierOrders=Lista das encomendas do fornecedor +MenuOrdersSupplierToBill=Encomendas do fornecedor para faturar 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) +DescNbDaysToDelivery=O maior atraso é exibido entre a lista do produto da encomenda +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/pt_PT/trips.lang b/htdocs/langs/pt_PT/trips.lang index 1733fe86dc25f..79f3954562581 100644 --- a/htdocs/langs/pt_PT/trips.lang +++ b/htdocs/langs/pt_PT/trips.lang @@ -1,30 +1,30 @@ # 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 +ExpenseReport=Relatório de despesas +ExpenseReports=Relatórios de despesas +Trip=Relatório de Despesas +Trips=Relatórios de Despesas +TripsAndExpenses=Relatório de Despesas +TripsAndExpensesStatistics=Estatísticas dos Relatórios de Despesas TripCard=Expense report card AddTrip=Create expense report -ListOfTrips=List of expense report +ListOfTrips=Lista de relatório de despesas ListOfFees=Lista de Taxas -NewTrip=New expense report +NewTrip=Novo relatório de despesas CompanyVisited=Empresa/Instituição Visitada Kilometers=Quilómetros FeesKilometersOrAmout=Quantidade de Quilómetros -DeleteTrip=Delete expense report -ConfirmDeleteTrip=Are you sure you want to delete this expense report ? -ListTripsAndExpenses=List of expense reports -ListToApprove=Waiting for approval +DeleteTrip=Apagar relatório de despesas +ConfirmDeleteTrip=Tem a certeza que deseja apagar este relatório de despesas? +ListTripsAndExpenses=Lista de relatórios de despesas +ListToApprove=A aguardar aprovação ExpensesArea=Expense reports area SearchATripAndExpense=Search an expense report -ClassifyRefunded=Classify 'Refunded' +ClassifyRefunded=Classificar '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 +TripSociete=Informação da Empresa TripSalarie=Informations user TripNDF=Informations expense report DeleteLine=Delete a ligne of the expense report @@ -32,53 +32,51 @@ 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_TRANSPORTATION=Meio de Transporte TF_LUNCH=Alimentação TF_METRO=Metro -TF_TRAIN=Train -TF_BUS=Bus -TF_CAR=Car -TF_PEAGE=Toll -TF_ESSENCE=Fuel +TF_TRAIN=Comboio +TF_BUS=Autocarro +TF_CAR=Carro +TF_PEAGE=Portagem +TF_ESSENCE=Combustível TF_HOTEL=Hostel -TF_TAXI=Taxi +TF_TAXI=Táxi ErrorDoubleDeclaration=You have declared another expense report into a similar date range. -ListTripsAndExpenses=List of expense reports +ListTripsAndExpenses=Lista de relatórios de despesas AucuneNDF=No expense reports found for this criteria AucuneLigne=There is no expense report declared yet -AddLine=Add a line -AddLineMini=Add +AddLine=Adicione uma linha +AddLineMini=Adicionar Date_DEBUT=Period date start Date_FIN=Period date end ModePaiement=Payment mode -Note=Note -Project=Project +Note=Nota +Project=Projeto VALIDATOR=User to inform for approbation -VALIDOR=Approved by -AUTHOR=Recorded by -AUTHORPAIEMENT=Paied by -REFUSEUR=Denied by -CANCEL_USER=Canceled by +VALIDOR=Aprovado por +AUTHOR=Registado por +AUTHORPAIEMENT=Pago por +REFUSEUR=Negado por +CANCEL_USER=Cancelado por -MOTIF_REFUS=Reason -MOTIF_CANCEL=Reason +MOTIF_REFUS=Motivo +MOTIF_CANCEL=Motivo DATE_REFUS=Deny date -DATE_SAVE=Validation date -DATE_VALIDE=Validation date -DateApprove=Approving date -DATE_CANCEL=Cancelation date -DATE_PAIEMENT=Payment date +DATE_SAVE=Data da validação +DATE_VALIDE=Data da validação +DATE_CANCEL=Data do cancelamento +DATE_PAIEMENT=Data de pagamento -Deny=Deny -TO_PAID=Pay -BROUILLONNER=Reopen -SendToValid=Sent to approve -ModifyInfoGen=Edit -ValidateAndSubmit=Validate and submit for approval +TO_PAID=Pagar +BROUILLONNER=Reabrir +SendToValid=Enviar para aprovação +ModifyInfoGen=Editar +ValidateAndSubmit=Validar e submeter para aprovação NOT_VALIDATOR=You are not allowed to approve this expense report NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. @@ -86,41 +84,19 @@ 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 +ValideTrip=Aprovar relatório de despesas ConfirmValideTrip=Are you sure you want to approve this expense report ? -PaidTrip=Pay an expense report +PaidTrip=Pagar um relatório de despesas ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? -CancelTrip=Cancel an expense report +CancelTrip=Cancelar um relatório de despesas 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 +SaveTrip=Validar relatório de despesas 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. +NoTripsToExportCSV=nenhum relatório de despesas para exportar para este período. diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang index b9036a91790c6..ded1fc6c1c4c3 100644 --- a/htdocs/langs/ro_RO/admin.lang +++ b/htdocs/langs/ro_RO/admin.lang @@ -297,10 +297,11 @@ MenuHandlers=Manager Meniu MenuAdmin=Editor Meniu DoNotUseInProduction=Nu utilizaţi în producţie ThisIsProcessToFollow=Acesta este procesul de configurare pentru a: +ThisIsAlternativeProcessToFollow=This is an alternative setup to process: StepNb=Pasul %s FindPackageFromWebSite=Găsiţi un pachet care ofera facilitate dorit (de exemplu, pe site-ul web %s). DownloadPackageFromWebSite=Descărcaţi pachetul %s. -UnpackPackageInDolibarrRoot=Unpack pachet de fişiere în directorul rădăcină Dolibarr lui %s +UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: %s SetupIsReadyForUse=Instalarea este terminat şi Dolibarr este gata pentru a fi utilizate cu această nouă componentă. NotExistsDirect=Nu este definit directorroot alternativ.
InfDirAlt=Începând cu versiunea 3, este posibil să se definească un director radacina alternativ.Director rădăcină vă permite să stocați, în același loc, plug-in-uri și template-uri personalizate.
Doar creaţi un director de la rădăcină Dolibarr (de exemplu: custom).
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Lista de parametri a venit de la tabelul
Sintaxa: 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) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Introduceți un număr de telefon pentru a afișa un link de test ClickToDial Url pentru utilizatorul%s RefreshPhoneLink=Refresh link @@ -540,8 +541,8 @@ Module6000Name=Flux de lucru Module6000Desc=Managementul fluxului de lucru Module20000Name=Managementul cererilor de concedii Module20000Desc=Declară şi urmăreşte cererile de concedii ale angajaţilor -Module39000Name=Lot Produs -Module39000Desc=Management Număr lot sau număr de serie , data de expirare şi vânzare pentru produse +Module39000Name=Product lot +Module39000Desc=Lot or serial number, eat-by and sell-by date management on products Module50000Name=Paybox Module50000Desc=Modul de a oferi o pagina de plata online prin card de credit cu Paybox Module50100Name=Punct de Vanzare @@ -558,8 +559,6 @@ Module59000Name=Marje Module59000Desc=Modul management marje Module60000Name=Comisioane Module60000Desc=Modul management comisioane -Module150010Name=Număr lot, data de expirare şi data vânzare -Module150010Desc=Management Număr lot și data de expirare pentru produse Permission11=Citeşte facturi Permission12=Creaţi/Modificare facturi Permission13=Facturi client nevalidate @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= Rata de RE, în mod implicit atunci când perspectivele c LocalTax2IsNotUsedDescES= În mod implicit propus IRPF este 0. Sfârşitul regulă. LocalTax2IsUsedExampleES= În Spania, liber profesionişti şi specialişti independenţi, care presta servicii şi companiile care au ales sistemul de impozitare de module. LocalTax2IsNotUsedExampleES= În Spania nu sunt afaceri care fac obiectul sistemului de impozitare de module. -CalcLocaltax=Rapoarte -CalcLocaltax1ES=Vânzări - Cumpârări +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Sales - Purchases CalcLocaltax1Desc=Rapoarte Taxe Locale este calcult ca diferenţă dintre taxele locale de vanzare şi taxele locale de cumparare -CalcLocaltax2ES=Achiziţii +CalcLocaltax2=Purchases CalcLocaltax2Desc=Rapoarte Taxe Locale este totalul taxelor locale de cumpărare -CalcLocaltax3ES=Vânzări +CalcLocaltax3=Sales CalcLocaltax3Desc=Rapoarte Taxe Locale este totalul taxelor locale de vanzare LabelUsedByDefault=Eticheta utilizat în mod implicit în cazul în care nu poate fi găsit de traducere pentru codul LabelOnDocuments=Eticheta de pe documente @@ -1018,14 +1017,14 @@ NoEventOrNoAuditSetup=Nici un eveniment de securitate a fost înregistrată înc NoEventFoundWithCriteria=Nici un eveniment de securitate a fost găsit pentru o astfel de criterii de căutare. SeeLocalSendMailSetup=Vedeţi-vă locale sendmail setup BackupDesc=Pentru a face o copie de siguranţă completă de Dolibarr, trebuie să: -BackupDesc2=* Salvaţi conţinutul documentelor director ( %s), care conţine toate fişierele de încărcat şi a generat (puteţi face un zip de exemplu). -BackupDesc3=* Salvaţi conţinutul de baze de date cu un dump. pentru aceasta, puteţi utiliza următoarele asistent. +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=Arhivat directorul trebuie să fie depozitate într-un loc sigur. BackupDescY=Generate de fişier de imagine memorie trebuie să fie depozitate într-un loc sigur. BackupPHPWarning=Backupul nu poate fi garantat cu această metodă. Preferă una precedent RestoreDesc=Pentru a restabili o Dolibarr de rezervă, trebuie să: -RestoreDesc2=* Restaurare fişier arhivă (zip dosar, de exemplu) din directorul de documente pentru a extrage fişierele din copac de documente de un nou director de instalare sau Dolibarr în acest curent documente directoy ( %s). -RestoreDesc3=* Restaurare de date, de la un fişier de imagine memorie de rezervă, în baza de date a noilor Dolibarr instalare sau în baza de date de acest curent de instalare. Atenţie, o dată de restaurare este terminat, trebuie să folosiţi un login / parola, care a existat, atunci când a fost făcută de rezervă, pentru a vă conecta din nou. Pentru a restaura o copie de siguranţă în baza de date a acestui curent de instalare, aveţi posibilitatea să urmaţi acest asistent. +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= Această regulă este obligat la %s către un activat modulul PreviousDumpFiles=Disponibil dump de rezervă fişiere de baze de date @@ -1337,6 +1336,8 @@ LDAPFieldCountry=Ţară LDAPFieldCountryExample=Exemplu: c LDAPFieldDescription=Descriere LDAPFieldDescriptionExample=Exemplu: descriere +LDAPFieldNotePublic=Public Note +LDAPFieldNotePublicExample=Example : publicnote LDAPFieldGroupMembers= Membrii grupului LDAPFieldGroupMembersExample= Exemplu: uniqueMember LDAPFieldBirthdate=Data naşterii @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= Cont pentru a folosi pentru a primi plăţi în numera 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot 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 @@ -1616,3 +1617,8 @@ 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 +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" diff --git a/htdocs/langs/ro_RO/banks.lang b/htdocs/langs/ro_RO/banks.lang index c090ed313267c..70f13d3bc3559 100644 --- a/htdocs/langs/ro_RO/banks.lang +++ b/htdocs/langs/ro_RO/banks.lang @@ -163,3 +163,5 @@ LabelRIB=Etichetă BAN NoBANRecord=Nicio înregistrare BAN DeleteARib=Ștergeți înregistrarea BAN ConfirmDeleteRib=Sigur doriţi să ştergeţi această înregistrare BAN ? +StartDate=Start date +EndDate=End date diff --git a/htdocs/langs/ro_RO/boxes.lang b/htdocs/langs/ro_RO/boxes.lang index d1f0c5e6c658f..14f69356c7280 100644 --- a/htdocs/langs/ro_RO/boxes.lang +++ b/htdocs/langs/ro_RO/boxes.lang @@ -94,3 +94,4 @@ BoxProductDistributionFor=Distribuţia de %s pe %s ForCustomersInvoices=Facturi clienţi ForCustomersOrders=Comenzi clienți ForProposals=Oferte comerciale +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/ro_RO/categories.lang b/htdocs/langs/ro_RO/categories.lang index 56b08765c268a..799c5ab66a15b 100644 --- a/htdocs/langs/ro_RO/categories.lang +++ b/htdocs/langs/ro_RO/categories.lang @@ -1,15 +1,15 @@ # 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=Tag / Categorie +Rubriques=Tag-uri / Categorii +categories=tag-uri / categorii +TheCategorie=Tag / categoria +NoCategoryYet=Niciun tag/categorie de acest tip creată In=În AddIn=Adăugă în modify=modifică Classify=Clasează -CategoriesArea=Tags/Categories area -ProductsCategoriesArea=Products/Services tags/categories area +CategoriesArea=Tag-uri / Categorii +ProductsCategoriesArea=Taguri/ Categorii Produse / Servicii SuppliersCategoriesArea=Suppliers tags/categories area CustomersCategoriesArea=Customers tags/categories area ThirdPartyCategoriesArea=Third parties tags/categories area @@ -25,8 +25,8 @@ 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 +CreateCat=Creați tag / categorie +CreateThisCat=Creați acest tag/ categorie ValidateFields=Validează câmpurile NoSubCat=Nicio subcategorie. SubCatOf=Subcategorie @@ -107,4 +107,4 @@ 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=Show tag/category +ShowCategory=Arată tag / categorie diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang index 18da25a146694..f1d575dc61200 100644 --- a/htdocs/langs/ro_RO/errors.lang +++ b/htdocs/langs/ro_RO/errors.lang @@ -159,14 +159,17 @@ ErrorPriceExpression22=Rezultat negativ '%s' ErrorPriceExpressionInternal=Eroare internă '%s' 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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=Parametri de setare obligatorii nu sunt încă definiţi diff --git a/htdocs/langs/ro_RO/interventions.lang b/htdocs/langs/ro_RO/interventions.lang index 2a22b3277cd36..e85c8eb3c908e 100644 --- a/htdocs/langs/ro_RO/interventions.lang +++ b/htdocs/langs/ro_RO/interventions.lang @@ -50,4 +50,4 @@ ArcticNumRefModelError=Activare nereuşită PacificNumRefModelDesc1=Numărul retrimis sub forma%syymm-nnnn unde yy este anul, mm este luna şi NNNN este o secvenţă continuă şi niciodată 0 PacificNumRefModelError=O fişă de intervenţie începând cu $syymm există deja şi nu este compatibilă cu acest model al succesiunii. Eliminaţi-o sau redenumiţi-o pentru a activa acest modul. PrintProductsOnFichinter=Printează produsele pe fişa intervenţiei -PrintProductsOnFichinterDetails=pentru intervenţiile generate din comenzi +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang index 4a16d72e5b163..66c56e7859281 100644 --- a/htdocs/langs/ro_RO/main.lang +++ b/htdocs/langs/ro_RO/main.lang @@ -220,6 +220,7 @@ Next=Următor Cards=Fişe Card=Fişă Now=Acum +HourStart=Start hour Date=Dată DateAndHour=Date and hour DateStart=Dată început @@ -242,6 +243,8 @@ DatePlanShort=Dată planificată DateRealShort=Dată reală DateBuild=Dată generare raport DatePayment=Data plății +DateApprove=Approving date +DateApprove2=Approving date (second approval) DurationYear=an DurationMonth=lună DurationWeek=săptămână @@ -408,6 +411,8 @@ OtherInformations=Alte informatii Quantity=Cantitate Qty=Cant ChangedBy=Modificat de +ApprovedBy=Approved by +ApprovedBy2=Approved by (second approval) ReCalculate=Recalculează ResultOk=Succes ResultKo=Eşec @@ -696,6 +701,8 @@ 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. +Deny=Deny +Denied=Denied # Week day Monday=Luni Tuesday=Marţi diff --git a/htdocs/langs/ro_RO/orders.lang b/htdocs/langs/ro_RO/orders.lang index f1e88e8c9c2ea..240dec059fb3f 100644 --- a/htdocs/langs/ro_RO/orders.lang +++ b/htdocs/langs/ro_RO/orders.lang @@ -59,12 +59,12 @@ MenuOrdersToBill=Comenzi livrate MenuOrdersToBill2=Comenzi facturabile SearchOrder=Caută Comanda SearchACustomerOrder=Caută o comandă client -SearchASupplierOrder=Search a supplier order +SearchASupplierOrder=Comandă comanda Furnizor ShipProduct=Expediază produs Discount=Discount CreateOrder=Crează Comanda RefuseOrder=Refuză comanda -ApproveOrder=Approve order +ApproveOrder=Aprobă comanda Approve2Order=Approve order (second level) ValidateOrder=Validează comanda UnvalidateOrder=Devalidează comandă @@ -79,7 +79,9 @@ NoOpenedOrders=Nu sunt comenzi deschise NoOtherOpenedOrders=Nu sunt alte comenzi deschise NoDraftOrders=Nicio comandă schiţă OtherOrders=Alte comenzi -LastOrders=Ultimele %s comenzi +LastOrders=Last %s customer orders +LastCustomerOrders=Last %s customer orders +LastSupplierOrders=Last %s supplier orders LastModifiedOrders=Ultimele %s comenzi modificate LastClosedOrders=Ultimele %s comenzi închise AllOrders=Toate comenzile diff --git a/htdocs/langs/ro_RO/other.lang b/htdocs/langs/ro_RO/other.lang index 3daa906f18101..d185c69bb00e0 100644 --- a/htdocs/langs/ro_RO/other.lang +++ b/htdocs/langs/ro_RO/other.lang @@ -203,6 +203,7 @@ NewKeyWillBe=Noua dvs. cheie pentru a vă conecta la software-ul va fi ClickHereToGoTo=Click aici pentru a merge la %s YouMustClickToChange=Trebuie însă mai întâi să faceți clic pe link-ul următor pentru a valida această schimbare a parolei ForgetIfNothing=Dacă nu ați solicitat această schimbare, ignoraţi acest e-mail. Datele dvs. sunt păstrate în condiții de siguranță. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=Adăugaţi în calendar intrare %s diff --git a/htdocs/langs/ro_RO/productbatch.lang b/htdocs/langs/ro_RO/productbatch.lang index 0be80ae35d4a6..3572c593286bd 100644 --- a/htdocs/langs/ro_RO/productbatch.lang +++ b/htdocs/langs/ro_RO/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Foloseşte Lot / Număr de serie -ProductStatusOnBatch=Da(Lot / Număr de serie cerut) -ProductStatusNotOnBatch=Nu(Lot / Număr de serie nefolosit) +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/serial not used) ProductStatusOnBatchShort=Da ProductStatusNotOnBatchShort=Nu -Batch=Lot / Serie -atleast1batchfield=Data expirare sau data de vânzare sau numărul de lot -batch_number=Lot / Număr de serie +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial 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) -printBatch=Lot: %s +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %s printEatby=Expiră : %s printSellby=Vanzare: %s printQty=Cant: %d AddDispatchBatchLine=Adauga o linie pentru Perioada de valabilitate expediere BatchDefaultNumber=Nedefinit -WhenProductBatchModuleOnOptionAreForced=Când modulul de lot / serial este pornit, modul de creștere / scădere a stocului este fortat la ultima alegere și nu poate fi editat. Alte opțiuni pot fi definite după cum doriți. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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=Acest produs nu foloseste numarul de lot / serie diff --git a/htdocs/langs/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang index 075afb106c035..720591129426f 100644 --- a/htdocs/langs/ro_RO/projects.lang +++ b/htdocs/langs/ro_RO/projects.lang @@ -14,6 +14,7 @@ MyTasksDesc=Această vedere este limitată la proiecte sau sarcini pentru care 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). +AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. ProjectsArea=Proiecte NewProject=Proiect nou AddProject=Creare proiect diff --git a/htdocs/langs/ro_RO/stocks.lang b/htdocs/langs/ro_RO/stocks.lang index 394853cb3558c..67ca7b271124f 100644 --- a/htdocs/langs/ro_RO/stocks.lang +++ b/htdocs/langs/ro_RO/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Anulează expediere DeleteSending=Şterge expediere Stock=Stoc Stocks=Stocuri +StocksByLotSerial=Stock by lot/serial Movement=Mişcare Movements=Mişcări ErrorWarehouseRefRequired=Referința Depozit este obligatorie @@ -47,7 +48,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 @@ -78,6 +79,7 @@ IdWarehouse=ID depozit DescWareHouse=Descriere depozit LieuWareHouse=Localizare depozit WarehousesAndProducts=Depozite şi produse +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=Preţul mediu ponderat de intrare AverageUnitPricePMP=Preţul mediu ponderat de intrare SellPriceMin=Preţ vânzare unitar @@ -111,7 +113,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) @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/ro_RO/suppliers.lang b/htdocs/langs/ro_RO/suppliers.lang index b2d32356eee36..9919d03b06eef 100644 --- a/htdocs/langs/ro_RO/suppliers.lang +++ b/htdocs/langs/ro_RO/suppliers.lang @@ -43,4 +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) +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/ro_RO/trips.lang b/htdocs/langs/ro_RO/trips.lang index f32deae86938e..5b8d86ea9b06d 100644 --- a/htdocs/langs/ro_RO/trips.lang +++ b/htdocs/langs/ro_RO/trips.lang @@ -1,126 +1,102 @@ # 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 - -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 +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=Perioada Dată început +Date_FIN=Perioada Dată sfârşit +ModePaiement=Mod plata +Note=Notă +Project=Proiect + +VALIDATOR=Utilizatorul de informat pentru aprobare +VALIDOR=Aprobat de +AUTHOR=Înregistrat de +AUTHORPAIEMENT=Platit de +REFUSEUR=Respins de +CANCEL_USER=Anulat de + +MOTIF_REFUS=Motiv +MOTIF_CANCEL=Motiv + +DATE_REFUS=Dată respingere +DATE_SAVE=Dată validare +DATE_VALIDE=Dată validare +DATE_CANCEL=Data anulare +DATE_PAIEMENT=Data Plata + +TO_PAID=Plăteşte +BROUILLONNER=Redeschide +SendToValid=Trimis la aprobare +ModifyInfoGen=Editare +ValidateAndSubmit=Validareaza și trimite pentru aprobare + +NOT_VALIDATOR=Nu aveti permisiunea să aprobati acest raport de cheltuieli +NOT_AUTHOR=Tu nu esti autorul acestui raport de cheltuieli. Operatiune anulata. + +RefuseTrip=Respinge un raport de cheltuieli +ConfirmRefuseTrip=Sunteți sigur că doriți să respingeti acest raport cheltuieli? + +ValideTrip=Aproba raport de cheltuieli +ConfirmValideTrip=Sunteți sigur că doriți să aprobati acest raport cheltuieli? + +PaidTrip=Plăste un raport de cheltuieli +ConfirmPaidTrip=Sunteţi sigur că doriţi sa clasati acest raport de cheltuieli ca "Platit" ? + +CancelTrip=Anulează un raport de cheltuieli +ConfirmCancelTrip=Sunteți sigur că doriți să anulați acest raport cheltuieli? + +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 - -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_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang index 05a964942aaec..5e15e4c1f4664 100644 --- a/htdocs/langs/ru_RU/admin.lang +++ b/htdocs/langs/ru_RU/admin.lang @@ -268,9 +268,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Не опреде MAIN_MAIL_EMAIL_FROM=Отправитель электронной почты для автоматических писем (по умолчанию в php.ini: %s) MAIN_MAIL_ERRORS_TO=Отправитель электронной почты, используемый для ошибки возвращает письма, отправленные MAIN_MAIL_AUTOCOPY_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_MAIL_AUTOCOPY_PROPOSAL_TO= Отправлять автоматически скрытую копию отправленных предложений по электронной почте +MAIN_MAIL_AUTOCOPY_ORDER_TO= Отправлять автоматически скрытую копию отправленных заказов по электронной почте +MAIN_MAIL_AUTOCOPY_INVOICE_TO= Отправлять автоматически скрытую копию отправленных счетов по электронной почте MAIN_DISABLE_ALL_MAILS=Отключение всех сообщений электронной почты отправок (для испытательных целей или Demos) MAIN_MAIL_SENDMODE=Метод, используемый для передачи сообщения электронной почты MAIN_MAIL_SMTPS_ID=SMTP ID, если требуется проверка подлинности @@ -297,10 +297,11 @@ MenuHandlers=Меню погрузчиков MenuAdmin=Меню редактора DoNotUseInProduction=Не используйте на Production-версии ThisIsProcessToFollow=Это установка для обработки: +ThisIsAlternativeProcessToFollow=This is an alternative setup to process: StepNb=Шаг %s FindPackageFromWebSite=Найти пакет, который обеспечивает функции вы хотите (например, на официальном веб-сайте %s). DownloadPackageFromWebSite=Загрузить пакет %s. -UnpackPackageInDolibarrRoot=Распакуйте пакет Dolibarr файл в корневой каталог %s +UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: %s SetupIsReadyForUse=Установка закончена, и Dolibarr готов к использованию с этого нового компонента. NotExistsDirect=Альтернативная root директория не определена.
InfDirAlt=Начиная с версии 3 стало возможным определение альтернативной root директории. Это позволяет вам хранить в одном и том же месте плагины и пользовательские шаблоны.
Просто создайте директорию в root директории Dolibarr (например, custom).
@@ -389,7 +390,7 @@ ExtrafieldSeparator=Разделитель ExtrafieldCheckBox=флажок ExtrafieldRadio=Переключатель ExtrafieldCheckBoxFromList= Checkbox from table -ExtrafieldLink=Link to an object +ExtrafieldLink=Ссылка на объект 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
... @@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_ 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=Библиотека, использованная для генерации 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) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Введите номер телефона для ссылки с целью тестирования ClickToDial пользователя %s RefreshPhoneLink=Обновить ссылку @@ -495,8 +496,8 @@ Module500Name=Специальные расходы (налоги, социал Module500Desc=Управление специальными расходами, такими как налоги, социальные выплаты, дивиденды и зарплаты Module510Name=Зарплаты Module510Desc=Управление зарплатами сотрудников и платежами -Module520Name=Loan -Module520Desc=Management of loans +Module520Name=Ссуда +Module520Desc=Управление ссудами Module600Name=Уведомления Module600Desc=Отправлять уведомления контактам контрагентов по электронной почте о некоторых бизнес-событиях системы Dolibarr (настройка задана для каждого контрагента) Module700Name=Пожертвования @@ -511,14 +512,14 @@ Module1400Name=Бухгалтерия эксперт Module1400Desc=Бухгалтерия управления для экспертов (двойная сторон) Module1520Name=Создание документов Module1520Desc=Mass mail document generation -Module1780Name=Tags/Categories -Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members) +Module1780Name=Теги/Категории +Module1780Desc=Создание тегов/категорий (товаров, клиентов, поставщиков, контактов или участников) Module2000Name=FCKeditor Module2000Desc=WYSIWYG редактор Module2200Name=Динамическое ценообразование Module2200Desc=Разрешить использовать математические операции для цен Module2300Name=Планировщик Cron -Module2300Desc=Scheduled job management +Module2300Desc=Управление запланированными задачами Module2400Name=Повестка дня Module2400Desc=Деятельность / задачи и программы управления Module2500Name=Электронное управление @@ -540,8 +541,8 @@ Module6000Name=Бизнес-Процесс Module6000Desc=Управление рабочим процессом Module20000Name=Управляение Заявлениями на отпуск Module20000Desc=Объявление и проверка заявлений на отпуск работников -Module39000Name=Серийный номер товара -Module39000Desc=Batch or serial number, eat-by and sell-by date management on products +Module39000Name=Product lot +Module39000Desc=Lot or serial number, eat-by and sell-by date management on products Module50000Name=PayBox Module50000Desc=Модуль предлагает онлайн страницу оплаты с помощью кредитной карты с PayBox Module50100Name=Кассовое @@ -558,8 +559,6 @@ Module59000Name=Наценки Module59000Desc=Модуль управления наценками Module60000Name=Комиссионные Module60000Desc=Модуль для управления комиссионными -Module150010Name=Серийный номер, срок годности и дата продажи -Module150010Desc=Управление Серийным номером, сроком годности и датой продажи товара Permission11=Читать счета Permission12=Создание/Изменение счета-фактуры Permission13=Unvalidate счетов @@ -717,11 +716,11 @@ Permission510=Открыть Зарплаты Permission512=Создать/изменить зарплаты Permission514=Удалить зарплаты Permission517=Экспорт зарплат -Permission520=Read Loans -Permission522=Create/modify loans -Permission524=Delete loans -Permission525=Access loan calculator -Permission527=Export loans +Permission520=Открыть ссуды +Permission522=Создать/изменить ссуды +Permission524=Удалить ссуды +Permission525=Доступ к калькулятору ссуды +Permission527=Экспорт ссуд Permission531=Читать услуги Permission532=Создать / изменить услуг Permission534=Удаление услуги @@ -730,11 +729,11 @@ Permission538=Экспорт услуг Permission701=Читать пожертвований Permission702=Создать / изменить пожертвований Permission703=Удалить пожертвований -Permission771=Read expense reports (own and his subordinates) +Permission771=Просмотр всех отчётов о затратах (собственные и подчинённых пользователей) Permission772=Создание/изменение отчётов о затратах Permission773=Удаление отчётов о затратах -Permission774=Read all expense reports (even for user not subordinates) -Permission775=Approve expense reports +Permission774=Просмотр всех отчётов о затратах (даже для неподчинённых пользователей) +Permission775=Утвердить отчёты о расходах Permission776=Оплата отчётов о затратах Permission779=Экспорт отчётов о затратах Permission1001=Читать запасов @@ -754,7 +753,7 @@ Permission1185=Одобрить поставщик заказов Permission1186=Заказ поставщику заказов Permission1187=Подтвердить получение поставщиками заказов Permission1188=Закрыть поставщик заказов -Permission1190=Approve (second approval) supplier orders +Permission1190=Утвердить (второй уровень) заказы поставщика Permission1201=Получите результат экспорта Permission1202=Создать / Изменить экспорт Permission1231=Читать поставщиком счета-фактуры @@ -767,10 +766,10 @@ Permission1237=Детализированный экспорт заказов п Permission1251=Запуск массового импорта внешних данных в базу данных (загрузка данных) Permission1321=Экспорт клиентом счета-фактуры, качества и платежей Permission1421=Экспорт заказов и атрибуты -Permission23001=Read Scheduled job -Permission23002=Create/update Scheduled job -Permission23003=Delete Scheduled job -Permission23004=Execute Scheduled job +Permission23001=Просмотр Запланированных задач +Permission23002=Создать/обновить Запланированную задачу +Permission23003=Удалить Запланированную задачу +Permission23004=Выполнить запланированную задачу Permission2401=Читать действия (события или задачи), связанные с его счета Permission2402=Создать / изменить / удалить действия (события или задачи), связанные с его счета Permission2403=Читать мероприятия (задачи, события или) других @@ -816,7 +815,7 @@ DictionaryAvailability=Задержка доставки DictionaryOrderMethods=Методы заказов DictionarySource=Происхождение Коммерческих предложений / Заказов DictionaryAccountancyplan=План счетов -DictionaryAccountancysystem=Models for chart of accounts +DictionaryAccountancysystem=Модели для диаграммы счетов DictionaryEMailTemplates=Шаблоны электронных писем SetupSaved=Настройки сохранены BackToModuleList=Вернуться к списку модулей @@ -853,13 +852,13 @@ LocalTax2IsUsedDescES= RE ставка по умолчанию при созда LocalTax2IsNotUsedDescES= По умолчанию предлагается IRPF 0. Конец правления. LocalTax2IsUsedExampleES= В Испании, фрилансеры и независимые специалисты, которые оказывают услуги и компаний, которые выбрали налоговой системы модулей. LocalTax2IsNotUsedExampleES= В Испании они бизнес не облагается налогом на системе модулей. -CalcLocaltax=Отчёты -CalcLocaltax1ES=Продажи - Покупки -CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Покупки -CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Продажи -CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Продажи-Покупки +CalcLocaltax1Desc=Отчёты о местных налогах - это разница между местными налогами с продаж и покупок +CalcLocaltax2=Покупки +CalcLocaltax2Desc=Отчёты о местных налогах - это итог местных налогов с покупок +CalcLocaltax3=Продажи +CalcLocaltax3Desc=Отчёты о местных налогах - это итог местных налогов с продаж LabelUsedByDefault=Метки, используемые по умолчанию, если нет перевода можно найти код LabelOnDocuments=Этикетка на документах NbOfDays=Кол-во дней @@ -1000,7 +999,7 @@ TriggerDisabledAsModuleDisabled=Триггеры в этом файле буду TriggerAlwaysActive=Триггеры в этом файле, всегда активны, независимо являются активированный Dolibarr модули. TriggerActiveAsModuleActive=Триггеры в этом файле действуют как модуль %s включен. GeneratedPasswordDesc=Определить здесь правила, которые вы хотите использовать для создания нового пароля если вы спросите иметь Auto сгенерированного пароля -DictionaryDesc=Define here all reference datas. You can complete predefined value with yours. +DictionaryDesc=Определить здесь все ссылающие данные. Вы можете заполнить заданное значение вашим. ConstDesc=На этой странице можно отредактировать все остальные параметры не доступны в предыдущих страницах. Они защищены параметров для продвинутых разработчиков или troubleshouting. OnceSetupFinishedCreateUsers=Внимание, вы Dolibarr администратора пользователю. Администратор пользователей используются для установки Dolibarr. Для обычного использования Dolibarr, рекомендуется для использования, не администратор пользователя создается из пользователей И группах меню. MiscellaneousDesc=Определить здесь все другие параметры, связанные с безопасностью. @@ -1018,14 +1017,14 @@ NoEventOrNoAuditSetup=Нет безопасности событие было з NoEventFoundWithCriteria=Нет событий безопасности была обнаружена в таких поисковых критериев. SeeLocalSendMailSetup=См. вашей локальной настройки Sendmail BackupDesc=Чтобы сделать полную резервную копию Dolibarr, Вам необходимо: -BackupDesc2=* Сохранить содержимое документов каталог ( %s), который содержит все загруженные и сгенерированные файлы (вы можете сделать ZIP, например). -BackupDesc3=* Сохранить содержимое ваших данных в свалку. Для этого вы можете использовать следующие ассистентом. +BackupDesc2=Сохраняет содержимой папки с документами (%s), которая содержит все загруженные и сгенерированные файлы (вы можете использовать сжатие Zip) +BackupDesc3=Сохраняет содержание вашей базы данных (%s) в файл. Для этого используйте следующей мастер. BackupDescX=Архивированный каталог должны храниться в безопасном месте. BackupDescY=Генерируемый файла дампа следует хранить в надежном месте. BackupPHPWarning=Использование этого метода не гарантирует создание резервной копии. Предыдущий метод предпочтительнее. RestoreDesc=Для восстановления резервной Dolibarr, Вам необходимо: -RestoreDesc2=* Восстановить архив (ZIP-файл, например) документов каталог для извлечения файлов в директории документов нового Dolibarr установка или в текущем каталоге документов ( %s). -RestoreDesc3=* Восстановление данных из резервной копии файла дампа, в базу данных нового Dolibarr установки или в базу данных текущей установки. Внимание, после восстановления будет завершен, вы должны использовать один логин и пароль, которые существовали, когда было сделано резервное копирование, чтобы подключиться снова. Чтобы восстановить резервную копию базы данных в текущей установки, вы можете следить за этим ассистентом. +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=Иvпорт MySQL ForcedToByAModule= Это правило вынуждены %s на активированный модуль PreviousDumpFiles=Наличие резервной копии базы данных дамп файлы @@ -1077,7 +1076,7 @@ TranslationDesc=Выбор языка, видимого на экране, мо TotalNumberOfActivatedModules=Полное количество активированных функций модулей: %s YouMustEnableOneModule=Вы должны включить минимум 1 модуль ClassNotFoundIntoPathWarning=Класс %s не найден по PHP пути -YesInSummer=Yes in summer +YesInSummer=Да летом OnlyFollowingModulesAreOpenedToExternalUsers=Примечание. Следующие модули открыты для внешних пользователей (Какими бы ни были права доступа для этих пользователей) SuhosinSessionEncrypt=Хранилище сессий шифровано системой SUHOSIN ConditionIsCurrently=Текущее состояние %s @@ -1185,8 +1184,8 @@ BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Запрос банковского счё AskPriceSupplierSetup=Настройка модуля запросов цен поставщиков 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) +FreeLegalTextOnAskPriceSupplier=Свободный текст на запросе цены у поставщиков +WatermarkOnDraftAskPriceSupplier=Водяной знак на проекте запроса цены у поставщиков (нет знака, если пустое) BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Приказ 'Management Setup @@ -1337,6 +1336,8 @@ LDAPFieldCountry=Страна LDAPFieldCountryExample=Пример: C LDAPFieldDescription=Описание LDAPFieldDescriptionExample=Пример: описание +LDAPFieldNotePublic=Public Note +LDAPFieldNotePublicExample=Example : publicnote LDAPFieldGroupMembers= Члены группы LDAPFieldGroupMembersExample= Пример: uniqueMember LDAPFieldBirthdate=Дата рождения @@ -1525,9 +1526,9 @@ AgendaSetup=Акции и повестки модуль настройки PasswordTogetVCalExport=Ключевые разрешить экспорт ссылке PastDelayVCalExport=Не экспортировать события старше 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 +AGENDA_DEFAULT_FILTER_TYPE=Устанавливать автоматически этот тип события в фильтр поиска для просмотра повестки дня +AGENDA_DEFAULT_FILTER_STATUS=Устанавливать автоматически этот статус события в фильтр поиска для просмотра повестки дня +AGENDA_DEFAULT_VIEW=Какую вкладку вы хотите открывать по умолчанию, когда выбираете из меню Повестку дня ##### ClickToDial ##### ClickToDialDesc=Этот модуль позволяет добавлять иконки после телефонный номер Dolibarr контакты. Нажмите на эту иконку, будем называть serveur с определенным URL вы указываете ниже. Это может быть использовано для вызова Call Center с системой Dolibarr, что можете позвонить по телефону SIP системы например. ##### Point Of Sales (CashDesk) ##### @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= Учетной записи для использов 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=Закладка Настройка модуля @@ -1566,7 +1567,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 +IfSetToYesDontForgetPermission=Если установлено "Да", не забудьте дать доступ группам или пользователям, разрешённым для повторного утверждения ##### GeoIPMaxmind ##### GeoIPMaxmindSetup=GeoIP MaxMind модуля установки PathToGeoIPMaxmindCountryDataFile=Путь к файлу Maxmind, который требуется для геолокации.
Например,
/usr/local/share/GeoIP/GeoIP.dat
/usr/share/GeoIP/GeoIP.dat @@ -1601,7 +1602,7 @@ NbMajMin=Минимальное количество символов в вре NbNumMin=Минимальное количество цифр NbSpeMin=Минимальное количество специальных символов NbIteConsecutive=Максимальное количество повторяющихся повторяющихся одинаковых символов -NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +NoAmbiCaracAutoGeneration=Не используйте похожие символы ("1","l","i","|","0","O") для автоматической генерации SalariesSetup=Настройка модуля зарплат SortOrder=Порядок сортировки Format=Формат @@ -1611,8 +1612,13 @@ 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 +YouMayFindNotificationsFeaturesIntoModuleNotification=Вы можете найти варианты уведомления по электронной почте, включив и настроив модуль "Уведомления". +ListOfNotificationsPerContact=Список уведомление по контактам +ListOfFixedNotifications=Список основных уведомлений +GoOntoContactCardToAddMore=Перейти на вкладку "Уведомления" контрагентов, чтобы добавить или удалить уведомления для контактов / адресов +Threshold=Порог +BackupDumpWizard=Мастер создания резервной копии базы данных +SomethingMakeInstallFromWebNotPossible=Установка внешних модулей через веб-интерфейс не возможна по следующей причине: +SomethingMakeInstallFromWebNotPossible2=По этой причине, описанный здесь процесс апрейгда - это только шаги, которые может выполнить пользователь с соответствующими правами доступа. +InstallModuleFromWebHasBeenDisabledByFile=Установка внешних модулей из приложения отключена вашим администратором. Вы должны попросить его удалить файл %s, чтобы использовать эту функцию. +ConfFileMuseContainCustom=Установка внешнего модуля из приложения сохраняет файлы модуля в папке %s. Для использования этой папке в системе Dolibarr вы должны настроить conf/conf.php с использованием этой функции
-$dolibarr_main_url_root_alt со значением $dolibarr_main_url_root_alt="/custom"
- $dolibarr_main_document_root_alt со значением "%s/custom" diff --git a/htdocs/langs/ru_RU/banks.lang b/htdocs/langs/ru_RU/banks.lang index 22beeaf591f4e..d5cb38767687a 100644 --- a/htdocs/langs/ru_RU/banks.lang +++ b/htdocs/langs/ru_RU/banks.lang @@ -1,8 +1,8 @@ # Dolibarr language file - Source file is en_US - banks Bank=Банк Banks=Банки -MenuBankCash=Банк / Наличный -MenuSetupBank=Банк / Наличный установки +MenuBankCash=Банк / Наличные +MenuSetupBank=Банк / Наличные установки BankName=Название банка FinancialAccount=Учетная запись FinancialAccounts=Счета @@ -138,7 +138,7 @@ CashBudget=Наличный бюджет PlannedTransactions=Планируемые операции Graph=Графика ExportDataset_banque_1=Банковские операции и счета -ExportDataset_banque_2=Deposit slip +ExportDataset_banque_2=Бланк депозита TransactionOnTheOtherAccount=Сделка с другой учетной записи TransactionWithOtherAccount=Счет передачи PaymentNumberUpdateSucceeded=Оплата числа успешно обновлен @@ -163,3 +163,5 @@ LabelRIB=Метка номера счета BAN NoBANRecord=Нет записи с номером счета BAN DeleteARib=Удалить запись в номером счета BAN ConfirmDeleteRib=Вы точно хотите удалить запись с номером счета BAN ? +StartDate=Дата начала +EndDate=Дата окончания diff --git a/htdocs/langs/ru_RU/boxes.lang b/htdocs/langs/ru_RU/boxes.lang index 7cdba89fb3fcb..4b407c6b0429e 100644 --- a/htdocs/langs/ru_RU/boxes.lang +++ b/htdocs/langs/ru_RU/boxes.lang @@ -94,3 +94,4 @@ BoxProductDistributionFor=Распространение %s для %s ForCustomersInvoices=Счета-фактуры Покупателей ForCustomersOrders=Заказы клиентов ForProposals=Предложения +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/ru_RU/donations.lang b/htdocs/langs/ru_RU/donations.lang index 40e38961a45dc..5d15f57425a82 100644 --- a/htdocs/langs/ru_RU/donations.lang +++ b/htdocs/langs/ru_RU/donations.lang @@ -6,8 +6,8 @@ Donor=Донор Donors=Доноры AddDonation=Создать пожертование NewDonation=Новое пожертвование -DeleteADonation=Delete a donation -ConfirmDeleteADonation=Are you sure you want to delete this donation ? +DeleteADonation=Удалить пожертование +ConfirmDeleteADonation=Вы уверены, что хотите удалить это пожертвование? ShowDonation=Показать пожертование DonationPromise=Обещание пожертвования PromisesNotValid=Неподтвержденные обещания @@ -23,8 +23,8 @@ DonationStatusPaid=Полученное пожертвование DonationStatusPromiseNotValidatedShort=Проект DonationStatusPromiseValidatedShort=Подтверждено DonationStatusPaidShort=Получено -DonationTitle=Donation receipt -DonationDatePayment=Payment date +DonationTitle=Получатель пожертования +DonationDatePayment=Дата платежа ValidPromess=Подтвердить обещание DonationReceipt=Получатель пожертования BuildDonationReceipt=Создать подтверждение получения @@ -40,4 +40,4 @@ FrenchOptions=Настройки для Франции DONATION_ART200=Если вы обеспокоены, показывать выдержку статьи 200 из CGI DONATION_ART238=Если вы обеспокоены, показывать выдержку статьи 238 из CGI DONATION_ART885=Если вы обеспокоены, показывать выдержку статьи 885 из CGI -DonationPayment=Donation payment +DonationPayment=Платёж пожертвования diff --git a/htdocs/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang index 6f7e5cc221045..161c887dc2794 100644 --- a/htdocs/langs/ru_RU/errors.lang +++ b/htdocs/langs/ru_RU/errors.lang @@ -29,7 +29,7 @@ ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type ErrorCustomerCodeRequired=Требуется код клиента ErrorBarCodeRequired=Требуется штрих-код ErrorCustomerCodeAlreadyUsed=Код клиента уже используется -ErrorBarCodeAlreadyUsed=Bar code already used +ErrorBarCodeAlreadyUsed=Штрих-код уже используется ErrorPrefixRequired=Префикс обязателен ErrorUrlNotValid=Адрес веб-сайта является неверным ErrorBadSupplierCodeSyntax=Плохо синтаксис поставщиком код @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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-запрос не удался, ошибка '%s' +ErrorGlobalVariableUpdater1=Неправильный формат JSON '%s' +ErrorGlobalVariableUpdater2=Пропущен параметр '%s' +ErrorGlobalVariableUpdater3=Запрашиваемые данные не найдены в результате +ErrorGlobalVariableUpdater4=Ошибка SOAP-клиента '%s' +ErrorGlobalVariableUpdater5=Не выбрана глобальная переменная +ErrorFieldMustBeANumeric=Field %s must be a numeric value +ErrorFieldMustBeAnInteger=Field %s must be an integer # Warnings WarningMandatorySetupNotComplete=Обязательные параметры не определены diff --git a/htdocs/langs/ru_RU/interventions.lang b/htdocs/langs/ru_RU/interventions.lang index 4801bb8b5544a..7135ca5aa687c 100644 --- a/htdocs/langs/ru_RU/interventions.lang +++ b/htdocs/langs/ru_RU/interventions.lang @@ -49,5 +49,5 @@ ArcticNumRefModelDesc1=Общие номера модели ArcticNumRefModelError=Ошибка при активации PacificNumRefModelDesc1=Вернуться Numero с форматом %syymm-YY, где NNNN это год, мм в месяц, и это NNNN последовательности без перерыва и не вернуться до 0 PacificNumRefModelError=Вмешательство карточки начиная с $ syymm уже и не совместимы с этой моделью последовательности. Удалить или переименовать его, чтобы активировать этот модуль. -PrintProductsOnFichinter=Print products on intervention card -PrintProductsOnFichinterDetails=forinterventions generated from orders +PrintProductsOnFichinter=Выводить товары на карточки посредничества +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang index 3e780d1aa50ab..2ee42a37e2e2c 100644 --- a/htdocs/langs/ru_RU/main.lang +++ b/htdocs/langs/ru_RU/main.lang @@ -220,6 +220,7 @@ Next=Следующий Cards=Карточки Card=Карточка Now=Сейчас +HourStart=Час начала Date=Дата DateAndHour=Дата и час DateStart=Дата начала @@ -242,6 +243,8 @@ DatePlanShort=Дата план. DateRealShort=Дата факт. DateBuild=Дата формирования отчета DatePayment=Дата оплаты +DateApprove=Дата утверждения +DateApprove2=Дата утверждения (повторного) DurationYear=год DurationMonth=месяц DurationWeek=неделя @@ -395,8 +398,8 @@ Available=Доступно NotYetAvailable=Пока не доступно NotAvailable=Не доступно Popularity=Популярность -Categories=Tags/categories -Category=Tag/category +Categories=Теги/категории +Category=Тег/категория By=Автор From=От to=к @@ -408,6 +411,8 @@ OtherInformations=Другая информация Quantity=Количество Qty=Кол-во ChangedBy=Изменен +ApprovedBy=Утверждено +ApprovedBy2=Утверждено (повторно) ReCalculate=Пересчитать ResultOk=Успешно ResultKo=Неудачно @@ -695,7 +700,9 @@ AddBox=Добавить бокс SelectElementAndClickRefresh=Выберите элемент и нажмите обновить PrintFile=Печать файл %s ShowTransaction=Показать транзакции -GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide. +GoIntoSetupToChangeLogo=Используйте Главная-Настройки-Компании для изменения логотипа или Главная-Настройки-Отображение для того, чтобы его скрыть. +Deny=Запретить +Denied=Запрещено # Week day Monday=Понедельник Tuesday=Вторник diff --git a/htdocs/langs/ru_RU/orders.lang b/htdocs/langs/ru_RU/orders.lang index 45a378e74c699..0bda675f6e477 100644 --- a/htdocs/langs/ru_RU/orders.lang +++ b/htdocs/langs/ru_RU/orders.lang @@ -5,7 +5,7 @@ OrderCard=Карточка заказа OrderId=Идентификатор заказа Order=Заказ Orders=Заказы -OrderLine=Заказ линии +OrderLine=Линия заказа OrderFollow=Последующие меры OrderDate=Дата заказа OrderToProcess=Для обработки @@ -65,7 +65,7 @@ Discount=Скидка CreateOrder=Создать заказ RefuseOrder=Отписаться порядка ApproveOrder=Approve order -Approve2Order=Approve order (second level) +Approve2Order=Утвердить заказ (второй уровень) ValidateOrder=Проверка порядка UnvalidateOrder=Unvalidate порядке DeleteOrder=Удалить тему @@ -79,7 +79,9 @@ NoOpenedOrders=Нет открыл заказов NoOtherOpenedOrders=Никакие другие открыли заказов NoDraftOrders=Нет проектов заказов OtherOrders=Другие заказы -LastOrders=Последнее %s заказов +LastOrders=Last %s customer orders +LastCustomerOrders=Последние %s заказов клиента +LastSupplierOrders=Последние %s заказов поставщика LastModifiedOrders=Последнее% с измененными заказов LastClosedOrders=Последнее% с закрытых заказов AllOrders=Все заказы @@ -103,8 +105,8 @@ ClassifyBilled=Классифицировать "Billed" ComptaCard=Бухгалтерия карту DraftOrders=Проект распоряжения RelatedOrders=Похожие заказов -RelatedCustomerOrders=Related customer orders -RelatedSupplierOrders=Related supplier orders +RelatedCustomerOrders=Связанные заказы клиента +RelatedSupplierOrders=Связанные заказы поставщика OnProcessOrders=В процессе заказов RefOrder=Ref. заказ RefCustomerOrder=Ref. Для клиента @@ -121,7 +123,7 @@ PaymentOrderRef=Оплата заказа %s CloneOrder=Клон порядка ConfirmCloneOrder=Вы уверены, что хотите клон этого приказа %s? DispatchSupplierOrder=Прием %s поставщиком для -FirstApprovalAlreadyDone=First approval already done +FirstApprovalAlreadyDone=Первое утверждение уже сделано ##### Types de contacts ##### TypeContact_commande_internal_SALESREPFOLL=Представитель следующие меры для клиентов TypeContact_commande_internal_SHIPPING=Представитель следующие меры судоходства diff --git a/htdocs/langs/ru_RU/other.lang b/htdocs/langs/ru_RU/other.lang index d920d4cb7658e..2b96b19c81323 100644 --- a/htdocs/langs/ru_RU/other.lang +++ b/htdocs/langs/ru_RU/other.lang @@ -17,8 +17,8 @@ Notify_ORDER_SUPPLIER_APPROVE=Поставщик утвердил порядок Notify_ORDER_SUPPLIER_REFUSE=Поставщик порядке отказалась Notify_ORDER_VALIDATE=Kundeordre validert Notify_PROPAL_VALIDATE=Kunden forslaget validert -Notify_PROPAL_CLOSE_SIGNED=Customer propal closed signed -Notify_PROPAL_CLOSE_REFUSED=Customer propal closed refused +Notify_PROPAL_CLOSE_SIGNED=Предложение клиента подписано +Notify_PROPAL_CLOSE_REFUSED=Предложение клиента отклонено Notify_WITHDRAW_TRANSMIT=Передача вывода Notify_WITHDRAW_CREDIT=Кредитный выход Notify_WITHDRAW_EMIT=Isue вывода @@ -27,12 +27,12 @@ Notify_COMPANY_CREATE=Третья партия, созданная Notify_COMPANY_SENTBYMAIL=Mails sent from third party card Notify_PROPAL_SENTBYMAIL=Коммерческое предложение по почте Notify_BILL_PAYED=Клиенту счет оплачен -Notify_BILL_CANCEL=Клиенту счет-фактура отменен +Notify_BILL_CANCEL=Счёт клиента отменён Notify_BILL_SENTBYMAIL=Клиенту счет-фактура высылается по почте Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_SENTBYMAIL=Поставщик поручение, отправленные по почте Notify_BILL_SUPPLIER_VALIDATE=Поставщик проверки счета -Notify_BILL_SUPPLIER_PAYED=Поставщик оплачен счет-фактура +Notify_BILL_SUPPLIER_PAYED= Счёт поставщика оплачен Notify_BILL_SUPPLIER_SENTBYMAIL=Поставщиком счета по почте Notify_BILL_SUPPLIER_CANCELED=Счёт поставщика отменён Notify_CONTRACT_VALIDATE=Договор проверку @@ -48,7 +48,7 @@ Notify_PROJECT_CREATE=Создание проекта Notify_TASK_CREATE=Задача создана Notify_TASK_MODIFY=Задача изменена Notify_TASK_DELETE=Задача удалена -SeeModuleSetup=See setup of module %s +SeeModuleSetup=Посмотреть настройку модуля %s NbOfAttachedFiles=Количество прикрепленных файлов / документов TotalSizeOfAttachedFiles=Общий размер присоединенных файлов / документы MaxSize=Максимальный размер @@ -61,7 +61,7 @@ PredefinedMailTestHtml=Dette er en test mail (ordet testen må være i fe 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__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nВы можете увидеть здесь запрос цены __ASKREF__\n\n\n__PERSONALIZED__С уважением\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__ @@ -171,7 +171,7 @@ EMailTextInvoiceValidated=Счет %s проверены EMailTextProposalValidated=Forslaget %s har blitt validert. EMailTextOrderValidated=Ordren %s har blitt validert. EMailTextOrderApproved=Приказ% с утвержденными -EMailTextOrderValidatedBy=The order %s has been recorded by %s. +EMailTextOrderValidatedBy=Заказ %s записан %s. EMailTextOrderApprovedBy=Приказ %s одобрен %s EMailTextOrderRefused=Приказ %s отказала EMailTextOrderRefusedBy=Приказ %s отказано %s @@ -203,6 +203,7 @@ NewKeyWillBe=Ваш новый ключ для доступа к ПО будет ClickHereToGoTo=Нажмите сюда, чтобы перейти к %s YouMustClickToChange=Однако, вы должны сначала нажать на ссылку для подтверждения изменения пароля ForgetIfNothing=Если вы не запрашивали эти изменения, забудьте про это электронное письмо. Ваши данные в безопасности. +IfAmountHigherThan=Если количество более чем %s ##### Calendar common ##### AddCalendarEntry=Добавить запись в календаре %s diff --git a/htdocs/langs/ru_RU/productbatch.lang b/htdocs/langs/ru_RU/productbatch.lang index 9fd48b424d499..659de0c2a4c63 100644 --- a/htdocs/langs/ru_RU/productbatch.lang +++ b/htdocs/langs/ru_RU/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH ManageLotSerial=Использовать номер партии/серийный номер -ProductStatusOnBatch=Да (требуется номер партии/серийный номер) -ProductStatusNotOnBatch=Нет (номер партии/серийный номер не требуется) +ProductStatusOnBatch=Да (требуется серийный номер/номер партии) +ProductStatusNotOnBatch=Нет (серийный номер/номер партии не используется) ProductStatusOnBatchShort=Да ProductStatusNotOnBatchShort=Нет -Batch=Номер партии/Серийный номер -atleast1batchfield=Дата окончания срока годности или дата продажи или номер партии -batch_number=Номер партии/серийный номер +Batch=Партии/серийный номер +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=номер партии/серийный номер +BatchNumberShort=Lot/Serial l_eatby=Дата окончания срока годности l_sellby=Дата продажи -DetailBatchNumber=Детали по номеру партии/серийному номеру -DetailBatchFormat=Номер партии/Серийный номер: %s - Дата окончания срока годности : %s - Дата продажи: %s (Кол-во : %d) -printBatch=Номер партии: %s +DetailBatchNumber=Детали номера партии/серийного номера +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=номер партии/серийный номер: %s printEatby=Дата окончания срока годности: %s printSellby=Дата продажи: %s printQty=Кол-во:%d AddDispatchBatchLine=Добавить строку Срока годности BatchDefaultNumber=Не задана -WhenProductBatchModuleOnOptionAreForced=Когда модуль Номер партии/Серийный номер включен, увеличение или уменьшение запаса на складе будет сброшено к последнему выбору и не может быть отредактировано. Другие настройки вы можете задавать по вашему желанию. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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=Этот товар не использует номер партии/серийный номер diff --git a/htdocs/langs/ru_RU/products.lang b/htdocs/langs/ru_RU/products.lang index f87ac58206736..6e0115ffc9974 100644 --- a/htdocs/langs/ru_RU/products.lang +++ b/htdocs/langs/ru_RU/products.lang @@ -15,8 +15,8 @@ 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. +MassBarcodeInit=Массовое создание штрих-кода +MassBarcodeInitDesc=Эта страница может быть использована для создания штрих-кодов для объектов, у которых нет штрих-кода. Проверьте перед выполнением настройки модуля штрих-кодов. ProductAccountancyBuyCode=Код бухгалтерии (купли) ProductAccountancySellCode=Код бухгалтерии (продажи) ProductOrService=Товар или Услуга @@ -163,7 +163,7 @@ RecordedServices=Услуги записаны RecordedProductsAndServices=Товары / услуги зарегистрированы PredefinedProductsToSell=Определённый заранее товар для продажи PredefinedServicesToSell=Определённая заранее услуга для продажи -PredefinedProductsAndServicesToSell=Predefined products/services to sell +PredefinedProductsAndServicesToSell=Предустановленные товары/услуги для продажи PredefinedProductsToPurchase=Определённый заранее товар для покупки PredefinedServicesToPurchase=Определённая заранее услуга для покупки PredefinedProductsAndServicesToPurchase=Определённые заранее товары/услуги для покупки @@ -192,9 +192,9 @@ Nature=Природа ProductCodeModel=Ссылка на шаблон товара ServiceCodeModel=Ссылка на шаблон услуги AddThisProductCard=Создать карточку товара -HelpAddThisProductCard=This option allows you to create or clone a product if it does not exist. +HelpAddThisProductCard=Эта опция позволяет вам создавать или клонировать товар, если он не существует. AddThisServiceCard=Создать карточку услуги -HelpAddThisServiceCard=This option allows you to create or clone a service if it does not exist. +HelpAddThisServiceCard=Эта опция позволяет вам создавать или клонировать услугу, если она не существует. CurrentProductPrice=Текущая цена AlwaysUseNewPrice=Всегда использовать текущую цену продукта/услуги AlwaysUseFixedPrice=Использовать фиксированную цену @@ -204,9 +204,9 @@ ProductsDashboard=Товары/услуги в общем UpdateOriginalProductLabel=Modify original label HelpUpdateOriginalProductLabel=Позволяет изменить название товара ### composition fabrication -Building=Production and items dispatchment -Build=Produce -BuildIt=Produce & Dispatch +Building=Отправка продукции и позиций +Build=Произведено +BuildIt=Произведено и отправлено BuildindListInfo=Available quantity for production per warehouse (set it to 0 for no further action) QtyNeed=Кол-во UnitPmp=Net unit VWAP @@ -238,7 +238,7 @@ PriceByCustomer=Различная цена для каждого клиента PriceCatalogue=Уникальная цена для товара/услуги PricingRule=Правила для цен клиента AddCustomerPrice=Добавить цену клиента -ForceUpdateChildPriceSoc=Set same price on customer subsidiaries +ForceUpdateChildPriceSoc=Установить такую же цену для дочерних клиентов PriceByCustomerLog=Цена по журналу клиента MinimumPriceLimit=Минимальная цена не может быть ниже %s MinimumRecommendedPrice=Минимальная рекомендованная цена : %s @@ -248,22 +248,22 @@ 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 +PriceExpressionEditorHelp5=Доступные глобальные значения: +PriceMode=Режим ценообразования PriceNumeric=Номер DefaultPrice=Цена по умолчанию -ComposedProductIncDecStock=Increase/Decrease stock on parent change -ComposedProduct=Sub-product -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 +ComposedProductIncDecStock=Увеличение / уменьшение запаса на складе при изменении источника +ComposedProduct=Под-товар +MinSupplierPrice=Минимальная цена поставщика +DynamicPriceConfiguration=Настройка динамического ценообразования +GlobalVariables=Глобальные переменные +GlobalVariableUpdaters=Обновители глобальных переменных +GlobalVariableUpdaterType0=Данные JSON +GlobalVariableUpdaterHelp0=Анализирует данные JSON из указанной ссылки, VALUE определяет местоположение соответствующего значения, +GlobalVariableUpdaterHelpFormat0=Следующий формат {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"} +GlobalVariableUpdaterType1=Данные модуля WebService +GlobalVariableUpdaterHelp1=Анализирует данные модуля WebService из указанной ссылки, NS задаёт пространство имён, VALUE определяет местоположение соответствующего значения, DATA должно содержать данные для отправки и METHOD вызова метода WS +GlobalVariableUpdaterHelpFormat1=Следующий формат {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}} +UpdateInterval=Интервал обновления (в минутах) +LastUpdated=Последнее обновление +CorrectlyUpdated=Правильно обновлено diff --git a/htdocs/langs/ru_RU/projects.lang b/htdocs/langs/ru_RU/projects.lang index aa51b63ec927f..19094a381aa0e 100644 --- a/htdocs/langs/ru_RU/projects.lang +++ b/htdocs/langs/ru_RU/projects.lang @@ -14,6 +14,7 @@ MyTasksDesc=Эта точка зрения ограничена на проек OnlyOpenedProject=Видны только открытые проекты (проекты на стадии черновика или закрытые проекты не видны) TasksPublicDesc=Эта точка зрения представляет всех проектов и задач, которые могут читать. TasksDesc=Эта точка зрения представляет всех проектов и задач (разрешений пользователей предоставить вам разрешение для просмотра всего). +AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. ProjectsArea=Проекты области NewProject=Новый проект AddProject=Создать проект @@ -71,8 +72,8 @@ ListSupplierOrdersAssociatedProject=Список поставщиков зака ListSupplierInvoicesAssociatedProject=Список поставщиков счетов-фактур, связанных с проектом ListContractAssociatedProject=Перечень договоров, связанных с проектом ListFichinterAssociatedProject=Список мероприятий, связанных с проектом -ListExpenseReportsAssociatedProject=List of expense reports associated with the project -ListDonationsAssociatedProject=List of donations associated with the project +ListExpenseReportsAssociatedProject=Список отчётов о затратах, связанных с проектом +ListDonationsAssociatedProject=Список пожертвований, связанных с проектом ListActionsAssociatedProject=Список мероприятий, связанных с проектом ActivityOnProjectThisWeek=Деятельность по проекту на этой неделе ActivityOnProjectThisMonth=Деятельность по проектам в этом месяце @@ -139,7 +140,7 @@ SearchAProject=Поиск проекта ProjectMustBeValidatedFirst=Проект должен быть сначала подтверждён ProjectDraft=Черновики проектов 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 +InputPerDay=Ввод по дням +InputPerWeek=Ввод по неделе +InputPerAction=Ввод по действиям +TimeAlreadyRecorded=Время, потраченное на уже зафиксировано для этой задачи / дня и пользователя %s diff --git a/htdocs/langs/ru_RU/stocks.lang b/htdocs/langs/ru_RU/stocks.lang index 4a7251f66e248..47b1c19b5308e 100644 --- a/htdocs/langs/ru_RU/stocks.lang +++ b/htdocs/langs/ru_RU/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Отменить отправку DeleteSending=Удалить отправку Stock=Фондовый Stocks=Акции +StocksByLotSerial=Stock by lot/serial Movement=Движение Movements=Перевозкой ErrorWarehouseRefRequired=Склад ссылкой зовут требуется @@ -78,6 +79,7 @@ IdWarehouse=Идентификатор склад DescWareHouse=Описание склада LieuWareHouse=Локализация склад WarehousesAndProducts=Склады и продукты +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=Средняя цена входного AverageUnitPricePMP=Средняя цена входного SellPriceMin=Продажа Цена за штуку @@ -131,4 +133,7 @@ IsInPackage=Contained into package ShowWarehouse=Просмотр склада MovementCorrectStock=Stock content correction for product %s 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Исходный склад должен быть определен здесь, когда модуль "номер партии товара" включён. Он будет использоваться для отображения с номером партии/серийным номером товара для необходимой номера партии/ серийного номера с целью движения товаров. Если вы хотите отправить товары из разных складов, просто сделайте отправку за несколько шагов. +InventoryCodeShort=Inv./Mov. code +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/ru_RU/suppliers.lang b/htdocs/langs/ru_RU/suppliers.lang index 552d52955a590..2e563da07c22f 100644 --- a/htdocs/langs/ru_RU/suppliers.lang +++ b/htdocs/langs/ru_RU/suppliers.lang @@ -43,4 +43,4 @@ ListOfSupplierOrders=Список заказов поставщиков MenuOrdersSupplierToBill=Заказы поставщика для выписки счёта NbDaysToDelivery=Задержка доставки в днях DescNbDaysToDelivery=Самая большая задержка отображается среди списка товаров в заказе -UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group) +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/ru_RU/trips.lang b/htdocs/langs/ru_RU/trips.lang index 90d1d087ec672..a1708340798f9 100644 --- a/htdocs/langs/ru_RU/trips.lang +++ b/htdocs/langs/ru_RU/trips.lang @@ -69,11 +69,9 @@ MOTIF_CANCEL=Причина DATE_REFUS=Дата отклонения DATE_SAVE=Дата проверки DATE_VALIDE=Дата проверки -DateApprove=Дата утверждения DATE_CANCEL=Дата отмены DATE_PAIEMENT=Дата платежа -Deny=Отменить TO_PAID=Оплатить BROUILLONNER=Открыть заново SendToValid=Отправить запрос на утверждение @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Вы точно хотите изменить стату SaveTrip=Проверить отчёт о завтратах ConfirmSaveTrip=Вы точно хотите проверить данный отчёт о затратах? -Synchro_Compta=NDF <-> Учётная запись - -TripSynch=Синхронизация: Расходы <-> текущий счёт -TripToSynch=Примечание: оплата должна быть включена в расчёт -AucuneTripToSynch=Состояние отчёта о затратах не "Оплачен". -ViewAccountSynch=Посмотреть аккаунт - -ConfirmNdfToAccount=Вы уверены, что хотите включить этот отчет о расходах в текущем счете? -ndfToAccount=Отчет о расходах - Интеграция - -ConfirmAccountToNdf=Вы уверены, что хотите удалить этот отчет о расходах текущего счета? -AccountToNdf=Оценка затрат - вывод - -LINE_NOT_ADDED=Номер строки добавил: -NO_PROJECT=Ни один проект не выбран. -NO_DATE=Ни одна дата не выбрана. -NO_PRICE=Цена не указана. - -TripForValid=Подтвердивший -TripForPaid=Плательщик -TripPaid=Плательщик - NoTripsToExportCSV=Нет отчёта о затратах за этот период. diff --git a/htdocs/langs/ru_UA/banks.lang b/htdocs/langs/ru_UA/banks.lang index 81b9d0d2a8e13..2791640ca6c3d 100644 --- a/htdocs/langs/ru_UA/banks.lang +++ b/htdocs/langs/ru_UA/banks.lang @@ -1,5 +1,4 @@ # Dolibarr language file - Source file is en_US - banks -MenuBankCash=Банк / Наличные MenuSetupBank=Банк / Денежные установки FinancialAccount=Счет MainAccount=Главное внимание diff --git a/htdocs/langs/sk_SK/accountancy.lang b/htdocs/langs/sk_SK/accountancy.lang index bb9b358c045f0..623e2060f7101 100644 --- a/htdocs/langs/sk_SK/accountancy.lang +++ b/htdocs/langs/sk_SK/accountancy.lang @@ -1,13 +1,13 @@ # 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=Účtovníctvo +Globalparameters=Globálne parametre +Chartofaccounts=Tabuľka účtov +Fiscalyear=Fiškálne roky +Menuaccount=Účty účtovníctva +Menuthirdpartyaccount=Účty tretích strán +MenuTools=Nástroje ConfigAccountingExpert=Configuration of the module accounting expert Journaux=Journals @@ -24,19 +24,19 @@ Back=Return Definechartofaccounts=Define a chart of accounts Selectchartofaccounts=Select a chart of accounts -Validate=Validate +Validate=Overiť Addanaccount=Add an accounting account AccountAccounting=Accounting account -Ventilation=Breakdown +Ventilation=Rozpis ToDispatch=To dispatch Dispatched=Dispatched -CustomersVentilation=Breakdown customers -SuppliersVentilation=Breakdown suppliers +CustomersVentilation=Rozpis zákazníkov +SuppliersVentilation=Rozpis dodávateľov TradeMargin=Trade margin -Reports=Reports -ByCustomerInvoice=By invoices customers -ByMonth=By Month +Reports=Zostavy +ByCustomerInvoice=Podľa faktúr zákazníkov +ByMonth=Podľa mesiacov NewAccount=New accounting account Update=Update List=List diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang index 8397120c94a02..9e4b7a8aad731 100644 --- a/htdocs/langs/sk_SK/admin.lang +++ b/htdocs/langs/sk_SK/admin.lang @@ -4,10 +4,10 @@ Version=Verzia VersionProgram=Verzia programu VersionLastInstall=Verzia počiatočnej inštalácie VersionLastUpgrade=Verzia poslednej aktualizácie -VersionExperimental=Experimentálne -VersionDevelopment=Vývoj -VersionUnknown=Neznámy -VersionRecommanded=Odporúčané +VersionExperimental=Experimentálna +VersionDevelopment=Vývojárska +VersionUnknown=Neznáma +VersionRecommanded=Odporúčaná FileCheck=Files Integrity FilesMissing=Missing Files FilesUpdated=Updated Files @@ -15,33 +15,33 @@ 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 +SessionSavePath=Adresár pre ukladanie relácií PurgeSessions=Purge relácií ConfirmPurgeSessions=Naozaj chcete, aby očistil všetky relácie? Tým sa odpojí všetky užívateľa (okrem seba). NoSessionListWithThisHandler=Uložiť relácie handler nakonfigurované PHP neumožňuje uviesť všetky spustené relácie. -LockNewSessions=Zámok nové spojenia +LockNewSessions=Zakázať nové pripojenia ConfirmLockNewSessions=Ste si istí, že chcete obmedziť akékoľvek nové Dolibarr spojenie na seba. Iba užívateľské %s budú môcť pripojiť po tom. -UnlockNewSessions=Odstrániť pripojenie zámku -YourSession=Vaše relácie -Sessions=Užívatelia zasadnutie +UnlockNewSessions=Povoliť nové pripojenia +YourSession=Vaša relácia +Sessions=Relácie užívateľov WebUserGroup=Webový server užívateľ / skupina NoSessionFound=Vaše PHP Zdá sa, že nedovolí, aby zoznam aktívnych relácií. Adresár slúži na uloženie sedenie (%s) môžu byť chránené (napr. tým, že oprávnenie OS alebo PHP open_basedir smernice). HTMLCharset=Znaková sada pre generované HTML stránky -DBStoringCharset=Databáza charset pre ukladanie dát -DBSortingCharset=Databáza charset radiť dáta +DBStoringCharset=Znaková sada dát uložených v databáze +DBSortingCharset=Znaková sada databázy pre radenie dát WarningModuleNotActive=Modul %s musí byť povolený WarningOnlyPermissionOfActivatedModules=Iba povolenia týkajúcej sa aktivovaných modulov sú uvedené tu. Môžete aktivovať ďalšie moduly na domovskej-> Nastavenie-> Moduly stránku. -DolibarrSetup=Dolibarr inštalovať alebo aktualizovať -DolibarrUser=Dolibarr užívateľa -InternalUser=Interné užívateľ +DolibarrSetup=Inštalovať alebo aktualizovať Dolibarr +DolibarrUser=Dolibarr užívateľ +InternalUser=Interný užívateľ ExternalUser=Externý užívateľ InternalUsers=Interní používatelia ExternalUsers=Externí používatelia GlobalSetup=Globálne nastavenie GUISetup=Zobraziť SetupArea=Nastavenie plochy -FormToTestFileUploadForm=Formulár pre testovanie upload súborov (podľa nastavenia) -IfModuleEnabled=Poznámka: áno je účinná len vtedy, ak je aktívny modul %s +FormToTestFileUploadForm=Formulár pre testovanie nahrávania súborov (podľa nastavenia) +IfModuleEnabled=Poznámka: áno je účinné len vtedy, ak je modul %s zapnutý RemoveLock=Odstráňte súbor %s ak existuje povoliť použitie aktualizačného nástroja. RestoreLock=Obnovenie súborov %s, s povolením čítať iba ak chcete zakázať akékoľvek použitie aktualizačný nástroj. SecuritySetup=Bezpečnostné nastavenia @@ -57,10 +57,10 @@ ErrorCodeCantContainZero=Kód môže obsahovať hodnotu 0 DisableJavascript=Vypnúť JavaScript a funkcie Ajax (Odporúča sa pre nevidiace osoby alebo pri textových prehliadačoch) ConfirmAjax=Použitie Ajax potvrdenie vyskakovacie okná 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. +UseSearchToSelectCompany=Používať samodoplňovacie polia na výber tretích strán namiesto zoznamu ActivityStateToSelectCompany= Pridať možnosť filtra pre zobrazenie / skrytie thirdparties, ktoré sú v súčasnej dobe v činnosti alebo prestal ju 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). +UseSearchToSelectContact=Používať samodoplňovacie polia na výber kontaktu (namiesto zoznamu) 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=Hľadať filtre možnosti @@ -122,9 +122,9 @@ ModulesOther=Ďalšie moduly ModulesInterfaces=Rozhranie modulov ModulesSpecial=Moduly veľmi konkrétne ParameterInDolibarr=Parameter %s -LanguageParameter=%s Jazykové parametrov +LanguageParameter=Jazykový parameter %s LanguageBrowserParameter=Parameter %s -LocalisationDolibarrParameters=Lokalizácia parametre +LocalisationDolibarrParameters=Parametre lokalizácie ClientTZ=Časová zóna klienta (používateľ) ClientHour=Čas klienta (používateľa) OSTZ=Čas servera @@ -135,7 +135,7 @@ DaylingSavingTime=Letný čas CurrentHour=PHP Čas (server) CompanyTZ=Spoločnosť Time Zone (hlavná spoločnosť) CompanyHour=Spoločnosť Time (hlavná spoločnosť) -CurrentSessionTimeOut=Aktuálne časového limitu relácie +CurrentSessionTimeOut=Časový limit súčasnej relácie YouCanEditPHPTZ=Ak chcete nastaviť iné časové pásmo PHP (nie je podmienkou), môžete skúsiť pridať súbor. Htacces s linkou, ako je tento "TZ setenv Europe / Paris" OSEnv=OS Životné prostredie Box=Box @@ -146,7 +146,7 @@ Position=Pozícia MenusDesc=Ponuky manažéri definovať obsah 2 panely ponúk (horizontálny a vertikálny bar bar). MenusEditorDesc=Menu Editor vám umožní definovať individuálne položky v menu. Použite ho opatrne, aby sa vyhla Dolibarr nestabilné a položky menu trvale nedostupný.
Niektoré moduly pridať položky v menu (v menu Všetko vo väčšine prípadov). Ak ste odstránili niektoré z týchto položiek omylom, môžete ich obnoviť vypnutím a opätovným zapnutím modulu. MenuForUsers=Menu pre užívateľov -LangFile=. Lang súbor +LangFile=súbor .lang System=Systém SystemInfo=Informácie o systéme SystemTools=Systémové nástroje @@ -297,10 +297,11 @@ MenuHandlers=Menu manipulátory MenuAdmin=Menu Editor DoNotUseInProduction=Nepoužívajte vo výrobe ThisIsProcessToFollow=To je nastavený tak, aby proces: +ThisIsAlternativeProcessToFollow=This is an alternative setup to process: StepNb=Krok %s FindPackageFromWebSite=Nájsť balíčka, ktorý obsahuje funkciu, ktorú chcete (napr. na oficiálnych webových stránkach %s). -DownloadPackageFromWebSite=Download package %s. -UnpackPackageInDolibarrRoot=Rozbaľte súbor balíka do %s Dolibarr v koreňovom adresári +DownloadPackageFromWebSite=Stiahnite si balíček %s. +UnpackPackageInDolibarrRoot=Rozbaľte súbor balíka do adresára vyhradeného pre externé moduly: %s SetupIsReadyForUse=Inštalácia je dokončená a Dolibarr je pripravený na použitie s touto nový komponent. NotExistsDirect=Alternatívne koreňový adresár nie je definovaná.
InfDirAlt=Od verzie 3 je možné definovať alternatívny koreň directory.This umožňuje ukladať, rovnaké miesto, plug-iny a vlastné šablóny.
Stačí vytvoriť adresár v koreňovom adresári Dolibarr (napr.: vlastné).
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_ 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=Knižnica použiť na vytvorenie PDF WarningUsingFPDF=Upozornenie: Váš conf.php obsahuje direktívu dolibarr_pdf_force_fpdf = 1. To znamená, že môžete používať knižnicu FPDF pre generovanie PDF súborov. Táto knižnica je stará a nepodporuje mnoho funkcií (Unicode, obraz transparentnosť, azbuka, arabské a ázijské jazyky, ...), takže môže dôjsť k chybám pri generovaní PDF.
Ak chcete vyriešiť tento a majú plnú podporu generovanie PDF, stiahnite si TCPDF knižnice , potom komentár alebo odstrániť riadok $ dolibarr_pdf_force_fpdf = 1, a namiesto neho doplniť $ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir " -LocalTaxDesc=Niektoré krajiny používajú 2 alebo 3 dane na každú faktúru riadku. Ak je to tento prípad, vybrať typ druhom a treťom dane a jej sadzba. Možné typom sú:
1: pobytová taxa platí o produktoch a službách bez DPH (nie je aplikovaný na miestnej dane)
2: pobytová taxa platí o produktoch a službách pred DPH (je vypočítaná na sumu + localtax)
3: pobytová taxa platí na výrobky bez DPH (nie je aplikovaný na miestnej dane)
4: pobytová taxa platí na výrobky pred DPH (je vypočítaná na sumu + localtax)
5: pobytová taxa platí na služby bez DPH (nie je aplikovaný na miestnej dane)
6: pobytová taxa platí o službách pred DPH (je vypočítaná na sumu + localtax) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Zadajte telefónne číslo pre volania ukázať odkaz na test ClickToDial URL pre %s RefreshPhoneLink=Obnoviť odkaz @@ -449,14 +450,14 @@ Module52Name=Zásoby Module52Desc=Skladové hospodárstvo (výrobky) Module53Name=Služby Module53Desc=Správa služieb -Module54Name=Contracts/Subscriptions -Module54Desc=Management of contracts (services or reccuring subscriptions) +Module54Name=Zmluvy / Predplatné +Module54Desc=Správa zmlúv (služieb alebo opakjúcich sa predplatení) Module55Name=Čiarové kódy Module55Desc=Barcode riadenie Module56Name=Telefónia Module56Desc=Telefónia integrácia Module57Name=Trvalé príkazy -Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. +Module57Desc=Správa trvalých príkazov a peňažných výberov. Obsahuje tiež generovanie SEPA súborov pre európske krajiny. Module58Name=ClickToDial Module58Desc=Integrácia ClickToDial systému (Asterisk, ...) Module59Name=Bookmark4u @@ -487,18 +488,18 @@ Module320Name=RSS Feed Module320Desc=Pridať RSS kanál vnútri obrazoviek Dolibarr Module330Name=Záložky Module330Desc=Správa záložiek -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/Príležitosti/Vyhliadky +Module400Desc=Riadenie projektov, príležitostí alebo vyhliadok. Môžete priradiť ľubovoľný prvok (faktúra, objednávka, návrh, intervencia, ...) k projektu a získať priečny pohľad z pohľadu projektu. Module410Name=WebCalendar Module410Desc=WebCalendar integrácia -Module500Name=Special expenses (tax, social contributions, dividends) -Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries +Module500Name=Osobitné náklady (dane, sociálne príspevky, dividendy) +Module500Desc=Správa špeciálnych výdavkov, ako sú dane, sociálny príspevok, dividendy a platy 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) +Module600Desc=Poslať e-mailové upozornenie na niektoré Dolibarr firemné udalosti kontaktom tretích strán (nastavenie definované zvlášť pre každú tretiu stranu) Module700Name=Dary Module700Desc=Darovanie riadenie Module770Name=Expense Report @@ -511,14 +512,14 @@ Module1400Name=Účtovníctvo Module1400Desc=Vedenie účtovníctva (dvojité strany) Module1520Name=Document Generation Module1520Desc=Mass mail document generation -Module1780Name=Tags/Categories -Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members) +Module1780Name=Štítky / Kategórie +Module1780Desc=Vytvorte štítky / kategórie (produkty, zákazníkov, dodávateľov, kontakty alebo členov) 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=Scheduled job management +Module2300Desc=Správa plánovaných úloh Module2400Name=Program rokovania Module2400Desc=Udalosti / úlohy a agendy vedenie Module2500Name=Elektronický Redakčný @@ -540,8 +541,8 @@ 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 +Module39000Name=Product lot +Module39000Desc=Lot or serial number, eat-by and sell-by date management on products Module50000Name=Paybox Module50000Desc=Modul ponúknuť on-line platby kreditnou kartou stránku s Paybox Module50100Name=Bod predaja @@ -558,8 +559,6 @@ Module59000Name=Okraje Module59000Desc=Modul pre správu marže Module60000Name=Provízie Module60000Desc=Modul pre správu provízie -Module150010Name=Batch number, eat-by date and sell-by date -Module150010Desc=batch number, eat-by date and sell-by date management for product Permission11=Prečítajte si zákazníkov faktúry Permission12=Vytvoriť / upraviť zákazníkov faktúr Permission13=Unvalidate zákazníkov faktúry @@ -589,7 +588,7 @@ Permission67=Vývozné intervencie Permission71=Prečítajte členov Permission72=Vytvoriť / upraviť členov Permission74=Zmazať členov -Permission75=Setup types of membership +Permission75=Nastaviť typy členstva Permission76=Export údaje Permission78=Prečítajte si predplatné Permission79=Vytvoriť / upraviť predplatné @@ -612,8 +611,8 @@ Permission106=Export sendings Permission109=Odstrániť sendings Permission111=Prečítajte finančných účtov Permission112=Vytvoriť / upraviť / zmazať a porovnať transakcie -Permission113=Setup financial accounts (create, manage categories) -Permission114=Reconciliate transactions +Permission113=Nastavenie finančných účtov (vytvárať, spravovať kategórie) +Permission114=Reconciliate transakcie Permission115=Vývozných transakcií, a výpisy z účtov Permission116=Prevody medzi účtami Permission117=Spravovanie kontroly dispečingu @@ -630,22 +629,22 @@ Permission151=Prečítajte si trvalé príkazy Permission152=Vytvoriť / upraviť trvalých príkazov žiadosť Permission153=Prevodovka trvalých príkazov príjmy Permission154=Kredit / odmietnuť trvalých príkazov príjmy -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 +Permission161=Prečítajte si zákazky / predplatné +Permission162=Vytvoriť / upraviť zákazky / predplatné +Permission163=Aktivovať službu / predplatné zmluvy +Permission164=Zakázať službu / predplatné zmluvy +Permission165=Odstrániť zmluvy / predplatné +Permission171=Ukázať obchodné cesty a náklady (vlastné i svojich podriadených) +Permission172=Vytvoriť / upraviť obchodné cesty a náklady +Permission173=Odstrániť obchodné cesty a náklady Permission174=Read all trips and expenses -Permission178=Export trips and expenses +Permission178=Export obchodných ciest a nákladov Permission180=Prečítajte si dodávateľa 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=Order or cancel supplier orders +Permission185=Vyvoriť alebo zrušiť dodávateľskú objednávku 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 @@ -696,7 +695,7 @@ Permission300=Prečítajte čiarových kódov Permission301=Vytvoriť / upraviť čiarových kódov Permission302=Odstrániť čiarových kódov Permission311=Prečítajte služby -Permission312=Assign service/subscription to contract +Permission312=Priradiť službu / predplatné k zmluve Permission331=Prečítajte si záložky Permission332=Vytvoriť / upraviť záložky Permission333=Odstránenie záložky @@ -738,8 +737,8 @@ 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 +Permission1002=Vytvoriť / upraviť sklady +Permission1003=Odstrániť sklady Permission1004=Prečítajte skladové pohyby Permission1005=Vytvoriť / upraviť skladové pohyby Permission1101=Prečítajte si dodacie @@ -767,10 +766,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=Read Scheduled job -Permission23002=Create/update Scheduled job -Permission23003=Delete Scheduled job -Permission23004=Execute Scheduled job +Permission23001=Ukázať naplánovanú úlohu +Permission23002=Vytvoriť / upraviť naplánovanú úlohu +Permission23003=Odstrániť naplánovanú úlohu +Permission23004=Spustiť naplánovanú úlohu 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 @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= RE sadzba v predvolenom nastavení pri vytváraní vyhlia LocalTax2IsNotUsedDescES= V predvolenom nastavení je navrhovaná IRPF je 0. Koniec vlády. LocalTax2IsUsedExampleES= V Španielsku, na voľnej nohe a nezávislí odborníci, ktorí poskytujú služby a firmy, ktorí sa rozhodli daňového systému modulov. LocalTax2IsNotUsedExampleES= V Španielsku sú bussines, ktoré nie sú predmetom daňového systému modulov. -CalcLocaltax=Reports -CalcLocaltax1ES=Sales - Purchases +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Sales - Purchases CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Purchases +CalcLocaltax2=Purchases CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Sales +CalcLocaltax3=Sales CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales LabelUsedByDefault=Label používa v predvolenom nastavení, pokiaľ nie je preklad možno nájsť kód LabelOnDocuments=Štítok na dokumenty @@ -1018,14 +1017,14 @@ NoEventOrNoAuditSetup=Žiadna udalosť zabezpečenia bol zaznamenaný ešte. To NoEventFoundWithCriteria=Žiadna udalosť zabezpečenia bol nájdený na týchto vyhľadávacích kritériami. SeeLocalSendMailSetup=Pozrite sa na miestne sendmail nastavenie BackupDesc=Ak chcete vykonať kompletnú zálohu Dolibarr, musíte: -BackupDesc2=* Uložte obsah adresára dokumentov (%s), ktorý obsahuje všetky nahrané a generované súbory (môžete urobiť zips pre príklad). -BackupDesc3=* Ukladanie obsahu databázy do súboru s výpisom. K tomu môžete použiť nasledujúce asistenta. +BackupDesc2=Uložiť obsahu adresára dokumentov (%s), ktorý obsahuje všetky nahraté a vytvorené súbory (môžete napríklad vytvoriť ZIP súbor ). +BackupDesc3=Uložiť obsah databázy (%s) do súboru. Môžete k tomu použiť nasledujúceho asistenta. BackupDescX=Archívne adresár by mal byť skladovaný na bezpečnom mieste. BackupDescY=Vygenerovaný súbor výpisu by sa mal skladovať na bezpečnom mieste. BackupPHPWarning=Záloha nemôže byť garantované s touto metódou. Preferujem predchádzajúce RestoreDesc=Ak chcete obnoviť zálohu Dolibarr, musíte: -RestoreDesc2=* Obnovenie súboru archívu (zip súbor napríklad) v adresári dokumentov získať štruktúre súborov v adresári dokumentov ako nová inštalácia Dolibarr alebo do tejto aktuálnych dokumentoch directoy (%s). -RestoreDesc3=* Obnovenie dát zo záložného súboru výpisu, do databázy novej inštalácii Dolibarr alebo do databázy tejto aktuálnej inštalácii. Pozor, po obnovení dokončené, musíte použiť login / heslo, ktoré existovali, kedy bola vykonaná záloha, znova pripojiť. Ak chcete obnoviť zálohu databázy do tejto aktuálnej inštalácii, môžete sledovať náš pomocník. +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= Toto pravidlo je nútený %s aktivovaným modulom PreviousDumpFiles=Dostupné databázové súbory zálohovanie výpisu @@ -1038,7 +1037,7 @@ SimpleNumRefModelDesc=Vracia referenčné číslo vo formáte nnnn-%syymm kde yy ShowProfIdInAddress=Zobraziť professionnal id s adresami na dokumenty ShowVATIntaInAddress=Skryť DPH Intra num s adresami na dokumentoch TranslationUncomplete=Čiastočný preklad -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=Niektoré jazyky môžu byť čiastočne preložené alebo môžu obsahovať chyby. Ak nejaké nájdete, môžete opraviť jazykové súbory po registrácii na http://transifex.com/projects/p/dolibarr/ . MenuUseLayout=Preveďte vertikálne menu hidable (možnosť javascript nesmie byť zakázaný) MAIN_DISABLE_METEO=Zakázať meteo názor TestLoginToAPI=Otestujte prihlásiť do API @@ -1064,7 +1063,7 @@ ExtraFieldsSupplierOrders=Doplnkové atribúty (objednávky) ExtraFieldsSupplierInvoices=Doplnkové atribúty (faktúry) ExtraFieldsProject=Doplnkové atribúty (projekty) ExtraFieldsProjectTask=Doplnkové atribúty (úlohy) -ExtraFieldHasWrongValue=Attribute %s has a wrong value. +ExtraFieldHasWrongValue=Atribút %s má nesprávnu hodnotu. AlphaNumOnlyCharsAndNoSpace=iba alphanumericals znaky bez medzier AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space SendingMailSetup=Nastavenie sendings e-mailom @@ -1138,7 +1137,7 @@ WebCalServer=Server hosting kalendár databázy WebCalDatabaseName=Názov databázy WebCalUser=Užívateľ prístup k databáze WebCalSetupSaved=WebCalendar nastavenie bolo úspešne uložené. -WebCalTestOk=Connection to server '%s' on database '%s' with user '%s' successful. +WebCalTestOk=Pripojenie k serveru "%s" na databázu '%s' s užívateľom "%s" úspešný. WebCalTestKo1=Pripojenie k "%s" servera úspešná, ale databáza "%s" by nebolo možné dosiahnuť. WebCalTestKo2=Pripojenie k serveru "%s" s užívateľom "%s 'zlyhalo. WebCalErrorConnectOkButWrongDatabase=Pripojenie úspešné, ale databáza nevyzerá byť WebCalendar databázy. @@ -1192,7 +1191,7 @@ BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination o OrdersSetup=Objednať riadenie nastavenia OrdersNumberingModules=Objednávky číslovanie modelov OrdersModelModule=Objednať dokumenty modely -HideTreadedOrders=Hide the treated or cancelled orders in the list +HideTreadedOrders=Skryť vybavrené alebo zrušené objednávky v zozname ValidOrderAfterPropalClosed=Pre potvrdenie objednávky po návrhu užší, umožňuje, aby krok za dočasné poradí FreeLegalTextOnOrders=Voľný text o objednávkach WatermarkOnDraftOrders=Vodoznak na konceptoch objednávok (ak žiadny prázdny) @@ -1210,7 +1209,7 @@ FicheinterNumberingModules=Intervenčné číslovanie modely TemplatePDFInterventions=Intervenčné kariet dokumenty modely WatermarkOnDraftInterventionCards=Vodoznak na dokumentoch intervenčných karty (ak žiadny prázdny) ##### Contracts ##### -ContractsSetup=Contracts/Subscriptions module setup +ContractsSetup=Nastaviť modul Zmluvy / Predplatné ContractsNumberingModules=Zákazky číslovanie moduly TemplatePDFContracts=Contracts documents models FreeLegalTextOnContracts=Free text on contracts @@ -1289,9 +1288,9 @@ LDAPSynchroKO=Nepodarilo synchronizácia testu LDAPSynchroKOMayBePermissions=Nepodarilo synchronizácia test. Skontrolujte, či je prípojka na server je správne nakonfigurovaný a umožňuje LDAP udpates LDAPTCPConnectOK=TCP pripojenie k LDAP servera (Server úspešných = %s, %s port =) LDAPTCPConnectKO=TCP pripojenie k LDAP serveru zlyhalo (Server = %s, Port = %s) -LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s) +LDAPBindOK=Pripojenie / autentikácia k LDAP serveru úspešný (Server =%s, Port =%s Admin =%s, Password =%s) LDAPBindKO=Pripojiť / Authentificate k LDAP serveru zlyhalo (Server = %s, Port = %s, Admin = %s, Password = %s) -LDAPUnbindSuccessfull=Disconnect successful +LDAPUnbindSuccessfull=Odpojenie úspešné LDAPUnbindFailed=Odpojenie zlyhalo LDAPConnectToDNSuccessfull=Pripojenie k DN (%s) úspešná LDAPConnectToDNFailed=Pripojenie k DN (%s) zlyhala @@ -1337,6 +1336,8 @@ LDAPFieldCountry=Krajina LDAPFieldCountryExample=Príklad: c LDAPFieldDescription=Popis LDAPFieldDescriptionExample=Príklad: opis +LDAPFieldNotePublic=Public Note +LDAPFieldNotePublicExample=Example : publicnote LDAPFieldGroupMembers= Členovia skupiny LDAPFieldGroupMembersExample= Príklad: uniqueMember LDAPFieldBirthdate=Dátum narodenia @@ -1348,7 +1349,7 @@ LDAPFieldSidExample=Príklad: objectSID LDAPFieldEndLastSubscription=Dátum ukončenia predplatného LDAPFieldTitle=Post / Funkcia LDAPFieldTitleExample=Príklad: title -LDAPParametersAreStillHardCoded=LDAP parameters are still hardcoded (in contact class) +LDAPParametersAreStillHardCoded=Parametre LDAP sú stále definované napevno (v triede kontakty) LDAPSetupNotComplete=Nastavenie LDAP nie je úplná (prejdite na záložku Iné) LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Žiadny správcu alebo heslo k dispozícii. LDAP prístup budú anonymné a iba pre čítanie. LDAPDescContact=Táto stránka umožňuje definovať atribúty LDAP názov stromu LDAP pre každý údajom o kontaktoch Dolibarr. @@ -1374,7 +1375,7 @@ FilesOfTypeNotCompressed=Súbory typu %s nekomprimuje servera HTTP CacheByServer=Cache serverom CacheByClient=Cache v prehliadači CompressionOfResources=Kompresia odpovedí HTTP -TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers +TestNotPossibleWithCurrentBrowsers=So súčasnými prehliadačmi taká automatická detekcia nie je možná ##### Products ##### ProductSetup=Produkty modul nastavenia ServiceSetup=Služby modul nastavenia @@ -1385,7 +1386,7 @@ ModifyProductDescAbility=Personalizácia popisy produktov vo formách ViewProductDescInFormAbility=Vizualizácia popisy produktov vo formách (inak ako vyskakovacie bubline) ViewProductDescInThirdpartyLanguageAbility=Vizualizácia Popisy výrobkov v thirdparty jazyku 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). +UseSearchToSelectProduct=Použť vyhľadávací formulár pre výber produktu (namiesto rozbaľovacieho zoznamu). UseEcoTaxeAbility=Podpora Eco-taxe (WEEE) SetDefaultBarcodeTypeProducts=Predvolený typ čiarového kódu použiť pre produkty SetDefaultBarcodeTypeThirdParties=Predvolený typ čiarového kódu použiť k tretím osobám @@ -1435,7 +1436,7 @@ MailingEMailFrom=Odosielateľa (From) pre emailov zasielaných e-mailom na modul MailingEMailError=Späť E-mail (chyby-do) e-maily s chybami MailingDelay=Seconds to wait after sending next message ##### Notification ##### -NotificationSetup=EMail notification module setup +NotificationSetup=Nastavenie modulu e-mailových upozornení NotificationEMailFrom=Odosielateľa (From) e-maily zaslané na oznámenia 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 @@ -1466,7 +1467,7 @@ OSCommerceTestOk=Pripojenie k serveru "%s" na databázu "%s" OSCommerceTestKo1=Pripojenie k "%s" servera úspešná, ale databáza "%s" by nebolo možné dosiahnuť. OSCommerceTestKo2=Pripojenie k serveru "%s" s užívateľom "%s 'zlyhalo. ##### Stock ##### -StockSetup=Warehouse module setup +StockSetup=Nastavenie modulu Sklady 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 ##### @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= Predvolený účet použiť pre príjem platieb prostr 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot 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 @@ -1616,3 +1617,8 @@ 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 +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" diff --git a/htdocs/langs/sk_SK/banks.lang b/htdocs/langs/sk_SK/banks.lang index b1c325a49e374..cf7d597da0cd4 100644 --- a/htdocs/langs/sk_SK/banks.lang +++ b/htdocs/langs/sk_SK/banks.lang @@ -163,3 +163,5 @@ LabelRIB=BAN Label NoBANRecord=No BAN record DeleteARib=Delete BAN record ConfirmDeleteRib=Are you sure you want to delete this BAN record ? +StartDate=Start date +EndDate=End date diff --git a/htdocs/langs/sk_SK/boxes.lang b/htdocs/langs/sk_SK/boxes.lang index cf3d5bd660e9b..7e585f6e16818 100644 --- a/htdocs/langs/sk_SK/boxes.lang +++ b/htdocs/langs/sk_SK/boxes.lang @@ -12,13 +12,14 @@ BoxLastProspects=Posledná modifikácia vyhliadky BoxLastCustomers=Posledná modifikácia zákazníkmi BoxLastSuppliers=Posledná modifikácia dodávatelia BoxLastCustomerOrders=Posledné objednávky zákazníkov +BoxLastValidatedCustomerOrders=Last validated customer orders BoxLastBooks=Najnovšie knihy BoxLastActions=Posledná akcia BoxLastContracts=Posledný zmluvy BoxLastContacts=Posledné kontakty / adresy BoxLastMembers=Najnovší členovia BoxFicheInter=Posledný intervencie -# BoxCurrentAccounts=Opened accounts balance +BoxCurrentAccounts=Opened accounts balance BoxSalesTurnover=Obrat BoxTotalUnpaidCustomerBills=Celkové nezaplatené faktúry zákazníka BoxTotalUnpaidSuppliersBills=Celkové nezaplatené faktúry dodávateľa @@ -27,26 +28,29 @@ BoxTitleNbOfCustomers=Počet klientov BoxTitleLastRssInfos=Posledné %s správy z %s BoxTitleLastProducts=Posledné %s modifikované produkty / služby BoxTitleProductsAlertStock=Produkty skladom pohotovosti -BoxTitleLastCustomerOrders=Posledné %s upravené zákaznícke objednávky +BoxTitleLastCustomerOrders=Last %s customer orders +BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders BoxTitleLastSuppliers=Posledné %s zaznamenaný dodávateľa BoxTitleLastCustomers=Posledné %s nahrané zákazníkmi BoxTitleLastModifiedSuppliers=Posledné %s upravené dodávateľa BoxTitleLastModifiedCustomers=Posledné %s modifikované zákazníkmi -BoxTitleLastCustomersOrProspects=Posledné %s modifikované zákazníkmi alebo vyhliadky -BoxTitleLastPropals=Posledné %s zaznamenané návrhy +BoxTitleLastCustomersOrProspects=Last %s customers or prospects +BoxTitleLastPropals=Last %s proposals +BoxTitleLastModifiedPropals=Last %s modified proposals BoxTitleLastCustomerBills=Minulý %s zákazníka faktúry +BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices BoxTitleLastSupplierBills=Minulý %s dodávateľských faktúr -BoxTitleLastProspects=Posledné %s zaznamenaný vyhliadky +BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices BoxTitleLastModifiedProspects=Posledné %s upravené vyhliadky BoxTitleLastProductsInContract=Posledné %s produkty / služby v zmluve -BoxTitleLastModifiedMembers=Posledné %s modifikované členov +BoxTitleLastModifiedMembers=Last %s members BoxTitleLastFicheInter=Posledné %s upravený zásah -BoxTitleOldestUnpaidCustomerBills=Najstaršie %s Nezaplatené faktúry zákazníka -BoxTitleOldestUnpaidSupplierBills=Najstaršie %s Nezaplatené faktúry dodávateľa -# BoxTitleCurrentAccounts=Opened account's balances +BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices +BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices +BoxTitleCurrentAccounts=Opened account's balances BoxTitleSalesTurnover=Obrat -BoxTitleTotalUnpaidCustomerBills=Nezaplatené faktúry zákazníka -BoxTitleTotalUnpaidSuppliersBills=Nezaplatené faktúry dodávateľa +BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices +BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices BoxTitleLastModifiedContacts=Posledné %s upravené kontakty / adresy BoxMyLastBookmarks=Moja posledná %s záložky BoxOldestExpiredServices=Najstarší aktívny vypršala služby @@ -76,7 +80,8 @@ NoContractedProducts=Žiadne produkty / služby zmluvne NoRecordedContracts=Žiadne zaznamenané zmluvy NoRecordedInterventions=Žiadne zaznamenané zásahy BoxLatestSupplierOrders=Najnovšie dodávateľské objednávky -BoxTitleLatestSupplierOrders=%s najnovšie dodávateľské objednávky +BoxTitleLatestSupplierOrders=Last %s supplier orders +BoxTitleLatestModifiedSupplierOrders=Last %s modified supplier orders NoSupplierOrder=Žiadne zaznamenané dodávateľa, aby BoxCustomersInvoicesPerMonth=Zákazníkov faktúry za mesiac BoxSuppliersInvoicesPerMonth=Dodávateľských faktúr za mesiac @@ -89,3 +94,4 @@ BoxProductDistributionFor=Distribúcia %s pre %s ForCustomersInvoices=Zákazníci faktúry ForCustomersOrders=Zákazníci objednávky ForProposals=Návrhy +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/sk_SK/commercial.lang b/htdocs/langs/sk_SK/commercial.lang index 7be1dd39c7fdf..7b31dcc32253f 100644 --- a/htdocs/langs/sk_SK/commercial.lang +++ b/htdocs/langs/sk_SK/commercial.lang @@ -9,8 +9,8 @@ Prospect=Vyhliadka Prospects=Vyhliadky DeleteAction=Odstrániť udalosť / úlohu NewAction=Nová udalosť / úlohu -AddAction=Create event/task -AddAnAction=Create an event/task +AddAction=Vytvoriť udalosť / úlohu +AddAnAction=Vytvoriť udalosť / úlohu AddActionRendezVous=Create a Rendez-vous event Rendez-Vous=Schôdzka ConfirmDeleteAction=Ste si istí, že chcete zmazať túto udalosť / úlohu? @@ -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=Submission of commercial proposal %s -SendOrderRef=Submission of order %s +SendPropalRef=Posielanie obchodného návrhu %s +SendOrderRef=Posielanie objednávky %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=Event assigned to +ActionAffectedTo=Udalosť priradená 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/companies.lang b/htdocs/langs/sk_SK/companies.lang index edca2288e6a63..12b261cf99a70 100644 --- a/htdocs/langs/sk_SK/companies.lang +++ b/htdocs/langs/sk_SK/companies.lang @@ -18,7 +18,7 @@ NewCompany=Nová spoločnosť (vyhliadka, zákazník, dodávateľ) NewThirdParty=Nový tretia strana (vyhliadka, zákazník, dodávateľ) NewSocGroup=Nová skupina spoločností NewPrivateIndividual=Nová súkromná osoba (vyhliadka, zákazník, dodávateľ) -CreateDolibarrThirdPartySupplier=Create a third party (supplier) +CreateDolibarrThirdPartySupplier=Vytvoriť tretiu stranu (dodávateľa) ProspectionArea=Prospekcia plochy SocGroup=Skupina spoločností IdThirdParty=Id treťou stranou @@ -83,7 +83,7 @@ DefaultLang=Predvolený jazyk VATIsUsed=DPH sa používa VATIsNotUsed=DPH sa nepoužíva CopyAddressFromSoc=Vyplňte adresu s thirdparty adresu -NoEmailDefined=There is no email defined +NoEmailDefined=Nie je definovaný e-mail ##### Local Taxes ##### LocalTax1IsUsedES= RE sa používa LocalTax1IsNotUsedES= RE sa nepoužíva @@ -93,7 +93,7 @@ LocalTax1ES=RE LocalTax2ES=IRPF TypeLocaltax1ES=RE Type TypeLocaltax2ES=IRPF Type -TypeES=Type +TypeES=Typ ThirdPartyEMail=%s WrongCustomerCode=Zákaznícky kód neplatný WrongSupplierCode=Dodávateľ kód neplatný @@ -259,8 +259,8 @@ AvailableGlobalDiscounts=Absolútna zľavy DiscountNone=Nikto Supplier=Dodávateľ CompanyList=Spoločnosti Zoznam -AddContact=Pridať kontakt -AddContactAddress=Pridať kontakt / adresa +AddContact=Vytvoriť kontakt +AddContactAddress=Vytvoriť kontakt/adresu EditContact=Upraviť kontakt EditContactAddress=Upraviť kontakt / adresa Contact=Kontakt @@ -268,8 +268,8 @@ ContactsAddresses=Kontakty / adresy NoContactDefinedForThirdParty=Žiadny kontakt definovaná pre túto tretiu stranu NoContactDefined=Žiadny kontakt definované DefaultContact=Predvolené kontakt / adresa -AddCompany=Pridať firmu -AddThirdParty=Pridať tretiu stranu +AddCompany=Vytvoriť spoločnosť +AddThirdParty=Vytvoriť tretiu stranu DeleteACompany=Odstránenie spoločnosť PersonalInformations=Osobné údaje AccountancyCode=Účtovníctvo kód @@ -367,10 +367,10 @@ ExportCardToFormat=Export do formátu karty ContactNotLinkedToCompany=Kontaktu, ktorý nie je spojený s akoukoľvek treťou stranou DolibarrLogin=Dolibarr prihlásenie NoDolibarrAccess=Žiadny prístup Dolibarr -ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties +ExportDataset_company_1=Tretie strany (spoločnosti/nadácie/fyzické osoby) a vlastnosti ExportDataset_company_2=Kontakty a vlastnosti -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=Tretie strany (spoločnosti/nadácie/fyzické osoby) a vlastnosti +ImportDataset_company_2=Kontakty/adresy (tretích strán aj iných) a atribúty ImportDataset_company_3=Bankové spojenie PriceLevel=Cenová hladina DeliveriesAddress=Dodacie adresy @@ -379,8 +379,8 @@ DeliveryAddressLabel=Dodacia adresa štítok DeleteDeliveryAddress=Odstránenie dodaciu adresu ConfirmDeleteDeliveryAddress=Ste si istí, že chcete zmazať túto dodaciu adresu? NewDeliveryAddress=Nová adresa pre doručovanie -AddDeliveryAddress=Pridať adresu -AddAddress=Pridať adresu +AddDeliveryAddress=Vytvoriť adresu +AddAddress=Vytvoriť adresu NoOtherDeliveryAddress=Žiadne náhradné doručenie definovaná adresa SupplierCategory=Dodávateľ kategórie JuridicalStatus200=Nezávislé @@ -397,18 +397,18 @@ YouMustCreateContactFirst=Musíte vytvoriť e-maily, kontakty pre tretie strany ListSuppliersShort=Zoznam dodávateľov ListProspectsShort=Zoznam vyhliadky ListCustomersShort=Zoznam zákazníkov -ThirdPartiesArea=Third parties and contact area +ThirdPartiesArea=Oblasť tretích strán a kontaktov LastModifiedThirdParties=Posledné %s upravené tretej strany UniqueThirdParties=Celkom jedinečné tretích strán InActivity=Otvorené ActivityCeased=Zatvorené ActivityStateFilter=Ekonomické postavenie -ProductsIntoElements=List of products into %s +ProductsIntoElements=Zoznam produktov v %s CurrentOutstandingBill=Current outstanding bill OutstandingBill=Max. za vynikajúce účet OutstandingBillReached=Reached max. for outstanding bill MonkeyNumRefModelDesc=Späť numero vo formáte %syymm-nnnn pre zákazníka kódu a %syymm-NNNN s dodávateľmi kódu, kde yy je rok, MM je mesiac a nnnn je sekvencia bez prerušenia a bez návratu na 0. LeopardNumRefModelDesc=Kód je zadarmo. Tento kód je možné kedykoľvek zmeniť. ManagingDirectors=Manager(s) name (CEO, director, president...) -SearchThirdparty=Search thirdparty -SearchContact=Search contact +SearchThirdparty=Vyhľadať tretiu stranu +SearchContact=Vyhľadať kontakt diff --git a/htdocs/langs/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang index 5a2bb06cb02ca..f5a8be6e516aa 100644 --- a/htdocs/langs/sk_SK/errors.lang +++ b/htdocs/langs/sk_SK/errors.lang @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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=Povinné parametre sú doteraz stanovené diff --git a/htdocs/langs/sk_SK/help.lang b/htdocs/langs/sk_SK/help.lang index e967d3ce5e6b1..f347e9bac3d5d 100644 --- a/htdocs/langs/sk_SK/help.lang +++ b/htdocs/langs/sk_SK/help.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - help -CommunitySupport=Forum / wiki podpora -EMailSupport=E-maily podporu -RemoteControlSupport=Online reálnom čase / vzdialená podpora +CommunitySupport=Forum / wiki pre podporu +EMailSupport=E-mailová podpora +RemoteControlSupport=Online / vzdialená podpora v reálnom čase OtherSupport=Ďalšia podpora ToSeeListOfAvailableRessources=Ak chcete kontaktovať / zobrazenie dostupných zdrojov: ClickHere=Kliknite tu @@ -25,4 +25,4 @@ LinkToGoldMember=Môžete zavolať jednu z predvolených trénera o Dolibarr pre PossibleLanguages=Podporované jazyky MakeADonation=Nápoveda Dolibarr projekt, aby sa darcovstvo SubscribeToFoundation=Nápoveda Dolibarr projekt, prihláste sa do základu -# SeeOfficalSupport=For official Dolibarr support in your language:
%s +SeeOfficalSupport=Oficiálna podpora Dolibarr vo Vašom jayzku: diff --git a/htdocs/langs/sk_SK/install.lang b/htdocs/langs/sk_SK/install.lang index f3ebf70457ab9..8af5284c8c4da 100644 --- a/htdocs/langs/sk_SK/install.lang +++ b/htdocs/langs/sk_SK/install.lang @@ -1,80 +1,80 @@ # Dolibarr language file - Source file is en_US - install InstallEasy=Stačí sledovať inštrukcie krok za krokom. -MiscellaneousChecks=Predpoklady kontrolu -DolibarrWelcome=Vitajte na Dolibarr +MiscellaneousChecks=Kontrola predpokladov +DolibarrWelcome=Vitajte v Dolibarr ConfFileExists=Konfiguračný súbor %s existuje. ConfFileDoesNotExists=Konfiguračný súbor %s neexistuje! ConfFileDoesNotExistsAndCouldNotBeCreated=%s Konfiguračný súbor neexistuje a nemohol byť vytvorený! ConfFileCouldBeCreated=%s Konfiguračný súbor môže byť vytvorený. -ConfFileIsNotWritable=%s Konfiguračný súbor nie je zapisovateľný. Skontrolujte oprávnenia. Pre prvú inštaláciu, musí byť Váš webový server poskytuje môcť písať do tohto súboru počas procesu konfigurácie ("chmod 666" napr na Unixe, ako je OS). -ConfFileIsWritable=Konfiguračný súbor %s zapisovať. +ConfFileIsNotWritable=%s Konfiguračný súbor nie je zapisovateľný. Skontrolujte oprávnenia. Pri prvej inštalácii musí byť Váš webový server schopný zapisovať do tohto súboru počas procesu konfigurácie (napr. "chmod 666" na Unixe, a pod.). +ConfFileIsWritable=Konfiguračný súbor %s je zapisovatelný. ConfFileReload=Aktualizuj všetky informácie z konfiguračného súboru. -PHPSupportSessions=Tento PHP podporuje relácie. -PHPSupportPOSTGETOk=To podporuje PHP premenné POST a GET. -PHPSupportPOSTGETKo=Je možné, že vaša inštalácia PHP nepodporuje premenné POST a / alebo GET. Skontrolujte, či vaša parametra variables_order v php.ini. -PHPSupportGD=Táto podpora PHP GD grafické funkcie. -PHPSupportUTF8=Táto podpora UTF8 PHP funkcie. -PHPMemoryOK=Vaše PHP max relácie pamäte je nastavená na %s. To by malo stačiť. -PHPMemoryTooLow=Vaše PHP max relácie pamäte je nastavená na %s bajtov. To by malo byť príliš nízka. Zmeňte svoj ​​php.ini nastaviť parameter memory_limit na aspoň %s bajtov. -Recheck=Kliknite tu pre viac signifikantný testu -ErrorPHPDoesNotSupportSessions=Vaša inštalácia PHP nepodporuje relácií. Táto funkcia je nutné, aby Dolibarr prácu. Skontrolujte, či vaše nastavenia PHP. -ErrorPHPDoesNotSupportGD=Vaša inštalácia PHP nepodporuje grafické funkcie GD. Nie graf bude k dispozícii. -ErrorPHPDoesNotSupportUTF8=Vaša inštalácia PHP nepodporuje UTF8 funkcie. Dolibarr nemôže pracovať správne. Vyriešiť to pred inštaláciou Dolibarr. +PHPSupportSessions=Vaše PHP podporuje relácie. +PHPSupportPOSTGETOk=Vaše PHP podporuje premenné POST a GET. +PHPSupportPOSTGETKo=Je možné, že vaša inštalácia PHP nepodporuje premenné POST a / alebo GET. Skontrolujte parameter variables_order v php.ini. +PHPSupportGD=Vaše PHP podporuje grafické funkcie GD . +PHPSupportUTF8=Vaše PHP podporuje funkcie UTF8. +PHPMemoryOK=Maximálna pamäť pre relácie v PHP je nastavená na %s. To by malo stačiť. +PHPMemoryTooLow=Maximálna pamäť pre relácie v PHP je nastavená na %s. Môže to byť príliš málo.Upravte súbor php.ini a nastavte parameter memory_limit aspoň na hodnotu %s bajtov. +Recheck=Kliknite sem pre viac signifikantný test +ErrorPHPDoesNotSupportSessions=Vaša inštalácia PHP nepodporuje relácie. Táto funkcia je nutná, aby Dolibarr fungoval. Skontrolujte vaše nastavenia PHP. +ErrorPHPDoesNotSupportGD=Vaša inštalácia PHP nepodporuje grafické funkcie GD. Grafy nebudú k dispozícii. +ErrorPHPDoesNotSupportUTF8=Vaša inštalácia PHP nepodporuje funkcie UTF8. Dolibarr nemôže pracovať správne. Pred inštaláciou Dolibarr treba tento problém vyriešiť. ErrorDirDoesNotExists=Adresár %s neexistuje. -ErrorGoBackAndCorrectParameters=Choďte späť a opraviť zlé parametre. +ErrorGoBackAndCorrectParameters=Choďte späť a opravte chybné parametre. ErrorWrongValueForParameter=Možno ste zadali nesprávnu hodnotu pre parameter "%s". ErrorFailedToCreateDatabase=Nepodarilo sa vytvoriť databázu "%s". ErrorFailedToConnectToDatabase=Nepodarilo sa pripojiť k databáze "%s". -ErrorDatabaseVersionTooLow=Verzia databázy (%s) príliš starý. Verzia %s alebo vyššej. -ErrorPHPVersionTooLow=PHP verzie príliš stará. Verzia %s je nutné. -WarningPHPVersionTooLow=PHP verzie príliš stará. Verzia %s a viac sa očakáva. Táto verzia by mala umožniť inštaláciu, ale nie je podporované. -ErrorConnectedButDatabaseNotFound=Pripojenie k serveru úspešné, ale nie databázy "%s" našiel. +ErrorDatabaseVersionTooLow=Verzia databázy (%s) je príliš stará. Vyžaduje sa verzia %s alebo vyššia. +ErrorPHPVersionTooLow=Verzia PHP je príliš stará. Vyžaduje sa verzia %s. +WarningPHPVersionTooLow=Verzia PHP je príliš stará. Predpokladá sa verzia %s alebo vyššia. Táto verzia by mala umožniť inštaláciu, ale nie je podporovaná. +ErrorConnectedButDatabaseNotFound=Pripojenie k serveru úspešné, ale databáza "%s" sa nenašla. ErrorDatabaseAlreadyExists=Databáza '%s' už existuje. -IfDatabaseNotExistsGoBackAndUncheckCreate=Ak databáza neexistuje, vráťte sa späť a zaškrtneme voľbu "Vytvoriť databázu". -IfDatabaseExistsGoBackAndCheckCreate=Ak databáza už existuje, vráťte sa späť a zrušte začiarknutie políčka "Vytvoriť databázu" možnosť voľby. -WarningBrowserTooOld=Príliš stará verzia prehliadača. Aktualizácia prehliadača na poslednú verziu Firefoxu, Chrome alebo Opera je vysoko odporúčané. -PHPVersion=PHP verzia +IfDatabaseNotExistsGoBackAndUncheckCreate=Ak databáza neexistuje, vráťte sa späť a zaškrtnite voľbu "Vytvoriť databázu". +IfDatabaseExistsGoBackAndCheckCreate=Ak databáza už existuje, vráťte sa späť a zrušte začiarknutie políčka "Vytvoriť databázu". +WarningBrowserTooOld=Príliš stará verzia prehliadača. Aktualizácia prehliadača na poslednú verziu Firefoxu, Chrome alebo Opery je vysoko odporúčaná. +PHPVersion=Verzia PHP YouCanContinue=Môžete pokračovať ... PleaseBePatient=Prosím o chvíľku strpenia ... -License=Použitie licenciu +License=Používa sa licencia ConfigurationFile=Konfiguračný súbor WebPagesDirectory=Adresár, kde sú uložené webové stránky -DocumentsDirectory=Adresár pre ukladanie nahraných a vytvorili dokumenty +DocumentsDirectory=Adresár pre ukladanie nahratých a vytvorených dokumentov URLRoot=URL Root ForceHttps=Vynútiť zabezpečené pripojenie (https) -CheckToForceHttps=Zaškrtnite túto možnosť, ako prinútiť zabezpečené pripojenie (https).
To si vyžaduje, aby webový server je nakonfigurovaný pomocou SSL certifikátu. -DolibarrDatabase=Dolibarr databázy -DatabaseChoice=Databáza výber +CheckToForceHttps=Zaškrtnite túto možnosť, aby sa vyžadovalo zabezpečené pripojenie (https).
Webový server musí byť nastavený na používanie SSL certifikátu. +DolibarrDatabase=Dolibarr databáza +DatabaseChoice=Výber databázy DatabaseType=Typ databázy DriverType=Typ ovládača Server=Server -ServerAddressDescription=Meno alebo IP adresa databázového servera, zvyčajne "localhost", keď je databázový server umiestnený na rovnakom serveri, ako web server -ServerPortDescription=Databázový server portu. Majte prázdne, ak je známy. +ServerAddressDescription=Názov alebo IP adresa databázového servera, zvyčajne "localhost", keď je databázový server umiestnený na rovnakom serveri, ako web server +ServerPortDescription=Port databázového servera. Nechajte prázdne, ak je neznámy. DatabaseServer=Databázový server DatabaseName=Názov databázy -DatabasePrefix=Databáza prefix tabuľky +DatabasePrefix=Prefix tabuliek databázy Login=Prihlásenie AdminLogin=Prihlásenie pre vlastníka databázy Dolibarr. Password=Heslo -PasswordAgain=Heslo znova druhýkrát +PasswordAgain=Zadajte heslo ešte raz AdminPassword=Heslo pre vlastníka databázy Dolibarr. -CreateDatabase=Vytvorenie databázy -CreateUser=Vytvorte majiteľa +CreateDatabase=Vytvoriť databázu +CreateUser=Vytvoriť majiteľa DatabaseSuperUserAccess=Databázový server - prístup Superuser -CheckToCreateDatabase=Zaškrtnite, ak databáza neexistuje a musí byť vytvorený.
V tomto prípade musíte zadať prihlasovacie meno / heslo pre superpoužívateľa účtu v dolnej časti tejto stránky. -CheckToCreateUser=Zaškrtnite, ak vlastník databázy neexistuje a musí byť vytvorený.
V tomto prípade je nutné zvoliť si prihlasovacie meno a heslo a tiež vyplniť login / heslo pre superpoužívateľa účtu v dolnej časti tejto stránky. Ak toto políčko nie je začiarknuté, vlastník databázy a jeho heslá musia existuje. +CheckToCreateDatabase=Zaškrtnite, ak databáza neexistuje a musí byť vytvorená.
V tom prípade musíte zadať prihlasovacie meno / heslo pre administrátora v dolnej časti tejto stránky. +CheckToCreateUser=Zaškrtnite, ak vlastník databázy neexistuje a musí byť vytvorený.
V tomto prípade je nutné zvoliť si prihlasovacie meno a heslo a tiež vyplniť login / heslo administrátora v dolnej časti tejto stránky. Ak toto políčko nie je začiarknuté, vlastník databázy a jeho heslá musia existovať. Experimental=(Experimentálne) -DatabaseRootLoginDescription=Prihlásenie užívateľa povolené vytvárať nové databázy alebo nových používateľov, povinné, ak vaše databázy alebo jeho majiteľ nie je už existuje. -KeepEmptyIfNoPassword=Ponechajte prázdne, ak užívateľ nemá heslo (vyhnúť) +DatabaseRootLoginDescription=Prihlásenie užívateľa oprávneného vytvárať nové databázy alebo nových užívateľov - povinné, ak vaša databáza alebo jej majiteľ ešte neexistuje. +KeepEmptyIfNoPassword=Ponechajte prázdne, ak užívateľ nemá heslo (neodporúčané) SaveConfigurationFile=Uložiť hodnoty ConfigurationSaving=Uloženie konfiguračného súboru ServerConnection=Pripojenie k serveru DatabaseConnection=Pripojenie k databáze DatabaseCreation=Vytvorenie databázy -UserCreation=Vytvorenie používateľa -CreateDatabaseObjects=Databáza objektov tvorba -ReferenceDataLoading=Referenčné načítanie dát -TablesAndPrimaryKeysCreation=Tabuľky a primárne kľúče tvorba +UserCreation=Vytvorenie užívateľa +CreateDatabaseObjects=Tvorba objektov databázy +ReferenceDataLoading=Načítavajú sa referenčné dáta +TablesAndPrimaryKeysCreation=Tvorba tabuliek a primárnych kľúčov CreateTableAndPrimaryKey=Vytvorenie tabuľky %s CreateOtherKeysForTable=Vytvorte cudzie kľúče a indexy pre tabuľky %s OtherKeysCreation=Cudzie kľúče a indexy tvorba @@ -155,8 +155,8 @@ MigrationFinished=Migrácia dokončená LastStepDesc=Posledný krok: Definujte tu prihlasovacie meno a heslo budete používať pre pripojenie k softvéru. Nestrácajte to, ako to je účet, spravovať všetky ostatné. 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) +WarningUpgrade=Varovanie:\nVytvorili ste si už zálohu databázy?\nZ dôvodu chýb v niektorých databázových systémoch (napr. MySQL 5.5.40), časť dát alebo tabuliek sa môže počas tohto procesu stratit. Odporúča sa preto vytvoriť úplnú zálohu databázy pred začatím migrácie.\nStlačte OK pre spustenie migračného procesu... +ErrorDatabaseVersionForbiddenForMigration=Verzia Vašej databázy je %s. Obsahuje kritickú chybu spôsobujúcu stratu dát v prípade zmeny štruktúry databázy; takáto zmena je však migračným procesom vyžadovaná. Migrácia preto nebude povolená kým si nezaktualizujete svoju databázu na vyššiu, opravenú verziu. (Zoznam známych chybných verzií: %s) ######### # upgrade @@ -208,7 +208,7 @@ MigrationProjectTaskTime=Aktualizovať čas strávený v sekundách MigrationActioncommElement=Aktualizovať údaje o činnosti MigrationPaymentMode=Migrácia dát platobného režimu MigrationCategorieAssociation=Migrácia kategórií -MigrationEvents=Migration of events to add event owner into assignement table +MigrationEvents=Migrácia udalostí za účelom pridania vlastníka udalosti do priraďovacej tabuľky -ShowNotAvailableOptions=Show not available options -HideNotAvailableOptions=Hide not available options +ShowNotAvailableOptions=Zobraziť nedostupné možnosti +HideNotAvailableOptions=Skryť nedostupné možnosti diff --git a/htdocs/langs/sk_SK/interventions.lang b/htdocs/langs/sk_SK/interventions.lang index c118974c8e368..ceed4a67bdc92 100644 --- a/htdocs/langs/sk_SK/interventions.lang +++ b/htdocs/langs/sk_SK/interventions.lang @@ -1,53 +1,53 @@ # Dolibarr language file - Source file is en_US - interventions -Intervention=Intervencie -Interventions=Intervencie -InterventionCard=Intervencie karty +Intervention=Zásah +Interventions=Zásahy +InterventionCard=Karta zásahu NewIntervention=Nový zásah -AddIntervention=Create intervention +AddIntervention=Vytvoriť zásah ListOfInterventions=Zoznam zásahov EditIntervention=Upraviť zásah -ActionsOnFicheInter=Akcie zamerané na intervenciu -LastInterventions=Posledný %s zásahy +ActionsOnFicheInter=Akcie zamerané na zásah +LastInterventions=Posledných %s zásahov AllInterventions=Všetky zásahy CreateDraftIntervention=Vytvorte návrh CustomerDoesNotHavePrefix=Zákazník nemá predponu -InterventionContact=Intervencie kontakt +InterventionContact=Kontakt pre zásah DeleteIntervention=Odstrániť zásah ValidateIntervention=Overiť zásah ModifyIntervention=Upraviť zásah -DeleteInterventionLine=Odstrániť intervenčné linku +DeleteInterventionLine=Odstrániť riadok zásahu ConfirmDeleteIntervention=Ste si istí, že chcete zmazať tento zásah? ConfirmValidateIntervention=Ste si istí, že chcete overiť tento zásah pod názvom %s? ConfirmModifyIntervention=Ste si istí, že chcete zmeniť tento zásah? -ConfirmDeleteInterventionLine=Ste si istí, že chcete zmazať tento riadok intervencie? -NameAndSignatureOfInternalContact=Meno a podpis intervencie: -NameAndSignatureOfExternalContact=Meno a podpis objednávateľa: -DocumentModelStandard=Štandardný dokument model pre zásahy -InterventionCardsAndInterventionLines=Intervencia a linky intervencií -InterventionClassifyBilled=Classify "Billed" -InterventionClassifyUnBilled=Classify "Unbilled" +ConfirmDeleteInterventionLine=Ste si istí, že chcete zmazať tento riadok zásahu? +NameAndSignatureOfInternalContact=Meno a podpis zasahujúceho: +NameAndSignatureOfExternalContact=Meno a podpis zákazníka: +DocumentModelStandard=Štandardný model dokumentu pre zásahy +InterventionCardsAndInterventionLines=Zásahy a riadky zásahov +InterventionClassifyBilled=Zaradiť ako "Účtovaný" +InterventionClassifyUnBilled=Zaradiť ako "Neúčtovaný" StatusInterInvoiced=Účtované -RelatedInterventions=Súvisiace zákroky +RelatedInterventions=Súvisiace zásahy ShowIntervention=Zobraziť zásah -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áznam zásahu %s +SendInterventionByMail=Poslať zásah e-mailom +InterventionCreatedInDolibarr=Zásah %s vytvorený +InterventionValidatedInDolibarr=Zásah %s overený +InterventionModifiedInDolibarr=Zásah %s upravený +InterventionClassifiedBilledInDolibarr=Zásah %s bude účtovaný +InterventionClassifiedUnbilledInDolibarr=Zásah %s nebude účtovaný +InterventionSentByEMail=Zásah %s odoslaný e-mailom +InterventionDeletedInDolibarr=Zásah %s odstránený +SearchAnIntervention=Vyhľadať zásah ##### Types de contacts ##### -TypeContact_fichinter_internal_INTERREPFOLL=Zástupca nasledujúce-up zásah -TypeContact_fichinter_internal_INTERVENING=Zásah +TypeContact_fichinter_internal_INTERREPFOLL=Zástupca dohliadajúci na zásah +TypeContact_fichinter_internal_INTERVENING=Zasahujúci TypeContact_fichinter_external_BILLING=Fakturačný kontakt so zákazníkom TypeContact_fichinter_external_CUSTOMER=V nadväznosti kontakt so zákazníkom # Modele numérotation -ArcticNumRefModelDesc1=Generic číslo modelu +ArcticNumRefModelDesc1=Generické číslo modelu ArcticNumRefModelError=Nepodarilo sa aktivovať PacificNumRefModelDesc1=Späť numero vo formáte %syymm-nnnn, kde yy je rok, MM je mesiac a nnnn je sekvencia bez prerušenia a bez vráti na 0. -PacificNumRefModelError=Zásah karta začína s $ syymm už existuje a nie je kompatibilný s týmto modelom sekvencie. Vyberte ju a premenujte ho na aktiváciu tohto modulu. -PrintProductsOnFichinter=Vytlačiť produktov na intervenčnú karty -PrintProductsOnFichinterDetails=forinterventions získané z objednávok +PacificNumRefModelError=Karta zásahu začínajúci sa s $syymm už existuje a nie je kompatibilný s týmto modelom sekvencie. Odstráňte ju alebo ju premenujte pre aktiváciu tohto modulu. +PrintProductsOnFichinter=Vytlačiť produkty na kartu zásahu +PrintProductsOnFichinterDetails=Zásahy vytvorené z objednávok diff --git a/htdocs/langs/sk_SK/languages.lang b/htdocs/langs/sk_SK/languages.lang index 47c46287babd8..14c4979520adf 100644 --- a/htdocs/langs/sk_SK/languages.lang +++ b/htdocs/langs/sk_SK/languages.lang @@ -4,16 +4,16 @@ Language_ar_AR=Arabčina Language_ar_SA=Arabčina Language_bg_BG=Bulharčina Language_bs_BA=Bosniansky -Language_ca_ES=Katalánsky +Language_ca_ES=Katalánčina Language_cs_CZ=Čeština Language_da_DA=Dánčina Language_da_DK=Dánčina -Language_de_DE=Nemec +Language_de_DE=Nemčina Language_de_AT=Nemčina (Rakúsko) -Language_de_CH=German (Switzerland) +Language_de_CH=Nemčina (Švajčiarsko) Language_el_GR=Grék Language_en_AU=Angličtina (Austrália) -Language_en_CA=English (Canada) +Language_en_CA=Angličtina (Kanada) Language_en_GB=Angličtina (Veľká Británia) Language_en_IN=Angličtina (India) Language_en_NZ=Angličtina (Nový Zéland) @@ -21,9 +21,9 @@ Language_en_SA=Angličtina (Saudská Arábia) Language_en_US=Angličtina (Spojené štáty) Language_en_ZA=Angličtina (Južná Afrika) Language_es_ES=Španielčina -Language_es_DO=Spanish (Dominican Republic) +Language_es_DO=Španielčina (Dominikánska Republika) Language_es_AR=Španielčina (Argentína) -Language_es_CL=Spanish (Chile) +Language_es_CL=Španielčina (Chile) Language_es_HN=Španielčina (Honduras) Language_es_MX=Španielčina (Mexiko) Language_es_PY=Španielčina (Paraguaj) @@ -31,28 +31,28 @@ Language_es_PE=Španielčina (Peru) Language_es_PR=Španielčina (Puerto Rico) Language_et_EE=Estónčina Language_eu_ES=Basque -Language_fa_IR=Peržan -Language_fi_FI=Plutvy +Language_fa_IR=Perzština +Language_fi_FI=Fínština Language_fr_BE=Francúzština (Belgicko) Language_fr_CA=Francúzština (Kanada) Language_fr_CH=Francúzština (Švajčiarsko) -Language_fr_FR=Francúzsky +Language_fr_FR=Francúzština Language_fr_NC=Francúzština (Nová Kaledónia) Language_he_IL=Hebrejčina Language_hr_HR=Chorvátsky Language_hu_HU=Maďarčina -Language_id_ID=Indonesian +Language_id_ID=Indonézština Language_is_IS=Islandský Language_it_IT=Taliančina -Language_ja_JP=Japonec +Language_ja_JP=Japonština Language_ko_KR=Kórejčina Language_lt_LT=Litovský Language_lv_LV=Lotyština Language_mk_MK=Macedónsky Language_nb_NO=Nórčina (Bokmål) -Language_nl_BE=Holanďania (Belgicko) -Language_nl_NL=Dutch (Holandsko) -Language_pl_PL=Poľský +Language_nl_BE=Holanďština (Belgicko) +Language_nl_NL=Holandština (Holandsko) +Language_pl_PL=Poľština Language_pt_BR=Portugalčina (Brazília) Language_pt_PT=Portugalčina Language_ro_RO=Rumunčina @@ -62,11 +62,11 @@ Language_tr_TR=Turečtina Language_sl_SI=Slovinčina Language_sv_SV=Švédsky Language_sv_SE=Švédsky -Language_sq_AL=Albanian -Language_sk_SK=Slovenský +Language_sq_AL=Albánčina +Language_sk_SK=Slovenčina Language_th_TH=Thai Language_uk_UA=Ukrajinec Language_uz_UZ=Uzbek -Language_vi_VN=Vietnamec -Language_zh_CN=Číňan +Language_vi_VN=Vietnamčina +Language_zh_CN=Čínština Language_zh_TW=Čínština (tradičná) diff --git a/htdocs/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang index 4efea27615ace..bc03cc57f23eb 100644 --- a/htdocs/langs/sk_SK/main.lang +++ b/htdocs/langs/sk_SK/main.lang @@ -24,20 +24,20 @@ FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p FormatDateHourTextShort=%b %d, %Y, %I:%M %p FormatDateHourText=%B %d, %Y, %I:%M %p DatabaseConnection=Pripojenie k databáze -NoTranslation=Preklad nie je +NoTranslation=Preklad neexistuje NoRecordFound=Nebol nájdený žiadny záznam NoError=Žiadna chyba Error=Chyba -ErrorFieldRequired=Field "%s 'je povinné -ErrorFieldFormat=Field "%s" má zlú hodnotu +ErrorFieldRequired=Pole '%s 'je povinné +ErrorFieldFormat=Pole "%s" má nesprávnu hodnotu ErrorFileDoesNotExists=Súbor %s neexistuje ErrorFailedToOpenFile=Nepodarilo sa otvoriť súbor %s -ErrorCanNotCreateDir=Nemožno vytvoriť dir %s -ErrorCanNotReadDir=Nemožno čítať dir %s -ErrorConstantNotDefined=Parameter %s nie je definované -ErrorUnknown=Unknown error +ErrorCanNotCreateDir=Nemožno vytvoriť adresár %s +ErrorCanNotReadDir=Nemožno čítať adresár %s +ErrorConstantNotDefined=Parameter %s nie je definovaný +ErrorUnknown=Neznáma chyba ErrorSQL=Chyba SQL -ErrorLogoFileNotFound=Logo súbor '%s' nebol nájdený +ErrorLogoFileNotFound=Súbor loga '%s' nebol nájdený ErrorGoToGlobalSetup=Prejsť do spoločnosti / Nadácia nastavenia Ak chcete tento ErrorGoToModuleSetup=Choď na Nastavenie modulu to opraviť ErrorFailedToSendMail=Nepodarilo sa odoslať poštu (vysielač, prijímač = %s = %s) @@ -59,13 +59,13 @@ ErrorCantLoadUserFromDolibarrDatabase=Nepodarilo sa nájsť užívateľa %s%s desatinných miest. @@ -141,7 +141,7 @@ Cancel=Zrušiť Modify=Upraviť Edit=Upraviť Validate=Potvrdiť -ValidateAndApprove=Validate and Approve +ValidateAndApprove=Overiť a schváliť ToValidate=Ak chcete overiť Save=Uložiť SaveAs=Uložiť ako @@ -159,7 +159,7 @@ Search=Vyhľadávanie SearchOf=Vyhľadávanie Valid=Platný Approve=Schvaľovať -Disapprove=Disapprove +Disapprove=Neschváliť ReOpen=Znovu otvoriť Upload=Odoslať súbor ToLink=Odkaz @@ -173,7 +173,7 @@ User=Užívateľ Users=Užívatelia Group=Skupina Groups=Skupiny -NoUserGroupDefined=No user group defined +NoUserGroupDefined=Nie je definovaná skupina užívateľov Password=Heslo PasswordRetype=Zadajte znovu heslo NoteSomeFeaturesAreDisabled=Všimnite si, že mnoho funkcií / modules sú zakázané v tejto ukážke. @@ -220,8 +220,9 @@ Next=Ďalšie Cards=Karty Card=Karta Now=Teraz +HourStart=Start hour Date=Dátum -DateAndHour=Date and hour +DateAndHour=Dátum a hodina DateStart=Dátum začiatku DateEnd=Dátum ukončenia DateCreation=Dátum vytvorenia @@ -242,6 +243,8 @@ DatePlanShort=Dátum hobľované DateRealShort=Dátum skutočný. DateBuild=Správa dátum zostavenia DatePayment=Dátum platby +DateApprove=Approving date +DateApprove2=Approving date (second approval) DurationYear=rok DurationMonth=mesiac DurationWeek=týždeň @@ -264,12 +267,12 @@ days=dni Hours=Hodiny Minutes=Zápis Seconds=Sekundy -Weeks=Weeks +Weeks=Týždne Today=Dnes Yesterday=Včera Tomorrow=Zajtra -Morning=Morning -Afternoon=Afternoon +Morning=Ráno +Afternoon=Popoludní Quadri=Quadri MonthOfDay=Mesiaca odo dňa HourShort=H @@ -349,7 +352,7 @@ FullList=Plný zoznam Statistics=Štatistika OtherStatistics=Ďalšie štatistiky Status=Postavenie -Favorite=Favorite +Favorite=Obľúbené ShortInfo=Info. Ref=Ref ExternalRef=Ref. extern @@ -367,7 +370,7 @@ ActionNotApplicable=Nevzťahuje sa ActionRunningNotStarted=Ak chcete začať ActionRunningShort=Začíname ActionDoneShort=Hotový -ActionUncomplete=Uncomplete +ActionUncomplete=Neúplné CompanyFoundation=Spoločnosti / Nadácia ContactsForCompany=Kontakty pre túto tretiu stranu ContactsAddressesForCompany=Kontakty / adries tretím stranám tejto @@ -376,7 +379,7 @@ ActionsOnCompany=Akcia o tejto tretej osobe ActionsOnMember=Akcia o tomto členovi NActions=%s udalosti NActionsLate=%s neskoro -RequestAlreadyDone=Request already recorded +RequestAlreadyDone=Požiadavka už bola zaznamenaná Filter=Filter RemoveFilter=Vyberte filter ChartGenerated=Graf generovaný @@ -395,8 +398,8 @@ Available=Dostupný NotYetAvailable=Zatiaľ nie je k dispozícii NotAvailable=Nie je k dispozícii Popularity=Popularita -Categories=Tags/categories -Category=Tag/category +Categories=Štítky/kategórie +Category=Štítok/kategória By=Podľa From=Z to=na @@ -408,6 +411,8 @@ OtherInformations=Ostatné informácie Quantity=Množstvo Qty=Množstvo ChangedBy=Zmenil +ApprovedBy=Approved by +ApprovedBy2=Approved by (second approval) ReCalculate=Prepočítať ResultOk=Úspech ResultKo=Zlyhanie @@ -520,13 +525,13 @@ NbOfCustomers=Počet zákazníkov NbOfLines=Počet riadkov NbOfObjects=Počet objektov NbOfReferers=Počet Odkazovače -Referers=Refering objects +Referers=Prepojené objekty TotalQuantity=Celkové množstvo DateFromTo=Od %s na %s DateFrom=Od %s DateUntil=Do %s Check=Kontrola -Uncheck=Uncheck +Uncheck=Odznačiť Internal=Vnútorné External=Externé Internals=Vnútorné @@ -565,7 +570,7 @@ MailSentBy=E-mail zaslaná TextUsedInTheMessageBody=E-mail telo SendAcknowledgementByMail=Poslať Ack. e-mailom NoEMail=Žiadny e-mail -NoMobilePhone=No mobile phone +NoMobilePhone=Žiadny mobil Owner=Majiteľ DetectedVersion=Zistená verzia FollowingConstantsWillBeSubstituted=Nasledujúci konštanty bude nahradený zodpovedajúcou hodnotou. @@ -591,7 +596,7 @@ TotalWoman=Celkový TotalMan=Celkový NeverReceived=Nikdy nedostal Canceled=Zrušený -YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary +YouCanChangeValuesForThisListFromDictionarySetup=Hodnoty tohto zoznamu môžete zmenit z menu Nastavenie - Slovník Color=Farba Documents=Pripojené súbory DocumentsNb=Pripojené súbory (%s) @@ -620,8 +625,8 @@ Notes=Poznámky AddNewLine=Pridať nový riadok AddFile=Pridať súbor ListOfFiles=Zoznam dostupných súborov -FreeZone=Free entry -FreeLineOfType=Free entry of type +FreeZone=Voľný vstup +FreeLineOfType=Voľný vstup typu CloneMainAttributes=Clone objekt s jeho hlavnými atribútmi PDFMerge=PDF Merge Merge=Spojiť @@ -655,10 +660,10 @@ IM=Instant messaging NewAttribute=Nový atribút AttributeCode=Atribút kód OptionalFieldsSetup=Extra nastavenia atribútov -URLPhoto=URL of photo/logo +URLPhoto=URL fotky/loga SetLinkToThirdParty=Odkaz na inej tretej osobe CreateDraft=Vytvorte návrh -SetToDraft=Back to draft +SetToDraft=Späť na návrh ClickToEdit=Kliknutím možno upraviť ObjectDeleted=Objekt %s zmazaný ByCountry=Podľa krajiny @@ -666,7 +671,7 @@ ByTown=Do mesta ByDate=Podľa dátumu ByMonthYear=Tým mesiac / rok ByYear=Do roku -ByMonth=By month +ByMonth=Podľa mesiaca ByDay=Vo dne BySalesRepresentative=Do obchodného zástupcu LinkedToSpecificUsers=V súvislosti s konkrétnym kontakte s užívateľom @@ -684,18 +689,20 @@ toward=k Access=Prístup HelpCopyToClipboard=Použite Ctrl + C skopírujte do schránky SaveUploadedFileWithMask=Uloženie súboru na serveri s názvom "%s" (inak "%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 -GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide. +OriginFileName=Pôvodný názov súboru +SetDemandReason=Určiť zdroj +SetBankAccount=Definovať bankový účet +AccountCurrency=Mena účtu +ViewPrivateNote=Zobraziť poznámky +XMoreLines=%s riadk(y/ov) skrytých +PublicUrl=Verejné URL +AddBox=Pridať box +SelectElementAndClickRefresh=Vyberte prvok a stlačte Obnoviť +PrintFile=Vytlačiť súbor %s +ShowTransaction=Zobraziť transakciu +GoIntoSetupToChangeLogo=Choďte na Domov - Nastavenie - Spoločnosť pre zmenu loga, alebo na Domov - Nastavenie - Zobrazenie pre skrytie loga. +Deny=Deny +Denied=Denied # Week day Monday=Pondelok Tuesday=Utorok diff --git a/htdocs/langs/sk_SK/opensurvey.lang b/htdocs/langs/sk_SK/opensurvey.lang index f2f7e437fada6..8a05a28672acd 100644 --- a/htdocs/langs/sk_SK/opensurvey.lang +++ b/htdocs/langs/sk_SK/opensurvey.lang @@ -1,18 +1,18 @@ # 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... +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=Pridať komentár CreatePoll=Vytvorenie ankety PollTitle=Anketa titul -# ToReceiveEMailForEachVote=Receive an email for each vote +ToReceiveEMailForEachVote=Receive an email for each vote TypeDate=Zadajte dátum TypeClassic=Typ štandardné -# 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 +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=Odstráňte všetky dni CopyHoursOfFirstDay=Kopírovanie hodín prvého dňa RemoveAllHours=Odstráňte všetky hodiny @@ -20,14 +20,14 @@ SelectedDays=Vybrané dni TheBestChoice=Najlepšou voľbou je v súčasnej dobe TheBestChoices=Najlepšie možnosťou sú v súčasnej dobe with=s -# 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. +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=Komentáre voličov -ConfirmRemovalOfPoll=Ste si istí, že chcete odstrániť túto anketu (a všetkých hlasov) +ConfirmRemovalOfPoll=Ste si istí, že chcete odstrániť túto anketu (a všetky hlasy)? RemovePoll=Odobrať prieskum -# 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 +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=Jednoduché políčko YesNoList=List (prázdny / áno / nie) PourContreList=List (prázdny / pre / proti) @@ -35,7 +35,7 @@ AddNewColumn=Pridať nový stĺpec TitleChoice=Voľba štítok ExportSpreadsheet=Export výsledkov tabuľku ExpireDate=Obmedziť dátum -# NbOfSurveys=Number of polls +NbOfSurveys=Number of polls NbOfVoters=Nb voličov SurveyResults=Výsledky PollAdminDesc=Ste dovolené meniť všetci voliť riadky tejto ankety pomocou tlačidla "Edit". Môžete tiež odstrániť stĺpec alebo riadok s %s. Môžete tiež pridať nový stĺpec s %s. @@ -53,14 +53,14 @@ AddEndHour=Pridať end hodinu votes=hlas (y) NoCommentYet=Žiadne komentáre boli zverejnené na túto anketu ešte CanEditVotes=Môže zmeniť hlas ostatných -# CanComment=Voters can comment in the poll -# CanSeeOthersVote=Voters can see other people's vote +CanComment=Voters can comment in the poll +CanSeeOthersVote=Voters can see other people's vote SelectDayDesc=Pre každý vybraný deň, môžete si vybrať, či sa majú splniť hodín v nasledujúcom formáte:
- Prázdne,
- "8h", "8H" alebo "8:00" dať schôdzku v úvodnej hodinu,
- "8-11", "8h-11h", "8H-11H" alebo "08:00-11:00" dať schôdzku je začiatok a koniec hodiny,
- "8h15-11h15", "8H15-11h15" alebo "08:15-11:15" to isté, ale v minútach. BackToCurrentMonth=Späť na aktuálny mesiac -# 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 +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/sk_SK/orders.lang b/htdocs/langs/sk_SK/orders.lang index fb9ac7fdd5e2b..c7a6e7a6a9a85 100644 --- a/htdocs/langs/sk_SK/orders.lang +++ b/htdocs/langs/sk_SK/orders.lang @@ -1,22 +1,22 @@ # Dolibarr language file - Source file is en_US - orders -OrdersArea=Zákazníci objednávky oblasť -SuppliersOrdersArea=Dodávatelia objednávky oblasť -OrderCard=Objednať kartu +OrdersArea=Zákaznícke objednávky +SuppliersOrdersArea=Dodávateľské objednávky +OrderCard=Karta objednávky OrderId=ID objednávky Order=Objednávka Orders=Objednávky OrderLine=Objednať linka OrderFollow=Sledovať -OrderDate=Objednať Dátum -OrderToProcess=Účelom spracovania +OrderDate=Dátum objednávky +OrderToProcess=Objednávka na spracovanie NewOrder=Nová objednávka -ToOrder=Urobiť poriadok -MakeOrder=Urobiť poriadok -SupplierOrder=Dodávateľ aby -SuppliersOrders=Dodávatelia objednávky -SuppliersOrdersRunning=Aktuálne dodávatelia objednávky -CustomerOrder=Zákazníka -CustomersOrders=Customers orders +ToOrder=Objednať +MakeOrder=Objednať +SupplierOrder=Dodávateľská objednávka +SuppliersOrders=Dodávateliské objednávky +SuppliersOrdersRunning=Aktuálne dodávatelské objednávky +CustomerOrder=Zákaznícka objednávka +CustomersOrders=Zákaznícke objednávky CustomersOrdersRunning=Objednávky aktuálneho zákazníka CustomersOrdersAndOrdersLines=Zákaznícke objednávky a objednávky linky OrdersToValid=Customers orders to validate @@ -79,7 +79,9 @@ NoOpenedOrders=Žiadne otvorené príkazy NoOtherOpenedOrders=Žiadny iný otvoril objednávky NoDraftOrders=Žiadne návrhy objednávky OtherOrders=Ostatné objednávky -LastOrders=Posledný %s objednávky +LastOrders=Last %s customer orders +LastCustomerOrders=Last %s customer orders +LastSupplierOrders=Last %s supplier orders LastModifiedOrders=Posledné %s modifikované objednávky LastClosedOrders=Posledné %s uzatvorené objednávky AllOrders=Všetky objednávky diff --git a/htdocs/langs/sk_SK/other.lang b/htdocs/langs/sk_SK/other.lang index ef3ca5bf08744..5b146c9708694 100644 --- a/htdocs/langs/sk_SK/other.lang +++ b/htdocs/langs/sk_SK/other.lang @@ -5,14 +5,14 @@ Tools=Nástroje ToolsDesc=Táto oblasť je určená pre skupiny rôznych strojov, ktoré nie sú k dispozícii na iné položky menu.

Tieto nástroje sa dostanete z menu na boku. Birthday=Narodeniny BirthdayDate=Narodeniny -DateToBirth=Date of birth +DateToBirth=Dátum narodenia BirthdayAlertOn= narodeniny výstraha aktívna BirthdayAlertOff= narodeniny upozornenia neaktívne 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_VALIDATE=Dodávateľská objednávka zaznamenaná Notify_ORDER_SUPPLIER_APPROVE=Dodávateľ aby schválila Notify_ORDER_SUPPLIER_REFUSE=Dodávateľ aby odmietol Notify_ORDER_VALIDATE=Zákazníka overená @@ -29,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=Supplier order recorded +Notify_ORDER_SUPPLIER_VALIDATE=Dodávateľská objednávka zaznamenaná 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í @@ -203,6 +203,7 @@ NewKeyWillBe=Váš nový kľúč pre prihlásenie do softvéru bude ClickHereToGoTo=Kliknite tu pre prechod na %s YouMustClickToChange=Musíte však najprv kliknúť na nasledujúci odkaz pre potvrdenie tejto zmeny hesla ForgetIfNothing=Ak ste o túto zmenu, stačí zabudnúť na tento e-mail. Vaše prihlasovacie údaje sú v bezpečí. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=Pridať záznam do kalendára %s diff --git a/htdocs/langs/sk_SK/printipp.lang b/htdocs/langs/sk_SK/printipp.lang index 835e6827f12ee..eb92974966d0e 100644 --- a/htdocs/langs/sk_SK/printipp.lang +++ b/htdocs/langs/sk_SK/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=Nastavenie modulu Priama tlač +PrintIPPDesc=Tento modul pridá tlačítko na priamu tlač dokumentov. Vyžaduje si Linuxový systém s nainštalovaným serverom CUPS. +PRINTIPP_ENABLED=Zobraziť ikonu "Priama tlač" v zoznamoch dokumentov +PRINTIPP_HOST=Tlačový 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 +PRINTIPP_USER=Prihlasovacie meno +PRINTIPP_PASSWORD=Heslo +NoPrinterFound=Nenašli sa žiadne tlačiarne (skontrolujte nastavenia CUPS) +FileWasSentToPrinter=Súbor %s bol odoslaný na tlač +NoDefaultPrinterDefined=Nie je nastavená predvolená tlačiareň +DefaultPrinter=Predvolená tlačiareň +Printer=Tlačiareň +CupsServer=Server CUPS diff --git a/htdocs/langs/sk_SK/productbatch.lang b/htdocs/langs/sk_SK/productbatch.lang index 452636819653f..85b1d27f3a611 100644 --- a/htdocs/langs/sk_SK/productbatch.lang +++ b/htdocs/langs/sk_SK/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use batch/serial number -ProductStatusOnBatch=Yes (Batch/serial required) -ProductStatusNotOnBatch=No (Batch/serial not used) +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/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 +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial 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 +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %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. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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/sk_SK/projects.lang b/htdocs/langs/sk_SK/projects.lang index 084f8e5794174..60e0e6713f6f7 100644 --- a/htdocs/langs/sk_SK/projects.lang +++ b/htdocs/langs/sk_SK/projects.lang @@ -14,6 +14,7 @@ MyTasksDesc=Tento pohľad je obmedzená na projekty alebo úlohy, ktoré sú pre 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). +AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. ProjectsArea=Projekty oblasť NewProject=Nový projekt AddProject=Create project diff --git a/htdocs/langs/sk_SK/salaries.lang b/htdocs/langs/sk_SK/salaries.lang index 28c21adfad3bf..f222c59dcf8ae 100644 --- a/htdocs/langs/sk_SK/salaries.lang +++ b/htdocs/langs/sk_SK/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 -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 +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Účtovný kód pre výplatu miezd +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Účtovný kód pre zrážky +Salary=Mzda +Salaries=Mzdy +Employee=Zamestnanec +NewSalaryPayment=Nová výplata mzdy +SalaryPayment=Výplata mzdy +SalariesPayments=Výplaty miezd +ShowSalaryPayment=Ukázať výplatu mzdy +THM=Priemerná hodinová cena +TJM=Priemerná denná cena +CurrentSalary=Súčasná mzda diff --git a/htdocs/langs/sk_SK/sendings.lang b/htdocs/langs/sk_SK/sendings.lang index 96cb8b60d6176..1e8634c96ecd8 100644 --- a/htdocs/langs/sk_SK/sendings.lang +++ b/htdocs/langs/sk_SK/sendings.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - sendings -RefSending=Ref náklad -Sending=Náklad +RefSending=Ref. zásielka +Sending=Zásielka Sendings=Zásielky AllSendings=All Shipments Shipment=Náklad @@ -11,8 +11,8 @@ SendingsArea=Zásielky oblasť ListOfSendings=Zoznam zásielok SendingMethod=Spôsob dopravy SendingReceipt=Prepravný doklad -LastSendings=Posledný %s zásielky -SearchASending=Hľadať zásielky +LastSendings=Posledných %s zásielok +SearchASending=Hľadať zásielku StatisticsOfSendings=Štatistika zásielok NbOfSendings=Počet zásielok NumberOfShipmentsByMonth=Počet zásielok podľa mesiaca @@ -20,20 +20,20 @@ SendingCard=Shipment card NewSending=Nová zásielka CreateASending=Vytvoriť zásielku CreateSending=Vytvoriť zásielku -QtyOrdered=Množstvo objednať -QtyShipped=Množstvo odoslané -QtyToShip=Množstvo na loď -QtyReceived=Množstvo prijatej -KeepToShip=Remain to ship +QtyOrdered=Objednané množstvo +QtyShipped=Odoslané množstvo +QtyToShip=Množstvo na odoslanie +QtyReceived=Prijaté množstvo +KeepToShip=Zostáva odoslať OtherSendingsForSameOrder=Ďalšie zásielky pre túto objednávku DateSending=Dátum odoslania, aby DateSendingShort=Dátum odoslania, aby SendingsForSameOrder=Zásielky pre túto objednávku SendingsAndReceivingForSameOrder=Zásielky a Receivings pre túto objednávku -SendingsToValidate=Zásielky sa overujú +SendingsToValidate=Zásielky na overenie StatusSendingCanceled=Zrušený StatusSendingDraft=Návrh -StatusSendingValidated=Overené (výrobky na loď alebo už dodávané) +StatusSendingValidated=Overené (výrobky na odoslanie alebo už dodané) StatusSendingProcessed=Spracované StatusSendingCanceledShort=Zrušený StatusSendingDraftShort=Návrh @@ -41,9 +41,9 @@ StatusSendingValidatedShort=Overené StatusSendingProcessedShort=Spracované SendingSheet=Shipment sheet Carriers=Dopravcovia -Carrier=Nosič +Carrier=Dopravca CarriersArea=Dopravcovia oblasti -NewCarrier=Nový nosič +NewCarrier=Nový dopravca ConfirmDeleteSending=Ste si istí, že chcete zmazať túto zásielku? ConfirmValidateSending=Ste si istí, že chcete overiť túto zásielku s referenčnými %s? ConfirmCancelSending=Ste si istí, že chcete zrušiť túto zásielku? diff --git a/htdocs/langs/sk_SK/sms.lang b/htdocs/langs/sk_SK/sms.lang index ff5ed4c886bb1..425ef170a84c6 100644 --- a/htdocs/langs/sk_SK/sms.lang +++ b/htdocs/langs/sk_SK/sms.lang @@ -1,9 +1,9 @@ # Dolibarr language file - Source file is en_US - sms Sms=SMS SmsSetup=Nastavenie SMS -SmsDesc=Táto stránka umožňuje definovať GLOBALS možnosti na SMS funkcia -SmsCard=SMS Card -AllSms=Všetky SMS campains +SmsDesc=Táto stránka umožňuje definovať globálne možnosti SMS funkcie +SmsCard=Karta SMS +AllSms=Všetky SMS kampaňe SmsTargets=Ciele SmsRecipients=Ciele SmsRecipient=Cieľ @@ -12,13 +12,13 @@ SmsFrom=Odosielateľ SmsTo=Cieľ SmsTopic=Téma SMS SmsText=Správa -SmsMessage=SMS správy +SmsMessage=SMS správa ShowSms=Zobraziť SMS -ListOfSms=Zoznam SMS campains -NewSms=Nová SMS ku kampani -EditSms=Úprava správ SMS -ResetSms=New odoslanie -DeleteSms=Odstrániť Sms ku kampani +ListOfSms=Zoznam SMS kampaní +NewSms=Nová SMS kampaň +EditSms=Úprava SMS +ResetSms=Nové odoslanie +DeleteSms=Odstrániť SMS kampaň DeleteASms=Odobrať Sms ku kampani PreviewSms=Previuw SMS PrepareSms=Pripravte SMS diff --git a/htdocs/langs/sk_SK/stocks.lang b/htdocs/langs/sk_SK/stocks.lang index 80cf13a58f0bc..ea2954eee1c16 100644 --- a/htdocs/langs/sk_SK/stocks.lang +++ b/htdocs/langs/sk_SK/stocks.lang @@ -2,28 +2,29 @@ WarehouseCard=Skladová karta Warehouse=Sklad Warehouses=Sklady -NewWarehouse=Nový sklad / Skladové plochy +NewWarehouse=Nový sklad / skladová plocha WarehouseEdit=Upraviť sklad MenuNewWarehouse=Nový sklad -WarehouseOpened=Warehouse otvoril +WarehouseOpened=Sklad otvorený WarehouseClosed=Sklad uzavretý -WarehouseSource=Zdroj sklad -WarehouseSourceNotDefined=Nie sklad definovaný, +WarehouseSource=Zdrojový sklad +WarehouseSourceNotDefined=Nie je definovaný žiadny sklad, AddOne=Pridať jeden WarehouseTarget=Cieľový sklad ValidateSending=Zmazať odoslanie -CancelSending=Zrušiť zasielanie +CancelSending=Zrušiť odoslanie DeleteSending=Zmazať odoslanie -Stock=Sklad +Stock=Zásoba Stocks=Zásoby +StocksByLotSerial=Stock by lot/serial Movement=Pohyb Movements=Pohyby -ErrorWarehouseRefRequired=Sklad referenčné meno je povinné +ErrorWarehouseRefRequired=Referenčné meno skladu je povinné ErrorWarehouseLabelRequired=Sklad štítok je nutné -CorrectStock=Správne skladom +CorrectStock=Opraviť zásoby ListOfWarehouses=Zoznam skladov ListOfStockMovements=Zoznam skladových pohybov -StocksArea=Warehouses area +StocksArea=Oblasť skladov Location=Umiestnenie LocationSummary=Krátky názov umiestnenia NumberOfDifferentProducts=Počet rôznych výrobkov @@ -32,10 +33,10 @@ LastMovement=Posledný pohyb LastMovements=Posledné pohyby Units=Jednotky Unit=Jednotka -StockCorrection=Správne skladom +StockCorrection=Opraviť zásoby StockTransfer=Stock prenos StockMovement=Preniesť -StockMovements=Sklad prevody +StockMovements=Skladové prevody LabelMovement=Pohyb štítok NumberOfUnit=Počet jednotiek UnitPurchaseValue=Jednotková kúpna cena @@ -47,10 +48,10 @@ 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 +IndependantSubProductStock=Zásoby produktu a podriadeného produktu sú nezávislé QtyDispatched=Množstvo odoslané -QtyDispatchedShort=Qty dispatched -QtyToDispatchShort=Qty to dispatch +QtyDispatchedShort=Odoslané množstvo +QtyToDispatchShort=Množstvo na odoslanie OrderDispatch=Stock dispečing RuleForStockManagementDecrease=Pravidlo pre zníženie riadenie zásob RuleForStockManagementIncrease=Pravidlo pre zvýšenie riadenie zásob @@ -62,11 +63,11 @@ ReStockOnValidateOrder=Zvýšenie reálnej zásoby na dodávateľa objednávok k ReStockOnDispatchOrder=Zvýšenie reálnej zásoby na ručné dispečingu do skladov, potom, čo sa s dodávateľmi účelom obdržania ReStockOnDeleteInvoice=Zvýšenie reálnej zásoby na faktúre zmazanie OrderStatusNotReadyToDispatch=Rád má ešte nie je, alebo viac postavenie, ktoré umožňuje zasielanie výrobkov na sklade skladoch. -StockDiffPhysicTeoric=Explanation for difference between physical and theoretical stock +StockDiffPhysicTeoric=Vysvetlenie rozdieľu medzi aktuálnym a teoretickým stavom zásob NoPredefinedProductToDispatch=Žiadne preddefinované produkty pre tento objekt. Takže žiadne dispečing skladom je nutná. DispatchVerb=Odoslanie -StockLimitShort=Limit for alert -StockLimit=Stock limit for alert +StockLimitShort=Limit pre výstrahu +StockLimit=Limit zásob pre výstrahu PhysicalStock=Fyzický kapitál RealStock=Skutočné Stock VirtualStock=Virtuálny sklad @@ -78,6 +79,7 @@ IdWarehouse=Id sklad DescWareHouse=Popis sklad LieuWareHouse=Lokalizácia sklad WarehousesAndProducts=Sklady a produkty +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=Vážený priemer cien vstupov AverageUnitPricePMP=Vážený priemer cien vstupov SellPriceMin=Predajná jednotka Cena @@ -99,36 +101,39 @@ Replenishment=Naplnenie ReplenishmentOrders=Doplňovanie objednávky 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 +UseVirtualStock=Používať virtuálne zásoby +UsePhysicalStock=Používať fyzické zásoby +CurentSelectionMode=Súčasný spôsob výberu +CurentlyUsingVirtualStock=Virtuálne zásoby +CurentlyUsingPhysicalStock=Fyzické zásoby RuleForStockReplenishment=Pravidlo pre doplňovanie zásob SelectProductWithNotNullQty=Vyberte aspoň jeden produkt s Množstvo NOT NULL a dodávateľom AlertOnly= Upozornenie iba WarehouseForStockDecrease=Skladová %s budú použité pre zníženie skladom 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. +ReplenishmentStatusDesc=Toto je zoznam všetkých produktov, ktorých zásoba je nižšia než požadovaná (alebo nižšia ako hodnota pre výstrahu ak "iba výstrahy" je zaškrtnuté). Odporúča sa vytvorenie dodávateľských objednávok na doplnenie rozdieľov. 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) -MassMovement=Mass movement +MassMovement=Hromadný pohyb MassStockMovement=Mass pohyb zásob SelectProductInAndOutWareHouse=Vyberte si produkt, množstvo, zdrojový sklad a cieľový sklad, potom kliknite na "%s". Akonáhle sa tak stane pre všetky požadované pohyby, kliknite na "%s". RecordMovement=Záznam 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 +ReceivingForSameOrder=Bločky tejto objednávky +StockMovementRecorded=Zaznamenané pohyby zásob +RuleForStockAvailability=Pravidlá skladových požiadaviek +StockMustBeEnoughForInvoice=Úroveň zásob musí byť dostatočná na zahrnutie produktu/služby do faktúry +StockMustBeEnoughForOrder=Úroveň zásob musí byť dostatočná na zahrnutie produktu/služby do objednávky +StockMustBeEnoughForShipment= Úroveň zásob musí byť dostatočná na zahrnutie produktu/služby do dodávky +MovementLabel=Štítok pohybu InventoryCode=Movement or inventory code -IsInPackage=Contained into package -ShowWarehouse=Show warehouse +IsInPackage=Vložené do balíka +ShowWarehouse=Ukázať sklad 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. +MovementTransferStock=Transfer zásoby produktu %s do iného skladu +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/sk_SK/suppliers.lang b/htdocs/langs/sk_SK/suppliers.lang index cbef03935a538..696d59df1cc9a 100644 --- a/htdocs/langs/sk_SK/suppliers.lang +++ b/htdocs/langs/sk_SK/suppliers.lang @@ -1,46 +1,46 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Dodávatelia -AddSupplier=Create a supplier -SupplierRemoved=Dodávateľ odstráni -SuppliersInvoice=Dodávatelia faktúra +AddSupplier=Vytvoriť dodávateľa +SupplierRemoved=Dodávateľ odstránený +SuppliersInvoice=Dodávateľská faktúra NewSupplier=Nový dodávateľ History=História ListOfSuppliers=Zoznam dodávateľov ShowSupplier=Zobraziť dodávateľa -OrderDate=Objednať Dátum -BuyingPrice=Nákup cenu -BuyingPriceMin=Minimálna kúpna cena -BuyingPriceMinShort=Minimálna kúpna cena -TotalBuyingPriceMin=Total of subproducts buying prices -SomeSubProductHaveNoPrices=Some sub-products have no price defined -AddSupplierPrice=Pridať cena dodávateľa tovaru -ChangeSupplierPrice=Zmena dodávateľa cenu +OrderDate=Dátum objednávky +BuyingPrice=Nákupná cena +BuyingPriceMin=Minimálna nákupná cena +BuyingPriceMinShort=Minimálna nákupná cena +TotalBuyingPriceMin=Celková nákupná cena podradených výrobkov +SomeSubProductHaveNoPrices=Niektoré podradené výrobky nemajú určenú cenu. +AddSupplierPrice=Pridať cenu dodávateľa tovaru +ChangeSupplierPrice=Zmeniť cenu dodávateľa ErrorQtyTooLowForThisSupplier=Nedostatočné množstvo tohto podniku, alebo nie je definovaná cena k tomuto produktu tohto podniku -ErrorSupplierCountryIsNotDefined=Krajina tohto podniku nie je definovaný. Odstrániť ako prvý. +ErrorSupplierCountryIsNotDefined=Krajina tohto dodávateľa nie je definovaná. Najprv to to treba opraviť. ProductHasAlreadyReferenceInThisSupplier=Tento produkt je už odkaz na tohto dodávateľa ReferenceSupplierIsAlreadyAssociatedWithAProduct=Tento odkaz Dodávateľ je už spojená s odkazom: %s -NoRecordedSuppliers=Žiadne zaznamenané dodávatelia -SupplierPayment=Dodávateľ platba -SuppliersArea=Dodávatelia oblasť -RefSupplierShort=Ref dodávateľ +NoRecordedSuppliers=Žiadni zaznamenaní dodávatelia +SupplierPayment=Dodávateľská platba +SuppliersArea=Oblasť dodávateľov +RefSupplierShort=Referenčný dodávateľ Availability=Dostupnosť -ExportDataset_fournisseur_1=Dodávateľských faktúr Zoznam faktúr a vedenia -ExportDataset_fournisseur_2=Dodávateľ faktúry a platby -ExportDataset_fournisseur_3=Dodávateľ objednávky a objednávka linky +ExportDataset_fournisseur_1=Zoznam dodávateľských faktúr a položiek +ExportDataset_fournisseur_2=Dodávateľské faktúry a platby +ExportDataset_fournisseur_3=Dodávateľské objednávky a položky ApproveThisOrder=Schváliť túto objednávku -ConfirmApproveThisOrder=Ste si istí, že chcete schváliť poradí %s? -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? +ConfirmApproveThisOrder=Ste si istí, že chcete schváliť objednávku %s? +DenyingThisOrder=Odmietnuť objednávku +ConfirmDenyingThisOrder=Ste si istí, že chcete odmietnuť objednávku %s? +ConfirmCancelThisOrder=Ste si istí, že chcete zrušiť túto objednávku %s? AddCustomerOrder=Vytvorenie objednávky zákazníka -AddCustomerInvoice=Môžete si zákazník faktúru -AddSupplierOrder=Môžete sa s dodávateľmi objednávku -AddSupplierInvoice=Vytvorte dodávateľskej faktúry -ListOfSupplierProductForSupplier=Zoznam výrobkov a cien dodávateľských %s -NoneOrBatchFileNeverRan=Žiadny alebo dávkový %s nie bežal nedávno +AddCustomerInvoice=Vytvoriť faktúru +AddSupplierOrder=Vytvoriť dodávateľskú objednávku +AddSupplierInvoice=Vytvoriť dodávateľskú faktúru +ListOfSupplierProductForSupplier=Zoznam výrobkov a cien dodávateľa %s +NoneOrBatchFileNeverRan=Žiadny alebo dávka %s nebežala v poslednom čase SentToSuppliers=Odoslané dodávateľom -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) +ListOfSupplierOrders=Zoznam dodávateľských objednávok +MenuOrdersSupplierToBill=Vytvoriť faktúru z dodávateľskej objednávky +NbDaysToDelivery=Zdržanie dodávky v dňoch +DescNbDaysToDelivery=Zobrazené je najväčšie zdržanie spomedzi položiek objednávky +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/sk_SK/trips.lang b/htdocs/langs/sk_SK/trips.lang index aa91658f50299..3943c585c50b3 100644 --- a/htdocs/langs/sk_SK/trips.lang +++ b/htdocs/langs/sk_SK/trips.lang @@ -69,11 +69,9 @@ 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 @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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/sk_SK/users.lang b/htdocs/langs/sk_SK/users.lang index 1d40f6a7f3528..c2d36bc695c42 100644 --- a/htdocs/langs/sk_SK/users.lang +++ b/htdocs/langs/sk_SK/users.lang @@ -1,52 +1,52 @@ # Dolibarr language file - Source file is en_US - users -HRMArea=HRM area -UserCard=Užívateľ karty -ContactCard=Kontaktné karty -GroupCard=Skupina karta -NoContactCard=Žiadna karta medzi kontakty -Permission=Povolenie -Permissions=Oprávnenie +HRMArea=Oblasť Personalistiky +UserCard=Karta užívateľa +ContactCard=Karta kontaktu +GroupCard=Karta skupiny +NoContactCard=Žiadna karta medzi kontaktmi +Permission=Oprávnenie +Permissions=Oprávnenia EditPassword=Upraviť heslo -SendNewPassword=Regeneráciu a zaslať heslo +SendNewPassword=Obnoviť a zaslať heslo ReinitPassword=Obnoviť heslo PasswordChangedTo=Heslo bolo zmenené na: %s SubjectNewPassword=Vaše nové heslo pre Dolibarr AvailableRights=Dostupné oprávnenia OwnedRights=Vlastné oprávnenia -GroupRights=Skupina oprávnenia +GroupRights=Skupinové oprávnenia UserRights=Užívateľské oprávnenia -UserGUISetup=Užívateľské zobrazenie nastavenia +UserGUISetup=Nastavenie zobrazenia užívateľa DisableUser=Zakázať DisableAUser=Zakázať užívateľa -DeleteUser=Vymazať +DeleteUser=Odstrániť DeleteAUser=Odstránenie užívateľa DisableGroup=Zakázať DisableAGroup=Zakázať skupinu -EnableAUser=Povoliť užívateľovi +EnableAUser=Povoliť užívateľa EnableAGroup=Povoliť skupinu -DeleteGroup=Vymazať -DeleteAGroup=Zmazať skupinu -ConfirmDisableUser=Ste si istí, že chcete zakázať užívateľa %s? -ConfirmDisableGroup=Ste si istí, že chcete zakázať skupinové %s? -ConfirmDeleteUser=Ste si istí, že chcete zmazať užívateľa %s? -ConfirmDeleteGroup=Ste si istí, že chcete zmazať skupinu %s? -ConfirmEnableUser=Ste si istí, že chcete povoliť užívateľské %s? -ConfirmEnableGroup=Ste si istí, že chcete povoliť skupiny %s? -ConfirmReinitPassword=Ste si istí, že chcete vytvoriť nové heslo pre užívateľa %s? -ConfirmSendNewPassword=Ste si istí, že chcete vytvárať a odosielať nové heslo pre užívateľa %s? +DeleteGroup=Odstrániť +DeleteAGroup=Odstrániť skupinu +ConfirmDisableUser=Ste si istí, že chcete zakázať užívateľa %s? +ConfirmDisableGroup=Ste si istí, že chcete zakázať skupinu %s? +ConfirmDeleteUser=Ste si istí, že chcete odstrániť užívateľa %s? +ConfirmDeleteGroup=Ste si istí, že chcete odstrániť skupinu %s? +ConfirmEnableUser=Ste si istí, že chcete povoliť užívateľa %s? +ConfirmEnableGroup=Ste si istí, že chcete povoliť skupinu %s? +ConfirmReinitPassword=Ste si istí, že chcete vytvoriť nové heslo pre užívateľa %s? +ConfirmSendNewPassword=Ste si istí, že chcete vytvoriť a odoslať nové heslo pre užívateľa %s? NewUser=Nový užívateľ CreateUser=Vytvoriť užívateľa SearchAGroup=Hľadať skupinu SearchAUser=Hľadať užívateľa -LoginNotDefined=Prihlásenie nie je definovaná. -NameNotDefined=Názov nie je definovaná. +LoginNotDefined=Prihlásenie nie je definované. +NameNotDefined=Názov nie je definovaný. ListOfUsers=Zoznam užívateľov Administrator=Správca SuperAdministrator=Super Administrator SuperAdministratorDesc=Globálny správca AdministratorDesc=Správca subjekt -DefaultRights=Predvolené povolenia -DefaultRightsDesc=Definujte tu predvolené povolenia, ktoré sú udelené automaticky do novo vytvoreného užívateľa (Choď na karte užívateľa k zmene povolenia existujúceho užívateľa). +DefaultRights=Predvolené oprávnenia +DefaultRightsDesc=Definujte tu predvolené oprávnenia, ktoré sú udelené automaticky novo vytvorenému užívateľovi (Zmeniť oprávnenia existujúceho užívateľa môžete na jeho karte). DolibarrUsers=Dolibarr užívatelia LastName=Názov FirstName=Krstné meno @@ -55,68 +55,68 @@ NewGroup=Nová skupina CreateGroup=Vytvoriť skupinu RemoveFromGroup=Odstrániť zo skupiny PasswordChangedAndSentTo=Heslo bolo zmenené a poslaný do %s. -PasswordChangeRequestSent=Žiadosť o zmenu hesla %s zaslaných %s. +PasswordChangeRequestSent=Žiadosť o zmenu hesla %s zaslaná %s. MenuUsersAndGroups=Používatelia a skupiny LastGroupsCreated=Posledné %s vytvorili skupiny LastUsersCreated=Posledné %s používatelia vytvorili ShowGroup=Zobraziť skupinu ShowUser=Zobraziť užívateľa -NonAffectedUsers=Non priradené užívatelia -UserModified=Užívateľ bolo úspešne upravené +NonAffectedUsers=Nepriradení užívatelia +UserModified=Užívateľ bol úspešne upravený PhotoFile=Súbor s fotografiou -UserWithDolibarrAccess=Užívateľ s prístupom Dolibarr +UserWithDolibarrAccess=Užívateľ s prístupom do Dolibarr ListOfUsersInGroup=Zoznam užívateľov tejto skupiny ListOfGroupsForUser=Zoznam skupín tohto užívateľa -UsersToAdd=Užívatelia pridať k tejto skupine -GroupsToAdd=Skupiny je možné pridať do tohto používateľa +UsersToAdd=Užívatelia na priradenie k tejto skupine +GroupsToAdd=Skupiny na priradenie k tomuto užívateľovi NoLogin=Bez prihlásenia -LinkToCompanyContact=Odkaz na tretiu osobu / kontakt +LinkToCompanyContact=Odkaz na tretiu stranu / kontakt LinkedToDolibarrMember=Odkaz na člena LinkedToDolibarrUser=Odkaz na užívateľa Dolibarr -LinkedToDolibarrThirdParty=Odkaz na Dolibarr tretej osobe -CreateDolibarrLogin=Vytvorenie používateľa +LinkedToDolibarrThirdParty=Odkaz na tretiu stranu Dolibarr +CreateDolibarrLogin=Vytvoriť používateľa CreateDolibarrThirdParty=Vytvorte tretiu stranu -LoginAccountDisable=Účet bol zakázaný, dať nové prihlasovacie údaje pre jeho aktiváciu. +LoginAccountDisable=Účet bol zakázaný, zadajte nové prihlasovacie údaje pre jeho aktiváciu. LoginAccountDisableInDolibarr=Účet bol zakázaný v Dolibarr. LoginAccountDisableInLdap=Účet bol zakázaný v doméne. UsePersonalValue=Používajte osobnú hodnotu GuiLanguage=Jazyk rozhrania -InternalUser=Interné užívateľ +InternalUser=Interný užívateľ MyInformations=Moje údaje -ExportDataset_user_1=Dolibarr užívateľov a vlastnosti -DomainUser=%s užívateľ domény +ExportDataset_user_1=Užívatelia a vlastnosti Dolibarr +DomainUser=Užívateľ domény %s Reactivate=Reaktivácia -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=Tento formulár umožňuje vytvoriť užívateľa, ktorý je interný z hľadiska Vašej organizácie. Ak chcete vytvoriť externého užívateľa (zákazník, dodávateľ, ...), použite tlačidlo "Vytvoriť užívateľa Dolibarr" na kontaktnej karte tretej strany. InternalExternalDesc=Interný užívateľ je užívateľ, ktorý je súčasťou vašej firme / nadácie.
Externý užívateľ je zákazník, dodávateľ alebo iný.

V oboch prípadoch oprávnenia definuje práva na Dolibarr tiež externé užívateľ môže mať inú ponuku než správcu interného užívateľa (pozri Domov - Nastavenie - Zobrazenie) PermissionInheritedFromAGroup=Povolenie udelené, pretože dedia z jednej zo skupiny užívateľov. Inherited=Zdedený -UserWillBeInternalUser=Vytvorené užívateľ bude interný užívateľ (pretože nie je spojená s určitou treťou stranou) -UserWillBeExternalUser=Vytvorený užívateľ bude externé užívateľ (pretože súvisí s určitou treťou stranou) +UserWillBeInternalUser=Vytvorený užívateľ bude interný užívateľ (pretože nie je spojený s určitou treťou stranou) +UserWillBeExternalUser=Vytvorený užívateľ bude externý užívateľ (pretože súvisí s určitou treťou stranou) IdPhoneCaller=Id telefón volajúceho UserLogged=Užívateľ %s prihlásenie UserLogoff=Užívateľ %s odhlásiť -NewUserCreated=Užívateľ %s vytvoril +NewUserCreated=Užívateľ %s vytvorený NewUserPassword=Zmena hesla pre %s -EventUserModified=Užívateľ %s zmenená -UserDisabled=Užívateľ %s zakázané -UserEnabled=Užívateľ %s aktivovaná -UserDeleted=Užívateľ %s odstránené -NewGroupCreated=Skupina vytvorila %s -GroupModified=Group %s modified -GroupDeleted=Skupina %s odstránené +EventUserModified=Užívateľ %s zmenený +UserDisabled=Užívateľ %s zakázaný +UserEnabled=Užívateľ %s aktivovaný +UserDeleted=Užívateľ %s odstránený +NewGroupCreated=Skupina %s vytvorená +GroupModified=Skupina %s bola upravená +GroupDeleted=Skupina %s odstránená ConfirmCreateContact=Ste si istí, že chcete vytvoriť účet Dolibarr pre tento kontakt? ConfirmCreateLogin=Ste si istí, že chcete vytvoriť účet Dolibarr pre tohto člena? -ConfirmCreateThirdParty=Ste si istí, že chcete vytvoriť tretia strana za týmto členom? +ConfirmCreateThirdParty=Ste si istí, že chcete vytvoriť tretiu stranu pre tohto člena? LoginToCreate=Prihlásiť sa ak chcete vytvoriť -NameToCreate=Názov tretej strany k vytvoreniu -YourRole=Vaša rola -YourQuotaOfUsersIsReached=Vaša kvóta aktívnych používateľov je dosiahnutý! -NbOfUsers=Nb užívateľov -DontDowngradeSuperAdmin=Iba superadmin môže downgrade superadmin -HierarchicalResponsible=Supervisor +NameToCreate=Názov vytváranej tretej strany +YourRole=Vaše roly +YourQuotaOfUsersIsReached=Vaša kvóta aktívnych používateľov bola dosiahnutá! +NbOfUsers=Počet užívateľov +DontDowngradeSuperAdmin=Iba superadmin môže degradovať superadmina +HierarchicalResponsible=Supervízor HierarchicView=Hierarchické zobrazenie -UseTypeFieldToChange=Použite typ poľa pre zmenu +UseTypeFieldToChange=Použite pole Typ pre zmenu OpenIDURL=OpenID URL -LoginUsingOpenID=Použite OpenID pre prihlásenie -WeeklyHours=Weekly hours -ColorUser=Color of the user +LoginUsingOpenID=Použiť OpenID pre prihlásenie +WeeklyHours=Počet hodín za týžden +ColorUser=Farba priradená užívateľovi diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang index 20e5c2ece1ad2..7e997bd1ab897 100644 --- a/htdocs/langs/sl_SI/admin.lang +++ b/htdocs/langs/sl_SI/admin.lang @@ -8,11 +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 +FileCheck=Integriteta datotek +FilesMissing=Manjkajoče datoteke +FilesUpdated=Posodobljene datoteke +FileCheckDolibarr=Kontrola integritete Dolibarr datotek +XmlNotFound=Ni najdena xml datoteka Dolibar integritete SessionId=ID seje SessionSaveHandler=Rutina za shranjevanje seje SessionSavePath=Lokalizacija shranjevanja seje @@ -297,10 +297,11 @@ MenuHandlers=Menijski vmesniki MenuAdmin=Urejevalnik menijev DoNotUseInProduction=Ne uporabljajte v proizvodnji ThisIsProcessToFollow=To je nastavitev za proces: +ThisIsAlternativeProcessToFollow=To je alternativna nastavitev za proces: StepNb=Korak %s FindPackageFromWebSite=Poiščite paket, ki omogoča funkcijo, ki jo želite (na primer na spletni strani %s). DownloadPackageFromWebSite=Prenesi paket %s. -UnpackPackageInDolibarrRoot=Razpakiraj paketno datoteko v Dolibarr korensko mapo %s +UnpackPackageInDolibarrRoot=Razpakiraj paketno datoteko v mapo, namenjeno eksternim modulom: %s SetupIsReadyForUse=Instalacija je zaključena in Dolibarr je pripravljen na uporabo s to novo komponento. NotExistsDirect=Ni definirana alternativna korenska mapa.
InfDirAlt=Od 3. različice dalje je možno definirati alternativno korensko mapo. To omogoča shranjevanje vtičnikov in uporabniških predlog na isto mesto.
Ustvariti je potrebno samo mapo v korenu Dolibarr (npr: custom).
@@ -389,7 +390,7 @@ ExtrafieldSeparator=Ločilo ExtrafieldCheckBox=Potrditveno polje ExtrafieldRadio=Radijski gumb ExtrafieldCheckBoxFromList= Potrditveno polje iz tabele -ExtrafieldLink=Link to an object +ExtrafieldLink=Poveži z objektom 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
... @@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Seznam parametrov iz tabele
Syntax : table_name:la ExtrafieldParamHelpchkbxlst=Seznam parametrov iz tabele
Syntax : table_name:label_field:id_field::filter
Primer : c_typent:libelle:id::filter

filter je lahko enostaven test (npr active=1) za prikaz samo aktivne vrednosti
če želite filtrirati po dodatnih poljih, uporabite sintakso extra.fieldcode=... (kjer je field code koda dodatnega polja)

če želite, da je seznam odvisen od drugega :
c_typent:libelle:id:parent_list_code|parent_column:filter LibraryToBuildPDF=Uporabljena knjižnica za ustvarjanje PDF WarningUsingFPDF=Pozor: vaš conf.php vsebuje direktivo dolibarr_pdf_force_fpdf=1. To pomeni, da uporabljate knjižnico FPDF za generiranje PDF datotek. Ta knjižnica je stara in ne podpira številnih značilnosti (Unicode, transparentnost slike, cirilico, arabske in azijske jezike, ...), zado lahko med generiranjem PDF pride do napak.
Za rešitev tega problema in polno podporo PDF generiranja, prosimo da naložite TCPDF knjižnico, nato označite kot komentar ali odstranite vrstico $dolibarr_pdf_force_fpdf=1, in namesto nje dodajte $dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir' -LocalTaxDesc=V nekaterih državah so na vsako vrstico računa vezani 2 ali 3 davki. V takem primeru izberite tip in stopnjo drugega in tretjega davka. Možni tipi so:
1 : lokalni davek na proizvode in storitve brez DDV (DDV se ne obračuna na lokalni davek)
2 : lokalni davek na proizvode in storitve pred DDV (DDV se obračuna na znesek + lokalni davek)
3 : lokalni davek na proizvode brez DDV (DDV se ne obračuna na lokalni davek)
4 : lokalni davek na proizvode pred DDV (DDV se obračuna na znesek + lokalni davek)
5 : lokalni davek na storitve brez DDV (DDV se ne obračuna na lokalni davek)
6 : lokalni davek na storitve pred DDV (DDV se obračuna na znesek + lokalni davek) +LocalTaxDesc=V nekaterih državah so na vsako vrstico računa vezani 2 ali 3 davki. V takem primeru izberite tip in stopnjo drugega in tretjega davka. Možni tipi so:
1 : lokalni davek na proizvode in storitve brez DDV (lokalni davek se obračuna na znesek brez DDV)
2 : lokalni davek na proizvode in storitve z DDV (lokalni davek se obračuna na znesek + DDV)
3 : lokalni davek na proizvode brez DDV (lokalni davek se obračuna na znesek brez DDV)
4 : lokalni davek na proizvode z DDV (lokalni davek se obračuna na znesek + DDV)
5 : lokalni davek na storitve brez DDV (lokalni davek se obračuna na znesek brez DDV)
6 : lokalni davek na storitve z DDV (lokalni davek se obračuna na znesek + DDV) SMS=SMS LinkToTestClickToDial=Vnesite telefonsko številko, na katero kličete za prikaz povezave za testiranje ClickToDial url za uporabnika %s RefreshPhoneLink=Osveži pšovezavo @@ -495,30 +496,30 @@ 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 +Module520Name=Posojilo +Module520Desc=Upravljanje posojil 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 +Module770Name=Stroškovno poročilo +Module770Desc=Poročilo upravljanja in stroškov povračil (prevoz, hrana, ...) +Module1120Name=Komercialna ponudba dobavitelja +Module1120Desc=Zahteva za komercialno ponudbo in cene dobavitelja Module1200Name=Mantis Module1200Desc=Mantis integracija Module1400Name=Računovodstvo Module1400Desc=Upravljanje računovodstva (dvostavno) -Module1520Name=Document Generation -Module1520Desc=Mass mail document generation -Module1780Name=Tags/Categories -Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members) +Module1520Name=Generiranje dokumenta +Module1520Desc=Generiranje dokumenta za masovno pošto +Module1780Name=Značke/kategorije +Module1780Desc=Ustvari značke/kategorijo (proizvodi, kupci, dobavitelji, kontakti ali člani) 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=Scheduled job management +Module2300Desc=Načrtovano upravljanje del Module2400Name=Dnevni red Module2400Desc=Upravljanje aktivnosti/nalog in dnevnih redov Module2500Name=Upravljanje elektronskih vsebin @@ -540,8 +541,8 @@ Module6000Name=Potek dela Module6000Desc=Upravljanje poteka dela Module20000Name=Upravljanje zahtevkov za dopust Module20000Desc=Določitev in sledenje zahtevkov za dopustov zaposlenih -Module39000Name=Paket proizvodov -Module39000Desc=Paket serijskih številk, upravljanje proizvodov po datumu prevzema in datumu prodaje +Module39000Name=Lot proizvoda +Module39000Desc=Lot ali serijska številka, upravljana po datumu prevzema in datumu prodaje Module50000Name=PayBox Module50000Desc=Modul za omogočanje strani za spletno plačevanje s kreditno kartico - PayBox Module50100Name=Prodajalne @@ -558,8 +559,6 @@ Module59000Name=Marže Module59000Desc=Modul za upravljanje z maržami Module60000Name=Provizije Module60000Desc=Modul za upravljanje s provizijami -Module150010Name=Paketna številka, datum prevzema in datum prodaje -Module150010Desc=paketna številka, upravljanje proizvodov po datumu prevzema in datumu prodaje Permission11=Branje računov Permission12=Kreiranje/Spreminjanje računov Permission13=Preklic potrditve računov @@ -645,7 +644,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=Order or cancel supplier orders +Permission185=Naročilo ali preklic naročil pri dobaviteljih Permission186=Prejem naročil pri dobaviteljih Permission187=Zaključek naročil pri dobaviteljih Permission188=Preklic naročil pri dobaviteljih @@ -717,11 +716,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 +Permission520=Branje posojil +Permission522=Kreiranje/spreminjanje posojil +Permission524=Delete posojil +Permission525=Dostop do kalkulatorja posojil +Permission527=Izvoz posojil Permission531=Branje storitev Permission532=Kreiranje/spreminjanje storitev Permission534=Brisanje storitev @@ -730,13 +729,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 +Permission771=Branje stroškovnih poročil (lastnih in podrejenih) +Permission772=Kreiranje/spreminjanje stroškovnih poročil +Permission773=Brisanje stroškovnih poročil +Permission774=Branje vseh stroškovnih poročil (tudi za nepodrejene) +Permission775=Odobritev stroškovnih poročil +Permission776=Plačilo stroškovnih poročil +Permission779=Izvoz stroškovnih poročil Permission1001=Branje zalog Permission1002=Kreiranje/spreminjanje skladišč Permission1003=Brisanje skladišč @@ -754,7 +753,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 +Permission1190=Odobri (druga odobritev) naročil pri dobaviteljih Permission1201=pregled rezultatov izvoza Permission1202=Kreiranje/spreminjanje izvoza Permission1231=Branje računov dobavitelja @@ -767,10 +766,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=Read Scheduled job -Permission23002=Create/update Scheduled job -Permission23003=Delete Scheduled job -Permission23004=Execute Scheduled job +Permission23001=Preberi načrtovano delo +Permission23002=Ustvari/posodobi načrtovano delo +Permission23003=Izbriši načrtovano delo +Permission23004=Izvedi načrtovano delo 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 @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= RE obrestno mero za zamudne pri ustvarjanju možnosti, iz LocalTax2IsNotUsedDescES= Privzeto predlagani IRPF je 0. Konec pravila. LocalTax2IsUsedExampleES= V Španiji, samostojnimi in neodvisni strokovnjaki, ki opravljajo storitve in podjetja, ki so se odločili davčni sistem modulov. LocalTax2IsNotUsedExampleES= V Španiji so poslovne niso predmet davčnega sistema modulov. -CalcLocaltax=Poročila -CalcLocaltax1ES=Prodaja - Nabava +CalcLocaltax=Poročila o lokalnih davkih +CalcLocaltax1=Prodaja - Nabava CalcLocaltax1Desc=Poročila o lokalnih davkih so izračunana kot razlika med nabavnimi in prodajnimi davki -CalcLocaltax2ES=Nabava +CalcLocaltax2=Nabava CalcLocaltax2Desc=Poročila o lokalnih davkih so seštevek nabavnih davkov -CalcLocaltax3ES=Prodaja +CalcLocaltax3=Prodaja CalcLocaltax3Desc=Poročila o lokalnih davkih so seštevek prodajnih davkov LabelUsedByDefault=Privzet naziv, če za kodo ne obstaja prevod LabelOnDocuments=Naslov na dokumentu @@ -1018,14 +1017,14 @@ NoEventOrNoAuditSetup=Do sedaj še ni bil zabeležen noben varnostno problemati NoEventFoundWithCriteria=Noben varnostni dogodek ne obstaja glede na podane kriterije iskanja. SeeLocalSendMailSetup=Glejte lokalne nastavitve za pošiljanje pošte BackupDesc=Za izdelavo celotne Dolibarr varnostne kopije (backup), morate: -BackupDesc2=* Shraniti vsebino mape z dokumenti (%s), ki vsebuje vse naložene in generirane datoteke (lahko na primer naredite zip datoteko). -BackupDesc3=* Shranite vsebino vaše baze podatkov v dump datoteko. Za izvedbo lahko sledite tem napotkom. +BackupDesc2=Shrani vsebino mape z dokumenti (%s), ki vsebuje vse naložene in generirane datoteke (lahko na primer naredite zip datoteko). +BackupDesc3=Shranite vsebino vaše baze podatkov (%s) v izpisno datoteko. Za izvedbo lahko sledite tem napotkom. BackupDescX=Arhivsko mapo morate shraniti na varno mesto. BackupDescY=Generirano dump datoteko morate shraniti na varno mesto. BackupPHPWarning=Varnostno kopiranje s to metodo ni zagotovljeno. Raje uporabite prejšnjo RestoreDesc=Za obnovitev Dolibarr varnostne kopije, morate: -RestoreDesc2=* Arhivsko datoteko mape z dokumenti (na primer zip datoteko) razpakirajte kot drevesno strukturo map in datotek v novo Dolibarr instalacijo ali v trenutno mapo z dokumenti (%s). -RestoreDesc3=* Obnovite podatke iz arhivske dump datoteke v bazo podatkov nove Dolibarr instalacije ali v bazo podatkov trenutne instalacije. Pozor, ko je obnova končana, morate za ponovno prijavo uporabiti uporabniško ime/geslo, kakršno je veljalo v trenutku izdelave varnostne kopije. Za obnovitev varnostne kopije baze v trenutno instalacijo, lahko sledite tem napotkom. +RestoreDesc2=Arhivsko datoteko mape z dokumenti (na primer zip datoteko) razpakirajte kot drevesno strukturo map in datotek v novo Dolibarr instalacijo ali v trenutno mapo z dokumenti (%s). +RestoreDesc3=Obnovite podatke iz arhivske dump datoteke v bazo podatkov nove Dolibarr instalacije ali v bazo podatkov trenutne instalacije (%s). Pozor, ko je obnova končana, morate za ponovno prijavo uporabiti uporabniško ime/geslo, kakršno je veljalo v trenutku izdelave varnostne kopije. Za obnovitev varnostne kopije baze v trenutno instalacijo, lahko sledite tem napotkom. RestoreMySQL=Uvoz MySQL ForcedToByAModule= To pravilo je postavljeno v %s z aktivnim modulom PreviousDumpFiles=Datoteke z varnostnimi kopijami podatkovnih baz, ki so na voljo. @@ -1052,8 +1051,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) +ExtraFieldsSupplierOrdersLines=Koplementarni atributi (vrstice naročila) +ExtraFieldsSupplierInvoicesLines=Koplementarni atributi (vrstice računi) ExtraFieldsThirdParties=Koplementarni atributi (partner) ExtraFieldsContacts=Koplementarni atributi (kontakt/naslov) ExtraFieldsMember=Koplementarni atributi (član) @@ -1116,7 +1115,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=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. +NotificationsDesc=Funkcija sporočil po E-pošti omogoča tiho pošiljanje avtomatskih e-mailov o nekaterih Dolibarr dogodkih. Cilji obvestil so lahko definirani kot:
* kontakti pri partnerjih (kupcih ali dobaviteljih), en kontakt naenkrat.
* ali z nastavitvijo globalnega ciljnega email naslova na strani za nastavitev modula. ModelModules=Predloge dokumentov DocumentModelOdt=Ustvari dokumente iz predlog OpenDocuments (.ODT ali .ODS datoteke v programih OpenOffice, KOffice, TextEdit ,...) WatermarkOnDraft=Vodni žig na osnutku dokumenta @@ -1182,12 +1181,12 @@ 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 +AskPriceSupplierSetup=Nastavitev modula cenovnih zahtevkov za dobavitelje +AskPriceSupplierNumberingModules=Modeli številčenja cenovnih zahtevkov za dobavitelje +AskPriceSupplierPDFModules=Modeli dokumentiranja cenovnih zahtevkov za dobavitelje +FreeLegalTextOnAskPriceSupplier=Prosti tekst na cenovnih zahtevkov dobaviteljev +WatermarkOnDraftAskPriceSupplier=Vodni tisk na osnutkih cenovnih zahtevkov za dobavitelje (brez, če je prazno) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Vprašaj za končni bančni račun cenovnega zahtevka ##### Orders ##### OrdersSetup=Nastavitve upravljanja z naročili OrdersNumberingModules=Moduli za številčenje naročil @@ -1337,6 +1336,8 @@ LDAPFieldCountry=Country LDAPFieldCountryExample=Example : c LDAPFieldDescription=Description LDAPFieldDescriptionExample=Example : description +LDAPFieldNotePublic=Javna opomba +LDAPFieldNotePublicExample=Example : publicnote LDAPFieldGroupMembers= Group members LDAPFieldGroupMembersExample= Example : uniqueMember LDAPFieldBirthdate=Birthdate @@ -1419,7 +1420,7 @@ BarcodeDescUPC=Črtna koda tipa UPC BarcodeDescISBN=Črtna koda tipa ISBN BarcodeDescC39=Črtna koda tipa C39 BarcodeDescC128=Črtna koda tipa 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=Orodje za generiranje črtne kode preko komandne vrstice (uporablja ga 'internal engine' za nekatere tipe črtnih kod). Mora biti kompatibilen z "genbarcode".
Na primer: /usr/local/bin/genbarcode BarcodeInternalEngine=Interno orodje BarCodeNumberManager=Upravljanje avtomatskega določanja številk črtnih kod ##### Prelevements ##### @@ -1537,10 +1538,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=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=Onemogoči zmanjšanje zaloge pri prodaji preko POS (če označite "ne", se zaloga zmanjša za vsako prodajo iz POS, ne glede na nastavljeno opcijo v modulu Zaloge). 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Zmanjšanje zaloge v POS ni kompatibilno z upravljanjem lotov CashDeskYouDidNotDisableStockDecease=Niste omogočili zmanjšanje zaloge ob prodaji na prodajnem mestu POS. Potrebno je skladišče. ##### Bookmark ##### BookmarkSetup=Nastavitev modula za zaznamke @@ -1566,7 +1567,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 +IfSetToYesDontForgetPermission=Če je nastavljeno na "da", ne pozabite zagotoviti dovoljenj skupinam ali uporabnikom za drugo odobritev ##### 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 @@ -1607,12 +1608,17 @@ 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. -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 +ExpenseReportsSetup=Nastavitev modula za stroškovna poročila +TemplatePDFExpenseReports=Predloga dokumenta za generiranje stroškovnega poročila +NoModueToManageStockDecrease=Noben modul za upravljanje avtomatskega zmanjševanja zalog ni aktiviran. Zaloge se bodo zmanjšale samo na osnovi ročnega vnosa. +NoModueToManageStockIncrease=Noben modul za upravljanje avtomatskega povečevanja zalog ni aktiviran. Zaloge se bodo povečale samo na osnovi ročnega vnosa. +YouMayFindNotificationsFeaturesIntoModuleNotification=Opcijo za EMail obvestila najdete pri omogočanju in konfiguriranju modula "Obvestila". +ListOfNotificationsPerContact=Seznam obvestil po kontaktih* +ListOfFixedNotifications=Seznam fiksnih obvestil +GoOntoContactCardToAddMore=Pojdite na zavihek "Obvestila" pri kontaktih partnerjev za odstranitev obveščanja za kontakt/naslov +Threshold=Prag +BackupDumpWizard=Čarovnik za ustvarjanje datoteke z varnostnimi kopijami podatkovnih baz +SomethingMakeInstallFromWebNotPossible=Instalacija eksternega modula s spletnega vmesnika ni možna zaradi naslednjega razloga: +SomethingMakeInstallFromWebNotPossible2=Zaradi tega razloga je tukaj opisan postopek samo ročnih korakov, ki jih lahko naredi le uporabnik z dovoljenjem. +InstallModuleFromWebHasBeenDisabledByFile=Instalacijo zunanjega modula iz aplikacije je onemogočil vaš administrator. Prositi ga morate, naj odstrani datoteko %s, da bi omogočil to funkcijo. +ConfFileMuseContainCustom=Instalacija eksternega modula iz aplikacije shrani datoteke modula v mapo %s. da bi Dolibarr procesiral to mapo, morate nastaviti vaš conf/conf.php tako, da bo opcija
- $dolibarr_main_url_root_alt omogočena z vrednostjo $dolibarr_main_url_root_alt="/custom"
- $dolibarr_main_document_root_alt pa z vrednostjo "%s/custom" diff --git a/htdocs/langs/sl_SI/banks.lang b/htdocs/langs/sl_SI/banks.lang index a74dde0ed8556..e6d9a86b5362a 100644 --- a/htdocs/langs/sl_SI/banks.lang +++ b/htdocs/langs/sl_SI/banks.lang @@ -33,11 +33,11 @@ AllTime=Od začetka Reconciliation=Usklajevanje RIB=Transakcijski račun IBAN=IBAN številka -IbanValid=IBAN is Valid -IbanNotValid=IBAN is Not Valid +IbanValid=IBAN je veljaven +IbanNotValid=IBAN ni veljaven BIC=BIC/SWIFT številka -SwiftValid=BIC/SWIFT is Valid -SwiftNotValid=BIC/SWIFT is Not Valid +SwiftValid=BIC/SWIFT je veljaven +SwiftNotValid=BIC/SWIFT ni veljaven StandingOrders=Trajni nalogi StandingOrder=Trajni nalog Withdrawals=Dvigi @@ -152,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=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD +InputReceiptNumber=Izberi bančni izpisek, povezan s posredovanjem. Uporabi numerično vrednost, ki se lahko sortira: YYYYMM ali YYYYMMDD EventualyAddCategory=Eventuelno določi kategorijo, v katero se razvrsti zapis ToConciliate=Za posredovanje? ThenCheckLinesAndConciliate=Nato preveri vrstice na bančnem izpisku in klikni @@ -163,3 +163,5 @@ LabelRIB=Naziv BAN-a NoBANRecord=Ni BAN zapisa DeleteARib=Izbriši BAN zapis ConfirmDeleteRib=Ali zares želite izbrisati ta BAN zapis +StartDate=Začetni datum +EndDate=Končni datum diff --git a/htdocs/langs/sl_SI/boxes.lang b/htdocs/langs/sl_SI/boxes.lang index 0c402a1109e57..5f41943efda7d 100644 --- a/htdocs/langs/sl_SI/boxes.lang +++ b/htdocs/langs/sl_SI/boxes.lang @@ -12,6 +12,7 @@ BoxLastProspects=Zadnje možne stranke BoxLastCustomers=Zadnji kupci BoxLastSuppliers=Zadnji dobavitelji BoxLastCustomerOrders=Zadnja naročila kupcev +BoxLastValidatedCustomerOrders=Zadnja potrjena naročila strank BoxLastBooks=Zadnje vknjižbe BoxLastActions=Zadnje aktivnosti BoxLastContracts=Zadnja naročila @@ -27,26 +28,29 @@ BoxTitleNbOfCustomers=Število kupcev BoxTitleLastRssInfos=Zadnjih %s novic od %s BoxTitleLastProducts=Zadnjih %s spremenjenih proizvodov/storitev BoxTitleProductsAlertStock=Opozorilo za izdelke na zalogi -BoxTitleLastCustomerOrders=Zadnjih %s spremenjenih naročil kupcev +BoxTitleLastCustomerOrders=Zadnjih %s naročil kupcev +BoxTitleLastModifiedCustomerOrders=Zadnja %s spremenjena naročila kupcev BoxTitleLastSuppliers=Zadnjih %s vnesenih dobaviteljev BoxTitleLastCustomers=Zadnjih %s vnesenih kupcev BoxTitleLastModifiedSuppliers=Zadnjih %s spremenjenih dobaviteljev BoxTitleLastModifiedCustomers=Zadnjih %s spremenjenih kupcev -BoxTitleLastCustomersOrProspects=Zadnjih %s spremenjenih kupcev ali možnih strank -BoxTitleLastPropals=Zadnjih %s vnesenih ponudb +BoxTitleLastCustomersOrProspects=Zadnji %s kupci ali možne stranke +BoxTitleLastPropals=Zadnjih %s predlogi +BoxTitleLastModifiedPropals=Zadnje %s spremenjene ponudbe BoxTitleLastCustomerBills=Zadnjih %s računov kupcev +BoxTitleLastModifiedCustomerBills=Zadnji %s spremenjeni računi kupcev BoxTitleLastSupplierBills=Zadnjih %s računov dobaviteljev -BoxTitleLastProspects=Zadnjih %s vnesenih možnih strank +BoxTitleLastModifiedSupplierBills=Zadnji %s spremenjeni računi dobaviteljev BoxTitleLastModifiedProspects=Zadnjih %s spremenjenih možnih kupcev BoxTitleLastProductsInContract=Zadnjih %s proizvodov/storitev v pogodbi -BoxTitleLastModifiedMembers=Zadnjih %s spremenjenih članov +BoxTitleLastModifiedMembers=Zadnjih %s člani BoxTitleLastFicheInter=Zadnjih %s spremenjenih intervencij -BoxTitleOldestUnpaidCustomerBills=Najstarejših %s neplačanih računov kupcev -BoxTitleOldestUnpaidSupplierBills=Najstarejših %s neplačanih računov dobaviteljev +BoxTitleOldestUnpaidCustomerBills=Najstarejši %s neplačani računi strank +BoxTitleOldestUnpaidSupplierBills=Najstarejši %s neplačani računi dobaviteljev BoxTitleCurrentAccounts=Stanja odprtih računov BoxTitleSalesTurnover=Prihodek od prodaje -BoxTitleTotalUnpaidCustomerBills=Neplačani računi kupca -BoxTitleTotalUnpaidSuppliersBills=Neplačani računi dobavitelju +BoxTitleTotalUnpaidCustomerBills=Neplačani računi strank +BoxTitleTotalUnpaidSuppliersBills=Neplačani računi dobaviteljev BoxTitleLastModifiedContacts=Zadnjih %s spremenjenih kontaktov/naslovov BoxMyLastBookmarks=Moji zadnji zaznamki BoxOldestExpiredServices=Najstarejši dejavni potekla storitve @@ -76,7 +80,8 @@ NoContractedProducts=Ni pogodbenih proizvodov/storitev NoRecordedContracts=Ni vnesenih pogodb NoRecordedInterventions=Ni zabeleženih intervencij BoxLatestSupplierOrders=Zadnja naročila pri dobaviteljih -BoxTitleLatestSupplierOrders=%s zadnjih naročil pri dobaviteljih +BoxTitleLatestSupplierOrders=Zadnja %s naročila dobavitelja +BoxTitleLatestModifiedSupplierOrders=Zadnja %s spremenjena naročila dobaviteljev NoSupplierOrder=Ni zabeleženih naročil pri dobavitelju BoxCustomersInvoicesPerMonth=Računi za kupce na mesec BoxSuppliersInvoicesPerMonth=Računi dobaviteljev na mesec @@ -89,3 +94,4 @@ BoxProductDistributionFor=Distribucija of %s za %s ForCustomersInvoices=Računi za kupce ForCustomersOrders=Naročila kupcev ForProposals=Ponudbe +LastXMonthRolling=Obrat zadnjih %s mesecev diff --git a/htdocs/langs/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang index 8f449cc18915a..ef110e2c6f0eb 100644 --- a/htdocs/langs/sl_SI/errors.lang +++ b/htdocs/langs/sl_SI/errors.lang @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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/langs/sl_SI/interventions.lang b/htdocs/langs/sl_SI/interventions.lang index deb4633066115..7234c0c6ab437 100644 --- a/htdocs/langs/sl_SI/interventions.lang +++ b/htdocs/langs/sl_SI/interventions.lang @@ -50,4 +50,4 @@ ArcticNumRefModelError=Aktivacija ni uspela PacificNumRefModelDesc1=Predlaga številko v formatu %syymm-nnnn kjer je yy leto, mm mesec in nnnn zaporedna številka brez presledkov in različna od 0 PacificNumRefModelError=Kartica intervencije, ki se začne z $syymm že obstaja in ni kompatibilna s tem modelom sekvence. Odstranite jo ali jo preimenujte, če želite aktivirati ta modul. PrintProductsOnFichinter=Natisni proizvode na intervencijsko kartico -PrintProductsOnFichinterDetails=za intervencije na osnovi naročil +PrintProductsOnFichinterDetails=intervencije na osnovi naročil diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang index 188b3ac0440b1..4dd37fd72d911 100644 --- a/htdocs/langs/sl_SI/main.lang +++ b/htdocs/langs/sl_SI/main.lang @@ -220,6 +220,7 @@ Next=Naslednji Cards=Kartice Card=Kartica Now=Zdaj +HourStart=Ura začetka Date=Datum DateAndHour=Datum in ura DateStart=Začetni datum @@ -242,6 +243,8 @@ DatePlanShort=Planiran datum DateRealShort=Datum real. DateBuild=Datum izdelave poročila DatePayment=Datum plačila +DateApprove=Datum odobritve +DateApprove2=Datum odobritve (drugi nivo) DurationYear=leto DurationMonth=mesec DurationWeek=teden @@ -352,7 +355,7 @@ Status=Status Favorite=Priljubljen ShortInfo=Info. Ref=Ref. -ExternalRef=Ref. extern +ExternalRef=Zunanja ref. RefSupplier=Ref. dobavitelj RefPayment=Ref. plačilo CommercialProposalsShort=Komercialne ponudbe @@ -395,8 +398,8 @@ Available=Na voljo NotYetAvailable=Še ni na voljo NotAvailable=Ni na voljo Popularity=Priljubljenost -Categories=Tags/categories -Category=Tag/category +Categories=Značke/kategorije +Category=Značka/kategorija By=Z From=Od to=do @@ -408,6 +411,8 @@ OtherInformations=Ostale informacije Quantity=Količina Qty=Kol. ChangedBy=Spremenil +ApprovedBy=Odobril +ApprovedBy2=Odobril (drugi nivo) ReCalculate=Ponovno izračunaj ResultOk=Uspeh ResultKo=Napaka @@ -695,7 +700,9 @@ AddBox=Dodaj okvir SelectElementAndClickRefresh=Izberi element in klikni osveži PrintFile=Natisni datoteko %s ShowTransaction=Prikaži transakcijo -GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide. +GoIntoSetupToChangeLogo=Pojdite na Domov - Nastavitve - Podjetje za spremembo logotipa oz. na Domov - Nastavitve - Prikaz za njegovo skritje. +Deny=Zavrni +Denied=Zavrnjen # Week day Monday=Ponedeljek Tuesday=Torek diff --git a/htdocs/langs/sl_SI/orders.lang b/htdocs/langs/sl_SI/orders.lang index 087279cc90a9a..297489f6cf94d 100644 --- a/htdocs/langs/sl_SI/orders.lang +++ b/htdocs/langs/sl_SI/orders.lang @@ -42,7 +42,7 @@ StatusOrderCanceled=Preklicano StatusOrderDraft=Osnutek (potrebno potrditi) StatusOrderValidated=Potrjeno StatusOrderOnProcess=Naročeno - čaka na prevzem -StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation +StatusOrderOnProcessWithValidation=Naročeno - čaka na prevzem ali potrditev StatusOrderProcessed=Obdelano StatusOrderToBill=Za fakturiranje StatusOrderToBill2=Za fakturiranje @@ -59,13 +59,13 @@ MenuOrdersToBill=Naročila za fakturiranje MenuOrdersToBill2=Naročila za fakturiranje SearchOrder=Iskanje naročila SearchACustomerOrder=Iskanje naročila kupca -SearchASupplierOrder=Search a supplier order +SearchASupplierOrder=Iskanje naročil pri dobaviteljih ShipProduct=Pošlji izdelek Discount=Popust CreateOrder=Kreiraj naročilo RefuseOrder=Zavrni naročilo -ApproveOrder=Approve order -Approve2Order=Approve order (second level) +ApproveOrder=Odobri naročilo +Approve2Order=Odobri naročilo (drugi nivo) ValidateOrder=Potrdi naročilo UnvalidateOrder=Unvalidate red DeleteOrder=Briši naročilo @@ -79,7 +79,9 @@ NoOpenedOrders=Ni odprtih naročil NoOtherOpenedOrders=Ni drugih odprtih naročil NoDraftOrders=Ni osnutkov naročil OtherOrders=Ostala naročila -LastOrders=Zadnjih %s naročil +LastOrders=Zadnjih %s naročil kupca +LastCustomerOrders=Zadnjih %s naročil kupca +LastSupplierOrders=Zadnjih %s naročil pri dobavitelju LastModifiedOrders=Zadnjih %s spremenjenih naročil LastClosedOrders=Zadnjih %s zaključenih naročil AllOrders=Vsa naročila @@ -103,8 +105,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 +RelatedCustomerOrders=Povezana naročila kupcev +RelatedSupplierOrders=Povezana naročila pri dobaviteljih OnProcessOrders=Naročila v obdelavi RefOrder=Ref. naročilo RefCustomerOrder=Ref. naročilo kupca @@ -121,7 +123,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 +FirstApprovalAlreadyDone=Prva odobritev je že narejena ##### 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 c10628fb1367c..da07def671e6d 100644 --- a/htdocs/langs/sl_SI/other.lang +++ b/htdocs/langs/sl_SI/other.lang @@ -12,7 +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_VALIDATE=Naročilo pri dobavitelju je shranjeno 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 @@ -29,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=Supplier order recorded +Notify_ORDER_SUPPLIER_VALIDATE=Naročilo pri dobavitelju je shranjeno 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 @@ -48,20 +48,20 @@ Notify_PROJECT_CREATE=Ustvarjanje projekta Notify_TASK_CREATE=Ustvarjena naloga Notify_TASK_MODIFY=Spremenjena naloga Notify_TASK_DELETE=Izbrisana naloga -SeeModuleSetup=See setup of module %s +SeeModuleSetup=Glejte nastavitev modula %s NbOfAttachedFiles=Število pripetih datotek/dokumentov TotalSizeOfAttachedFiles=Skupna velikost pripetih datotek/dokumentov MaxSize=Največja velikost AttachANewFile=Pripni novo datoteko/dokument LinkedObject=Povezani objekti Miscellaneous=Razno -NbOfActiveNotifications=Number of notifications (nb of recipient emails) +NbOfActiveNotifications=Število obvestil (število emailov prejemnika) 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__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nV prilogi je zahtevek za ceno __ASKREF__\n\n__PERSONALIZED__S spoštovanjem\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__ @@ -171,7 +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. +EMailTextOrderValidatedBy=Naročilo %s je shranil %s EMailTextOrderApprovedBy=Naročilo %s odobril %s EMailTextOrderRefused=Zavrnjeno naročilo %s EMailTextOrderRefusedBy=Naročilo %s zavrnil %s @@ -203,6 +203,7 @@ NewKeyWillBe=Vaši novi podatki za prijavo v program bodo ClickHereToGoTo=K.iknite tukaj za vstop v %s YouMustClickToChange=Vendar morate najprej klikniti na naslednji link za potrditev spremembe gesla ForgetIfNothing=Če niste zahtevali te spremembe, enostavno pozabite na ta email. Vaši prijavni podatki so varno shranjeni. +IfAmountHigherThan=Če je znesek večji od %s ##### Calendar common ##### AddCalendarEntry=Dodaj vnos v koledar %s diff --git a/htdocs/langs/sl_SI/productbatch.lang b/htdocs/langs/sl_SI/productbatch.lang index 452636819653f..85b1d27f3a611 100644 --- a/htdocs/langs/sl_SI/productbatch.lang +++ b/htdocs/langs/sl_SI/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use batch/serial number -ProductStatusOnBatch=Yes (Batch/serial required) -ProductStatusNotOnBatch=No (Batch/serial not used) +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/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 +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial 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 +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %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. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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/sl_SI/projects.lang b/htdocs/langs/sl_SI/projects.lang index d0cd6e6d55623..8ccd9ea2e49e2 100644 --- a/htdocs/langs/sl_SI/projects.lang +++ b/htdocs/langs/sl_SI/projects.lang @@ -14,6 +14,7 @@ MyTasksDesc=Ta pogled je omejen na projekte ali naloge, za katere ste kontaktna 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). +AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. ProjectsArea=Področje projektov NewProject=Nov projekt AddProject=Ustvari projekt diff --git a/htdocs/langs/sl_SI/stocks.lang b/htdocs/langs/sl_SI/stocks.lang index ff1eed4224356..d0bd66253de09 100644 --- a/htdocs/langs/sl_SI/stocks.lang +++ b/htdocs/langs/sl_SI/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Prekliči pošiljko DeleteSending=Izbriši pošiljko Stock=Zaloga Stocks=Zaloge +StocksByLotSerial=Zaloga po lotu/serijski številki Movement=Gibanje Movements=Gibanja ErrorWarehouseRefRequired=Obvezno je referenčno ime skladišča @@ -47,7 +48,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 +IndependantSubProductStock=Zaloga proizvodov in zaloga komponent sta neodvisni QtyDispatched=Odposlana količina QtyDispatchedShort=Odposlana količina QtyToDispatchShort=Količina za odpošiljanje @@ -78,6 +79,7 @@ IdWarehouse=ID skladišča DescWareHouse=Opis skladišča LieuWareHouse=Lokalizacija skladišča WarehousesAndProducts=Skladišča in proizvodi +WarehousesAndProductsBatchDetail=Skladišča in proizvodi (s podrobnostmi o lotu/serijski številki) AverageUnitPricePMPShort=Uravnotežena povprečna vhodna cena AverageUnitPricePMP=Uravnotežena povprečna vhodna cena SellPriceMin=Prodajna cena za enoto @@ -111,7 +113,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=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=To je seznam vseh odprih naročil pri dobaviteljih vključno s prednaročenimi proizvodi. Vidna so samo odprta naročila s prednaročenimi proizvodi, ki lahko vplivajo na stanje zaloge. Replenishments=Obnovitve NbOfProductBeforePeriod=Količina proizvoda %s na zalogi pred izbranim obdobjem (< %s) NbOfProductAfterPeriod=Količina proizvoda %s na zalogi po izbranem obdobju (> %s) @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Ko je vključen modul "produktni lot", mora biti tukaj določeno izvorno skladišče. Uporablja se za seznam lotov/serijskih številk, ki so na voljo za proizvod, ki za premik zahteva lot/serijsko številko. Če želite poslati proizvode iz različnih skladišč, morate narediti pošiljko v več korakih. +InventoryCodeShort=Koda zaloge/premika +NoPendingReceptionOnSupplierOrder=Nobeno odprto naročilo pri dobavitelju ne čaka na dobavo +ThisSerialAlreadyExistWithDifferentDate=Ta lot/serijska številka (%s) že obstaja, vendar z drugim datumom vstopa ali izstopa (najden je %s, vi pa ste vnesli %s). diff --git a/htdocs/langs/sl_SI/suppliers.lang b/htdocs/langs/sl_SI/suppliers.lang index e3604ebde3372..76afb645b51e8 100644 --- a/htdocs/langs/sl_SI/suppliers.lang +++ b/htdocs/langs/sl_SI/suppliers.lang @@ -29,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=Deny this order +DenyingThisOrder=Zavrni to naročilo ConfirmDenyingThisOrder=Ali zares želite zavrniti to naročilo? ConfirmCancelThisOrder=Ali zares želite preklicati to naročilo? AddCustomerOrder=Kreirajte naročilo kupca @@ -43,4 +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) +UseDoubleApproval=Uporabi dvojno potrjevanje (drugo potrditev lahko izvrši katerikoli uporabnik z dodeljenim dovoljenjem) diff --git a/htdocs/langs/sl_SI/trips.lang b/htdocs/langs/sl_SI/trips.lang index 9b9729b3d9e8b..25ec423814a1e 100644 --- a/htdocs/langs/sl_SI/trips.lang +++ b/htdocs/langs/sl_SI/trips.lang @@ -69,11 +69,9 @@ 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 @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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 3df78528d98f1..e823d364258a3 100644 --- a/htdocs/langs/sq_AL/admin.lang +++ b/htdocs/langs/sq_AL/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).
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_ 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) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s RefreshPhoneLink=Refresh link @@ -540,8 +541,8 @@ 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 +Module39000Name=Product lot +Module39000Desc=Lot 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 @@ -558,8 +559,6 @@ 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 @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, 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 +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Sales - Purchases CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Purchases +CalcLocaltax2=Purchases CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Sales +CalcLocaltax3=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 @@ -1018,14 +1017,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 @@ -1337,6 +1336,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 @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= Default account to use to receive payments by credit c 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot 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 @@ -1616,3 +1617,8 @@ 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 +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" diff --git a/htdocs/langs/sq_AL/banks.lang b/htdocs/langs/sq_AL/banks.lang index a2306950fb484..72639883e1ac2 100644 --- a/htdocs/langs/sq_AL/banks.lang +++ b/htdocs/langs/sq_AL/banks.lang @@ -163,3 +163,5 @@ LabelRIB=BAN Label NoBANRecord=No BAN record DeleteARib=Delete BAN record ConfirmDeleteRib=Are you sure you want to delete this BAN record ? +StartDate=Start date +EndDate=End date diff --git a/htdocs/langs/sq_AL/boxes.lang b/htdocs/langs/sq_AL/boxes.lang index e7e9da7dc1b80..c0180bebdaa46 100644 --- a/htdocs/langs/sq_AL/boxes.lang +++ b/htdocs/langs/sq_AL/boxes.lang @@ -12,6 +12,7 @@ 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 @@ -27,26 +28,29 @@ BoxTitleNbOfCustomers=Number of clients 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=Unpaid customer invoices +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 @@ -89,3 +94,4 @@ BoxProductDistributionFor=Distribution of %s for %s ForCustomersInvoices=Customers invoices ForCustomersOrders=Customers orders ForProposals=Proposals +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang index 52e9f6aeae473..dbafde2f6e546 100644 --- a/htdocs/langs/sq_AL/errors.lang +++ b/htdocs/langs/sq_AL/errors.lang @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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/langs/sq_AL/interventions.lang b/htdocs/langs/sq_AL/interventions.lang index c79da05364e61..67d4f61d9f15d 100644 --- a/htdocs/langs/sq_AL/interventions.lang +++ b/htdocs/langs/sq_AL/interventions.lang @@ -50,4 +50,4 @@ 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 +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang index f73388ef0cdea..ce5849c43babc 100644 --- a/htdocs/langs/sq_AL/main.lang +++ b/htdocs/langs/sq_AL/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 @@ -242,6 +243,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 +411,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 @@ -696,6 +701,8 @@ 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. +Deny=Deny +Denied=Denied # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/sq_AL/orders.lang b/htdocs/langs/sq_AL/orders.lang index 3d4f381c40b4d..044bcc0eb0174 100644 --- a/htdocs/langs/sq_AL/orders.lang +++ b/htdocs/langs/sq_AL/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/langs/sq_AL/other.lang b/htdocs/langs/sq_AL/other.lang index 9b2de3eeb9024..6b60f5eac9717 100644 --- a/htdocs/langs/sq_AL/other.lang +++ b/htdocs/langs/sq_AL/other.lang @@ -203,6 +203,7 @@ 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. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=Add entry in calendar %s diff --git a/htdocs/langs/sq_AL/productbatch.lang b/htdocs/langs/sq_AL/productbatch.lang index 452636819653f..85b1d27f3a611 100644 --- a/htdocs/langs/sq_AL/productbatch.lang +++ b/htdocs/langs/sq_AL/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use batch/serial number -ProductStatusOnBatch=Yes (Batch/serial required) -ProductStatusNotOnBatch=No (Batch/serial not used) +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/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 +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial 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 +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %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. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang index 03c11382a2d8b..eac0f41d321f1 100644 --- a/htdocs/langs/sq_AL/projects.lang +++ b/htdocs/langs/sq_AL/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/langs/sq_AL/stocks.lang b/htdocs/langs/sq_AL/stocks.lang index 29706d1761545..c2b432d7f9b93 100644 --- a/htdocs/langs/sq_AL/stocks.lang +++ b/htdocs/langs/sq_AL/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Cancel sending DeleteSending=Delete sending Stock=Stock Stocks=Stocks +StocksByLotSerial=Stock by lot/serial Movement=Movement Movements=Movements ErrorWarehouseRefRequired=Warehouse reference name is required @@ -78,6 +79,7 @@ IdWarehouse=Id warehouse DescWareHouse=Description warehouse LieuWareHouse=Localisation warehouse WarehousesAndProducts=Warehouses and products +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=Weighted average input price AverageUnitPricePMP=Weighted average input price SellPriceMin=Selling Unit Price @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/sq_AL/suppliers.lang b/htdocs/langs/sq_AL/suppliers.lang index d9de79fe84dbc..e0552c064e8ce 100644 --- a/htdocs/langs/sq_AL/suppliers.lang +++ b/htdocs/langs/sq_AL/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) +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/sq_AL/trips.lang b/htdocs/langs/sq_AL/trips.lang index ba36fc9b07b6a..76b214abdb77f 100644 --- a/htdocs/langs/sq_AL/trips.lang +++ b/htdocs/langs/sq_AL/trips.lang @@ -69,11 +69,9 @@ 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 @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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/admin.lang b/htdocs/langs/sv_SE/admin.lang index 69454f180a58d..789630e2262ec 100644 --- a/htdocs/langs/sv_SE/admin.lang +++ b/htdocs/langs/sv_SE/admin.lang @@ -297,10 +297,11 @@ MenuHandlers=Meny hanterar MenuAdmin=Menu Editor DoNotUseInProduction=Använd inte i poroduktion ThisIsProcessToFollow=Detta är inställd för att behandla: +ThisIsAlternativeProcessToFollow=This is an alternative setup to process: StepNb=Steg %s FindPackageFromWebSite=Hitta ett paket som ger funktionen du vill ha (till exempel om %s webbplats). DownloadPackageFromWebSite=Ladda hem paket %s. -UnpackPackageInDolibarrRoot=Packa upp paketet fil till Dolibarr s katalog %s rot +UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: %s SetupIsReadyForUse=Installera är klar och Dolibarr är klar att användas med den nya komponenten. NotExistsDirect=Den alternativa rotkatalogen är inte definierad.
InfDirAlt=Sedab version 3 är det möjligt att definiera en alternativ rotkatalog. Detta medger en gemensam plats att lagra plugin och anpassade mallar.
Skapa en katalog i Dolibarrs rot (t.ex. custom).
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parametrar lista kommer från en tabell
Syntax: 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) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Skriv in ett telefonnummer att ringa upp för att visa en länk för att prova ClickToDial url för användare %s RefreshPhoneLink=Uppdatera länk @@ -511,7 +512,7 @@ Module1400Name=Bokföring Module1400Desc=Bokföring och redovisning (dubbel part) Module1520Name=Document Generation Module1520Desc=Mass mail document generation -Module1780Name=Tags/Categories +Module1780Name=Taggar/Kategorier Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members) Module2000Name=FCKeditor Module2000Desc=WYSIWYG Editor @@ -540,8 +541,8 @@ Module6000Name=Workflow Module6000Desc=Workflow management Module20000Name=Lämna Framställningar förvaltning Module20000Desc=Deklarera och följ de anställda lämnar förfrågningar -Module39000Name=Produktsats -Module39000Desc=Batch eller serienummer, äter-by och bäst före-datum hantering på produkter +Module39000Name=Product lot +Module39000Desc=Lot or serial number, eat-by and sell-by date management on products Module50000Name=Paybox Module50000Desc=Modul för att erbjuda en online-betalning sidan genom kreditkort med Paybox Module50100Name=Point of sales @@ -558,8 +559,6 @@ Module59000Name=Marginaler Module59000Desc=Modul för att hantera marginaler Module60000Name=Provision Module60000Desc=Modul för att hantera uppdrag -Module150010Name=Batchnummer, äter före-datum och bäst före-datum -Module150010Desc=batchnummer, äter före-datum och bäst före-datum hantering för produkt Permission11=Läs fakturor Permission12=Skapa / ändra fakturor Permission13=Unvalidate fakturor @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= RE räntesats som standard när du skapar framtidsutsikte LocalTax2IsNotUsedDescES= Som standard föreslås IRPF är 0. Slut på regeln. LocalTax2IsUsedExampleES= I Spanien, frilansare och oberoende yrkesutövare som tillhandahåller tjänster och företag som har valt skattesystemet i moduler. LocalTax2IsNotUsedExampleES= I Spanien de bussines inte omfattas av skattesystemet i moduler. -CalcLocaltax=Rapporter -CalcLocaltax1ES=Försäljning - Inköp +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Sales - Purchases CalcLocaltax1Desc=Lokala skatter rapporter beräknas med skillnaden mellan localtaxes försäljning och localtaxes inköp -CalcLocaltax2ES=Inköp +CalcLocaltax2=Purchases CalcLocaltax2Desc=Lokala skatter rapporter är summan av localtaxes inköp -CalcLocaltax3ES=Försäljning +CalcLocaltax3=Sales CalcLocaltax3Desc=Lokala skatter rapporter är summan av localtaxes försäljning LabelUsedByDefault=Etikett som används som standard om ingen översättning kan hittas för kod LabelOnDocuments=Etikett på dokument @@ -1018,14 +1017,14 @@ NoEventOrNoAuditSetup=Ingen säkerhet händelsen har registrerats ännu. Detta k NoEventFoundWithCriteria=Ingen säkerhet händelse har konstaterats för sådan sökning sökkriterier. SeeLocalSendMailSetup=Se din lokala sendmail setup BackupDesc=För att göra en fullständig säkerhetskopia av Dolibarr måste du: -BackupDesc2=* Spara innehållet i de dokument katalog (%s) som innehåller alla upp och genererade filer (du kan göra en zip till exempel). -BackupDesc3=* Spara innehållet i din databas till en soptipp fil. för detta kan du använda följande assistent. +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=Arkiverade katalogen bör förvaras på ett säkert ställe. BackupDescY=Den genererade dumpfilen bör förvaras på ett säkert ställe. BackupPHPWarning=Backup kan inte guaranted med denna metod. Föredrar tidigare ett RestoreDesc=Om du vill återställa en Dolibarr säkerhetskopia måste du: -RestoreDesc2=* Återställ arkivfil (zip-fil till exempel) av handlingar katalog att extrahera träd av filer i dokument katalog med en ny Dolibarr anläggning eller i den här aktuella dokument directoy (%s). -RestoreDesc3=* Återställ data från en säkerhetskopia dumpfil in i databasen av den nya Dolibarr installationen eller i databasen för den aktuella installationen. Varning när återställningen är klar måste du använda ett användarnamn / lösenord, som fanns när säkerhetskopian gjordes, att ansluta igen. Om du vill återställa en backup databas i den nuvarande installationen kan du följa denna assistent. +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= Denna regel tvingas %s av en aktiverad modul PreviousDumpFiles=Tillgänglig databas backup dumpfiler @@ -1337,6 +1336,8 @@ LDAPFieldCountry=Land LDAPFieldCountryExample=Exempel: c LDAPFieldDescription=Beskrivning LDAPFieldDescriptionExample=Exempel: beskrivning +LDAPFieldNotePublic=Public Note +LDAPFieldNotePublicExample=Example : publicnote LDAPFieldGroupMembers= Gruppmedlemmar LDAPFieldGroupMembersExample= Exempel: uniqueMember LDAPFieldBirthdate=Födelsedag @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= Konto som ska användas för att ta emot kontant betal 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot 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 @@ -1616,3 +1617,8 @@ 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 +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" diff --git a/htdocs/langs/sv_SE/banks.lang b/htdocs/langs/sv_SE/banks.lang index 2f6dc103262cc..647f145563cdc 100644 --- a/htdocs/langs/sv_SE/banks.lang +++ b/htdocs/langs/sv_SE/banks.lang @@ -163,3 +163,5 @@ LabelRIB=BAN etikett NoBANRecord=Inget BAN rad DeleteARib=Radera BAN rad ConfirmDeleteRib=Är du säker på att du vill ta bort denna BAN rad? +StartDate=Start date +EndDate=End date diff --git a/htdocs/langs/sv_SE/boxes.lang b/htdocs/langs/sv_SE/boxes.lang index a8fadb4e77be0..ba87abe3aaf75 100644 --- a/htdocs/langs/sv_SE/boxes.lang +++ b/htdocs/langs/sv_SE/boxes.lang @@ -94,3 +94,4 @@ BoxProductDistributionFor=Fördelning av %s för %s ForCustomersInvoices=Kundens fakturor ForCustomersOrders=Kund beställningar ForProposals=Förslag +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang index e66c00e339744..1cb706ce1da85 100644 --- a/htdocs/langs/sv_SE/errors.lang +++ b/htdocs/langs/sv_SE/errors.lang @@ -159,14 +159,17 @@ ErrorPriceExpression22=Negativt resultat '%s' 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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=Obligatoriska inställningsparametrarna har ännu inte definierat diff --git a/htdocs/langs/sv_SE/interventions.lang b/htdocs/langs/sv_SE/interventions.lang index 425f32452454a..cee8d499f1980 100644 --- a/htdocs/langs/sv_SE/interventions.lang +++ b/htdocs/langs/sv_SE/interventions.lang @@ -50,4 +50,4 @@ ArcticNumRefModelError=Misslyckades med att aktivera PacificNumRefModelDesc1=Återgå numero med format %syymm-nnnn där YY är år, mm månaden och nnnn är en sekvens utan avbrott och ingen återgång till 0 PacificNumRefModelError=En intervention kort börjar med $ syymm finns redan och är inte förenligt med denna modell för sekvens. Ta bort den eller byta namn på den för att aktivera denna modul. PrintProductsOnFichinter=Trycksaker på interventionskort -PrintProductsOnFichinterDetails=forinterventions genereras från order +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang index 8962281388961..4e333c261f0dc 100644 --- a/htdocs/langs/sv_SE/main.lang +++ b/htdocs/langs/sv_SE/main.lang @@ -220,6 +220,7 @@ Next=Nästa Cards=Kort Card=Kort Now=Nu +HourStart=Start hour Date=Datum DateAndHour=Date and hour DateStart=Startdatum @@ -242,6 +243,8 @@ DatePlanShort=Datum planerat DateRealShort=Datum verkligt. DateBuild=Rapportera byggdatum DatePayment=Datum för betalning +DateApprove=Approving date +DateApprove2=Approving date (second approval) DurationYear=år DurationMonth=månad DurationWeek=vecka @@ -408,6 +411,8 @@ OtherInformations=Övriga upplysningar Quantity=Kvantitet Qty=Antal ChangedBy=Ändrad av +ApprovedBy=Approved by +ApprovedBy2=Approved by (second approval) ReCalculate=Uppdatera beräkning ResultOk=Framgång ResultKo=Misslyckande @@ -696,6 +701,8 @@ 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. +Deny=Deny +Denied=Denied # Week day Monday=Måndag Tuesday=Tisdag diff --git a/htdocs/langs/sv_SE/orders.lang b/htdocs/langs/sv_SE/orders.lang index f7d101378d46a..7913229855382 100644 --- a/htdocs/langs/sv_SE/orders.lang +++ b/htdocs/langs/sv_SE/orders.lang @@ -79,7 +79,9 @@ NoOpenedOrders=Ingen öppnade order NoOtherOpenedOrders=Ingen annan öppnas order NoDraftOrders=Inga förslag till beslut OtherOrders=Övriga beställningar -LastOrders=Senaste %s order +LastOrders=Last %s customer orders +LastCustomerOrders=Last %s customer orders +LastSupplierOrders=Last %s supplier orders LastModifiedOrders=Senast %s uppdaterad order LastClosedOrders=Senaste %s stängd order AllOrders=Alla order diff --git a/htdocs/langs/sv_SE/other.lang b/htdocs/langs/sv_SE/other.lang index 78c95c5c6cdc0..623bba60ef2eb 100644 --- a/htdocs/langs/sv_SE/other.lang +++ b/htdocs/langs/sv_SE/other.lang @@ -203,6 +203,7 @@ NewKeyWillBe=Din nya knappen för att logga in på programvaran kommer att vara ClickHereToGoTo=Klicka här för att gå till %s YouMustClickToChange=Du måste dock först klicka på följande länk för att bekräfta detta lösenord förändring ForgetIfNothing=Om du inte har begärt denna förändring, bara glömma detta mail. Dina referenser förvaras säkert. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=Lägg till post i kalendern %s diff --git a/htdocs/langs/sv_SE/productbatch.lang b/htdocs/langs/sv_SE/productbatch.lang index df95cb13beab2..bb7a9acdc8e74 100644 --- a/htdocs/langs/sv_SE/productbatch.lang +++ b/htdocs/langs/sv_SE/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Använd batch- / serienummer -ProductStatusOnBatch=Ja (batch- / serienr krävs) -ProductStatusNotOnBatch=Nej (batch- / serienr används inte) +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/serial not used) ProductStatusOnBatchShort=Ja ProductStatusNotOnBatchShort=Nej -Batch=Batch / Serial -atleast1batchfield=Ät före-datum eller bäst före-datum eller batchnummer -batch_number=Batch / Serienummer +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial l_eatby=Ät efter datum l_sellby=Sälj före-datum -DetailBatchNumber=Batch / Serial detaljer -DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) -printBatch=Sats: %s +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %s printEatby=Äter med:%s printSellby=Sälj-med :%s 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. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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=Denna artikel använder inte batch- / serienummer diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang index 4d55abdc67c27..72c4e61630c80 100644 --- a/htdocs/langs/sv_SE/projects.lang +++ b/htdocs/langs/sv_SE/projects.lang @@ -14,6 +14,7 @@ MyTasksDesc=Denna syn är begränsad till projekt eller uppdrag du en kontakt f 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). +AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. ProjectsArea=Projekt område NewProject=Nytt projekt AddProject=Skapa projekt diff --git a/htdocs/langs/sv_SE/stocks.lang b/htdocs/langs/sv_SE/stocks.lang index ac0a569d542b2..124e0ad96ad60 100644 --- a/htdocs/langs/sv_SE/stocks.lang +++ b/htdocs/langs/sv_SE/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Avbryt sändning DeleteSending=Radera sändning Stock=Lager Stocks=Lager +StocksByLotSerial=Stock by lot/serial Movement=Förändring Movements=Förändringar ErrorWarehouseRefRequired=Lagrets referensnamn krävs @@ -78,6 +79,7 @@ IdWarehouse=Id lager DescWareHouse=Beskrivning lager LieuWareHouse=Lokalisering lager WarehousesAndProducts=Lager och produkter +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=Vägt genomsnittligt inpris AverageUnitPricePMP=Vägt genomsnittligt inpris SellPriceMin=Säljpris per styck @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/sv_SE/suppliers.lang b/htdocs/langs/sv_SE/suppliers.lang index d11b1ba05e78f..b90a57d97deca 100644 --- a/htdocs/langs/sv_SE/suppliers.lang +++ b/htdocs/langs/sv_SE/suppliers.lang @@ -43,4 +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) +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/sv_SE/trips.lang b/htdocs/langs/sv_SE/trips.lang index 758ffaa367b10..0065634965924 100644 --- a/htdocs/langs/sv_SE/trips.lang +++ b/htdocs/langs/sv_SE/trips.lang @@ -69,11 +69,9 @@ 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 @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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/admin.lang b/htdocs/langs/sw_SW/admin.lang index 3df78528d98f1..e823d364258a3 100644 --- a/htdocs/langs/sw_SW/admin.lang +++ b/htdocs/langs/sw_SW/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).
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_ 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) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s RefreshPhoneLink=Refresh link @@ -540,8 +541,8 @@ 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 +Module39000Name=Product lot +Module39000Desc=Lot 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 @@ -558,8 +559,6 @@ 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 @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, 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 +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Sales - Purchases CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Purchases +CalcLocaltax2=Purchases CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Sales +CalcLocaltax3=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 @@ -1018,14 +1017,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 @@ -1337,6 +1336,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 @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= Default account to use to receive payments by credit c 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot 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 @@ -1616,3 +1617,8 @@ 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 +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" diff --git a/htdocs/langs/sw_SW/banks.lang b/htdocs/langs/sw_SW/banks.lang index a2306950fb484..72639883e1ac2 100644 --- a/htdocs/langs/sw_SW/banks.lang +++ b/htdocs/langs/sw_SW/banks.lang @@ -163,3 +163,5 @@ LabelRIB=BAN Label NoBANRecord=No BAN record DeleteARib=Delete BAN record ConfirmDeleteRib=Are you sure you want to delete this BAN record ? +StartDate=Start date +EndDate=End date diff --git a/htdocs/langs/sw_SW/boxes.lang b/htdocs/langs/sw_SW/boxes.lang index bf118b9b88ed0..c0180bebdaa46 100644 --- a/htdocs/langs/sw_SW/boxes.lang +++ b/htdocs/langs/sw_SW/boxes.lang @@ -94,3 +94,4 @@ BoxProductDistributionFor=Distribution of %s for %s ForCustomersInvoices=Customers invoices ForCustomersOrders=Customers orders ForProposals=Proposals +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/sw_SW/errors.lang b/htdocs/langs/sw_SW/errors.lang index 52e9f6aeae473..dbafde2f6e546 100644 --- a/htdocs/langs/sw_SW/errors.lang +++ b/htdocs/langs/sw_SW/errors.lang @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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/langs/sw_SW/interventions.lang b/htdocs/langs/sw_SW/interventions.lang index c79da05364e61..67d4f61d9f15d 100644 --- a/htdocs/langs/sw_SW/interventions.lang +++ b/htdocs/langs/sw_SW/interventions.lang @@ -50,4 +50,4 @@ 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 +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/sw_SW/main.lang b/htdocs/langs/sw_SW/main.lang index 4b393ec50c5fc..9a32ee6f1ea5a 100644 --- a/htdocs/langs/sw_SW/main.lang +++ b/htdocs/langs/sw_SW/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 @@ -242,6 +243,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 +411,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 @@ -696,6 +701,8 @@ 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. +Deny=Deny +Denied=Denied # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/sw_SW/orders.lang b/htdocs/langs/sw_SW/orders.lang index 3d4f381c40b4d..044bcc0eb0174 100644 --- a/htdocs/langs/sw_SW/orders.lang +++ b/htdocs/langs/sw_SW/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/langs/sw_SW/other.lang b/htdocs/langs/sw_SW/other.lang index 9b2de3eeb9024..6b60f5eac9717 100644 --- a/htdocs/langs/sw_SW/other.lang +++ b/htdocs/langs/sw_SW/other.lang @@ -203,6 +203,7 @@ 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. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=Add entry in calendar %s diff --git a/htdocs/langs/sw_SW/productbatch.lang b/htdocs/langs/sw_SW/productbatch.lang index 452636819653f..85b1d27f3a611 100644 --- a/htdocs/langs/sw_SW/productbatch.lang +++ b/htdocs/langs/sw_SW/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use batch/serial number -ProductStatusOnBatch=Yes (Batch/serial required) -ProductStatusNotOnBatch=No (Batch/serial not used) +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/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 +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial 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 +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %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. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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/projects.lang b/htdocs/langs/sw_SW/projects.lang index 03c11382a2d8b..eac0f41d321f1 100644 --- a/htdocs/langs/sw_SW/projects.lang +++ b/htdocs/langs/sw_SW/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/langs/sw_SW/stocks.lang b/htdocs/langs/sw_SW/stocks.lang index 29706d1761545..c2b432d7f9b93 100644 --- a/htdocs/langs/sw_SW/stocks.lang +++ b/htdocs/langs/sw_SW/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Cancel sending DeleteSending=Delete sending Stock=Stock Stocks=Stocks +StocksByLotSerial=Stock by lot/serial Movement=Movement Movements=Movements ErrorWarehouseRefRequired=Warehouse reference name is required @@ -78,6 +79,7 @@ IdWarehouse=Id warehouse DescWareHouse=Description warehouse LieuWareHouse=Localisation warehouse WarehousesAndProducts=Warehouses and products +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=Weighted average input price AverageUnitPricePMP=Weighted average input price SellPriceMin=Selling Unit Price @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/sw_SW/suppliers.lang b/htdocs/langs/sw_SW/suppliers.lang index d9de79fe84dbc..e0552c064e8ce 100644 --- a/htdocs/langs/sw_SW/suppliers.lang +++ b/htdocs/langs/sw_SW/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) +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/sw_SW/trips.lang b/htdocs/langs/sw_SW/trips.lang index ba36fc9b07b6a..76b214abdb77f 100644 --- a/htdocs/langs/sw_SW/trips.lang +++ b/htdocs/langs/sw_SW/trips.lang @@ -69,11 +69,9 @@ 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 @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang index fcffe3a92bb8a..6ee60191c3edb 100644 --- a/htdocs/langs/th_TH/admin.lang +++ b/htdocs/langs/th_TH/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).
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_ 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) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s RefreshPhoneLink=Refresh link @@ -540,8 +541,8 @@ 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 +Module39000Name=Product lot +Module39000Desc=Lot 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 @@ -558,8 +559,6 @@ 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 @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, 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 +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Sales - Purchases CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Purchases +CalcLocaltax2=Purchases CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Sales +CalcLocaltax3=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 @@ -1018,14 +1017,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 @@ -1337,6 +1336,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 @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= Default account to use to receive payments by credit c 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot 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 @@ -1616,3 +1617,8 @@ 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 +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" diff --git a/htdocs/langs/th_TH/banks.lang b/htdocs/langs/th_TH/banks.lang index a2306950fb484..72639883e1ac2 100644 --- a/htdocs/langs/th_TH/banks.lang +++ b/htdocs/langs/th_TH/banks.lang @@ -163,3 +163,5 @@ LabelRIB=BAN Label NoBANRecord=No BAN record DeleteARib=Delete BAN record ConfirmDeleteRib=Are you sure you want to delete this BAN record ? +StartDate=Start date +EndDate=End date diff --git a/htdocs/langs/th_TH/boxes.lang b/htdocs/langs/th_TH/boxes.lang index e7e9da7dc1b80..c0180bebdaa46 100644 --- a/htdocs/langs/th_TH/boxes.lang +++ b/htdocs/langs/th_TH/boxes.lang @@ -12,6 +12,7 @@ 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 @@ -27,26 +28,29 @@ BoxTitleNbOfCustomers=Number of clients 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=Unpaid customer invoices +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 @@ -89,3 +94,4 @@ BoxProductDistributionFor=Distribution of %s for %s ForCustomersInvoices=Customers invoices ForCustomersOrders=Customers orders ForProposals=Proposals +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang index 52e9f6aeae473..dbafde2f6e546 100644 --- a/htdocs/langs/th_TH/errors.lang +++ b/htdocs/langs/th_TH/errors.lang @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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/langs/th_TH/interventions.lang b/htdocs/langs/th_TH/interventions.lang index c79da05364e61..67d4f61d9f15d 100644 --- a/htdocs/langs/th_TH/interventions.lang +++ b/htdocs/langs/th_TH/interventions.lang @@ -50,4 +50,4 @@ 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 +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/th_TH/main.lang b/htdocs/langs/th_TH/main.lang index c64c5bf88f07d..c40847a872624 100644 --- a/htdocs/langs/th_TH/main.lang +++ b/htdocs/langs/th_TH/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 @@ -242,6 +243,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 +411,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 @@ -696,6 +701,8 @@ 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. +Deny=Deny +Denied=Denied # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/th_TH/orders.lang b/htdocs/langs/th_TH/orders.lang index 3d4f381c40b4d..044bcc0eb0174 100644 --- a/htdocs/langs/th_TH/orders.lang +++ b/htdocs/langs/th_TH/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/langs/th_TH/other.lang b/htdocs/langs/th_TH/other.lang index 9b2de3eeb9024..6b60f5eac9717 100644 --- a/htdocs/langs/th_TH/other.lang +++ b/htdocs/langs/th_TH/other.lang @@ -203,6 +203,7 @@ 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. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=Add entry in calendar %s diff --git a/htdocs/langs/th_TH/productbatch.lang b/htdocs/langs/th_TH/productbatch.lang index 452636819653f..85b1d27f3a611 100644 --- a/htdocs/langs/th_TH/productbatch.lang +++ b/htdocs/langs/th_TH/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use batch/serial number -ProductStatusOnBatch=Yes (Batch/serial required) -ProductStatusNotOnBatch=No (Batch/serial not used) +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/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 +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial 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 +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %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. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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/th_TH/projects.lang b/htdocs/langs/th_TH/projects.lang index 03c11382a2d8b..eac0f41d321f1 100644 --- a/htdocs/langs/th_TH/projects.lang +++ b/htdocs/langs/th_TH/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/langs/th_TH/stocks.lang b/htdocs/langs/th_TH/stocks.lang index 29706d1761545..c2b432d7f9b93 100644 --- a/htdocs/langs/th_TH/stocks.lang +++ b/htdocs/langs/th_TH/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Cancel sending DeleteSending=Delete sending Stock=Stock Stocks=Stocks +StocksByLotSerial=Stock by lot/serial Movement=Movement Movements=Movements ErrorWarehouseRefRequired=Warehouse reference name is required @@ -78,6 +79,7 @@ IdWarehouse=Id warehouse DescWareHouse=Description warehouse LieuWareHouse=Localisation warehouse WarehousesAndProducts=Warehouses and products +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=Weighted average input price AverageUnitPricePMP=Weighted average input price SellPriceMin=Selling Unit Price @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/th_TH/suppliers.lang b/htdocs/langs/th_TH/suppliers.lang index d9de79fe84dbc..e0552c064e8ce 100644 --- a/htdocs/langs/th_TH/suppliers.lang +++ b/htdocs/langs/th_TH/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) +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/th_TH/trips.lang b/htdocs/langs/th_TH/trips.lang index ba36fc9b07b6a..76b214abdb77f 100644 --- a/htdocs/langs/th_TH/trips.lang +++ b/htdocs/langs/th_TH/trips.lang @@ -69,11 +69,9 @@ 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 @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang index e2d152e2ec1cf..c44f2e423b10b 100644 --- a/htdocs/langs/tr_TR/accountancy.lang +++ b/htdocs/langs/tr_TR/accountancy.lang @@ -52,7 +52,7 @@ AccountingVentilationSupplier=Tedarikçi hesabı analizi AccountingVentilationCustomer=Müşteri hesabı analizi Line=Satır -CAHTF=Tedarikçi HT toplam sipariş +CAHTF=Tedarikçi HT toplam alışı InvoiceLines=Analiz edilecek fatura kalemleri InvoiceLinesDone=Analiz edilen fatura kalemleri IntoAccount=Muhasebe hesabında @@ -80,7 +80,7 @@ ACCOUNTING_LENGTH_GACCOUNT=Genel hesapların uzunluğu ACCOUNTING_LENGTH_AACCOUNT=Üçüncü parti hesaplarının uzunluğu ACCOUNTING_SELL_JOURNAL=Satış günlüğü -ACCOUNTING_PURCHASE_JOURNAL=Satınalma günlüğü +ACCOUNTING_PURCHASE_JOURNAL=Alış günlüğü ACCOUNTING_BANK_JOURNAL=Banka günlüğü ACCOUNTING_CASH_JOURNAL=Kasa günlüğü ACCOUNTING_MISCELLANEOUS_JOURNAL=Çeşitli günlük @@ -109,9 +109,9 @@ Codejournal=Günlük DelBookKeeping=Büyük defter kayıtlarını sil SellsJournal=Satış günlüğü -PurchasesJournal=Satınalma günlüğü +PurchasesJournal=Alış günlüğü DescSellsJournal=Satış günlüğü -DescPurchasesJournal=Satınalma günlüğü +DescPurchasesJournal=Alış günlüğü BankJournal=Banka günlüğü DescBankJournal=Nakit dışında her türlü ödemeyi içeren banka günlüğü CashJournal=Kasa günlüğü diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang index a79c568991227..75998b5e64e81 100644 --- a/htdocs/langs/tr_TR/admin.lang +++ b/htdocs/langs/tr_TR/admin.lang @@ -297,10 +297,11 @@ MenuHandlers=Menü işlemcileri MenuAdmin=Menü düzenleyici DoNotUseInProduction=Üretimde kullanmayın ThisIsProcessToFollow=Bu ayarlama işlemidir: +ThisIsAlternativeProcessToFollow=Bu bir alternatif işlem ayarıdır: StepNb=Adım %s FindPackageFromWebSite=İstediğiniz özelliği sağlayan bir paket bulun (örneğin; resmi web sitesinden %s). DownloadPackageFromWebSite=%s Paketini indir. -UnpackPackageInDolibarrRoot=Dosya paketini Dolibarr'ın kök dizinine aç %s +UnpackPackageInDolibarrRoot=Paket dosyasını dış modüllere ayrılmış dizin içine aç: %s SetupIsReadyForUse=Kurma işlemi bitmiştir ve Dolibarr bu yeni bileşeni ile kullanıma hazırdır. NotExistsDirect=Alternatif kök dizin tanımlanmamış.
InfDirAlt=Sürüm 3 ten beri bir alternatif kök dizin tanımlanabiliyor. Bu sizin bir miktar boşluk, eklentiler ve özel şablonlar depolamanızı sağlar.
Yalnızca Dolibarr kökünde bir dizin oluşturun (örn. özel).
@@ -389,7 +390,7 @@ ExtrafieldSeparator=Ayırıcı ExtrafieldCheckBox=Onay kutusu ExtrafieldRadio=Onay düğmesi ExtrafieldCheckBoxFromList= Tablodan açılır kutu -ExtrafieldLink=Link to an object +ExtrafieldLink=Bir nesneye bağlantı 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
... @@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parametre listesi bir tablodan gelir
Sözdizimi : ExtrafieldParamHelpchkbxlst=Parametre listesi bir tablodan gelir
Sözdizimi : table_name:label_field:id_field::filter
Örnek: c_typent:libelle:id::filter

süzgeç yalnızca etkin değeri gösteren (eg active=1) basit bir test olabilir
daha çok alanda süzecekseniz bu söz dizimini kullanın extra.fieldcode=... (burada kod ek alanın kodudur)

Başkasına dayalı listeyi almak için :
c_typent:libelle:id:parent_list_code|parent_column:filter LibraryToBuildPDF=PDF oluşturmada kullanılan kütüphane 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) +LocalTaxDesc=Bazı ülkelerde her fatura satırına 2 ya da 3 tane vergi uygulanır. Böyle bir durum varsa, ikinci ve üçüncü vergi türünü ve oranını seçin. Olası türler:
1 : ürün ve hizmetlere uygulanan kdv siz yerel vergi (yerel vergi tutar üzerinden kdv siz olarak hesaplanır))
2 : ürün ve hizmetlere kdv dahil olarak hesaplanan yerel vergi (yerel vergi tutar + ana vergi üzerinden hesaplanır)
3 : ürünlere uygulanan kdv siz yerel vergi (yerel vergi tutar üzerinden kdv hariç hesaplanır))
4 : yerel vergi ürünlerde kdv dahil uygulanır (kdv tutar + ana kdv üzerinden hesaplanır)
5 : yerel vergi ürünlerde kdv siz olarak uygulanır (yerel vergi tutar üzerinden kdv siz olarak hesaplanır)
6 : yerel vergi hizmetlere kdv dahil uygulanır (yeel vergi tutar + vergi üzerinden hesaplanır) SMS=SMS LinkToTestClickToDial=Kullanıcı %s için ClickTodial url denemesi yapmak üzere gösterilecek bağlantıyı aramak için bir telefon numarası gir RefreshPhoneLink=Bağlantıyı yenile @@ -495,8 +496,8 @@ 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 +Module520Name=Borç +Module520Desc=Borçların yönetimi 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 @@ -511,14 +512,14 @@ Module1400Name=Muhasebe Module1400Desc=Muhasebe yönetimi (her iki parti için) Module1520Name=Belge Oluşturma Module1520Desc=Toplu posta belgesi oluşturma -Module1780Name=Tags/Categories -Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members) +Module1780Name=Etiketler/Kategoriler +Module1780Desc=Etiket/kategori oluştur (ürünler, müşteriler, tedarikçiler, kişiler ya da üyeler) 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=Scheduled job management +Module2300Desc=Planlı iş yönetimi Module2400Name=Gündem Module2400Desc=Etkinlikler/görevler ve gündem yönetimi Module2500Name=Elektronik İçerik Yönetimi @@ -540,8 +541,8 @@ Module6000Name=İş akışı Module6000Desc=İş akışı yönetimi Module20000Name=İzin İstekleri yönetimi Module20000Desc=Çalışanların izin isteklerini bildirin ve izleyin -Module39000Name=Ürün kümesi -Module39000Desc=Parti ya da seri numarası, ürünlerin son yenme tarihi ve son satma tarihi yönetimi +Module39000Name=Ürün partisi +Module39000Desc=Ürünlerde ürün ya da seri numarası, son tüketme ve son satma tarihi yönetimi Module50000Name=PayBox Module50000Desc=PayBox modülü ile kredi kartı ile çevrimiçi ödeme sayfası sunmak için Module50100Name=Satış Noktaları @@ -558,8 +559,6 @@ Module59000Name=Oranlar Module59000Desc=Oran yönetimi modülü Module60000Name=Komisyonlar Module60000Desc=Komisyon yönetimi modülü -Module150010Name=Parti numarası, son yenme tarihi ve son satış tarihi -Module150010Desc=ürünün parti numarası, son yenme tarihi ve son satış tarihi yönetimi Permission11=Müşteri faturalarını oku Permission12=Müşteri faturaları oluştur/düzenle Permission13=Müşteri faturalarının doğrulamasını kaldır @@ -717,11 +716,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 +Permission520=Borçları oku +Permission522=Borç oluştur/değiştir +Permission524=Borç sil +Permission525=Borç hesaplayıcısına erişim +Permission527=Borç dışaaktar Permission531=Hizmet oku Permission532=Hizmet oluştur/değiştir Permission534=Hizmet sil @@ -754,7 +753,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 +Permission1190=Tedarikçi siparişlerini onayla (ikinci onay) Permission1201=Bir dışaaktarma sonucu al Permission1202=Dışaaktarma oluştur/değiştir Permission1231=Tedarikçi faturalarını oku @@ -767,10 +766,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=Read Scheduled job -Permission23002=Create/update Scheduled job -Permission23003=Delete Scheduled job -Permission23004=Execute Scheduled job +Permission23001=Planlı iş oku +Permission23002=Planlı iş oluştur/güncelle +Permission23003=Planlı iş sil +Permission23004=Planlı iş yürüt 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 @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= Adayları, faturaları, siparişleri, v.s. oluştururken LocalTax2IsNotUsedDescES= Varsayılan olarak önerilen IRPF 0. Kural sonu. LocalTax2IsUsedExampleES= İspanya'da, hizmet işleri yapan serbest meslek sahipleri ve bağımsız uzmanlar ile bu vergi sistemini seçen firmalardır. LocalTax2IsNotUsedExampleES= İspanya’da vergi sistemine tabi olmayan işler. -CalcLocaltax=Raporlar -CalcLocaltax1ES=Satışlar - Satınalmalar -CalcLocaltax1Desc=Yerel Vergi raporları, yerek satış vergileri ile yerel satınalma vergileri farkı olarak hesaplanır -CalcLocaltax2ES=Satınalmalar -CalcLocaltax2Desc=Yerel Vergi raporları satınalmaların yerel vergileri toplamıdır -CalcLocaltax3ES=Satışlar +CalcLocaltax=Yerel vergi raporları +CalcLocaltax1=Satışlar - Alışlar +CalcLocaltax1Desc=Yerel Vergi raporları, yerel satış vergileri ile yerel alış vergileri farkı olarak hesaplanır +CalcLocaltax2=Alışlar +CalcLocaltax2Desc=Yerel Vergi raporları alımların yerel vergileri toplamıdır +CalcLocaltax3=Satışlar CalcLocaltax3Desc=Yerel Vergi raporları satışların yerel vergileri toplamıdır LabelUsedByDefault=Hiçbir çeviri kodu bulunmuyorsa varsayılan olarak kullanılan etiket LabelOnDocuments=Belgeler üzerindeki etiket @@ -1018,14 +1017,14 @@ NoEventOrNoAuditSetup=Hiçbir güvenlik etkinliği henüz kaydedilmedi. Eğer NoEventFoundWithCriteria=Bu arama kriteri için herhangi bir güvenlik etkinliği bulunamadı. SeeLocalSendMailSetup=Yerel postagönder kurulumunuza bakın BackupDesc=Tam bir Dolibarr yedeklemesi için şunları yapmalısınız: -BackupDesc2=* Gönderilen ve oluşturulan dosyaları içeren (%s) belge dizinin içeriğini kaydedin(örneğin bir zip dosyası yapabilirsiniz). -BackupDesc3=* Bir bilgi döküm dosyası halinde veritabanı içeriğini kaydedin. Bunun için, aşağıdaki yardımcıyı kullanabilirsiniz. +BackupDesc2=Tüm gönderilen ve oluşturulan dosyaları (örneğin bir zip dosyası yapabilirsiniz) içeren belge dizininin (%s) içeriğini kaydedin. +BackupDesc3=Veritabanınızın içeriğini (%s) bir döküm dosyasına kaydedin. Bunun için, aşağıdaki yardımcıyı kullanabilirsiniz. BackupDescX=Arşivlenmiş dizin güvenli bir yerde korunmalıdır. BackupDescY=Üretilen bilgi döküm dosyası güvenli bir yerde korunmalıdır. BackupPHPWarning=Bu yöntemle yedekleme garanti edilmez. Öncekini yeğleyin RestoreDesc=Bir Dolibarr yedeklemesini geri yüklemek için şunları yapmalısınız: -RestoreDesc2=Yeni Dolibarr kurulum dizini belgeleri dosyaların ağaç ayıklamak için veya bu belgeleri geçerli dizinle içine (% s) listesi arşiv dosyası belgeleri (örneğin zip dosyası) Restore. * Belge dizini arşiv dosyalarını yeni Dolibarr kurulumundaki ya da bu geçerli belge dizinindeki dizine ayıklamak için geri yükleyin(%s). -RestoreDesc3=* Bir yedek dökümü dosyasından, yeni Dolibarr yükleme veritabanına verileri geri yükleyin veya bu geçerli yükleme veritabanına geri yükleyin. Uyarı, geri yükleme bir kez tamamlandığında, yeniden bağlanmak için yedekleme yapılırken varolan bir kullanıcı adı/parola kullanmanız gerekir. Bu geçerli yükleme içine yedekleme veritabanını geri yüklemek için, bu yardımcıyı takip edebilirsiniz. +RestoreDesc2=Belgeler dizinindeki dosya ağacını ayıklamak için arşiv dosyasını (örneğin zip dosyası) yeni bir Dolibarr kurulumu belge dizinine ya da bu mevcut belge dizinine ayıklayın (%s). +RestoreDesc3=Veriyi bir yedekleme döküm dosyasından, yeni Dolibarr kurulumu veritabanına ya da geçerli kurulumun veritabanına geri yükleyin (%s). Uyarı, geri yükleme tamamlandıktan sonra yeniden bağlanabilmek için yedekleme yapıldığı sırada varolan bir kullanıcı adı/parolası kullanmalısınız. Bu geçerli kuruluma yedekleme veritabanını geri yüklemek için aşağıdaki yardımcıyı kullanabilirsiniz. RestoreMySQL=MySQL içeaktar ForcedToByAModule= Bu kural bir aktif modül tarafından s ye zorlanır PreviousDumpFiles=Mevcut veritabanı yedekleme dosyaları dökümü @@ -1116,7 +1115,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=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. +NotificationsDesc=Eposta özelliği, bazı Dolibarr etkinlikleri için sessiz ve otomatik olarak posta göndermenizi sağlar. Bildirim hedefleri şu şekilde tanımlanabilir:
* her üçüncü parti kişisine (müşteri ya da tedarikçi), aynı anda bir kişiye.
* ya da modül ayarları sayfasında genel eposta hedeflerini tanımlayarak. ModelModules=Belge şablonları DocumentModelOdt=OpenDocuments şablonlarından belgeler oluşturun (OpenOffice, KOffice, TextEdit .ODT veya .ODS dosyaları) WatermarkOnDraft=Taslak belge üzerinde filigran @@ -1337,6 +1336,8 @@ LDAPFieldCountry=Ülke LDAPFieldCountryExample=Örnek: c LDAPFieldDescription=Açıklamalar LDAPFieldDescriptionExample=Örnek: açıklamalar +LDAPFieldNotePublic=Genel Not +LDAPFieldNotePublicExample=Örnek: genelnot LDAPFieldGroupMembers= Grup üyeleri LDAPFieldGroupMembersExample= Örnek: benzersizÜye LDAPFieldBirthdate=Doğum Günü @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= Nakit ödemeleri kredi kartıyla almak için kullanıl 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=POS ta stok eksiltmesi toplu yönetmeyle uyumlu değil +StockDecreaseForPointOfSaleDisabledbyBatch=POS taki stok eksiltmesi parti yönetimi ile uyumlu değildir. CashDeskYouDidNotDisableStockDecease=Satış Noktasından satış yapılırken stok eksiltilmesini engellemediniz. Bu durumda depo gereklidir. ##### Bookmark ##### BookmarkSetup=Yerimi modülü kurulumu @@ -1566,7 +1567,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 +IfSetToYesDontForgetPermission=Evet olarak ayarlıysa, ikinci onayı sağlayacak grup ve kullanıcılara izin sağlamayı unutmayın ##### 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 @@ -1611,8 +1612,13 @@ 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 +YouMayFindNotificationsFeaturesIntoModuleNotification="Bildirimler" modülünü etkinleştirerek ve yapılandırarak Eposta bildirimleri seçeneklerini bulabilirsiniz. +ListOfNotificationsPerContact=Kişi başına bildirimler listesi* +ListOfFixedNotifications=Sabit bildirimler listesi +GoOntoContactCardToAddMore=Kişilerden/adreslerden bildirimleri kaldırmak için üçüncü parti kişileri "Bildirimler" sekmesine git +Threshold=Sınır +BackupDumpWizard=Veritabanı yedekleme döküm dosyası oluşturma sihirbazı +SomethingMakeInstallFromWebNotPossible=Web arayüzünden dış modül kurulumu aşağıdaki nedenden ötürü olanaksızdır: +SomethingMakeInstallFromWebNotPossible2=Bu nedenle, burada anlatılan yükseltme işlemi yalnızca ayrıcalıklı bir kullanıcın elle atacağı adımlardır. +InstallModuleFromWebHasBeenDisabledByFile=Dış modülün uygulama içerisinden kurulumu yöneticiniz tarafından engellenmiştir. Bu özelliğe izin verilmesi için ondan %s dosyasını kaldırmasını istemelisiniz. +ConfFileMuseContainCustom=Uygulama içerisinden dış modül kurarken modül dosyalarını %s dizini içinde kaydedin. Bu dizinin Dolibarr tarafından işlenebilmesi için conf/conf.php nizi ayarlayın
- $dolibarr_main_url_root_alt seçeneğini elde etmek için değeri buna $dolibarr_main_url_root_alt="/custom" etkinleştirin
- $dolibarr_main_document_root_alt değerini ise "%s/custom" a etkinleştirin. diff --git a/htdocs/langs/tr_TR/agenda.lang b/htdocs/langs/tr_TR/agenda.lang index 1821f49cad310..2df600befe401 100644 --- a/htdocs/langs/tr_TR/agenda.lang +++ b/htdocs/langs/tr_TR/agenda.lang @@ -49,9 +49,9 @@ 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ı -OrderDeliveredInDolibarr=Order %s classified delivered +OrderDeliveredInDolibarr=%s Sınıfı sipariş sevkedildi OrderCanceledInDolibarr=%s Siparişi iptal edildi -OrderBilledInDolibarr=Order %s classified billed +OrderBilledInDolibarr=%s Sınıfı sipariş faturalandı OrderApprovedInDolibarr=%s Siparişi onayladı OrderRefusedInDolibarr=Reddedilen teklif %s OrderBackToDraftInDolibarr=%s Siparişini taslak durumuna geri götür @@ -94,5 +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 +ActionType=Etkinlik türü +DateActionBegin=Etkinlik başlangıç tarihi diff --git a/htdocs/langs/tr_TR/banks.lang b/htdocs/langs/tr_TR/banks.lang index 77b0858125dd2..6c21db8419dd8 100644 --- a/htdocs/langs/tr_TR/banks.lang +++ b/htdocs/langs/tr_TR/banks.lang @@ -163,3 +163,5 @@ LabelRIB=BAN Etiketi NoBANRecord=BAN kaydı yok DeleteARib=BAN kaydını sil ConfirmDeleteRib=Bu BAN kaydını silmek istediğinize emin misiniz? +StartDate=Başlangıç tarihi +EndDate=Bitiş tarihi diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang index b799ca33cd3a5..257f4b46653a2 100644 --- a/htdocs/langs/tr_TR/bills.lang +++ b/htdocs/langs/tr_TR/bills.lang @@ -294,10 +294,11 @@ 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 +RelatedCustomerInvoices=İlgili müşteri faturaları +RelatedSupplierInvoices=İlgili tedarikçi faturaları LatestRelatedBill=Son ilgili fatura WarningBillExist=Uyarı, bir yada çok fatura zaten var +MergingPDFTool=Birleştirme PDF aracı # PaymentConditions PaymentConditionShortRECEP=Derhal diff --git a/htdocs/langs/tr_TR/boxes.lang b/htdocs/langs/tr_TR/boxes.lang index 5d88bf29ebc7b..36df7f25b967a 100644 --- a/htdocs/langs/tr_TR/boxes.lang +++ b/htdocs/langs/tr_TR/boxes.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - boxes BoxLastRssInfos=Rss bilgileri BoxLastProducts=Son %s ürün/hizmet -BoxProductsAlertStock=Stoktaki ürün uyarısı +BoxProductsAlertStock=Stok uyarısındaki ürünler BoxLastProductsInContract=Son %s sözleşmeli ürün/hizmet BoxLastSupplierBills=Son tedarikçi faturaları BoxLastCustomerBills=Son müşteri faturaları @@ -94,3 +94,4 @@ BoxProductDistributionFor=%sin %s içindeki dağılımı ForCustomersInvoices=Müşteri faturaları ForCustomersOrders=Müşteri siparişleri ForProposals=Teklifler +LastXMonthRolling=Devreden son %s ay diff --git a/htdocs/langs/tr_TR/cashdesk.lang b/htdocs/langs/tr_TR/cashdesk.lang index cabc60ec36c86..521d781542ae5 100644 --- a/htdocs/langs/tr_TR/cashdesk.lang +++ b/htdocs/langs/tr_TR/cashdesk.lang @@ -22,7 +22,7 @@ SellFinished=Satış bitti PrintTicket=Fiş yazdır NoProductFound=Hiç mal bulunamadı ProductFound=ürün bulundu -ProductsFound=ürünler bulundu +ProductsFound=bulunan ürünler NoArticle=Mal yok Identification=Kimlik saptama Article=Mal diff --git a/htdocs/langs/tr_TR/categories.lang b/htdocs/langs/tr_TR/categories.lang index 3eeda08ff7306..752f0f18da9aa 100644 --- a/htdocs/langs/tr_TR/categories.lang +++ b/htdocs/langs/tr_TR/categories.lang @@ -1,62 +1,62 @@ # 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=Etiket/Kategori +Rubriques=Etiketler/Kategoriler +categories=etiketler/kategoriler +TheCategorie=etiket/kategori +NoCategoryYet=Bu türde oluşturulmuş etiket/kategori yok In=İçinde AddIn=Eklenti modify=değiştir Classify=Sınıflandır -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 +CategoriesArea=Etiketler/Kategoriler alanı +ProductsCategoriesArea=Ürünler/Hizmetler etiketleri/kategorileri alanı +SuppliersCategoriesArea=Tedarikçi etiketleri/kategorileri alanı +CustomersCategoriesArea=Müşteri etiketleri/kategorileri alanı +ThirdPartyCategoriesArea=Üçüncü parti etiketleri/kategorileri alanı +MembersCategoriesArea=Üyeler etiketleri/kategorileri alanı +ContactsCategoriesArea=Kişi etiketleri/kategorileri alanı +MainCats=Ana etiketler/kategoriler alanı SubCats=Alt kategoriler CatStatistics=İstatistikler -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 +CatList= Etiketler/kategoriler listesi +AllCats=Tüm etiketler/kategoriler +ViewCat=Etiket/kategori izle +NewCat=Etiket/kategori ekle +NewCategory=Yeni etiket/kategori +ModifCat=Etiket/kategori değiştir +CatCreated=Etiket/kategori oluşturuldu +CreateCat=Etiket/kategori oluştur +CreateThisCat=Bu etiketi/kategoriyi oluştur ValidateFields=Alanları doğrula NoSubCat=Alt kategori yok. SubCatOf=Alt 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 +FoundCats=Etiket/kategori bul +FoundCatsForName=Bu isim için bulanan etiketler/kategoriler: +FoundSubCatsIn=Etiket/kategoride bulunan alt kategoriler +ErrSameCatSelected=Birçok defa aynı etiketi/kategoriyi seçtiniz +ErrForgotCat=Etiket/kategori seçmeyi unuttunuz ErrForgotField=Alanlara bilgi girmeyi unuttunuz ErrCatAlreadyExists=Bu ad zaten kullanılıyor -AddProductToCat=Add this product to a tag/category? -ImpossibleAddCat=Impossible to add the tag/category -ImpossibleAssociateCategory=Impossible to associate the tag/category to +AddProductToCat=Bu ürün bir etikete/kategoriye eklensin mi? +ImpossibleAddCat=Etiketin/kategorinin eklenmesi olanaksız +ImpossibleAssociateCategory=Etiketin/kategorinin şununla ilişkilendirilmesi olanaksız: WasAddedSuccessfully=%s başarıyla eklendi. -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 +ObjectAlreadyLinkedToCategory=Öğe zaten bu etiketle/kategoriyle ilişkilendirilmiş +CategorySuccessfullyCreated=Bu etiket/kategori %s başarıyla eklendi +ProductIsInCategories=Ürün/hizmet bu etikete/kategoriye sahip +SupplierIsInCategories=Üçüncü parti bu tedarikçi etiketine/kategorisine sahip +CompanyIsInCustomersCategories=Bu üçüncü parti aşağıdaki müşteri/aday etiketlerine/kategorilerine sahiptir +CompanyIsInSuppliersCategories=Bu üçüncü parti aşağıdaki tedarikçi etiketlerine/kategorilerine sahiptir +MemberIsInCategories=Bu üye aşağıdaki üye etiketlerine/kategorilerine sahiptir +ContactIsInCategories=Bu kişi şu etiketlere/kategorilere sahip +ProductHasNoCategory=Bu ürün/hizmet hiçbir etikette/kategoride yoktur +SupplierHasNoCategory=Bu tedarikçi hiçbir etikette/kategoride yoktur +CompanyHasNoCategory=Bu firma hiçbir etikette/kategoride yoktur +MemberHasNoCategory=Bu üye hiçbir etikette/kategoride yoktur +ContactHasNoCategory=Bu kişi hiçbir etikette/kategoride yok +ClassifyInCategory=Etikette/kategoride sınıflandır NoneCategory=Hiçbiri -NotCategorized=Without tag/category +NotCategorized=Etiketsiz/kategorisiz 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 @@ -64,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=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 +CategoriesTree=Etiket/kategori ağacı +DeleteCategory=Etiket/kategori sil +ConfirmDeleteCategory=Bu etiketi/kategoriyi silmek istediğinizden emin misiniz? +RemoveFromCategory=Bağlantıyı etiketi/kategorisi ile birlikte kaldır +RemoveFromCategoryConfirm=İşlem ve etiket/kategori arasındaki bağlantıyı kaldırmak istediğinizden emin misiniz? +NoCategoriesDefined=Tanımlı etiket/kategori yok +SuppliersCategoryShort=Tedarikçi etiketleri/kategorisi +CustomersCategoryShort=Müşteri etiketleri/kategorisi +ProductsCategoryShort=Ürün etiketleri/kategorisi +MembersCategoryShort=Üye etiketleri/kategorisi +SuppliersCategoriesShort=Tedarikçi etiketleri/kategorileri +CustomersCategoriesShort=Müşteri etiketleri/kategorileri CustomersProspectsCategoriesShort=Müşt./aday kategorileri -ProductsCategoriesShort=Products tags/categories -MembersCategoriesShort=Members tags/categories -ContactCategoriesShort=Contacts tags/categories +ProductsCategoriesShort=ürün etiketleri/kategorileri +MembersCategoriesShort=Üye etiketleri/kategorileri +ContactCategoriesShort=Kişi etiketleri/kategorileri 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. @@ -88,23 +88,23 @@ ThisCategoryHasNoContact=Bu kategori herhangi bir kişi içermiyor. AssignedToCustomer=Bir müşteriye atanmış AssignedToTheCustomer=Müşteriye atanmış InternalCategory=İç 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 +CategoryContents=Etiket/kategori içeriği +CategId=Etiket/kategori kimliği +CatSupList=Tedarikçi etiketleri/kategorileri listesi +CatCusList=Müşteri/aday etiketleri/kategorileri listesi +CatProdList=Ürün etiketleri/kategorileri listesi +CatMemberList=Üye etiketleri/kategorileri listesi +CatContactList=Kişi etiketleri/kategorileri ve kişi listesi +CatSupLinks=Tedarikçiler ve etiketler/kategoriler arasındaki bağlantılar +CatCusLinks=Müşteriler/adaylar ve etiketler/kategoriler arasındaki bağlantılar +CatProdLinks=Ürünler/hizmetler ve etiketler/kategoriler arasındaki bağlantılar +CatMemberLinks=Üyeler ve etiketler/kategoriler arasındaki bağlantılar +DeleteFromCat=Etiketlerden/kategorilerden kaldır DeletePicture=Resim silindi ConfirmDeletePicture=Resim silmeyi onayla ExtraFieldsCategories=Tamamlayıcı öznitelikler -CategoriesSetup=Tags/categories setup -CategorieRecursiv=Link with parent tag/category automatically +CategoriesSetup=Etiket/kategori ayarları +CategorieRecursiv=Otomatik ana etiketli/kategorili bağlantı CategorieRecursivHelp=Etkinse, ürün bir alt kategoriye eklenirken aynı zamanda ana kategoriye de eklenecektir AddProductServiceIntoCategory=Aşağıdaki ürünü/hizmeti ekle -ShowCategory=Show tag/category +ShowCategory=Etiketi/kategoriyi göster diff --git a/htdocs/langs/tr_TR/companies.lang b/htdocs/langs/tr_TR/companies.lang index 2874d14febd71..41110ac4357f1 100644 --- a/htdocs/langs/tr_TR/companies.lang +++ b/htdocs/langs/tr_TR/companies.lang @@ -399,7 +399,7 @@ ListProspectsShort=Aday Listesi ListCustomersShort=Müşteri listesi ThirdPartiesArea=Üçüncü partiler kişi alanı LastModifiedThirdParties=Değiştirilen son %s üçüncü parti -UniqueThirdParties=Toplam eşsiz üçüncü parti +UniqueThirdParties=Toplam benzersiz üçüncü parti InActivity=Açık ActivityCeased=Kapalı ActivityStateFilter=Etkinlik durumu diff --git a/htdocs/langs/tr_TR/compta.lang b/htdocs/langs/tr_TR/compta.lang index eb6e0558110c9..73afcbe1d13fb 100644 --- a/htdocs/langs/tr_TR/compta.lang +++ b/htdocs/langs/tr_TR/compta.lang @@ -40,7 +40,7 @@ AmountHTVATRealReceived=Net alınan AmountHTVATRealPaid=Net ödenen VATToPay=KDV satışlar VATReceived=KDV alınan -VATToCollect=KDV satınalımlar +VATToCollect=KDV alışlar VATSummary=KDV bakiyesi LT2SummaryES=IRPF bakiyesi LT1SummaryES=RE Bakiye @@ -49,9 +49,9 @@ SalaryPaid=Ödenen ücret LT2PaidES=IRPF ödenmiş LT1PaidES=RE Ödenen LT2CustomerES=IRPF satışlar -LT2SupplierES=IRPF satınalımlar +LT2SupplierES=IRPF alışlar LT1CustomerES=RE satışlar -LT1SupplierES=RE satınalmalar +LT1SupplierES=RE alımlar VATCollected=KDV alınan ToPay=Ödenecek ToGet=Geri alınacak @@ -171,9 +171,9 @@ Dispatched=Dağıtılmış ToDispatch=Dağıtılacak ThirdPartyMustBeEditAsCustomer=Üçüncü parti bir müşteri olarak tanımlanmalıdır SellsJournal=Satış Günlüğü -PurchasesJournal=Satınalma Günlüğü +PurchasesJournal=Alış Günlüğü DescSellsJournal=Satış Günlüğü -DescPurchasesJournal=Satınalma Günlüğü +DescPurchasesJournal=Alış Günlüğü InvoiceRef=Fatura ref. CodeNotDef=Tanımlanmamış AddRemind=Sevkedilebilir miktar diff --git a/htdocs/langs/tr_TR/cron.lang b/htdocs/langs/tr_TR/cron.lang index 824ad2f4fa5eb..e42fd7a0d5779 100644 --- a/htdocs/langs/tr_TR/cron.lang +++ b/htdocs/langs/tr_TR/cron.lang @@ -26,13 +26,13 @@ CronLastOutput=Son çalıştırma çıktısı CronLastResult=Son sonuç kodu CronListOfCronJobs=Planlı işler listesi CronCommand=Komut -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 +CronList=Planlı iş +CronDelete=Planlı işleri sil +CronConfirmDelete=Bu planlı işi silmek istediğinizden emin misiniz? +CronExecute=Planlı işleri yükle +CronConfirmExecute=Bu planlı işi şimdi yürütmek istediğinizden emin misiniz? +CronInfo=Planlı iş modülü planlanmış işlerin yürütülmesini sağlar +CronWaitingJobs=İş bekliyor CronTask=İş CronNone=Hiçbiri CronDtStart=Başlama tarihi @@ -75,7 +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 +CronCreateJob=Yeni Planlı İş oluştur # Info CronInfoPage=Bilgi # Common diff --git a/htdocs/langs/tr_TR/donations.lang b/htdocs/langs/tr_TR/donations.lang index d9c9d4c6ba409..b5b9970bd649a 100644 --- a/htdocs/langs/tr_TR/donations.lang +++ b/htdocs/langs/tr_TR/donations.lang @@ -6,8 +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 ? +DeleteADonation=Bağış sil +ConfirmDeleteADonation=Bu bağışı silmek istediğinizden emin misiniz? ShowDonation=Bağış göster DonationPromise=Hibe sözü PromisesNotValid=Doğrulanmamış sözler @@ -23,8 +23,8 @@ DonationStatusPaid=Bağış alındı DonationStatusPromiseNotValidatedShort=Taslak DonationStatusPromiseValidatedShort=Doğrulanmış DonationStatusPaidShort=Alınan -DonationTitle=Donation receipt -DonationDatePayment=Payment date +DonationTitle=Bağış makbuzu +DonationDatePayment=Ödeme tarihi ValidPromess=Söz doğrula DonationReceipt=Bağış makbuzu BuildDonationReceipt=Makbuz oluştur @@ -40,4 +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 +DonationPayment=Bağış ödemesi diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang index 384513df1f54b..becb10f7a4329 100644 --- a/htdocs/langs/tr_TR/errors.lang +++ b/htdocs/langs/tr_TR/errors.lang @@ -159,14 +159,17 @@ ErrorPriceExpression22=Eksi sonuç '%s' 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=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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Hata, parti/seri numarası gerektiren bir ürün için parti/seri numarası olmadan bir stok hareketi yapılmaya çalışılıyor. +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Bütün kayıtlı kabuller, bu eylemin yapılmasına izin verilmeden önce doğrulanmalıdır (onaylanmış ya da reddedilmiş) +ErrorCantSetReceptionToTotalDoneWithReceptionDenied=Bütün kayıtlı kabuller, bu eylemin yapılmasına izin verilmeden önce doğrulanmalıdır (onaylanmış) +ErrorGlobalVariableUpdater0=HTTP isteğinde '%s' hatası +ErrorGlobalVariableUpdater1=Geçersiz JSON biçimi '%s' +ErrorGlobalVariableUpdater2=Parametre '%s' eksik +ErrorGlobalVariableUpdater3=İstenen veri sonuçta bulunamadı +ErrorGlobalVariableUpdater4=SOAP istemcisinde '%s' hatası +ErrorGlobalVariableUpdater5=Seçilmiş genel değişken yok +ErrorFieldMustBeANumeric=%s alanı sayısal bir değer olmalıdır +ErrorFieldMustBeAnInteger=%s alanı tamsayı olmalıdır # Warnings WarningMandatorySetupNotComplete=Zorunlu kurulum parametreleri henüz tanımlanmamış diff --git a/htdocs/langs/tr_TR/exports.lang b/htdocs/langs/tr_TR/exports.lang index f08d37906d7a8..facac39520587 100644 --- a/htdocs/langs/tr_TR/exports.lang +++ b/htdocs/langs/tr_TR/exports.lang @@ -118,7 +118,7 @@ ExportFieldAutomaticallyAdded=%s alanı kendiliğinden eklenmiştir. Benz CsvOptions=CSV Ayarları Separator=Ayıraç Enclosure=Ek -SuppliersProducts=Tedarikçinin Ürünleri +SuppliersProducts=Tedarikçi Ürünleri BankCode=Banka kodu DeskCode=Sıra kodu BankAccountNumber=Hesap numarası diff --git a/htdocs/langs/tr_TR/interventions.lang b/htdocs/langs/tr_TR/interventions.lang index 0202aa11bfd44..53e55848873de 100644 --- a/htdocs/langs/tr_TR/interventions.lang +++ b/htdocs/langs/tr_TR/interventions.lang @@ -50,4 +50,4 @@ ArcticNumRefModelError=Etkinleştirme başarısız PacificNumRefModelDesc1=Sayıyı %syymm-nnnn olarak gösterir, yy: yıl, mm: ay ve nnnn: 0 olmayan bir sayı dizisidir PacificNumRefModelError=$syymm Başlayan bir müdahale kartı zaten var ve sıra bu dizi modeli ile uyumlu değildir. Modülü etkinleştirmek için kaldırın ya da yeniden adlandırın. PrintProductsOnFichinter=Müdahale kartında ürünleri yazdır -PrintProductsOnFichinterDetails=siparişlerden oluşturulan müdahaleler için +PrintProductsOnFichinterDetails=Siparişlerden oluşturulan müdahaleler diff --git a/htdocs/langs/tr_TR/mails.lang b/htdocs/langs/tr_TR/mails.lang index d59aeeb8f71e1..d2e5c102f2cac 100644 --- a/htdocs/langs/tr_TR/mails.lang +++ b/htdocs/langs/tr_TR/mails.lang @@ -139,5 +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 +YouCanAlsoUseSupervisorKeyword=Ayrıca; kullanıcının danışmanına giden epostayı almak için __SUPERVISOREMAIL__ anahtar kelimesini de ekleyebilirsiniz (yalnızca bu danışman için bir eposta tanımlanmışsa çalışır). +NbOfTargetedContacts=Mevcut hedef kişi eposta sayısı diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang index 8de51040fd57b..f9e763e45f7bd 100644 --- a/htdocs/langs/tr_TR/main.lang +++ b/htdocs/langs/tr_TR/main.lang @@ -220,6 +220,7 @@ Next=Sonraki Cards=Kartlar Card=Kart Now=Şimdi +HourStart=Başlama saati Date=Tarih DateAndHour=Tarih ve saat DateStart=Başlama tarihi @@ -242,6 +243,8 @@ DatePlanShort=Planlanan tarih DateRealShort=Gerç.Tarih DateBuild=Oluşturma tarihi raporu DatePayment=Ödeme tarihi +DateApprove=Onaylama tarihi +DateApprove2=Onaylama tarihi (ikinci onaylama) DurationYear=yıl DurationMonth=ay DurationWeek=hafta @@ -352,7 +355,7 @@ Status=Durum Favorite=Sık kullanılan ShortInfo=Bilgi. Ref=Ref. -ExternalRef=Ref. extern +ExternalRef=Ref. stajyer RefSupplier=Ref. tedarikçi RefPayment=Ref. ödeme CommercialProposalsShort=Teklifler @@ -395,8 +398,8 @@ Available=Mevcut NotYetAvailable=Henüz mevcut değil NotAvailable=Uygun değil Popularity=Popülerlik -Categories=Tags/categories -Category=Tag/category +Categories=Etiketler/kategoriler +Category=Etiket/kategori By=Tarafından From=Başlama to=Bitiş @@ -408,6 +411,8 @@ OtherInformations=Diğer Bilgiler Quantity=Miktar Qty=Mik ChangedBy=Değiştiren +ApprovedBy=Onaylayan +ApprovedBy2=Onaylayan (ikinci onay) ReCalculate=Yeniden hesapla ResultOk=Başarılı ResultKo=Başarısız @@ -695,7 +700,9 @@ AddBox=Kutu ekle SelectElementAndClickRefresh=Bir öğe seçin ve Yenile'ye tıkla PrintFile=%s Dosyasını Yazdır ShowTransaction=İşlemi göster -GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide. +GoIntoSetupToChangeLogo=Logoyu değiştirmek için Giriş - Ayarlar - Firma menüsüne ya da gizlemek için Giriş - Ayarlar - Görünüm menüsüne git. +Deny=Ret +Denied=Reddedildi # Week day Monday=Pazartesi Tuesday=Salı diff --git a/htdocs/langs/tr_TR/margins.lang b/htdocs/langs/tr_TR/margins.lang index ca8865fa8eed8..721d6f34ba9a3 100644 --- a/htdocs/langs/tr_TR/margins.lang +++ b/htdocs/langs/tr_TR/margins.lang @@ -18,7 +18,7 @@ CustomerMargins=Müşteri oranları SalesRepresentativeMargins=Satış temsilcisi oranları UserMargins=Kullanıcı oranları ProductService=Ürün veya Hizmet -AllProducts=Bütün ürün ve hizmetler +AllProducts=Bütün ürünler ve hizmetler ChooseProduct/Service=Ürün veya hizmet seç StartDate=İlk tarih EndDate=Son tarih diff --git a/htdocs/langs/tr_TR/orders.lang b/htdocs/langs/tr_TR/orders.lang index 375c91d7e0127..daacf40131480 100644 --- a/htdocs/langs/tr_TR/orders.lang +++ b/htdocs/langs/tr_TR/orders.lang @@ -64,8 +64,8 @@ ShipProduct=Ürünü sevket Discount=İndirim CreateOrder=Sipariş oluştur RefuseOrder=Siparişi reddet -ApproveOrder=Approve order -Approve2Order=Approve order (second level) +ApproveOrder=Sipariş onayla +Approve2Order=Sipariş onayla (ikinci seviye) ValidateOrder=Doğrulamak amacıyla UnvalidateOrder=Siparişten doğrulamayı kaldır DeleteOrder=Sipariş sil @@ -79,7 +79,9 @@ NoOpenedOrders=Açık sipariş yok NoOtherOpenedOrders=Başka açık sipariş yok NoDraftOrders=Taslak sipariş yok OtherOrders=Diğer siparişler -LastOrders=Son %s sipariş +LastOrders=Son %s müşteri siparişi +LastCustomerOrders=Son %s müşteri siparişi +LastSupplierOrders=Son %s tedarikçi siparişi LastModifiedOrders=Değiştirilen son %s sipariş LastClosedOrders=Kapatılan son %s sipariş AllOrders=Bütün siparişler @@ -103,8 +105,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 +RelatedCustomerOrders=İlgili müşteri siparişi +RelatedSupplierOrders=İlgili tedarikçi siparişi OnProcessOrders=İşlemdeki siparişler RefOrder=Sipariş ref. RefCustomerOrder=Müşteri sipariş ref. @@ -121,7 +123,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 +FirstApprovalAlreadyDone=İlk onay zaten yapılmış ##### 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 b1cd3b07cb06d..52c073cce172c 100644 --- a/htdocs/langs/tr_TR/other.lang +++ b/htdocs/langs/tr_TR/other.lang @@ -12,7 +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_VALIDATE=Tedarikçi siparişi kaydedildi. 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ı @@ -29,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=Supplier order recorded +Notify_ORDER_SUPPLIER_VALIDATE=Tedarikçi siparişi kaydedildi. 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 @@ -48,7 +48,7 @@ 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=See setup of module %s +SeeModuleSetup=%s modülü ayarlarına bak NbOfAttachedFiles=Eklenen dosya/belge sayısı TotalSizeOfAttachedFiles=Eklenen dosyaların/belgelerin toplam boyutu MaxSize=Ençok boyut @@ -171,7 +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. +EMailTextOrderValidatedBy=%s Siparişi %s tarafından kadedilmiş EMailTextOrderApprovedBy=%s Siparişi %s tarafından onaylanmıştır. EMailTextOrderRefused=%s Teklifi reddedilmiştir. EMailTextOrderRefusedBy=%s Teklifi %tarafından reddedilmiştir. @@ -203,6 +203,7 @@ NewKeyWillBe=Yazılımda oturum açmak için yeni anahtarınız bu olacaktır ClickHereToGoTo=%s e gitmek için buraya tıkla YouMustClickToChange=Ancak önce bu şifre değiştirmeyi doğrulamak için aşağıdaki linke tıklamanız gerekir ForgetIfNothing=Bu değiştirmeyi istemediyseniz, bu epostayı unutun. Kimlik bilgilerinizi güvenli tutulur. +IfAmountHigherThan=Eğer tutar %s den büyükse ##### Calendar common ##### AddCalendarEntry=% Takvimine giriş ekleyin diff --git a/htdocs/langs/tr_TR/productbatch.lang b/htdocs/langs/tr_TR/productbatch.lang index c7f701bb52224..2c25b7e592b9a 100644 --- a/htdocs/langs/tr_TR/productbatch.lang +++ b/htdocs/langs/tr_TR/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Parti/seri numarası kullan -ProductStatusOnBatch=Evet (Parti/seri numarası gerekliyse) -ProductStatusNotOnBatch=Hayır (Parti/seri numarası gerekli değilse) +ManageLotSerial=Parti/ürün numarası kullan +ProductStatusOnBatch=Evet (parti/seri gerekli) +ProductStatusNotOnBatch=Hayır (parti/seri kullanılmaz) ProductStatusOnBatchShort=Evet ProductStatusNotOnBatchShort=Hayır Batch=Parti/Seri -atleast1batchfield=Son yenme tarihi ya da Son satış tarihi ya da Parti numarası +atleast1batchfield=Son Tüketme tarihi ya da Son Satma tarihi ya da Parti/Seri numarası batch_number=Parti/Seri numarası +BatchNumberShort=Parti/Seri l_eatby=Son yenme tarihi l_sellby=Son satış tarihi -DetailBatchNumber=Parti/Seri ayrıntıları -DetailBatchFormat=Parti/Seri: %s - Son Yenme: %s - Son Satış: %s (Mik: %d) -printBatch=Parti: %s +DetailBatchNumber=Parti/Seri ayrıntısı +DetailBatchFormat=Parti/Seri: %s - Son Tüketme: %s - Son Satma: %s (Mik: %d) +printBatch=Parti/Seri: %s printEatby=Son Yenme: %s printSellby=Son satış: %s printQty=Mik: %d AddDispatchBatchLine=Dağıtımda bir Raf Ömrü satırı ekle BatchDefaultNumber=Tanımlanmamış -WhenProductBatchModuleOnOptionAreForced=Parti/Seri devredeyken, stok arttırma/eksiltme modu son seçime zorlanır ve düzenlenemez. Diğer seçenekler istediğiniz gibi yapılandırılabilir. +WhenProductBatchModuleOnOptionAreForced=Parti/Seri modülü açıkken, stok arttırma/eksiltme modu son seçime zorlanır ve düzenlenemez. Diğer seçenekler isteğinize göre düzenlenebilir. ProductDoesNotUseBatchSerial=Bu ürün parti/seri numarası kullanmaz diff --git a/htdocs/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang index 52332a5fff599..d49a3fffe8d60 100644 --- a/htdocs/langs/tr_TR/products.lang +++ b/htdocs/langs/tr_TR/products.lang @@ -22,14 +22,14 @@ ProductAccountancySellCode=Muhasebe kodu (satış) ProductOrService=Ürün veya Hizmet ProductsAndServices=Ürünler ve Hizmetler ProductsOrServices=Ürünler veya hizmetler -ProductsAndServicesOnSell=Satılabilir veya satınalınabilir Ürünler ve Hizmetler +ProductsAndServicesOnSell=Satılır ya da alınır Ürünler ve Hizmetler ProductsAndServicesNotOnSell=Satış dışı Ürünler ve Hizmetler ProductsAndServicesStatistics=Ürün ve Hizme istatistikleri ProductsStatistics=Ürün istatistikleri ProductsOnSell=Satılır ya da satınalınır ürün -ProductsNotOnSell=Satılmayan ya da satınalınmayan ürün +ProductsNotOnSell=Satılmaz ya da alınmaz ürün ProductsOnSellAndOnBuy=Satılır ve alınır ürünler -ServicesOnSell=Satılabilir veya satınalınabilir Hizmetler +ServicesOnSell=Satılır veya alınır Hizmetler ServicesNotOnSell=Satılmayan hizmetler ServicesOnSellAndOnBuy=Satılır ve alınır hizmetler InternalRef=İç referans @@ -164,8 +164,8 @@ RecordedProductsAndServices=Ürün/hizmet kaydedildi PredefinedProductsToSell=Öntanımlı satın alınan ürünler PredefinedServicesToSell=Öntanımlı satın alınan hizmetler PredefinedProductsAndServicesToSell=Öntanımlı satılan ürünler/hizmetler -PredefinedProductsToPurchase=Öntanımlı satılan ürünler -PredefinedServicesToPurchase=Öntanımlı satılan servisler +PredefinedProductsToPurchase=Öntanımlı alınır ürünler +PredefinedServicesToPurchase=Öntanımlı alınır servisler PredefinedProductsAndServicesToPurchase=Öntanımlı satın alınan ürünler/servisler GenerateThumb=Kararlama (thumb) oluştur ProductCanvasAbility=Özel “kanvas” eklentileri kullan @@ -245,25 +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=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode# +PriceExpressionEditorHelp2=ExtraFields e şu gibi değişkenlerle erişebilirsiniz #extrafield_myextrafieldkey# ve şunlara sahip genel değişkenlerle #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: +PriceExpressionEditorHelp5=Uygun genel değerler: PriceMode=Fiyat biçimi PriceNumeric=Sayı 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 +MinSupplierPrice=En düşük tedarikçi fiyatı +DynamicPriceConfiguration=Dinamik fiyat yapılandırması +GlobalVariables=Genel değişkenler +GlobalVariableUpdaters=Genel değişkenler güncelleyicisi +GlobalVariableUpdaterType0=JSON verisi +GlobalVariableUpdaterHelp0=Belirtilen URL'den JSON verilerini ayrıştırır, DEĞER ilgili değerin yerini belirtir, +GlobalVariableUpdaterHelpFormat0=biçimi {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"} şeklindedir +GlobalVariableUpdaterType1=WebService verisi +GlobalVariableUpdaterHelp1=Belirtilen URL'den Web Servis verilerini ayrıştırır, NS isimyerini belirtir, DEĞER ilgili verinin konumunu belirtir, VERİ gönderilecek veriyi içermelidir ve YÖNTEM arayan WS yöntemidir +GlobalVariableUpdaterHelpFormat1=biçimi {"URL": "http://example.com/urlofws", "DEĞER": "array,targetvalue", "NS": "http://example.com/urlofns", "YÖNTEM": "myWSMethod", "VERİ": {"your": "data, "to": "send"}} şeklindedir +UpdateInterval=Güncelleme aralığı (dakika) +LastUpdated=Son güncelleme +CorrectlyUpdated=Doru olarak güncellendi diff --git a/htdocs/langs/tr_TR/projects.lang b/htdocs/langs/tr_TR/projects.lang index 143f3d1350a32..93f75815e60e4 100644 --- a/htdocs/langs/tr_TR/projects.lang +++ b/htdocs/langs/tr_TR/projects.lang @@ -14,6 +14,7 @@ MyTasksDesc=Bu görünüm ilgilisi olduğunuz projelerle ya da görevlerle sın 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). +AllTaskVisibleButEditIfYouAreAssigned=Böyle bir proje için tüm görevler görünürdür, ama yalnızca atanmış olduğunuz görev için zaman girişi yapabilirsiniz. ProjectsArea=Projeler alanı NewProject=Yeni proje AddProject=Proje oluştur @@ -72,7 +73,7 @@ ListSupplierInvoicesAssociatedProject=Proje ile ilgili tedarikçi faturalarını ListContractAssociatedProject=Proje ile ilgili sözleşmelerin listesi ListFichinterAssociatedProject=Proje ile ilgili müdahalelerin listesi ListExpenseReportsAssociatedProject=Bu proje ile ilişkili gider raporları listesi -ListDonationsAssociatedProject=List of donations associated with the project +ListDonationsAssociatedProject=Bu proje ile ilişkilendirilmiş bağış listesi ListActionsAssociatedProject=Proje ile ilgili etkinliklerin listesi ActivityOnProjectThisWeek=Projede bu haftaki etkinlik ActivityOnProjectThisMonth=Projede bu ayki etkinlik diff --git a/htdocs/langs/tr_TR/sendings.lang b/htdocs/langs/tr_TR/sendings.lang index 6b6781c427652..3881d64ef9b28 100644 --- a/htdocs/langs/tr_TR/sendings.lang +++ b/htdocs/langs/tr_TR/sendings.lang @@ -2,7 +2,7 @@ RefSending=Sevkiyat ref. Sending=Sevkiyat Sendings=Sevkiyatlar -AllSendings=All Shipments +AllSendings=Tüm sevkiyatlar Shipment=Sevkiyat Shipments=Sevkiyatlar ShowSending=Gönderimi göster diff --git a/htdocs/langs/tr_TR/stocks.lang b/htdocs/langs/tr_TR/stocks.lang index 3360b2afbb711..5ab213a1ed38e 100644 --- a/htdocs/langs/tr_TR/stocks.lang +++ b/htdocs/langs/tr_TR/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Gönderim iptal et DeleteSending=Gönderim sil Stock=Stok Stocks=Stoklar +StocksByLotSerial=Parti/seri numarasına göre stok Movement=Hareket Movements=Hareketler ErrorWarehouseRefRequired=Depo referans adı gereklidir @@ -78,6 +79,7 @@ IdWarehouse=Depo No DescWareHouse=Depo açıklaması LieuWareHouse=Depo konumlandırma WarehousesAndProducts=Depolar ve ürünler +WarehousesAndProductsBatchDetail=Depolar ve ürünler (her parti/seri için ayrıntılı) AverageUnitPricePMPShort=Ağırlıklı ortalama giriş fiyatı AverageUnitPricePMP=Ağırlıklı ortalama giriş fiyatı SellPriceMin=Satış Birim Fiyatı @@ -131,4 +133,7 @@ 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=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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn="ürün partisi" açıkken kaynak depo burada tanımlanmalıdır. Hareket için parti/seri gerektiren ürün için hangi partinin/serinin uygun olduğunun listelenmesi için kullanılacaktır. Farklı depolardan ürün göndermek isterseniz yalnızca bir kaç adımda sevkiyat yapın. +InventoryCodeShort=Inv./Mov. kodu +NoPendingReceptionOnSupplierOrder=Açılmış tedarikçi siparişi nedeniyle bekleyen kabul yok +ThisSerialAlreadyExistWithDifferentDate=Bu parti/seri numarası (%s) zaten var fakat farklı tüketme ya da satma tarihli bulundu (%s ama sizin girdiğiniz bu %s). diff --git a/htdocs/langs/tr_TR/suppliers.lang b/htdocs/langs/tr_TR/suppliers.lang index 87ead1dd32ee9..ccaf0938eee4f 100644 --- a/htdocs/langs/tr_TR/suppliers.lang +++ b/htdocs/langs/tr_TR/suppliers.lang @@ -43,4 +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) +UseDoubleApproval=İkili onay kullanın (ikinci onay özel izinli herhangi bir kullanıcı tarafından yapılabilir) diff --git a/htdocs/langs/tr_TR/trips.lang b/htdocs/langs/tr_TR/trips.lang index 97448e921fb75..a0b9a259ab99f 100644 --- a/htdocs/langs/tr_TR/trips.lang +++ b/htdocs/langs/tr_TR/trips.lang @@ -69,11 +69,9 @@ MOTIF_CANCEL=Neden 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=Ret TO_PAID=Öde BROUILLONNER=Yeniden aç SendToValid=Onay için gönder @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Bu gider raporunu "Taslak" durumuna döndürmek istediğ SaveTrip=Gider raporunu doğrula ConfirmSaveTrip=Bu gider raporunu doğrulamak istediğinizden emin misiniz? -Synchro_Compta=NDF <-> Hesap - -TripSynch=Senkronizasyon: Gider Raporu <-> Cari Hesap -TripToSynch=Hesaba işlenecek gider raporu -AucuneTripToSynch="Ödendi" durumunda hiç gider raporu yok -ViewAccountSynch=Hesabı incele - -ConfirmNdfToAccount=Bu gider raporunu geçerli hesaba işlemek istediğinizden emin misiniz? -ndfToAccount=Gider raporu - Entegrasyon - -ConfirmAccountToNdf=Bu gider raporunu geçerli hesaptan silmek istediğinizden emin misini? -AccountToNdf=Gider Raporu - Para çekme - -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=Doğrulanacak -TripForPaid=Ödenecek -TripPaid=Ödendi - 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 ea96fc8e07f93..a24e57c3336e0 100644 --- a/htdocs/langs/uk_UA/admin.lang +++ b/htdocs/langs/uk_UA/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).
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_ 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) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s RefreshPhoneLink=Refresh link @@ -540,8 +541,8 @@ 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 +Module39000Name=Product lot +Module39000Desc=Lot 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 @@ -558,8 +559,6 @@ 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 @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, 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 +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Sales - Purchases CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Purchases +CalcLocaltax2=Purchases CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Sales +CalcLocaltax3=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 @@ -1018,14 +1017,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 @@ -1337,6 +1336,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 @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= Default account to use to receive payments by credit c 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot 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 @@ -1616,3 +1617,8 @@ 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 +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" diff --git a/htdocs/langs/uk_UA/banks.lang b/htdocs/langs/uk_UA/banks.lang index a2306950fb484..72639883e1ac2 100644 --- a/htdocs/langs/uk_UA/banks.lang +++ b/htdocs/langs/uk_UA/banks.lang @@ -163,3 +163,5 @@ LabelRIB=BAN Label NoBANRecord=No BAN record DeleteARib=Delete BAN record ConfirmDeleteRib=Are you sure you want to delete this BAN record ? +StartDate=Start date +EndDate=End date diff --git a/htdocs/langs/uk_UA/boxes.lang b/htdocs/langs/uk_UA/boxes.lang index b3778e847368c..6fd5e90e8c545 100644 --- a/htdocs/langs/uk_UA/boxes.lang +++ b/htdocs/langs/uk_UA/boxes.lang @@ -94,3 +94,4 @@ BoxProductDistributionFor=Distribution of %s for %s ForCustomersInvoices=Customers invoices ForCustomersOrders=Замовлення клієнтів ForProposals=Пропозиції +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang index 52e9f6aeae473..dbafde2f6e546 100644 --- a/htdocs/langs/uk_UA/errors.lang +++ b/htdocs/langs/uk_UA/errors.lang @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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/langs/uk_UA/interventions.lang b/htdocs/langs/uk_UA/interventions.lang index c79da05364e61..67d4f61d9f15d 100644 --- a/htdocs/langs/uk_UA/interventions.lang +++ b/htdocs/langs/uk_UA/interventions.lang @@ -50,4 +50,4 @@ 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 +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang index 4e4c5fba03150..13f82db52fdf9 100644 --- a/htdocs/langs/uk_UA/main.lang +++ b/htdocs/langs/uk_UA/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 @@ -242,6 +243,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 +411,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 @@ -696,6 +701,8 @@ 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. +Deny=Deny +Denied=Denied # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/uk_UA/orders.lang b/htdocs/langs/uk_UA/orders.lang index 3d4f381c40b4d..044bcc0eb0174 100644 --- a/htdocs/langs/uk_UA/orders.lang +++ b/htdocs/langs/uk_UA/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/langs/uk_UA/other.lang b/htdocs/langs/uk_UA/other.lang index 9b2de3eeb9024..6b60f5eac9717 100644 --- a/htdocs/langs/uk_UA/other.lang +++ b/htdocs/langs/uk_UA/other.lang @@ -203,6 +203,7 @@ 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. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=Add entry in calendar %s diff --git a/htdocs/langs/uk_UA/productbatch.lang b/htdocs/langs/uk_UA/productbatch.lang index 452636819653f..85b1d27f3a611 100644 --- a/htdocs/langs/uk_UA/productbatch.lang +++ b/htdocs/langs/uk_UA/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use batch/serial number -ProductStatusOnBatch=Yes (Batch/serial required) -ProductStatusNotOnBatch=No (Batch/serial not used) +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/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 +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial 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 +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %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. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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/uk_UA/projects.lang b/htdocs/langs/uk_UA/projects.lang index 03c11382a2d8b..eac0f41d321f1 100644 --- a/htdocs/langs/uk_UA/projects.lang +++ b/htdocs/langs/uk_UA/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/langs/uk_UA/stocks.lang b/htdocs/langs/uk_UA/stocks.lang index 29706d1761545..c2b432d7f9b93 100644 --- a/htdocs/langs/uk_UA/stocks.lang +++ b/htdocs/langs/uk_UA/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Cancel sending DeleteSending=Delete sending Stock=Stock Stocks=Stocks +StocksByLotSerial=Stock by lot/serial Movement=Movement Movements=Movements ErrorWarehouseRefRequired=Warehouse reference name is required @@ -78,6 +79,7 @@ IdWarehouse=Id warehouse DescWareHouse=Description warehouse LieuWareHouse=Localisation warehouse WarehousesAndProducts=Warehouses and products +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=Weighted average input price AverageUnitPricePMP=Weighted average input price SellPriceMin=Selling Unit Price @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/uk_UA/suppliers.lang b/htdocs/langs/uk_UA/suppliers.lang index d9de79fe84dbc..e0552c064e8ce 100644 --- a/htdocs/langs/uk_UA/suppliers.lang +++ b/htdocs/langs/uk_UA/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) +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/uk_UA/trips.lang b/htdocs/langs/uk_UA/trips.lang index ba36fc9b07b6a..76b214abdb77f 100644 --- a/htdocs/langs/uk_UA/trips.lang +++ b/htdocs/langs/uk_UA/trips.lang @@ -69,11 +69,9 @@ 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 @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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 3df78528d98f1..e823d364258a3 100644 --- a/htdocs/langs/uz_UZ/admin.lang +++ b/htdocs/langs/uz_UZ/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).
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_ 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) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s RefreshPhoneLink=Refresh link @@ -540,8 +541,8 @@ 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 +Module39000Name=Product lot +Module39000Desc=Lot 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 @@ -558,8 +559,6 @@ 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 @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, 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 +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Sales - Purchases CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Purchases +CalcLocaltax2=Purchases CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Sales +CalcLocaltax3=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 @@ -1018,14 +1017,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 @@ -1337,6 +1336,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 @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= Default account to use to receive payments by credit c 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot 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 @@ -1616,3 +1617,8 @@ 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 +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" diff --git a/htdocs/langs/uz_UZ/banks.lang b/htdocs/langs/uz_UZ/banks.lang index a2306950fb484..72639883e1ac2 100644 --- a/htdocs/langs/uz_UZ/banks.lang +++ b/htdocs/langs/uz_UZ/banks.lang @@ -163,3 +163,5 @@ LabelRIB=BAN Label NoBANRecord=No BAN record DeleteARib=Delete BAN record ConfirmDeleteRib=Are you sure you want to delete this BAN record ? +StartDate=Start date +EndDate=End date diff --git a/htdocs/langs/uz_UZ/boxes.lang b/htdocs/langs/uz_UZ/boxes.lang index e7e9da7dc1b80..c0180bebdaa46 100644 --- a/htdocs/langs/uz_UZ/boxes.lang +++ b/htdocs/langs/uz_UZ/boxes.lang @@ -12,6 +12,7 @@ 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 @@ -27,26 +28,29 @@ BoxTitleNbOfCustomers=Number of clients 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=Unpaid customer invoices +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 @@ -89,3 +94,4 @@ BoxProductDistributionFor=Distribution of %s for %s ForCustomersInvoices=Customers invoices ForCustomersOrders=Customers orders ForProposals=Proposals +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang index 52e9f6aeae473..dbafde2f6e546 100644 --- a/htdocs/langs/uz_UZ/errors.lang +++ b/htdocs/langs/uz_UZ/errors.lang @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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/langs/uz_UZ/interventions.lang b/htdocs/langs/uz_UZ/interventions.lang index c79da05364e61..67d4f61d9f15d 100644 --- a/htdocs/langs/uz_UZ/interventions.lang +++ b/htdocs/langs/uz_UZ/interventions.lang @@ -50,4 +50,4 @@ 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 +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang index 711c3e0752cc3..d87c45109c077 100644 --- a/htdocs/langs/uz_UZ/main.lang +++ b/htdocs/langs/uz_UZ/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 @@ -242,6 +243,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 +411,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 @@ -696,6 +701,8 @@ 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. +Deny=Deny +Denied=Denied # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/uz_UZ/orders.lang b/htdocs/langs/uz_UZ/orders.lang index 3d4f381c40b4d..044bcc0eb0174 100644 --- a/htdocs/langs/uz_UZ/orders.lang +++ b/htdocs/langs/uz_UZ/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/langs/uz_UZ/other.lang b/htdocs/langs/uz_UZ/other.lang index 9b2de3eeb9024..6b60f5eac9717 100644 --- a/htdocs/langs/uz_UZ/other.lang +++ b/htdocs/langs/uz_UZ/other.lang @@ -203,6 +203,7 @@ 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. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=Add entry in calendar %s diff --git a/htdocs/langs/uz_UZ/productbatch.lang b/htdocs/langs/uz_UZ/productbatch.lang index 452636819653f..85b1d27f3a611 100644 --- a/htdocs/langs/uz_UZ/productbatch.lang +++ b/htdocs/langs/uz_UZ/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use batch/serial number -ProductStatusOnBatch=Yes (Batch/serial required) -ProductStatusNotOnBatch=No (Batch/serial not used) +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/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 +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial 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 +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %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. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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/projects.lang b/htdocs/langs/uz_UZ/projects.lang index 03c11382a2d8b..eac0f41d321f1 100644 --- a/htdocs/langs/uz_UZ/projects.lang +++ b/htdocs/langs/uz_UZ/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/langs/uz_UZ/stocks.lang b/htdocs/langs/uz_UZ/stocks.lang index 29706d1761545..c2b432d7f9b93 100644 --- a/htdocs/langs/uz_UZ/stocks.lang +++ b/htdocs/langs/uz_UZ/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Cancel sending DeleteSending=Delete sending Stock=Stock Stocks=Stocks +StocksByLotSerial=Stock by lot/serial Movement=Movement Movements=Movements ErrorWarehouseRefRequired=Warehouse reference name is required @@ -78,6 +79,7 @@ IdWarehouse=Id warehouse DescWareHouse=Description warehouse LieuWareHouse=Localisation warehouse WarehousesAndProducts=Warehouses and products +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=Weighted average input price AverageUnitPricePMP=Weighted average input price SellPriceMin=Selling Unit Price @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/uz_UZ/suppliers.lang b/htdocs/langs/uz_UZ/suppliers.lang index d9de79fe84dbc..e0552c064e8ce 100644 --- a/htdocs/langs/uz_UZ/suppliers.lang +++ b/htdocs/langs/uz_UZ/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) +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/uz_UZ/trips.lang b/htdocs/langs/uz_UZ/trips.lang index ba36fc9b07b6a..76b214abdb77f 100644 --- a/htdocs/langs/uz_UZ/trips.lang +++ b/htdocs/langs/uz_UZ/trips.lang @@ -69,11 +69,9 @@ 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 @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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 a498843036213..bd5b3285f661d 100644 --- a/htdocs/langs/vi_VN/admin.lang +++ b/htdocs/langs/vi_VN/admin.lang @@ -3,34 +3,34 @@ Foundation=Tổ chức Version=Phiên bản VersionProgram=Phiên bản chương trình VersionLastInstall=Phiên bản cài đặt ban đầu -VersionLastUpgrade=Lần cập nhật phiên bản trước đó +VersionLastUpgrade=Phiên bản nâng cấp cuối VersionExperimental=Thử nghiệm VersionDevelopment=Phát triển -VersionUnknown=Chưa rõ +VersionUnknown=Không 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 +FileCheck=Files toàn vẹn +FilesMissing=File thất lạc +FilesUpdated=File đã cập nhật +FileCheckDolibarr=Kiểm tra toàn vẹn file Dolibarr +XmlNotFound=Xml file của Dolibarr toàn vẹn Không tìm thấy +SessionId=ID 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ữ -PurgeSessions=Cập nhật phiên làm việc -ConfirmPurgeSessions=Bạn có muốn xóa sạch các phiên làm việc? Điều này sẽ ngắt kết nối với tất cả người dùng (ngoại trừ bạn). -NoSessionListWithThisHandler=Phần quản lý lưu trữ phiên làm việc được tùy chỉnh trong PHP của bạn không được phép liệt kê các phiên làm việc hiện có. +SessionSavePath=Lưu trữ phiên làm việc bản địa hóa +PurgeSessions=Thanh lọc phiên làm việc +ConfirmPurgeSessions=Bạn có muốn thanh lọc tất cả các phiên làm việc? Điều này sẽ ngắt kết nối với tất cả người dùng (ngoại trừ bạn). +NoSessionListWithThisHandler=Phần quản lý lưu phiên làm việc được cấu hình trong PHP của bạn không cho phép để liệt kê tất cả các phiên đang chạy. LockNewSessions=Khóa kết nối mới -ConfirmLockNewSessions=Bạn có chắc về việc hạn chế bất kỳ kết nối mới nào được tạo bởi Dolibarr hay không. Chỉ người dùng %s mới có thể kết nối sau đó. +ConfirmLockNewSessions=Bạn có chắc muốn hạn chế bất kỳ kết nối Dolibarr mới đến chính bạn. Chỉ người dùng %s sẽ có thể được kết nối sau đó. UnlockNewSessions=Bỏ việc khóa kết nôi YourSession=Phiên làm việc của bạn Sessions=Phiên làm việc của người dùng WebUserGroup=Người dùng/nhóm trên máy chủ -NoSessionFound=PHP của bạn không cho phép liệt kê các phiên làm việc hiện có. Thư mục sử dụng để lưu các phiên làm việc (%s) có thể được bảo vệ (Thí dụ, tùy theo sự cho phép của hệ điệu hành hoặc mối liên hệ giữa open_basedir trong PHP). -HTMLCharset=Ký tự để tạo cho các trang HTML -DBStoringCharset=Ký tự của cơ sở dữ liệu để lưu dữ liệu -DBSortingCharset=Ký tự của cơ sở dữ liệu để sắp xếp dữ liệu -WarningModuleNotActive=Module %s phải được kích hoạt -WarningOnlyPermissionOfActivatedModules=Chỉ những sự cho phép có liên quan đến các module được kích hoạt mới được hiển thị tại đây. Bạn cần kích hoạt các module khác trong Trang chủ->Thiết lập->Trang Module. +NoSessionFound=PHP của bạn không cho phép liệt kê các phiên làm việc hiện có. Thư mục đã dùng để lưu các phiên làm việc (%s) có thể được bảo vệ (Thí dụ, tùy theo sự cho phép của hệ điệu hành hoặc mối liên hệ giữa open_basedir trong PHP). +HTMLCharset=Bộ ký tự để tạo trang HTML +DBStoringCharset=Cơ sở dữ liệu bộ ký tự để lưu trữ dữ liệu +DBSortingCharset=Cơ sở dữ liệu bộ ký tự để sắp xếp dữ liệu +WarningModuleNotActive=Module %s phải được mở +WarningOnlyPermissionOfActivatedModules=Chỉ những quyền liên quan đến các module được kích hoạt mới được hiển thị tại đây. Bạn cần kích hoạt các module khác trong Nhà->Thiết lập->Trang Module. DolibarrSetup=Cài đặt hoặc nâng cấp Dolibarr DolibarrUser=Người dùng Dolibarr InternalUser=Người dùng bên trong @@ -41,102 +41,102 @@ GlobalSetup=Thiết lập chung GUISetup=Hiển thị SetupArea=Khu vực thiết lập FormToTestFileUploadForm=Mẫu để thử nghiệm việc tải lên tập tin (dựa theo thiết lập) -IfModuleEnabled=Chú ý: đồng ý chỉ có tác dụng nếu module %s được kích hoạt +IfModuleEnabled=Ghi chú: Yes chỉ có tác dụng nếu module %s được mở RemoveLock=Loại bỏ tập tin %s nếu tập tin này cho phép sử dụng công cụ cập nhật. RestoreLock=Phục hồi tập tin %s, với quyền truy cập chỉ được đọc, để vô hiệu hóa bất kỳ thao tác sử dụng công cụ cập nhật. -SecuritySetup=Thiết lập an nin +SecuritySetup=Thiết lập an ninh ErrorModuleRequirePHPVersion=Lỗi, module này yêu cầu phiên bản PHP %s hoặc mới hơn ErrorModuleRequireDolibarrVersion=Lỗi, module này yêu cầu Dolibarr phiên bản %s hoặc mới hơn ErrorDecimalLargerThanAreForbidden=Lỗi, thao tác này có độ ưu tiên cao hơn %s sẽ không được hỗ trợ. -DictionarySetup=Thiết lập từ điển +DictionarySetup=Cài đặt từ điển Dictionary=Từ điển Chartofaccounts=Biểu đồ tài khoản Fiscalyear=Năm tài chính -ErrorReservedTypeSystemSystemAuto=Giá trị 'hệ thống' và 'hệ thống tự động' đối với loại đã được lưu trữ. Bạn có thể sử dụng 'người dùng' như là dạng giá trị để thêm vào bản ghi của riêng mình +ErrorReservedTypeSystemSystemAuto=Giá trị 'hệ thống' và 'systemauto đối với loại được dành riêng. Bạn có thể sử dụng "người dùng" giá trị để thêm vào bản ghi chính mình ErrorCodeCantContainZero=Mã lệnh không thể chứa giá trị 0 -DisableJavascript=Vô hiệu hóa JavaScript và Ajax chức năng (Đề xuất cho người mù hoặc văn bản trình duyệt) +DisableJavascript=Vô hiệu hóa chức năng JavaScript và Ajax (Đề xuất cho người mù hoặc văn bản trình duyệt) ConfirmAjax=Sử dụng popups xác định từ Ajax -UseSearchToSelectCompanyTooltip=Ngoài ra nếu bạn có một số lượng lớn các bên thứ ba (> 100 000), bạn có thể tăng tốc độ bằng cách thiết lập COMPANY_DONOTSEARCH_ANYWHERE liên tục đến 1 trong Setup-> khác. Tìm kiếm sau đó sẽ được giới hạn để bắt đầu của chuỗi. -UseSearchToSelectCompany=Sử dụng các lĩnh vực tự động gõ để lựa chọn bên thứ ba thay vì sử dụng một hộp danh sách. -ActivityStateToSelectCompany= Thêm tùy chọn bộ lọc để ẩn/hiện các nhà phát triển thứ ba hiện đang hoạt động hoặc đã bị xóa -UseSearchToSelectContactTooltip=Ngoài ra nếu bạn có một số lượng lớn các bên thứ ba (> 100 000), bạn có thể tăng tốc độ bằng cách thiết lập CONTACT_DONOTSEARCH_ANYWHERE liên tục đến 1 trong Setup-> khác. Tìm kiếm sau đó sẽ được giới hạn để bắt đầu của chuỗi. -UseSearchToSelectContact=Sử dụng các trường để lựa chọn năng tự động gõ liên lạc (thay vì sử dụng một hộp danh sách). -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) +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=Sử dụng các trường điền tự động để chọn bên thứ ba thay vì sử dụng một hộp danh sách. +ActivityStateToSelectCompany= Thêm tùy chọn bộ lọc để ẩn/hiện các bên thứ ba hiện đang hoạt động hoặc đã bị xóa +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=Sử dụng các trường điền tự động để lựa chọn năng liên lạc (thay vì sử dụng một hộp danh sách). +DelaiedFullListToSelectCompany=Chờ bạn nhấn một phím trước khi tải nội dung của danh sách thirdparties combo (Điều này có thể làm tăng hiệu suất nếu bạn có một số lượng lớn các thirdparties) +DelaiedFullListToSelectContact=Chờ bạn nhấn một phím trước khi tải nội dung của danh sách liên lạc combo (Điều này có thể làm tăng hiệu suất nếu bạn có một số lượng lớn các liên lạc) SearchFilter=Tùy chọn bộ lọc tìm kiếm -NumberOfKeyToSearch=Ký tự nbr để tìm: %s +NumberOfKeyToSearch=Nbr của characters để kích hoạt tìm kiếm: %s ViewFullDateActions=Hiển thị ngày tháng đầy đủ của sự kiện ở bảng tính thứ ba NotAvailableWhenAjaxDisabled=Hiện không có sẵn khi Ajax bị vô hiệu JavascriptDisabled=Vô hiệu JavaScript UsePopupCalendar=Sử dụng menu xổ xuống để nhập ngày tháng vào UsePreviewTabs=Sử dụng chế độ xem sơ lược tab ShowPreview=Hiển thị xem trước -PreviewNotAvailable=Xem trước hiện không khả dụng +PreviewNotAvailable=Xem trước không sẵn có ThemeCurrentlyActive=Giao diện hiện đã kích hoạt CurrentTimeZone=Mã vùng thời gian PHP (server) -MySQLTimeZone=TimeZone MySql (cơ sở dữ liệu) -TZHasNoEffect=Ngày được lưu trữ và máy chủ cơ sở dữ liệu trả về bởi như thể chúng được lưu giữ như là chuỗi đệ trình. Các múi giờ có tác dụng chỉ khi sử dụng chức năng UNIX_TIMESTAMP (mà không nên được sử dụng bởi Dolibarr, vì vậy cơ sở dữ liệu TZ nên không có hiệu lực, ngay cả khi thay đổi sau khi dữ liệu đã được nhập vào). +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=Khoảng trống -Table=Bàn +Table=Bảng Fields=Trường Index=Chỉ mục Mask=Mặt nạ NextValue=Giá trị tiếp theo -NextValueForInvoices=Giá trị tiếp theo (invoices) -NextValueForCreditNotes=Giá trị tiếp theo (ghi chú tín dụng) -NextValueForDeposit=Giá trị tiếp theo (tiền đặt cọc) +NextValueForInvoices=Giá trị tiếp theo (hóa đơn) +NextValueForCreditNotes=Giá trị tiếp theo (giấy báo có) +NextValueForDeposit=Giá trị tiếp theo (tiền ứng trước) NextValueForReplacements=Giá trị tiếp theo (thay thế) -MustBeLowerThanPHPLimit=Chú ý: PHP của bạn giới hạn kích thước của tập tin tải lên là %s%s, cho dù giá trị thông số phần này là -NoMaxSizeByPHPLimit=Chú ý: Không có giới hạn được chỉnh sửa trong phần chỉnh sửa PHP +MustBeLowerThanPHPLimit=Ghi chú: PHP của bạn giới hạn kích thước của tập tin tải lên là %s%s, cho dù giá trị thông số phần này là +NoMaxSizeByPHPLimit=Ghi chú: Không có giới hạn được chỉnh sửa trong phần chỉnh sửa PHP MaxSizeForUploadedFiles=Kích thước tối đa của tập tin được tải lên (0 sẽ tắt chế độ tải lên) UseCaptchaCode=Sử dụng mã xác nhận (CAPTCHA) ở trang đăng nhập UseAvToScanUploadedFiles=Sử dụng trình quét virus đối với tập tin được tải lên AntiVirusCommand= Đường dẫn đầy đủ để thi hành việc quét virus AntiVirusCommandExample= Thí dụ dành cho ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
Thí dụ cho ClamAv: /usr/bin/clamscan -AntiVirusParam= Thêm các thông số khác trong dòng lệnh +AntiVirusParam= Nhiều thông số trên dòng lệnh AntiVirusParamExample= Thí dụ với ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib" ComptaSetup=Cài đặt module kế toán UserSetup=Cài đặt quản lý người dùng MenuSetup=Cài đặt quản lý menu MenuLimits=Giới hạn và độ chính xác -MenuIdParent=Chỉ số menu gốc -DetailMenuIdParent=Chỉ số của menu gốc (rỗng nếu là menu gốc) +MenuIdParent=ID menu chính +DetailMenuIdParent=ID menu chính (rỗng nếu là menu gốc) DetailPosition=Sắp xếp chữ số để xác định vị trí menu -PersonalizedMenusNotSupported=Menu theo do người dùng tự chỉnh không được hỗ trợ +PersonalizedMenusNotSupported=Menu cá nhân hóa không được hỗ trợ AllMenus=Tất cả -NotConfigured=Module vẫn chưa được chỉnh +NotConfigured=Module chưa được cấu hình Setup=Cài đặt Activation=Kích hoạt -Active=Hoạt động +Active=Kích hoạt SetupShort=Cài đặt OtherOptions=Tùy chọn khác OtherSetup=Cài đặt khác -CurrentValueSeparatorDecimal=Phân cách tập phân +CurrentValueSeparatorDecimal=Phân cách thập phân CurrentValueSeparatorThousand=Phân cách phần ngàn -Destination=Điểm đến -IdModule=Module ID -IdPermissions=Quyền ID +Destination=Đích đến +IdModule=ID module +IdPermissions=ID phân quyền Modules=Module ModulesCommon=Module chính -ModulesOther=Các module khác +ModulesOther=Module khác ModulesInterfaces=Module giao diện -ModulesSpecial=Xác nhận module +ModulesSpecial=Modules đặc biệt ParameterInDolibarr=Thông số %s LanguageParameter=Thông số ngôn ngữ %s LanguageBrowserParameter=Thông số %s -LocalisationDolibarrParameters=Địa phương hóa thông số +LocalisationDolibarrParameters=Thông số địa phương hóa ClientTZ=Time Zone khách hàng (người sử dụng) -ClientHour=Hiện khách hàng (người sử dụng) -OSTZ=Máy chủ hệ điều hành Time Zone -PHPTZ=PHP máy chủ Time Zone -PHPServerOffsetWithGreenwich=PHP server offset width Greenwich (giây) -ClientOffsetWithGreenwich=Client/Trình duyệt độ rộng offset Greenwich (giây) -DaylingSavingTime=Tiết kiệm thời gian ban ngày -CurrentHour=PHP thời gian (máy chủ) -CompanyTZ=Thời gian Công ty Zone (công ty chính) -CompanyHour=Công ty thời gian (công ty chính) -CurrentSessionTimeOut=Thời gian hết hạn của phiên làm việc hiện tại -YouCanEditPHPTZ=Để thiết lập một PHP múi giờ khác nhau (không bắt buộc), bạn có thể cố gắng thêm một tập tin .htacces với một dòng như thế này "setenv TZ Châu Âu / Paris" +ClientHour=Thời gian khách hàng (người sử dụng) +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=Thời hạn phiên làm việc hiện tại +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=Môi trường hệ điều hành Box=Hộp Boxes=Các Hộp @@ -144,11 +144,11 @@ MaxNbOfLinesForBoxes=Số lượng dòng tối đa đối với các hộp PositionByDefault=Trật tự mặc định Position=Chức vụ MenusDesc=Phần quản lý menu xác định nội dung đối với 2 thanh menu (thanh đặt ở chiều ngang và đặt theo chiều dọc). -MenusEditorDesc=Các biên tập viên menu cho phép bạn xác định mục cá nhân trong các menu. Sử dụng nó một cách cẩn thận để tránh làm cho dolibarr không ổn định và các mục trình đơn vĩnh viễn không thể truy cập.
Một số mô-đun thêm các mục trong menu (trong trình đơn Tất cả trong hầu hết các trường hợp). Nếu bạn loại bỏ một số trong những mục do nhầm lẫn, bạn có thể khôi phục lại chúng bằng cách vô hiệu hóa và kích hoạt lại các mô-đun. -MenuForUsers=Menu dành cho người sử dụng +MenusEditorDesc=Các biên tập viên menu cho phép bạn xác định cá nhân hóa các mục trong các menu. Sử dụng nó một cách cẩn thận để tránh làm cho dolibarr không ổn định và các mục trình đơn vĩnh viễn không thể truy cập.
Một số mô-đun thêm các mục trong menu (trong trình đơn Tất cả trong hầu hết các trường hợp). Nếu bạn loại bỏ một số trong những mục do nhầm lẫn, bạn có thể khôi phục lại chúng bằng cách vô hiệu hóa và kích hoạt lại các mô-đun. +MenuForUsers=Menu cho người dùng LangFile=tập tin .lang System=Hệ thống -SystemInfo=Thông tin về hệ thống +SystemInfo=Thông tin hệ thống SystemTools=Công cụ hệ thống SystemToolsArea=Khu vực công cụ hệ thống SystemToolsAreaDesc=Khu vực này cung cấp các tính năng quản trị. Sử dụng menu để chọn tính năng mà bạn đang muốn thao tác. @@ -157,288 +157,289 @@ PurgeAreaDesc=Trang này cho phép bạn xóa toàn bộ các tập tin đã đ PurgeDeleteLogFile=Xóa tập tin nhật trình %s được tạo bởi module Syslog (không gây nguy hiểm cho việc mất mát dữ liệu) PurgeDeleteTemporaryFiles=Xóa toàn bộ các tập tin tạm (không gây nguy hiểm cho việc thất thoát dữ liệu) PurgeDeleteAllFilesInDocumentsDir=Xóa tất cả các file trong thư mục %s. Tập tin tạm thời mà còn sao lưu cơ sở dữ liệu bãi, tập tin đính kèm với các yếu tố (các bên thứ ba, hóa đơn, ...) và tải lên vào module ECM sẽ bị xóa. -PurgeRunNow=Tẩy giờ +PurgeRunNow=Thanh lọc bây giờ PurgeNothingToDelete=Không có thư mục hoặc tập tin để xóa. PurgeNDirectoriesDeleted=% các tập tin hoặc thư mục bị xóa. -PurgeAuditEvents=Thanh trừng tất cả các sự kiện an ninh -ConfirmPurgeAuditEvents=Bạn Bạn có chắc chắn muốn thanh trừng tất cả các sự kiện an ninh? Tất cả các nhật bảo mật sẽ bị xóa, không có dữ liệu khác sẽ bị xóa. +PurgeAuditEvents=Thanh lọc tất cả các sự kiện bảo mật +ConfirmPurgeAuditEvents=Bạn Bạn có chắc chắn muốn thanh lọc tất cả các sự kiện bảo mật? Tất cả các nhật trình bảo mật sẽ bị xóa, không có dữ liệu khác nào sẽ bị xóa. NewBackup=Sao lưu mới GenerateBackup=Tạo sao lưu Backup=Sao lưu Restore=Khôi phục -RunCommandSummary=Sao lưu đã được đưa ra với lệnh sau đây -RunCommandSummaryToLaunch=Sao lưu có thể được đưa ra với lệnh sau đây -WebServerMustHavePermissionForCommand=Máy chủ web của bạn phải có sự cho phép để chạy các lệnh như vậy +RunCommandSummary=Sao lưu mới được triển khai với lệnh sau đây +RunCommandSummaryToLaunch=Sao lưu có thể được triển khai với lệnh sau đây +WebServerMustHavePermissionForCommand=Máy chủ web của bạn phải có quyền để chạy các lệnh như vậy BackupResult=Kết quả sao lưu BackupFileSuccessfullyCreated=Tập tin sao lưu được tạo ra thành công YouCanDownloadBackupFile=Các tập tin được tạo ra có thể được tải về -NoBackupFileAvailable=Không sao lưu tập tin có sẵn. -ExportMethod=Phương pháp xuất khẩu -ImportMethod=Phương pháp nhập khẩu +NoBackupFileAvailable=Không có tập tin sao lưu sẵn. +ExportMethod=Phương thức xuất dữ liệu +ImportMethod=Phương thức nhập dữ liệu ToBuildBackupFileClickHere=Để xây dựng một tập tin sao lưu, nhấn vào đây . ImportMySqlDesc=Để nhập một tập tin sao lưu, bạn phải sử dụng lệnh mysql từ dòng lệnh: ImportPostgreSqlDesc=Để nhập một tập tin sao lưu, bạn phải sử dụng lệnh pg_restore từ dòng lệnh: ImportMySqlCommand=%s %s < mybackupfile.sql ImportPostgreSqlCommand=%s %s mybackupfile.sql -FileNameToGenerate=Tên tập tin để tạo ra -Compression=Nén -CommandsToDisableForeignKeysForImport=Lệnh để vô hiệu hóa các phím nước ngoài nhập khẩu -CommandsToDisableForeignKeysForImportWarning=Bắt buộc nếu bạn muốn để có thể khôi phục lại bãi sql của bạn sau này -ExportCompatibility=Khả năng tương thích của tập tin xuất khẩu tạo ra -MySqlExportParameters=Thông số xuất khẩu MySQL -PostgreSqlExportParameters= Thông số xuất khẩu PostgreSQL +FileNameToGenerate=Tên tập tin để tạo +Compression=Nén dữ liệu +CommandsToDisableForeignKeysForImport=Lệnh để vô hiệu hóa các khóa ngoại trên dữ liệu nhập khẩu +CommandsToDisableForeignKeysForImportWarning=Bắt buộc nếu bạn muốn để có thể khôi phục lại sql dump của bạn sau này +ExportCompatibility=Sự tương thích của tập tin xuất dữ liệu được tạo ra +MySqlExportParameters=Thông số xuất dữ liệu MySQL +PostgreSqlExportParameters= Thông số xuất dữ liệu PostgreSQL UseTransactionnalMode=Sử dụng chế độ giao dịch -FullPathToMysqldumpCommand=Đường dẫn đầy đủ để mysqldump lệnh -FullPathToPostgreSQLdumpCommand=Đường dẫn đầy đủ để pg_dump lệnh -ExportOptions=Tùy chọn xuất khẩu -AddDropDatabase=Thêm lệnh DATABASE thả -AddDropTable=Thêm DROP TABLE lệnh -ExportStructure=Cơ cấu +FullPathToMysqldumpCommand=Đường dẫn đầy đủ cho lệnh mysqldump +FullPathToPostgreSQLdumpCommand=Đường dẫn đầy đủ cho lệnh pg_dump +ExportOptions=Tùy chọn xuất dữ liệu +AddDropDatabase=Add DROP DATABASE command +AddDropTable=Add DROP TABLE command +ExportStructure=Cấu trúc Datas=Dữ liệu -NameColumn=Cột Name -ExtendedInsert=Mở rộng INSERT -NoLockBeforeInsert=Không khóa lệnh trên INSERT -DelayedInsert=Chèn bị trì hoãn -EncodeBinariesInHexa=Mã hóa dữ liệu nhị phân trong hệ thập lục phân -IgnoreDuplicateRecords=Bỏ qua lỗi của bản ghi trùng lặp (INSERT bỏ qua) +NameColumn=Cột Tên +ExtendedInsert=Lệnh INSERT mở rộng +NoLockBeforeInsert=Không khóa lệnh quanh INSERT +DelayedInsert=Độ trẽ insert +EncodeBinariesInHexa=Encode binary data in hexadecimal +IgnoreDuplicateRecords=Ignore errors of duplicate records (INSERT IGNORE) Yes=Có -No=Không có -AutoDetectLang=Tự động (ngôn ngữ trình duyệt) -FeatureDisabledInDemo=Tính năng vô hiệu hóa trong bản demo -Rights=Quyền -BoxesDesc=Hộp là khu vực màn hình hiển thị một mẩu thông tin trên một số trang. Bạn có thể chọn giữa việc hiển thị hộp hay không bằng cách chọn trang mục tiêu và nhấp vào 'Kích hoạt', hoặc bằng cách nhấn vào thùng rác để vô hiệu hóa nó. -OnlyActiveElementsAreShown=Chỉ có các yếu tố từ kích hoạt module được hiển thị. -ModulesDesc=Module Dolibarr xác định các chức năng được kích hoạt trong phần mềm. Một số module yêu cầu cấp phép mà bạn phải cấp cho người sử dụng, sau khi kích hoạt module. Click vào nút on / off trong cột "Trạng thái" để cho phép một mô-đun / tính năng. -ModulesInterfaceDesc=Các Dolibarr giao diện module cho phép bạn thêm các tính năng phụ thuộc vào phần mềm bên ngoài, hệ thống hoặc dịch vụ. +No=Không +AutoDetectLang=Tự động phát hiện (ngôn ngữ trình duyệt) +FeatureDisabledInDemo=Tính năng đã vô hiệu hóa trong bản demo +Rights=Phân quyền +BoxesDesc=Hộp là khu vực màn hình hiển thị một mẩu thông tin trên một số trang. Bạn có thể chọn giữa việc hiển thị hộp hay không bằng cách chọn trang mục tiêu và nhấp vào 'Kích hoạt', hoặc bằng cách nhấn vào biểu tượng thùng rác để vô hiệu hóa nó. +OnlyActiveElementsAreShown=Chỉ có các yếu tố từ module kích hoạt được hiển thị. +ModulesDesc=Module Dolibarr xác định các chức năng được kích hoạt trong phần mềm. Một số module yêu cầu phân quyền mà bạn phải cấp cho người sử dụng, sau khi kích hoạt module. Click vào nút on / off trong cột "Trạng thái" để mở một mô-đun / tính năng. +ModulesInterfaceDesc=Các giao diện module Dolibarr cho phép bạn thêm các tính năng phụ thuộc vào phần mềm bên ngoài, hệ thống hoặc dịch vụ. ModulesSpecialDesc=Các mô-đun đặc biệt là các mô-đun rất cụ thể hoặc ít khi sử dụng. ModulesJobDesc=Module kinh doanh cung cấp thiết lập được xác định trước đơn giản của Dolibarr cho một doanh nghiệp cụ thể. -ModulesMarketPlaceDesc=Bạn có thể tìm thấy các mô-đun tải bên ngoài trang web trên Internet ... +ModulesMarketPlaceDesc=Bạn có thể tìm thấy nhiều mô-đun để tải về ngoài trang web trên Internet ... ModulesMarketPlaces=Nhiều mô-đun ... -DoliStoreDesc=DoliStore, trên thị trường chính thức cho Dolibarr ERP / CRM module bên ngoài -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=Cung cấp dịch vụ trang web, bạn có thể tìm kiếm để tìm các mô-đun ... +DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules +DoliPartnersDesc=Danh sách với một số công ty có thể cung cấp / phát triển theo yêu cầu module hoặc các tính năng (Lưu ý: bất kỳ công ty mã nguồn mở knowning ngôn ngữ PHP có thể cung cấp cho bạn phát triển cụ thể) +WebSiteDesc=Nhà cung cấp dịch vụ trang web, bạn search có thể tìm kiếm nhiều mô-đun ... URL=Liên kết BoxesAvailable=Hộp có sẵn -BoxesActivated=Hộp kích hoạt +BoxesActivated=Hộp được kích hoạt ActivateOn=Kích hoạt trên ActiveOn=Đã kích hoạt trên SourceFile=Tập tin nguồn AutomaticIfJavascriptDisabled=Tự động nếu Javascript bị vô hiệu hóa AvailableOnlyIfJavascriptNotDisabled=Chỉ có sẵn nếu JavaScript không bị vô hiệu hóa AvailableOnlyIfJavascriptAndAjaxNotDisabled=Chỉ có sẵn nếu JavaScript không bị vô hiệu hóa -Required=Yêu cầu -UsedOnlyWithTypeOption=Được sử dụng bởi một số chương trình nghị sự lựa chọn duy nhất -Security=An ninh +Required=Được yêu cầu +UsedOnlyWithTypeOption=Được dùng chỉ bởi một vài tùy chọn chương trình nghị sự +Security=Bảo mật Passwords=Mật khẩu -DoNotStoreClearPassword=Do không có cửa hàng mật khẩu rõ ràng trong cơ sở dữ liệu nhưng cửa hàng chỉ có giá trị được mã hóa (đề nghị Đã kích hoạt) -MainDbPasswordFileConfEncrypted=Cơ sở dữ liệu mật khẩu được mã hóa trong conf.php (Đã kích hoạt được đề nghị) -InstrucToEncodePass=Để có mật khẩu mã hóa vào tập tin conf.php, thay thế dòng
$dolibarr_main_db_pass="..."
bởi
$dolibarr_main_db_pass="crypted:%s" -InstrucToClearPass=Để có mật khẩu giải mã (làm sạch) vào tập tin conf.php, thay thế dòng
$dolibarr_main_db_pass="crypted:..."
bởi
$dolibarr_main_db_pass="%s" -ProtectAndEncryptPdfFiles=Bảo vệ các tập tin pdf được tạo ra (hoạt không được khuyến khích, phá vỡ hệ pdf khối lượng) -ProtectAndEncryptPdfFilesDesc=Bảo vệ tài liệu PDF giữ cho nó có sẵn để đọc và in với bất kỳ trình duyệt PDF. Tuy nhiên, chỉnh sửa và sao chép là không thể nữa. Lưu ý rằng việc sử dụng tính năng này làm cho xây dựng một tích lũy pdf toàn cầu không làm việc (như hóa đơn chưa thanh toán). -Feature=Tính năng +DoNotStoreClearPassword=Không chứa mật khẩu đã xóa trong cơ sở dữ liệu nhưng chỉ chứa giá trị được mã hóa (Đã kích hoạt được khuyến nghị) +MainDbPasswordFileConfEncrypted=Cơ sở dữ liệu mật khẩu được mã hóa trong conf.php (Đã kích hoạt được Khuyến nghị) +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=Đặc tính DolibarrLicense=Giấy phép -DolibarrProjectLeader=Người lãnh đạo dự án -Developpers=Các nhà phát triển / thành viên góp -OtherDeveloppers=Phát triển khác / đóng góp -OfficialWebSite=Dolibarr trang web chính thức quốc tế +DolibarrProjectLeader=Lãnh đạo dự án +Developpers=Người phát triển/cộng tác viên +OtherDeveloppers=Nhà phát triển/cộng tác viên khác +OfficialWebSite=Trang web chính thức quốc tế Dolibarr OfficialWebSiteFr=Trang web chính thức của Pháp OfficialWiki=Tài liệu Dolibarr trên Wiki OfficialDemo=Dolibarr demo trực tuyến -OfficialMarketPlace=Thị trường chính thức cho các module bên ngoài / addons -OfficialWebHostingService=Dịch vụ lưu trữ web tham chiếu (Cloud lưu trữ) -ReferencedPreferredPartners=Đối tác ưa thích -OtherResources=Autres nguồn tài -ForDocumentationSeeWiki=Đối với người dùng hay tài liệu hướng dẫn phát triển (tài liệu, Hỏi đáp về ...),
hãy xem các Dolibarr Wiki:
%s -ForAnswersSeeForum=Đối với bất kỳ câu hỏi khác / giúp đỡ, bạn có thể sử dụng diễn đàn Dolibarr:
%s -HelpCenterDesc1=Khu vực này có thể giúp bạn để có được một dịch vụ hỗ trợ giúp về Dolibarr. -HelpCenterDesc2=Một số phần của dịch vụ này có sẵn chỉ trong tiếng Anh. -CurrentTopMenuHandler=Xử lý menu trên cùng hiện tại -CurrentLeftMenuHandler=Xử lý menu bên trái hiện tại -CurrentMenuHandler=Xử lý menu hiện tại -CurrentSmartphoneMenuHandler=Xử lý menu điện thoại thông minh hiện tại +OfficialMarketPlace=Thị trường chính thức cho các module/addon bên ngoài +OfficialWebHostingService=Dịch vụ lưu trữ web được tham chiếu (Cloud hosting) +ReferencedPreferredPartners=Đối tác ưu tiên +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=Điều khiển menu trên cùng hiện tại +CurrentLeftMenuHandler=Điều khiển menu bên trái hiện tại +CurrentMenuHandler=Điều khiển menu hiện tại +CurrentSmartphoneMenuHandler=Điều khiển menu smartphine hiện tại MeasuringUnit=Đơn vị đo Emails=E-mail -EMailsSetup=E-mail cài đặt -EMailsDesc=Trang này cho phép bạn ghi đè lên các thông số PHP của bạn cho e-mail gửi. Trong hầu hết các trường hợp trên Unix / Linux hệ điều hành, thiết lập PHP của bạn là chính xác và các thông số này là vô ích. -MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (Theo mặc định trong php.ini: %s) -MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (Theo mặc định trong php.ini: %s) -MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP / SMTPS Port (Không xác định vào PHP trên Unix như hệ thống) -MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS Host (Không xác định vào PHP trên Unix như hệ thống) -MAIN_MAIL_EMAIL_FROM=Tên người gửi e-mail cho các email tự động (theo mặc định trong php.ini: %s) -MAIN_MAIL_ERRORS_TO=Tên người gửi e-mail được sử dụng cho các lỗi trả về email được gửi -MAIN_MAIL_AUTOCOPY_TO= Gửi một cách có hệ thống ẩn carbon bản sao của tất cả các email gửi tới -MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Gửi một cách có hệ thống ẩn carbon bản sao của kiến ​​nghị gửi qua email -MAIN_MAIL_AUTOCOPY_ORDER_TO= Gửi một cách có hệ thống ẩn carbon bản sao của đơn đặt hàng được gửi qua email đến -MAIN_MAIL_AUTOCOPY_INVOICE_TO= Gửi một cách có hệ thống ẩn carbon bản sao hoá đơn gửi bằng email đến +EMailsSetup=Cài đặt E-mail +EMailsDesc=Trang này cho phép bạn ghi đè lên các thông số PHP của bạn cho việc gửi e-mail. Trong hầu hết các trường hợp trên hệ điều hành Unix / Linux, cài đặt PHP của bạn là chính xác và các thông số này là vô ích. +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=Người gửi e-mail được sử dụng cho các lỗi trả về email được gửi +MAIN_MAIL_AUTOCOPY_TO= Gửi một bản CC một cách tự động cho tất cả các email được gửi +MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Gửi tự động một bản sao CC ẩn của đơn hàng đề xuất đã gửi qua email cho +MAIN_MAIL_AUTOCOPY_ORDER_TO= Gửi tự động một bản sao CC ẩn của đơn hàng được gửi qua email đến +MAIN_MAIL_AUTOCOPY_INVOICE_TO= Gửi tự động bản sao CC ẩn của hoá đơn đã gửi bằng email đến MAIN_DISABLE_ALL_MAILS=Vô hiệu hoá tất cả các e-mail sendings (cho mục đích thử nghiệm hoặc trình diễn) MAIN_MAIL_SENDMODE=Phương pháp sử dụng để gửi email MAIN_MAIL_SMTPS_ID=SMTP ID nếu có yêu cầu xác thực MAIN_MAIL_SMTPS_PW=Mật khẩu SMTP nếu có yêu cầu xác thực MAIN_MAIL_EMAIL_TLS= Sử dụng TLS (SSL) mã hóa MAIN_DISABLE_ALL_SMS=Vô hiệu hoá tất cả sendings SMS (cho mục đích thử nghiệm hoặc trình diễn) -MAIN_SMS_SENDMODE=Phương pháp sử dụng để gửi tin nhắn SMS -MAIN_MAIL_SMS_FROM=Số điện thoại mặc định cho người gửi SMS gửi -FeatureNotAvailableOnLinux=Tính năng không có sẵn trên Unix như hệ thống. Kiểm tra chương trình sendmail của bạn tại địa phương. -SubmitTranslation=Nếu dịch cho ngôn ngữ này không phải là hoàn toàn hoặc bạn tìm thấy lỗi, bạn có thể khắc phục điều này bằng cách chỉnh sửa tập tin vào thư mục langs/%s và submit file đã chỉnh sửa trên diễn đàn www.dolibarr.org. -ModuleSetup=Thiết lập mô-đun -ModulesSetup=Các mô-đun cài đặt +MAIN_SMS_SENDMODE=Phương pháp sử dụng để gửi SMS +MAIN_MAIL_SMS_FROM=Số điện thoại mặc định cho việc gửi SMS gửi +FeatureNotAvailableOnLinux=Tính năng không có sẵn trên Unix như hệ thống. Kiểm tra chương trình sendmail bản địa của bạn. +SubmitTranslation=Nếu dịch cho ngôn ngữ này không hoàn tất hoặc bạn tìm thấy lỗi, bạn có thể khắc phục điều này bằng cách chỉnh sửa tập tin vào thư mục langs/%s và submit file đã chỉnh sửa trên diễn đàn www.dolibarr.org. +ModuleSetup=Cài đặt module +ModulesSetup=Cài đặt module ModuleFamilyBase=Hệ thống ModuleFamilyCrm=Quản lý quan hệ khách hàng (CRM) ModuleFamilyProducts=Quản lý sản phẩm ModuleFamilyHr=Quản lý nguồn nhân lực -ModuleFamilyProjects=Các dự án / công trình hợp tác +ModuleFamilyProjects=Các dự án/Việc cộng tác ModuleFamilyOther=Khác -ModuleFamilyTechnic=Nhiều mô-đun công cụ -ModuleFamilyExperimental=Các mô-đun thí nghiệm -ModuleFamilyFinancial=Mô-đun tài chính (Kế toán / Tài chính) +ModuleFamilyTechnic=Công cụ đa module +ModuleFamilyExperimental=Module thử nghiệm +ModuleFamilyFinancial=Module tài chính (Kế toán/Ngân quỹ) ModuleFamilyECM=Quản lý nội dung điện tử (ECM) -MenuHandlers=Xử lý đơn -MenuAdmin=Biên tập đơn +MenuHandlers=Điều khiển menu +MenuAdmin=Biên tập menu DoNotUseInProduction=Không sử dụng trong sản xuất -ThisIsProcessToFollow=Đây là thiết lập để quá trình: -StepNb=Bước%s +ThisIsProcessToFollow=Đây là cài đặt cho quy trình: +ThisIsAlternativeProcessToFollow=Đây là cài đặt thay thế cho quy trình: +StepNb=Bước %s FindPackageFromWebSite=Tìm một gói phần mềm cung cấp các tính năng mà bạn muốn (ví dụ như trên trang web chính thức %s). -DownloadPackageFromWebSite=Download package %s. -UnpackPackageInDolibarrRoot=Tập tin gói giải nén vào thư mục gốc của Dolibarr %s +DownloadPackageFromWebSite=Gói tải về %s. +UnpackPackageInDolibarrRoot=Giải nèn file gói dữ liệu vào thư mục được chỉ định vào module bên ngoài: %s SetupIsReadyForUse=Cài đặt xong và Dolibarr đã sẵn sàng để sử dụng với thành phần mới này. NotExistsDirect=Các thư mục gốc thay thế không được định nghĩa.
-InfDirAlt=Kể từ phiên bản 3 có thể xác định một directory.This gốc thay thế cho phép bạn lưu trữ, cùng một vị trí, plug-in và các mẫu tùy chỉnh.
Chỉ cần tạo một thư mục trong thư mục gốc của Dolibarr (ví dụ như: tùy chỉnh).
-InfDirExample=
Sau đó khai báo trong tập tin conf.php
$dolibarr_main_url_root_alt='http://myserver/custom'
$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'
* Những dòng này được nhận xét với "#", để bỏ ghi chú chỉ loại bỏ các nhân vật. -YouCanSubmitFile=Chọn mô-đun: +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=Chọn module: CurrentVersion=Phiên bản hiện tại Dolibarr -CallUpdatePage=Tới trang đó cập nhật các cấu trúc cơ sở dữ liệu và dữ liệu:% s. -LastStableVersion=Cuối phiên bản ổn định -UpdateServerOffline=Update server offline -GenericMaskCodes=Bạn có thể nhập bất kỳ số mặt nạ. Trong mặt nạ này, các thẻ sau đây có thể được sử dụng:
{000000} tương ứng với một số trong đó sẽ được phát triển trên mỗi%s. Nhập càng nhiều số không như độ dài mong muốn của các truy cập. Truy cập sẽ được hoàn thành vào số không trên bên trái để có nhiều số không như mặt nạ.
{000000+000} giống như trước nhưng một bù đắp tương ứng với số bên phải dấu + là đã áp dụng bắt đầu từ ngày đầu tiên %s.
{000000@x} giống như trước, nhưng truy cập được thiết lập lại để không khi tháng x đạt được (x từ 1 đến 12, hoặc từ 0 đến sử dụng những tháng đầu của năm tài chính được xác định trong cấu hình của bạn, hoặc 99 để thiết lập lại bằng không mỗi tháng ). Nếu tùy chọn này được sử dụng và x là 2 hoặc cao hơn, sau đó tự {yy}{mm} hoặc {yyyy}{mm} cũng được yêu cầu.
{dd} ngày (01 đến 31).
{mm} tháng (01 đến 12).
{yy}, {yyyy} hoặc {y} năm trên 2, 4 hoặc 1 con số.
-GenericMaskCodes2={cccc} mã khách hàng về n ký tự
{cccc000} mã khách hàng về n ký tự tiếp theo là một truy cập dành riêng cho khách hàng. Truy cập này dành riêng cho khách hàng được thiết lập lại tại cùng một thời gian hơn truy cập toàn cầu.
{tttt} Đoạn mã của loại của bên thứ ba trên n ký tự (xem các loại từ điển của bên thứ ba).
-GenericMaskCodes3=Tất cả các nhân vật khác trong mặt nạ sẽ vẫn còn nguyên vẹn.
Khoảng trống không được phép.
-GenericMaskCodes4a=Ví dụ trên %s thứ 99 của bên thứ ba TheCompany đã hoàn thành 2007-01-31:
-GenericMaskCodes4b=Ví dụ về bên thứ ba tạo ra trên 2007-03-01:
-GenericMaskCodes4c=Ví dụ về sản phẩm tạo ra trên 2007-03-01:
-GenericMaskCodes5=b>ABC{yy}{mm}-{000000} sẽ gửi cho ABC0701-000099
{0000+100@1}-ZZZ/{dd}/XXX sẽ gửi cho 0199-ZZZ/31/XXX -GenericNumRefModelDesc=Trả về một số tùy biến theo một mặt nạ được xác định. -ServerAvailableOnIPOrPort=Máy chủ có sẵn tại địa chỉ %s trêncổng %s -ServerNotAvailableOnIPOrPort=Máy chủ không có sẵn tại địa chỉ %s trên cổng %s +CallUpdatePage=Tới trang cập nhật các cấu trúc cơ sở dữ liệu và dữ liệu: %s. +LastStableVersion=Phiên bản ổn định mới nhất +UpdateServerOffline=Cập nhật 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=Kết nối máy chủ thử nghiệm -DoTestSend=Kiểm tra gửi +DoTestSend=Kiểm tra gửi đi DoTestSendHTML=Kiểm tra gửi HTML -ErrorCantUseRazIfNoYearInMask=Lỗi, không thể sử dụng tùy chọn @ để thiết lập lại truy cập mỗi năm nếu chuỗi {yy} hoặc {yyyy} không có trong mặt nạ. -ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Lỗi, không thể sử dụng tùy chọn @ nếu chuỗi {yy}{mm} hoặc {yyyy}{mm} không có trong mặt nạ. -UMask=Umask tham số cho các tập tin mới trên hệ thống tập tin Unix / Linux / BSD / Mac. -UMaskExplanation=Thông số này cho phép bạn xác định quyền truy cập thiết lập mặc định trên các tập tin được tạo ra bởi Dolibarr trên máy chủ (khi tải ví dụ).
Nó phải là giá trị bát phân (ví dụ, 0666 có nghĩa là đọc và viết cho tất cả mọi người).
Tham số này là vô dụng trên một máy chủ Windows. -SeeWikiForAllTeam=Hãy xem các trang wiki cho danh sách đầy đủ của tất cả các diễn viên và các tổ chức của họ -UseACacheDelay= Delay cho xuất khẩu đáp ứng bộ nhớ đệm trong vài giây (0 hoặc trống rỗng không có bộ nhớ cache) -DisableLinkToHelpCenter=Ẩn liên kết "Cần giúp đỡ hoặc hỗ trợ" trên trang đăng nhập -DisableLinkToHelp=Ẩn liên kết "%s Hỗ trợ trực tuyến" trên menu bên trái -AddCRIfTooLong=Không có gói tự động, do đó, nếu dòng là ra khỏi trang trên các tài liệu bởi vì quá dài, bạn phải thêm mình xuống dòng trong khung văn bản. -ModuleDisabled=Mô-đun bị vô hiệu hóa -ModuleDisabledSoNoEvent=Mô-đun để vô hiệu hóa sự kiện không bao giờ tạo ra -ConfirmPurge=Bạn Bạn có chắc chắn muốn thực hiện cuộc thanh trừng này?
Điều này chắc chắn sẽ xóa tất cả các file dữ liệu của bạn không có cách nào khôi phục lại được (file ECM, file đính kèm ...). +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 bị vô hiệu +ModuleDisabledSoNoEvent=Module bị vô hiệu nên sự kiện không bao giờ được tạo +ConfirmPurge=Bạn có chắc muốn thực hiện việc thanh lọc này?
Điều này sẽ xóa vĩnh viễn tất cả các file dữ liệu của bạn không có cách nào khôi phục lại được (file ECM, file đính kèm ...). MinLength=Chiều dài tối thiểu -LanguageFilesCachedIntoShmopSharedMemory=Tập tin .lang nạp vào bộ nhớ chia sẻ -ExamplesWithCurrentSetup=Ví dụ với các thiết lập đang chạy -ListOfDirectories=Danh sách các mẫu tài liệu mở thư mục -ListOfDirectoriesForModelGenODT=Danh sách các thư mục chứa tập tin mẫu với các định dạng tài liệu mở.

Đặt ở đây đường dẫn đầy đủ của thư mục.
Thêm một trở về vận chuyển giữa các thư mục EAH.
Để thêm một thư mục của module GED, thêm ở đây DOL_DATA_ROOT/ecm/yourdirectoryname.

File trong thư mục phải kết thúc với .odt -NumberOfModelFilesFound=Số ODT / tập tin mẫu ODS tìm thấy trong các thư mục -ExampleOfDirectoriesForModelGen=Ví dụ về các cú pháp:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir -FollowingSubstitutionKeysCanBeUsed=
Để biết làm thế nào để tạo ra odt mẫu tài liệu của bạn, trước khi lưu trữ chúng trong các thư mục, đọc tài liệu wiki: +LanguageFilesCachedIntoShmopSharedMemory=Tập tin .lang được nạp vào bộ nhớ chia sẻ +ExamplesWithCurrentSetup=Ví dụ với cài đặt đang chạy hiện tại +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=Chức vụ Tên / LastName +FirstnameNamePosition=Chức vụ của Tên/Họ DescWeather=Những hình ảnh sau đây sẽ được hiển thị trên bảng điều khiển khi số hành động cuối đạt các giá trị sau đây: -KeyForWebServicesAccess=Chìa khóa để sử dụng dịch vụ Web (tham số "dolibarrkey" trong webservices) -TestSubmitForm=Hình thức kiểm tra đầu vào -ThisForceAlsoTheme=Quản lý sử dụng trình đơn này cũng sẽ sử dụng chủ đề của riêng mình bất cứ điều gì là sự lựa chọn của người dùng. Ngoài ra menu này quản lý chuyên ngành cho điện thoại thông minh không hoạt động trên tất cả các điện thoại thông minh. Quản lý sử dụng một trình đơn nếu bạn gặp vấn đề trên của bạn. -ThemeDir=Skins thư mục -ConnectionTimeout=Connexion thời gian chờ -ResponseTimeout=Đáp ứng thời gian chờ +KeyForWebServicesAccess=Key to use Web Services (parameter "dolibarrkey" in webservices) +TestSubmitForm=Form kiểm tra đầu vào +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=Thư mục giao diện +ConnectionTimeout=Connexion timeout +ResponseTimeout=Response timeout SmsTestMessage=Tin nhắn kiểm tra từ __PHONEFROM__ để __PHONETO__ -ModuleMustBeEnabledFirst=Mô-đun%s phải được kích hoạt trước khi sử dụng tính năng này. -SecurityToken=Chìa khóa để đảm bảo URL -NoSmsEngine=Không quản lý người gửi tin nhắn SMS có sẵn. Quản lý người gửi tin nhắn SMS không được cài đặt mặc định với phân phối (vì họ phụ thuộc vào một nhà cung cấp bên ngoài) nhưng bạn có thể tìm thấy một số trên%s +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=Bạn có thể thiết lập cho mỗi tùy chọn toàn cầu liên quan đến các thế hệ PDF -PDFAddressForging=Quy định giả mạo địa chỉ hộp -HideAnyVATInformationOnPDF=Ẩn tất cả các thông tin liên quan đến thuế GTGT đối với PDF được tạo ra +PDFDesc=Bạn có thể thiết lập cho mỗi tùy chọn toàn cầu liên quan đến việc tạo PDF +PDFAddressForging=Quy tắc bắt buộc hộp địa chỉ +HideAnyVATInformationOnPDF=Ẩn tất cả các thông tin liên quan đến thuế VAT đối với PDF được tạo ra HideDescOnPDF=Ẩn mô tả sản phẩm vào PDF được tạo ra -HideRefOnPDF=Ẩn các sản phẩm ref. PDF được tạo ra trên -HideDetailsOnPDF=Ẩn dòng sản phẩm chi tiết về PDF được tạo ra +HideRefOnPDF=Ẩn các sản phẩm tham chiếu trên PDF được tạo ra +HideDetailsOnPDF=Ẩn chi tiết sản phẩm trên PDF được tạo ra Library=Thư viện -UrlGenerationParameters=Các thông số để đảm bảo URL +UrlGenerationParameters=Các thông số để bảo mật URL SecurityTokenIsUnique=Sử dụng một tham số securekey duy nhất cho mỗi URL EnterRefToBuildUrl=Nhập tham chiếu cho đối tượng %s -GetSecuredUrl=Nhận URL tính -ButtonHideUnauthorized=Ẩn nút cho các hành động trái phép, thay vì hiển thị các nút khuyết tật -OldVATRates=Thuế suất thuế GTGT cũ -NewVATRates=Thuế suất thuế GTGT mới -PriceBaseTypeToChange=Sửa đổi về giá với giá trị tham chiếu được xác định trên cơ sở -MassConvert=Khởi động chuyển đổi hàng loạt -String=Chuỗi -TextLong=Văn bản dài +GetSecuredUrl=Nhận URL được tính +ButtonHideUnauthorized=Ẩn nút mà không được phân quyền, thay vì hiển thị các nút đã vô hiệu +OldVATRates=Thuế suất VAT cũ +NewVATRates=Thuế suất VAT mới +PriceBaseTypeToChange=Sửa đổi về giá với giá trị tham chiếu cơ sở được xác định trên +MassConvert=Thực hiện chuyển đổi hàng loạt +String=String +TextLong=Long text Int=Integer Float=Float -DateAndTime=Ngày và giờ -Unique=Độc đáo +DateAndTime=Date and hour +Unique=Unique Boolean=Boolean (Checkbox) -ExtrafieldPhone = Điện thoại +ExtrafieldPhone = Phone ExtrafieldPrice = Giá ExtrafieldMail = Email -ExtrafieldSelect = Danh sách lựa chọn +ExtrafieldSelect = Lựa chọn danh sách ExtrafieldSelectList = Chọn từ bảng 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
... -ExtrafieldParamHelpsellist=Danh sách các thông số xuất phát từ một bảng
Cú pháp: tên_bảng: label_field: id_field :: lọc
Ví dụ: c_typent: libelle: id :: lọc

bộ lọc có thể là một thử nghiệm đơn giản (ví dụ như hoạt động = 1) để hiển thị chỉ có giá trị tích cực
nếu bạn muốn lọc vào extrafields sử dụng syntaxt extra.fieldcode = ... (nơi mã trường là mã của extrafield)

Để có danh sách tùy thuộc vào khác:
c_typent: libelle: id: parent_list_code | parent_column: bộ lọc +ExtrafieldRadio=Radio button +ExtrafieldCheckBoxFromList= Checkbox từ bảng +ExtrafieldLink=Liên kết với một đối tượng +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=Thư viện được sử dụng để xây dựng PDF -WarningUsingFPDF=Cảnh báo: conf.php của bạn có chứa trực tiếp dolibarr_pdf_force_fpdf=1. Điều này có nghĩa là bạn sử dụng thư viện FPDF để tạo ra các tập tin PDF. Thư viện này là cũ và không hỗ trợ rất nhiều tính năng (Unicode, minh bạch, hình ảnh, ngôn ngữ Cyrillic, Arab và châu Á, ...), vì vậy bạn có thể gặp một số lỗi trong hệ PDF.
Để giải quyết điều này và có một sự hỗ trợ đầy đủ các thế hệ PDF, xin vui lòng tải TCPDF library, sau đó bình luận hoặc loại bỏ các dòng $dolibarr_pdf_force_fpdf=1, và thêm thay vì $dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir' -LocalTaxDesc=Một số quốc gia áp dụng 2 hoặc 3 loại thuế trên mỗi dòng hóa đơn. Nếu đây là trường hợp, chọn loại thuế thứ hai và thứ ba và tỷ lệ của nó. Loại có thể là:
1: thuế địa phương áp dụng trên các sản phẩm và dịch vụ mà không có thùng (thùng không được áp dụng thuế địa phương)
2: thuế địa phương áp dụng trên các sản phẩm và dịch vụ trước khi thùng (thùng được tính trên số tiền + localtax)
3: thuế địa phương áp dụng vào các sản phẩm mà không có thùng (thùng không được áp dụng thuế địa phương)
4: thuế địa phương áp dụng trên các sản phẩm trước khi thùng (thùng được tính trên số tiền + localtax)
5: thuế địa phương áp dụng vào các dịch vụ mà không có thùng (thùng không được áp dụng thuế địa phương)
6: thuế địa phương áp dụng vào các dịch vụ trước khi thùng (thùng được tính trên số tiền + localtax) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS -LinkToTestClickToDial=Nhập số điện thoại để gọi cho thấy một liên kết để kiểm tra url ClickToDial cho người dùng %s +LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s RefreshPhoneLink=Làm mới liên kết LinkToTest=Liên kết có thể click được tạo ra cho người dùng %s (bấm số điện thoại để kiểm tra) KeepEmptyToUseDefault=Giữ trống để sử dụng giá trị mặc định DefaultLink=Liên kết mặc định ValueOverwrittenByUserSetup=Cảnh báo, giá trị này có thể được ghi đè bởi các thiết lập cụ thể người sử dụng (mỗi người dùng có thể thiết lập url clicktodial riêng của mình) -ExternalModule=Bên ngoài mô-đun - cài đặt vào thư mục%s -BarcodeInitForThirdparties=Init mã vạch hàng loạt cho thirdparties -BarcodeInitForProductsOrServices=Init mã vạch khối lượng hoặc thiết lập lại các sản phẩm hoặc dịch vụ -CurrentlyNWithoutBarCode=Hiện tại, bạn có %s biên bản %s %s không có mã vạch xác định. -InitEmptyBarCode=Giá trị init cho các hồ sơ có sản phẩm nào tiếp theo%s +ExternalModule=Module bên ngoài được cài đặt vào thư mục %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=Xóa tất cả các giá trị hiện tại của mã vạch -ConfirmEraseAllCurrentBarCode=Bạn Bạn có chắc chắn muốn xóa tất cả các giá trị mã vạch hiện nay? +ConfirmEraseAllCurrentBarCode=Bạn có chắc muốn xóa tất cả các giá trị mã vạch hiện nay ? AllBarcodeReset=Tất cả giá trị mã vạch đã được loại bỏ -NoBarcodeNumberingTemplateDefined=Không có đánh số mã vạch mẫu kích hoạt vào thiết lập mô-đun mã vạch. -NoRecordWithoutBarcodeDefined=Không có hồ sơ không có giá trị xác định mã vạch. +NoBarcodeNumberingTemplateDefined=Không có mẫu mã vạch đánh số được kích hoạt trong cài đặt mô-đun mã vạch. +NoRecordWithoutBarcodeDefined=Không có bản ghi với không có mã vạch được xác định giá trị. # Modules Module0Name=Người dùng & nhóm -Module0Desc=Người dùng và nhóm quản lý -Module1Name=Các bên thứ ba -Module1Desc=Các công ty và quản lý liên lạc (khách hàng, khách hàng tiềm năng ...) +Module0Desc=Quản lý người dùng và nhóm +Module1Name=Bên thứ ba +Module1Desc=Quản lý liên lạc và công ty (khách hàng, khách hàng tiềm năng ...) Module2Name=Thương mại Module2Desc=Quản lý thương mại Module10Name=Kế toán -Module10Desc=Báo cáo kế toán đơn giản (các tạp chí, kim ngạch) dựa vào nội dung cơ sở dữ liệu. Không có điều phối. -Module20Name=Đề xuất -Module20Desc=Quản lý đề nghị thương mại +Module10Desc=Báo cáo kế toán đơn giản (nhật ký, doanh thu) dựa vào nội dung cơ sở dữ liệu. Không có điều phối. +Module20Name=Đơn hàng đề xuất +Module20Desc=Quản lý đơn hàng đề xuất Module22Name=Gửi Email hàng loạt Module22Desc=Quản lý gửi Email hàng loạt Module23Name= Năng lượng Module23Desc= Giám sát việc tiêu thụ năng lượng -Module25Name=Đơn đặt hàng của khách hàng -Module25Desc=Quản lý đơn đặt hàng +Module25Name=Đơn hàng khách hàng +Module25Desc=Quản lý đơn hàng khách hàng Module30Name=Hoá đơn -Module30Desc=Quản lý hóa đơn và phiếu ghi nợ cho khách hàng. Quản lý hóa đơn cho các nhà cung cấp +Module30Desc=Quản lý hóa đơn và giấy báo có cho khách hàng. Quản lý hóa đơn cho các nhà cung cấp Module40Name=Nhà cung cấp -Module40Desc=Quản lý nhà cung cấp và mua (đơn đặt hàng và hoá đơn) -Module42Name=Bản ghi -Module42Desc=Các cơ sở khai thác gỗ (tập tin, nhật ký hệ thống, ...) +Module40Desc=Quản lý nhà cung cấp và mua hàng (đơn hàng và hoá đơn) +Module42Name=Nhật trình +Module42Desc=Nhật trình thiết bị (file, nhật trình hệ thống, ...) Module49Name=Biên tập Module49Desc=Quản lý biên tập Module50Name=Sản phẩm @@ -449,598 +450,596 @@ Module52Name=Tồn kho Module52Desc=Quản lý tồn kho (sản phẩm) Module53Name=Dịch vụ Module53Desc=Quản lý dịch vụ -Module54Name=Contracts/Subscriptions -Module54Desc=Management of contracts (services or reccuring subscriptions) +Module54Name=Hợp đồng/Thuê bao +Module54Desc=Quản lý hợp đồng (dịch vụ hoặc thuê bao định kỳ) Module55Name=Mã vạch Module55Desc=Quản lý mã vạch -Module56Name=Điện thoại -Module56Desc=Tích hợp điện thoại -Module57Name=Chỉ thị thanh toán định kỳ -Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. +Module56Name=Telephony +Module56Desc=Telephony integration +Module57Name=Ủy nhiệm chi +Module57Desc=Quản lý ủy nhiệm chi và rút tiền. Cũng bao gồm việc tạo ra file SEPA đối với các nước châu Âu. Module58Name=ClickToDial -Module58Desc=Tích hợp hệ thống ClickToDial (Asterisk, ...) +Module58Desc=Integration of a ClickToDial system (Asterisk, ...) Module59Name=Bookmark4u Module59Desc=Thêm chức năng để tạo ra tài khoản Bookmark4u từ một tài khoản Dolibarr -Module70Name=Các can thiệp -Module70Desc=Quản lý can thiệp +Module70Name=Interventions +Module70Desc=Quản lý Intervention Module75Name=Phiếu công tác phí Module75Desc=Quản lý phiếu công tác phí Module80Name=Vận chuyển -Module80Desc=Quản lý đơn giao hàng và vận chuyển -Module85Name=Các ngân hàng và tiền mặt +Module80Desc=Quản lý phiếu xuất kho và phiếu giao hàng +Module85Name=Ngân hàng và tiền mặt Module85Desc=Quản lý tài khoản ngân hàng hoặc tiền mặt -Module100Name=External site -Module100Desc=Module này bao gồm một trang web bên ngoài hoặc trang vào menu Dolibarr và xem nó vào một khung Dolibarr -Module105Name=Mailman và SPIP -Module105Desc=Giao diện Mailman hoặc SPIP cho mô-đun thành viên +Module100Name=Trang web bên ngoài +Module100Desc=Module này bao gồm một trang web bên ngoài hoặc trang trong menu Dolibarr và xem nó trong một khung Dolibarr +Module105Name=Mailman and SPIP +Module105Desc=Mailman or SPIP interface for member module Module200Name=LDAP Module200Desc=Đồng bộ hóa thư mục LDAP Module210Name=PostNuke -Module210Desc=PostNuke hội nhập -Module240Name=Xuất khẩu dữ liệu -Module240Desc=Công cụ để xuất khẩu Dolibarr dữ liệu ngay (với các trợ lý) -Module250Name=Import dữ liệu -Module250Desc=Công cụ để import dữ liệu ngay trong Dolibarr (với trợ lý) +Module210Desc=Tích hợp PostNuke +Module240Name=Xuất dữ liệu +Module240Desc=Công cụ để xuất dữ liệu Dolibarr (với trợ lý) +Module250Name=Nhập dữ liệu +Module250Desc=Công cụ để import dữ liệu trong Dolibarr (với trợ lý) Module310Name=Thành viên -Module310Desc=Quản lý thành viên công ty +Module310Desc=Quản lý thành viên của tổ chức Module320Name=RSS Feed Module320Desc=Thêm nguồn cấp dữ liệu RSS trong trang màn hình Dolibarr -Module330Name=Đánh dấu +Module330Name=Bookmarks Module330Desc=Quản lý Bookmark -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 tích hợp +Module400Name=Dự án/Cơ hội/Đầu mối +Module400Desc=Quản lý dự án, cơ hội hoặc đầu mối. Bạn có thể chỉ định bất kỳ thành phần nào sau đó (hóa đơn, đơn hàng, đơn hàng đề xuất, intervention, ...) để dự án và hiển thị chiều ngang từ hiển thị dự án. +Module410Name=Lịch trên web +Module410Desc=Tích hợp lịch trên web 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 +Module510Name=Lương +Module510Desc=Quản lý lương nhân viên và thanh toán +Module520Name=Cho vay +Module520Desc=Quản lý cho vay 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 +Module770Name=Báo cáo chi phí +Module770Desc=Báo cáo quản lý và claim chi phí (di chuyển, ăn uống, ...) +Module1120Name=Đơn hàng đề xuất nhà cung cấp +Module1120Desc=Yêu cầu giá và đơn hàng đề xuất nhà cung cấp Module1200Name=Mantis -Module1200Desc=Mantis hội nhập +Module1200Desc=Tích hợp Mantis Module1400Name=Kế toán -Module1400Desc=Kế toán quản trị (đôi bên) -Module1520Name=Document Generation -Module1520Desc=Mass mail document generation -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 +Module1400Desc=Quản trị kế toán (đôi bên) +Module1520Name=Xuất chứng từ +Module1520Desc=Xuất chứng từ Mass mail +Module1780Name=Gán thẻ/phân nhóm +Module1780Desc=Tạo gán thẻ/phân nhóm (sản phẩm, khách hàng, nhà cung cấp, liên hệ hoặc thành viên) +Module2000Name=WYSIWYG editor +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 trình biên tập nâng cao +Module2200Name=Giá linh hoạt +Module2200Desc=Cho phép sử dụng các biểu thức toán học cho giá Module2300Name=Cron -Module2300Desc=Scheduled job management +Module2300Desc=Quản lý công việc theo lịch trình Module2400Name=Chương trình nghị sự -Module2400Desc=Sự kiện / nhiệm vụ và quản lý chương trình nghị sự +Module2400Desc=Quản lý Sự kiện/Tác vụ và chương trình nghị sự Module2500Name=Quản lý nội dung điện tử Module2500Desc=Lưu và chia sẻ tài liệu Module2600Name=WebServices Module2600Desc=Cho phép các máy chủ dịch vụ web 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) +Module2650Desc=Kích hoạt các dịch vụ web Dolibarr client (có thể được sử dụng để đẩy dữ liệu / yêu cầu đến các máy chủ bên ngoài. Đơn hàng Nhà cung cấp chỉ được hỗ trợ cho thời điểm này) Module2700Name=Gravatar Module2700Desc=Sử dụng dịch vụ trực tuyến Gravatar (www.gravatar.com) để hiển thị hình ảnh của người sử dụng / thành viên (được tìm thấy với các email của họ). Cần truy cập internet Module2800Desc=FTP Client Module2900Name=GeoIPMaxmind -Module2900Desc=GeoIP MaxMind khả năng chuyển đổi +Module2900Desc=GeoIP Maxmind conversions capabilities Module3100Name=Skype -Module3100Desc=Thêm một nút Skype vào thẻ tín đồ / bên thứ ba / địa chỉ liên lạc -Module5000Name=Nhiều công ty -Module5000Desc=Cho phép bạn quản lý nhiều công ty +Module3100Desc=Thêm một nút Skype vào thẻ adherent / bên thứ ba / liên lạc +Module5000Name=Đa công ty +Module5000Desc=Cho phép bạn quản lý đa công ty Module6000Name=Quy trình làm việc -Module6000Desc=Quản lý công việc -Module20000Name=Để lại yêu cầu quản lý -Module20000Desc=Khai báo và nhân viên theo yêu cầu nghỉ phép -Module39000Name=Hàng loạt sản phẩm -Module39000Desc=Batch or serial number, eat-by and sell-by date management on products -Module50000Name=Nơi trả tiền -Module50000Desc=Module để cung cấp một trang thanh toán trực tuyến bằng thẻ tín dụng với nơi trả tiền +Module6000Desc=Quản lý quy trình làm việc +Module20000Name=Quản lý phiếu nghỉ phép +Module20000Desc=Khai báo và theo dõi phiếu nghỉ phép của nhân viên +Module39000Name=Lô Sản phẩm +Module39000Desc=Lô hoặc số sê ri, quản lý ngày eat-by và sell-by trên sản phẩm +Module50000Name=PayBox +Module50000Desc=Module to offer an online payment page by credit card with PayBox Module50100Name=Điểm bán hàng -Module50100Desc=Quan điểm của mô-đun bán hàng +Module50100Desc=Module điểm bán hàng Module50200Name=Paypal Module50200Desc=Module để cung cấp một trang thanh toán trực tuyến bằng thẻ tín dụng với Paypal Module50400Name=Kế toán (nâng cao) -Module50400Desc=Kế toán quản trị (đôi bên) +Module50400Desc=Quản trị kế toán (đôi bên) 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=Mở Poll -Module55000Desc=Mô-đun để thực hiện các cuộc thăm dò trực tuyến (như Doodle, Studs, Rdvz, ...) +Module55000Name=Open Poll +Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) Module59000Name=Lợi nhuận -Module59000Desc=Mô-đun để quản lý lợi nhuận +Module59000Desc=Module quản lý lợi nhuận Module60000Name=Hoa hồng -Module60000Desc=Mô-đun để quản lý hoa hồng -Module150010Name=Số lô, ăn theo ngày và bán theo ngày -Module150010Desc=số lô, ăn theo ngày và bán theo quản lý ngày cho sản phẩm -Permission11=Đọc hóa đơn của khách hàng -Permission12=Tạo / chỉnh sửa hóa đơn khách hàng -Permission13=Hóa đơn khách hàng Unvalidate -Permission14=Xác nhận hoá đơn của khách hàng +Module60000Desc=Module quản lý hoa hồng +Permission11=Xem hóa đơn khách hàng +Permission12=Tạo/chỉnh sửa hóa đơn khách hàng +Permission13=Hóa đơn khách hàng chưa xác nhận +Permission14=Xác nhận hoá đơn khách hàng Permission15=Gửi hóa đơn khách hàng qua email -Permission16=Tạo hoá đơn thanh toán cho khách hàng -Permission19=Xóa hóa đơn của khách hàng -Permission21=Đọc đề xuất thương mại -Permission22=Tạo / sửa đổi đề xuất thương mại -Permission24=Xác nhận đề xuất thương mại -Permission25=Gửi đề nghị thương mại -Permission26=Đóng đề xuất thương mại -Permission27=Xóa đề xuất thương mại -Permission28=Xuất khẩu đề nghị thương mại -Permission31=Ðọc sản phẩm -Permission32=Tạo / chỉnh sửa sản phẩm +Permission16=Tạo thanh toán cho hoá đơn khách hàng +Permission19=Xóa hóa đơn khách hàng +Permission21=Xem đơn hàng đề xuất +Permission22=Tạo/chỉnh sửa đơn hàng đề xuất +Permission24=Xác nhận đơn hàng đề xuất +Permission25=Gửi đơn hàng đề xuất +Permission26=Đóng đơn hàng đề xuất +Permission27=Xóa đơn hàng đề xuất +Permission28=Xuất dữ liệu đơn hàng đề xuất +Permission31=Xem sản phẩm +Permission32=Tạo/chỉnh sửa sản phẩm Permission34=Xóa sản phẩm -Permission36=Xem / quản lý sản phẩm ẩn -Permission38=Export products -Permission41=Đọc các dự án (dự án được chia sẻ và các dự án tôi liên lạc) -Permission42=Tạo / sửa đổi dự án (dự án chung và các dự án tôi liên lạc) -Permission44=Xóa dự án (dự án chung và các dự án tôi liên lạc) -Permission61=Đọc can thiệp -Permission62=Tạo / chỉnh sửa can thiệp -Permission64=Xóa can thiệp -Permission67=Can thiệp xuất khẩu -Permission71=Thành viên đã đọc -Permission72=Tạo / thay đổi thành viên +Permission36=Xem/quản lý sản phẩm ẩn +Permission38=Xuất dữ liệu sản phẩm +Permission41=Xem dự án (dự án được chia sẻ và các dự án tôi nằm trong liên lạc) +Permission42=Tạo/chỉnh sửa dự án (dự án chung và các dự án tôi liên lạc) +Permission44=Xóa dự án (dự án chia sẻ và các dự án tôi liên lạc) +Permission61=Xem intervention +Permission62=Tạo/chỉnh sửa intervention +Permission64=Xóa intervention +Permission67=Xuất dữ liệu intervention +Permission71=Xem thành viên +Permission72=Tạo/chỉnh sửa thành viên Permission74=Xóa thành viên -Permission75=Setup types of membership -Permission76=Export datas -Permission78=Đọc đăng ký -Permission79=Tạo / sửa đổi đăng ký -Permission81=Xem đơn đặt hàng của khách hàng -Permission82=Tạo / sửa đổi đơn đặt hàng của khách hàng -Permission84=Xác nhận đơn đặt hàng cho khách hàng -Permission86=Gửi đơn đặt hàng cho khách hàng -Permission87=Đóng khách hàng đơn đặt hàng -Permission88=Hủy bỏ đơn đặt hàng khách hàng -Permission89=Xóa khách hàng đơn đặt hàng -Permission91=Đọc đóng góp xã hội và vat -Permission92=Tạo / sửa đổi các khoản đóng góp xã hội và vat -Permission93=Xóa đóng góp xã hội và vat -Permission94=Đóng góp xã hội xuất khẩu -Permission95=Đọc báo cáo -Permission101=Đọc sendings -Permission102=Tạo / sửa đổi sendings +Permission75=Cài đặt loại thành viên +Permission76=Xuất dữ liệu +Permission78=Xem thuê bao +Permission79=Tạo/sửa đổi thuê bao +Permission81=Xem đơn hàng khách hàng +Permission82=Tạo/chỉnh sửa đơn hàng khách hàng +Permission84=Xác nhận đơn hàng khách hàng +Permission86=Gửi đơn hàng khách hàng +Permission87=Đóng đơn hàng khách hàng +Permission88=Hủy bỏ đơn hàng khách hàng +Permission89=Xóa đơn hàng khách hàng +Permission91=Xem đóng góp xã hội và VAT +Permission92=Tạo/chỉnh sửa đóng góp xã hội và VAT +Permission93=Xóa đóng góp xã hội và VAT +Permission94=Xuất dữ liệu đóng góp xã hội +Permission95=Xem báo cáo +Permission101=Xem sendings +Permission102=Tạo/chỉnh sửa sendings Permission104=Xác nhận sendings -Permission106=Sendings xuất khẩu +Permission106=Xuất dữ liệu Sendings Permission109=Xóa sendings -Permission111=Đọc các tài khoản tài chính -Permission112=Tạo / sửa đổi / xóa và so sánh giao dịch -Permission113=Setup financial accounts (create, manage categories) -Permission114=Reconciliate transactions -Permission115=Các giao dịch xuất khẩu, báo cáo tài khoản +Permission111=Xem tài khoản tài chính +Permission112=Tạo/chỉnh sửa/xóa và so sánh giao dịch +Permission113=Cài đặt tài khoản tài chính (tạo, quản lý phân nhóm) +Permission114=Reconciliate giao dịch +Permission115=Xuất dữ liệu giao dịch và bảng kê tài khoản Permission116=Chuyển giữa các tài khoản Permission117=Quản lý việc gửi séc -Permission121=Đọc các bên thứ ba liên quan đến người sử dụng -Permission122=Tạo / chỉnh sửa các bên thứ ba liên quan đến người sử dụng -Permission125=Xóa các bên thứ ba liên quan đến người sử dụng -Permission126=Export third parties -Permission141=Đọc các dự án (cũng tin tôi không liên lạc với) -Permission142=Tạo / sửa đổi dự án (cũng tin tôi không liên lạc với) -Permission144=Xóa dự án (cũng tin tôi không liên lạc với) +Permission121=Xem bên thứ ba liên quan đến người dùng +Permission122=Tạo/chỉnh sửa bên thứ ba liên quan đến người dùng +Permission125=Xóa bên thứ ba liên quan đến người dùng +Permission126=Xuất dữ liệu bên thứ ba +Permission141=Xem dự án (cá nhân mà tôi không liên lạc với) +Permission142=Tạo/chỉnh sửa dự án (cá nhân mà tôi không liên lạc với) +Permission144=Xóa dự án (cá nhân mà tôi không liên lạc với) Permission146=Xem nhà cung cấp -Permission147=Đọc số liệu thống kê -Permission151=Đọc lệnh đứng -Permission152=Tạo / sửa đổi một yêu cầu đơn đặt hàng thường trực -Permission153=Đơn đặt hàng đứng truyền thu -Permission154=Tín dụng / từ chối đứng đơn đặt hàng biên lai -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=Đọc các chuyến đi và các chi phí (riêng và cấp dưới của mình) -Permission172=Tạo / chỉnh sửa các chuyến đi và các chi phí -Permission173=Xóa các chuyến đi và các chi phí -Permission174=Đọc tất cả các chuyến đi và các chi phí -Permission178=Xuất dữ liệu chuyến đi và chi phí -Permission180=Đọc cung cấp -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=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 -Permission192=Tạo dòng -Permission193=Hủy bỏ dòng -Permission194=Đọc những dòng băng thông +Permission147=Xem thống kê +Permission151=Xem ủy nhiệm chi +Permission152=Tạo/chỉnh sửa yêu cầu ủy nhiệm chi +Permission153=Chuyển giao chứng từ ủy nhiệm chi +Permission154=Ghi có/từ chối chứng từ ủy nhiệm chi +Permission161=Xem hợp đồng/thuê bao +Permission162=Tạo/chỉnh sửa hợp đồng/thuê bao +Permission163=Kích hoạt dịch vụ/thuê bao của hợp đồng +Permission164=Vô hiệu dịch vụ/thuê bao của hợp đồng +Permission165=Xóa hợp đồng/thuê bao +Permission171=Xem công tác phi (chính mình và cấp dưới của mình) +Permission172=Tạo/chỉnh sửa công tác phí +Permission173=Xóa công tác phí +Permission174=Xem tất cả các chuyến đi và các chi phí +Permission178=Xuất dữ liệu công tác phí +Permission180=Xem nhà cung cấp +Permission181=Xem đơn hàng nhà cung cấp +Permission182=Tạo/chỉnh sửa đơn hàng nhà cung cấp +Permission183=Xác nhận đơn hàng nhà cung cấp +Permission184=Phê duyệt đơn hàng nhà cung cấp +Permission185=Đặt hàng hoặc hủy bỏ đơn hàng nhà cung cấp +Permission186=Nhận đơn hàng nhà cung cấp +Permission187=Đóng đơn hàng nhà cung cấp +Permission188=Hủy bỏ đơn hàng nhà cung cấp +Permission192=Tạo dòng chi tiết +Permission193=Hủy bỏ dòng chi tiết +Permission194=Xem dòng băng thông Permission202=Tạo kết nối ADSL -Permission203=Kết nối để đơn đặt hàng -Permission204=Kết nối theo thứ tự +Permission203=Lệnh kết nối đơn hàng +Permission204=Lệnh kết nối Permission205=Quản lý kết nối -Permission206=Đọc kết nối -Permission211=Đọc điện thoại -Permission212=Dòng thứ tự -Permission213=Kích hoạt dòng -Permission214=Cài đặt điện thoại -Permission215=Các nhà cung cấp thiết lập -Permission221=Đọc emailings -Permission222=Tạo / sửa đổi emailings (đề, nhận ...) +Permission206=Xem kết nối +Permission211=Xem Telephony +Permission212=Chi tiết đơn hàng +Permission213=Kích hoạt dòng chi tiết +Permission214=Cài đặt Telephony +Permission215=Thiết lập nhà cung cấp +Permission221=Xem emailings +Permission222=Tạo/Chỉnh sửa emailings (tiêu đề, người nhận ...) Permission223=Xác nhận emailings (cho phép gửi) Permission229=Xóa emailings Permission237=Xem người nhận và các thông tin -Permission238=Tự gửi thư +Permission238=Gửi thư thủ công Permission239=Xóa thư sau khi xác nhận hoặc gửi -Permission241=Đã đọc chuyên mục -Permission242=Tạo / sửa đổi danh mục -Permission243=Xóa danh mục -Permission244=Xem nội dung của thể loại ẩn -Permission251=Đọc người dùng và các nhóm khác -PermissionAdvanced251=Ðọc những người dùng khác -Permission252=Đọc các điều khoản của người dùng khác -Permission253=Tạo / sửa đổi những người dùng khác, các nhóm và permisssions -PermissionAdvanced253=Tạo / thay đổi người sử dụng nội bộ / bên ngoài và cho phép -Permission254=Tạo / chỉnh sửa người dùng bên ngoài chỉ -Permission255=Thay đổi mật khẩu của những người dùng khác -Permission256=Xóa hoặc vô hiệu hóa những người dùng khác -Permission262=Mở rộng quyền truy cập vào tất cả các bên thứ ba (không phải chỉ có những người liên quan đến người sử dụng). Không có hiệu quả cho người dùng bên ngoài (luôn có giới hạn cho bản thân). -Permission271=CA đã đọc -Permission272=Đọc hóa đơn -Permission273=Hóa đơn phát hành -Permission281=Đọc địa chỉ liên lạc -Permission282=Tạo / chỉnh sửa địa chỉ liên lạc -Permission283=Xóa số liên lạc -Permission286=Xuất khẩu địa chỉ liên lạc -Permission291=Đọc thuế -Permission292=Thiết lập quyền truy cập vào các mức thuế -Permission293=Sửa đổi mức thuế costumers -Permission300=Đọc mã vạch -Permission301=Tạo / chỉnh sửa mã vạch +Permission241=Xem phân nhóm +Permission242=Tạo/chỉnh sửa phân nhóm +Permission243=Xóa phân nhóm +Permission244=Xem nội dung của phân nhóm ẩn +Permission251=Xem người dùng và nhóm khác +PermissionAdvanced251=Xem người dùng khác +Permission252=Xem phân quyền của người dùng khác +Permission253=Tạo/chỉnh sửa người dùng khác, nhóm và phân quyền +PermissionAdvanced253=Tạo/chỉnh sửa người sử dụng nội bộ / bên ngoài và phân quyền +Permission254=Tạo/chỉnh sửa chỉ người dùng bên ngoài +Permission255=Chỉnh sửa mật khẩu của người dùng khác +Permission256=Xóa hoặc vô hiệu người dùng khác +Permission262=Mở rộng quyền truy cập vào tất cả các bên thứ ba (không chỉ có những người liên quan đến người dùng). Không có hiệu quả cho người dùng bên ngoài (luôn có giới hạn cho nhóm này). +Permission271=Xem CA +Permission272=Xem hóa đơn +Permission273=Xuất hóa đơn +Permission281=Xem liên lạc +Permission282=Tạo/chỉnh sửa liên lạc +Permission283=Xóa liên lạc +Permission286=Xuất dữ liệu liên lạc +Permission291=Xem thuế +Permission292=Chỉnh phân quyền trên mức thuế +Permission293=Chính sửa mức thuế khách hàng +Permission300=Xem mã vạch +Permission301=Tạo/chỉnh sửa mã vạch Permission302=Xóa mã vạch -Permission311=Đọc dịch vụ -Permission312=Assign service/subscription to contract -Permission331=Đánh dấu đã đọc -Permission332=Tạo / chỉnh sửa bookmark -Permission333=Xóa dấu trang -Permission341=Đọc các điều khoản riêng của mình -Permission342=Tạo / chỉnh sửa thông tin người dùng của mình -Permission343=Thay đổi mật khẩu của mình -Permission344=Sửa đổi điều khoản riêng của mình -Permission351=Đọc thông tin nhóm -Permission352=Đọc thông tin về quyền của nhóm +Permission311=Xem dịch vụ +Permission312=Chỉ định dịch vụ/thuê bao cho hợp đồng +Permission331=Xem bookmark +Permission332=Tạo/chỉnh sửa bookmark +Permission333=Xóa bookmark +Permission341=Xem phân quyền của chính mình +Permission342=Tạo/chỉnh sửa thông tin người dùng của chính mình +Permission343=Thay đổi mật khẩu của chính mình +Permission344=Chỉnh sửa phân quyền chính mình +Permission351=Xem nhóm +Permission352=Xem phân quyền của nhóm Permission353=Tạo / sửa đổi nhóm -Permission354=Xóa hoặc vô hiệu hóa các nhóm +Permission354=Xóa hoặc vô hiệu nhóm Permission358=Xuất dữ liệu người dùng -Permission401=Ðọc thông tin giảm giá -Permission402=Tạo / sửa đổi giảm giá +Permission401=Xem giảm giá +Permission402=Tạo/chỉnh sửa giảm giá Permission403=Xác nhận giảm giá Permission404=Xóa giảm giá -Permission510=Đọc Lương -Permission512=Tạo / sửa đổi tiền lương +Permission510=Xem lương +Permission512=Tạo/chỉnh sửa 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ụ +Permission517=Xuất dữ liệu lương +Permission520=Xem cho vay +Permission522=Tạo/Chỉnh sửa cho vay +Permission524=Xóa cho vay +Permission525=Truy cập tính toán cho vay +Permission527=Xuất dữ liệu cho vay +Permission531=Xem dịch vụ +Permission532=Tạo/chỉnh sửa dịch vụ Permission534=Xóa dịch vụ -Permission536=Xem / quản lý dịch vụ ẩn +Permission536=Xem/quản lý dịch vụ ẩn 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 +Permission702=Tạo/sửa đổi Tài trợ 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 -Permission1004=Đọc chuyển động tồn kho -Permission1005=Tạo / sửa đổi chuyển động tồn kho -Permission1101=Đọc lệnh giao hàng -Permission1102=Tạo / chỉnh sửa lệnh giao hàng -Permission1104=Xác nhận lệnh giao hàng -Permission1109=Xóa lệnh giao hàng -Permission1181=Đọc thông tin Nhà cung cấp -Permission1182=Đọc đơn đặt hàng nhà cung cấp -Permission1183=Tạo / chỉnh sửa đơn đặt hàng nhà cung cấp -Permission1184=Xác nhận đơn đặt hàng nhà cung cấp -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 -Permission1232=Tạo / chỉnh sửa hóa đơn nhà cung cấp +Permission771=Xem báo cáo chi phí (chính mình và người phụ thuộc) +Permission772=Tạo/chỉnh sửa báo cáo chi phí +Permission773=Xóa báo cáo chi phí +Permission774=Đọc tất cả báo cáo chi phí (ngay cả người dùng không phụ thuộc) +Permission775=Duyệt báo cáo chi phí +Permission776=Báo cáo thanh toán chi phí +Permission779=Xuất dữ liệu báo cáo chi phí +Permission1001=Xem tồn kho +Permission1002=Tạo/chỉnh sửa Kho hàng +Permission1003=Xóa kho hàng +Permission1004=Xem thay đổi tồn kho +Permission1005=Tạo/chỉnh sửa thay đổi tồn kho +Permission1101=Xem phiếu xuất kho +Permission1102=Tạo/chỉnh sửa phiếu xuất kho +Permission1104=Xác nhận phiếu xuất kho +Permission1109=Xóa phiếu xuất kho +Permission1181=Xem nhà cung cấp +Permission1182=Xem đơn hàng nhà cung cấp +Permission1183=Tạo/chỉnh sửa đơn hàng nhà cung cấp +Permission1184=Xác nhận đơn hàng nhà cung cấp +Permission1185=Phê duyệt đơn hàng nhà cung cấp +Permission1186=Đặt hàng đơn hàng nhà cung cấp +Permission1187=Xác nhận đã nhận đơn hàng nhà cung cấp +Permission1188=Xóa đơn hàng nhà cung cấp +Permission1190=Duyệt (lần hai) đơn hàng nhà cung cấp +Permission1201=Nhận kết quả của xuất dữ liệu +Permission1202=Tạo/chỉnh sửa đổi xuất dữ liệu +Permission1231=Xem hóa đơn nhà cung cấp +Permission1232=Tạo/chỉnh sửa hóa đơn nhà cung cấp Permission1233=Xác nhận hoá đơn nhà cung cấp Permission1234=Xóa hóa đơn nhà cung cấp Permission1235=Gửi hóa đơn nhà cung cấp qua email -Permission1236=Nhà cung cấp xuất hóa đơn, thuộc tính và thanh toán -Permission1237=Đơn đặt hàng nhà cung cấp xuất khẩu và chi tiết của họ -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=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 +Permission1236=Xuất dữ liệu hóa đơn nhà cung cấp, thuộc tính và thanh toán +Permission1237=Xuất dữ liệu đơn hàng nhà cung cấp và chi tiết của nó +Permission1251=Chạy nhập dữ liệu khối cho 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 khách hàng, các thuộc tính và thanh toán +Permission1421=Xuất dữ liệu Đơn hàng và các thuộc tính +Permission23001=Xem công việc theo lịch trình +Permission23002=Tạo/cập nhật công việc theo lịch trình +Permission23003=Xóa công việc theo lịch trình +Permission23004=Thực thi công việc theo lịch trình +Permission2401=Xem 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/chỉnh sửa 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 -Permission2411=Đọc hành động (sự kiện hay tác vụ) của người khác -Permission2412=Tạo / sửa đổi các hành động (sự kiện hay tác vụ) của người khác +Permission2411=Xem hành động (sự kiện hay tác vụ) của người khác +Permission2412=Tạo/chỉnh sửa hành động (sự kiện hay tác vụ) của người khác Permission2413=Xóa hành động (sự kiện hay tác vụ) của người khác -Permission2501=Đọc / Tải tài liệu +Permission2501=Xem/Tải về tài liệu Permission2502=Tải về tài liệu -Permission2503=Nộp hoặc xóa tài liệu -Permission2515=Tài liệu thiết lập các thư mục -Permission2801=Sử dụng FTP client trong chế độ đọc (duyệt và chỉ tải về) +Permission2503=Gửi hoặc xóa tài liệu +Permission2515=Cài đặt thư mục tài liệu +Permission2801=Sử dụng FTP client trong chế độ đọc (chỉ duyệt và tải về) Permission2802=Sử dụng FTP client trong chế độ ghi (xóa hoặc tải lên các tập tin) Permission50101=Sử dụng điểm bán hàng -Permission50201=Đọc các giao dịch -Permission50202=Các giao dịch nhập khẩu +Permission50201=Xem giao dịch +Permission50202=Giao dịch nhập dữ liệu Permission54001=In -Permission55001=Đọc các cuộc thăm dò -Permission55002=Tạo / sửa đổi các cuộc thăm dò -Permission59001=Đọc lợi nhuận thương mại +Permission55001=Xem các thăm dò +Permission55002=Tạo/chỉnh sửa các thăm dò +Permission59001=Xem lợi nhuận thương mại Permission59002=Xác định lợi nhuận thương mại -Permission59003=Read every user margin -DictionaryCompanyType=Thirdparties loại -DictionaryCompanyJuridicalType=Các loại pháp nhân của thirdparties -DictionaryProspectLevel=Triển vọng mức tiềm năng -DictionaryCanton=Nhà nước / Cantons -DictionaryRegion=Khu vực -DictionaryCountry=Nước -DictionaryCurrency=Đơn vị tiền tệ -DictionaryCivility=Tiêu đề lịch sự +Permission59003=Xem lợi nhuận mỗi người dùng +DictionaryCompanyType=Loại bên thứ ba +DictionaryCompanyJuridicalType=Loại pháp nhân của bên thứ ba +DictionaryProspectLevel=Mức khách hàng tiềm năng +DictionaryCanton=State/Cantons +DictionaryRegion=Vùng +DictionaryCountry=Quốc gia +DictionaryCurrency=Tiền tệ +DictionaryCivility=Civility title DictionaryActions=Loại sự kiện chương trình nghị sự -DictionarySocialContributions=Các loại đóng góp xã hội -DictionaryVAT=Giá thuế GTGT, thuế tiêu thụ giá -DictionaryRevenueStamp=Số tiền tem doanh thu +DictionarySocialContributions=Loại đóng góp xã hội +DictionaryVAT=Tỉ suất VAT hoặc Tỉ xuất thuế bán hàng +DictionaryRevenueStamp=Số tiền phiếu doanh thu DictionaryPaymentConditions=Điều khoản thanh toán DictionaryPaymentModes=Phương thức thanh toán -DictionaryTypeContact=Liên hệ / loại Địa chỉ +DictionaryTypeContact=Loại Liên lạc/Địa chỉ DictionaryEcotaxe=Ecotax (WEEE) DictionaryPaperFormat=Định dạng giấy DictionaryFees=Loại phí -DictionarySendingMethods=Phương pháp vận chuyển +DictionarySendingMethods=Phương thức vận chuyển DictionaryStaff=Nhân viên -DictionaryAvailability=Chậm trễ giao hàng -DictionaryOrderMethods=Phương pháp đặt hàng -DictionarySource=Nguồn gốc của các đề xuất / đơn đặt hàng +DictionaryAvailability=Trì hoãn giao hàng +DictionaryOrderMethods=Phương thức đặt hàng +DictionarySource=Chứng từ gốc của đơn hàng đề xuất/đơn hàng DictionaryAccountancyplan=Biểu đồ tài khoản -DictionaryAccountancysystem=Mô hình biểu đồ của tài khoản -DictionaryEMailTemplates=Emails templates -SetupSaved=Thiết lập lưu -BackToModuleList=Trở lại danh sách các mô-đun +DictionaryAccountancysystem=Kiểu biểu đồ tài khoản +DictionaryEMailTemplates=Mẫu email +SetupSaved=Cài đặt đã lưu +BackToModuleList=Trở lại danh sách module BackToDictionaryList=Trở lại danh sách từ điển VATReceivedOnly=Tỷ lệ đặc biệt không bị tính phí -VATManagement=Quản lý thuế GTGT -VATIsUsedDesc=Thuế suất thuế GTGT theo mặc định khi tạo ra triển vọng, hóa đơn, đơn đặt hàng vv theo các quy tắc tiêu chuẩn hoạt động:
Nếu người bán không phải chịu thuế GTGT, sau đó thuế GTGT theo mặc định = 0. Kết thúc quy tắc.
Nếu (bán nước = mua nước), sau đó thuế GTGT theo mặc định = thuế GTGT của sản phẩm trong nước bán. Kết thúc quy tắc.
Nếu người bán và người mua trong cộng đồng và hàng hóa châu Âu là những sản phẩm giao thông (ô tô, tàu, máy bay), thuế GTGT mặc định = 0 (Thuế GTGT phải được thanh toán của người mua tại customoffice của đất nước của mình và không ít người bán). Kết thúc quy tắc.
Nếu người bán và người mua trong Cộng đồng châu Âu và người mua không phải là một công ty, sau đó thuế GTGT theo mặc định = thuế GTGT của sản phẩm bán ra. Kết thúc quy tắc.
Nếu người bán và người mua trong Cộng đồng châu Âu và người mua là một công ty, sau đó thuế GTGT theo mặc định = 0. Kết thúc quy tắc.
Thuế GTGT khác đề xuất mặc định = 0. Kết thúc quy tắc. -VATIsNotUsedDesc=Theo mặc định, đề xuất thuế GTGT là 0 có thể được sử dụng cho các trường hợp như các hiệp hội, cá nhân ou công ty nhỏ. -VATIsUsedExampleFR=Ở Pháp, nó có nghĩa là các công ty, tổ chức có một hệ thống tài chính thực (giản thể thực sự hay bình thường thực tế). Một hệ thống trong đó thuế GTGT đã kê khai. -VATIsNotUsedExampleFR=Ở Pháp, nó có nghĩa là hiệp hội được khai báo không thuế VAT hoặc các công ty, tổ chức, nghề nghiệp tự do đã lựa chọn hệ thống tài chính doanh nghiệp nhỏ (VAT trong nhượng quyền thương mại) và nộp thuế GTGT nhượng quyền thương mại mà không có bất kỳ kê khai thuế GTGT. Lựa chọn này sẽ hiển thị các tài liệu tham khảo "không được áp dụng thuế GTGT - nghệ thuật-293B của CGI" trên hoá đơn. +VATManagement=Quản lý thuế 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. +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=Tỷ giá -LocalTax1IsUsed=Thuế sử dụng thứ hai -LocalTax1IsNotUsed=Không sử dụng thuế thứ hai -LocalTax1IsUsedDesc=Sử dụng một loại thứ hai của thuế (trừ thuế GTGT) -LocalTax1IsNotUsedDesc=Không sử dụng các loại thuế khác (trừ thuế GTGT) -LocalTax1Management=Loại thứ hai của thuế +LTRate=Tỷ suất +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=Thuế sử dụng thứ ba -LocalTax2IsNotUsed=Không sử dụng thuế thứ ba -LocalTax2IsUsedDesc=Sử dụng một loại thứ ba của thuế (trừ thuế GTGT) -LocalTax2IsNotUsedDesc=Không sử dụng các loại thuế khác (trừ thuế GTGT) -LocalTax2Management=Loại thứ ba của thuế +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= Quản lý RE -LocalTax1IsUsedDescES= Tỷ lệ RE theo mặc định khi tạo ra triển vọng, hóa đơn, đơn đặt hàng vv theo các quy tắc tiêu chuẩn hoạt động:
Nếu te mua không chịu RE, RE mặc định = 0. Kết thúc quy tắc.
Nếu người mua là đối tượng của RE thì RE theo mặc định. Kết thúc quy tắc.
-LocalTax1IsNotUsedDescES= Theo mặc định, RE đề xuất là 0 Kết thúc quy tắc. -LocalTax1IsUsedExampleES= Tại Tây Ban Nha họ là các chuyên gia phụ thuộc vào một số phần cụ thể của các IAE Tây Ban Nha. -LocalTax1IsNotUsedExampleES= Tại Tây Ban Nha họ rất chuyên nghiệp và xã hội và có thể phần nào đó của IAE Tây Ban Nha. -LocalTax2ManagementES= Quản lý IRPF -LocalTax2IsUsedDescES= Tỷ lệ RE theo mặc định khi tạo ra triển vọng, hóa đơn, đơn đặt hàng vv theo các quy tắc tiêu chuẩn hoạt động:
Nếu người bán không chịu IRPF, sau đó IRPF theo mặc định = 0. Kết thúc quy tắc.
Nếu người bán phải chịu IRPF thì IRPF theo mặc định. Kết thúc quy tắc.
-LocalTax2IsNotUsedDescES= Theo mặc định, IRPF đề xuất là 0 Kết thúc quy tắc. -LocalTax2IsUsedExampleES= Tại Tây Ban Nha, dịch giả tự do và các chuyên gia độc lập cung cấp dịch vụ và các công ty đã chọn hệ thống thuế của mô-đun. -LocalTax2IsNotUsedExampleES= Tại Tây Ban Nha họ Bussines không phụ thuộc vào hệ thống thuế của mô-đun. -CalcLocaltax=Báo cáo -CalcLocaltax1ES=Bán - mua -CalcLocaltax1Desc=Thuế địa phương báo cáo được tính toán với sự khác biệt giữa localtaxes bán hàng và mua hàng localtaxes -CalcLocaltax2ES=Mua -CalcLocaltax2Desc=Thuế địa phương báo cáo là tổng của localtaxes mua -CalcLocaltax3ES=Bán hàng -CalcLocaltax3Desc=Thuế địa phương báo cáo là tổng của localtaxes bán hàng -LabelUsedByDefault=Nhãn được sử dụng bởi mặc định nếu không có bản dịch có thể được tìm thấy mã +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=Báo cáo thuế địa phương +CalcLocaltax1=Bán - Mua +CalcLocaltax1Desc=Báo cáo Thuế địa phương được tính toán với sự khác biệt giữa localtaxes bán hàng và mua hàng localtaxes +CalcLocaltax2=Mua +CalcLocaltax2Desc=Báo cáo Thuế địa phương là tổng của localtaxes mua +CalcLocaltax3=Bán +CalcLocaltax3Desc=Báo cáo Thuế địa phương là tổng của localtaxes bán hàng +LabelUsedByDefault=Nhãn được sử dụng bởi mặc định nếu không có bản dịch có thể được tìm thấy với code đó LabelOnDocuments=Nhãn trên các tài liệu -NbOfDays=Nb ngày +NbOfDays=Nb của ngày AtEndOfMonth=Vào cuối tháng -Offset=Bù đắp -AlwaysActive=Luôn luôn hoạt động -UpdateRequired=Hệ thống của bạn cần được cập nhật. Để làm điều này, bấm vào Update now . +Offset=Offset +AlwaysActive=Luôn hoạt động +UpdateRequired=Your system needs to be updated. To do this, click on Update now. Upgrade=Nâng cấp MenuUpgrade=Nâng cấp / Mở rộng AddExtensionThemeModuleOrOther=Thêm phần mở rộng (chủ đề, mô-đun, ...) WebServer=Máy chủ Web DocumentRootServer=Thư mục gốc của máy chủ Web -DataRootServer=Dữ liệu thư mục tập tin +DataRootServer=Thư mục file dữ liệu IP=IP -Port=Cảng +Port=Port VirtualServerName=Tên máy chủ ảo AllParameters=Tất cả các thông số OS=Hệ điều hành PhpEnv=Env -PhpModules=Module +PhpModules=Modules PhpConf=Conf -PhpWebLink=Liên kết web Php +PhpWebLink=Web-Php link Pear=Pear -PearPackages=Gói lê +PearPackages=Pear Packages Browser=Trình duyệt Server=Máy chủ Database=Cơ sở dữ liệu DatabaseServer=Máy chủ cơ sở dữ liệu DatabaseName=Tên cơ sở dữ liệu DatabasePort=Cổng cơ sở dữ liệu -DatabaseUser=Cơ sở dữ liệu người dùng -DatabasePassword=Cơ sở dữ liệu mật khẩu -DatabaseConfiguration=Thiết lập cơ sở dữ liệu -Tables=Bàn +DatabaseUser=Người dùng cơ sở dữ liệu +DatabasePassword=Mật khẩu cơ sở dữ liệu +DatabaseConfiguration=Cài đặt cơ sở dữ liệu +Tables=Bảng TableName=Tên bảng TableLineFormat=Định dạng dòng -NbOfRecord=Nb hồ sơ -Constraints=Hạn chế -ConstraintsType=Hạn chế loại -ConstraintsToShowOrNotEntry=Hạn chế để hiển thị hoặc không phải là mục trình đơn +NbOfRecord=Nb của bản ghi +Constraints=Rang buộc +ConstraintsType=Loại ràng buộc +ConstraintsToShowOrNotEntry=Rang buộc để hiển thị hoặc không menu nhập liệu AllMustBeOk=Tất cả những điều này phải được kiểm tra Host=Máy chủ -DriverType=Loại điều khiển -SummarySystem=Hệ thống thông tin tóm tắt +DriverType=Driver type +SummarySystem=Tóm tắt thông tin hệ thống SummaryConst=Danh sách của tất cả các thông số cài đặt Dolibarr SystemUpdate=Cập nhật hệ thống -SystemSuccessfulyUpdate=Hệ thống của bạn đã được cập nhật successfuly -MenuCompanySetup=Công ty / cơ sở +SystemSuccessfulyUpdate=Hệ thống của bạn đã được cập nhật thành công +MenuCompanySetup=Công ty/Tổ chức MenuNewUser=Người dùng mới MenuTopManager=Quản lý menu phía trên MenuLeftManager=Quản lý menu bên trái MenuManager=Quản lý menu -MenuSmartphoneManager=Quản lý đơn điện thoại thông minh +MenuSmartphoneManager=Quản lý menu smartphone DefaultMenuTopManager=Quản lý menu phía trên DefaultMenuLeftManager=Quản lý menu bên trái DefaultMenuManager= Quản lý menu chuẩn -DefaultMenuSmartphoneManager=Quản lý menu điện thoại thông minh -Skin=Skin chủ đề -DefaultSkin=Giao diện mặc định da -MaxSizeList=Max length cho danh sách -DefaultMaxSizeList=Mặc định chiều dài tối đa cho danh sách +DefaultMenuSmartphoneManager=Quản lý menu smartphone +Skin=Chủ đề giao diện +DefaultSkin=Chủ đề giao diện mặc định +MaxSizeList=Chiều dài tối đa cho danh sách +DefaultMaxSizeList=Chiều dài tối đa mặc định cho danh sách MessageOfDay=Tin trong ngày MessageLogin=Tin trang đăng nhập -PermanentLeftSearchForm=Hình thức tìm kiếm thường xuyên trên menu bên trái +PermanentLeftSearchForm=Forrm tìm kiếm cố định trên menu bên trái DefaultLanguage=Ngôn ngữ mặc định để sử dụng (mã ngôn ngữ) EnableMultilangInterface=Kích hoạt giao diện đa ngôn ngữ -EnableShowLogo=Hiển thị biểu tượng trên menu bên trái +EnableShowLogo=Hiển thị logo trên menu bên trái EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) SystemSuccessfulyUpdated=Hệ thống của bạn đã được cập nhật thành công -CompanyInfo=Thông tin Công ty / cơ sở -CompanyIds=Xác định Công ty/ Cơ sở +CompanyInfo=Thông tin Công ty/Tổ chức +CompanyIds=Xác định Công ty/Tổ chức CompanyName=Tên CompanyAddress=Địa chỉ CompanyZip=Zip -CompanyTown=Town -CompanyCountry=Đất nước +CompanyTown=Thành phố +CompanyCountry=Quốc gia CompanyCurrency=Tiền tệ chính Logo=Logo DoNotShow=Không hiển thị DoNotSuggestPaymentMode=Không đề nghị NoActiveBankAccountDefined=Không có tài khoản ngân hàng hoạt động được xác định -OwnerOfBankAccount=Chủ sở hữu của tài khoản ngân hàng%s -BankModuleNotActive=Ngân hàng mô-đun tài khoản chưa được kích hoạt -ShowBugTrackLink=Hiển thị liên kết "Báo cáo một lỗi" -ShowWorkBoard=Xem "bàn làm việc" trên trang chủ +OwnerOfBankAccount=Chủ sở hữu của tài khoản ngân hàng %s +BankModuleNotActive=Module tài khoản ngân hàng chưa được mở +ShowBugTrackLink=Hiển thị liên kết "Báo cáo lỗi" +ShowWorkBoard=Xem "workbench" trên trang chủ Alerts=Cảnh báo -Delays=Sự chậm trễ -DelayBeforeWarning=Chậm trễ trước khi cảnh báo -DelaysBeforeWarning=Sự chậm trễ trước khi cảnh báo -DelaysOfToleranceBeforeWarning=Sự chậm trễ khoan dung trước khi cảnh báo -DelaysOfToleranceDesc=Màn hình này cho phép bạn xác định sự chậm trễ trước khi chấp nhận một cảnh báo được báo cáo trên màn hình với Picto%s cho mỗi phần tử cuối. -Delays_MAIN_DELAY_ACTIONS_TODO=Trì hoãn khoan dung (trong ngày) trước khi cảnh báo về các sự kiện theo kế hoạch chưa thực hiện -Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Trì hoãn khoan dung (trong ngày) trước khi cảnh báo về đơn đặt hàng chưa qua chế biến -Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Trì hoãn khoan dung (trong ngày) trước khi cảnh báo các nhà cung cấp đơn đặt hàng chưa qua chế biến -Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Trì hoãn khoan dung (trong ngày) trước khi cảnh báo về các đề xuất để đóng -Delays_MAIN_DELAY_PROPALS_TO_BILL=Trì hoãn khoan dung (trong ngày) trước khi cảnh báo về các đề xuất không hóa đơn -Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Chậm trễ khoan dung (trong ngày) trước khi cảnh báo về dịch vụ để kích hoạt -Delays_MAIN_DELAY_RUNNING_SERVICES=Chậm trễ khoan dung (trong ngày) trước khi cảnh báo về dịch vụ hết hạn -Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Chậm trễ khoan dung (trong ngày) trước khi cảnh báo về hóa đơn chưa thanh toán nhà cung cấp -Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Chậm trễ khoan dung (trong ngày) trước khi cảnh báo về hóa đơn chưa thanh toán của khách hàng -Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Chậm trễ khoan dung (trong ngày) trước khi cảnh báo về cấp phát ngân hàng hòa giải -Delays_MAIN_DELAY_MEMBERS=Chậm trễ khoan dung (trong ngày) trước khi cảnh báo về lệ phí thành viên bị trì hoãn -Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Chậm trễ khoan dung (trong ngày) trước khi cảnh báo đối với tiền gửi kiểm tra để làm -SetupDescription1=Tất cả các thông số có sẵn trong khu vực thiết lập cho phép bạn thiết lập Dolibarr trước khi bắt đầu sử dụng nó. -SetupDescription2=2 bước thiết lập quan trọng nhất là 2 người đầu tiên trong menu cài đặt bên trái, điều này có nghĩa là công ty / cơ sở trang thiết lập và cài đặt module trang: -SetupDescription3=Các thông số trong menu Setup -> Công ty / cơ sở được yêu cầu bởi vì các thông tin đầu vào được sử dụng trên Dolibarr hiển thị và chỉnh sửa Dolibarr hành vi (ví dụ cho các tính năng liên quan đến đất nước của bạn). -SetupDescription4=Các thông số trong menu Setup -> module được yêu cầu bởi vì Dolibarr không phải là một hệ thống ERP / CRM cố định nhưng một số tiền của một số mô-đun, tất cả ít nhiều độc lập. Nó chỉ sau khi kích hoạt module bạn thú vị trong đó bạn sẽ thấy các tính năng xuất hiện trong menu. -SetupDescription5=Mục trình đơn khác quản lý các thông số tùy chọn. -EventsSetup=Thiết lập cho các sự kiện nhật ký +Delays=Trì hoãn +DelayBeforeWarning=Trì hoãn trước cảnh báo +DelaysBeforeWarning=Trì hoãn trước cảnh báo +DelaysOfToleranceBeforeWarning=Khoảng trì hoãn trước cảnh báo +DelaysOfToleranceDesc=Màn hình này cho phép bạn xác định trì hoãn trước khi chấp nhận một cảnh báo được báo cáo trên màn hình với Picto %s cho mỗi phần tử cuối. +Delays_MAIN_DELAY_ACTIONS_TODO=Khoảng trì hoãn (theo ngày) trước khi cảnh báo về các sự kiện theo kế hoạch chưa thực hiện +Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Khoảng trì hoãn (theo ngày) trước khi cảnh báo về đơn hàng chưa được xử lý +Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Khoảng trì hoãn (theo ngày) trước khi cảnh báo trên đơn hàng nhà cung cấp chưa được xử lý +Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Khoảng trì hoãn (theo ngày) trước khi cảnh báo về đơn hàng đề xuất để đóng +Delays_MAIN_DELAY_PROPALS_TO_BILL=Khoảng trì hoãn (theo ngày) trước khi cảnh báo về đơn hàng đề xuất không ra hóa đơn +Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Khoảng trì hoãn (theo ngày) trước khi cảnh báo về dịch vụ để kích hoạt +Delays_MAIN_DELAY_RUNNING_SERVICES=Khoảng trì hoãn (theo ngày) trước khi cảnh báo về dịch vụ hết hạn +Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Khoảng trì hoãn (theo ngày) trước khi cảnh báo về hóa đơn chưa thanh toán nhà cung cấp +Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Khoảng trì hoãn (theo ngày) trước khi cảnh báo về hóa đơn chưa thanh toán của khách hàng +Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Khoảng trì hoãn (theo ngày) trước khi cảnh báo về pending bank reconciliation +Delays_MAIN_DELAY_MEMBERS=Khoảng trì hoãn (theo ngày) trước khi cảnh báo về lệ phí thành viên bị trì hoãn +Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Khoảng trì hoãn (theo ngày) trước khi cảnh báo đối với séc ứng trước để làm +SetupDescription1=Tất cả các thông số có sẵn trong khu vực cài đặt cho phép bạn thiết lập Dolibarr trước khi bắt đầu sử dụng nó. +SetupDescription2=2 bước thiết lập quan trọng nhất là 2 mục đầu tiên trong menu cài đặt bên trái, điều này có nghĩa là cài đặt mục Công ty/tổ chức và cài đặt mục Module: +SetupDescription3=Các thông số trong menu Cài đặt -> Công ty/Tổ chức được yêu cầu bởi vì các thông tin đầu vào được sử dụng trên Dolibarr hiển thị và chỉnh sửa hành vi Dolibarr (ví dụ cho các tính năng liên quan đến quốc gia của bạn). +SetupDescription4=Các thông số trong menu Cài đặt -> module được yêu cầu bởi vì Dolibarr không phải là một hệ thống ERP / CRM cố định nhưng tổng của một số mô-đun, tất cả ít nhiều độc lập. Chỉ sau khi kích hoạt module bạn sẽ thấy các tính năng xuất hiện trong menu. +SetupDescription5=Thông số tùy chọn quản lý thông tin menu đầu vào khác +EventsSetup=Cài đặt cho các sự kiện nhật trình LogEvents=Sự kiện kiểm toán bảo mật Audit=Kiểm toán InfoDolibarr=Infos Dolibarr InfoBrowser=Infos trình duyệt InfoOS=Infos hệ điều hành InfoWebServer=Infos máy chủ web -InfoDatabase=Cơ sở dữ liệu Infos +InfoDatabase=Infos Cơ sở dữ liệu InfoPHP=Infos PHP -InfoPerf=Infos biểu diễn +InfoPerf=Infos trình diễn BrowserName=Tên trình duyệt BrowserOS=Trình duyệt hệ điều hành ListEvents=Sự kiện kiểm toán ListOfSecurityEvents=Danh sách các sự kiện bảo mật Dolibarr -SecurityEventsPurged=Sự kiện bảo mật thanh lọc -LogEventDesc=Bạn có thể kích hoạt ở đây khai thác gỗ cho các sự kiện an ninh Dolibarr. Sau đó các quản trị viên có thể xem nội dung của nó thông qua các công cụ hệ thống menu - Kiểm toán. Cảnh báo, tính năng này có thể tiêu thụ một lượng lớn dữ liệu trong cơ sở dữ liệu. +SecurityEventsPurged=Sự kiện bảo mật được thanh lọc +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=Những tính năng này có thể được sử dụng bởi những người dùng quản trị. -SystemInfoDesc=Hệ thống thông tin là thông tin kỹ thuật linh tinh bạn nhận được trong chế độ chỉ đọc và nhìn thấy chỉ quản trị viên. -SystemAreaForAdminOnly=Khu vực này hiện có sẵn cho những người dùng quản trị. Không ai trong số các điều khoản Dolibarr có thể làm giảm giới hạn này. -CompanyFundationDesc=Chỉnh sửa trên trang này được biết tất cả thông tin của công ty hoặc nền tảng bạn cần quản lý (Đối với điều này, nhấn vào nút "Sửa đổi" ở dưới cùng của trang) +SystemInfoDesc=Hệ thống thông tin là thông tin kỹ thuật linh tinh bạn nhận được trong chế độ chỉ đọc và có thể nhìn thấy chỉ cho quản trị viên. +SystemAreaForAdminOnly=Khu vực này hiện có sẵn cho những người dùng quản trị. Không ai trong số phân quyền Dolibarr có thể làm giảm giới hạn này. +CompanyFundationDesc=Chỉnh sửa trên trang này được biết tất cả thông tin của công ty hoặc tổ chức bạn cần quản lý (Đối với điều này, nhấn vào nút "Chỉnh sửa" ở dưới cùng của trang) DisplayDesc=Bạn có thể chọn từng thông số liên quan đến Dolibarr nhìn và cảm thấy ở đây -AvailableModules=Các mô-đun có sẵn -ToActivateModule=Để kích hoạt mô-đun, đi vào thiết lập trong khu vực (chủ-> Setup-> Modules). -SessionTimeOut=Thời gian cho phiên -SessionExplanation=Bảo lãnh này con số đó sẽ không bao giờ hết hạn phiên trước sự chậm trễ này, nếu phiên sạch được thực hiện bằng nội PHP phiên sạch hơn (và không có gì khác). Nội phiên PHP sạch hơn không làm bảo lãnh rằng phiên sẽ hết hiệu lực ngay sau khi sự chậm trễ này. Nó sẽ hết hạn, sau khi sự chậm trễ này, và khi phiên sạch hơn là chạy, vì vậy mỗi%s /% s truy cập, nhưng chỉ trong thời gian truy cập được thực hiện bởi các phần khác.
Lưu ý: trên một số máy chủ với một cơ chế phiên làm sạch bên ngoài (cron dưới Debian, Ubuntu ...), các phiên giao dịch có thể bị phá hủy sau một thời gian được xác định bởi session.gc_maxlifetime mặc định, không có vấn đề gì giá trị nhập ở đây. -TriggersAvailable=Kích hoạt sẵn -TriggersDesc=Gây nên là các tập tin mà sẽ thay đổi hành vi của Dolibarr quy trình làm việc một lần sao chép vào thư mục htdocs / core / gây nên. Họ nhận ra những hành động mới, kích hoạt các sự kiện Dolibarr (công ty mới thành lập, xác nhận hóa đơn, ...). -TriggerDisabledByName=Gây ra trong tập tin này đang bị vô hiệu hóa bởi các hậu tố -NORUN trong tên của họ. -TriggerDisabledAsModuleDisabled=Gây ra trong tập tin này bị vô hiệu hóa như mô-đun%s bị vô hiệu hóa. -TriggerAlwaysActive=Gây ra trong tập tin này luôn hoạt động, nào là các mô-đun Dolibarr kích hoạt. -TriggerActiveAsModuleActive=Triggers trong tập tin này đang hoạt động như mô-đun%s được kích hoạt. -GeneratedPasswordDesc=Xác định đây mà cai trị mà bạn muốn sử dụng để tạo mật khẩu mới nếu bạn hỏi có tự động tạo ra mật khẩu -DictionaryDesc=Xác định đây tất cả dữ liệu ngay tài liệu tham khảo. Bạn có thể hoàn thành được xác định trước giá trị với bạn. -ConstDesc=Trang này cho phép bạn chỉnh sửa tất cả các thông số khác không có sẵn trong các trang trước đó. Họ được dành riêng cho các nhà phát triển các thông số cao cấp hoặc cho troubleshouting. -OnceSetupFinishedCreateUsers=Cảnh báo, bạn là một người dùng quản trị Dolibarr. Người sử dụng quản trị viên được sử dụng để thiết lập Dolibarr. Đối với một cách sử dụng thông thường của Dolibarr, nó được khuyến khích sử dụng một người dùng không quản trị được tạo ra từ người sử dụng và đơn Groups. -MiscellaneousDesc=Xác định đây tất cả các thông số khác liên quan đến an ninh. -LimitsSetup=Giới hạn / thiết lập chính xác -LimitsDesc=Bạn có thể xác định giới hạn, độ chính xác và tối ưu hoá được sử dụng bởi Dolibarr đây -MAIN_MAX_DECIMALS_UNIT=Max số thập phân cho đơn giá -MAIN_MAX_DECIMALS_TOT=Max số thập phân cho tổng giá +AvailableModules=Module có sẵn +ToActivateModule=Để kích hoạt mô-đun, đi vào Cài đặt Khu vực (Nhà-> Cài đặt-> 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=Trigger có sẵn +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=Xác định đây là quy tắc mà bạn muốn sử dụng để tạo mật khẩu mới nếu bạn yêu cầu tạo ra mật khẩu tự động +DictionaryDesc=Xác định đây tất cả dữ liệu tham chiếu. Bạn có thể hoàn thành giá trị được xác định trước của bạn. +ConstDesc=Trang này cho phép bạn chỉnh sửa tất cả các thông số khác không có sẵn trong các trang trước đó. Chúng được dành riêng thông số cho các nhà phát triển nâng cao hoặc cho troubleshouting. +OnceSetupFinishedCreateUsers=Cảnh báo, bạn là một người dùng quản trị Dolibarr. Người dùng quản trị để cài đặt Dolibarr. Đối với một cách sử dụng thông thường của Dolibarr, nó được khuyến khích sử dụng một người dùng không quản trị được tạo ra từ menu người dùng và nhóm +MiscellaneousDesc=Xác định đây tất cả các thông số khác liên quan đến bảo mật. +LimitsSetup=Cài đặt Giới hạn và độ chính xác +LimitsDesc=Bạn có thể xác định giới hạn, độ chính xác và tối ưu hoá được sử dụng bởi Dolibarr ở đây +MAIN_MAX_DECIMALS_UNIT=Số thập phân tối đa cho đơn giá +MAIN_MAX_DECIMALS_TOT=Số thập phân tối đa cho tổng giá MAIN_MAX_DECIMALS_SHOWN=Max số thập phân cho giá được hiển thị trên màn hình (Add ... sau khi con số này nếu bạn muốn xem ... khi số là cắt ngắn khi hiển thị trên màn hình) MAIN_DISABLE_PDF_COMPRESSION=Sử dụng PDF nén các file PDF được tạo ra. MAIN_ROUNDING_RULE_TOT= Kích thước của phạm vi làm tròn (đối với các quốc gia hiếm hoi mà làm tròn được thực hiện trên một cái gì đó khác hơn so với cơ số 10) -UnitPriceOfProduct=Đơn giá ròng của một sản phẩm -TotalPriceAfterRounding=Tổng giá (net / thùng / bao gồm thuế) sau khi làm tròn -ParameterActiveForNextInputOnly=Thông số hiệu quả cho đầu vào tiếp theo chỉ -NoEventOrNoAuditSetup=Không có sự kiện an ninh đã được ghi lại được nêu ra. Đây có thể là bình thường nếu kiểm toán đã không được kích hoạt trên "thiết lập - an ninh - kiểm toán" trang. +UnitPriceOfProduct=Đơn giá chưa thuế của một sản phẩm +TotalPriceAfterRounding=Tổng giá (chưa thuế/VAT/bao gồm thuế) sau khi làm tròn +ParameterActiveForNextInputOnly=Thông số hiệu quả cho chỉ đầu vào kế tiếp +NoEventOrNoAuditSetup=Chưa có sự kiện bảo mật được ghi nhận. Đây có thể là bình thường nếu kiểm toán đã không được kích hoạt trên trang "Cài đặt - Bảo mật - kiểm toán". NoEventFoundWithCriteria=Không có sự kiện bảo mật đã được tìm thấy cho các tiêu chí tìm kiếm như vậy. SeeLocalSendMailSetup=Xem thiết lập sendmail địa phương của bạn -BackupDesc=Để thực hiện một sao lưu đầy đủ Dolibarr, bạn phải: -BackupDesc2=* Lưu nội dung của tài liệu thư mục (% s) có chứa tất cả các tập tin tải lên và tạo ra (bạn có thể làm cho một zip ví dụ). -BackupDesc3=* Lưu nội dung của cơ sở dữ liệu của bạn vào một tập tin dump. Đối với điều này, bạn có thể sử dụng trợ lý sau. +BackupDesc=Để thực hiện một sao lưu đầy đủ của Dolibarr, bạn phải: +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=Thư mục lưu trữ nên được lưu trữ ở một nơi an toàn. BackupDescY=Tạo ra các tập tin dump nên được lưu trữ ở một nơi an toàn. -BackupPHPWarning=Sao lưu không thể được guaranted với phương pháp này. Thích trước đó +BackupPHPWarning=Sao lưu không thể được guaranted với phương pháp này. Tham chiếu trước đó RestoreDesc=Để khôi phục lại một bản sao lưu Dolibarr, bạn phải: -RestoreDesc2=* Khôi phục tập tin lưu trữ (file zip ví dụ) các tài liệu thư mục để trích xuất các tập tin trong cây thư mục tài liệu của một cài đặt Dolibarr mới hoặc vào văn bản hiện hành này directoy (% s). -RestoreDesc3=* Khôi phục dữ liệu từ một tập tin dump sao lưu, vào cơ sở dữ liệu cài đặt Dolibarr mới hoặc vào cơ sở dữ liệu cài đặt hiện tại này. Cảnh báo, một khi khôi phục xong, bạn phải sử dụng một tên đăng nhập / mật khẩu, đã tồn tại khi sao lưu đã được thực hiện, để kết nối lại. Để khôi phục lại cơ sở dữ liệu sao lưu vào cài đặt hiện tại, bạn có thể làm theo trợ lý này. -RestoreMySQL=MySQL nhập khẩu -ForcedToByAModule= Quy luật này buộc phải%s bởi một mô-đun kích hoạt -PreviousDumpFiles=Sao lưu cơ sở dữ liệu tập tin dump có sẵn +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 nhập dữ liệu +ForcedToByAModule= Quy luật này buộc %s bởi một mô-đun được kích hoạt +PreviousDumpFiles=Available database backup dump files WeekStartOnDay=Ngày đầu tiên của tuần -RunningUpdateProcessMayBeRequired=Chạy quá trình nâng cấp dường như được yêu cầu (Chương trình phiên bản%s khác với phiên bản cơ sở dữ liệu%s) -YouMustRunCommandFromCommandLineAfterLoginToUser=Bạn phải chạy lệnh này từ dòng lệnh sau khi đăng nhập vào một vỏ với người sử dụng%s hoặc bạn phải thêm tùy chọn -W ở cuối dòng lệnh để cung cấp%s mật khẩu. +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=Chức năng SSL không có sẵn trong chương trình PHP DownloadMoreSkins=Nhiều giao diện để tải về -SimpleNumRefModelDesc=Trả về số tài liệu tham khảo với các định dạng% syymm-nnnn nơi yyyy là năm, mm là tháng và NNNN là một chuỗi không có lỗ và không có thiết lập lại +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=Hiển thị id professionnal với các địa chỉ trên các tài liệu -ShowVATIntaInAddress=Ẩn VAT nội num với các địa chỉ trên các tài liệu -TranslationUncomplete=Một phần dịch -SomeTranslationAreUncomplete=Một số ngôn ngữ có thể được dịch một phần hoặc tháng năm có lỗi. Nếu bạn phát hiện một số, bạn có thể sửa chữa các file ngôn ngữ đăng ký http://transifex.com/projects/p/dolibarr/ . -MenuUseLayout=Hãy hidable menu dọc (tùy chọn javascript không được vô hiệu hóa) -MAIN_DISABLE_METEO=Xem khí tượng vô hiệu hóa +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=Vô hiệu phần xem thời tiết TestLoginToAPI=Kiểm tra đăng nhập vào API ProxyDesc=Một số tính năng của Dolibarr cần phải có một kết nối Internet để làm việc. Xác định các thông số ở đây cho việc này. Nếu máy chủ Dolibarr là phía sau một máy chủ proxy, các tham số cho Dolibarr làm thế nào để truy cập Internet thông qua nó. ExternalAccess=Truy cập bên ngoài @@ -1049,295 +1048,297 @@ MAIN_PROXY_HOST=Tên / Địa chỉ của máy chủ proxy MAIN_PROXY_PORT=Cổng của máy chủ proxy MAIN_PROXY_USER=Đăng nhập để sử dụng máy chủ proxy 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. +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) +ExtraFieldsSupplierOrdersLines=Thuộc tính bổ sung (chi tiết đơn hàng) +ExtraFieldsSupplierInvoicesLines=Thuộc tính bổ sung (chi tiết hóa đơn) 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ỉ) +ExtraFieldsContacts=Thuộc tính bổ sung (liên lạc/địa chỉ) ExtraFieldsMember=Thuộc tính bổ sung (thành viên) ExtraFieldsMemberType=Thuộc tính bổ sung (loại thành viên) -ExtraFieldsCustomerOrders=Thuộc tính bổ sung (đơn đặt hàng) +ExtraFieldsCustomerOrders=Thuộc tính bổ sung (đơn hàng) ExtraFieldsCustomerInvoices=Thuộc tính bổ sung (hoá đơn) -ExtraFieldsSupplierOrders=Thuộc tính bổ sung (đơn đặt hàng) +ExtraFieldsSupplierOrders=Thuộc tính bổ sung (đơn hàng) ExtraFieldsSupplierInvoices=Thuộc tính bổ sung (hoá đơn) ExtraFieldsProject=Thuộc tính bổ sung (dự án) ExtraFieldsProjectTask=Thuộc tính bổ sung (nhiệm vụ) -ExtraFieldHasWrongValue=Thuộc tính%s có giá trị sai. -AlphaNumOnlyCharsAndNoSpace=chỉ alphanumericals ký tự không có không gian -AlphaNumOnlyLowerCharsAndNoSpace=chỉ alphanumericals và ký tự chữ thường không có không gian +ExtraFieldHasWrongValue=Thuộc tính %s có giá trị sai. +AlphaNumOnlyCharsAndNoSpace=only alphanumericals characters without space +AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space SendingMailSetup=Thiết lập sendings qua email -SendmailOptionNotComplete=Cảnh báo, trên một số hệ thống Linux, để gửi email từ email của bạn, thiết lập sendmail thực hiện phải có lựa chọn -ba (mail.force_extra_parameters tham số vào file php.ini của bạn). Nếu một số người nhận không bao giờ nhận được email, hãy thử để chỉnh sửa thông số này PHP với mail.force_extra_parameters = -ba). +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=Đường dẫn đến tài liệu PathDirectory=Thư mục 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=Cấu hình de la Traduction -TranslationDesc=Lựa chọn ngôn ngữ hiển thị trên màn hình có thể được chỉnh sửa:
* Trên toàn cầu từ menu Home - Cài đặt - Hiển thị
* Đối với người dùng chỉ từ tab hiển thị tài khoản của người sử dụng thẻ (click vào đăng nhập trên đầu trang của màn hình). -TotalNumberOfActivatedModules=Tổng số các module tính năng kích hoạt: %s +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=Bạn phải có ít nhất 1 mô-đun cho phép -ClassNotFoundIntoPathWarning=Lớp%s không tìm thấy con đường vào PHP -YesInSummer=Có trong mùa hè -OnlyFollowingModulesAreOpenedToExternalUsers=Lưu ý, các mô-đun chỉ sau đây được mở cho người dùng bên ngoài (bất cứ điều gì là sự cho phép của người dùng như vậy): -SuhosinSessionEncrypt=Lưu trữ phiên mã hóa bằng Suhosin -ConditionIsCurrently=Điều kiện hiện nay là %s -YouUseBestDriver=Bạn sử dụng trình điều khiển%s đó là điều khiển tốt nhất có sẵn hiện nay. -YouDoNotUseBestDriver=Bạn sử dụng ổ đĩa%s%s, nhưng lái xe được khuyến khích. -NbOfProductIsLowerThanNoPb=Bạn chỉ có%s sản phẩm / dịch vụ vào cơ sở dữ liệu. Điều này không yêu cầu bất kỳ tối ưu hóa đặc biệt. +ClassNotFoundIntoPathWarning=Lớp %s không tìm thấy con đường vào PHP +YesInSummer=Yes in summer +OnlyFollowingModulesAreOpenedToExternalUsers=Lưu ý, các mô-đun chỉ sau đây được mở cho người dùng bên ngoài (bất cứ điều gì có phân quyền của người dùng như vậy): +SuhosinSessionEncrypt=Session storage encrypted by Suhosin +ConditionIsCurrently=Điều kiện là hiện tại %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=Tối ưu hóa tìm kiếm -YouHaveXProductUseSearchOptim=Bạn có sản phẩm%s vào cơ sở dữ liệu. Bạn nên thêm PRODUCT_DONOTSEARCH_ANYWHERE liên tục tới 1 vào Home-Setup khác, bạn giới hạn tìm kiếm với đầu dây làm cho cơ sở dữ liệu có thể sử dụng chỉ số và bạn sẽ nhận được một phản ứng ngay lập tức. -BrowserIsOK=Bạn đang sử dụng trình duyệt web%s. Trình duyệt này là ok cho bảo mật và hiệu suất. -BrowserIsKO=Bạn đang sử dụng trình duyệt web%s. Trình duyệt này được biết đến là một lựa chọn tốt cho bảo mật, hiệu suất và độ tin cậy. Chúng tôi recommand bạn sử dụng Firefox, Chrome, Opera hay Safari. -XDebugInstalled=XDebug được tải. -XCacheInstalled=XCache được tải. +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=Bạn đang sử dụng trình duyệt web %s. Trình duyệt này là ok cho bảo mật và hiệu suất. +BrowserIsKO=Bạn đang sử dụng trình duyệt web %s. Trình duyệt này được biết đến là một lựa chọn tốt cho bảo mật, hiệu suất và độ tin cậy. Chúng tôi recommand bạn sử dụng Firefox, Chrome, Opera hay 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 của trường%s -FixTZ=Sửa chữa TimeZone -FillThisOnlyIfRequired=Ví dụ: 2 (chỉ điền nếu múi giờ bù đắp vấn đề có nhiều kinh nghiệm) +FieldEdition=Biên soạn của trường %s +FixTZ=TimeZone fix +FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) GetBarCode=Nhận mã vạch -EmptyNumRefModelDesc=Mã này là miễn phí. Mã này có thể được sửa đổi bất cứ lúc nào. +EmptyNumRefModelDesc=Mã này còn trống. Mã này có thể được sửa đổi bất cứ lúc nào. ##### Module password generation PasswordGenerationStandard=Quay trở lại một mật khẩu được tạo ra theo thuật toán Dolibarr nội bộ: 8 ký tự có chứa số chia sẻ và ký tự trong chữ thường. PasswordGenerationNone=Không đề nghị bất kỳ mật khẩu được tạo ra. Mật khẩu phải được gõ bằng tay. ##### Users setup ##### -UserGroupSetup=Người sử dụng và nhóm thiết lập mô-đun +UserGroupSetup=Cài đặt module người dùng và nhóm GeneratePassword=Đề nghị một mật khẩu được tạo ra RuleForGeneratedPasswords=Quy tắc để tạo mật khẩu đề nghị hoặc xác nhận mật khẩu -DoNotSuggest=Không đề nghị bất kỳ mật khẩu -EncryptedPasswordInDatabase=Để cho phép mã hóa các mật khẩu trong cơ sở dữ liệu +DoNotSuggest=Không đề nghị bất kỳ mật khẩu nào +EncryptedPasswordInDatabase=Cho phép mã hóa các mật khẩu trong cơ sở dữ liệu DisableForgetPasswordLinkOnLogonPage=Không hiển thị liên kết "Quên mật khẩu" trên trang đăng nhập -UsersSetup=Thiết lập người sử dụng mô-đun -UserMailRequired=Email cần thiết để tạo một người dùng mới +UsersSetup=Thiết lập module người dùng +UserMailRequired=Email được yêu cầu để tạo một người dùng mới ##### Company setup ##### -CompanySetup=Thiết lập các công ty mô-đun -CompanyCodeChecker=Module cho thế hệ thứ ba bên mã và kiểm tra (khách hàng hoặc nhà cung cấp) -AccountCodeManager=Module cho hệ mã kế toán (khách hàng hoặc nhà cung cấp) -ModuleCompanyCodeAquarium=Quay trở lại một mã số kế toán được xây dựng bởi:
%s tiếp theo là mã nhà cung cấp bên thứ ba cho một mã nhà cung cấp kế toán,
%s tiếp theo là mã khách hàng của bên thứ ba cho một mã số kế toán của khách hàng. -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. +CompanySetup=Cài đặt module Công ty +CompanyCodeChecker=Module cho bên thứ ba tạo mã và kiểm tra (khách hàng hoặc nhà cung cấp) +AccountCodeManager=Module cho tạo mã kế toán (khách hàng hoặc nhà cung cấp) +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=Trả lại một mã kế toán rỗng. +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=Sử dụng thông báo 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, ...) +DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...) WatermarkOnDraft=Watermark vào dự thảo văn bản -JSOnPaimentBill=Kích hoạt tính năng tự động điền vào các dòng tiền vào hình thức thanh toán -CompanyIdProfChecker=Các quy định về chuyên môn Id +JSOnPaimentBill=Kích hoạt tính năng tự động điền vào các dòng thanh toán trên form thanh toán +CompanyIdProfChecker=Rules on Professional Ids MustBeUnique=Phải là duy nhất? MustBeMandatory=Bắt buộc để tạo ra các bên thứ ba? MustBeInvoiceMandatory=Bắt buộc để xác nhận hóa đơn? Miscellaneous=Linh tinh ##### Webcal setup ##### -WebCalSetup=Thiết lập liên kết Webcalendar +WebCalSetup=Cài đặt liên kết Webcalendar WebCalSyncro=Thêm sự kiện Dolibarr để WebCalendar -WebCalAllways=Luôn luôn, không chào bán -WebCalYesByDefault=Theo yêu cầu (có mặc định) -WebCalNoByDefault=Theo yêu cầu (không theo mặc định) +WebCalAllways=Luôn luôn, không hỏi +WebCalYesByDefault=Theo yêu cầu (mặc định là có) +WebCalNoByDefault=Theo yêu cầu (mặc định là không) WebCalNever=Không bao giờ WebCalURL=URL để truy cập lịch -WebCalServer=Máy chủ cơ sở dữ liệu lưu trữ lịch +WebCalServer=Server hosting calendar database WebCalDatabaseName=Tên cơ sở dữ liệu -WebCalUser=Người sử dụng cơ sở dữ liệu truy cập +WebCalUser=Người dùng truy cập cơ sở dữ liệu WebCalSetupSaved=Thiết lập Webcalendar lưu thành công. -WebCalTestOk=Kết nối với máy chủ '%s' vào cơ sở dữ liệu '%s' với người sử dụng '%s' thành công. -WebCalTestKo1=Kết nối với máy chủ '%s' thành công nhưng cơ sở dữ liệu '%s' không thể đạt được. +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=Kết nối với máy chủ '%s' với người dùng '%s' thất bại. WebCalErrorConnectOkButWrongDatabase=Kết nối cơ sở dữ liệu thành công nhưng không nhìn được một cơ sở dữ liệu Webcalendar. WebCalAddEventOnCreateActions=Thêm sự kiện lịch về các hoạt động tạo ra WebCalAddEventOnCreateCompany=Thêm sự kiện lịch trên các công ty tạo ra -WebCalAddEventOnStatusPropal=Thêm sự kiện lịch trên đề xuất thương mại thay đổi trạng thái -WebCalAddEventOnStatusContract=Thêm sự kiện lịch trên hợp đồng thay đổi trạng thái -WebCalAddEventOnStatusBill=Thêm sự kiện lịch trên hóa đơn thay đổi trạng thái -WebCalAddEventOnStatusMember=Thêm sự kiện lịch trên các thành viên thay đổi trạng thái -WebCalUrlForVCalExport=Một liên kết xuất khẩu sang định dạng %s có sẵn tại liên kết sau đây: %s +WebCalAddEventOnStatusPropal=Thêm sự kiện lịch trên đơn hàng đề nghị trạng thái thay đổi +WebCalAddEventOnStatusContract=Thêm sự kiện lịch trên hợp đồng trạng thái thay đổi +WebCalAddEventOnStatusBill=Thêm sự kiện lịch trên xuất hóa đơn trạng thái thay đổi +WebCalAddEventOnStatusMember=Thêm sự kiện lịch trên các thành viên trạng thái thay đổi +WebCalUrlForVCalExport=Một liên kết xuất dữ liệu sang định dạng %s có sẵn tại liên kết sau đây: %s WebCalCheckWebcalSetup=Có thể thiết lập mô-đun Webcal là không đúng. ##### Invoices ##### -BillsSetup=Thiết lập mô-đun hóa đơn +BillsSetup=Cài đặt module hóa đơn BillsDate=Ngày hóa đơn -BillsNumberingModule=Hoá đơn, ghi chú tín dụng đánh số mô hình -BillsPDFModules=Tài liệu mô hình hóa đơn -CreditNoteSetup=Thiết lập mô-đun lưu ý tín dụng -CreditNotePDFModules=Mô hình tín dụng tài liệu lưu ý +BillsNumberingModule=Mô hình đánh số Hoá đơn và giấy báo có +BillsPDFModules=Mô hình chứng từ hóa đơn +CreditNoteSetup=Cài đặt module giấy báo có +CreditNotePDFModules=Mô hình chứng từ giấy báo có CreditNote=Lưu ý tín dụng -CreditNotes=Ghi chú tín dụng -ForceInvoiceDate=Lực lượng ngày hóa đơn cho đến nay xác nhận -DisableRepeatable=Vô hiệu hoá đơn lặp lại +CreditNotes=Giấy báo có +ForceInvoiceDate=Buộc ngày hóa đơn là ngày xác nhận +DisableRepeatable=Vô hiệu Hóa đơn có thể lặp lại SuggestedPaymentModesIfNotDefinedInInvoice=Đề nghị chế độ thanh toán trên hoá đơn theo mặc định nếu không được xác định cho hóa đơn -EnableEditDeleteValidInvoice=Kích hoạt tính năng khả năng để chỉnh sửa / xóa hóa đơn hợp lệ không có thanh toán +EnableEditDeleteValidInvoice=Kích hoạt tính năng khả năng để chỉnh sửa / xóa hóa đơn hợp lệ chưa thanh toán SuggestPaymentByRIBOnAccount=Đề nghị thanh toán bằng thu hồi vào tài khoản -SuggestPaymentByChequeToAddress=Đề nghị thanh toán bằng séc để -FreeLegalTextOnInvoices=Miễn phí văn bản trên hoá đơn -WatermarkOnDraftInvoices=Watermark về dự thảo hoá đơn (nếu không có sản phẩm nào) +SuggestPaymentByChequeToAddress=Đề nghị thanh toán bằng séc cho +FreeLegalTextOnInvoices=Free text on invoices +WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty) ##### Proposals ##### -PropalSetup=Đề xuất thương mại thiết lập mô-đun +PropalSetup=Cài đặt module đơn hàng đề xuất CreateForm=Tạo các biểu mẫu NumberOfProductLines=Số dòng sản phẩm -ProposalsNumberingModules=Mô hình đánh số đề nghị thương mại -ProposalsPDFModules=Văn bản đề nghị thương mại mô hình +ProposalsNumberingModules=Mô hình đánh số đơn hàng đề xuất +ProposalsPDFModules=Mô hình chứng từ đơn hàng đề xuất ClassifiedInvoiced=Phân loại hóa đơn -HideTreadedPropal=Ẩn đề xuất thương mại được điều trị trong danh sách -AddShippingDateAbility=Thêm khả năng vận chuyển ngày -AddDeliveryAddressAbility=Thêm khả năng ngày giao hàng -UseOptionLineIfNoQuantity=Một dòng sản phẩm / dịch vụ với một số lượng không được coi là một lựa chọn -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 +HideTreadedPropal=Ẩn đơn hàng đề nghị trong danh sách +AddShippingDateAbility=Thêm ngày vận chuyên có thể +AddDeliveryAddressAbility=Thêm ngày giao hàng có thể +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=Yêu cầu tài khoản ngân hàng của đơn hàng đề xuất ##### 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=Cài đặt module đề nghị giá nhà cung cấp +AskPriceSupplierNumberingModules=Kiểu đánh số cho đề nghị giá nhà cung cấp +AskPriceSupplierPDFModules=Kiểu chứng từ đề nghị giá nhà cung cấp +FreeLegalTextOnAskPriceSupplier=Free text trên đề nghị giá nhà cung cấp +WatermarkOnDraftAskPriceSupplier=Watermark trên dự thảo đề nghị giá nhà cung cấp (không nếu rỗng) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Yêu cầu số tài khoản ngân hàng trên đề nghị giá ##### Orders ##### -OrdersSetup=Thiết lập quản lý đơn hàng +OrdersSetup=Cài đặt quản lý đơn hàng OrdersNumberingModules=Mô hình đánh số đơn hàng -OrdersModelModule=Mô hình tài liệu về đơn hàng -HideTreadedOrders=Ẩn các đơn đặt hàng được xử lý hoặc hủy bỏ trong danh sách -ValidOrderAfterPropalClosed=Để xác nhận đơn đặt hàng sau khi đề xuất gần hơn, làm cho nó có thể không bước theo lệnh tạm thời -FreeLegalTextOnOrders=Miễn phí văn bản trên đơn đặt hàng -WatermarkOnDraftOrders=Watermark về dự thảo đơn đặt hàng (nếu không có sản phẩm nào) -ShippableOrderIconInList=Thêm một biểu tượng trong danh sách đơn đặt hàng lớn cho biết nếu thứ tự là shippable -BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order +OrdersModelModule=Mô hình chứng từ đơn hàng +HideTreadedOrders=Ẩn các đơn hàng được xử lý hoặc hủy bỏ trong danh sách +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=Thêm một biểu tượng trong danh sách đơn hàng cho biết nếu đơn hàng có thể vận chuyển +BANK_ASK_PAYMENT_BANK_DURING_ORDER=Yêu cầu số tài khoản ngân hàng của đơn hàng ##### Clicktodial ##### -ClickToDialSetup=Nhấn vào đây để quay số thiết lập mô-đun -ClickToDialUrlDesc=Url gọi khi một nhấp chuột trên điện thoại Picto được thực hiện. Trong URL, bạn có thể sử dụng các thẻ
__PHONETO__ Sẽ được thay thế bằng số điện thoại của người gọi
__PHONEFROM__ Sẽ được thay thế bằng số điện thoại của người gọi (của bạn)
__LOGIN__ Sẽ được thay thế bằng đăng nhập clicktodial của bạn (xác định trên thẻ người dùng của bạn)
__PASS__ Sẽ được thay thế bằng mật khẩu clicktodial của bạn (xác định trên thẻ người dùng của bạn). +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=Thiết lập mô-đun Bookmark4u +Bookmark4uSetup=Bookmark4u module setup ##### Interventions ##### -InterventionsSetup=Thiết lập mô-đun can thiệp -FreeLegalTextOnInterventions=Miễn phí văn bản trên các tài liệu can thiệp -FicheinterNumberingModules=Mô hình can thiệp đánh số -TemplatePDFInterventions=Tài liệu mô hình can thiệp thẻ -WatermarkOnDraftInterventionCards=Watermark vào tài liệu thẻ can thiệp (nếu không có sản phẩm nào) +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=Hợp đồng đánh số module -TemplatePDFContracts=Hợp đồng tài liệu mô hình -FreeLegalTextOnContracts=Miễn phí văn bản về hợp đồng -WatermarkOnDraftContractCards=Watermark vào dự thảo hợp đồng (nếu không có sản phẩm nào) +ContractsSetup=Cài đặt module Hợp đồng/thuê bao +ContractsNumberingModules=Module đánh số hợp đồng +TemplatePDFContracts=Kiểu chứng từ hợp đồng +FreeLegalTextOnContracts=Free text trên hợp đồng +WatermarkOnDraftContractCards=Watermark on dự thảo hợp đồng (none if empty) ##### Members ##### -MembersSetup=Thiết lập các thành viên mô-đun +MembersSetup=Cài đặt module thành viên MemberMainOptions=Lựa chọn chính -AddSubscriptionIntoAccount=Đề nghị theo mặc định để tạo ra một giao dịch ngân hàng, trong mô-đun ngân hàng, khi thêm một thuê bao payed mới +AddSubscriptionIntoAccount=Suggest by default to create a bank transaction, in bank module, when adding a new payed subscription AdherentLoginRequired= Quản lý một Đăng nhập cho mỗi thành viên -AdherentMailRequired=Email cần thiết để tạo ra một thành viên mới +AdherentMailRequired=Email được yêu cầu để tạo ra một thành viên mới MemberSendInformationByMailByDefault=Hộp kiểm để gửi thư xác nhận cho các thành viên (xác nhận hoặc đăng ký mới) là theo mặc định ##### LDAP setup ##### LDAPSetup=Thiết lập LDAP LDAPGlobalParameters=Các thông số toàn cầu -LDAPUsersSynchro=Người sử dụng +LDAPUsersSynchro=Người dùng LDAPGroupsSynchro=Nhóm -LDAPContactsSynchro=Liên hệ +LDAPContactsSynchro=Liên lạc LDAPMembersSynchro=Thành viên LDAPSynchronization=Đồng bộ hóa LDAP -LDAPFunctionsNotAvailableOnPHP=LDAP chức năng không có sẵn trên PHP của bạn -LDAPToDolibarr=LDAP - Dolibarr> +LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP +LDAPToDolibarr=LDAP -> Dolibarr DolibarrToLDAP=Dolibarr -> LDAP -LDAPNamingAttribute=Quan trọng trong LDAP -LDAPSynchronizeUsers=Tổ chức của người sử dụng trong LDAP -LDAPSynchronizeGroups=Tổ chức của các nhóm trong LDAP -LDAPSynchronizeContacts=Tổ chức liên lạc trong LDAP -LDAPSynchronizeMembers=Tổ chức thành viên sáng lập trong LDAP -LDAPTypeExample=OpenLDAP, eGroupWare hoặc Active Directory +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=Máy chủ chính LDAPSecondaryServer=Máy chủ thứ cấp LDAPServerPort=Cổng máy chủ LDAPServerPortExample=Cổng mặc định: 389 LDAPServerProtocolVersion=Phiên bản giao thức -LDAPServerUseTLS=Sử dụng TLS -LDAPServerUseTLSExample=LDAP của bạn sử dụng máy chủ TLS -LDAPServerDn=Máy chủ DN -LDAPAdminDn=Quản trị DN -LDAPAdminDnExample=Toàn bộ DN (ví dụ: cn = admin, dc = Ví dụ, dc = com) +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=Mật khẩu quản trị -LDAPUserDn=DN của người sử dụng -LDAPUserDnExample=Toàn bộ DN (ví dụ: ou = người dùng, dc = Ví dụ, dc = com) -LDAPGroupDn=DN nhóm ' -LDAPGroupDnExample=Toàn bộ DN (ví dụ: ou = nhóm, dc = Ví dụ, dc = com) -LDAPServerExample=Địa chỉ máy chủ (ví dụ: localhost, 192.168.0.2, LDAPS: //ldap.example.com/) -LDAPServerDnExample=Toàn bộ DN (ví dụ: dc = Ví dụ, dc = com) +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=Mật khẩu quản trị -LDAPDnSynchroActive=Người sử dụng và nhóm đồng bộ hóa -LDAPDnSynchroActiveExample=LDAP để Dolibarr hoặc Dolibarr để đồng bộ hóa LDAP -LDAPDnContactActive=Đồng bộ hóa địa chỉ liên lạc ' -LDAPDnContactActiveYes=Đồng bộ hóa kích hoạt -LDAPDnContactActiveExample=Kích hoạt / Unactivated đồng bộ hóa +LDAPDnSynchroActive=Người dùng và nhóm đồng bộ hóa +LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization +LDAPDnContactActive=Đồng bộ hóa liên lạc ' +LDAPDnContactActiveYes=Đồng bộ hóa được kích hoạt +LDAPDnContactActiveExample=Kích hoạt/Không kích hoạt đồng bộ hóa LDAPDnMemberActive=Đồng bộ của các thành viên -LDAPDnMemberActiveExample=Kích hoạt / Unactivated đồng bộ hóa -LDAPContactDn=DN Dolibarr liên lạc ' -LDAPContactDnExample=Toàn bộ DN (ví dụ: ou = địa chỉ liên lạc, dc = Ví dụ, dc = com) -LDAPMemberDn=Thành viên Dolibarr DN -LDAPMemberDnExample=Toàn bộ DN (ví dụ: ou = thành viên, dc = Ví dụ, dc = com) -LDAPMemberObjectClassList=Danh sách objectClass -LDAPMemberObjectClassListExample=Danh sách objectClass xác định kỷ lục thuộc tính (ví dụ: hàng đầu, inetOrgPerson hay hàng đầu, sử dụng cho hoạt động thư mục) -LDAPUserObjectClassList=Danh sách objectClass -LDAPUserObjectClassListExample=Danh sách objectClass xác định kỷ lục thuộc tính (ví dụ: hàng đầu, inetOrgPerson hay hàng đầu, sử dụng cho hoạt động thư mục) -LDAPGroupObjectClassList=Danh sách objectClass -LDAPGroupObjectClassListExample=Danh sách objectClass xác định kỷ lục thuộc tính (ví dụ: hàng đầu, groupOfUniqueNames) -LDAPContactObjectClassList=Danh sách objectClass -LDAPContactObjectClassListExample=Danh sách objectClass xác định kỷ lục thuộc tính (ví dụ: hàng đầu, inetOrgPerson hay hàng đầu, sử dụng cho hoạt động thư mục) -LDAPMemberTypeDn=Thành viên Dolibarr nhập DN -LDAPMemberTypeDnExample=Toàn bộ DN (ví dụ: ou = type_members, dc = Ví dụ, dc = com) -LDAPTestConnect=Kiểm tra kết nối LDAP -LDAPTestSynchroContact=Kiểm tra đồng bộ hóa địa chỉ liên lạc -LDAPTestSynchroUser=Đồng bộ hóa sử dụng thử nghiệm -LDAPTestSynchroGroup=Đồng bộ hóa nhóm thử nghiệm -LDAPTestSynchroMember=Đồng bộ thành viên kiểm tra -LDAPTestSearch= Kiểm tra một tìm kiếm LDAP -LDAPSynchroOK=Kiểm tra đồng bộ thành công -LDAPSynchroKO=Kiểm tra đồng bộ hóa thất bại -LDAPSynchroKOMayBePermissions=Kiểm tra đồng bộ hóa thất bại. Kiểm tra xem xui đến máy chủ được cấu hình đúng và cho phép udpates LDAP -LDAPTCPConnectOK=TCP kết nối với máy chủ LDAP thành công (Server =%s, Port =%s) -LDAPTCPConnectKO=TCP kết nối với máy chủ LDAP thất bại (Server =%s, Port =%s) -LDAPBindOK=Kết nối / Authentificate đến máy chủ LDAP thành công (Server =%s, Port =%s, Admin =%s, mật khẩu =%s) -LDAPBindKO=Kết nối / Authentificate đến máy chủ LDAP thất bại (Server =%s, Port =%s, Admin =%s, mật khẩu =%s) +LDAPDnMemberActiveExample=Kích hoạt/Không kích hoạt đồng bộ hóa +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=Ngắt kết nối thành công LDAPUnbindFailed=Ngắt kết nối thất bại -LDAPConnectToDNSuccessfull=Kết nối với DN (%s) thành công -LDAPConnectToDNFailed=Kết nối với DN (%s) không thành công -LDAPSetupForVersion3=Máy chủ LDAP cấu hình cho phiên bản 3 -LDAPSetupForVersion2=Máy chủ LDAP cấu hình của phiên bản 2 -LDAPDolibarrMapping=Dolibarr bản đồ -LDAPLdapMapping=LDAP bản đồ -LDAPFieldLoginUnix=Đăng nhập (Unix) -LDAPFieldLoginExample=Ví dụ: uid +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=Bộ lọc tìm kiếm -LDAPFilterConnectionExample=Ví dụ: &(objectClass = inetOrgPerson) -LDAPFieldLoginSamba=Đăng nhập (samba, ActiveDirectory) -LDAPFieldLoginSambaExample=Ví dụ: sAMAccountName +LDAPFilterConnectionExample=Example : &(objectClass=inetOrgPerson) +LDAPFieldLoginSamba=Login (samba, activedirectory) +LDAPFieldLoginSambaExample=Example : samaccountname LDAPFieldFullname=Họ và tên -LDAPFieldFullnameExample=Ví dụ: cn +LDAPFieldFullnameExample=Example : cn LDAPFieldPassword=Mật khẩu -LDAPFieldPasswordNotCrypted=Mật khẩu không crypted -LDAPFieldPasswordCrypted=Mật khẩu crypted -LDAPFieldPasswordExample=Ví dụ: userPassword +LDAPFieldPasswordNotCrypted=Password not crypted +LDAPFieldPasswordCrypted=Password crypted +LDAPFieldPasswordExample=Example : userPassword LDAPFieldCommonName=Tên thường gặp LDAPFieldCommonNameExample=Ví dụ: cn LDAPFieldName=Tên LDAPFieldNameExample=Ví dụ: sn -LDAPFieldFirstName=Tên đầu tiên -LDAPFieldFirstNameExample=Ví dụ: givenName +LDAPFieldFirstName=Tên +LDAPFieldFirstNameExample=Example : givenName LDAPFieldMail=Địa chỉ email -LDAPFieldMailExample=Ví dụ mail của bạn: -LDAPFieldPhone=Số điện thoại chuyên nghiệp -LDAPFieldPhoneExample=Ví dụ: telephonenumber -LDAPFieldHomePhone=Số điện thoại cá nhân -LDAPFieldHomePhoneExample=Ví dụ: HomePhone -LDAPFieldMobile=Điện thoại di động -LDAPFieldMobileExample=Ví dụ: điện thoại di động -LDAPFieldFax=Số fax -LDAPFieldFaxExample=Ví dụ: facsimiletelephonenumber -LDAPFieldAddress=Đường phố +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=Đường LDAPFieldAddressExample=Ví dụ: đường phố LDAPFieldZip=Zip LDAPFieldZipExample=Ví dụ: Mã Bưu chính -LDAPFieldTown=Town +LDAPFieldTown=Thành phố LDAPFieldTownExample=Ví dụ: l -LDAPFieldCountry=Đất nước +LDAPFieldCountry=Quốc gia LDAPFieldCountryExample=Ví dụ: c LDAPFieldDescription=Mô tả LDAPFieldDescriptionExample=Ví dụ: Mô tả -LDAPFieldGroupMembers= Nhóm thành viên +LDAPFieldNotePublic=Ghi chú công khai +LDAPFieldNotePublicExample=Example : publicnote +LDAPFieldGroupMembers= Thành viên Nhóm LDAPFieldGroupMembersExample= Ví dụ: uniqueMember LDAPFieldBirthdate=Ngày sinh LDAPFieldBirthdateExample=Ví dụ: @@ -1346,273 +1347,278 @@ LDAPFieldCompanyExample=Ví dụ: o LDAPFieldSid=SID LDAPFieldSidExample=Ví dụ: objectsid LDAPFieldEndLastSubscription=Ngày đăng ký cuối cùng -LDAPFieldTitle=Bài / Chức năng +LDAPFieldTitle=Post/Function LDAPFieldTitleExample=Ví dụ: tiêu đề -LDAPParametersAreStillHardCoded=Thông số LDAP vẫn được mã hóa (trong lớp liên lạc) -LDAPSetupNotComplete=Thiết lập LDAP không hoàn thành (đi trên các tab khác) -LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Không có người quản trị hoặc mật khẩu được cung cấp. Truy cập LDAP sẽ được ẩn danh và ở chế độ chỉ đọc. -LDAPDescContact=Trang này cho phép bạn xác định các thuộc tính LDAP tên trong cây LDAP cho mỗi dữ liệu được tìm thấy trên địa chỉ liên lạc Dolibarr. -LDAPDescUsers=Trang này cho phép bạn xác định các thuộc tính LDAP tên trong cây LDAP cho mỗi dữ liệu được tìm thấy trên người sử dụng Dolibarr. -LDAPDescGroups=Trang này cho phép bạn xác định các thuộc tính LDAP tên trong cây LDAP cho mỗi dữ liệu được tìm thấy trên các nhóm Dolibarr. -LDAPDescMembers=Trang này cho phép bạn xác định các thuộc tính LDAP tên trong cây LDAP cho mỗi dữ liệu được tìm thấy trên các thành viên Dolibarr mô-đun. -LDAPDescValues=Ví dụ giá trị được thiết kế cho OpenLDAP với các lược đồ sau đây nạp: core.schema, cosine.schema, inetorgperson.schema). Nếu bạn sử dụng thoose giá trị và OpenLDAP, LDAP sửa đổi tập tin cấu hình slapd.conf của bạn có tất cả các lược đồ thoose nạp. -ForANonAnonymousAccess=Đối với một truy cập xác thực (đối với quyền truy cập ghi ví dụ) -PerfDolibarr=Thiết lập hiệu suất / tối ưu hóa báo cáo -YouMayFindPerfAdviceHere=Bạn sẽ tìm thấy trên trang này một số kiểm tra và tư vấn liên quan đến hiệu suất. -NotInstalled=Không cài đặt, do máy chủ của bạn không làm chậm của thành viên này. -ApplicativeCache=Bộ nhớ cache applicative -MemcachedNotAvailable=Không có bộ nhớ cache applicative được tìm thấy. Bạn có thể nâng cao hiệu suất bằng cách cài đặt một máy chủ memcached bộ nhớ cache và một mô-đun có thể sử dụng máy chủ cache này.
Thêm thông tin ở đây http://wiki.dolibarr.org/index.php/Module_MemCached_EN .
Lưu ý rằng rất nhiều nhà cung cấp máy chủ web không cung cấp máy chủ cache như vậy. -MemcachedModuleAvailableButNotSetup=Mô-đun bộ nhớ cache memcached cho applicative tìm thấy nhưng cài đặt các mô-đun không đầy đủ. -MemcachedAvailableAndSetup=Memcached mô-đun dành riêng cho sử dụng máy chủ memcached được kích hoạt. -OPCodeCache=Bộ nhớ cache opcode -NoOPCodeCacheFound=Không có bộ nhớ cache opcode được tìm thấy. Có thể là bạn sử dụng một bộ nhớ cache opcode hơn XCache hoặc eAccelerator (tốt), có thể bạn không có bộ nhớ cache opcode (rất xấu). -HTTPCacheStaticResources=Bộ nhớ cache HTTP cho tài nguyên tĩnh (css, img, javascript) -FilesOfTypeCached=Files of type%s được lưu trữ bởi máy chủ HTTP -FilesOfTypeNotCached=Files of type%s không được lưu trữ bởi máy chủ HTTP -FilesOfTypeCompressed=Files of type%s được nén bởi máy chủ HTTP -FilesOfTypeNotCompressed=Files of type%s không bị nén bởi máy chủ HTTP -CacheByServer=Bộ nhớ cache của máy chủ -CacheByClient=Bộ nhớ cache của trình duyệt -CompressionOfResources=Nén các phản hồi HTTP +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=Báo cáo cài đặt trình diễn/ tối ưu hóa +YouMayFindPerfAdviceHere=Bạn sẽ tìm thấy trên trang này một số kiểm tra và lời khuyên liên quan đến hiệu suất. +NotInstalled=Không cài đặt, vì vậy máy chủ của bạn không chậm vì điều này. +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=Thiết lập mô-đun sản phẩm -ServiceSetup=Thiết lập mô-đun dịch vụ -ProductServiceSetup=Thiết lập mô-đun sản phẩm và dịch vụ +ProductSetup=Cài đặt module sản phẩm +ServiceSetup=Cài đặt module dịch vụ +ProductServiceSetup=Cài đặt module Sản phẩm và Dịch vụ NumberOfProductShowInSelect=Số lượng tối đa của sản phẩm trong danh sách combo chọn (0 = không giới hạn) -ConfirmDeleteProductLineAbility=Xác nhận khi loại bỏ các dòng sản phẩm trong các hình thức -ModifyProductDescAbility=Cá nhân mô tả sản phẩm dưới nhiều hình thức -ViewProductDescInFormAbility=Hình ảnh của mô tả sản phẩm bằng các hình thức (nếu không như bật lên tooltip) -ViewProductDescInThirdpartyLanguageAbility=Hình ảnh của sản phẩm mô tả trong ngôn ngữ của bên thứ ba -UseSearchToSelectProductTooltip=Ngoài ra nếu bạn có một số lượng lớn các sản phẩm (> 100 000), bạn có thể tăng tốc độ bằng cách thiết lập PRODUCT_DONOTSEARCH_ANYWHERE liên tục đến 1 trong Setup-> khác. Tìm kiếm sau đó sẽ được giới hạn để bắt đầu của chuỗi. -UseSearchToSelectProduct=Sử dụng một hình thức tìm kiếm để chọn một sản phẩm (chứ không phải là một danh sách thả xuống). -UseEcoTaxeAbility=Hỗ trợ sinh thái taxe (WEEE) +ConfirmDeleteProductLineAbility=Xác nhận khi loại bỏ các dòng sản phẩm trong các biểu mẫu +ModifyProductDescAbility=Cá nhân hóa mô tả sản phẩm trong các biểu mẫu +ViewProductDescInFormAbility=Hình ảnh hóa của mô tả sản phẩm bằng trong các biểu mẫu (nếu không bật lên cửa sổ tooltip) +ViewProductDescInThirdpartyLanguageAbility=Hình ảnh hóa của mô tả sản phẩm trong ngôn ngữ của bên thứ ba +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=Sử dụng một form tìm kiếm để chọn một sản phẩm (chứ không phải là một danh sách thả xuống). +UseEcoTaxeAbility=Support Eco-Taxe (WEEE) SetDefaultBarcodeTypeProducts=Loại mã vạch mặc định để sử dụng cho các sản phẩm -SetDefaultBarcodeTypeThirdParties=Mặc định loại mã vạch để sử dụng cho các bên thứ ba -ProductCodeChecker= Module cho hệ mã sản phẩm và kiểm tra (sản phẩm hoặc dịch vụ) -ProductOtherConf= Sản phẩm / dịch vụ cấu hình +SetDefaultBarcodeTypeThirdParties=Loại mã vạch mặc định để sử dụng cho các bên thứ ba +ProductCodeChecker= Module để sinh ra mã sản phẩm và kiểm tra (sản phẩm hoặc dịch vụ) +ProductOtherConf= Cấu hình Sản phẩm / Dịch vụ ##### Syslog ##### -SyslogSetup=Thiết lập các bản ghi mô-đun -SyslogOutput=Bản ghi kết quả đầu ra +SyslogSetup=Cài đặt module nhật trình +SyslogOutput=Nhật trình đầu ra SyslogSyslog=Syslog -SyslogFacility=Cơ sở -SyslogLevel=Cấp +SyslogFacility=Thiết bị +SyslogLevel=Mức SyslogSimpleFile=Tập tin SyslogFilename=Tên tập tin và đường dẫn -YouCanUseDOL_DATA_ROOT=Bạn có thể sử dụng DOL_DATA_ROOT / dolibarr.log cho một tập tin đăng nhập Dolibarr "tài liệu" thư mục. Bạn có thể thiết lập một con đường khác nhau để lưu trữ các tập tin này. -ErrorUnknownSyslogConstant=Liên tục%s không phải là một hằng số Syslog biết -OnlyWindowsLOG_USER=Windows chỉ hỗ trợ LOG_USER +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=Thiết lập mô-đun tặng -DonationsReceiptModel=Mẫu nhận tặng +DonationsSetup=Cài đặt module Tài trợ +DonationsReceiptModel=Mẫu biên nhận Tài trợ ##### Barcode ##### -BarcodeSetup=Thiết lập mã vạch -PaperFormatModule=Mô-đun định dạng In -BarcodeEncodeModule=Mã vạch kiểu mã hóa +BarcodeSetup=Cài đặt mã vạch +PaperFormatModule=Module định dạng in +BarcodeEncodeModule=Kiểu mã hõa mã vạch UseBarcodeInProductModule=Sử dụng mã vạch cho sản phẩm -CodeBarGenerator=Máy phát điện mã vạch -ChooseABarCode=Không có máy phát điện được xác định -FormatNotSupportedByGenerator=Định dạng không được hỗ trợ bởi máy phát điện này -BarcodeDescEAN8=Barcode loại EAN8 -BarcodeDescEAN13=Barcode loại EAN13 -BarcodeDescUPC=Mã vạch UPC loại -BarcodeDescISBN=Barcode loại ISBN -BarcodeDescC39=Barcode loại C39 -BarcodeDescC128=Barcode loại C128 +CodeBarGenerator=Máy sinh mã vạch +ChooseABarCode=Không xác định được máy sinh mã vạch +FormatNotSupportedByGenerator=Định dạng không được hỗ trợ bởi máy sinh mã vạch này +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=Động cơ nội bộ -BarCodeNumberManager=Manager để tự động xác định số mã vạch +BarcodeInternalEngine=Engine nội bộ +BarCodeNumberManager=Quản lý số mã vạch xác định tự động ##### Prelevements ##### -WithdrawalsSetup=Thiết lập mô-đun thu hồi +WithdrawalsSetup=Cài đặt module rút tiền ##### ExternalRSS ##### -ExternalRSSSetup=RSS ngoài nhập khẩu thiết lập -NewRSS=RSS Feed Mới +ExternalRSSSetup=Cài đặt nhập dữ liệu RSS bên ngoài +NewRSS=Nguồn cấp RSS Mới RSSUrl=RSS URL RSSUrlExample=Một nguồn cấp dữ liệu RSS thú vị ##### Mailing ##### -MailingSetup=Gửi email cài đặt mô-đun -MailingEMailFrom=Tên người gửi thư điện tử (Từ) cho email được gửi bằng cách gửi email mô-đun -MailingEMailError=Quay trở lại thư điện tử (lỗi-to) cho email với các lỗi -MailingDelay=Seconds to wait after sending next message +MailingSetup=Cài đặt module Emailing +MailingEMailFrom=Tên người gửi thư điện tử (Từ) cho email được gửi bằng module emailing +MailingEMailError=Quay trở lại email (lỗi-đến) cho email có lỗi +MailingDelay=Số giây để chờ đợi sau khi gửi tin nhắn tiếp theo ##### Notification ##### -NotificationSetup=Thư điện tử của thiết lập mô-đun thông báo -NotificationEMailFrom=Tên người gửi thư điện tử (Từ) cho các email gửi đi thông báo -ListOfAvailableNotifications=Danh sách các sự kiện mà bạn có thể thiết lập thông báo trên, cho mỗi của bên thứ ba (đi vào thẻ của bên thứ ba để thiết lập) hoặc bằng cách thiết lập một email cố định (Danh sách phụ thuộc vào mô-đun kích hoạt) -FixedEmailTarget=Mục tiêu email cố định +NotificationSetup=Cài đặt module thông báo email +NotificationEMailFrom=Tên người gửi email (Từ) cho các email đã gửi thông báo +ListOfAvailableNotifications=Danh sách các sự kiện mà bạn có thể thiết lập thông báo trên, cho mỗi của bên thứ ba (vào thẻ của bên thứ ba để thiết lập) hoặc bằng cách thiết lập một email cố định (Danh sách phụ thuộc vào mô-đun kích hoạt) +FixedEmailTarget=Fixed email target ##### Sendings ##### -SendingsSetup=Gửi thiết lập mô-đun -SendingsReceiptModel=Gửi mô hình nhận -SendingsNumberingModules=Sendings đánh số module -SendingsAbility=Support shipment sheets for customer deliveries -NoNeedForDeliveryReceipts=Trong hầu hết các trường hợp, sendings hóa đơn được sử dụng như tờ cho việc giao hàng của khách hàng (danh sách các sản phẩm để gửi) và tấm được recevied và chữ ký của khách hàng. Vì vậy, phân phối sản phẩm hóa đơn là một tính năng sao chép và hiếm khi được kích hoạt. -FreeLegalTextOnShippings=Free text on shipments +SendingsSetup=Cài đặt module Gửi +SendingsReceiptModel=Mô hình biên nhận Gửi +SendingsNumberingModules=Module đánh số Gửi +SendingsAbility=Phiếu vận chuyển cho đơn giao hàng khách hàng +NoNeedForDeliveryReceipts=Trong hầu hết các trường hợp, biên nhận gửi đi được sử dụng như phiếu giao hàng khách hàng (danh sách các sản phẩm để gửi) và phiếu này được nhận và ký tên bởi khách hàng. Vì vậy, phiếu vận chuyển sản phẩm là đặc tính trùng lắp và hiếm khi được kích hoạt. +FreeLegalTextOnShippings=Free text trên phiếu vận chuyển ##### Deliveries ##### -DeliveryOrderNumberingModules=Sản phẩm phân phối mô-đun số nhận -DeliveryOrderModel=Sản phẩm mô hình giao nhận -DeliveriesOrderAbility=Sản phẩm hỗ trợ giao biên lai -FreeLegalTextOnDeliveryReceipts=Văn bản miễn phí trên hóa đơn giao hàng +DeliveryOrderNumberingModules=Module đánh số phiếu giao nhận sản phẩm +DeliveryOrderModel=Mẫu phiếu giao nhận sản phẩm +DeliveriesOrderAbility=Hỗ trợ phiếu giao nhận sản phẩm giao nhậ +FreeLegalTextOnDeliveryReceipts=Free text trên phiếu giao nhận ##### FCKeditor ##### -AdvancedEditor=Biên tập viên cao cấp +AdvancedEditor=Trình soạn thảo nâng cao ActivateFCKeditor=Kích hoạt trình soạn thảo nâng cao cho: -FCKeditorForCompany=WYSIWIG tạo / phiên bản của các yếu tố mô tả và lưu ý (trừ các sản phẩm / dịch vụ) -FCKeditorForProduct=WYSIWIG tạo / phiên bản của sản phẩm / dịch vụ mô tả và lưu ý +FCKeditorForCompany=WYSIWIG tạo / sửa của các yếu tố mô tả và ghi chú (trừ các sản phẩm / dịch vụ) +FCKeditorForProduct=WYSIWIG tạo / sửa của sản phẩm / dịch vụ mô tả và ghi chú 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 tạo / phiên bản cho eMailings khối (Tools> gửi email) -FCKeditorForUserSignature=WYSIWIG tạo / phiên bản của chữ ký người sử dụng -FCKeditorForMail=WYSIWIG tạo / phiên bản cho tất cả thư (trừ Outils-> gửi email) +FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Công cụ->eMailing) +FCKeditorForUserSignature=WYSIWIG tạo / sửa chữ ký người sử dụng +FCKeditorForMail=WYSIWIG tạo / sửa cho tất cả mail (trừ Outils-> emailing) ##### OSCommerce 1 ##### -OSCommerceErrorConnectOkButWrongDatabase=Kết nối cơ sở dữ liệu thành công nhưng không nhìn được một cơ sở dữ liệu osCommerce (%s chính không tìm thấy trong bảng %s). -OSCommerceTestOk=Kết nối với máy chủ '%s' vào cơ sở dữ liệu '%s' với người sử dụng '%s' thành công. -OSCommerceTestKo1=Kết nối với máy chủ '%s' thành công nhưng cơ sở dữ liệu '%s' không thể đạt được. -OSCommerceTestKo2=Kết nối với máy chủ '%s' với người dùng '%s' thất bại. +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. +StockSetup=Cài đặt module Kho hàng +UserWarehouse=Sử dụng Kho hàng cá nhân người dùng +IfYouUsePointOfSaleCheckModule=Nếu bạn sử dụng module điểm bán hàng(module POS được cung cấp mặc định hoặc mô-đun bên ngoài khác), thiết lập này có thể được bỏ qua bởi Module Điểm bán hàng. Hầu hết module điểm bán hàng được thiết kế để tạo lập tức một hóa đơn và giảm tồn kho theo mặc định bất cứ điều gì là tùy chọn ở đây. Vì vậy, nếu bạn cần hay không giảm tồn kho khi đăng ký bán từ điểm bán hàng của bạn, kiểm tra lại cài đặt module POS của bạn. ##### Menu ##### -MenuDeleted=Đơn bị xóa -TreeMenu=Menu cây -Menus=Thực đơn -TreeMenuPersonalized=Menu cá nhân -NewMenu=Đơn mới -MenuConf=Thiết lập menu -Menu=Lựa chọn các đơn -MenuHandler=Xử lý đơn -MenuModule=Mô-đun mã nguồn -HideUnauthorizedMenu= Ẩn menu trái phép (màu xám) -DetailId=Id menu -DetailMenuHandler=Đơn xử lý vị trí hiển thị trình đơn mới -DetailMenuModule=Tên module nếu mục trình đơn đến từ một mô-đun +MenuDeleted=Menu bị xóa +TreeMenu=Cây menu +Menus=Menu +TreeMenuPersonalized=Menu cá nhân hóa +NewMenu=Menu mới +MenuConf=Cài đặt menu +Menu=Lựa chọn menu +MenuHandler=Xử lý menu +MenuModule=Module nguồn +HideUnauthorizedMenu= Ẩn menu không được phép (màu xám) +DetailId=ID menu +DetailMenuHandler=Xử lý menu nơi hiển thị menu mới +DetailMenuModule=Tên module nếu menu vào đến từ một module DetailType=Loại menu (trên hoặc bên trái) -DetailTitre=Nhãn Menu hoặc nhãn mã cho dịch +DetailTitre=Nhãn Menu hoặc mã nhãn để dịch DetailMainmenu=Nhóm mà nó thuộc về (đã lỗi thời) -DetailUrl=URL nơi đơn gửi cho bạn (liên kết URL tuyệt đối hoặc liên kết bên ngoài với http: //) +DetailUrl=URL where menu send you (Absolute URL link or external link with http://) DetailLeftmenu=Điều kiện hiển thị hay không (đã lỗi thời) DetailEnabled=Điều kiện để hiển thị hoặc không nhập -DetailRight=Điều kiện để hiển thị menu màu xám trái phép -DetailLangs=Tên file lang cho dịch nhãn mã -DetailUser=Intern / ở ngoài / Tất cả -Target=Mục tiêu -DetailTarget=Mục tiêu cho các liên kết (_blank đầu mở một cửa sổ mới) -DetailLevel=Cấp (-1: menu trên cùng, 0: đơn tiêu đề,> 0 menu và menu phụ) -ModifMenu=Thực đơn thay đổi -DeleteMenu=Xóa mục trình đơn -ConfirmDeleteMenu=Bạn có chắc chắn muốn xóa mục trình đơn %s ? +DetailRight=Điều kiện để hiển thị menu không được phép màu xám +DetailLangs=Tên file lang cho việc dịch mã nhãn +DetailUser=Trong/ Ngoài/ Tất cả +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=Thay đổi menu +DeleteMenu=Xóa menu vào +ConfirmDeleteMenu=Bạn có chắc muốn xóa menu vào %s ? DeleteLine=Xóa dòng -ConfirmDeleteLine=Bạn Bạn có chắc chắn muốn xóa dòng này? +ConfirmDeleteLine=Bạn Bạn có chắc muốn xóa dòng này? ##### Tax ##### -TaxSetup=Thuế, các khoản đóng góp xã hội và cổ tức thiết lập mô-đun -OptionVatMode=Thuế GTGT do -OptionVATDefault=Tiền cơ sở -OptionVATDebitOption=Cơ sở dồn tích +TaxSetup=Cài đặt module Thuế, Đóng góp xã hội và Cổ tức +OptionVatMode=VAT due +OptionVATDefault=Dựa trên tiền mặt +OptionVATDebitOption=Dựa trên cộng dồn OptionVatDefaultDesc=Thuế GTGT là do:
- Giao hàng đối với hàng hóa (chúng ta sử dụng ngày hóa đơn)
- Về chi trả dịch vụ -OptionVatDebitOptionDesc=Thuế GTGT là do:
- Giao hàng đối với hàng hóa (chúng ta sử dụng ngày hóa đơn)
- Trên hoá đơn (ghi nợ) cho các dịch vụ -SummaryOfVatExigibilityUsedByDefault=Thời gian exigibility thuế GTGT theo mặc định theo lựa chọn lựa chọn: +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=Ngày giao hàng OnPayment=Ngày thanh toán OnInvoice=Trên hóa đơn -SupposedToBePaymentDate=Ngày thanh toán sử dụng -SupposedToBeInvoiceDate=Ngày sử dụng hóa đơn +SupposedToBePaymentDate=Ngày thanh toán được dùng +SupposedToBeInvoiceDate=Ngày hóa đơn được dùng Buy=Mua Sell=Bán -InvoiceDateUsed=Ngày sử dụng hóa đơn -YourCompanyDoesNotUseVAT=Công ty của bạn đã được xác định không sử dụng thuế GTGT (Trang chủ - Thiết lập - Công ty / cơ sở), vì vậy không có tùy chọn để thiết lập thuế GTGT. -AccountancyCode=Kế toán Mã -AccountancyCodeSell=Tài khoản bán hàng. Mã -AccountancyCodeBuy=Mua tài khoản. Mã +InvoiceDateUsed=Ngày hóa đơn được dùng +YourCompanyDoesNotUseVAT=Công ty của bạn đã được xác định không sử dụng thuế VAT (Trang chủ - Cài đặt - Công ty / Tổ chức), vì vậy không có tùy chọn để cài đặt thuế VAT. +AccountancyCode=Mã kế toán +AccountancyCodeSell=Mã kế toán bán hàng +AccountancyCodeBuy=Mã kế toán mua hàng ##### Agenda ##### -AgendaSetup=Sự kiện và thiết lập mô-đun chương trình nghị sự -PasswordTogetVCalExport=Key cho phép xuất liên kết +AgendaSetup=Cài đặt module sự kiện và chương trình nghị sự +PasswordTogetVCalExport=Khóa được phép xuất liên kết PastDelayVCalExport=Không xuất dữ liệu sự kiện cũ hơn -AGENDA_USE_EVENT_TYPE=Loại hình sử dụng sự kiện (quản lý vào menu Setup -> từ điển -> Loại sự kiện chương trình) -AGENDA_DEFAULT_FILTER_TYPE=Thiết lập tự động loại sự kiện vào bộ lọc tìm kiếm xem chương trình nghị sự -AGENDA_DEFAULT_FILTER_STATUS=Tự động thiết lập trạng thái này cho các sự kiện vào bộ lọc tìm kiếm xem chương trình nghị sự -AGENDA_DEFAULT_VIEW=Tab mà bạn muốn mở mặc định khi lựa chọn chương trình nghị sự đơn +AGENDA_USE_EVENT_TYPE=Sử dụng loại sự kiện (được quản lý trong menu Cài đặt -> Từ điển -> Loại sự kiện chương trình nghị sự) +AGENDA_DEFAULT_FILTER_TYPE=Thiết lập tự động loại sự kiện này vào khung bộ lọc tìm kiếm chương trình nghị sự +AGENDA_DEFAULT_FILTER_STATUS=Thiết lập tự động trạng thái này cho các sự kiện vào khung bộ lọc tìm kiếm chương trình nghị sự +AGENDA_DEFAULT_VIEW=Tab mà bạn muốn mở mặc định khi lựa chọn menu chương trình nghị sự ##### ClickToDial ##### -ClickToDialDesc=Module này cho phép để thêm một biểu tượng sau khi số điện thoại. Một nhấp chuột vào biểu tượng này sẽ gọi một máy chủ với một địa chỉ URL đặc biệt bạn xác định dưới đây. Điều này có thể được sử dụng để gọi một hệ thống trung tâm cuộc gọi từ Dolibarr có thể gọi số điện thoại trên một hệ thống SIP ví dụ. +ClickToDialDesc=Module này cho phép để thêm một biểu tượng sau số điện thoại. Một nhấp chuột vào biểu tượng này sẽ gọi một máy chủ với một địa chỉ URL đặc biệt bạn xác định dưới đây. Điều này có thể được sử dụng để gọi một hệ thống trung tâm cuộc gọi từ Dolibarr có thể gọi số điện thoại trên một hệ thống SIP như ví dụ. ##### Point Of Sales (CashDesk) ##### CashDesk=Điểm bán hàng -CashDeskSetup=Thiết lập mô-đun Điểm bán hàng -CashDeskThirdPartyForSell=Default generic third party to use for sells +CashDeskSetup=Cài đặt module điểm bán hàng +CashDeskThirdPartyForSell=Bên thứ ba mặc định chung để sử dụng cho Bán 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 (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=Vô hiệu giảm tồn kho khi bán được thực hiện từ Điểm bán hàng (nếu "không", giảm tồn kho được thực hiện đối với mỗi lần bán được thực hiện từ POS, bất cứ cái gì thiết lập tùy chọn trong module tồn kho). +CashDeskIdWareHouse=Buộc và hạn chế kho hàng để sử dụng cho giảm tồn kho +StockDecreaseForPointOfSaleDisabled=Giảm tồn kho từ Điểm bán hàng đã bị vô hiệu +StockDecreaseForPointOfSaleDisabledbyBatch=Giảm tồn kho trong POS thì không tương thích với quản lý lô hàng +CashDeskYouDidNotDisableStockDecease=Bạn không vô hiệu giảm tồn kho khi tạo một lần bán từ Điểm bán hàng. Vì vậy kho hàng thì được yêu cầu ##### Bookmark ##### -BookmarkSetup=Thiết lập mô-đun Bookmark +BookmarkSetup=Cài đặt module Bookmark BookmarkDesc=Module này cho phép bạn quản lý bookmark. Bạn cũng có thể thêm các phím tắt cho bất kỳ trang Dolibarr hoặc các trang web externale trên menu bên trái của bạn. -NbOfBoomarkToShow=Số lượng tối đa các trang đánh dấu để hiển thị trong menu bên trái +NbOfBoomarkToShow=Số lượng tối đa các bookmark để hiển thị trong menu bên trái ##### WebServices ##### -WebServicesSetup=Thiết lập mô-đun webservices +WebServicesSetup=Cài đặt module webservices WebServicesDesc=Bằng cách cho phép mô-đun này, Dolibarr trở thành một máy chủ dịch vụ web để cung cấp dịch vụ web linh tinh. WSDLCanBeDownloadedHere=Các tập tin mô tả WSDL của dịch vụ cung cấp có thể được tải về tại đây EndPointIs=SOAP khách hàng phải gửi yêu cầu tới các thiết bị đầu cuối Dolibarr tại Url ##### Bank ##### -BankSetupModule=Thiết lập mô-đun Ngân hàng -FreeLegalTextOnChequeReceipts=Văn bản miễn phí trên hóa đơn kiểm tra +BankSetupModule=Cài đặt module Ngân hàng +FreeLegalTextOnChequeReceipts=Free text trên biên nhận Séc BankOrderShow=Để hiển thị các tài khoản ngân hàng cho các nước đang sử dụng "số ngân hàng chi tiết" BankOrderGlobal=Chung BankOrderGlobalDesc=Thứ tự hiển thị chung BankOrderES=Tây Ban Nha BankOrderESDesc=Thứ tự hiển thị tiếng Tây Ban Nha ##### Multicompany ##### -MultiCompanySetup=Thiết lập mô-đun Multi-công ty +MultiCompanySetup=Thiết lập mô-đun đa công ty ##### Suppliers ##### 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 +SuppliersCommandModel=Toàn bộ mẫu đơn hàng nhà cung cấp (logo ...) +SuppliersInvoiceModel=Toàn bộ mẫu hóa đơn nhà cung cấp (logo ...) +SuppliersInvoiceNumberingModel=Mô hình đánh số hóa đơn nhà cung cấp +IfSetToYesDontForgetPermission=Nếu chỉnh là có, đừng quên cung cấp phân quyền cho nhóm hoặc người dùng được phép cho duyệt lần hai. ##### 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 -NoteOnPathLocation=Lưu ý rằng chỉ IP của bạn để đất nước tập tin dữ liệu phải được bên trong một thư mục PHP của bạn có thể đọc (Kiểm tra PHP open_basedir cho phép cài đặt và hệ thống tập tin). -YouCanDownloadFreeDatFileTo=Bạn có thể tải về một phiên bản demo miễn phí của tập tin nước MaxMind GeoIP tại%s. -YouCanDownloadAdvancedDatFileTo=Bạn cũng có thể tải về một phiên bản hoàn thiện hơn, với bản cập nhật, các tập tin nước MaxMind GeoIP tại%s. -TestGeoIPResult=Thử nghiệm của một IP chuyển đổi -> nước +GeoIPMaxmindSetup=Cài đặt module GeoIP MaxMind +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 của một chuyển đổi IP -> quốc gia ##### Projects ##### -ProjectsNumberingModules=Dự án đánh số mô-đun -ProjectsSetup=Thiết lập mô-đun dự án -ProjectsModelModule=Dự án báo cáo mô hình tài liệu -TasksNumberingModules=Nhiệm vụ đánh số mô-đun -TaskModelModule=Nhiệm vụ báo cáo mô hình tài liệu +ProjectsNumberingModules=Module đánh số dự án +ProjectsSetup=Cài đặt module dự án +ProjectsModelModule=Kiểu chứng từ báo cáo dự án +TasksNumberingModules=Module đánh số tác vụ +TaskModelModule=Kiểu chứng từ báo cáo tác vụ ##### ECM (GED) ##### -ECMSetup = GED cài đặt +ECMSetup = Cài đặt GED ECMAutoTree = Cây thư mục tự động và tài liệu ##### Fiscal Year ##### FiscalYears=Năm tài chính FiscalYear=Năm tài chính FiscalYearCard=Thẻ năm tài chính NewFiscalYear=Năm tài chính mới -EditFiscalYear=Chỉnh sửa năm tài chính -OpenFiscalYear=Mở cửa năm tài chính +EditFiscalYear=Sửa năm tài chính +OpenFiscalYear=Mở năm tài chính CloseFiscalYear=Đóng năm tài chính DeleteFiscalYear=Xóa năm tài chính -ConfirmDeleteFiscalYear=Bạn chắc chắn muốn xóa năm tài chính này? -Opened=Mở -Closed=Đóng +ConfirmDeleteFiscalYear=Bạn chắc muốn xóa năm tài chính này? +Opened=Đã mở +Closed=Đã đóng AlwaysEditable=Luôn luôn có thể được chỉnh sửa 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 +NbMajMin=Số lượng tối thiểu của các ký tự chữ hoa +NbNumMin=Số lượng tối thiểu của các ký tự số +NbSpeMin=Số lượng tối thiểu của các ký tự đặc biệt +NbIteConsecutive=Tối đa số lặp đi lặp lại cùng một ký tự +NoAmbiCaracAutoGeneration=Không sử dụng các ký tự không rõ ràng ("1", "l", "i", "|", "0", "O") cho thế hệ tự động +SalariesSetup=Cài đặt module lương +SortOrder=Sắp xếp đơn hàng 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. -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 +TypePaymentDesc=0: Loại khách hàng thanh toán 1: Loại nhà cung cấp thanh toán, 2: Loại cả khách hàng và nhà cung cấp thanh toán +IncludePath=Bao gồm các đường dẫn (được xác định vào biến %s) +ExpenseReportsSetup=Cài đặt module báo cáo chi phí +TemplatePDFExpenseReports=Mẫu chứng từ để xuất chứng từ báo cáo chi phí +NoModueToManageStockDecrease=Không có module có thể quản lý tự dộng giảm tồn kho được kích hoạt. Giảm tồn kho sẽ chỉ được thực hiện thủ công. +NoModueToManageStockIncrease=Không có module có thể quản lý tăng tồn kho được kích hoạt. Tăng tồn kho sẽ chỉ được thực hiện thủ công. +YouMayFindNotificationsFeaturesIntoModuleNotification=Bạn có thể thấy tùy chọn cho thông báo Email bằng cách mở và cấu hình module "Thông báo" +ListOfNotificationsPerContact=Danh sách thông báo cho mỗi liên lạc +ListOfFixedNotifications=Danh sách thông báo cố định +GoOntoContactCardToAddMore=Vào tab "Thông báo" của liên hệ bên thứ ba để thêm hoặc bỏ thông báo cho liên lạc/địa chỉ Threshold=Threshold +BackupDumpWizard=Thủ thuật tạo file dump sao lưu dự phòng cơ sở dữ liệu +SomethingMakeInstallFromWebNotPossible=Cài đặt module bên ngoài là không thể từ giao diện web với các lý do sau: +SomethingMakeInstallFromWebNotPossible2=Vì lý do này, quá trình nâng cấp để mô tả ở đây là chỉ là bước thủ công một người dùng có đặc quyền có thể làm. +InstallModuleFromWebHasBeenDisabledByFile=Cài đặt các module bên ngoài từ các ứng dụng đã bị vô hiệu bởi quản trị viên của bạn. Bạn phải yêu cầu ông phải loại bỏ các tập tin %s để cho phép tính năng này. +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" diff --git a/htdocs/langs/vi_VN/banks.lang b/htdocs/langs/vi_VN/banks.lang index 0c65a74d4cb0d..c610b4fe77ebf 100644 --- a/htdocs/langs/vi_VN/banks.lang +++ b/htdocs/langs/vi_VN/banks.lang @@ -163,3 +163,5 @@ LabelRIB=BAN Label NoBANRecord=Không có hồ sơ BAN DeleteARib=Xóa BAN kỷ lục ConfirmDeleteRib=Bạn Bạn có chắc chắn muốn xóa bản ghi BAN này? +StartDate=Start date +EndDate=End date diff --git a/htdocs/langs/vi_VN/bills.lang b/htdocs/langs/vi_VN/bills.lang index 2811dca157174..a0d6d23d9049a 100644 --- a/htdocs/langs/vi_VN/bills.lang +++ b/htdocs/langs/vi_VN/bills.lang @@ -5,299 +5,300 @@ 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ễ +BillsCustomersUnpaidForCompany=Hoá đơn khách hàng chưa thanh toán cho %s +BillsSuppliersUnpaid=Hoá đơn nhà cung cấp chưa thanh toán +BillsSuppliersUnpaidForCompany=Hoá đơn nhà cung cấp chưa thanh toán cho %s +BillsLate=Thanh toán trễ 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 +InvoiceStandard=Hóa đơn chuẩn +InvoiceStandardAsk=Hóa đơn chuẩn InvoiceStandardDesc=Đây là loại hóa đơn là hóa đơn thông thường. -InvoiceDeposit=Hóa đơn tiền gửi -InvoiceDepositAsk=Hóa đơn tiền gửi -InvoiceDepositDesc=Đây là loại hoá đơn được thực hiện khi một khoản tiền gửi đã được nhận. -InvoiceProForma=Proforma hóa đơn -InvoiceProFormaAsk=Proforma hóa đơn -InvoiceProFormaDesc=Proforma hóa đơn là một hình ảnh của một hóa đơn đúng, nhưng không có giá trị kế toán. -InvoiceReplacement=Thay thế hóa đơn -InvoiceReplacementAsk=Thay thế hóa đơn cho hóa đơn -InvoiceReplacementDesc=Thay thế hóa đơn được sử dụng để hủy bỏ và thay thế hoàn toàn một hóa đơn không có thanh toán đã nhận được.

Lưu ý: Chỉ có hoá đơn không có thanh toán trên nó có thể được thay thế. Nếu bạn thay thế hóa đơn chưa khép kín, nó sẽ được tự động đóng cửa để 'bỏ rơi'. -InvoiceAvoir=Ghi nợ -InvoiceAvoirAsk=Ghi nợ cho hóa đơn đúng -InvoiceAvoirDesc=Những lưu ý ghi nợ là một hóa đơn tiêu cực được sử dụng để giải quyết thực tế là một hóa đơn có số tiền đó khác hơn so với số tiền thực sự trả tiền (do khách hàng trả tiền quá nhiều bởi lỗi, hoặc sẽ không được thanh toán hoàn toàn kể từ khi ông quay trở lại một số sản phẩm chẳng hạn). -invoiceAvoirWithLines=Tạo phiếu ghi nợ với dòng từ hoá đơn nguồn gốc -invoiceAvoirWithPaymentRestAmount=Tạo phiếu ghi nợ với còn lại chưa thanh toán của hóa đơn gốc -invoiceAvoirLineWithPaymentRestAmount=Lưu ý cho ghi nợ còn lại chưa thanh toán tiền +InvoiceDeposit=Hóa đơn ứng trước +InvoiceDepositAsk=Hóa đơn ứng trước +InvoiceDepositDesc=Đây là loại hoá đơn được thực hiện khi một khoản tiền ứng trước đã được nhận. +InvoiceProForma=Hóa đơn hình thức +InvoiceProFormaAsk=Hóa đơn hình thức +InvoiceProFormaDesc=Hóa đơn hình thức là một hình ảnh của một hóa đơn thực, nhưng không có giá trị kế toán. +InvoiceReplacement=Hóa đơn thay thế +InvoiceReplacementAsk=Hóa đơn thay thế cho hóa đơn +InvoiceReplacementDesc=Hóa đơn thay thế được sử dụng để hủy bỏ và thay thế hoàn toàn một hóa đơn không có thanh toán đã nhận được.

Ghi chú: Chỉ có hoá đơn không có thanh toán trên nó có thể được thay thế. Nếu bạn thay thế hóa đơn chưa đóng, nó sẽ được tự động đóng để 'bị loại bỏ'. +InvoiceAvoir=Giấy báo có +InvoiceAvoirAsk=Giấy báo có để chỉnh sửa hóa đơn +InvoiceAvoirDesc=Những giấy báo có là một hóa đơn âm được sử dụng để giải quyết thực tế là một hóa đơn có số tiền đó khác hơn so với số tiền thực sự trả tiền (do khách hàng trả tiền quá nhiều bởi lỗi, hoặc sẽ không được thanh toán hoàn toàn kể từ khi anh ta trả lại một số sản phẩm chẳng hạn). +invoiceAvoirWithLines=Tạo Giấy báo có với chi tiết từ hóa đơn gốc +invoiceAvoirWithPaymentRestAmount=Tạo Giấy báo có với phần chưa trả còn lại từ hóa đơn gốc +invoiceAvoirLineWithPaymentRestAmount=Số tiền chưa trả còn lại trên Giấy báo có ReplaceInvoice=Thay thế hóa đơn %s -ReplacementInvoice=Thay thế hóa đơn -ReplacedByInvoice=Thay thế bằng hóa đơn %s -ReplacementByInvoice=Thay thế bằng hóa đơn -CorrectInvoice=Hóa đơn đúng %s -CorrectionInvoice=Chỉnh hóa đơn -UsedByInvoice=Được sử dụng để thanh toán hoá đơn %s -ConsumedBy=Tiêu thụ -NotConsumed=Không tiêu thụ -NoReplacableInvoice=Không có hoá đơn replacable -NoInvoiceToCorrect=Không có hoá đơn để điều chỉnh -InvoiceHasAvoir=Sửa chữa theo một hoặc một số hoá đơn +ReplacementInvoice=Hóa đơn thay thế +ReplacedByInvoice=Được thay bằng hóa đơn %s +ReplacementByInvoice=Được thay bằng hóa đơn +CorrectInvoice=Chỉnh sửa hóa đơn %s +CorrectionInvoice=Chỉnh sửa hóa đơn +UsedByInvoice=Được dùng để thanh toán hoá đơn %s +ConsumedBy=Được tiêu thụ bởi +NotConsumed=Không được tiêu thụ +NoReplacableInvoice=Không có hóa đơn có thể thay thế +NoInvoiceToCorrect=Không có hoá đơn để chỉnh sửa +InvoiceHasAvoir=Được chỉnh sửa bởi một hoặc một số hóa đơn CardBill=Thẻ hóa đơn -PredefinedInvoices=Hoá đơn được xác định trước +PredefinedInvoices=Hoá đơn định sẵn Invoice=Hoá đơn Invoices=Hoá đơn -InvoiceLine=Đường hóa đơn -InvoiceCustomer=Hóa đơn của khách hàng -CustomerInvoice=Hóa đơn của khách hàng -CustomersInvoices=Khách hàng hoá đơn -SupplierInvoice=Nhà cung cấp hóa đơn -SuppliersInvoices=Nhà cung cấp hoá đơn -SupplierBill=Nhà cung cấp hóa đơn -SupplierBills=các nhà cung cấp hoá đơn +InvoiceLine=Dòng hóa đơn +InvoiceCustomer=Hóa đơn khách hàng +CustomerInvoice=Hóa đơn khách hàng +CustomersInvoices=Hóa đơn khách hàng +SupplierInvoice=Hóa đơn nhà cung cấp +SuppliersInvoices=Hóa đơn nhà cung cấp +SupplierBill=Hóa đơn nhà cung cấp +SupplierBills=Hóa đơn nhà cung cấp Payment=Thanh toán -PaymentBack=Lại thanh toán +PaymentBack=Thanh toán lại Payments=Thanh toán PaymentsBack=Thanh toán lại -PaidBack=Trả lại +PaidBack=Đã trả lại DatePayment=Ngày thanh toán DeletePayment=Xóa thanh toán -ConfirmDeletePayment=Bạn Bạn có chắc chắn muốn xóa thanh toán này? -ConfirmConvertToReduc=Bạn có muốn chuyển đổi giấy báo này hoặc khoản đặt cọc vào một giảm giá tuyệt đối?
Số lượng như vậy sẽ được lưu trong số tất cả giảm giá và có thể được sử dụng như giảm giá cho một hiện tại hoặc tương lai hóa đơn cho khách hàng này. -SupplierPayments=Nhà cung cấp các khoản thanh toán -ReceivedPayments=Khoản tiền nhận được -ReceivedCustomersPayments=Khoản tiền nhận được từ khách hàng -PayedSuppliersPayments=Thanh toán payed để nhà cung cấp -ReceivedCustomersPaymentsToValid=Nhận được khoản thanh toán cho khách hàng để xác nhận -PaymentsReportsForYear=Báo cáo thanh toán cho%s -PaymentsReports=Thanh toán báo cáo -PaymentsAlreadyDone=Thanh toán đã được thực hiện -PaymentsBackAlreadyDone=Thanh toán đã được thực hiện trở lại +ConfirmDeletePayment=Bạn có chắc muốn xóa thanh toán này ? +ConfirmConvertToReduc=Bạn có muốn chuyển đổi giấy báo có này hoặc khoản ứng trước vào một giảm giá theo số tiền ?
Số tiền này sẽ được lưu trong số tất cả giảm giá và có thể được sử dụng như giảm giá cho một hóa đơn hiện tại hoặc tương lai cho khách hàng này. +SupplierPayments=Nhà cung cấp thanh toán +ReceivedPayments=Đã nhận thanh toán +ReceivedCustomersPayments=Thanh toán đã nhận được từ khách hàng +PayedSuppliersPayments=Thanh toán đã trả cho nhà cung cấp +ReceivedCustomersPaymentsToValid=Đã nhận thanh toán khách hàng để xác nhận +PaymentsReportsForYear=Báo cáo thanh toán cho %s +PaymentsReports=Báo cáo thanh toán +PaymentsAlreadyDone=Đã thanh toán +PaymentsBackAlreadyDone=Đã thanh toán lại PaymentRule=Quy tắc thanh toán -PaymentMode=Phương thức thanh toán +PaymentMode=Loại thanh toán PaymentTerm=Điều khoản thanh toán PaymentConditions=Điều khoản thanh toán -PaymentConditionsShort=Payment terms +PaymentConditionsShort=Điều khoản thanh toán 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ả -HelpPaymentHigherThanReminderToPay=Chú ý, số tiền thanh toán của một hoặc nhiều hóa đơn là cao hơn so với phần còn lại để trả tiền.
Chỉnh sửa mục nhập của bạn, nếu không xác nhận và suy nghĩ về việc tạo ra một giấy báo có của dư thừa nhận được cho mỗi hoá đơn đã nộp thừa. -HelpPaymentHigherThanReminderToPaySupplier=Chú ý, số tiền thanh toán của một hoặc nhiều hóa đơn là cao hơn so với phần còn lại để trả tiền.
Chỉnh sửa mục nhập của bạn, nếu không xác nhận. -ClassifyPaid=Phân loại 'trả tiền' -ClassifyPaidPartially=Phân loại 'trả một phần' -ClassifyCanceled=Phân loại 'bỏ rơi' -ClassifyClosed=Phân loại 'Đóng' -ClassifyUnBilled=Phân loại 'chưa lập hoá đơn' +PaymentHigherThanReminderToPay=Thanh toán cao hơn so với đề nghị trả +HelpPaymentHigherThanReminderToPay=Chú ý, số tiền thanh toán của một hoặc nhiều hóa đơn là cao hơn so với phần còn lại để trả.
Chỉnh sửa mục nhập của bạn, nếu không xác nhận và suy nghĩ về việc tạo ra một giấy báo có của phần dư nhận được cho mỗi hoá đơn đã nộp dư. +HelpPaymentHigherThanReminderToPaySupplier=Chú ý, số tiền thanh toán của một hoặc nhiều hóa đơn là cao hơn so với phần còn lại để trả tiền.
Sửa mục nhập của bạn, nếu không xác nhận. +ClassifyPaid=Phân loại 'Đã trả' +ClassifyPaidPartially=Phân loại 'Đã trả một phần' +ClassifyCanceled=Phân loại 'Đã loại bỏ' +ClassifyClosed=Phân loại 'Đã đóng' +ClassifyUnBilled=Phân loại 'chưa ra hoá đơn' CreateBill=Tạo hóa đơn -AddBill=Tạo hóa đơn hoặc ghi nợ lưu ý -AddToDraftInvoices=Thêm vào dự thảo hóa đơn +AddBill=Tạo hóa đơn hoặc giấy báo có +AddToDraftInvoices=Thêm vào hóa đơn dự thảo DeleteBill=Xóa hóa đơn -SearchACustomerInvoice=Tìm kiếm một hóa đơn của khách hàng -SearchASupplierInvoice=Tìm kiếm một nhà cung cấp hóa đơn -CancelBill=Hủy bỏ một hóa đơn -SendRemindByMail=Gửi lời nhắc nhở bằng thư điện tử +SearchACustomerInvoice=Tìm kiếm một hóa đơn khách hàng +SearchASupplierInvoice=Tìm kiếm một hóa đơn nhà cung cấp +CancelBill=Hủy hóa đơn +SendRemindByMail=Gửi nhắc nhở bằng email DoPayment=Thực hiện thanh toán DoPaymentBack=Thực hiện thanh toán lại ConvertToReduc=Chuyển đổi thành giảm giá trong tương lai -EnterPaymentReceivedFromCustomer=Nhập thanh toán nhận được từ khách hàng +EnterPaymentReceivedFromCustomer=Nhập thanh toán đã nhận được từ khách hàng EnterPaymentDueToCustomer=Thực hiện thanh toán do khách hàng -DisabledBecauseRemainderToPayIsZero=Vô hiệu hóa bởi vì còn lại chưa thanh toán là số không +DisabledBecauseRemainderToPayIsZero=Vô hiệu hóa bởi vì phần chưa thanh toán còn lại là bằng 0 Amount=Số tiền PriceBase=Giá cơ sở -BillStatus=Tình trạng hóa đơn -BillStatusDraft=Dự thảo (cần phải được xác nhận) -BillStatusPaid=Trả -BillStatusPaidBackOrConverted=Trả tiền hoặc chuyển đổi thành giảm giá -BillStatusConverted=Trả (sẵn sàng cho hóa đơn cuối cùng) -BillStatusCanceled=Bị bỏ rơi -BillStatusValidated=Xác nhận (cần phải được thanh toán) -BillStatusStarted=Bắt đầu -BillStatusNotPaid=Không trả tiền -BillStatusClosedUnpaid=Đóng (chưa thanh toán) -BillStatusClosedPaidPartially=Trả tiền (một phần) +BillStatus=Trạng thái hóa đơn +BillStatusDraft=Dự thảo (cần được xác nhận) +BillStatusPaid=Đã trả +BillStatusPaidBackOrConverted=Đã trả hoặc đã chuyển thành giảm giá +BillStatusConverted=Đã trả (sẵn sàng cho hóa đơn cuối cùng) +BillStatusCanceled=Đã loại bỏ +BillStatusValidated=Đã xác nhận (cần được thanh toán) +BillStatusStarted=Đã bắt đầu +BillStatusNotPaid=Chưa trả +BillStatusClosedUnpaid=Đã đóng (chưa trả) +BillStatusClosedPaidPartially=Đã trả (một phần) BillShortStatusDraft=Dự thảo -BillShortStatusPaid=Trả -BillShortStatusPaidBackOrConverted=Xử lý -BillShortStatusConverted=Xử lý -BillShortStatusCanceled=Bị bỏ rơi -BillShortStatusValidated=Xác nhận -BillShortStatusStarted=Bắt đầu -BillShortStatusNotPaid=Không trả tiền -BillShortStatusClosedUnpaid=Đóng -BillShortStatusClosedPaidPartially=Trả tiền (một phần) +BillShortStatusPaid=Đã trả +BillShortStatusPaidBackOrConverted=Đã xử lý +BillShortStatusConverted=Đã xử lý +BillShortStatusCanceled=Đã loại bỏ +BillShortStatusValidated=Đã xác nhận +BillShortStatusStarted=Đã bắt đầu +BillShortStatusNotPaid=Chưa trả +BillShortStatusClosedUnpaid=Đã đóng +BillShortStatusClosedPaidPartially=Đã trả (một phần) PaymentStatusToValidShort=Để xác nhận -ErrorVATIntraNotConfigured=Số thuế GTGT Intracommunautary chưa được xác định -ErrorNoPaiementModeConfigured=Không có phương thức thanh toán mặc định được xác định. Tới hóa đơn thiết lập mô-đun để sửa lỗi này. -ErrorCreateBankAccount=Tạo một tài khoản ngân hàng, sau đó đi vào bảng cài đặt của mô-đun hóa đơn để xác định phương thức thanh toán +ErrorVATIntraNotConfigured=Số thuế VAT Intracommunautary chưa được xác định +ErrorNoPaiementModeConfigured=Không có chế độ thanh toán mặc định được xác định. Tới phần thiết lập mô-đun hóa đơn để sửa lỗi này. +ErrorCreateBankAccount=Tạo một tài khoản ngân hàng, sau đó đi vào bảng Thiết lập của mô-đun hóa đơn để xác định chế độ thanh toán ErrorBillNotFound=Hoá đơn %s không tồn tại -ErrorInvoiceAlreadyReplaced=Lỗi, bạn cố gắng để xác nhận một hóa đơn để thay thế hóa đơn%s. Nhưng điều này đã được thay thế bằng hóa đơn%s. +ErrorInvoiceAlreadyReplaced=Lỗi, bạn cố gắng để xác nhận một hóa đơn để thay thế hóa đơn %s. Nhưng hóa đơn này đã được thay thế bằng hóa đơn %s. ErrorDiscountAlreadyUsed=Lỗi, giảm giá đã được sử dụng -ErrorInvoiceAvoirMustBeNegative=Lỗi, hóa đơn đúng phải có một số tiêu cực -ErrorInvoiceOfThisTypeMustBePositive=Lỗi, loại hóa đơn phải có một số lượng tích cực +ErrorInvoiceAvoirMustBeNegative=Lỗi, chỉnh sửa hóa đơn phải có một số tiền âm. +ErrorInvoiceOfThisTypeMustBePositive=Lỗi, hóa đơn loại này phải có một số tiền dương ErrorCantCancelIfReplacementInvoiceNotValidated=Lỗi, không thể hủy bỏ một hóa đơn đã được thay thế bằng hóa đơn khác mà vẫn còn trong tình trạng dự thảo BillFrom=Từ -BillTo=Để -ActionsOnBill=Hoạt động trên hoá đơn +BillTo=Đến +ActionsOnBill=Hành động trên hoá đơn NewBill=Hóa đơn mới -LastBills=Hoá đơn cuối %s -LastCustomersBills=Cuối% của hoá đơn cho khách hàng -LastSuppliersBills=Cuối%s nhà cung cấp hoá đơn +LastBills=%s hóa đơn cuối +LastCustomersBills=%s hoá đơn khách hàng cuối +LastSuppliersBills=%s hóa đơn nhà cung cấp cuối AllBills=Tất cả hóa đơn OtherBills=Hoá đơn khác -DraftBills=Dự thảo hoá đơn -CustomersDraftInvoices=Khách hàng soạn thảo hoá đơn -SuppliersDraftInvoices=Nhà cung cấp dự thảo hoá đơn -Unpaid=Chưa thanh toán -ConfirmDeleteBill=Bạn Bạn có chắc chắn muốn xóa hóa đơn này? -ConfirmValidateBill=Bạn có chắc chắn bạn muốn xác nhận hóa đơn này với tham chiếu %s ? -ConfirmUnvalidateBill=Bạn có chắc chắn bạn muốn thay đổi hóa đơn %s để soạn thảo trạng thái? -ConfirmClassifyPaidBill=Bạn có chắc chắn bạn muốn thay đổi hóa đơn %s đến tình trạng thanh toán? -ConfirmCancelBill=Bạn có chắc chắn bạn muốn hủy bỏ hóa đơn %s ? -ConfirmCancelBillQuestion=Tại sao bạn muốn để phân loại hóa đơn này 'bỏ rơi'? -ConfirmClassifyPaidPartially=Bạn có chắc chắn bạn muốn thay đổi hóa đơn %s đến tình trạng thanh toán? -ConfirmClassifyPaidPartiallyQuestion=Hoá đơn này chưa được thanh toán hoàn toàn. Lý do để bạn có thể đóng hóa đơn này là gì? -ConfirmClassifyPaidPartiallyReasonAvoir=Còn lại chưa thanh toán (%s %s) là giảm giá cấp vì khoản thanh toán đã được thực hiện trước thời hạn. Tôi làm đúng luật thuế GTGT với một ghi chú ghi nợ. -ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Còn lại chưa thanh toán (%s %s) là giảm giá cấp vì thanh toán đã được thực hiện trước thời hạn. Tôi chấp nhận để mất thuế GTGT đối với giảm giá này. -ConfirmClassifyPaidPartiallyReasonDiscountVat=Còn lại chưa thanh toán (%s %s) là giảm giá cấp vì thanh toán đã được thực hiện trước thời hạn. Tôi thu hồi thuế GTGT đối với giảm giá này mà không có một ghi chú ghi nợ. +DraftBills=Hóa đơn dự thảo +CustomersDraftInvoices=Hóa đơn khách hàng dự thảo +SuppliersDraftInvoices=Hóa đơn nhà cung cấp dự thảo +Unpaid=Chưa trả +ConfirmDeleteBill=Bạn có chắc muốn xóa hóa đơn này ? +ConfirmValidateBill=Bạn có chắc muốn xác nhận hóa đơn này với tham chiếu %s ? +ConfirmUnvalidateBill=Bạn có chắc muốn thay đổi hóa đơn %s sang trạng thái dự thảo ? +ConfirmClassifyPaidBill=Bạn có chắc muốn thay đổi hóa đơn %s sang trạng thái đã trả ? +ConfirmCancelBill=Bạn có chắc muốn hủy hóa đơn %s ? +ConfirmCancelBillQuestion=Tại sao bạn muốn phân loại hóa đơn này là 'Đã loại bỏ'? +ConfirmClassifyPaidPartially=Bạn có chắc muốn thay đổi hóa đơn %s sang trạng thái đã trả ? +ConfirmClassifyPaidPartiallyQuestion=Hoá đơn này chưa được trả hoàn toàn. Lý do gì để bạn đóng hóa đơn này ? +ConfirmClassifyPaidPartiallyReasonAvoir=Phần chưa trả còn lại (%s %s) là giảm giá đã gán vì khoản thanh toán đã được thực hiện trước thời hạn. Tôi hợp thức VAT với giấy báo có +ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Phần chưa trả còn lại (%s %s) là giảm giá đã gán vì thanh toán đã được thực hiện trước thời hạn. Tôi chấp nhận mất thuế VAT trên giảm giá này. +ConfirmClassifyPaidPartiallyReasonDiscountVat=Phần chưa thanh trả còn lại (%s %s) là giảm giá được cấp vì thanh toán đã được thực hiện trước thời hạn. Tôi thu hồi thuế VAT đối với giảm giá này mà không có một giấy báo có. ConfirmClassifyPaidPartiallyReasonBadCustomer=Khách hàng xấu -ConfirmClassifyPaidPartiallyReasonProductReturned=Sản phẩm trả lại một phần -ConfirmClassifyPaidPartiallyReasonOther=Số tiền bị bỏ rơi vì lý do khác -ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Sự lựa chọn này là có thể nếu hóa đơn của bạn đã được cung cấp với bình luận phù hợp. (Ví dụ «Chỉ có thuế tương ứng với mức giá mà đã được thực tế phải trả cho quyền khấu trừ») -ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Ở một số nước, sự lựa chọn này có thể là có thể chỉ khi hóa đơn của bạn có đúng ý. -ConfirmClassifyPaidPartiallyReasonAvoirDesc=Sử dụng lựa chọn này nếu tất cả các khác không phù hợp với +ConfirmClassifyPaidPartiallyReasonProductReturned=Sản phẩm đã trả lại một phần +ConfirmClassifyPaidPartiallyReasonOther=Số tiền đã bị loại bỏ cho lý do khác +ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Sự lựa chọn này là có thể nếu hóa đơn của bạn đã được cung cấp với ghi chú phù hợp. (Ví dụ «Chỉ có thuế tương ứng với mức giá mà đã được trả thực tế thì có quyền khấu trừ») +ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Ở một số nước, sự lựa chọn này là có thể chỉ khi hóa đơn của bạn chứa ghi chú chỉnh sửa. +ConfirmClassifyPaidPartiallyReasonAvoirDesc=Sử dụng lựa chọn này nếu tất cả các khác không phù hợp ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Một khách hàng xấu là một khách hàng mà từ chối trả nợ của mình. ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Lựa chọn này được sử dụng khi thanh toán không đầy đủ vì một số sản phẩm đã được trả lại -ConfirmClassifyPaidPartiallyReasonOtherDesc=Sử dụng lựa chọn này nếu tất cả các khác không phù hợp, ví dụ như trong tình huống sau đây:
- Thanh toán không hoàn thành vì một số sản phẩm được vận chuyển trở lại
- Số tiền đòi quá quan trọng bởi vì giảm giá bị lãng quên
Trong mọi trường hợp, số tiền trên, tuyên bố phải được sửa chữa trong hệ thống kế toán bằng cách tạo ra một lưu ý ghi nợ. +ConfirmClassifyPaidPartiallyReasonOtherDesc=Sử dụng lựa chọn này nếu tất cả các khác không phù hợp, ví dụ như trong tình huống sau đây:
- Thanh toán không hoàn thành vì một số sản phẩm được vận chuyển trở lại
- Số tiền đòi quá lớn bởi vì quên giảm giá
Trong mọi trường hợp, số tiền đòi vượt phải được chính sửa trong hệ thống kế toán bằng cách tạo ra một giấy báo có. ConfirmClassifyAbandonReasonOther=Khác ConfirmClassifyAbandonReasonOtherDesc=Lựa chọn này sẽ được sử dụng trong tất cả các trường hợp khác. Ví dụ bởi vì bạn có kế hoạch để tạo ra một hóa đơn thay thế. ConfirmCustomerPayment=Bạn có xác nhận đầu vào thanh toán này cho %s %s ? -ConfirmSupplierPayment=Bạn có xác nhận đầu vào thanh toán này cho %s %s ? -ConfirmValidatePayment=Bạn có chắc chắn bạn muốn xác nhận thanh toán này? Không có thay đổi có thể được thực hiện một lần thanh toán được xác nhận. +ConfirmSupplierPayment=Bạn có xác nhận khoản thanh toán đầu vào này cho %s %s ? +ConfirmValidatePayment=Bạn có chắc muốn xác nhận thanh toán này? Không thay đổi nào được thực hiện một khi thanh toán đã được xác nhận. ValidateBill=Xác nhận hóa đơn -UnvalidateBill=Hóa đơn Unvalidate -NumberOfBills=Nb hoá đơn -NumberOfBillsByMonth=Nb hoá đơn theo tháng +UnvalidateBill=Chưa xác nhận hóa đơn +NumberOfBills=Nb của hoá đơn +NumberOfBillsByMonth=Nb của hoá đơn theo tháng AmountOfBills=Số tiền của hóa đơn -AmountOfBillsByMonthHT=Số tiền của hóa đơn theo tháng (sau thuế) +AmountOfBillsByMonthHT=Số tiền của hóa đơn theo tháng (có thuế) ShowSocialContribution=Hiển thị đóng góp xã hội -ShowBill=Hiện hóa đơn -ShowInvoice=Hiện hóa đơn -ShowInvoiceReplace=Hiển thị thay thế hóa đơn -ShowInvoiceAvoir=Xem tin ghi nợ -ShowInvoiceDeposit=Hiện tiền gửi hóa đơn -ShowPayment=Hiện thanh toán +ShowBill=Hiện thị hóa đơn +ShowInvoice=Hiển thị hóa đơn +ShowInvoiceReplace=Hiển thị hóa đơn thay thế +ShowInvoiceAvoir=Xem giấy báo có +ShowInvoiceDeposit=Hiển thị hóa đơn ứng trước +ShowPayment=Hiển thị thanh toán File=Tập tin -AlreadyPaid=Đã thanh toán -AlreadyPaidBack=Đã thanh toán lại -AlreadyPaidNoCreditNotesNoDeposits=Đã thanh toán (không có ghi chú ghi nợ và tiền gửi) -Abandoned=Bị bỏ rơi -RemainderToPay=Còn lại chưa thanh toán -RemainderToTake=Số tiền còn lại để mất +AlreadyPaid=Đã trả +AlreadyPaidBack=Đã trả lại +AlreadyPaidNoCreditNotesNoDeposits=Đã trả (không có giấy báo có hoặc ứng trước) +Abandoned=Đã loại bỏ +RemainderToPay=Chưa trả còn lại +RemainderToTake=Số tiền còn lại để lấy RemainderToPayBack=Số tiền còn lại để trả lại -Rest=Cấp phát -AmountExpected=Số tiền tuyên bố -ExcessReceived=Dư thừa đã nhận -EscompteOffered=Giảm giá cung cấp (thanh toán trước hạn) -SendBillRef=Trình hóa đơn%s -SendReminderBillRef=Trình hóa đơn%s (nhắc nhở) -StandingOrders=Đứng đơn đặt hàng -StandingOrder=Lệnh chuyển tiền định -NoDraftBills=Không có dự thảo hoá đơn -NoOtherDraftBills=Không có dự thảo hoá đơn khác -NoDraftInvoices=Không có dự thảo hoá đơn -RefBill=Ref hóa đơn -ToBill=Vào hóa đơn -RemainderToBill=Còn lại vào hóa đơn +Rest=Chờ xử lý +AmountExpected=Số tiền đã đòi +ExcessReceived=Số dư đã nhận +EscompteOffered=Giảm giá được tặng (thanh toán trước hạn) +SendBillRef=Nộp hóa đơn %s +SendReminderBillRef=Nộp hóa đơn %s (nhắc nhở) +StandingOrders=Ủy nhiệm chi +StandingOrder=Ủy nhiệm chi +NoDraftBills=Không có hóa đơn dự thảo +NoOtherDraftBills=Không có hóa đơn dự thảo khác +NoDraftInvoices=Không có hóa đơn dự thảo +RefBill=Hóa đơn tham chiếu +ToBill=Để ra hóa đơn +RemainderToBill=Nhắc nhở ra hóa đơn SendBillByMail=Gửi hóa đơn qua email -SendReminderBillByMail=Gửi lời nhắc nhở bằng email -RelatedCommercialProposals=Các đề xuất liên quan đến thương mại -MenuToValid=Để hợp lệ -DateMaxPayment=Thanh toán do trước -DateEcheance=Giới hạn thời hạn +SendReminderBillByMail=Gửi nhắc nhở bằng email +RelatedCommercialProposals=Đơn hàng đề xuất liên quan +MenuToValid=Để xác nhận +DateMaxPayment=Thoánh toán trước hạn +DateEcheance=Ngày đáo hạn DateInvoice=Ngày hóa đơn NoInvoice=Không có hoá đơn ClassifyBill=Phân loại hóa đơn -SupplierBillsToPay=Nhà cung cấp hoá đơn thanh toán -CustomerBillsUnpaid=Hóa đơn khách hàng chưa thanh toán -DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters +SupplierBillsToPay=Hóa đơn nhà cung cấp để trả +CustomerBillsUnpaid=Hóa đơn khách hàng chưa trả +DispenseMontantLettres=Các hoá đơn được viết thông qua các thủ tục mecanographic được phân chia theo thứ tự chữ cái NonPercuRecuperable=Không thể thu hồi -SetConditions=Thiết lập các điều khoản thanh toán -SetMode=Đặt chế độ thanh toán -Billed=Hóa đơn +SetConditions=Thiết lập điều khoản thanh toán +SetMode=Thiết lập chế độ thanh toán +Billed=Đã ra hóa đơn RepeatableInvoice=Hóa đơn mẫu RepeatableInvoices=Hoá đơn mẫu -Repeatable=Template -Repeatables=Templates -ChangeIntoRepeatableInvoice=Chuyển đổi thành mẫu hóa đơn -CreateRepeatableInvoice=Tạo mẫu hóa đơn -CreateFromRepeatableInvoice=Tạo ra từ mẫu hóa đơn -CustomersInvoicesAndInvoiceLines=Hoá đơn của khách hàng và dòng hóa đơn của -CustomersInvoicesAndPayments=Hoá đơn và các khoản thanh toán của khách hàng -ExportDataset_invoice_1=Hóa đơn khách hàng danh sách và đường hóa đơn của -ExportDataset_invoice_2=Hoá đơn và các khoản thanh toán của khách hàng -ProformaBill=Proforma Bill: -Reduction=Giảm -ReductionShort=Reduc. -Reductions=Giảm -ReductionsShort=Reduc. +Repeatable=Mẫu +Repeatables=Mẫu +ChangeIntoRepeatableInvoice=Chuyển đổi thành hóa đơn mẫu +CreateRepeatableInvoice=Tạo hóa đơn mẫu +CreateFromRepeatableInvoice=Tạo từ hóa đơn mẫu +CustomersInvoicesAndInvoiceLines=Hoá đơn khách hàng và chi tiết hóa đơn +CustomersInvoicesAndPayments=Hóa đơn khách hàng và thanh toán +ExportDataset_invoice_1=Danh sách hóa đơn khách hàng và chi tiết hóa đơn +ExportDataset_invoice_2=Hóa đơn khách hàng và thanh toán +ProformaBill=Ra hóa đơn hình thức: +Reduction=Khấu trừ +ReductionShort=Khấu trừ +Reductions=Khấu trừ +ReductionsShort=Khấu trừ Discount=Giảm giá Discounts=Giảm giá AddDiscount=Tạo giảm giá -AddRelativeDiscount=Tạo giảm giá tương đối -EditRelativeDiscount=Chỉnh sửa giảm giá tương đối -AddGlobalDiscount=Tạo giảm tuyệt đối -EditGlobalDiscounts=Chỉnh sửa giảm giá tuyệt đối -AddCreditNote=Tạo ghi chú ghi nợ -ShowDiscount=Hiện giảm giá -ShowReduc=Các khấu trừ -RelativeDiscount=Giảm tương đối -GlobalDiscount=Giảm giá toàn cầu -CreditNote=Ghi nợ -CreditNotes=Ghi nợ -Deposit=Tiền đặt cọc -Deposits=Tiền gửi -DiscountFromCreditNote=Giảm giá từ giấy báo %s -DiscountFromDeposit=Thanh toán từ hóa đơn tiền gửi %s -AbsoluteDiscountUse=Đây là loại ghi nợ có thể được sử dụng trên hóa đơn trước khi xác nhận nó -CreditNoteDepositUse=Hóa đơn phải được xác nhận để sử dụng vị vua này ghi nợ -NewGlobalDiscount=Giảm giá mới tuyệt đối -NewRelativeDiscount=Giảm giá mới tương đối -NoteReason=Lưu ý / Lý do +AddRelativeDiscount=Tạo giảm giá theo % +EditRelativeDiscount=Sửa giảm giá theo % +AddGlobalDiscount=Tạo giảm giá theo số tiền +EditGlobalDiscounts=Sửa giảm giá theo số tiền +AddCreditNote=Tạo giấy báo có +ShowDiscount=Hiển thị giảm giá +ShowReduc=Hiển thị khoản khấu trừ +RelativeDiscount=Giảm theo % +GlobalDiscount=Giảm giá toàn cục +CreditNote=Giấy báo có +CreditNotes=Giấy báo có +Deposit=Ứng trước +Deposits=Ứng trước +DiscountFromCreditNote=Giảm giá từ giấy báo có %s +DiscountFromDeposit=Thanh toán từ hóa đơn ứng trước %s +AbsoluteDiscountUse=Đây là loại giấy báo có được sử dụng trên hóa đơn trước khi xác nhận +CreditNoteDepositUse=Hóa đơn phải được xác nhận để sử dụng loại tín dụng này +NewGlobalDiscount=Tạo giảm giá theo số tiền +NewRelativeDiscount=Tạo giảm giá theo % +NoteReason=Ghi chú/Lý do ReasonDiscount=Lý do -DiscountOfferedBy=Do -DiscountStillRemaining=Giảm giá vẫn còn lại -DiscountAlreadyCounted=Giảm giá đã tính -BillAddress=Địa chỉ hóa đơn -HelpEscompte=Giảm giá này là giảm giá dành cho các khách hàng thanh toán bởi vì nó đã được thực hiện trước thời hạn. -HelpAbandonBadCustomer=Số tiền này đã bị bỏ rơi (khách hàng cho là một khách hàng xấu) và được coi là một ngoại lệ lỏng lẻo. -HelpAbandonOther=Số tiền này đã bị bỏ rơi vì đó là một lỗi (khách hàng sai hoặc hóa đơn thay thế bằng một ví dụ khác) -IdSocialContribution=Xã hội đóng góp id -PaymentId=Id thanh toán -InvoiceId=Id hóa đơn -InvoiceRef=Ref hóa đơn. +DiscountOfferedBy=Được cấp bởi +DiscountStillRemaining=Giảm giá vẫn còn hiệu lực +DiscountAlreadyCounted=Giảm giá đã được tính +BillAddress=Địa chỉ ra hóa đơn +HelpEscompte=Giảm giá này được cấp cho các khách hàng bởi vì thanh toán của nó đã được thực hiện trước thời hạn. +HelpAbandonBadCustomer=Số tiền này đã bị loại bỏ (khách hàng được cho là một khách hàng xấu) và được coi là một ngoại lệ . +HelpAbandonOther=Số tiền này đã bị loại bỏ vì đó là một lỗi (ví dụ khách hàng sai hoặc hóa đơn được thay thế bằng hóa đơn khác) +IdSocialContribution=ID đóng góp xã hội +PaymentId=ID thanh toán +InvoiceId=ID hóa đơn +InvoiceRef=Hóa đơn tham chiếu InvoiceDateCreation=Ngày tạo hóa đơn InvoiceStatus=Tình trạng hóa đơn -InvoiceNote=Lưu ý hóa đơn -InvoicePaid=Hoá đơn thanh toán +InvoiceNote=Ghi chú hóa đơn +InvoicePaid=Hóa đơn đã trả PaymentNumber=Số thanh toán RemoveDiscount=Hủy bỏ giảm giá -WatermarkOnDraftBill=Watermark về dự thảo hoá đơn (không có gì nếu trống) -InvoiceNotChecked=Không có hoá đơn được lựa chọn -CloneInvoice=Hóa đơn sao chép -ConfirmCloneInvoice=Bạn có chắc chắn bạn muốn nhân bản hóa đơn này %s ? +WatermarkOnDraftBill=Watermark trên hóa đơn dự thảo (không có gì nếu trống) +InvoiceNotChecked=Không có hoá đơn được chọn +CloneInvoice=Nhân bản hóa đơn +ConfirmCloneInvoice=Bạn có chắc muốn nhân bản hóa đơn này %s ? DisabledBecauseReplacedInvoice=Hành động vô hiệu hóa vì hóa đơn đã được thay thế -DescTaxAndDividendsArea=Khu vực này trình bày một bản tóm tắt của tất cả các khoản thanh toán cho các chi phí đặc biệt. Hồ sơ chỉ với thanh toán trong năm cố định được bao gồm ở đây. -NbOfPayments=Nb thanh toán -SplitDiscount=Tách chiết khấu trong hai -ConfirmSplitDiscount=Bạn có chắc chắn bạn muốn chia giảm giá này của %s %s thành 2 giảm giá thấp hơn? -TypeAmountOfEachNewDiscount=Số lượng đầu vào cho mỗi hai phần: +DescTaxAndDividendsArea=Khu vực này trình bày một bản tóm tắt của tất cả các khoản thanh toán cho các chi phí đặc biệt. Chỉ có những hồ sơ mà thanh toán trong năm cố định được bao gồm ở đây. +NbOfPayments=Nb của thanh toán +SplitDiscount=Tách chiết khấu thành 2 +ConfirmSplitDiscount=Bạn có chắc muốn tách giảm giá này của %s %s thành 2 giảm giá thấp hơn ? +TypeAmountOfEachNewDiscount=Số tiền đầu vào cho mỗi hai phần: TotalOfTwoDiscountMustEqualsOriginal=Tổng của hai giảm giá mới phải bằng số tiền giảm giá ban đầu. -ConfirmRemoveDiscount=Bạn có chắc là bạn muốn loại bỏ giảm giá này? +ConfirmRemoveDiscount=Bạn có chắc muốn xóa 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 +RelatedCustomerInvoices=Hóa đơn khách hàng liên quan +RelatedSupplierInvoices=Hóa đơn nhà cung cấp liên quan +LatestRelatedBill=Hóa đơn liên quan mới nhất WarningBillExist=Cảnh báo, một hoặc nhiều hóa đơn đã tồn tại +MergingPDFTool=Công cụ sáp nhập PDF # PaymentConditions PaymentConditionShortRECEP=Ngay lập tức @@ -310,124 +311,124 @@ PaymentConditionShort60D=60 ngày PaymentCondition60D=60 ngày PaymentConditionShort60DENDMONTH=60 ngày cuối tháng PaymentCondition60DENDMONTH=60 ngày cuối tháng -PaymentConditionShortPT_DELIVERY=Giao hàng tận nơi -PaymentConditionPT_DELIVERY=Ngày giao hàng -PaymentConditionShortPT_ORDER=Theo lệnh -PaymentConditionPT_ORDER=Theo lệnh +PaymentConditionShortPT_DELIVERY=Giao hàng +PaymentConditionPT_DELIVERY=Đang giao hàng +PaymentConditionShortPT_ORDER=Trên đơn hàng +PaymentConditionPT_ORDER=Trên đơn hàng PaymentConditionShortPT_5050=50-50 -PaymentConditionPT_5050=50%% trước, 50%% khi giao hàng -FixAmount=Số tiền sửa chữa -VarAmount=Số lượng biến (%% tot.) +PaymentConditionPT_5050=50%% trả trước, 50%% trả khi giao hàng +FixAmount=Số tiền cố định +VarAmount=Số tiền thay đổi (%% tot.) # PaymentType PaymentTypeVIR=Tiền gửi ngân hàng PaymentTypeShortVIR=Tiền gửi ngân hàng -PaymentTypePRE=Để Ngân hàng -PaymentTypeShortPRE=Để Ngân hàng -PaymentTypeLIQ=Tiền -PaymentTypeShortLIQ=Tiền -PaymentTypeCB=Thẻ ghi nợ -PaymentTypeShortCB=Thẻ ghi nợ -PaymentTypeCHQ=Kiểm tra -PaymentTypeShortCHQ=Kiểm tra +PaymentTypePRE=Lệnh gửi ngân hàng +PaymentTypeShortPRE=Lệnh gửi ngân hàng +PaymentTypeLIQ=Tiền mặt +PaymentTypeShortLIQ=Tiền mặt +PaymentTypeCB=Thẻ tín dụng +PaymentTypeShortCB=Thẻ tín dụng +PaymentTypeCHQ=Séc +PaymentTypeShortCHQ=Séc PaymentTypeTIP=TIP PaymentTypeShortTIP=TIP PaymentTypeVAD=Thanh toán trực tuyến PaymentTypeShortVAD=Thanh toán trực tuyến -PaymentTypeTRA=Thanh toán hóa đơn -PaymentTypeShortTRA=Bill +PaymentTypeTRA=Thanh toán ra hóa đơn +PaymentTypeShortTRA=Ra hóa đơn BankDetails=Chi tiết ngân hàng BankCode=Mã ngân hàng -DeskCode=Đang bàn +DeskCode=Đang quầy BankAccountNumber=Số tài khoản -BankAccountNumberKey=Chính -Residence=Domiciliation +BankAccountNumberKey=Khóa +Residence=Nơi cứ trú IBANNumber=Số IBAN IBAN=IBAN BIC=BIC / SWIFT -BICNumber=BIC / SWIFT số -ExtraInfos=Infos thêm -RegulatedOn=Quy định về -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 +BICNumber=Số BIC / SWIFT +ExtraInfos=Thông tin thêm +RegulatedOn=Quy định trên +ChequeNumber=Kiểm tra N° +ChequeOrTransferNumber=Kiểm tra/Chuyển N° +ChequeMaker=Phát hành Séc +ChequeBank=Ngân hàng của Séc CheckBank=Séc -NetToBePaid=Net để được thanh toán +NetToBePaid=Số tiền chưa thuế được trả PhoneNumber=Điện thoại FullPhoneNumber=Điện thoại TeleFax=Fax -PrettyLittleSentence=Chấp nhận tiền thanh toán bằng séc do ban hành trong tên của tôi là một thành viên của một hiệp hội kế toán được chấp thuận của Cục Quản lý tài chính. -IntracommunityVATNumber=Intracommunity số thuế GTGT -PaymentByChequeOrderedTo=Kiểm tra thanh toán (bao gồm thuế) được trả cho%s gửi đến -PaymentByChequeOrderedToShort=Kiểm tra thanh toán (bao gồm thuế) được trả cho -SendTo=gửi đến +PrettyLittleSentence=Chấp nhận tiền thanh toán bằng séc được ban hành với tên của tôi như là một thành viên của một hiệp hội kế toán được chấp thuận của Cục Quản lý tài chính. +IntracommunityVATNumber=Số Intracommunity của thuế VAT +PaymentByChequeOrderedTo=Thanh toán Séc (bao gồm thuế) được trả cho %s gửi đến +PaymentByChequeOrderedToShort=Thanh toán Séc (bao gồm thuế) được trả cho +SendTo=Đã gửi đến PaymentByTransferOnThisBankAccount=Thanh toán bằng chuyển khoản vào tài khoản ngân hàng sau -VATIsNotUsedForInvoice=* Không áp dụng thuế GTGT nghệ thuật-293B của CGI -LawApplicationPart1=Bằng cách áp dụng pháp luật của 80,335 12/05/80 -LawApplicationPart2=hàng hóa là tài sản của -LawApplicationPart3=người bán cho đến khi đổi tiền mặt hoàn toàn +VATIsNotUsedForInvoice=* Không áp dụng thuế VAT art-293B of CGI +LawApplicationPart1=Bằng cách áp dụng luật 80.335 of 12/05/80 +LawApplicationPart2=hàng hóa duy trì đặc tính của +LawApplicationPart3=người bán vẫn thanh toán tiền mặt hoàn toàn LawApplicationPart4=giá của họ. -LimitedLiabilityCompanyCapital=SARL có vốn đầu tư của +LimitedLiabilityCompanyCapital=SARL with Capital of UseLine=Áp dụng UseDiscount=Sử dụng giảm giá -UseCredit=Sử dụng ghi nợ -UseCreditNoteInInvoicePayment=Giảm số tiền thanh toán bằng ghi nợ này -MenuChequeDeposits=Tiền gửi kiểm tra -MenuCheques=Kiểm tra -MenuChequesReceipts=Kiểm tra biên lai -NewChequeDeposit=Huy động mới -ChequesReceipts=Kiểm tra biên lai -ChequesArea=Khu vực tiền gửi kiểm tra -ChequeDeposits=Tiền gửi kiểm tra -Cheques=Kiểm tra -CreditNoteConvertedIntoDiscount=Ghi nợ này hoặc hóa đơn tiền gửi đã được chuyển đổi thành%s -UsBillingContactAsIncoiveRecipientIfExist=Sử dụng địa chỉ liên lạc của khách hàng thanh toán thay vì địa chỉ của bên thứ ba là người nhận hoá đơn -ShowUnpaidAll=Hiển thị tất cả các hoá đơn chưa thanh toán -ShowUnpaidLateOnly=Hiện hoá đơn chưa thanh toán cuối chỉ -PaymentInvoiceRef=Thanh toán hóa đơn%s +UseCredit=Sử dụng giấy ghi có +UseCreditNoteInInvoicePayment=Giảm số tiền trả bằng giấy báo có này +MenuChequeDeposits=Séc ứng trước +MenuCheques=Séc +MenuChequesReceipts=Biên nhận Séc +NewChequeDeposit=Ứng trước mới +ChequesReceipts=Biên nhận Séc +ChequesArea=Khu vực Séc ứng trước +ChequeDeposits=Séc ứng trước +Cheques=Séc +CreditNoteConvertedIntoDiscount=Giấy báo có này hoặc hóa đơn ứng trước đã được chuyển đổi thành %s +UsBillingContactAsIncoiveRecipientIfExist=Sử dụng địa chỉ liên lạc khách hàng để ra hóa đơn thay vì địa chỉ của bên thứ ba như là người nhận hoá đơn +ShowUnpaidAll=Hiển thị tất cả các hoá đơn chưa trả +ShowUnpaidLateOnly=Hiển thị chỉ hoá đơn chưa trả cuối +PaymentInvoiceRef=Hóa đơn thanh toán %s ValidateInvoice=Xác nhận hóa đơn -Cash=Tiền -Reported=Bị trì hoãn -DisabledBecausePayments=Không thể vì có một số khoản thanh toán -CantRemovePaymentWithOneInvoicePaid=Không thể loại bỏ thanh toán kể từ khi có ít nhất một hóa đơn thanh toán phân loại +Cash=Tiền mặt +Reported=Bị trễ +DisabledBecausePayments=Không được khi có nhiều khoản thanh toán +CantRemovePaymentWithOneInvoicePaid=Không thể xóa bỏ thanh toán khi có ít nhất một hóa đơn được phân loại đã trả ExpectedToPay=Thanh toán dự kiến -PayedByThisPayment=Thanh toán thanh toán này -ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid. -ClosePaidCreditNotesAutomatically=Phân loại các "Đã thanh toán" tất cả các ghi chú ghi nợ hoàn toàn trả lại. -AllCompletelyPayedInvoiceWillBeClosed=Tất cả hóa đơn không còn phải trả sẽ được tự động đóng cửa để trạng thái "Đã thanh toán". +PayedByThisPayment=Đã trả bởi khoản thanh toán này +ClosePaidInvoicesAutomatically=Phân loại "Đã trả" tất cả các hóa đơn chuẩn, hóa đơn tình huống hoặc hóa đơn thay thế đã trả đủ. +ClosePaidCreditNotesAutomatically=Phân loại các "Đã trả" tất cả các giấy báo có đã trả đủ trở lại. +AllCompletelyPayedInvoiceWillBeClosed=Tất cả hóa đơn chưa trả sẽ được tự động đóng sang trạng thái "Đã trả". ToMakePayment=Trả ToMakePaymentBack=Trả lại -ListOfYourUnpaidInvoices=Danh sách các hoá đơn chưa thanh toán -NoteListOfYourUnpaidInvoices=Lưu ý: Danh sách này chỉ chứa các hoá đơn cho bên thứ ba mà bạn đang kết nối như là một đại diện bán hàng. -RevenueStamp=Đóng dấu doanh thu +ListOfYourUnpaidInvoices=Danh sách các hoá đơn chưa trả +NoteListOfYourUnpaidInvoices=Ghi chú: Danh sách này chỉ chứa các hoá đơn cho bên thứ ba mà bạn liên quan như là một đại diện bán hàng. +RevenueStamp=Doanh thu đóng dấu YouMustCreateInvoiceFromThird=Tùy chọn này chỉ có sẵn khi tạo hóa đơn từ tab "khách hàng" của của bên thứ ba PDFCrabeDescription=Hóa đơn mẫu PDF Crabe. Một mẫu hóa đơn đầy đủ (mẫu đề nghị) -TerreNumRefModelDesc1=Quay trở lại với số lượng định dạng syymm-nnnn cho hóa đơn tiêu chuẩn và% syymm-nnnn cho các ghi chú ghi nợ mà yyyy là năm%, mm là tháng và NNNN là một chuỗi không có nghỉ ngơi và không trở lại 0 -MarsNumRefModelDesc1=Quay trở lại với số lượng định dạng syymm-nnnn cho hóa đơn tiêu chuẩn%,% syymm-nnnn cho hoá đơn thay thế,% syymm-nnnn cho các ghi chú ghi nợ và% syymm-nnnn cho các ghi chú ghi nợ mà yyyy là năm, mm là tháng và NNNN là một chuỗi không có phá vỡ và không trở về 0 -TerreNumRefModelError=Một dự luật bắt đầu với $ syymm đã tồn tại và không tương thích với mô hình này của chuỗi. Loại bỏ nó hoặc đổi tên nó để kích hoạt module này. +TerreNumRefModelDesc1=Quay về số với định dạng %ssyymm-nnnn cho hóa đơn chuẩn và %syymm-nnnn cho các giấy báo có nơi mà yy là năm, mm là tháng và nnnn là một chuỗi ngắt và không trở về 0 +MarsNumRefModelDesc1=Số trả về với định dạng %syymm-nnnn cho hóa đơn chuẩn, %syymm-nnnn cho hoá đơn thay thế, %syymm-nnnn cho các giấy báo có và %syymm-nnnn cho giấy báo có mà yy là năm, mm là tháng và nnnn là một chuỗi không có ngắt và không trở về 0 +TerreNumRefModelError=Bắt đầu ra một hóa đơn với $syymm mà đã tồn tại thì không tương thích với mô hình này của chuỗi. Xóa bỏ nó hoặc đổi tên nó để kích hoạt module này. ##### Types de contacts ##### -TypeContact_facture_internal_SALESREPFOLL=Đại diện sau lên hóa đơn của khách hàng -TypeContact_facture_external_BILLING=Hóa đơn của khách hàng liên lạc -TypeContact_facture_external_SHIPPING=Vận chuyển khách hàng liên hệ -TypeContact_facture_external_SERVICE=Liên hệ với dịch vụ khách hàng -TypeContact_invoice_supplier_internal_SALESREPFOLL=Đại diện theo dõi nhà cung cấp hóa đơn -TypeContact_invoice_supplier_external_BILLING=Nhà cung cấp hóa đơn liên lạc -TypeContact_invoice_supplier_external_SHIPPING=Nhà cung cấp vận chuyển liên lạc -TypeContact_invoice_supplier_external_SERVICE=Nhà cung cấp dịch vụ liên lạc +TypeContact_facture_internal_SALESREPFOLL=Đại diện theo dõi hóa đơn khách hàng +TypeContact_facture_external_BILLING=Liên lạc hóa đơn khách hàng +TypeContact_facture_external_SHIPPING=Liên lạc vận chuyển khách hàng +TypeContact_facture_external_SERVICE=Liên lạc dịch vụ khách hàng +TypeContact_invoice_supplier_internal_SALESREPFOLL=Đại diện theo dõi hóa đơn nhà cung cấp +TypeContact_invoice_supplier_external_BILLING=Liên lạc hóa đơn nhà cung cấp +TypeContact_invoice_supplier_external_SHIPPING=Liên lạc vận chuyển nhà cung cấp +TypeContact_invoice_supplier_external_SERVICE=Liên lạc dịch vụ nhà cung cấp # 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 +InvoiceFirstSituationAsk=Hóa đơn tình huống đầu +InvoiceFirstSituationDesc=Các hoá đơn tình huống được gắn với các tình huống liên quan đến một sự tiến triển, ví dụ như sự tiến triển của một công trình. Mỗi tình huống được gắn với một hóa đơn. +InvoiceSituation=Hóa đơn tình huống +InvoiceSituationAsk=Hóa đơn theo dõi tình huống +InvoiceSituationDesc=Tạo một tình huống mới theo cái đã tồn tại +SituationAmount=Số tiền hóa đơn tình huống (chưa thuế) +SituationDeduction=Tình huống giảm trừ 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=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=Không có vị trí nào mở -InvoiceSituationLast=Final and general invoice +CreateNextSituationInvoice=Tạo tình huống tiếp theo +NotLastInCycle=Hoá đơn này không phải là cuối cùng trong chu kỳ và không được sửa đổi. +DisabledBecauseNotLastInCycle=Tình huống tiếp theo đã tồn tại +DisabledBecauseFinal=Tình huống này là cuối cùng +CantBeLessThanMinPercent=Tiến trình này không thể nhỏ hơn giá trị của nó trong tình huống trước. +NoSituations=Không có tình huống nào đã mở +InvoiceSituationLast=Hóa đơn cuối cùng và tổng hợp diff --git a/htdocs/langs/vi_VN/boxes.lang b/htdocs/langs/vi_VN/boxes.lang index 622461f3da69a..b8de141bfade8 100644 --- a/htdocs/langs/vi_VN/boxes.lang +++ b/htdocs/langs/vi_VN/boxes.lang @@ -94,3 +94,4 @@ BoxProductDistributionFor=Phân phối %s cho %s ForCustomersInvoices=Khách hàng hoá đơn ForCustomersOrders=Khách hàng đặt hàng ForProposals=Đề xuất +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/vi_VN/companies.lang b/htdocs/langs/vi_VN/companies.lang index c63934a0536a4..914be1b57b843 100644 --- a/htdocs/langs/vi_VN/companies.lang +++ b/htdocs/langs/vi_VN/companies.lang @@ -1,131 +1,131 @@ # Dolibarr language file - Source file is en_US - companies -ErrorCompanyNameAlreadyExists=Tên công ty %s đã tồn tại. Chọn một số khác. -ErrorPrefixAlreadyExists=Tiền tố %s đã tồn tại. Chọn một số khác. -ErrorSetACountryFirst=Thiết lập đầu tiên của đất nước +ErrorCompanyNameAlreadyExists=Tên công ty %s đã tồn tại. Chọn tên khác khác. +ErrorPrefixAlreadyExists=Tiền tố %s đã tồn tại. Chọn tiền tố khác. +ErrorSetACountryFirst=Thiết lập quốc gia trước SelectThirdParty=Chọn một bên thứ ba DeleteThirdParty=Xóa một bên thứ ba -ConfirmDeleteCompany=Bạn có chắc chắn muốn xóa công ty này và tất cả các thông tin di truyền? -DeleteContact=Xóa một số liên lạc / địa chỉ -ConfirmDeleteContact=Bạn có chắc chắn muốn xóa liên hệ này và tất cả các thông tin di truyền? +ConfirmDeleteCompany=Bạn có chắc muốn xóa công ty này và tất cả các thông tin liên quan ? +DeleteContact=Xóa một liên lạc/địa chỉ +ConfirmDeleteContact=Bạn có chắc muốn xóa liên lạc này và tất cả các thông tin liên quan? MenuNewThirdParty=Bên thứ ba mới MenuNewCompany=Công ty mới MenuNewCustomer=Khách hàng mới -MenuNewProspect=Triển vọng mới +MenuNewProspect=KH tiềm năng mới MenuNewSupplier=Nhà cung cấp mới -MenuNewPrivateIndividual=Cá nhân riêng tư mới +MenuNewPrivateIndividual=Cá nhân mới MenuSocGroup=Nhóm -NewCompany=Công ty mới (khách hàng tiềm năng, khách hàng, nhà cung cấp) -NewThirdParty=Bên thứ ba mới (khách hàng tiềm năng, khách hàng, nhà cung cấp) +NewCompany=Công ty mới (KH tiềm năng, khách hàng, nhà cung cấp) +NewThirdParty=Bên thứ ba mới (KH tiềm năng, khách hàng, nhà cung cấp) NewSocGroup=Nhóm công ty mới -NewPrivateIndividual=Cá nhân riêng tư mới (khách hàng tiềm năng, khách hàng, nhà cung cấp) -CreateDolibarrThirdPartySupplier=Tạo một bên thứ ba (nhà cung cấp) -ProspectionArea=Khu vực thăm dò -SocGroup=Nhóm các công ty -IdThirdParty=Id của bên thứ ba -IdCompany=Mã công ty -IdContact=Id Liên hệ -Contacts=Liên hệ / địa chỉ -ThirdPartyContacts=Địa chỉ liên lạc của bên thứ ba -ThirdPartyContact=Bên thứ ba liên lạc / địa chỉ -StatusContactValidated=Tình hình liên lạc / địa chỉ +NewPrivateIndividual=Cá nhân mới (KH tiềm năng, khách hàng, nhà cung cấp) +CreateDolibarrThirdPartySupplier=Tạo bên thứ ba (nhà cung cấp) +ProspectionArea=Khu vực khảo sát +SocGroup=Nhóm công ty +IdThirdParty=ID bên thứ ba +IdCompany=ID công ty +IdContact=ID liên lạc +Contacts=Liên lạc/Địa chỉ +ThirdPartyContacts=Liên lạc bên thứ ba +ThirdPartyContact=Liên lạc/địa chỉ bên thứ ba +StatusContactValidated=Trạng thái liên lạc/địa chỉ Company=Công ty CompanyName=Tên công ty Companies=Các công ty -CountryIsInEEC=Đất nước là bên trong Cộng đồng Kinh tế châu Âu +CountryIsInEEC=Quốc gia thuộc Cộng đồng Kinh tế châu Âu ThirdPartyName=Tên của bên thứ ba ThirdParty=Bên thứ ba ThirdParties=Các bên thứ ba ThirdPartyAll=Các bên thứ ba (tất cả) -ThirdPartyProspects=Triển vọng -ThirdPartyProspectsStats=Triển vọng -ThirdPartyCustomers=Khách hàng -ThirdPartyCustomersStats=Khách hàng -ThirdPartyCustomersWithIdProf12=Khách hàng có%s hay%s +ThirdPartyProspects=KH tiềm năng +ThirdPartyProspectsStats=Các KH tiềm năng +ThirdPartyCustomers=Các khách hàng +ThirdPartyCustomersStats=Các khách hàng +ThirdPartyCustomersWithIdProf12=Khách hàng với %s hoặc %s ThirdPartySuppliers=Nhà cung cấp ThirdPartyType=Loại bên thứ ba -Company/Fundation=Công ty / cơ sở -Individual=Cá thể -ToCreateContactWithSameName=Sẽ tự động tạo ra một tiếp xúc vật lý với cùng một thông tin +Company/Fundation=Công ty/Tổ chức +Individual=Cá nhân +ToCreateContactWithSameName=Sẽ tự động tạo liên lạc thực với cùng thông tin ParentCompany=Công ty mẹ -Subsidiary=Công ty con -Subsidiaries=Các công ty con -NoSubsidiary=Không có công ty con -ReportByCustomers=Báo cáo của khách hàng -ReportByQuarter=Báo cáo của tỷ lệ -CivilityCode=Mã văn minh +Subsidiary=Chi nhánh +Subsidiaries=Các chi nhánh +NoSubsidiary=Không có chi nhánh +ReportByCustomers=Báo cáo theo khách hàng +ReportByQuarter=Báo cáo theo tỷ lệ +CivilityCode=Mã Civility RegisteredOffice=Trụ sở đăng ký -Name=Tên +Name=Họ và tên Lastname=Họ -Firstname=Tên đầu tiên -PostOrFunction=Bài / Chức năng +Firstname=Tên +PostOrFunction=Bài/Chức năng UserTitle=Tiêu đề -Surname=Họ / Pseudo +Surname=Họ/Pseudo Address=Địa chỉ -State=Tiểu bang / tỉnh -Region=Khu vực -Country=Đất nước +State=Bang/Tỉnh +Region=Vùng +Country=Quốc gia CountryCode=Mã quốc gia -CountryId=Country ID +CountryId=ID quốc gia Phone=Điện thoại Skype=Skype -Call=Gọi -Chat=Trò chuyện -PhonePro=Giáo sư điện thoại -PhonePerso=Pers. điện thoại -PhoneMobile=Điện thoại di động -No_Email=Không gửi hàng loạt thư điện tử +Call=Call +Chat=Chat +PhonePro=Prof. phone +PhonePerso=Pers. phone +PhoneMobile=Mobile +No_Email=Không gửi email hàng loạt Fax=Fax -Zip=Zip Code +Zip=Mã Zip Town=Thành phố Web=Web Poste= Chức vụ DefaultLang=Ngôn ngữ mặc định -VATIsUsed=Thuế GTGT được sử dụng -VATIsNotUsed=Thuế GTGT không được sử dụng +VATIsUsed=Thuế VAT được dùng +VATIsNotUsed=Thuế VAT không được dùng CopyAddressFromSoc=Điền địa chỉ với địa chỉ của bên thứ ba NoEmailDefined=Không có email được xác định ##### Local Taxes ##### -LocalTax1IsUsedES= RE được sử dụng -LocalTax1IsNotUsedES= RE không được sử dụng -LocalTax2IsUsedES= IRPF được sử dụng -LocalTax2IsNotUsedES= IRPF không được sử dụng +LocalTax1IsUsedES= RE được dùng +LocalTax1IsNotUsedES= RE không được dùng +LocalTax2IsUsedES= IRPF được dùng +LocalTax2IsNotUsedES= IRPF không được dùng LocalTax1ES=RE LocalTax2ES=IRPF -TypeLocaltax1ES=Loại RE -TypeLocaltax2ES=IRPF Loại +TypeLocaltax1ES=RE Type +TypeLocaltax2ES=IRPF Type TypeES=Loại ThirdPartyEMail=%s WrongCustomerCode=Mã khách hàng không hợp lệ WrongSupplierCode=Mã nhà cung cấp không hợp lệ -CustomerCodeModel=Mô hình mã khách hàng -SupplierCodeModel=Nhà cung cấp mô hình mã +CustomerCodeModel=Kiểu mã khách hàng +SupplierCodeModel=Kiểu mã nhà cung cấp Gencod=Mã vạch ##### Professional ID ##### -ProfId1Short=Giáo sư id 1 -ProfId2Short=Giáo sư id 2 -ProfId3Short=Giáo sư id 3 -ProfId4Short=Giáo sư id 4 -ProfId5Short=Giáo sư id 5 -ProfId6Short=Giáo sư id 5 -ProfId1=ID chuyên nghiệp 1 -ProfId2=ID chuyên nghiệp 2 -ProfId3=ID chuyên nghiệp 3 -ProfId4=ID chuyên nghiệp 4 -ProfId5=ID chuyên nghiệp 5 -ProfId6=ID chuyên nghiệp 6 -ProfId1AR=Giáo sư Id 1 (CUIT / Cuil) -ProfId2AR=Giáo sư Id 2 (Revenu xử tàn bạo) +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=Giáo sư Id 1 (ABN) +ProfId1AU=Prof Id 1 (ABN) ProfId2AU=- ProfId3AU=- ProfId4AU=- ProfId5AU=- ProfId6AU=- -ProfId1BE=Giáo sư Id 1 (số chuyên nghiệp) +ProfId1BE=Prof Id 1 (Professional number) ProfId2BE=- ProfId3BE=- ProfId4BE=- @@ -133,47 +133,47 @@ ProfId5BE=- ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) -ProfId3BR=IM (Inscricao thành phố) +ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS ProfId1CH=- ProfId2CH=- -ProfId3CH=Giáo sư Id 1 (số liên bang) -ProfId4CH=Giáo sư Id 2 (Ghi lại số thương mại) +ProfId3CH=Prof Id 1 (Federal number) +ProfId4CH=Prof Id 2 (Commercial Record number) ProfId5CH=- ProfId6CH=- -ProfId1CL=Giáo sư Id 1 (RUT) +ProfId1CL=Prof Id 1 (R.U.T.) ProfId2CL=- ProfId3CL=- ProfId4CL=- ProfId5CL=- ProfId6CL=- -ProfId1CO=Giáo sư Id 1 (RUT) +ProfId1CO=Prof Id 1 (R.U.T.) ProfId2CO=- ProfId3CO=- ProfId4CO=- ProfId5CO=- ProfId6CO=- -ProfId1DE=Giáo sư Id 1 (USt.-IdNr) -ProfId2DE=Giáo sư Id 2 (USt.-Nr) -ProfId3DE=Giáo sư Id 3 (Handelsregister-Nr.) +ProfId1DE=Prof Id 1 (USt.-IdNr) +ProfId2DE=Prof Id 2 (USt.-Nr) +ProfId3DE=Prof Id 3 (Handelsregister-Nr.) ProfId4DE=- ProfId5DE=- ProfId6DE=- -ProfId1ES=Giáo sư Id 1 (CIF / NIF) -ProfId2ES=Giáo sư Id 2 (số an sinh xã hội) -ProfId3ES=Giáo sư Id 3 (CNAE) -ProfId4ES=Giáo sư Id 4 (số Collegiate) +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=Giáo sư Id 1 (SIREN) -ProfId2FR=Giáo sư Id 2 (SIRET) -ProfId3FR=Giáo sư Id 3 (NAF, APE cũ) -ProfId4FR=Giáo sư Id 4 (RCS / RM) +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=Số đăng ký +ProfId1GB=Registration Number ProfId2GB=- ProfId3GB=SIC ProfId4GB=- @@ -185,34 +185,34 @@ ProfId3HN=- ProfId4HN=- ProfId5HN=- ProfId6HN=- -ProfId1IN=Giáo sư Id 1 (TIN) -ProfId2IN=Giáo sư Id 2 (PAN) -ProfId3IN=Giáo sư Id 3 (thuế SRVC) -ProfId4IN=Giáo sư Id 4 -ProfId5IN=Giáo sư Id 5 +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 (RC) +ProfId1MA=Id prof. 1 (R.C.) ProfId2MA=Id prof. 2 (Patente) -ProfId3MA=Id prof. 3 (IF) -ProfId4MA=Id prof. 4 (CNSS) +ProfId3MA=Id prof. 3 (I.F.) +ProfId4MA=Id prof. 4 (C.N.S.S.) ProfId5MA=- ProfId6MA=- -ProfId1MX=Giáo sư Id 1 (RFC). -ProfId2MX=Giáo sư Id 2 (R..P. IMSS) -ProfId3MX=Giáo sư Id 3 (Profesional điều lệ) +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 +ProfId1NL=KVK nummer ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) ProfId5NL=- ProfId6NL=- -ProfId1PT=Giáo sư Id 1 (NIPC) -ProfId2PT=Giáo sư Id 2 (số an sinh xã hội) -ProfId3PT=Giáo sư Id 3 (Ghi lại số thương mại) -ProfId4PT=Giáo sư Id 4 (viện) +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 @@ -221,194 +221,194 @@ ProfId3SN=- ProfId4SN=- ProfId5SN=- ProfId6SN=- -ProfId1TN=Giáo sư Id 1 (RC) -ProfId2TN=Giáo sư Id 2 (matricule tài chính) -ProfId3TN=Giáo sư Id 3 (mã Douane) -ProfId4TN=Giáo sư Id 4 (BAN) +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=Giáo sư Id 1 (OGRN) -ProfId2RU=Giáo sư Id 2 (INN) -ProfId3RU=Giáo sư Id 3 (KPP) -ProfId4RU=Giáo sư Id 4 (OKPO) +ProfId1RU=Prof Id 1 (OGRN) +ProfId2RU=Prof Id 2 (INN) +ProfId3RU=Prof Id 3 (KPP) +ProfId4RU=Prof Id 4 (OKPO) ProfId5RU=- ProfId6RU=- -VATIntra=Số thuế GTGT -VATIntraShort=Số thuế GTGT -VATIntraVeryShort=Thuế GTGT -VATIntraSyntaxIsValid=Cú pháp là hợp lệ -VATIntraValueIsValid=Giá trị là hợp lệ -ProspectCustomer=Khách hàng tiềm năng / khách hàng -Prospect=Triển vọng +VATIntra=Số VAT +VATIntraShort=Số VAT +VATIntraVeryShort=VAT +VATIntraSyntaxIsValid=Cú pháp hợp lệ +VATIntraValueIsValid=Giá trị hợp lệ +ProspectCustomer=KH tiềm năng/khách hàng +Prospect=KH tiềm năng CustomerCard=Thẻ khách hàng Customer=Khách hàng CustomerDiscount=Giảm giá khách hàng -CustomerRelativeDiscount=Giảm giá của khách hàng liên quan -CustomerAbsoluteDiscount=Giảm giá khách hàng tuyệt đối -CustomerRelativeDiscountShort=Giảm tương đối -CustomerAbsoluteDiscountShort=Giảm giá tuyệt đối -CompanyHasRelativeDiscount=Khách hàng này có giảm giá mặc định của %s%% -CompanyHasNoRelativeDiscount=Khách hàng này không có giảm giá tương đối theo mặc định -CompanyHasAbsoluteDiscount=Khách hàng này vẫn có các khoản tín dụng giảm giá hoặc tiền đặt cọc cho %s %s -CompanyHasCreditNote=Khách hàng này vẫn có giấy báo cho %s %s -CompanyHasNoAbsoluteDiscount=Khách hàng này không có tín dụng giảm giá có sẵn -CustomerAbsoluteDiscountAllUsers=Giảm giá tuyệt đối (do tất cả người dùng) -CustomerAbsoluteDiscountMy=Giảm giá tuyệt đối (do chính mình) -DefaultDiscount=Mặc định giảm giá -AvailableGlobalDiscounts=Giảm giá tuyệt đối có sẵn +CustomerRelativeDiscount=Giảm giá theo số tiền +CustomerAbsoluteDiscount=Giảm giá theo số tiền +CustomerRelativeDiscountShort=Giảm giá theo % +CustomerAbsoluteDiscountShort=Giảm giá theo số tiền +CompanyHasRelativeDiscount=Khách hàng này có giảm giá mặc định là %s%% +CompanyHasNoRelativeDiscount=Khách hàng này không có mặc định giảm giá theo % +CompanyHasAbsoluteDiscount=Khách hàng này vẫn có các khoản nợ chiết khấu hoặc ứng trước cho %s %s +CompanyHasCreditNote=Khách hàng này vẫn có ghi nợ cho %s %s +CompanyHasNoAbsoluteDiscount=Khách hàng này không có sẵn nợ chiết khấu +CustomerAbsoluteDiscountAllUsers=Giảm giá theo % (gán cho tất cả người dùng) +CustomerAbsoluteDiscountMy=Giảm giá theo số tiền (gán cho chính bạn) +DefaultDiscount=Giảm giá mặc định +AvailableGlobalDiscounts=Giảm giá số tiền có sẵn DiscountNone=Không Supplier=Nhà cung cấp -CompanyList=Danh sách của công ty -AddContact=Tạo liên hệ -AddContactAddress=Tạo liên hệ / địa chỉ +CompanyList=Danh sách công ty +AddContact=Tạo liên lạc +AddContactAddress=Tạo liên lạc/địa chỉ EditContact=Sửa liên lạc -EditContactAddress=Sửa liên lạc / địa chỉ -Contact=Liên hệ -ContactsAddresses=Liên hệ / địa chỉ -NoContactDefinedForThirdParty=Không liên lạc được xác định cho bên thứ ba này +EditContactAddress=Sửa liên lạc/địa chỉ +Contact=Liên lạc +ContactsAddresses=Liên lạc/địa chỉ +NoContactDefinedForThirdParty=Không có liên lạc được xác định cho bên thứ ba này NoContactDefined=Không liên lạc được xác định -DefaultContact=Mặc định liên lạc / địa chỉ +DefaultContact=Liên lạc/địa chỉ mặc định AddCompany=Tạo công ty AddThirdParty=Tạo bên thứ ba DeleteACompany=Xóa một công ty PersonalInformations=Dữ liệu cá nhân -AccountancyCode=Đang kế toán +AccountancyCode=Mã kế toán CustomerCode=Mã khách hàng SupplierCode=Mã nhà cung cấp -CustomerAccount=Tài khoản của khách hàng +CustomerAccount=Tài khoản khách hàng SupplierAccount=Tài khoản nhà cung cấp -CustomerCodeDesc=Mã số khách hàng, duy nhất cho tất cả khách hàng -SupplierCodeDesc=Mã nhà cung cấp, độc đáo cho tất cả các nhà cung cấp -RequiredIfCustomer=Yêu cầu nếu bên thứ ba là một khách hàng hoặc khách hàng tiềm năng +CustomerCodeDesc=Mã khách hàng, duy nhất cho tất cả khách hàng +SupplierCodeDesc=Mã nhà cung cấp, duy nhất cho tất cả các nhà cung cấp +RequiredIfCustomer=Yêu cầu nếu bên thứ ba là một khách hàng hoặc KH tiềm năng RequiredIfSupplier=Yêu cầu nếu bên thứ ba là nhà cung cấp -ValidityControledByModule=Hiệu lực điều khiển bởi mô-đun +ValidityControledByModule=Xác nhận kiểm soát bởi mô-đun ThisIsModuleRules=Đây là quy tắc cho các mô-đun này LastProspect=Cuối -ProspectToContact=Khách hàng tiềm năng để liên hệ -CompanyDeleted=Công ty "%s" sẽ bị xóa khỏi cơ sở dữ liệu. -ListOfContacts=Danh sách địa chỉ liên lạc / địa chỉ -ListOfContactsAddresses=Danh sách địa chỉ liên lạc / adresses -ListOfProspectsContacts=Danh sách liên hệ khách hàng tiềm năng -ListOfCustomersContacts=Danh sách địa chỉ liên lạc của khách hàng -ListOfSuppliersContacts=Danh sách liên hệ nhà cung cấp +ProspectToContact=KH tiềm năng để liên lạc +CompanyDeleted=Công ty "%s" đã xóa khỏi cơ sở dữ liệu. +ListOfContacts=Danh sách liên lạc/địa chỉ +ListOfContactsAddresses=Danh sách liên lạc/địa chỉ +ListOfProspectsContacts=Danh sách liên lạc KH tiềm năng +ListOfCustomersContacts=Danh sách liên lạc khách hàng +ListOfSuppliersContacts=Danh sách liên lạc nhà cung cấp ListOfCompanies=Danh sách các công ty ListOfThirdParties=Danh sách các bên thứ ba ShowCompany=Hiện công ty ShowContact=Hiện liên lạc -ContactsAllShort=Tất cả (không chọn lọc) -ContactType=Loại Liên hệ -ContactForOrders=Liên hệ với đơn đặt hàng của -ContactForProposals=Liên lạc đề nghị của -ContactForContracts=Hợp đồng liên lạc của -ContactForInvoices=Tiếp xúc của hóa đơn -NoContactForAnyOrder=Liên hệ này không phải là một số liên lạc cho bất kỳ thứ tự -NoContactForAnyProposal=Liên hệ này không phải là một số liên lạc cho bất kỳ đề xuất thương mại -NoContactForAnyContract=Liên hệ này không phải là một số liên lạc cho bất cứ hợp đồng -NoContactForAnyInvoice=Liên hệ này không phải là một số liên lạc cho bất kỳ hóa đơn +ContactsAllShort=Tất cả (không lọc) +ContactType=Loại liên lạc +ContactForOrders=Liên lạc đơn hàng +ContactForProposals=Liên lạc đơn hàng đề xuất +ContactForContracts=Liên lạc hợp đồng +ContactForInvoices=Liên lạc hóa đơn +NoContactForAnyOrder=Liên lạc này không phải cho bất kỳ đơn hàng nào +NoContactForAnyProposal=Liên lạc này không phải cho bất kỳ đơn hàng đề xuất nào +NoContactForAnyContract=Liên lạc này không phải cho bất kỳ hợp đồng nào +NoContactForAnyInvoice=Liên lạc này không phải cho bất kỳ hóa đơn nào NewContact=Liên lạc mới -NewContactAddress=Liên lạc mới / địa chỉ -LastContacts=Địa chỉ liên lạc cuối cùng -MyContacts=Địa chỉ liên lạc của tôi +NewContactAddress=Liên lạc/địa chỉ mới +LastContacts=Liên lạc cuối +MyContacts=Liên lạc của tôi Phones=Điện thoại Capital=Vốn -CapitalOf=Vốn của%s +CapitalOf=Vốn của %s EditCompany=Chỉnh sửa công ty EditDeliveryAddress=Chỉnh sửa địa chỉ giao hàng -ThisUserIsNot=Thành viên này không phải là một khách hàng tiềm năng, khách hàng cũng không phải nhà cung cấp +ThisUserIsNot=Người dùng này không phải là một KH tiềm năng, khách hàng hoặc nhà cung cấp VATIntraCheck=Kiểm tra -VATIntraCheckDesc=Các liên kết %s cho phép yêu cầu các dịch vụ kiểm tra thuế GTGT châu Âu. Một truy cập internet từ máy chủ bên ngoài là cần thiết cho dịch vụ này để làm việc. +VATIntraCheckDesc=Các liên kết %s cho phép yêu cầu các dịch vụ kiểm tra thuế VAT châu Âu. Một truy cập internet từ máy chủ bên ngoài là cần thiết cho dịch vụ này để làm việc. VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do -VATIntraCheckableOnEUSite=Kiểm tra Intracomunnautary thuế GTGT trên trang web của hoa hồng Châu Âu -VATIntraManualCheck=Bạn cũng có thể kiểm tra bằng tay từ châu Âu trang web % s -ErrorVATCheckMS_UNAVAILABLE=Kiểm tra không thể. Kiểm tra dịch vụ không được cung cấp bởi các quốc gia thành viên (% s). +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=Cũng không phải khách hàng tiềm năng, cũng không phải khách hàng JuridicalStatus=Tư cách pháp nhân Staff=Nhân viên ProspectLevelShort=Tiềm năng -ProspectLevel=Triển vọng tiềm năng -ContactPrivate=Tin -ContactPublic=Chia sẻ -ContactVisibility=Tầm nhìn -OthersNotLinkedToThirdParty=Người khác, không liên kết với một bên thứ ba -ProspectStatus=Tình trạng khách hàng tiềm năng +ProspectLevel=KH tiềm năng +ContactPrivate=Riêng tư +ContactPublic=Đã chia sẻ +ContactVisibility=Hiển thị +OthersNotLinkedToThirdParty=Người khác, không liên quan với một bên thứ ba +ProspectStatus=Trạng thái KH tiềm năng PL_NONE=Không -PL_UNKNOWN=Chưa rõ +PL_UNKNOWN=Không biết PL_LOW=Thấp PL_MEDIUM=Trung bình PL_HIGH=Cao TE_UNKNOWN=- -TE_STARTUP=Khởi động +TE_STARTUP=Khởi nghiệp TE_GROUP=Công ty lớn TE_MEDIUM=Công ty vừa TE_ADMIN=Chính phủ TE_SMALL=Công ty nhỏ -TE_RETAIL=Cửa hàng bán lẻ -TE_WHOLE=Wholetailer -TE_PRIVATE=Cá thể +TE_RETAIL=Bán lẻ +TE_WHOLE=Bán sỉ +TE_PRIVATE=Cá nhân TE_OTHER=Khác -StatusProspect-1=Không liên hệ -StatusProspect0=Không bao giờ liên lạc -StatusProspect1=Để liên hệ -StatusProspect2=Liên hệ trong quá trình -StatusProspect3=Liên hệ với thực hiện -ChangeDoNotContact=Thay đổi trạng thái để 'Đừng liên lạc' -ChangeNeverContacted=Thay đổi trạng thái để 'Không bao giờ liên lạc' -ChangeToContact=Thay đổi trạng thái để 'Để liên hệ với' -ChangeContactInProcess=Thay đổi trạng thái để 'Liên hệ trong quá trình' -ChangeContactDone=Thay đổi trạng thái để 'Liên hệ với thực hiện' -ProspectsByStatus=Triển vọng bởi tình trạng -BillingContact=Liên hệ thanh toán -NbOfAttachedFiles=Số lượng hồ sơ đính kèm -AttachANewFile=Đính kèm một tập tin mới -NoRIB=Không có định nghĩa BAN +StatusProspect-1=Không liên lạc +StatusProspect0=Chưa từng liên lạc +StatusProspect1=Để liên lạc +StatusProspect2=Đang liên lạc +StatusProspect3=Đã liên lạc +ChangeDoNotContact=Đổi sang trạng thái 'Không liên lạc' +ChangeNeverContacted=Đổi sang trạng thái 'Chưa từng liên lạc' +ChangeToContact=Đổi sang trạng thái 'Để liên lạc' +ChangeContactInProcess=Đổi sang trạng thái 'Đang liên lạc' +ChangeContactDone=Đổi sang trạng thái để 'Đã liên lạc' +ProspectsByStatus=KH tiềm năng theo trạng thái +BillingContact=Liên lạc thanh toán +NbOfAttachedFiles=Số tập tin đính kèm +AttachANewFile=Đính kèm tập tin mới +NoRIB=No BAN defined NoParentCompany=Không -ExportImport=Xuất nhập khẩu -ExportCardToFormat=Thẻ xuất khẩu sang các định dạng -ContactNotLinkedToCompany=Liên không liên quan đến bất kỳ bên thứ ba +ExportImport=Nhập-Xuất +ExportCardToFormat=Thẻ xuất để định dạng +ContactNotLinkedToCompany=Liên lạc không liên quan đến bất kỳ bên thứ ba DolibarrLogin=Đăng nhập Dolibarr NoDolibarrAccess=Không truy cập Dolibarr -ExportDataset_company_1=Các bên thứ ba (công ty / cơ sở / người vật lý) và tài sản -ExportDataset_company_2=Liên hệ và tài sản -ImportDataset_company_1=Các bên thứ ba (công ty / cơ sở / người vật lý) và tài sản -ImportDataset_company_2=Liên hệ / địa chỉ (của thirdparties hay không) và các thuộc tính +ExportDataset_company_1=Bên thứ ba (Công ty/Tổ chức/Cá nhân) và các thuộc tính +ExportDataset_company_2=Liên lạc và các thuộc tính +ImportDataset_company_1=Bên thứ ba (Công ty/Tổ chức/Cá nhân) và các thuộc tính +ImportDataset_company_2=Liên lạc/địa chỉ (của bên thứ ba hay không) và các thuộc tính ImportDataset_company_3=Chi tiết ngân hàng PriceLevel=Mức giá DeliveriesAddress=Địa chỉ giao hàng DeliveryAddress=Địa chỉ giao hàng -DeliveryAddressLabel=Giao hàng tận nơi nhãn địa chỉ -DeleteDeliveryAddress=Xóa một địa chỉ giao hàng -ConfirmDeleteDeliveryAddress=Bạn Bạn có chắc chắn muốn xóa địa chỉ giao hàng này? +DeliveryAddressLabel=Nhãn địa chỉ giao hàng +DeleteDeliveryAddress=Xóa địa chỉ giao hàng +ConfirmDeleteDeliveryAddress=Bạn có chắc muốn xóa địa chỉ giao hàng này? NewDeliveryAddress=Địa chỉ giao hàng mới AddDeliveryAddress=Tạo địa chỉ AddAddress=Tạo địa chỉ NoOtherDeliveryAddress=Không có địa chỉ giao hàng thay thế được xác định -SupplierCategory=Loại nhà cung cấp +SupplierCategory=Phân nhóm nhà cung cấp JuridicalStatus200=Độc lập DeleteFile=Xóa tập tin -ConfirmDeleteFile=Bạn Bạn có chắc chắn muốn xóa ảnh này? -AllocateCommercial=Giao cho đại diện bán +ConfirmDeleteFile=Bạn có chắc muốn xóa tập tin này? +AllocateCommercial=Chỉ định cho Đại điện bán hàng SelectCountry=Chọn một quốc gia SelectCompany=Chọn một bên thứ ba Organization=Tổ chức -AutomaticallyGenerated=Tự động tạo ra +AutomaticallyGenerated=Được tạo tự động FiscalYearInformation=Thông tin về năm tài chính -FiscalMonthStart=Bắt đầu từ tháng của năm tài chính -YouMustCreateContactFirst=Bạn phải tạo ra các email liên lạc cho bên thứ ba đầu tiên để có thể thêm các email thông báo. +FiscalMonthStart=Tháng bắt đầu của năm tài chính +YouMustCreateContactFirst=Bạn phải tạo liên lạc email cho bên thứ ba trước để có thể thêm các thông báo email. ListSuppliersShort=Danh sách nhà cung cấp -ListProspectsShort=Danh sách khách hàng tiềm năng +ListProspectsShort=Danh sách KH tiềm năng ListCustomersShort=Danh sách khách hàng -ThirdPartiesArea=Bên thứ ba và các khu vực liên hệ -LastModifiedThirdParties=Các bên thứ ba cuối%s sửa đổi -UniqueThirdParties=Tổng số của bên thứ ba độc đáo +ThirdPartiesArea=Bên thứ ba và các khu vực liên lạc +LastModifiedThirdParties=%s bên thứ ba đã chỉnh sửa cuối +UniqueThirdParties=Tổng của bên thứ ba duy nhất InActivity=Mở ActivityCeased=Đóng -ActivityStateFilter=Tình trạng hoạt động -ProductsIntoElements=Danh sách sản phẩm vào%s -CurrentOutstandingBill=Hóa đơn đang lưu hành -OutstandingBill=Max. cho hóa đơn xuất sắc -OutstandingBillReached=Đạt tối đa. cho hóa đơn xuất sắc -MonkeyNumRefModelDesc=Quay trở lại với các định dạng numero syymm-nnnn cho mã khách hàng và% syymm-nnnn cho mã nhà cung cấp nơi yyyy là năm%, mm là tháng và NNNN là một chuỗi không có nghỉ ngơi và không trở lại 0. -LeopardNumRefModelDesc=Mã này là miễn phí. Mã này có thể được sửa đổi bất cứ lúc nào. -ManagingDirectors=Quản lý (các) tên (Giám đốc điều hành, giám đốc, chủ tịch ...) -SearchThirdparty=Tìm kiếm của bên thứ ba +ActivityStateFilter=Trạng thái hoạt động +ProductsIntoElements=Danh sách sản phẩm vào %s +CurrentOutstandingBill=Công nợ hiện tại +OutstandingBill=Công nợ tối đa +OutstandingBillReached=Đã đạt công nợ tối đa +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=Mã này tự do. Mã này có thể được sửa đổi bất cứ lúc nào. +ManagingDirectors=Tên quản lý (CEO, giám đốc, chủ tịch...) +SearchThirdparty=Tìm kiếm bên thứ ba SearchContact=Tìm kiếm liên lạc diff --git a/htdocs/langs/vi_VN/deliveries.lang b/htdocs/langs/vi_VN/deliveries.lang index eaad58cffcbff..f8935825aca21 100644 --- a/htdocs/langs/vi_VN/deliveries.lang +++ b/htdocs/langs/vi_VN/deliveries.lang @@ -1,28 +1,28 @@ # Dolibarr language file - Source file is en_US - deliveries -Delivery=Giao hàng tận nơi -Deliveries=Việc giao hàng -DeliveryCard=Thẻ Giao hàng tận nơi -DeliveryOrder=Lệnh giao hàng -DeliveryOrders=Lệnh giao hàng +Delivery=Giao hàng +Deliveries=Giao hàng +DeliveryCard=Thẻ giao hàng +DeliveryOrder=Phiếu giao hàng +DeliveryOrders=Phiếu giao hàng DeliveryDate=Ngày giao hàng -DeliveryDateShort=Deliv. ngày -CreateDeliveryOrder=Tạo lệnh giao hàng -QtyDelivered=Số lượng giao -SetDeliveryDate=Thiết lập ngày vận chuyển -ValidateDeliveryReceipt=Xác nhận giao hàng -ValidateDeliveryReceiptConfirm=Bạn có chắc chắn bạn muốn xác nhận giao hàng này? -DeleteDeliveryReceipt=Xóa nhận giao hàng -DeleteDeliveryReceiptConfirm=Bạn Bạn có chắc chắn muốn xóa nhận giao hàng %s ? -DeliveryMethod=Phương thức vận chuyển +DeliveryDateShort=Ngày giao hàng +CreateDeliveryOrder=Tạo phiếu giao hàng +QtyDelivered=Số lượng đã giao hàng +SetDeliveryDate=Lập ngày vận chuyển +ValidateDeliveryReceipt=Xác nhận chứng từ giao hàng +ValidateDeliveryReceiptConfirm=Bạn có chắc muốn xác nhận chứng từ giao hàng này ? +DeleteDeliveryReceipt=Xóa chứng từ giao hàng +DeleteDeliveryReceiptConfirm=Bạn có chắc muốn xóa chứng từ giao hàng %s ? +DeliveryMethod=Phương thức giao hàng TrackingNumber=Số theo dõi -DeliveryNotValidated=Giao hàng tận nơi không xác nhận +DeliveryNotValidated=Giao hàng chưa được xác nhận # merou PDF model NameAndSignature=Tên và chữ ký: -ToAndDate=To___________________________________ vào ____ / _____ / __________ +ToAndDate=Gửi___________________________________ vào ____ / _____ / __________ GoodStatusDeclaration=Đã nhận được hàng hoá trên trong tình trạng tốt, -Deliverer=Giao: -Sender=Tên người gửi +Deliverer=Người giao: +Sender=Người gửi Recipient=Người nhận ErrorStockIsNotEnough=Không có đủ tồn kho -Shippable=Shippable -NonShippable=Không shippable +Shippable=Vận chuyển được +NonShippable=Không vận chuyển được diff --git a/htdocs/langs/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang index 982dea2342d18..72d63d6336efc 100644 --- a/htdocs/langs/vi_VN/errors.lang +++ b/htdocs/langs/vi_VN/errors.lang @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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=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/interventions.lang b/htdocs/langs/vi_VN/interventions.lang index ca16bedea7849..8e859781737e9 100644 --- a/htdocs/langs/vi_VN/interventions.lang +++ b/htdocs/langs/vi_VN/interventions.lang @@ -50,4 +50,4 @@ ArcticNumRefModelError=Không thể kích hoạt PacificNumRefModelDesc1=Quay trở lại với các định dạng numero% syymm-nnnn nơi yyyy là năm, mm là tháng và NNNN là một chuỗi không có nghỉ ngơi và không trở lại 0 PacificNumRefModelError=Thẻ can thiệp bắt đầu với $ syymm đã tồn tại và không tương thích với mô hình này của chuỗi. Loại bỏ nó hoặc đổi tên nó để kích hoạt module này. PrintProductsOnFichinter=Sản phẩm in trên thẻ can thiệp -PrintProductsOnFichinterDetails=forinterventions tạo ra từ các đơn đặt hàng +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang index 55c30b98a9c43..40fa0296d366c 100644 --- a/htdocs/langs/vi_VN/main.lang +++ b/htdocs/langs/vi_VN/main.lang @@ -4,7 +4,7 @@ DIRECTION=ltr # 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 +FONTFORPDF=helvetica FONTSIZEFORPDF=10 SeparatorDecimal=. SeparatorThousand=, @@ -24,161 +24,161 @@ FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p FormatDateHourTextShort=%b %d, %Y, %I:%M %p FormatDateHourText=%B %d, %Y, %I:%M %p DatabaseConnection=Kết nối cơ sở dữ liệu -NoTranslation=Không có bản dịch -NoRecordFound=Không có hồ sơ tìm thấy +NoTranslation=Không dịch +NoRecordFound=Không tìm thấy bản ghi NoError=Không có lỗi Error=Lỗi -ErrorFieldRequired=Dòng '%s' được yêu cầu -ErrorFieldFormat=Dòng '%s' có một giá trị xấu -ErrorFileDoesNotExists=Tập tin %s không tồn tại -ErrorFailedToOpenFile=Không thể mở tập tin %s +ErrorFieldRequired=Cần khai báo trường '%s' +ErrorFieldFormat=Trường '%s' có giá trị sai +ErrorFileDoesNotExists=Tệp %s không tồn tại +ErrorFailedToOpenFile=Lỗi mở tệp %s ErrorCanNotCreateDir=Không thể tạo thư mục %s ErrorCanNotReadDir=Không thể đọc thư mục %s -ErrorConstantNotDefined=Thông số% s chưa được xác định +ErrorConstantNotDefined=Thông số %s chưa được khai báo ErrorUnknown=Lỗi không xác định ErrorSQL=Lỗi SQL -ErrorLogoFileNotFound=Logo tập tin '% s' không được tìm thấy -ErrorGoToGlobalSetup=Đi đến 'Công ty / cơ sở "thiết lập để sửa lỗi này -ErrorGoToModuleSetup=Tới Học phần thiết lập để sửa lỗi này -ErrorFailedToSendMail=Không thể gửi thư (người gửi =%s, thu =%s) -ErrorAttachedFilesDisabled=Tập tin đính bị vô hiệu hóa trên máy chủ này -ErrorFileNotUploaded=Tập tin không được tải lên. Kiểm tra kích thước không vượt quá tối đa cho phép, không gian miễn phí có sẵn trên đĩa và không có đã là một tập tin có cùng tên trong thư mục này. +ErrorLogoFileNotFound=Không tìm thấy tệp logo '%s' +ErrorGoToGlobalSetup=Đi đến phần thiết lập 'Công ty/Tổ chức" để sửa lỗi này +ErrorGoToModuleSetup=Đến phần thiết lập Module để sửa lỗi này +ErrorFailedToSendMail=Lỗi gửi mail (người gửi=%s, người nhận=%s) +ErrorAttachedFilesDisabled=Tập tin đính kèm bị vô hiệu hóa trên máy chủ này +ErrorFileNotUploaded=Tập tin không được tải lên. Kiểm tra kích thước không vượt quá tối đa cho phép, không gian miễn phí có sẵn trên đĩa và không có một tập tin đã có cùng tên trong thư mục này. ErrorInternalErrorDetected=Lỗi được phát hiện -ErrorNoRequestRan=Không có yêu cầu chạy +ErrorNoRequestRan=Không có yêu cầu đã chạy ErrorWrongHostParameter=Tham số máy chủ sai -ErrorYourCountryIsNotDefined=Đất nước các bạn không được xác định. Đi đến Trang chủ-Setup-Chỉnh sửa và đăng lại hình thức. -ErrorRecordIsUsedByChild=Không thể xóa hồ sơ này. Kỷ lục này được sử dụng bởi ít nhất một hồ sơ trẻ em. +ErrorYourCountryIsNotDefined=Quốc gia của bạn không được xác định. Đi đến Trang chủ-Thiết lập-Chỉnh sửa và đăng lại mẫu. +ErrorRecordIsUsedByChild=Không thể xóa bản ghi này. Bản ghi này được sử dụng bởi ít nhất một bản ghi con. ErrorWrongValue=Giá trị sai ErrorWrongValueForParameterX=Giá trị sai cho tham số %s -ErrorNoRequestInError=Không yêu cầu trong báo lỗi +ErrorNoRequestInError=Không yêu cầu do lỗi ErrorServiceUnavailableTryLater=Dịch vụ không sẵn sàng cho thời điểm này. Hãy thử lại sau. -ErrorDuplicateField=Giá trị nhân bản trong một lĩnh vực duy nhất -ErrorSomeErrorWereFoundRollbackIsDone=Một số lỗi đã được tìm thấy. Chúng tôi rollback thay đổi. -ErrorConfigParameterNotDefined=Thông số %s không được định nghĩa trong tập tin cấu hình Dolibarr conf.php. -ErrorCantLoadUserFromDolibarrDatabase=Không thể tìm thấy người dùng %s trong cơ sở dữ liệu Dolibarr. -ErrorNoVATRateDefinedForSellerCountry=Lỗi, không có giá vat xác định cho đất nước '%s'. -ErrorNoSocialContributionForSellerCountry=Lỗi, không có loại đóng góp xã hội được xác định cho đất nước '%s'. -ErrorFailedToSaveFile=Lỗi, không lưu tập tin. +ErrorDuplicateField=Trùng giá trị trong trường duy nhất +ErrorSomeErrorWereFoundRollbackIsDone=Một vài lỗi đã được tìm thấy. Chúng tôi đã thay đổi trở lại +ErrorConfigParameterNotDefined=Thông số %s không được định nghĩa bên trong tập tin cấu hình Dolibarr conf.php. +ErrorCantLoadUserFromDolibarrDatabase=Không tìm thấy người dùng %s trong cơ sở dữ liệu Dolibarr. +ErrorNoVATRateDefinedForSellerCountry=Lỗi, không xác định tỉ lệ VAT cho quốc gia '%s'. +ErrorNoSocialContributionForSellerCountry=Lỗi, không xác định loại đóng góp xã hội cho quốc gia '%s'. +ErrorFailedToSaveFile=Lỗi, lưu tập tin thất bại SetDate=Thiết lập ngày SelectDate=Chọn một ngày SeeAlso=Xem thêm %s -SeeHere=See here -BackgroundColorByDefault=Màu mặc định nền +SeeHere=Xem ở đây +BackgroundColorByDefault=Màu nền mặc định FileNotUploaded=Các tập tin không được tải lên FileUploaded=Các tập tin được tải lên thành công -FileWasNotUploaded=Một tập tin được lựa chọn để đính kèm nhưng vẫn chưa được tải lên. Bấm vào nút "Đính kèm tập tin" cho việc này. -NbOfEntries=Nb các mục -GoToWikiHelpPage=Đọc trợ giúp trực tuyến (cần truy cập Internet) +FileWasNotUploaded=Một tập tin được chọn để đính kèm nhưng vẫn chưa được tải lên. Bấm vào nút "Đính kèm tập tin" cho việc này. +NbOfEntries=Nb of entries +GoToWikiHelpPage=Đọc giúp đỡ online (cần có internet để truy cập) GoToHelpPage=Đọc giúp đỡ -RecordSaved=Ghi lưu -RecordDeleted=Ghi lại bị xóa -LevelOfFeature=Mức độ tính năng +RecordSaved=Bản ghi đã lưu +RecordDeleted=Bản ghi đã xóa +LevelOfFeature=Mức tính năng NotDefined=Không xác định -DefinedAndHasThisValue=Xác định và giá trị -IsNotDefined=không xác định -DolibarrInHttpAuthenticationSoPasswordUseless=Chế độ xác thực Dolibarr được thiết lập để %s trong tập tin cấu hình conf.php.
Điều này có nghĩa rằng cơ sở dữ liệu mật khẩu là ở ngoài để Dolibarr, vì vậy thay đổi lĩnh vực này có thể không có tác dụng. -Administrator=Quản trị viên +DefinedAndHasThisValue=Đã xác định và giá trị cho +IsNotDefined=Không xác định +DolibarrInHttpAuthenticationSoPasswordUseless=Chế độ xác thực Dolibarr được thiết lập cho %s trong tập tin cấu hình conf.php.
Điều này có nghĩa là cơ sở dữ liệu mật khẩu ở ngoài Dolibarr, vì vậy việc thay đổi trường này không có tác dụng. +Administrator=Quản trị Undefined=Không xác định -PasswordForgotten=Mật khẩu đã quên? +PasswordForgotten=Quên mật khẩu ? SeeAbove=Xem ở trên HomeArea=Khu vực nhà LastConnexion=Kết nối cuối PreviousConnexion=Kết nối trước -ConnectedOnMultiCompany=Kết nối trên môi trường +ConnectedOnMultiCompany=Kết nối trong môi trường ConnectedSince=Kết nối từ AuthenticationMode=Chế độ xác thực -RequestedUrl=Url yêu cầu -DatabaseTypeManager=Loại cơ sở dữ liệu quản lý -RequestLastAccess=Yêu cầu truy cập cơ sở dữ liệu mới nhất -RequestLastAccessInError=Yêu cầu cuối cùng truy cập cơ sở dữ liệu lỗi -ReturnCodeLastAccessInError=Quay trở lại mã cho cuối cùng truy cập cơ sở dữ liệu lỗi -InformationLastAccessInError=Thông tin cho cơ sở dữ liệu truy cập cuối cùng lỗi +RequestedUrl=Yêu cầu Url +DatabaseTypeManager=Quản lý loại cơ sở dữ liệu +RequestLastAccess=Yêu cầu truy cập cơ sở dữ liệu cuối +RequestLastAccessInError=Yêu cầu truy cập cơ sở dữ liệu cuối bị lỗi +ReturnCodeLastAccessInError=Trở lại mã truy cập cơ sở dữ liệu cuối bị lỗi +InformationLastAccessInError=Thông tin cho truy cập cơ sở dữ liệu cuối bị lỗi DolibarrHasDetectedError=Dolibarr đã phát hiện một lỗi kỹ thuật InformationToHelpDiagnose=Đây là thông tin có thể giúp chẩn đoán MoreInformation=Thông tin chi tiết TechnicalInformation=Thông tin kỹ thuật -NotePublic=Lưu ý (công cộng) -NotePrivate=Lưu ý (tư nhân) -PrecisionUnitIsLimitedToXDecimals=Dolibarr đã được thiết lập để hạn chế độ chính xác của các đơn giá cho %s thập phân. +NotePublic=Ghi chú (công khai) +NotePrivate=Ghi chú (cá nhân) +PrecisionUnitIsLimitedToXDecimals=Dolibarr đã được thiết lập để giới hạn độ chính xác của các đơn giá cho %s theo thập phân. DoTest=Kiểm tra -ToFilter=Lọc -WarningYouHaveAtLeastOneTaskLate=Cảnh báo, bạn có ít nhất một yếu tố đó đã vượt quá sự chậm trễ khoan dung. +ToFilter=Bộ lọc +WarningYouHaveAtLeastOneTaskLate=Cảnh báo, bạn có ít nhất một yếu tố đó đã vượt quá dung sai cho phép. yes=có Yes=Có -no=không có -No=Không có +no=không +No=Không All=Tất cả -Home=Trang chủ -Help=Trợ giúp -OnlineHelp=Hỗ trợ trực tuyến +Home=Nhà +Help=Giúp đỡ +OnlineHelp=Giúp đỡ online PageWiki=Trang wiki Always=Luôn luôn Never=Không bao giờ Under=dưới -Period=Thời gian -PeriodEndDate=Ngày kết thúc trong khoảng thời gian +Period=Thời hạn +PeriodEndDate=Ngày cuối trong thời hạn Activate=Kích hoạt -Activated=Kích hoạt -Closed=Đóng -Closed2=Đóng -Enabled=Bật -Deprecated=Phản đối -Disable=Vô hiệu hoá -Disabled=Người khuyết tật +Activated=Đã kích hoạt +Closed=Đã đóng +Closed2=Đã đóng +Enabled=Đã bật +Deprecated=Đã bác bỏ +Disable=Tắt +Disabled=Đã tắt Add=Thêm AddLink=Thêm liên kết Update=Cập nhật -AddActionToDo=Thêm sự kiện vào làm -AddActionDone=Thêm sự kiện thực hiện +AddActionToDo=Thêm sự kiện cần làm +AddActionDone=Thêm sự kiện đã hoàn thành Close=Đóng Close2=Đóng Confirm=Xác nhận -ConfirmSendCardByMail=Bạn có thực sự muốn gửi nội dung của thẻ này qua đường bưu điện đến %s ? +ConfirmSendCardByMail=Bạn có thực sự muốn gửi nội dung của thẻ này qua đường thư đến %s ? Delete=Xóa -Remove=Hủy bỏ -Resiliate=Resiliate -Cancel=Hủy bỏ -Modify=Sửa đổi -Edit=Chỉnh sửa +Remove=Gỡ bỏ +Resiliate=Giải trừ +Cancel=Hủy +Modify=Điều chỉnh +Edit=Sửa Validate=Xác nhận -ValidateAndApprove=Validate and Approve +ValidateAndApprove=Xác nhận và Duyệt ToValidate=Để xác nhận Save=Lưu -SaveAs=Save As -TestConnection=Kết nối thử nghiệm -ToClone=Clone -ConfirmClone=Chọn dữ liệu bạn muốn sao chép: -NoCloneOptionsSpecified=Không có dữ liệu để sao lưu được xác định. +SaveAs=Lưu thành +TestConnection=Kiểm tra kết nối +ToClone=Nhân bản +ConfirmClone=Chọn dữ liệu bạn muốn nhân bản: +NoCloneOptionsSpecified=Không có dữ liệu nhân bản được xác định. Of=của Go=Tới -Run=Run -CopyOf=Bản sao -Show=Hiện -ShowCardHere=Hiện thẻ +Run=Hoạt động +CopyOf=Bản sao của +Show=Hiển thị +ShowCardHere=Thẻ hiển thị Search=Tìm kiếm SearchOf=Tìm kiếm -Valid=Hợp lệ -Approve=Phê duyệt -Disapprove=Disapprove -ReOpen=Re-Open +Valid=Xác nhận +Approve=Duyệt +Disapprove=Không chấp thuận +ReOpen=Mở lại Upload=Gửi tập tin ToLink=Liên kết Select=Chọn -Choose=Chọn +Choose=Lựa ChooseLangage=Vui lòng chọn ngôn ngữ của bạn -Resize=Thay đổi kích thước +Resize=Đổi kích thước Recenter=Recenter -Author=Tác giả -User=Người sử dụng -Users=Người sử dụng +Author=Quyền +User=Người dùng +Users=Người dùng Group=Nhóm Groups=Nhóm -NoUserGroupDefined=No user group defined +NoUserGroupDefined=Không có nhóm người dùng được xác định Password=Mật khẩu PasswordRetype=Nhập lại mật khẩu của bạn -NoteSomeFeaturesAreDisabled=Lưu ý rằng rất nhiều tính năng / modules bị vô hiệu hóa trong trình diễn này. +NoteSomeFeaturesAreDisabled=Lưu ý rằng rất nhiều tính năng/modules bị vô hiệu hóa trong trình diễn này. Name=Tên -Person=Người +Person=Cá nhân Parameter=Thông số Parameters=Các thông số Value=Giá trị @@ -190,17 +190,17 @@ Code=Mã Type=Loại Language=Ngôn ngữ MultiLanguage=Đa ngôn ngữ -Note=Lưu ý -CurrentNote=Lưu ý hiện tại +Note=Ghi chú +CurrentNote=Ghi chú hiện tại Title=Tiêu đề Label=Nhãn -RefOrLabel=Tài liệu tham khảo. hay nhãn hiệu -Info=Đăng nhập +RefOrLabel=Tham chiếu hoặc nhãn +Info=Bản ghi Family=Gia đình Description=Mô tả Designation=Mô tả -Model=Mô hình -DefaultModel=Mô hình mặc định +Model=Kiểu +DefaultModel=Kiểu mặc định Action=Sự kiện About=Về Number=Số @@ -211,37 +211,40 @@ Limit=Giới hạn Limits=Giới hạn DevelopmentTeam=Nhóm phát triển Logout=Đăng xuất -NoLogoutProcessWithAuthMode=Không có tính năng ngắt kết nối applicative với chế độ xác thực %s +NoLogoutProcessWithAuthMode=Không áp dụng tính năng ngắt kết nối với chế độ xác thực %s Connection=Kết nối Setup=Thiết lập -Alert=Báo +Alert=Cảnh báo Previous=Trước Next=Tiếp theo Cards=Thẻ Card=Thẻ Now=Bây giờ +HourStart=Start hour Date=Ngày -DateAndHour=Date and hour +DateAndHour=Ngày và giờ DateStart=Ngày bắt đầu DateEnd=Ngày kết thúc DateCreation=Ngày tạo -DateModification=Ngày sửa đổi -DateModificationShort=Modif. ngày -DateLastModification=Cuối ngày sửa đổi +DateModification=Ngày điều chỉnh +DateModificationShort=Ngày điều chỉnh +DateLastModification=Ngày điều chỉnh cuối DateValidation=Ngày xác nhận DateClosing=Ngày kết thúc DateDue=Ngày đáo hạn DateValue=Giá trị ngày DateValueShort=Giá trị ngày DateOperation=Ngày hoạt động -DateOperationShort=Oper. Ngày +DateOperationShort=Ngày hoạt động DateLimit=Giới hạn ngày DateRequest=Ngày yêu cầu -DateProcess=Ngày quá trình -DatePlanShort=Ngày bào -DateRealShort=Ngày thực. -DateBuild=Báo cáo xây dựng ngày +DateProcess=Ngày thực hiện +DatePlanShort=Ngày dự kiến +DateRealShort=Ngày thực tế +DateBuild=Ngày làm báo cáo DatePayment=Ngày thanh toán +DateApprove=Approving date +DateApprove2=Approving date (second approval) DurationYear=năm DurationMonth=tháng DurationWeek=tuần @@ -256,7 +259,7 @@ Week=Tuần Day=Ngày Hour=Giờ Minute=Phút -Second=Thứ hai +Second=Thứ nhì Years=Năm Months=Tháng Days=Ngày @@ -264,18 +267,18 @@ days=ngày Hours=Giờ Minutes=Phút Seconds=Giây -Weeks=Weeks +Weeks=Tuần Today=Hôm nay Yesterday=Hôm qua Tomorrow=Ngày mai -Morning=Buổi sáng +Morning=Sáng Afternoon=Chiều -Quadri=Quadri -MonthOfDay=Tháng ngày +Quadri=Quý +MonthOfDay=Tháng của ngày HourShort=H MinuteShort=mn -Rate=Tỷ giá -UseLocalTax=Bao gồm thuế +Rate=Tỷ lệ +UseLocalTax=Gồm thuế Bytes=Bytes KiloBytes=Kilobyte MegaBytes=MB @@ -286,168 +289,170 @@ Kb=Kb Mb=Mb Gb=Gb Tb=Tb -Cut=Cut -Copy=Sao chép +Cut=Cắt +Copy=Copy Paste=Dán Default=Mặc định DefaultValue=Giá trị mặc định DefaultGlobalValue=Giá trị toàn cầu Price=Giá UnitPrice=Đơn giá -UnitPriceHT=Đơn giá (net) +UnitPriceHT=Đơn giá (chưa thuế) UnitPriceTTC=Đơn giá -PriceU=UP -PriceUHT=UP (net) +PriceU=U.P. +PriceUHT=U.P. (net) AskPriceSupplierUHT=P.U. HT Requested -PriceUTTC=UP +PriceUTTC=U.P. Amount=Số tiền -AmountInvoice=Lượng hóa đơn +AmountInvoice=Số tiền hóa đơn AmountPayment=Số tiền thanh toán -AmountHTShort=Số tiền (ròng) -AmountTTCShort=(Bao gồm thuế). Số tiền -AmountHT=Số tiền (đã trừ thuế) -AmountTTC=(Bao gồm thuế). Số tiền +AmountHTShort=Số tiền (chưa thuế) +AmountTTCShort=Số tiền (gồm thuế) +AmountHT=Số tiền (chưa thuế) +AmountTTC=Số tiền (gồm thuế) AmountVAT=Số tiền thuế AmountLT1=Số tiền thuế 2 AmountLT2=Số tiền thuế 3 -AmountLT1ES=Số tiền RE -AmountLT2ES=Số tiền IRPF +AmountLT1ES=Amount RE +AmountLT2ES=Amount IRPF AmountTotal=Tổng số tiền AmountAverage=Số tiền trung bình -PriceQtyHT=Giá cho số lượng này (đã trừ thuế) -PriceQtyMinHT=Giá số lượng phút. (Đã trừ thuế) -PriceQtyTTC=Giá cho số lượng (bao thuế). Này -PriceQtyMinTTC=Giá số lượng phút. (Inc. Thuế) -Percentage=Tỷ lệ phần trăm -Total=Tổng số -SubTotal=Tổng số tiền -TotalHTShort=Tổng số (net) -TotalTTCShort=(Bao gồm thuế). Tổng số -TotalHT=Tổng số (đã trừ thuế) -TotalHTforthispage=Tổng số (đã trừ thuế) cho trang này -TotalTTC=(Bao gồm thuế). Tổng số -TotalTTCToYourCredit=Tổng số (inc. Thuế) để tín dụng của bạn -TotalVAT=Tổng số thuế -TotalLT1=Tổng số thuế 2 -TotalLT2=Tổng số thuế 3 -TotalLT1ES=Tổng RE -TotalLT2ES=Tổng số IRPF -IncludedVAT=Đã bao gồm thuế -HT=Sau thuế -TTC=Inc thuế +PriceQtyHT=Giá cho số lượng này (chưa thuế) +PriceQtyMinHT=Giá cho số lượng tối thiểu (gồm thuế). +PriceQtyTTC=Giá cho số lượng này (gồm thuế) +PriceQtyMinTTC=Giá cho số lượng tối thiểu (gồm thuế) +Percentage=Phần trăm +Total=Tổng +SubTotal=Tổng phụ +TotalHTShort=Tổng (chưa thuế) +TotalTTCShort=Tổng (gồm thuế) +TotalHT=Tổng (chưa thuế) +TotalHTforthispage=Tổng (có thuế) cho trang này +TotalTTC=Tổng (gồm thuế) +TotalTTCToYourCredit=Tổng (gồm thuế) cho nợ của bạn +TotalVAT=Tổng thuế +TotalLT1=Tổng thuế 2 +TotalLT2=Tổng thuế 3 +TotalLT1ES=Total RE +TotalLT2ES=Total IRPF +IncludedVAT=Đã gồm thuế +HT=Chưa thuế +TTC=Gồm thuế VAT=Thuế bán hàng LT1ES=RE LT2ES=IRPF VATRate=Thuế suất Average=Trung bình -Sum=Sum +Sum=Tính tổng Delta=Delta -Module=Mô-đun -Option=Lựa chọn +Module=Module +Option=Tùy chọn List=Danh sách FullList=Danh mục đầy đủ Statistics=Thống kê -OtherStatistics=Số liệu thống kê khác -Status=Tình trạng +OtherStatistics=Thống kê khác +Status=Trạng thái Favorite=Yêu thích ShortInfo=Thông tin. -Ref=Tài liệu tham khảo. +Ref=Tham chiếu 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 -Comment=Nhận xét -Comments=Bình luận -ActionsToDo=Sự kiện làm -ActionsDone=Sự kiện thực hiện -ActionsToDoShort=Để làm -ActionsRunningshort=Bắt đầu -ActionsDoneShort=Xong +RefSupplier=Tham chiếu nhà cung cấp +RefPayment=Tham chiếu thanh toán +CommercialProposalsShort=Đơn hàng đề xuất +Comment=Chú thích +Comments=Chú thích +ActionsToDo=Sự kiện cần làm +ActionsDone=Sự kiện hoàn thành +ActionsToDoShort=Việc cần làm +ActionsRunningshort=Đã bắt đầu +ActionsDoneShort=Đã hoàn thành ActionNotApplicable=Không áp dụng ActionRunningNotStarted=Để bắt đầu -ActionRunningShort=Bắt đầu -ActionDoneShort=Hoàn thành -ActionUncomplete=Uncomplete -CompanyFoundation=Công ty / cơ sở -ContactsForCompany=Liên hệ với bên thứ ba này -ContactsAddressesForCompany=Liên hệ / địa chỉ cho các bên thứ ba này -AddressesForCompany=Địa chỉ cho các bên thứ ba này +ActionRunningShort=Đã bắt đầu +ActionDoneShort=Đã hoàn tất +ActionUncomplete=Không hoàn tất +CompanyFoundation=Công ty/Tổ chức +ContactsForCompany=Liên lạc cho bên thứ ba này +ContactsAddressesForCompany=Liên lạc/địa chỉ cho bên thứ ba này +AddressesForCompany=Địa chỉ cho bên thứ ba này ActionsOnCompany=Sự kiện về bên thứ ba này ActionsOnMember=Sự kiện về thành viên này -NActions=Sự kiện% s -NActionsLate=% S cuối -RequestAlreadyDone=Request already recorded -Filter=Lọc -RemoveFilter=Bỏ bộ lọc -ChartGenerated=Biểu đồ được tạo ra -ChartNotGenerated=Biểu đồ không được tạo ra -GeneratedOn=Xây dựng trên% s -Generate=Tạo -Duration=Thời gian -TotalDuration=Tổng thời gian +NActions=%s sự kiện +NActionsLate=%s cuối +RequestAlreadyDone=Yêu cầu đã được ghi nhận +Filter=Bộ lọc +RemoveFilter=Gỡ bộ lọc +ChartGenerated=Xuất biểu đồ +ChartNotGenerated=Biểu đồ không được xuất +GeneratedOn=Làm trên %s +Generate=Xuất ra +Duration=Thời hạn +TotalDuration=Tổng thời hạn Summary=Tóm tắt MyBookmarks=Dấu trang của tôi OtherInformationsBoxes=Hộp thông tin khác -DolibarrBoard=Ban Dolibarr +DolibarrBoard=Dolibarr board DolibarrStateBoard=Thống kê -DolibarrWorkBoard=Nhiệm vụ công việc của hội đồng quản trị -Available=Có sẵn +DolibarrWorkBoard=Ban tác vụ công việc +Available=Sẵn có NotYetAvailable=Chưa có -NotAvailable=Không có sẵn +NotAvailable=Chưa có Popularity=Phổ biến -Categories=Tags/categories -Category=Tag/category -By=By +Categories=Gán thẻ/phân nhóm +Category=Gán thẻ/phân nhóm +By=Theo From=Từ -to=để +to=đến and=và or=hoặc Other=Khác -Others=Loại khác +Others=Khác OtherInformations=Thông tin khác Quantity=Số lượng Qty=Số lượng -ChangedBy=Thay đổi bằng cách +ChangedBy=Thay đổi bằng +ApprovedBy=Approved by +ApprovedBy2=Approved by (second approval) ReCalculate=Tính toán lại ResultOk=Thành công -ResultKo=Không -Reporting=Báo cáo -Reportings=Báo cáo +ResultKo=Thất bại +Reporting=Việc báo cáo +Reportings=Việc báo cáo Draft=Dự thảo Drafts=Dự thảo -Validated=Xác nhận -Opened=Mở +Validated=Đã xác nhận +Opened=Đã mở New=Mới Discount=Giảm giá Unknown=Không biết -General=Chung +General=Tổng hợp Size=Kích thước -Received=Nhận -Paid=Trả -Topic=Sujet -ByCompanies=Do các bên thứ ba -ByUsers=Người sử dụng +Received=Đã nhận +Paid=Đã trả +Topic=Chủ đề +ByCompanies=Bởi bên thứ ba +ByUsers=Bởi người dùng Links=Liên kết Link=Liên kết -Receipts=Tiền thu -Rejects=Rejects +Receipts=Biên nhận +Rejects=Từ chối Preview=Xem trước NextStep=Bước tiếp theo PreviousStep=Bước trước Datas=Dữ liệu None=Không NoneF=Không -Late=Cuối +Late=Trễ Photo=Hình ảnh Photos=Hình ảnh AddPhoto=Thêm hình ảnh Login=Đăng nhập CurrentLogin=Đăng nhập hiện tại -January=Tháng một +January=Tháng Một February=Tháng Hai -March=Tháng +March=Tháng Ba April=Tháng Tư -May=May +May=Tháng Năm June=Tháng Sáu July=Tháng Bảy August=Tháng Tám @@ -455,11 +460,11 @@ September=Tháng Chín October=Tháng Mười November=Tháng mười một December=Tháng Mười Hai -JanuaryMin=Jan +JanuaryMin=Tháng Một FebruaryMin=Tháng Hai -MarchMin=Mar +MarchMin=Tháng Ba AprilMin=Tháng Tư -MayMin=May +MayMin=Tháng Năm JuneMin=Tháng Sáu JulyMin=Tháng Bảy AugustMin=Tháng Tám @@ -467,149 +472,149 @@ SeptemberMin=Tháng Chín OctoberMin=Tháng Mười NovemberMin=Tháng mười một DecemberMin=Tháng Mười Hai -Month01=Tháng một +Month01=Tháng Một Month02=Tháng Hai -Month03=Tháng +Month03=Tháng Ba Month04=Tháng Tư -Month05=May +Month05=Tháng Năm Month06=Tháng Sáu Month07=Tháng Bảy Month08=Tháng Tám Month09=Tháng Chín Month10=Tháng Mười -Month11=Tháng mười một +Month11=Tháng Mười Một Month12=Tháng Mười Hai -MonthShort01=Jan +MonthShort01=Tháng Một MonthShort02=Tháng Hai -MonthShort03=Mar +MonthShort03=Tháng Ba MonthShort04=Tháng Tư -MonthShort05=May +MonthShort05=Tháng Năm MonthShort06=Tháng Sáu MonthShort07=Tháng Bảy MonthShort08=Tháng Tám MonthShort09=Tháng Chín MonthShort10=Tháng Mười -MonthShort11=Tháng mười một +MonthShort11=Tháng Mười Một MonthShort12=Tháng Mười Hai -AttachedFiles=Tập tin và tài liệu kèm theo -FileTransferComplete=Tập tin đã được tải lên successfuly +AttachedFiles=Được đính kèm tập tin và tài liệu +FileTransferComplete=Tập tin đã được tải lên thành công DateFormatYYYYMM=YYYY-MM DateFormatYYYYMMDD=YYYY-MM-DD -DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH: SS +DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS ReportName=Tên báo cáo ReportPeriod=Kỳ báo cáo ReportDescription=Mô tả Report=Báo cáo -Keyword=Một Clé -Legend=Huyền thoại -FillTownFromZip=Điền vào thành phố từ zip +Keyword=Mot clé +Legend=Chú thích +FillTownFromZip=Fill city from zip Fill=Điền Reset=Thiết lập lại ShowLog=Hiển thị bản ghi File=Tập tin Files=Tập tin NotAllowed=Không được phép -ReadPermissionNotAllowed=Cho phép đọc không được phép -AmountInCurrency=Số tiền tệ trong %s +ReadPermissionNotAllowed=Không có quyền đọc +AmountInCurrency=Số tiền %s trong tiền tệ Example=Ví dụ Examples=Ví dụ NoExample=Không có ví dụ -FindBug=Thông báo lỗi -NbOfThirdParties=Số của bên thứ ba +FindBug=Báo cáo một lỗi +NbOfThirdParties=Số lượng bên thứ ba NbOfCustomers=Số lượng khách hàng NbOfLines=Số dòng NbOfObjects=Số đối tượng -NbOfReferers=Số referrers -Referers=Đề cập đối tượng +NbOfReferers=Số lượng tham chiếu +Referers=Tham chiếu đối tượng TotalQuantity=Tổng số lượng DateFromTo=Từ %s đến %s -DateFrom=Từ% s -DateUntil=Cho đến% s +DateFrom=Từ %s +DateUntil=Cho đến %s Check=Kiểm tra -Uncheck=Uncheck +Uncheck=Không chọn Internal=Nội bộ External=Bên ngoài Internals=Nội bộ Externals=Bên ngoài Warning=Cảnh báo Warnings=Cảnh báo -BuildPDF=Xây dựng PDF -RebuildPDF=Xây dựng lại định dạng file pdf -BuildDoc=Xây dựng Doc -RebuildDoc=Xây dựng lại Doc +BuildPDF=Làm PDF +RebuildPDF=Làm lại định dạng file pdf +BuildDoc=Làm file Doc +RebuildDoc=Làm lại file Doc Entity=Môi trường -Entities=Các đối tượng -EventLogs=Bản ghi -CustomerPreview=Xem trước của khách hàng -SupplierPreview=Nhà cung cấp bản xem trước -AccountancyPreview=Kế toán xem trước -ShowCustomerPreview=Hiện khách hàng xem trước -ShowSupplierPreview=Hiện nhà cung cấp xem trước -ShowAccountancyPreview=Hiện kế toán xem trước -ShowProspectPreview=Hiện khách hàng tiềm năng xem trước -RefCustomer=Tài liệu tham khảo. khách hàng -Currency=Ngoại tệ -InfoAdmin=Thông tin dành cho quản trị viên -Undo=Hoàn tác +Entities=Thực thể +EventLogs=Chú thích +CustomerPreview=Xem trước khách hàng +SupplierPreview=Xem trước nhà cung cấp +AccountancyPreview=Xem trước mã kế toán +ShowCustomerPreview=Xem trước khách hàng hiển thị +ShowSupplierPreview=Xem trước nhà cung cấp hiển thị +ShowAccountancyPreview=Xem trước mã kế toán hiển thị +ShowProspectPreview=Xem trước KH tiềm năng hiển thị +RefCustomer=Tham chiếu khách hàng +Currency=Tiền tệ +InfoAdmin=Thông tin dành cho người quản trị +Undo=Lùi lại Redo=Làm lại ExpandAll=Mở rộng tất cả -UndoExpandAll=Hoàn tác mở rộng +UndoExpandAll=Lùi lại mở rộng Reason=Lý do FeatureNotYetSupported=Tính năng chưa được hỗ trợ CloseWindow=Đóng cửa sổ Question=Câu hỏi -Response=Phản ứng +Response=Đáp trả Priority=Ưu tiên -SendByMail=Gửi bởi Thư điện tử -MailSentBy=Email gửi -TextUsedInTheMessageBody=Email cơ thể +SendByMail=Gửi bởi Email +MailSentBy=Email gửi bởi +TextUsedInTheMessageBody=Thân email SendAcknowledgementByMail=Gửi Ack. qua email NoEMail=Không có email -NoMobilePhone=Không có điện thoại di động +NoMobilePhone=No mobile phone Owner=Chủ sở hữu -DetectedVersion=Phiên bản phát hiện +DetectedVersion=Đã phát hiện phiên bản FollowingConstantsWillBeSubstituted=Các hằng số sau đây sẽ được thay thế bằng giá trị tương ứng. Refresh=Làm mới BackToList=Trở lại danh sách GoBack=Quay trở lại -CanBeModifiedIfOk=Có thể được sửa đổi nếu hợp lệ -CanBeModifiedIfKo=Có thể được sửa đổi nếu không hợp lệ -RecordModifiedSuccessfully=Ghi lại đổi thành công -RecordsModified=Hồ sơ %s sửa đổi +CanBeModifiedIfOk=Có thể được điều chỉnh nếu hợp lệ +CanBeModifiedIfKo=Có thể được điều sửa nếu không hợp lệ +RecordModifiedSuccessfully=Bản ghi được điều chỉnh thành công +RecordsModified=% bản ghi đã điều chỉnh AutomaticCode=Mã tự động -NotManaged=Không quản lý +NotManaged=Không được quản lý FeatureDisabled=Tính năng bị vô hiệu hóa MoveBox=Di chuyển hộp %s -Offered=Cung cấp +Offered=Đã đề nghị NotEnoughPermissions=Bạn không có quyền cho hành động này SessionName=Tên phiên Method=Phương pháp Receive=Nhận PartialWoman=Một phần PartialMan=Một phần -TotalWoman=Tổng số -TotalMan=Tổng số -NeverReceived=Không bao giờ nhận được -Canceled=Hủy bỏ -YouCanChangeValuesForThisListFromDictionarySetup=Bạn có thể thay đổi giá trị cho danh sách này từ trình đơn thiết lập - từ điển +TotalWoman=Tổng +TotalMan=Tổng +NeverReceived=Chưa từng nhận +Canceled=Đã hủy +YouCanChangeValuesForThisListFromDictionarySetup=Bạn có thể thay đổi giá trị cho danh sách này từ menu thiết lập-từ điển Color=Màu Documents=Tập tin liên kết DocumentsNb=Các tập tin liên kết (%s) -Documents2=Tài liệu -BuildDocuments=Các tài liệu được tạo ra -UploadDisabled=Tải khuyết tật -MenuECM=Tài liệu +Documents2=Chứng từ +BuildDocuments=Đã xuất chứng từ +UploadDisabled=Đã tắt tải lên +MenuECM=Chứng từ MenuAWStats=AWStats MenuMembers=Thành viên -MenuAgendaGoogle=Chương trình nghị sự của Google -ThisLimitIsDefinedInSetup=Hạn Dolibarr (Menu nhà thiết lập bảo mật): %s Kb, PHP giới hạn: %s Kb -NoFileFound=Không có tài liệu được lưu trong thư mục này +MenuAgendaGoogle=Google agenda +ThisLimitIsDefinedInSetup=Giới hạn của Dolibarr (Thực đơn Nhà-Thiết lập-Bảo mật): %s Kb, giới hạn của PHP: %s Kb +NoFileFound=Không có chứng từ được lưu trong thư mục này CurrentUserLanguage=Ngôn ngữ hiện tại -CurrentTheme=Chủ đề hiện tại -CurrentMenuManager=Quản lý trình đơn hiện tại -DisabledModules=Module khuyết tật -For=Đối với -ForCustomer=Đối với khách hàng +CurrentTheme=Theme hiện tại +CurrentMenuManager=Quản lý menu hiện tại +DisabledModules=Module đã tắt +For=Cho +ForCustomer=cho khách hàng Signature=Chữ ký HidePassword=Hiện lệnh với mật khẩu ẩn UnHidePassword=Hiển thị lệnh thực với mật khẩu rõ ràng @@ -620,35 +625,35 @@ Notes=Ghi chú AddNewLine=Thêm dòng mới AddFile=Thêm tập tin ListOfFiles=Danh sách các tập tin có sẵn -FreeZone=Vào cửa miễn phí -FreeLineOfType=Nhập miễn phí các loại -CloneMainAttributes=Clone đối tượng với các thuộc tính chính của nó +FreeZone=Gõ tự do +FreeLineOfType=Loại tự do gõ +CloneMainAttributes=Nhân bản đối tượng và các thuộc tính chính của nó PDFMerge=PDF Merge -Merge=Hợp nhất +Merge=Merge PrintContentArea=Hiển thị trang in khu vực nội dung chính -MenuManager=Quản lý đơn -NoMenu=Không có trình đơn phụ -WarningYouAreInMaintenanceMode=Cảnh báo, bạn đang ở trong một chế độ bảo trì, vì vậy chỉ đăng nhập %s được phép sử dụng ứng dụng tại thời điểm này. +MenuManager=Menu quản lý +NoMenu=Không có sub-menu +WarningYouAreInMaintenanceMode=Cảnh báo, bạn đang trong chế độ bảo trì, vì vậy chỉ có đăng nhập %s là được phép sử dụng ứng dụng tại thời điểm này. CoreErrorTitle=Lỗi hệ thống -CoreErrorMessage=Xin lỗi, đã xảy ra lỗi. Kiểm tra các bản ghi hoặc liên hệ với quản trị hệ thống của bạn. +CoreErrorMessage=Xin lỗi, đã xảy ra lỗi. Kiểm tra các bản ghi hoặc liên lạc với quản trị hệ thống của bạn. CreditCard=Thẻ tín dụng -FieldsWithAreMandatory=Các lĩnh vực với %s là bắt buộc -FieldsWithIsForPublic=Các lĩnh vực với %s được hiển thị trên danh sách công khai của các thành viên. Nếu bạn không muốn điều này, đánh dấu vào hộp "công cộng". -AccordingToGeoIPDatabase=(Theo GeoIP chuyển đổi) +FieldsWithAreMandatory=Các trường với %s là bắt buộc +FieldsWithIsForPublic=Các trường với %s được hiển thị trên danh sách công khai của các thành viên. Nếu bạn không muốn điều này, đánh dấu vào hộp "công khai". +AccordingToGeoIPDatabase=(according to GeoIP convertion) Line=Dòng NotSupported=Không được hỗ trợ RequiredField=Dòng bắt buộc Result=Kết quả ToTest=Kiểm tra ValidateBefore=Thẻ phải được xác nhận trước khi sử dụng tính năng này -Visibility=Tầm nhìn -Private=Tin -Hidden=Thành viên ẩn danh +Visibility=Hiển thị +Private=Cá nhân +Hidden=Đã ẩn Resources=Tài nguyên Source=Nguồn Prefix=Tiền tố -Before=Trước khi -After=Sau khi +Before=Trước +After=Sau IPAddress=Địa chỉ IP Frequency=Tần số IM=Nhắn tin tức thời @@ -658,20 +663,20 @@ OptionalFieldsSetup=Thuộc tính thiết lập thêm URLPhoto=URL của hình ảnh / logo SetLinkToThirdParty=Liên kết đến một bên thứ ba CreateDraft=Tạo dự thảo -SetToDraft=Về dự thảo -ClickToEdit=Nhấn vào đây để chỉnh sửa -ObjectDeleted=Đối tượng% s bị xóa +SetToDraft=Trở về dự thảo +ClickToEdit=Nhấn vào để sửa +ObjectDeleted=Đối tượng %s đã xóa ByCountry=Theo quốc gia -ByTown=Bởi thị trấn +ByTown=Theo thị trấn ByDate=Theo ngày -ByMonthYear=Theo tháng / năm -ByYear=Đến năm +ByMonthYear=Theo tháng/năm +ByYear=Theo năm ByMonth=Theo tháng -ByDay=Đến ngày -BySalesRepresentative=Đại diện bán hàng -LinkedToSpecificUsers=Liên kết với một số liên lạc người dùng cụ thể +ByDay=Theo ngày +BySalesRepresentative=Theo Đại diện bán hàng +LinkedToSpecificUsers=Đã liên kết với một số liên lạc người dùng cụ thể DeleteAFile=Xóa một tập tin -ConfirmDeleteAFile=Bạn có chắc chắn muốn xóa tập tin +ConfirmDeleteAFile=Bạn có chắc muốn xóa tập tin NoResults=Không có kết quả ModulesSystemTools=Module công cụ Test=Kiểm tra @@ -685,43 +690,45 @@ Access=Truy cập HelpCopyToClipboard=Sử dụng tổ hợp phím Ctrl + C để copy vào clipboard SaveUploadedFileWithMask=Lưu tập tin trên máy chủ với tên "%s" (nếu không "%s") OriginFileName=Tên tập tin gốc -SetDemandReason=Bộ nguồn +SetDemandReason=Thiết lập nguồn SetBankAccount=Xác định tài khoản ngân hàng -AccountCurrency=Tài khoản ngoại tệ +AccountCurrency=Tài khoản Tiền tệ ViewPrivateNote=Xem ghi chú -XMoreLines=Dòng (các) %s ẩn -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 -GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide. +XMoreLines=%s dòng ẩn +PublicUrl=URL công khai +AddBox=Thêm hộp +SelectElementAndClickRefresh=Chọn một phần tử và nhấn Làm mới +PrintFile=In tập tin %s +ShowTransaction=Hiển thị giao dịch +GoIntoSetupToChangeLogo=Vào Nhà-Thiết lập-Công ty để đổi logo hoặc vào Nhà-Thiết lập-Hiển thị để ẩn. +Deny=Deny +Denied=Denied # Week day -Monday=Thứ hai -Tuesday=Thứ ba -Wednesday=Thứ tư -Thursday=Thứ năm -Friday=Thứ sáu -Saturday=Thứ bảy +Monday=Thứ Hai +Tuesday=Thứ Ba +Wednesday=Thứ Tư +Thursday=Thứ Năm +Friday=Thứ Sáu +Saturday=Thứ Bảy Sunday=Chủ Nhật -MondayMin=Mo -TuesdayMin=Tu -WednesdayMin=Chúng tôi -ThursdayMin=Th -FridayMin=Cha -SaturdayMin=Sa -SundayMin=Su -Day1=Thứ hai -Day2=Thứ ba -Day3=Thứ tư -Day4=Thứ năm -Day5=Thứ sáu -Day6=Thứ bảy +MondayMin=Hai +TuesdayMin=Ba +WednesdayMin=Tư +ThursdayMin=Năm +FridayMin=Sáu +SaturdayMin=Bảy +SundayMin=CN +Day1=Thứ Hai +Day2=Thứ Ba +Day3=Thứ Tư +Day4=Thứ Năm +Day5=Thứ Sáu +Day6=Thứ Bảy Day0=Chủ Nhật -ShortMonday=M -ShortTuesday=T -ShortWednesday=W -ShortThursday=T -ShortFriday=F -ShortSaturday=S -ShortSunday=S +ShortMonday=H +ShortTuesday=B +ShortWednesday=T +ShortThursday=N +ShortFriday=S +ShortSaturday=B +ShortSunday=C diff --git a/htdocs/langs/vi_VN/orders.lang b/htdocs/langs/vi_VN/orders.lang index 340e3f907fa91..23623723cd2f4 100644 --- a/htdocs/langs/vi_VN/orders.lang +++ b/htdocs/langs/vi_VN/orders.lang @@ -1,170 +1,172 @@ # Dolibarr language file - Source file is en_US - orders -OrdersArea=Khu vực đơn hàng của khách hàng -SuppliersOrdersArea=Khu vực đơn đặt hàng của nhà cung cấp -OrderCard=Thẻ đơn hàng -OrderId=Mã đơn hàng -Order=Đơn đặt hàng -Orders=Đơn đặt hàng -OrderLine=Dòng thứ tự +OrdersArea=Khu vực đặt hàng của khách hàng +SuppliersOrdersArea=Khu vực đặt hàng của nhà cung cấp +OrderCard=Thẻ đặt hàng +OrderId=Mã đặt hàng +Order=Đơn hàng +Orders=Đơn hàng +OrderLine=Chi tiết đơn hàng OrderFollow=Theo dõi OrderDate=Ngày đặt hàng -OrderToProcess=Để xử lý -NewOrder=Đơn đặt hàng mới -ToOrder=Tạo đơn đặt hàng -MakeOrder=Tạo đơn đặt hàng -SupplierOrder=Để nhà cung cấp -SuppliersOrders=Nhà cung cấp đơn đặt hàng -SuppliersOrdersRunning=Đơn đặt hàng của các nhà cung cấp hiện tại -CustomerOrder=Đơn đặt hàng -CustomersOrders=Customers orders -CustomersOrdersRunning=Đơn đặt hàng của khách hàng hiện tại của -CustomersOrdersAndOrdersLines=Đơn đặt hàng của khách hàng và đơn đặt hàng của dòng -OrdersToValid=Customers orders to validate -OrdersToBill=Customers orders delivered -OrdersInProcess=Customers orders in process -OrdersToProcess=Customers orders to process -SuppliersOrdersToProcess=Đơn đặt hàng của nhà cung cấp cho quá trình -StatusOrderCanceledShort=Hủy bỏ +OrderToProcess=Đơn hàng xử lý +NewOrder=Đơn hàng mới +ToOrder=Tạo đơn hàng +MakeOrder=Tạo đơn hàng +SupplierOrder=Đơn hàng nhà cung cấp +SuppliersOrders=Đơn hàng nhà cung cấp +SuppliersOrdersRunning=Đơn hàng nhà cung cấp hiện tại +CustomerOrder=Đơn hàng khách hàng +CustomersOrders=Đơn hàng khách hàng +CustomersOrdersRunning=Đơn hàng khách hàng hiện tại +CustomersOrdersAndOrdersLines=Đơn hàng khách hàng và chi tiết đơn hàng +OrdersToValid=Đơn hàng khách hàng cần xác nhận +OrdersToBill=Đơn hàng khách hàng đã gửi +OrdersInProcess=Đơn hàng khách hàng đang xử lý +OrdersToProcess=Đơn hàng khách hàng để xử lý +SuppliersOrdersToProcess=Đơn hàng nhà cung cấp để xử lý +StatusOrderCanceledShort=Đã hủy bỏ StatusOrderDraftShort=Dự thảo -StatusOrderValidatedShort=Xác nhận -StatusOrderSentShort=Trong quá trình -StatusOrderSent=Lô hàng trong quá trình -StatusOrderOnProcessShort=Ordered +StatusOrderValidatedShort=Đã xác nhận +StatusOrderSentShort=Đang xử lý +StatusOrderSent=Đang vận chuyển +StatusOrderOnProcessShort=Đã đặt hàng StatusOrderProcessedShort=Đã xử lý StatusOrderToBillShort=Đã giao hàng -StatusOrderToBill2Short=Thanh toán -StatusOrderApprovedShort=Đã được duyệt -StatusOrderRefusedShort=Đã bị từ chối -StatusOrderToProcessShort=Đang xử lý +StatusOrderToBill2Short=Để thanh toán +StatusOrderApprovedShort=Đã duyệt +StatusOrderRefusedShort=Đã từ chối +StatusOrderToProcessShort=Để xử lý StatusOrderReceivedPartiallyShort=Đã nhận một phần StatusOrderReceivedAllShort=Đã nhận đủ -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 +StatusOrderCanceled=Đã hủy +StatusOrderDraft=Dự thảo (cần được xác nhận) +StatusOrderValidated=Đã xác nhận +StatusOrderOnProcess=Đã đặt hàng - Đang chờ nhận +StatusOrderOnProcessWithValidation=Đã đặt hàng - Đang chờ nhận hoặc xác nhận StatusOrderProcessed=Đã xử lý StatusOrderToBill=Đã giao hàng -StatusOrderToBill2=Thanh toán -StatusOrderApproved=Đã được duyệt -StatusOrderRefused=Đã bị từ chối +StatusOrderToBill2=Để thanh toán +StatusOrderApproved=Đã duyệt +StatusOrderRefused=Đã từ chối StatusOrderReceivedPartially=Đã nhận một phần -StatusOrderReceivedAll=Đã nhận đầy đủ -ShippingExist=A shipment exists -ProductQtyInDraft=Product quantity into draft orders -ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered -DraftOrWaitingApproved=Nháp hoặc đã được phê duyệt nhưng chưa đặt hàng -DraftOrWaitingShipped=Nháp hoặc đã xác nhận nhưng chưa vận chuyển +StatusOrderReceivedAll=Đã nhận đủ +ShippingExist=Chưa vận chuyển +ProductQtyInDraft=Nhập lượng sản phẩm vào đơn hàng dự thảo +ProductQtyInDraftOrWaitingApproved=Nhập số lượng sản phẩm vào đơn hàng dự thảo hoặc đơn hàng đã duyệt nhưng chưa đặt hàng +DraftOrWaitingApproved=Dự thảo hoặc đã duyệt nhưng chưa đặt hàng +DraftOrWaitingShipped=Dự thảo hoặc đã xác nhận nhưng chưa vận chuyển MenuOrdersToBill=Đơn hàng đã giao -MenuOrdersToBill2=Billable orders +MenuOrdersToBill2=Đơn hàng có thể lập hóa đơn 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 +SearchACustomerOrder=Tìm kiếm một đơn hàng khách hàng +SearchASupplierOrder=Tìm kiếm đơn hàng nhà cung cấp +ShipProduct=Giao hàng Discount=Giảm giá CreateOrder=Tạo đơn hàng RefuseOrder=Từ chối đơn hàng -ApproveOrder=Approve order -Approve2Order=Approve order (second level) -ValidateOrder=Xác nhận đặt hàng +ApproveOrder=Duyệt đơn hàng +Approve2Order=Duyệt đơn hàng (mức thứ hai) +ValidateOrder=Xác nhận đơn hàng UnvalidateOrder=Đơn hàng chưa xác nhận DeleteOrder=Xóa đơn hàng CancelOrder=Hủy đơn hàng AddOrder=Tạo đơn hàng -AddToMyOrders=Thêm vào đơn đặt hàng của tôi -AddToOtherOrders=Thêm vào đơn đặt hàng khác -AddToDraftOrders=Thêm vào đơn hàng nháp -ShowOrder=Hiển thị đơn đặt hàng -NoOpenedOrders=Không có đơn hàng được mở -NoOtherOpenedOrders=Không có đơn hàng được mở khác -NoDraftOrders=Không có đơn hàng nháp -OtherOrders=Đơn đặt hàng khác -LastOrders=Đơn đặt hàng cuối %s -LastModifiedOrders=Đơn đặt hàng đã điều chỉnh cuối cùng %s -LastClosedOrders=Đơn hàng đã đóng cuối cùng %s -AllOrders=Tất cả đơn đặt hàng -NbOfOrders=Số đơn đặt hàng -OrdersStatistics=Thống kê đơn đặt hàng -OrdersStatisticsSuppliers=Số liệu thống kê để nhà cung cấp -NumberOfOrdersByMonth=Số đơn đặt hàng theo tháng -AmountOfOrdersByMonthHT=Số lượng đơn đặt hàng theo tháng (sau thuế) -ListOfOrders=Danh sách đơn đặt hàng -CloseOrder=Đóng đơn đặt hàng -ConfirmCloseOrder=Bạn có chắc là bạn muốn thiết lập đơn đạt hàng này để giao? Khi một đơn hàng được giao, nó có thể được thiết lập để tính tiền. -ConfirmCloseOrderIfSending=Bạn có chắc là bạn muốn đóng theo đơn đặt hàng này? Bạn phải đóng đơn đặt hàng chỉ khi tất cả vận chuyển được thực hiện. -ConfirmDeleteOrder=Bạn Bạn có chắc chắn muốn xóa đơn đặt hàng này? -ConfirmValidateOrder=Bạn có chắc chắn bạn muốn xác nhận đơn đặt hàng này dưới tên %s ? -ConfirmUnvalidateOrder=Bạn Bạn có chắc chắn muốn chuyển lại đơn đặt hàng %s về trạng thái soạn thảo? -ConfirmCancelOrder=Bạn có chắc chắn bạn muốn hủy bỏ đơn đặt hàng này? -ConfirmMakeOrder=Bạn có chắc chắn bạn muốn xác nhận bạn đã thực hiện lệnh này vào %s ? -GenerateBill=Tạo hóa đơn -ClassifyShipped=Phân loại giao hàng -ClassifyBilled=Phân loại hóa đơn +AddToMyOrders=Thêm vào đơn hàng của tôi +AddToOtherOrders=Thêm vào đơn hàng khác +AddToDraftOrders=Thêm vào đơn hàng dự thảo +ShowOrder=Hiển thị đơn hàng +NoOpenedOrders=Không có đơn hàng đã mở +NoOtherOpenedOrders=Không có đơn hàng đã mở khác +NoDraftOrders=Không có đơn hàng dự thảo +OtherOrders=Đơn hàng khác +LastOrders=Last %s customer orders +LastCustomerOrders=Last %s customer orders +LastSupplierOrders=Last %s supplier orders +LastModifiedOrders=%s đơn hàng đã điều chỉnh cuối +LastClosedOrders=%s đơn hàng đã đóng cuối +AllOrders=Tất cả đơn hàng +NbOfOrders=Số lượng đơn hàng +OrdersStatistics=Thống kê đơn hàng +OrdersStatisticsSuppliers=Thống kê đơn hàng nhà cung cấp +NumberOfOrdersByMonth=Số lượng đơn hàng theo tháng +AmountOfOrdersByMonthHT=Số tiền của đơn hàng theo tháng (chưa thuế) +ListOfOrders=Danh sách đơn hàng +CloseOrder=Đóng đơn hàng +ConfirmCloseOrder=Bạn có chắc là bạn muốn chuyển đơn hàng này sang đã gửi? Khi một đơn hàng được gửi, nó có thể được lập để thanh toán. +ConfirmCloseOrderIfSending=Bạn có chắc muốn đóng theo đơn hàng này? Bạn phải đóng đơn hàng chỉ khi tất cả việc vận chuyển đã xong. +ConfirmDeleteOrder=Bạn có chắc muốn xóa đơn hàng này? +ConfirmValidateOrder=Bạn có chắc muốn xác nhận đơn hàng này dưới tên %s ? +ConfirmUnvalidateOrder=Bạn có chắc muốn khôi phục lại đơn hàng %s về trạng thái dự thảo ? +ConfirmCancelOrder=Bạn có chắc muốn hủy đơn hàng này ? +ConfirmMakeOrder=Bạn có chắc muốn xác nhận rằng bạn đã lập đơn hàng này vào %s ? +GenerateBill=Xuất ra hóa đơn +ClassifyShipped=Phân vào đã giao hàng +ClassifyBilled=Phân loại đã thanh toá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 -RefCustomerOrderShort=Số tham chiếu đơn đặt hàng của khách hàng -SendOrderByMail=Gửi đơn đặt hàng qua đường bưu điện -ActionsOnOrder=Sự kiện về đơn đặt hàng -NoArticleOfTypeProduct=Không có bài viết của loại 'sản phẩm' như vậy không có bài viết shippable về đơn hàng này -OrderMode=Phương pháp đơn hàng -AuthorRequest=Yêu cầu tác giả -UseCustomerContactAsOrderRecipientIfExist=Sử dụng địa chỉ liên lạc của khách hàng nếu được xác định thay vì địa chỉ của bên thứ ba như là địa chỉ để người nhận -RunningOrders=Đơn đặt hàng đang được xử lý -UserWithApproveOrderGrant=Người dùng được cấp "thông qua các đơn đặt hàng" cho phép. -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 +DraftOrders=Dự thảo đơn hàng +RelatedOrders=Đơn hàng liên quan +RelatedCustomerOrders=Đơn hàng khách hàng liên quan +RelatedSupplierOrders=Đơn hàng nhà cung cấp liên quan +OnProcessOrders=Đang xử lý đơn hàng +RefOrder=Tham chiếu đơn hàng +RefCustomerOrder=Tham chiếu đơn hàng khách hàng +RefCustomerOrderShort=Tham chiếu đơn hàng khách hàng +SendOrderByMail=Gửi đơn hàng qua bưu điện +ActionsOnOrder=Sự kiện trên đơn hàng +NoArticleOfTypeProduct=Không có điều khoản của loại 'sản phẩm' vì vậy không có điều khoản vận chuyển cho đơn hàng này +OrderMode=Phương thức đặt hàng +AuthorRequest=Yêu cầu quyền +UseCustomerContactAsOrderRecipientIfExist=Dùng địa chỉ liên lạc khách hàng nếu đã xác định thay vì địa chỉ của bên thứ ba như là địa chỉ người nhận +RunningOrders=Đơn hàng đang xử lý +UserWithApproveOrderGrant=Người dùng được cấp quyền "duyệt đơn hàng". +PaymentOrderRef=Thanh toán đơn hàng %s +CloneOrder=Sao chép đơn hàng +ConfirmCloneOrder=Bạn có chắc muốn sao chép đơn hàng này %s ? +DispatchSupplierOrder=Đang nhận đơn hàng nhà cung cấp %s +FirstApprovalAlreadyDone=Duyệt mức đầu tiên đã xong ##### Types de contacts ##### -TypeContact_commande_internal_SALESREPFOLL=Đại diện theo dõi đơn đặt hàng +TypeContact_commande_internal_SALESREPFOLL=Đại diện theo dõi đơn hàng khách hàng TypeContact_commande_internal_SHIPPING=Đại diện theo dõi vận chuyển -TypeContact_commande_external_BILLING=Địa chỉ hóa đơn khách hàng -TypeContact_commande_external_SHIPPING=Địa chỉ giao hàng cho khách hàng -TypeContact_commande_external_CUSTOMER=Địa chỉ khách hàng theo dõi đơn hàng +TypeContact_commande_external_BILLING=Liên lạc khách hàng về hóa đơn +TypeContact_commande_external_SHIPPING=Liên lạc khách hàng về việc giao hàng +TypeContact_commande_external_CUSTOMER=Liên lạc khách hàng để theo dõi đơn hàng TypeContact_order_supplier_internal_SALESREPFOLL=Đại diện theo dõi đơn hàng nhà cung cấp -TypeContact_order_supplier_internal_SHIPPING=Đại diện theo dõi vận chuyển -TypeContact_order_supplier_external_BILLING=Địa chỉ hóa đơn nhà cung cấp -TypeContact_order_supplier_external_SHIPPING=Địa chỉ giao hàng cho nhà cung cấp -TypeContact_order_supplier_external_CUSTOMER=Đia chỉ nhà cung cấp theo dõi đơn hàng +TypeContact_order_supplier_internal_SHIPPING=Đại diện theo dõi việc vận chuyển +TypeContact_order_supplier_external_BILLING=Liên lạc nhà cung cấp về hóa đơn +TypeContact_order_supplier_external_SHIPPING=Liên lạc nhà cung cấp về việc giao hàng +TypeContact_order_supplier_external_CUSTOMER=Liên lạc nhà cung cấp để theo dõi đơn hàng -Error_COMMANDE_SUPPLIER_ADDON_NotDefined=COMMANDE_SUPPLIER_ADDON liên tục không được xác định -Error_COMMANDE_ADDON_NotDefined=COMMANDE_ADDON liên tục không được xác định -Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Không thể tải tập tin mô-đun '%s' -Error_FailedToLoad_COMMANDE_ADDON_File=Không thể tải tập tin mô-đun '%s' -Error_OrderNotChecked=Không có đơn đặt hàng cho hóa đơn được lựa chọn +Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Thông số COMMANDE_SUPPLIER_ADDON chưa xác định +Error_COMMANDE_ADDON_NotDefined=Thông số COMMANDE_ADDON chưa xác định +Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Thất bại khi tải mô-đun file '%s' +Error_FailedToLoad_COMMANDE_ADDON_File=Thất bại khi tải mô-đun file '%s' +Error_OrderNotChecked=Không có đơn hàng nào chuyển sang hóa đơn được chọn # Sources -OrderSource0=Đề nghị thương mại +OrderSource0=Đơn hàng đề xuất OrderSource1=Internet -OrderSource2=Chiến dịch gửi thư -OrderSource3=Điện thoại compaign +OrderSource2=Chiến dịch mail +OrderSource3=Chiến dịch Phone OrderSource4=Chiến dịch Fax OrderSource5=Thương mại OrderSource6=Cửa hàng -QtyOrdered=Số lượng đặt hàng -AddDeliveryCostLine=Thêm một dòng chi phí giao hàng cho thấy trọng lượng của thứ tự +QtyOrdered=Số lượng đã đặt hàng +AddDeliveryCostLine=Thêm một dòng chi phí vận chuyển theo trọng lượng của đơn hàng đó # Documents models -PDFEinsteinDescription=Một mô hình đơn hàng đầy đủ (logo ...) -PDFEdisonDescription=Một mô hình đơn hàng đơn giản -PDFProformaDescription=Hoá đơn chiếu lệ đầy đủ (logo ...) +PDFEinsteinDescription=Mẫu đơn hàng đầy đủ (logo ...) +PDFEdisonDescription=Mẫu đơn hàng đơn giản +PDFProformaDescription=Hoá đơn proforma đầy đủ (logo ...) # Orders modes -OrderByMail=Thư +OrderByMail=Mail OrderByFax=Fax OrderByEMail=Email -OrderByWWW=Trực tuyến +OrderByWWW=Online OrderByPhone=Điện thoại CreateInvoiceForThisCustomer=Thanh toán đơn hàng -NoOrdersToInvoice=Không có đơn đặt hàng có thể thanh toán -CloseProcessedOrdersAutomatically=Chọn "Đã xử lý" cho tất cả các đơn đặt hàng. +NoOrdersToInvoice=Không có đơn hàng có thể lập hóa đơn +CloseProcessedOrdersAutomatically=Phân loại "Đã xử lý" cho tất cả các đơn hàng được chọn. OrderCreation=Tạo đơn hàng -Ordered=Đơn hàng đã được tạo -OrderCreated=Đơn đặt hàng của bạn đã được tạo ra -OrderFail=Một lỗi đã xảy ra trong quá trình tạo đơn đặt hàng của bạn -CreateOrders=Tạo đơn đặt hàng -ToBillSeveralOrderSelectCustomer=Để tạo ra một hóa đơn cho một số đơn đặt hàng, đầu tiên nhấp vào khách hàng, sau đó chọn "%s". +Ordered=Đã đặt hàng +OrderCreated=Đơn hàng của bạn đã được tạo +OrderFail=Một lỗi đã xảy ra khi tạo đơn hàng của bạn +CreateOrders=Tạo đơn hàng +ToBillSeveralOrderSelectCustomer=Để tạo một hóa đơn cho nhiều đơn hàng, đầu tiên nhấp vào khách hàng, sau đó chọn "%s". diff --git a/htdocs/langs/vi_VN/other.lang b/htdocs/langs/vi_VN/other.lang index 06622eb717bc3..519eac4bf922b 100644 --- a/htdocs/langs/vi_VN/other.lang +++ b/htdocs/langs/vi_VN/other.lang @@ -203,6 +203,7 @@ NewKeyWillBe=Khóa mới của bạn để đăng nhập vào phần mềm sẽ ClickHereToGoTo=Click vào đây để đi đến% s YouMustClickToChange=Tuy nhiên, trước tiên bạn phải nhấp vào liên kết sau đây để xác nhận thay đổi mật khẩu này ForgetIfNothing=Nếu bạn không yêu cầu thay đổi này, chỉ cần quên email này. Thông tin của bạn được lưu giữ an toàn. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=Thêm phần trong lịch% s diff --git a/htdocs/langs/vi_VN/productbatch.lang b/htdocs/langs/vi_VN/productbatch.lang index 452636819653f..38902b9949b5c 100644 --- a/htdocs/langs/vi_VN/productbatch.lang +++ b/htdocs/langs/vi_VN/productbatch.lang @@ -1,21 +1,22 @@ # 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. +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/serial not used) +ProductStatusOnBatchShort=Có +ProductStatusNotOnBatchShort=Không +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial +l_eatby=Ăn theo ngày +l_sellby=Bán theo ngày +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %s +printEatby=Ăn theo: %s +printSellby=Bán theo: %s +printQty=SL: %d +AddDispatchBatchLine=Thêm 1 line cho Shelf Life dispatching +BatchDefaultNumber=Không định nghĩa +WhenProductBatchModuleOnOptionAreForced=When module Lot/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/vi_VN/projects.lang b/htdocs/langs/vi_VN/projects.lang index d82f0ae1e3331..79744e83f0f15 100644 --- a/htdocs/langs/vi_VN/projects.lang +++ b/htdocs/langs/vi_VN/projects.lang @@ -1,145 +1,146 @@ # Dolibarr language file - Source file is en_US - projects -RefProject=Tài liệu tham khảo. dự án -ProjectId=Mã dự án +RefProject=Tham chiếu dự án +ProjectId=ID dự án Project=Dự án Projects=Các dự án -ProjectStatus=Project status +ProjectStatus=Trạng thái dự án 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ứ). +MyProjectsDesc=Phần xem này được giới hạn cho dự án mà bạn có liên quan (đố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 được phép đọc. +ProjectsPublicTaskDesc=Phần xem này hiển thị tất cả dự án và tác vụ mà bạn được phép đọc. +ProjectsDesc=Phần xem này hiển thị tất cả các dự án (quyền người dùng cấp cho bạn được phép xem 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. +OnlyOpenedProject=Chỉ dự án đã mở mới hiển thị (dự án trạng thái dự thảo hoặc đã đóng thì không hiển thị). +TasksPublicDesc=Phần xem này hiển thị tất cả dự án và tác vụ mà bạn được phép đọc. 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). +AllTaskVisibleButEditIfYouAreAssigned=Tất cả tác vụ cho dự án như vậy được hiển thị, nhưng bạn chỉ có thể nhập vào thời gian cho tác vụ mà bạn được giao. ProjectsArea=Khu vực dự án NewProject=Dự án mới AddProject=Tạo dự án DeleteAProject=Xóa một dự án DeleteATask=Xóa một tác vụ -ConfirmDeleteAProject=Bạn có chắc muốn xóa dự án này? -ConfirmDeleteATask=Bạn có chắc muốn xóa tác vụ này? -OfficerProject=Nhân viên tham gia dự án -LastProjects=Dự án %s trước đó +ConfirmDeleteAProject=Bạn có chắc muốn xóa dự án này ? +ConfirmDeleteATask=Bạn có chắc muốn xóa tác vụ này ? +OfficerProject=Nhân viên dự án +LastProjects=% dự án cuối AllProjects=Tất cả dự án -ProjectsList=Danh sách các dự án +ProjectsList=Danh sách dự án ShowProject=Hiển thị dự án -SetProject=Đặt dự án -NoProject=Không có dự án nào được định lược hoặc sở hữu +SetProject=Lập dự án +NoProject=Không có dự án được xác định hoặc tự tạo 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 +TimeSpentByYou=Thời gian đã qua bởi bạn +TimeSpentByUser=Thời gian đã qua bởi người dùng TimesSpent=Thời gian đã qua -RefTask=Tác vụ tham chiếu -LabelTask=Nhãn của tác vụ -TaskTimeSpent=Thời gian dành cho công việc -TaskTimeUser=Người sử dụng -TaskTimeNote=Lưu ý +RefTask=Tham chiếu tác vụ +LabelTask=Nhãn tác vụ +TaskTimeSpent=Thời gian đã qua trên tác vụ +TaskTimeUser=Người dùng +TaskTimeNote=Ghi chú TaskTimeDate=Ngày -TasksOnOpenedProject=Tasks on opened projects -WorkloadNotDefined=Workload not defined +TasksOnOpenedProject=Tác vụ đã mở trong dự án +WorkloadNotDefined=Khối lượng công việc chưa xác định NewTimeSpent=Thời gian đã qua mới MyTimeSpent=Thời gian đã qua của tôi MyTasks=Tác vụ của tôi Tasks=Tác vụ Task=Tác vụ -TaskDateStart=Nhiệm vụ ngày bắt đầu -TaskDateEnd=Nhiệm vụ ngày kết thúc -TaskDescription=Mô tả công việc +TaskDateStart=Tác vụ bắt đầu ngày +TaskDateEnd=Tác vụ kết thúc ngày +TaskDescription=Mô tả tác vụ NewTask=Tác vụ mới -AddTask=Tạo công việc -AddDuration=Thêm độ dài thời gian +AddTask=Tạo tác vụ +AddDuration=Thêm thời hạn Activity=Hoạt động Activities=Tác vụ/hoạt động MyActivity=Hoạt động của tôi MyActivities=Tác vụ/hoạt động của tôi MyProjects=Dự án của tôi -DurationEffective=Độ dài thời gian hiệu quả +DurationEffective=Thời hạn hiệu lực Progress=Tiến độ ProgressDeclared=Tiến độ công bố -ProgressCalculated=Tính tiến bộ +ProgressCalculated=Tiến độ được tính toán Time=Thời gian -ListProposalsAssociatedProject=Danh sách các gợi ý thương mại được gắn với dự án -ListOrdersAssociatedProject=Danh sách các đơn đặt hàng từ khách hàng được gắn với dự án -ListInvoicesAssociatedProject=Danh sách các hóa đơn của khách hàng được gắn với dự án -ListPredefinedInvoicesAssociatedProject=Danh sách các hóa đơn được xác định trước của khách hàng gắn với dự án -ListSupplierOrdersAssociatedProject=Danh sách các đơn đặt hàng từ nhà cung cấp được gắn với dự án -ListSupplierInvoicesAssociatedProject=Danh sách các hóa đơn của nhà cung cấp được gắn với dự án +ListProposalsAssociatedProject=Danh sách các đơn hàng đề xuất được gắn với dự án +ListOrdersAssociatedProject=Danh sách các đơn hàng khách hàng được gắn với dự án +ListInvoicesAssociatedProject=Danh sách các hóa đơn khách hàng được gắn với dự án +ListPredefinedInvoicesAssociatedProject=Danh sách các hóa đơn định sẵn của khách hàng gắn với dự án +ListSupplierOrdersAssociatedProject=Danh sách các đơn hàng nhà cung cấp được gắn với dự án +ListSupplierInvoicesAssociatedProject=Danh sách các hóa đơn 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 -ListExpenseReportsAssociatedProject=List of expense reports associated with the project -ListDonationsAssociatedProject=List of donations associated with the project +ListExpenseReportsAssociatedProject=Danh sách các báo cáo chi phí liên quan đến dự án +ListDonationsAssociatedProject=Danh sách hiến tặng liên quan đến dự án 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 -ActivityOnProjectThisYear=Các hoạt động của dự án trong năm này +ActivityOnProjectThisWeek=Hoạt động của dự án trong tuần này +ActivityOnProjectThisMonth=Hoạt động của dự án trong tháng này +ActivityOnProjectThisYear=Hoạt động của dự án trong năm này ChildOfTask=Dự án/tác vụ con -NotOwnerOfProject=Không phải người sở hữu dự án cá nhân này +NotOwnerOfProject=Không phải chủ dự án cá nhân này AffectedTo=Được phân bổ đến -CantRemoveProject=Dự án này không thể bị loại bỏ vì phần này được tham chiếu đến các đối tượng khác (đơn hàng, đơn đặt hàng hoặc các phần khác). Xem tab các phần tham chiếu để biết thêm chi tiết -ValidateProject=Phê chuẩn dự án -ConfirmValidateProject=Bạn có chắc rằng bạn muốn phê chuẩn dự án này? -CloseAProject=Đóng lại dự án -ConfirmCloseAProject=Bạn có chắc bạn muốn đóng lại dự án này? +CantRemoveProject=Dự án này không thể bị xóa bỏ vì nó được tham chiếu đến các đối tượng khác (hóa đơn, đơn hàng hoặc các phần khác). Xem thêm các tham chiếu tab. +ValidateProject=Xác nhận dự án +ConfirmValidateProject=Bạn có chắc muốn xác nhận dự án này? +CloseAProject=Đóng dự án +ConfirmCloseAProject=Bạn có chắc muốn đóng dự án này ? ReOpenAProject=Mở dự án -ConfirmReOpenAProject=Bạn có chắc muốn mở lại dự án này? -ProjectContact=Liên lạc với dự án -ActionsOnProject=Các sự kiện liên quan đến dự án -YouAreNotContactOfProject=Bạn không thuộc phần liên lạc đối với chủ đề thuộc phạm vi riêng tư này -DeleteATimeSpent=Xóa thời gian đã bỏ ra -ConfirmDeleteATimeSpent=Bạn có chắc muốn xóa thời gian đã bỏ ra? -DoNotShowMyTasksOnly=Xem thêm nhiệm vụ không được gán cho tôi -ShowMyTasksOnly=Xem chỉ nhiệm vụ được giao với tôi -TaskRessourceLinks=Các nguồn tài nguyên +ConfirmReOpenAProject=Bạn có chắc muốn mở dự án này ? +ProjectContact=Liên lạc dự án +ActionsOnProject=Các sự kiện trên dự án +YouAreNotContactOfProject=Bạn không là một liên hệ của dự án riêng tư này +DeleteATimeSpent=Xóa thời gian đã qua +ConfirmDeleteATimeSpent=Bạn có chắc muốn xóa thời gian đã qua này? +DoNotShowMyTasksOnly=Xem thêm tác vụ không được gán cho tôi +ShowMyTasksOnly=Xem chỉ tác vụ được gán cho tôi +TaskRessourceLinks=Tài nguyên ProjectsDedicatedToThisThirdParty=Các dự án được dành riêng cho bên thứ ba này NoTasks=Không có tác vụ nào cho dự án này LinkedToAnotherCompany=Được liên kết đến các bên thứ ba -TaskIsNotAffectedToYou=Nhiệm vụ không được giao cho bạn -ErrorTimeSpentIsEmpty=Thời gian đã qua hiện đang rỗng +TaskIsNotAffectedToYou=Tác vụ không được gán cho bạn +ErrorTimeSpentIsEmpty=Thời gian đã qua đang trống ThisWillAlsoRemoveTasks=Thao tác này sẽ xóa toàn bộ các tác vụ của dự án (%s các tác vụ ở thời điểm hiện tại) và toàn bộ dữ liệu đã nhập vào trong suốt thời gian vừa qua. -IfNeedToUseOhterObjectKeepEmpty=Nếu một số đối tượng (đơn hàng, đơn đặt hàng, ...), thuộc về một bên thứ ba khác, phải có đường liên kết đến dự án để tạo, duy trì phần này rỗng để dự án có thể có sự tham gia của nhiều bên thứ ba khác +IfNeedToUseOhterObjectKeepEmpty=Nếu một số đối tượng (hóa đơn, đơn hàng, ...), thuộc về một bên thứ ba khác, phải có liên kết đến dự án để tạo, giữ phần này trống để dự án có sự tham gia của nhiều bên thứ ba khác CloneProject=Nhân bản dự án CloneTasks=Nhân bản tác vụ CloneContacts=Nhân bản liên lạc -CloneNotes=Nhân bản các ghi chú -CloneProjectFiles=Dự án Clone tham gia các tập tin -CloneTaskFiles=Clone nhiệm vụ (các) tập tin tham gia (nếu nhiệm vụ (các) nhân bản vô tính) -CloneMoveDate=Update project/tasks dates from now ? -ConfirmCloneProject=Bạn có chắc rằng bạn muốn nhân bản dự án này? -ProjectReportDate=Thay đổi thời gian tác vụ theo thời gian bắt đầu dự án -ErrorShiftTaskDate=Không thể dịch chuyển ngày của phần tác vụ dựa theo ngày bắt đầu của dự án mới +CloneNotes=Nhân bản ghi chú +CloneProjectFiles=Nhân bản dự án được gắn các tập tin +CloneTaskFiles=Nhân bản (các) tác vụ gắn với (các) tập tin (nếu tác vụ đã nhân bản) +CloneMoveDate=Cập nhật ngày dự án/tác vụ từ bây giờ ? +ConfirmCloneProject=Bạn có chắc muốn nhân bản dự án này ? +ProjectReportDate=Thay đổi ngày tác vụ theo ngày bắt đầu dự án +ErrorShiftTaskDate=Không thể dịch chuyển ngày của tác vụ theo ngày bắt đầu của dự án mới ProjectsAndTasksLines=Các dự án và tác vụ -ProjectCreatedInDolibarr=Đã tạo dự án %s -TaskCreatedInDolibarr=Nhiệm vụ% s tạo -TaskModifiedInDolibarr=Nhiệm vụ% s sửa đổi -TaskDeletedInDolibarr=Nhiệm vụ% s bị xóa +ProjectCreatedInDolibarr=Dự án %s đã được tạo +TaskCreatedInDolibarr=Tác vụ %s được tạo +TaskModifiedInDolibarr=Tác vụ %s đã chỉnh sửa +TaskDeletedInDolibarr=Tác vụ %s đã xóa ##### Types de contacts ##### -TypeContact_project_internal_PROJECTLEADER=Người lãnh đạo dự án -TypeContact_project_external_PROJECTLEADER=Người lãnh đạo dự án -TypeContact_project_internal_PROJECTCONTRIBUTOR=Đóng góp -TypeContact_project_external_PROJECTCONTRIBUTOR=Đóng góp -TypeContact_project_task_internal_TASKEXECUTIVE=Thi hành tác vụ -TypeContact_project_task_external_TASKEXECUTIVE=Thi hành tác vụ -TypeContact_project_task_internal_TASKCONTRIBUTOR=Đóng góp -TypeContact_project_task_external_TASKCONTRIBUTOR=Đóng góp -SelectElement=Chọn phần +TypeContact_project_internal_PROJECTLEADER=Lãnh đạo dự án +TypeContact_project_external_PROJECTLEADER=Lãnh đạo dự án +TypeContact_project_internal_PROJECTCONTRIBUTOR=Cộng sự +TypeContact_project_external_PROJECTCONTRIBUTOR=Cộng sự +TypeContact_project_task_internal_TASKEXECUTIVE=Thực thi tác vụ +TypeContact_project_task_external_TASKEXECUTIVE=Thực thi tác vụ +TypeContact_project_task_internal_TASKCONTRIBUTOR=Cộng sự +TypeContact_project_task_external_TASKCONTRIBUTOR=Cộng sự +SelectElement=Chọn yếu tố AddElement=Liên kết đến yếu tố -UnlinkElement=Yếu tố Bỏ liên kết +UnlinkElement=Yếu tố không 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 -PlannedWorkloadShort=Workload -WorkloadOccupation=Workload assignation +PlannedWorkload=Khối lượng công việc dự tính +PlannedWorkloadShort=Khối lượng công việc +WorkloadOccupation=Phân phối khối lượng công việc 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 -InputPerDay=Input per day -InputPerWeek=Input per week -InputPerAction=Input per action -TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s +ProjectMustBeValidatedFirst=Dự án phải được xác nhận trước +ProjectDraft=Dự án dự thảo +FirstAddRessourceToAllocateTime=Liên kết tài nguyên để phân bổ thời gian +InputPerDay=Đầu vào mỗi ngày +InputPerWeek=Đầu vào mỗi tuần +InputPerAction=Đầu vào mỗi hành động +TimeAlreadyRecorded=Thời gian đã qua được ghi nhận cho tác vụ/ngày này và người dùng %s diff --git a/htdocs/langs/vi_VN/propal.lang b/htdocs/langs/vi_VN/propal.lang index 6e9b8aef50b6b..f6fdefe90ce2e 100644 --- a/htdocs/langs/vi_VN/propal.lang +++ b/htdocs/langs/vi_VN/propal.lang @@ -1,87 +1,87 @@ # Dolibarr language file - Source file is en_US - propal -Proposals=Đề nghị thương mại -Proposal=Đề nghị thương mại -ProposalShort=Đề nghị -ProposalsDraft=Dự thảo đề xuất thương mại -ProposalDraft=Dự thảo đề xuất thương mại -ProposalsOpened=Đề nghị thương mại mở -Prop=Đề nghị thương mại -CommercialProposal=Đề nghị thương mại -CommercialProposals=Đề nghị thương mại -ProposalCard=Thẻ đề nghị -NewProp=Đề nghị thương mại mới -NewProposal=Đề nghị thương mại mới -NewPropal=Đề xuất mới -Prospect=Triển vọng -ProspectList=Danh sách khách hàng tiềm năng -DeleteProp=Xóa đề nghị thương mại -ValidateProp=Xác nhận đề nghị thương mại -AddProp=Tạo đề xuất -ConfirmDeleteProp=Bạn Bạn có chắc chắn muốn xóa đề nghị thương mại này? -ConfirmValidateProp=Bạn có chắc chắn bạn muốn xác nhận đề nghị thương mại này dưới tên% s? -LastPropals=Cuối% s đề xuất -LastClosedProposals=Cuối% s đề xuất khép kín -LastModifiedProposals=Đề xuất sửa đổi lần cuối% s -AllPropals=Tất cả các đề xuất -LastProposals=Đề nghị cuối cùng -SearchAProposal=Tìm kiếm một đề nghị -ProposalsStatistics=Số liệu thống kê thương mại đề nghị của -NumberOfProposalsByMonth=Số theo tháng -AmountOfProposalsByMonthHT=Số tiền theo tháng (sau thuế) -NbOfProposals=Số đề xuất thương mại -ShowPropal=Hiện đề nghị +Proposals=Đơn hàng đề xuất +Proposal=Đơn hàng đề xuất +ProposalShort=Đơn hàng đề xuất +ProposalsDraft=Dự thảo đơn hàng đề xuất +ProposalDraft=Dự thảo đơn hàng đề xuất +ProposalsOpened=Đơn hàng đề xuất đã mở +Prop=Đơn hàng đề xuất +CommercialProposal=Đơn hàng đề xuất +CommercialProposals=Đơn hàng đề xuất +ProposalCard=Thẻ đơn hàng đề xuất +NewProp=Đơn hàng đề xuất mới +NewProposal=Đơn hàng đề xuất mới +NewPropal=Đơn hàng đề xuất mới +Prospect=KH tiềm năng +ProspectList=Danh sách KH tiềm năng +DeleteProp=Xóa đơn hàng đề xuất +ValidateProp=Xác nhận đơn hàng đề xuất +AddProp=Tạo đơn hàng đề xuất +ConfirmDeleteProp=Bạn có chắc muốn xóa đơn hàng đề xuất này? +ConfirmValidateProp=Bạn có chắc muốn xác nhận đơn hàng đề xuất này dưới tên %s ? +LastPropals=%s đơn hàng đề xuất cuối +LastClosedProposals=%s đơn hàng đề xuất đã đóng cuối +LastModifiedProposals=%s đơn hàng đề xuất đã chỉnh sửa cuối +AllPropals=Tất cả đơn hàng đề xuất +LastProposals=Đơn hàng đề xuất cuối +SearchAProposal=Tìm kiếm đơn hàng đề xuất +ProposalsStatistics=Thống kê đơn hàng đề xuất +NumberOfProposalsByMonth=Số lượng theo tháng +AmountOfProposalsByMonthHT=Số tiền theo tháng (chưa thuế) +NbOfProposals=Số lượng đơn hàng đề xuất +ShowPropal=Hiện đơn hàng đề xuất PropalsDraft=Dự thảo -PropalsOpened=Mở -PropalsNotBilled=Đóng không phải lập hóa đơn -PropalStatusDraft=Dự thảo (cần phải được xác nhận) -PropalStatusValidated=Xác nhận (đề nghị được mở) -PropalStatusOpened=Xác nhận (đề nghị được mở) -PropalStatusClosed=Đóng -PropalStatusSigned=Ký (cần thanh toán) -PropalStatusNotSigned=Không đăng (đóng cửa) -PropalStatusBilled=Hóa đơn +PropalsOpened=Đã mở +PropalsNotBilled=Đã đóng chưa ra hóa đơn +PropalStatusDraft=Dự thảo (cần được xác nhận) +PropalStatusValidated=Xác nhận (đề xuất mở) +PropalStatusOpened=Xác nhận (đề xuất được mở) +PropalStatusClosed=Đã đóng +PropalStatusSigned=Đã ký (cần ra hóa đơn) +PropalStatusNotSigned=Không ký (đã đóng) +PropalStatusBilled=Đã ra hóa đơn PropalStatusDraftShort=Dự thảo -PropalStatusValidatedShort=Xác nhận -PropalStatusOpenedShort=Mở -PropalStatusClosedShort=Đóng -PropalStatusSignedShort=Ký -PropalStatusNotSignedShort=Không đăng -PropalStatusBilledShort=Hóa đơn -PropalsToClose=Đề nghị thương mại phải đóng cửa -PropalsToBill=Ký kết các đề xuất thương mại vào hóa đơn -ListOfProposals=Danh sách các đề xuất thương mại -ActionsOnPropal=Sự kiện về đề nghị -NoOpenedPropals=Không có đề xuất thương mại mở -NoOtherOpenedPropals=Không có đề xuất thương mại mở khác -RefProposal=Đề nghị ref thương mại -SendPropalByMail=Gửi đề nghị thương mại qua đường bưu điện -AssociatedDocuments=Các tài liệu liên quan đến đề nghị: +PropalStatusValidatedShort=Đã xác nhận +PropalStatusOpenedShort=Đã mở +PropalStatusClosedShort=Đã đóng +PropalStatusSignedShort=Đã ký +PropalStatusNotSignedShort=Không ký +PropalStatusBilledShort=Đã ra hóa đơn +PropalsToClose=Đơn hàng đề xuất đóng +PropalsToBill=Đơn hàng đề xuất đã ký cần ra hóa đơn +ListOfProposals=Danh sách các đơn hàng đề xuất +ActionsOnPropal=Sự kiện về đơn hàng đề xuất +NoOpenedPropals=Không có đơn hàng đề xuất đã mở +NoOtherOpenedPropals=Không có đơn hàng đề xuất đã mở khác +RefProposal=Đơn hàng đề xuất tham chiếu +SendPropalByMail=Gửi đơn hàng đề xuất qua thư +AssociatedDocuments=Chứng từ liên quan đến đơn hàng đề xuất: ErrorCantOpenDir=Không thể mở thư mục -DatePropal=Ngày đề nghị -DateEndPropal=Hiệu lực ngày kết thúc +DatePropal=Ngày đề xuất +DateEndPropal=Ngày hết hiệu lực DateEndPropalShort=Ngày kết thúc ValidityDuration=Thời hạn hiệu lực -CloseAs=Chặt chẽ với tình trạng -ClassifyBilled=Phân loại hóa đơn -BuildBill=Xây dựng hóa đơn -ErrorPropalNotFound=Propal% s không tìm thấy +CloseAs=Đóng với trạng thái +ClassifyBilled=Xác định đã ra hóa đơn +BuildBill=Tạo hóa đơn +ErrorPropalNotFound=Đơn hàng đề xuất %s không tìm thấy Estimate=Ước tính: EstimateShort=Ước tính -OtherPropals=Các đề xuất khác +OtherPropals=Các đơn hàng đề xuất khác AddToDraftProposals=Thêm vào dự thảo đề xuất NoDraftProposals=Không có đề xuất dự thảo -CopyPropalFrom=Tạo đề nghị thương mại bằng cách sao chép đề nghị hiện tại -CreateEmptyPropal=Tạo ra sản phẩm nào đề xuất thương mại Vierge hoặc từ danh sách các sản phẩm / dịch vụ -DefaultProposalDurationValidity=Mặc định thời hạn đề nghị thương mại (trong ngày) -UseCustomerContactAsPropalRecipientIfExist=Sử dụng địa chỉ liên lạc của khách hàng nếu được xác định thay vì địa chỉ của bên thứ ba như là địa chỉ đề nghị người nhận -ClonePropal=Đề nghị thương mại sao chép -ConfirmClonePropal=Bạn có chắc chắn bạn muốn nhân bản đề nghị thương mại% s? -ConfirmReOpenProp=Bạn có chắc chắn bạn muốn mở lại đề nghị thương mại% s? -ProposalsAndProposalsLines=Đề nghị thương mại và dòng -ProposalLine=Nga đề xuất -AvailabilityPeriod=Sẵn sàng trì hoãn -SetAvailability=Set sẵn sàng trì hoãn -AfterOrder=sau động lệnh +CopyPropalFrom=Tạo đơn hàng đề xuất bằng cách sao chép đề nghị hiện tại +CreateEmptyPropal=Tạo đơn hàng đề xuất trống hoặc từ danh sách các sản phẩm / dịch vụ +DefaultProposalDurationValidity=Thời gian hiệu lực mặc định của đơn hàng đề xuất (theo ngày) +UseCustomerContactAsPropalRecipientIfExist=Dùng địa chỉ liên lạc của khách hàng nếu được xác định thay vì địa chỉ của bên thứ ba như là địa chỉ người nhận đơn hàng đề xuất +ClonePropal=Sao chép đơn hàng đề xuất +ConfirmClonePropal=Bạn có chắc muốn sao chép đơn hàng đề xuất %s ? +ConfirmReOpenProp=Bạn có chắc muốn mở lại đơn hàng đề xuất %s ? +ProposalsAndProposalsLines=Đơn hàng đề xuất và chi tiết +ProposalLine=Chi tiết đơn hàng đề xuất +AvailabilityPeriod=Độ chậm trễ có thể +SetAvailability=Chỉnh thời gian trì hoãn sẵn có +AfterOrder=sau đơn hàng ##### Availability ##### AvailabilityTypeAV_NOW=Ngay lập tức AvailabilityTypeAV_1W=1 tuần @@ -89,8 +89,8 @@ AvailabilityTypeAV_2W=2 tuần AvailabilityTypeAV_3W=3 tuần AvailabilityTypeAV_1M=1 tháng ##### Types de contacts ##### -TypeContact_propal_internal_SALESREPFOLL=Sau-up đề nghị đại diện -TypeContact_propal_external_BILLING=Hóa đơn của khách hàng liên lạc +TypeContact_propal_internal_SALESREPFOLL=Đại diện kinh doanh theo dõi đơn hàng đề xuất +TypeContact_propal_external_BILLING=Liên lạc khách hàng về hóa đơn TypeContact_propal_external_CUSTOMER=Liên hệ với khách hàng sau-up đề nghị # Document models DocModelAzurDescription=Một mô hình đề xuất đầy đủ (logo ...) diff --git a/htdocs/langs/vi_VN/stocks.lang b/htdocs/langs/vi_VN/stocks.lang index 656a87714c5e9..2954e893b450b 100644 --- a/htdocs/langs/vi_VN/stocks.lang +++ b/htdocs/langs/vi_VN/stocks.lang @@ -16,6 +16,7 @@ CancelSending=Hủy bỏ việc gửi DeleteSending=Xóa gửi Stock=Tồn kho Stocks=Tồn kho +StocksByLotSerial=Stock by lot/serial Movement=Chuyển kho Movements=Danh sách chuyển kho ErrorWarehouseRefRequired=Tên tài liệu tham khảo kho là cần thiết @@ -78,6 +79,7 @@ IdWarehouse=Mã kho DescWareHouse=Mô tả kho LieuWareHouse=Địa phương hóa kho WarehousesAndProducts=Các kho hàng và sản phẩm +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=Trọng giá đầu vào trung bình AverageUnitPricePMP=Trọng giá đầu vào trung bình SellPriceMin=Đơn giá bán @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/vi_VN/suppliers.lang b/htdocs/langs/vi_VN/suppliers.lang index 6d54d374454f2..d206fd52de72c 100644 --- a/htdocs/langs/vi_VN/suppliers.lang +++ b/htdocs/langs/vi_VN/suppliers.lang @@ -1,8 +1,8 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=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 +AddSupplier=Tạo nhà cung cấp +SupplierRemoved=Nhà cung cấp đã bị xóa +SuppliersInvoice=Hóa đơn nhà cung cấp NewSupplier=Nhà cung cấp mới History=Lịch sử ListOfSuppliers=Danh sách nhà cung cấp @@ -10,37 +10,37 @@ ShowSupplier=Hiện nhà cung cấp OrderDate=Ngày đặt hàng BuyingPrice=Giá mua BuyingPriceMin=Giá mua tối thiểu -BuyingPriceMinShort=Tối thiểu giá mua -TotalBuyingPriceMin=Tổng số subproducts giá mua -SomeSubProductHaveNoPrices=Một số phụ phẩm đã có giá quy định +BuyingPriceMinShort=Giá mua tối thiểu +TotalBuyingPriceMin=Giá mua của tổng sản phẩm con +SomeSubProductHaveNoPrices=Một vài sản phẩm con không có giá xác định AddSupplierPrice=Thêm giá nhà cung cấp ChangeSupplierPrice=Thay đổi giá nhà cung cấp -ErrorQtyTooLowForThisSupplier=Số lượng quá thấp đối với nhà cung cấp hoặc không có giá quy định về sản phẩm này cho nhà cung cấp này -ErrorSupplierCountryIsNotDefined=Nước cho nhà cung cấp này không được xác định. Sửa điều này đầu tiên. +ErrorQtyTooLowForThisSupplier=Số lượng quá thấp không có giá xác định cho sản phẩm này với nhà cung cấp này +ErrorSupplierCountryIsNotDefined=Quốc gia cho nhà cung cấp này không được xác định. Điều chỉnh lại trước. ProductHasAlreadyReferenceInThisSupplier=Sản phẩm này đã có một tham chiếu trong nhà cung cấp này -ReferenceSupplierIsAlreadyAssociatedWithAProduct=Cung cấp thông tin này đã được liên kết với một tài liệu tham khảo:% s -NoRecordedSuppliers=Không có nhà cung cấp ghi -SupplierPayment=Thanh toán nhà cung cấp -SuppliersArea=Khu vực Nhà cung cấp -RefSupplierShort=Tài liệu tham khảo. nhà cung cấp +ReferenceSupplierIsAlreadyAssociatedWithAProduct=Cung cấp thông tin này đã được liên kết với một tham chiếu: %s +NoRecordedSuppliers=Không có nhà cung cấp được ghi nhận +SupplierPayment=Thanh toán của nhà cung cấp +SuppliersArea=Khu vực nhà cung cấp +RefSupplierShort=Số tham chiếu nhà cung cấp Availability=Sẵn có -ExportDataset_fournisseur_1=Danh sách nhà cung cấp hoá đơn và đường hóa đơn -ExportDataset_fournisseur_2=Hoá đơn và các khoản thanh toán nhà cung cấp -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=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 +ExportDataset_fournisseur_1=Danh sách hóa đơn và chi tiết hóa đơn của nhà cung cấp +ExportDataset_fournisseur_2=Thanh toán và hóa đơn của nhà cung cấp +ExportDataset_fournisseur_3=Đơn hàng và chi tiết đơn hàng của nhà cung cấp +ApproveThisOrder=Duyệt đơn hàng này +ConfirmApproveThisOrder=Bạn có chắc muốn duyệt đơn hàng %s ? +DenyingThisOrder=Từ chối đơn hàng này +ConfirmDenyingThisOrder=Bạn có chắc bạn muốn từ chối đơn hàng này %s ? +ConfirmCancelThisOrder=Bạn có chắc muốn hủy bỏ đơn hàng này %s ? +AddCustomerOrder=Tạo đơn hàng của khách hàng AddCustomerInvoice=Tạo hóa đơn của khách hàng -AddSupplierOrder=Tạo ra để cung cấp -AddSupplierInvoice=Tạo nhà cung cấp hóa đơn -ListOfSupplierProductForSupplier=Danh sách sản phẩm và giá cả cho nhà cung cấp% s -NoneOrBatchFileNeverRan=Không có hoặc hàng loạt% s không chạy gần đây -SentToSuppliers=Gửi đến nhà cung cấp -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) +AddSupplierOrder=Tạo đơn hàng nhà cung cấp +AddSupplierInvoice=Tạo hóa đơn nhà cung cấp +ListOfSupplierProductForSupplier=Danh sách sản phẩm và giá cho nhà cung %s +NoneOrBatchFileNeverRan=Không có hoặc lô %s không chạy gần đây +SentToSuppliers=Đã gửi đến nhà cung cấp +ListOfSupplierOrders=Danh sách các đơn hàng nhà cung cấp +MenuOrdersSupplierToBill=Chuyển các đơn hàng nhà cung cấp sang hóa đơn +NbDaysToDelivery=Số ngày giao hàng +DescNbDaysToDelivery=Thời gian chậm nhất được hiển thị trong danh sách sản phẩm đặt hàng +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/vi_VN/trips.lang b/htdocs/langs/vi_VN/trips.lang index 10710992222e3..f9c0f5dbaf005 100644 --- a/htdocs/langs/vi_VN/trips.lang +++ b/htdocs/langs/vi_VN/trips.lang @@ -69,11 +69,9 @@ 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 @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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/users.lang b/htdocs/langs/vi_VN/users.lang index c80e82cd32c2f..632bfcf2d9018 100644 --- a/htdocs/langs/vi_VN/users.lang +++ b/htdocs/langs/vi_VN/users.lang @@ -1,20 +1,20 @@ # Dolibarr language file - Source file is en_US - users -HRMArea=Khu vực quản lý nhân sự -UserCard=Thẻ sử dụng +HRMArea=Khu vực HRM +UserCard=Thẻ người dùng ContactCard=Thẻ liên lạc -GroupCard=Nhóm thẻ -NoContactCard=Không có thẻ giữa các địa chỉ liên lạc -Permission=Giấy phép +GroupCard=Thẻ Nhóm +NoContactCard=Không có thẻ giữa các liên lạc +Permission=Quyền Permissions=Quyền -EditPassword=Chỉnh sửa mật khẩu -SendNewPassword=Tái tạo và gửi mật khẩu -ReinitPassword=Phục hồi mật khẩu -PasswordChangedTo=Mật khẩu thay đổi để:% s -SubjectNewPassword=Mật khẩu mới cho Dolibarr -AvailableRights=Quyền có sẵn -OwnedRights=Quyền sở hữu -GroupRights=Cho phép nhóm -UserRights=Cho phép người dùng +EditPassword=Sửa mật khẩu +SendNewPassword=Tạo và gửi mật khẩu +ReinitPassword=Tạo mật khẩu +PasswordChangedTo=Mật khẩu đã đổi sang: %s +SubjectNewPassword=Mật khẩu mới của bạn cho Dolibarr +AvailableRights=Quyền sẵn có +OwnedRights=Quyền Chính mình +GroupRights=Quyền Nhóm +UserRights=Quyền người dùng UserGUISetup=Thiết lập hiển thị người dùng DisableUser=Vô hiệu hoá DisableAUser=Vô hiệu hóa người dùng @@ -22,101 +22,101 @@ DeleteUser=Xóa DeleteAUser=Xóa một người dùng DisableGroup=Vô hiệu hoá DisableAGroup=Vô hiệu hóa một nhóm -EnableAUser=Cho phép một người sử dụng +EnableAUser=Cho phép một người dùng EnableAGroup=Cho phép một nhóm DeleteGroup=Xóa -DeleteAGroup=Xóa nhóm -ConfirmDisableUser=Bạn có chắc chắn bạn muốn vô hiệu hóa người dùng% s? -ConfirmDisableGroup=Bạn có chắc chắn bạn muốn vô hiệu hóa nhóm% s? -ConfirmDeleteUser=Bạn Bạn có chắc chắn muốn xóa người dùng% s? -ConfirmDeleteGroup=Bạn có chắc chắn muốn xóa nhóm% s? -ConfirmEnableUser=Bạn có chắc là bạn muốn cho phép người dùng% s? -ConfirmEnableGroup=Bạn có chắc chắn bạn muốn kích hoạt nhóm% s? -ConfirmReinitPassword=Bạn có chắc chắn bạn muốn tạo ra một mật khẩu mới cho người dùng% s? -ConfirmSendNewPassword=Bạn có chắc chắn bạn muốn tạo ra và gửi mật khẩu mới cho người dùng% s? +DeleteAGroup=Xóa một nhóm +ConfirmDisableUser=Bạn có chắc muốn vô hiệu hóa người dùng %s ? +ConfirmDisableGroup=Bạn có chắc muốn vô hiệu hóa nhóm %s ? +ConfirmDeleteUser=Bạn có chắc muốn xóa người dùng %s ? +ConfirmDeleteGroup=Bạn có chắc muốn xóa nhóm %s ? +ConfirmEnableUser=Bạn có chắc muốn cho phép người dùng %s ? +ConfirmEnableGroup=Bạn có chắc muốn kích hoạt nhóm %s ? +ConfirmReinitPassword=Bạn có chắc muốn tạo ra một mật khẩu mới cho người dùng %s ? +ConfirmSendNewPassword=Bạn có chắc muốn tạo ra và gửi mật khẩu mới cho người dùng %s ? NewUser=Người dùng mới CreateUser=Tạo người dùng SearchAGroup=Tìm kiếm một nhóm -SearchAUser=Tìm kiếm một người sử dụng +SearchAUser=Tìm kiếm một người dùng LoginNotDefined=Đăng nhập không được xác định. NameNotDefined=Tên không được xác định. ListOfUsers=Danh sách người dùng Administrator=Quản trị viên SuperAdministrator=Super Administrator SuperAdministratorDesc=Quản trị toàn cầu -AdministratorDesc=Tổ chức quản trị của +AdministratorDesc=Thực thể của quản trị viên DefaultRights=Quyền mặc định -DefaultRightsDesc=Xác định đây cho phép mặc định được tự động cấp cho người dùng tạo mới (Xem trên thẻ sử dụng để thay đổi sự cho phép của người dùng hiện tại). -DolibarrUsers=Người sử dụng Dolibarr +DefaultRightsDesc=Xác định ở đây các quyền mặc định được tự động cấp cho người dùng được tạo mới (Xem trên thẻ người dùng để thay đổi quyền của người dùng hiện tại). +DolibarrUsers=Dolibarr users LastName=Tên -FirstName=Tên đầu tiên +FirstName=Họ ListOfGroups=Danh sách nhóm NewGroup=Nhóm mới CreateGroup=Tạo nhóm RemoveFromGroup=Xóa khỏi nhóm -PasswordChangedAndSentTo=Mật khẩu thay đổi và gửi đến% s. -PasswordChangeRequestSent=Yêu cầu thay đổi mật khẩu cho% s gửi đến% s. +PasswordChangedAndSentTo=Mật khẩu thay đổi và gửi đến %s. +PasswordChangeRequestSent=Yêu cầu thay đổi mật khẩu cho %s đã gửi đến % s. MenuUsersAndGroups=Người dùng & Nhóm -LastGroupsCreated=Nhóm tạo ra cuối% s -LastUsersCreated=Cuối% của người sử dụng tạo ra -ShowGroup=Hiện nhóm -ShowUser=Hiện người dùng -NonAffectedUsers=Người dùng không được giao -UserModified=Người sử dụng sửa đổi thành công -PhotoFile=Hình ảnh tập tin -UserWithDolibarrAccess=Người sử dụng truy cập Dolibarr -ListOfUsersInGroup=Danh sách các thành viên trong nhóm này +LastGroupsCreated=%s Nhóm được tạo ra cuối +LastUsersCreated=%s người dùng được tạo ra cuối +ShowGroup=Hiển thị nhóm +ShowUser=Hiển thị người dùng +NonAffectedUsers=Không chỉ định người dùng +UserModified=Người dùng đã điều chỉnh thành công +PhotoFile=Tập tin hình +UserWithDolibarrAccess=Người dùng có quyền truy cập Dolibarr +ListOfUsersInGroup=Danh sách các người dùng trong nhóm này ListOfGroupsForUser=Danh sách nhóm cho người dùng này -UsersToAdd=Người sử dụng để thêm vào nhóm này -GroupsToAdd=Nhóm để thêm người sử dụng này +UsersToAdd=Người dùng để thêm vào nhóm này +GroupsToAdd=Nhóm để thêm người dùng này NoLogin=Không đăng nhập -LinkToCompanyContact=Liên kết với bên thứ ba / liên lạc -LinkedToDolibarrMember=Trao đổi liên kết thành viên -LinkedToDolibarrUser=Liên kết đến Dolibarr người dùng -LinkedToDolibarrThirdParty=Liên kết đến Dolibarr bên thứ ba +LinkToCompanyContact=Liên kết với bên thứ ba/liên lạc +LinkedToDolibarrMember=Liên kết với thành viên +LinkedToDolibarrUser=Liên kết với người dùng Dolibarr +LinkedToDolibarrThirdParty=Liên kết với bên thứ ba Dolibarr CreateDolibarrLogin=Tạo một người dùng CreateDolibarrThirdParty=Tạo một bên thứ ba LoginAccountDisable=Tài khoản bị vô hiệu hóa, đặt một đăng nhập mới để kích hoạt nó. LoginAccountDisableInDolibarr=Tài khoản bị vô hiệu hóa trong Dolibarr. LoginAccountDisableInLdap=Tài khoản bị vô hiệu hóa trong miền. -UsePersonalValue=Sử dụng giá trị cá nhân -GuiLanguage=Ngôn ngữ giao diện +UsePersonalValue=Dùng giá trị cá nhân +GuiLanguage=Giao diện ngôn ngữ InternalUser=Người dùng bên trong MyInformations=Dữ liệu của tôi ExportDataset_user_1=Người sử dụng và các đặc tính của Dolibarr -DomainUser=Miền người dùng% s -Reactivate=Kích hoạt -CreateInternalUserDesc=Hình thức này cho phép bạn tạo ra một người dùng nội bộ cho công ty / tổ chức. Để tạo ra một người dùng bên ngoài (khách hàng, nhà cung cấp, ...), sử dụng nút 'Tạo Dolibarr người sử dụng từ thẻ liên lạc bên thứ ba. -InternalExternalDesc=Một người sử dụng nội bộ là một người sử dụng là một phần của công ty / tổ chức.
Một người sử dụng bên ngoài là một khách hàng, nhà cung cấp hoặc khác.

Trong cả hai trường hợp, cho phép xác định quyền trên Dolibarr, còn người dùng bên ngoài có thể có một người quản lý menu khác nhau hơn so với người dùng nội bộ (Xem chủ - Setup - Display) -PermissionInheritedFromAGroup=Giấy phép được cấp bởi vì thừa hưởng từ một trong những nhóm của người dùng. -Inherited=Kế thừa +DomainUser=Domain người dùng %s +Reactivate=Kích hoạt lại +CreateInternalUserDesc=Hình thức này cho phép bạn tạo ra một người dùng nội bộ cho công ty/tổ chức. Để tạo ra một người dùng bên ngoài (khách hàng, nhà cung cấp, ...), sử dụng nút 'Tạo người dùng Dolibarr' từ thẻ liên lạc bên thứ ba. +InternalExternalDesc=Một người dùng nội bộ là một người dùng là một phần của công ty/tổ chức.
Một người dùng bên ngoài là một khách hàng, nhà cung cấp hoặc khác.

Trong cả hai trường hợp, quyền xác định được xác lập trên Dolibarr, còn người dùng bên ngoài có thể có một menu quản lý khác so với người dùng nội bộ (Xem Nhà - Thiết lập - Hiển thị) +PermissionInheritedFromAGroup=Quyền được cấp bởi vì được thừa hưởng từ một trong những nhóm của người dùng. +Inherited=Được thừa kế UserWillBeInternalUser=Người dùng tạo ra sẽ là một người dùng nội bộ (vì không liên kết với một bên thứ ba cụ thể) UserWillBeExternalUser=Người dùng tạo ra sẽ là một người dùng bên ngoài (vì liên quan đến một bên thứ ba cụ thể) IdPhoneCaller=Id người gọi điện thoại -UserLogged=Người dùng đăng nhập% s -UserLogoff=Sử dụng% s đăng xuất -NewUserCreated=Sử dụng% s tạo -NewUserPassword=Thay đổi mật khẩu cho% s -EventUserModified=Sử dụng% s sửa đổi -UserDisabled=Sử dụng% s khuyết tật -UserEnabled=Sử dụng% s kích hoạt -UserDeleted=Sử dụng% s loại bỏ -NewGroupCreated=Nhóm% s tạo -GroupModified=Group %s modified -GroupDeleted=Nhóm% s loại bỏ -ConfirmCreateContact=Bạn có chắc chắn bạn muốn tạo một tài khoản Dolibarr cho liên hệ này? -ConfirmCreateLogin=Bạn có chắc chắn bạn muốn tạo một tài khoản Dolibarr thành viên này? -ConfirmCreateThirdParty=Bạn có chắc chắn bạn muốn tạo ra một bên thứ ba của thành viên này? -LoginToCreate=Đăng nhập để tạo ra -NameToCreate=Tên của bên thứ ba để tạo ra +UserLogged=Người dùng %s đăng nhập +UserLogoff=Người dùng %s đăng xuất +NewUserCreated=Người dùng %s được tạo +NewUserPassword=Thay đổi mật khẩu cho %s +EventUserModified=Người dùng %s đã chỉnh sửa +UserDisabled=Người dùng %s đã bị vô hiệu hóa +UserEnabled=Người dùng %s đã được kích hoạt +UserDeleted=Người dùng %s đã bị gỡ bỏ +NewGroupCreated=Nhóm %s đã được tạo +GroupModified=Nhóm %s đã được điều chỉnh +GroupDeleted=Nhóm %s đã bị gỡ bỏ +ConfirmCreateContact=Bạn có chắc muốn tạo một tài khoản Dolibarr cho liên lạc này? +ConfirmCreateLogin=Bạn có chắc muốn tạo một tài khoản Dolibarr cho thành viên này? +ConfirmCreateThirdParty=Bạn có chắc muốn tạo ra một bên thứ ba cho thành viên này? +LoginToCreate=Đăng nhập để tạo +NameToCreate=Tên của bên thứ ba để tạo YourRole=Vai trò của bạn -YourQuotaOfUsersIsReached=Hạn ngạch của người dùng hoạt động đạt được! -NbOfUsers=Nb của người sử dụng -DontDowngradeSuperAdmin=Chỉ có một superadmin có thể hạ xuống một superadmin +YourQuotaOfUsersIsReached=Hạn ngạch của người dùng hoạt động đã hết! +NbOfUsers=Nb of users +DontDowngradeSuperAdmin=Chỉ có một superadmin có thể hạ bậc một superadmin HierarchicalResponsible=Giám sát -HierarchicView=Nhìn thứ bậc -UseTypeFieldToChange=Sử dụng Type để thay đổi +HierarchicView=Xem tính kế thừa +UseTypeFieldToChange=Dùng trường Loại để thay đổi OpenIDURL=OpenID URL LoginUsingOpenID=Sử dụng OpenID để đăng nhập WeeklyHours=Giờ hàng tuần -ColorUser=Màu của người sử dụng +ColorUser=Màu của người dùng diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang index 8b3c55d91b617..bc56fe2e18ea2 100644 --- a/htdocs/langs/zh_CN/admin.lang +++ b/htdocs/langs/zh_CN/admin.lang @@ -297,10 +297,11 @@ MenuHandlers=菜单处理程序 MenuAdmin=菜单编辑器 DoNotUseInProduction=请勿用于生产环境 ThisIsProcessToFollow=以下为软体的安装过程： +ThisIsAlternativeProcessToFollow=This is an alternative setup to process: StepNb=第 %s 步骤 FindPackageFromWebSite=搜索你需要的功能(例如在官方 %s )。 DownloadPackageFromWebSite=下载包 %S。 -UnpackPackageInDolibarrRoot=解压缩到 Dolibarr 的根目录 %s 下 +UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: %s SetupIsReadyForUse=安装完成，Dolibarr 已可以使用此新组件。 NotExistsDirect=未设置可选备用根目录。
InfDirAlt=自 v3 开始，Dolibarr 可以定义备用根目录。这令您可以将插件和自定义模板保存至同一位置。
您只需在Dolibarr的根目录下创建一个目录(例如custom)。
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_ 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=在一些国家，每个账单行有 2 或 3 项税。(大陆不适用)如果是这样，请选择第二和第三项税的类型及税率。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) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s RefreshPhoneLink=刷新链接 @@ -540,8 +541,8 @@ Module6000Name=工作流程 Module6000Desc=工作流管理 Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests -Module39000Name=产品批号 -Module39000Desc=Batch or serial number, eat-by and sell-by date management on products +Module39000Name=Product lot +Module39000Desc=Lot or serial number, eat-by and sell-by date management on products Module50000Name=出纳 Module50000Desc=模块通过 PayBox 提供信用卡网上支付页面 Module50100Name=POS @@ -558,8 +559,6 @@ Module59000Name=利润空间 Module59000Desc=利润空间管理模块 Module60000Name=佣金 Module60000Desc=佣金管理模块 -Module150010Name=Batch number, eat-by date and sell-by date -Module150010Desc=batch number, eat-by date and sell-by date management for product Permission11=读取销售账单 Permission12=创建修改客户账单 Permission13=重新起草销售账单 @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, LocalTax2IsNotUsedDescES= By default the proposed IRPF is 0. 规则结束。 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=报告 -CalcLocaltax1ES=销售 - 购买 +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Sales - Purchases CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=购买 +CalcLocaltax2=Purchases CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=销售 +CalcLocaltax3=Sales CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales LabelUsedByDefault=如果代码没有翻译则默认使用以下标签 LabelOnDocuments=文档中的标签 @@ -1018,14 +1017,14 @@ NoEventOrNoAuditSetup=尚无安全事件被记录。这属正常，默认“设 NoEventFoundWithCriteria=未发现符合搜索条件的安全事件。 SeeLocalSendMailSetup=参见您的本机 sendmail 设置 BackupDesc=为了生成一个完整的 Dolibarr 备份，您必须： -BackupDesc2=保存文档目录 (%s) 中的内容 (例如您可以将此目录压缩打包)，此目录中包括所有上传和生成的文件。 -BackupDesc3=保存您的数据库转储文件。为此，您可以使用如下辅助措施。 +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=存档的文档目录应存储在一个安全的地方。 BackupDescY=生成的转储文件应存放在安全的地方。 BackupPHPWarning=此方法不保证成功生成备份。建议使用前者 RestoreDesc=要还原Dolibarr备份，您必须： -RestoreDesc2=还原存档的文档文件夹(例如 zip 文件包)将其中的文件树释放到新装 Dolibarr 的 documents 文件夹或当前 Dolibarr 的文档文件夹(%s)中。 -RestoreDesc3=将备份的转储文件中的数据还原到新装或当前 Dolibarr 的数据库中。警告，一旦完成还原，您必须使用备份时数据库中的登陆用户名/密码登陆。要恢复备份的数据库到当前安装中，请根据说明操作。/follow assistance +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 导入 ForcedToByAModule= 此规则被一个启用中的模块强制应用于 %s PreviousDumpFiles=可用的数据库备份转储文件 @@ -1337,6 +1336,8 @@ LDAPFieldCountry=国家 LDAPFieldCountryExample=例如：美国 LDAPFieldDescription=描述 LDAPFieldDescriptionExample=例如 ：备注描述等等 +LDAPFieldNotePublic=Public Note +LDAPFieldNotePublicExample=Example : publicnote LDAPFieldGroupMembers= 组成员 LDAPFieldGroupMembersExample= 例如：成员1 LDAPFieldBirthdate=生日 @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= 接收信用卡支付的默认帐户 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=书签模块设置 @@ -1616,3 +1617,8 @@ 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 +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" diff --git a/htdocs/langs/zh_CN/banks.lang b/htdocs/langs/zh_CN/banks.lang index 906138fb720cc..2174b43f49852 100644 --- a/htdocs/langs/zh_CN/banks.lang +++ b/htdocs/langs/zh_CN/banks.lang @@ -163,3 +163,5 @@ LabelRIB=BAN Label NoBANRecord=No BAN record DeleteARib=Delete BAN record ConfirmDeleteRib=Are you sure you want to delete this BAN record ? +StartDate=Start date +EndDate=End date diff --git a/htdocs/langs/zh_CN/boxes.lang b/htdocs/langs/zh_CN/boxes.lang index 83f5f93063857..62e78b17bd036 100644 --- a/htdocs/langs/zh_CN/boxes.lang +++ b/htdocs/langs/zh_CN/boxes.lang @@ -12,13 +12,14 @@ BoxLastProspects=最近更新的潜在客户 BoxLastCustomers=最近更新的客户信息 BoxLastSuppliers=最近更新的供应商信息 BoxLastCustomerOrders=最近的订单 +BoxLastValidatedCustomerOrders=Last validated customer orders BoxLastBooks=Last books 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=Last %s customer orders +BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders BoxTitleLastSuppliers=最近添加的 %s 个供应商信息 BoxTitleLastCustomers=最近添加的 %s 个客户信息 BoxTitleLastModifiedSuppliers=最近更新的 %s 个供应商信息 BoxTitleLastModifiedCustomers=最近更新的 %s 个客户信息 -BoxTitleLastCustomersOrProspects=最近更新的 %s 个客户信息(当前/潜在) -BoxTitleLastPropals=最近添加的 %s 个报价 +BoxTitleLastCustomersOrProspects=Last %s customers or prospects +BoxTitleLastPropals=Last %s proposals +BoxTitleLastModifiedPropals=Last %s modified proposals BoxTitleLastCustomerBills=最近的 %s 笔销售账单 +BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices BoxTitleLastSupplierBills=最近的 %s 笔采购账单 -BoxTitleLastProspects=最近添加的 %s 个潜在客户 +BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices BoxTitleLastModifiedProspects=最近更新的 %s 个潜在客户 BoxTitleLastProductsInContract=最近销售的 %s 个产品/服务 -BoxTitleLastModifiedMembers=最近更新的 %s 个成员信息 +BoxTitleLastModifiedMembers=Last %s members BoxTitleLastFicheInter=最近更新的 %s 个交易干预 -BoxTitleOldestUnpaidCustomerBills=催款最久的 %s 笔销售账单 -BoxTitleOldestUnpaidSupplierBills=欠款最久的 %s 笔采购账单 -# BoxTitleCurrentAccounts=Opened account's balances +BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices +BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices +BoxTitleCurrentAccounts=Opened account's balances BoxTitleSalesTurnover=销售营业额 -BoxTitleTotalUnpaidCustomerBills=待收款销售账单 -BoxTitleTotalUnpaidSuppliersBills=待付款采购账单 +BoxTitleTotalUnpaidCustomerBills=客户未付发票 +BoxTitleTotalUnpaidSuppliersBills=未付供应商发票 BoxTitleLastModifiedContacts=最近更新的 %s 项联系人/地址 BoxMyLastBookmarks=我最近的书签 BoxOldestExpiredServices=执行中的逾期时间最长的服务 @@ -76,7 +80,8 @@ NoContractedProducts=无签订合同的产品 NoRecordedContracts=无合同记录 NoRecordedInterventions=没有干预措施的记录 BoxLatestSupplierOrders=最近的采购订单 -BoxTitleLatestSupplierOrders=最近的 %s 笔采购订单 +BoxTitleLatestSupplierOrders=Last %s supplier orders +BoxTitleLatestModifiedSupplierOrders=Last %s modified supplier orders NoSupplierOrder=无采购订单记录 BoxCustomersInvoicesPerMonth=客户每月发票 BoxSuppliersInvoicesPerMonth=供应商每月的发票 @@ -89,3 +94,4 @@ BoxProductDistributionFor=%s的%s分布 ForCustomersInvoices=客户的发票 ForCustomersOrders=客户订单 ForProposals=报价 +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang index ddd31e68a0c27..f3c3a51c4e8ba 100644 --- a/htdocs/langs/zh_CN/errors.lang +++ b/htdocs/langs/zh_CN/errors.lang @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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=强制设置参数尚未定义 diff --git a/htdocs/langs/zh_CN/interventions.lang b/htdocs/langs/zh_CN/interventions.lang index af761b7fe90e8..cc9d69048103f 100644 --- a/htdocs/langs/zh_CN/interventions.lang +++ b/htdocs/langs/zh_CN/interventions.lang @@ -50,4 +50,4 @@ ArcticNumRefModelError=无法启动 PacificNumRefModelDesc1=返回格式%syymm，其中yy是二○○一年numero，MM是月，nnnn是一个没有休息，没有返回0序列 PacificNumRefModelError=干预卡$ syymm起已经存在，而不是与此序列模型兼容。删除或重新命名它激活该模块。 PrintProductsOnFichinter=干预卡上的打印产品 -PrintProductsOnFichinterDetails=从订单生成的干预 +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang index eda0b17552806..fdbb167fc6018 100644 --- a/htdocs/langs/zh_CN/main.lang +++ b/htdocs/langs/zh_CN/main.lang @@ -220,6 +220,7 @@ Next=未来 Cards=牌 Card=卡 Now=现在 +HourStart=Start hour Date=日期 DateAndHour=Date and hour DateStart=开始日期 @@ -242,6 +243,8 @@ DatePlanShort=日期刨 DateRealShort=真正的日期。 DateBuild=报告生成日期 DatePayment=付款日期 +DateApprove=Approving date +DateApprove2=Approving date (second approval) DurationYear=年 DurationMonth=月 DurationWeek=周 @@ -408,6 +411,8 @@ OtherInformations=其它信息 Quantity=数量 Qty=数量 ChangedBy=改变 +ApprovedBy=Approved by +ApprovedBy2=Approved by (second approval) ReCalculate=重新计算 ResultOk=成功 ResultKo=失败 @@ -696,6 +701,8 @@ 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. +Deny=Deny +Denied=Denied # Week day Monday=星期一 Tuesday=星期二 diff --git a/htdocs/langs/zh_CN/orders.lang b/htdocs/langs/zh_CN/orders.lang index 41d8a87078e10..0cf7849dc1247 100644 --- a/htdocs/langs/zh_CN/orders.lang +++ b/htdocs/langs/zh_CN/orders.lang @@ -79,7 +79,9 @@ NoOpenedOrders=没有打开的订单 NoOtherOpenedOrders=没有其他打开的订单 NoDraftOrders=没有订单草案 OtherOrders=其他订单 -LastOrders=上次%s的订单 +LastOrders=Last %s customer orders +LastCustomerOrders=Last %s customer orders +LastSupplierOrders=Last %s supplier orders LastModifiedOrders=最后修改%s的订单 LastClosedOrders=最后关闭的%订单 AllOrders=所有的订单 diff --git a/htdocs/langs/zh_CN/other.lang b/htdocs/langs/zh_CN/other.lang index 24695554bd08f..206356048d573 100644 --- a/htdocs/langs/zh_CN/other.lang +++ b/htdocs/langs/zh_CN/other.lang @@ -203,6 +203,7 @@ 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. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=日历项中添加%s的 diff --git a/htdocs/langs/zh_CN/productbatch.lang b/htdocs/langs/zh_CN/productbatch.lang index 452636819653f..85b1d27f3a611 100644 --- a/htdocs/langs/zh_CN/productbatch.lang +++ b/htdocs/langs/zh_CN/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use batch/serial number -ProductStatusOnBatch=Yes (Batch/serial required) -ProductStatusNotOnBatch=No (Batch/serial not used) +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/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 +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial 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 +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %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. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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/zh_CN/projects.lang b/htdocs/langs/zh_CN/projects.lang index 7a9d56f4b1e57..8e07926c60a19 100644 --- a/htdocs/langs/zh_CN/projects.lang +++ b/htdocs/langs/zh_CN/projects.lang @@ -14,6 +14,7 @@ MyTasksDesc=这种观点是有限的项目或任务你是一个接触（不管 OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=这种观点提出的所有项目，您可阅读任务。 TasksDesc=这种观点提出的所有项目和任务（您的用户权限批准你认为一切）。 +AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. ProjectsArea=项目领域 NewProject=新项目 AddProject=Create project diff --git a/htdocs/langs/zh_CN/stocks.lang b/htdocs/langs/zh_CN/stocks.lang index f78f8468b6788..472cff1916101 100644 --- a/htdocs/langs/zh_CN/stocks.lang +++ b/htdocs/langs/zh_CN/stocks.lang @@ -16,6 +16,7 @@ CancelSending=取消发送 DeleteSending=删除发送 Stock=股票 Stocks=股票 +StocksByLotSerial=Stock by lot/serial Movement=运动 Movements=运动 ErrorWarehouseRefRequired=仓库引用的名称是必需的 @@ -78,6 +79,7 @@ IdWarehouse=编号仓库 DescWareHouse=说明仓库 LieuWareHouse=本地化仓库 WarehousesAndProducts=仓库和产品 +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=投入品平均价格 AverageUnitPricePMP=投入品平均价格 SellPriceMin=销售单价 @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/zh_CN/suppliers.lang b/htdocs/langs/zh_CN/suppliers.lang index 9d6a6e207eb61..3985b1cdf6736 100644 --- a/htdocs/langs/zh_CN/suppliers.lang +++ b/htdocs/langs/zh_CN/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) +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/zh_CN/trips.lang b/htdocs/langs/zh_CN/trips.lang index 4962abe8c288f..2c0fc087aa7e9 100644 --- a/htdocs/langs/zh_CN/trips.lang +++ b/htdocs/langs/zh_CN/trips.lang @@ -69,11 +69,9 @@ 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 @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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 418fbd5385d8b..bcb0dec0a3437 100644 --- a/htdocs/langs/zh_TW/admin.lang +++ b/htdocs/langs/zh_TW/admin.lang @@ -297,10 +297,11 @@ MenuHandlers=選單處理程序 MenuAdmin=選單編輯器 DoNotUseInProduction=Do not use in production ThisIsProcessToFollow=以下為軟體安裝的過程： +ThisIsAlternativeProcessToFollow=This is an alternative setup to process: StepNb=第 %s 步驟 FindPackageFromWebSite=從網站尋找你想要擴充的主題、模組（可上 %s 網站參考）。 DownloadPackageFromWebSite=Download package %s. -UnpackPackageInDolibarrRoot=解壓縮到 %Dolibarr 目錄下 +UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: %s SetupIsReadyForUse=安裝完成，此時此系統軟體已經可以開始使用擴充的部分。 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).
@@ -397,7 +398,7 @@ ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_ 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) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s RefreshPhoneLink=Refresh link @@ -540,8 +541,8 @@ 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 +Module39000Name=Product lot +Module39000Desc=Lot or serial number, eat-by and sell-by date management on products Module50000Name=出納 Module50000Desc=模組提供信用卡網上支付頁面與出納 Module50100Name=銷售點 @@ -558,8 +559,6 @@ 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=讀取發票 Permission12=讀取發票 Permission13=Unvalidate發票 @@ -853,12 +852,12 @@ LocalTax2IsUsedDescES= 預設情況下，稀土率在創建前景，發票，訂 LocalTax2IsNotUsedDescES= 預設情況下，建議IRPF為0。結束統治。 LocalTax2IsUsedExampleES= 在西班牙，自由職業者，誰提供服務，誰選擇了模組稅務系統公司獨立專業人士。 LocalTax2IsNotUsedExampleES= 在西班牙他們bussines不繳稅的模組系統。 -CalcLocaltax=Reports -CalcLocaltax1ES=Sales - Purchases +CalcLocaltax=Reports on local taxes +CalcLocaltax1=Sales - Purchases CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Purchases +CalcLocaltax2=Purchases CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Sales +CalcLocaltax3=Sales CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales LabelUsedByDefault=預設情況下使用標籤，如果沒有翻譯，可找到的代碼 LabelOnDocuments=標籤上的文件 @@ -1018,14 +1017,14 @@ NoEventOrNoAuditSetup=沒有安全事件已被記錄呢。這可以是正常的 NoEventFoundWithCriteria=沒有安全事件已發現這種搜尋標準。 SeeLocalSendMailSetup=看到您當地的sendmail的設置 BackupDesc=為了使一個完整的Dolibarr備份，您必須： -BackupDesc2=*保存內容的文件目錄（%s）中包含所有上傳和生成的文件（你可以壓縮為一個例子）。 -BackupDesc3=*您的數據庫的內容保存到轉儲文件。對於這一點，你可以使用下面的助手。 +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=存檔的目錄應該被存儲在一個安全的地方。 BackupDescY=生成的轉儲文件應存放在安全的地方。 BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one RestoreDesc=要還原Dolibarr備份，您必須： -RestoreDesc2=*還原存檔文件（例如文件壓縮文件）解壓縮文件的目錄中的文件目錄樹中安裝一個新的Dolibarr或進入這個現行文件directoy（%s）中。 -RestoreDesc3=*還原數據，從備份轉儲文件，進入新Dolibarr安裝數據庫或進入此當前安裝的數據庫。警告，一旦還原完成後，你必須使用一個登錄/密碼，備份時存在了，再次連接。要還原到這個當前安裝一個備份數據庫，你可以按照這個助理。 +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= 這項規則是被迫到%s的一個激活的模組 PreviousDumpFiles=可用的數據庫備份轉儲文件 @@ -1337,6 +1336,8 @@ LDAPFieldCountry=國家 LDAPFieldCountryExample=例如：C LDAPFieldDescription=描述 LDAPFieldDescriptionExample=例如：說明 +LDAPFieldNotePublic=Public Note +LDAPFieldNotePublicExample=Example : publicnote LDAPFieldGroupMembers= 集團成員 LDAPFieldGroupMembersExample= 例如：uniqueMember LDAPFieldBirthdate=生日 @@ -1540,7 +1541,7 @@ CashDeskBankAccountForCB= 帳戶用於接收信用卡支付現金 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 +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=模組設置書籤 @@ -1616,3 +1617,8 @@ 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 +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" diff --git a/htdocs/langs/zh_TW/banks.lang b/htdocs/langs/zh_TW/banks.lang index 93639850ef2f0..16fd2c0596c6d 100644 --- a/htdocs/langs/zh_TW/banks.lang +++ b/htdocs/langs/zh_TW/banks.lang @@ -163,3 +163,5 @@ LabelRIB=BAN Label NoBANRecord=No BAN record DeleteARib=Delete BAN record ConfirmDeleteRib=Are you sure you want to delete this BAN record ? +StartDate=Start date +EndDate=End date diff --git a/htdocs/langs/zh_TW/boxes.lang b/htdocs/langs/zh_TW/boxes.lang index 33dc26e5fd25a..b05ea5dd81a81 100644 --- a/htdocs/langs/zh_TW/boxes.lang +++ b/htdocs/langs/zh_TW/boxes.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - boxes BoxLastRssInfos=RSS信息 BoxLastProducts=最後更新的產品/服務清單 -# BoxProductsAlertStock=Products in stock alert +BoxProductsAlertStock=Products in stock alert BoxLastProductsInContract=最後更新的的合同/產品/服務 BoxLastSupplierBills=最後更新的供應商帳單票 BoxLastCustomerBills=最後更新的客戶帳單 @@ -12,13 +12,14 @@ BoxLastProspects=最後更新的潛在清單 BoxLastCustomers=最後更新的客戶清單 BoxLastSuppliers=最後更新的供應商清單 BoxLastCustomerOrders=最後更新的客戶訂單 +BoxLastValidatedCustomerOrders=Last validated customer orders BoxLastBooks=最後更新的書籍清單 BoxLastActions=最後更新的事件清單 BoxLastContracts=最後更新的合同清單 BoxLastContacts=最後接觸/地址 BoxLastMembers=最後成員 -# BoxFicheInter=Last interventions -# BoxCurrentAccounts=Opened accounts balance +BoxFicheInter=Last interventions +BoxCurrentAccounts=Opened accounts balance BoxSalesTurnover=銷售營業額 BoxTotalUnpaidCustomerBills=共有未付客戶的發票 BoxTotalUnpaidSuppliersBills=共有未付供應商的發票 @@ -26,27 +27,30 @@ BoxTitleLastBooks=最後更新的書籍清單 BoxTitleNbOfCustomers=客戶端的數量 BoxTitleLastRssInfos=最後 %s 更新的 Rss 消息等(from %s) BoxTitleLastProducts=最後更新的產品/服務清單 -# BoxTitleProductsAlertStock=Products in stock alert -BoxTitleLastCustomerOrders=最後更新的客戶訂單 +BoxTitleProductsAlertStock=Products in stock alert +BoxTitleLastCustomerOrders=Last %s customer orders +BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders BoxTitleLastSuppliers=最後更新的供應商清單 BoxTitleLastCustomers=最後更新的客戶清單 BoxTitleLastModifiedSuppliers=最後更新的供應商清單 BoxTitleLastModifiedCustomers=最後更新的客戶清單 -BoxTitleLastCustomersOrProspects=最後更新的潛在客戶清單 -BoxTitleLastPropals=最後更新的建議書 +BoxTitleLastCustomersOrProspects=Last %s customers or prospects +BoxTitleLastPropals=Last %s proposals +BoxTitleLastModifiedPropals=Last %s modified proposals BoxTitleLastCustomerBills=最後更新的客戶帳單 +BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices BoxTitleLastSupplierBills=最後更新的供應商帳單 -BoxTitleLastProspects=最後更新的潛在 +BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices BoxTitleLastModifiedProspects=最後更新的潛在客戶清單 BoxTitleLastProductsInContract=最後更新的產品/服務合同 -BoxTitleLastModifiedMembers=最後更新的成員清單 -# BoxTitleLastFicheInter=Last %s modified intervention -BoxTitleOldestUnpaidCustomerBills=最後更新的未付款的客戶帳單 -BoxTitleOldestUnpaidSupplierBills=最後更新的未付款的供應商帳單 -# BoxTitleCurrentAccounts=Opened account's balances +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=銷售營業額 -BoxTitleTotalUnpaidCustomerBills=未付客戶的發票 -BoxTitleTotalUnpaidSuppliersBills=未付供應商的發票 +BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices +BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices BoxTitleLastModifiedContacts=最後更新的聯絡人/地址清單 BoxMyLastBookmarks=我最後的%s的書簽 BoxOldestExpiredServices=最早的活動過期服務 @@ -55,7 +59,7 @@ BoxTitleLastActionsToDo=上次%s的行動做 BoxTitleLastContracts=上次%的承 BoxTitleLastModifiedDonations=最後更新的捐款清單 BoxTitleLastModifiedExpenses=最後更新的修改費用 -# BoxGlobalActivity=Global activity (invoices, proposals, orders) +BoxGlobalActivity=Global activity (invoices, proposals, orders) FailedToRefreshDataInfoNotUpToDate=無法刷新的RSS流量。上次成功刷新日期：%s LastRefreshDate=最後更新日期 NoRecordedBookmarks=沒有書簽定義。點擊這裏添加書簽。 @@ -74,18 +78,20 @@ NoRecordedProducts=沒有任何產品/服務記錄 NoRecordedProspects=沒有任何潛在資訊記錄 NoContractedProducts=沒有產品/服務合同 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 +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=客戶的發票 -# ForCustomersOrders=Customers orders +ForCustomersOrders=Customers orders ForProposals=建議 +LastXMonthRolling=The last %s month rolling diff --git a/htdocs/langs/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang index e0cd34688ce9b..739ca19c92004 100644 --- a/htdocs/langs/zh_TW/errors.lang +++ b/htdocs/langs/zh_TW/errors.lang @@ -159,14 +159,17 @@ 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 +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information +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' 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/langs/zh_TW/interventions.lang b/htdocs/langs/zh_TW/interventions.lang index c26551d4a9683..7f71934850b4f 100644 --- a/htdocs/langs/zh_TW/interventions.lang +++ b/htdocs/langs/zh_TW/interventions.lang @@ -50,4 +50,4 @@ ArcticNumRefModelError=無法啟動 PacificNumRefModelDesc1=用以下固定的方式回傳編號:
%syymm-nnnn
yy 是年、mm是月、nnnn是一個不為0的序號。 PacificNumRefModelError=錯誤編號一個以 $syymm 為起始的 intervention card 已經存在，且不相容於此序號模型。請刪除或重新命名以便啟用這個模塊。 PrintProductsOnFichinter=Print products on intervention card -PrintProductsOnFichinterDetails=forinterventions generated from orders +PrintProductsOnFichinterDetails=interventions generated from orders diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang index f2feec280dcb1..cad6b50defb2d 100644 --- a/htdocs/langs/zh_TW/main.lang +++ b/htdocs/langs/zh_TW/main.lang @@ -220,6 +220,7 @@ Next=下一筆 Cards=資訊卡 Card=資訊卡 Now=現在 +HourStart=Start hour Date=日期 DateAndHour=Date and hour DateStart=開始日期 @@ -242,6 +243,8 @@ DatePlanShort=日期刨 DateRealShort=真正的日期。 DateBuild=報告生成日期 DatePayment=付款日期 +DateApprove=Approving date +DateApprove2=Approving date (second approval) DurationYear=年 DurationMonth=月 DurationWeek=周 @@ -408,6 +411,8 @@ OtherInformations=其它信息 Quantity=數量 Qty=數量 ChangedBy=修改 by +ApprovedBy=Approved by +ApprovedBy2=Approved by (second approval) ReCalculate=Recalculate ResultOk=成功 ResultKo=失敗 @@ -696,6 +701,8 @@ 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. +Deny=Deny +Denied=Denied # Week day Monday=星期一 Tuesday=星期二 diff --git a/htdocs/langs/zh_TW/orders.lang b/htdocs/langs/zh_TW/orders.lang index d843668c5cd9c..bf16fa314b6c7 100644 --- a/htdocs/langs/zh_TW/orders.lang +++ b/htdocs/langs/zh_TW/orders.lang @@ -79,7 +79,9 @@ NoOpenedOrders=沒有打開訂單 NoOtherOpenedOrders=沒有其他人已經新增的訂單 NoDraftOrders=No draft orders OtherOrders=其他命令 -LastOrders=上次%s的訂單 +LastOrders=Last %s customer orders +LastCustomerOrders=Last %s customer orders +LastSupplierOrders=Last %s supplier orders LastModifiedOrders=最新修改的訂單 LastClosedOrders=最後%s的封閉式訂單 AllOrders=所有的訂單 diff --git a/htdocs/langs/zh_TW/other.lang b/htdocs/langs/zh_TW/other.lang index 2cf747a9bd40f..d4b58709afb4c 100644 --- a/htdocs/langs/zh_TW/other.lang +++ b/htdocs/langs/zh_TW/other.lang @@ -203,6 +203,7 @@ 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. +IfAmountHigherThan=If amount higher than %s ##### Calendar common ##### AddCalendarEntry=日歷項中添加%s的 diff --git a/htdocs/langs/zh_TW/productbatch.lang b/htdocs/langs/zh_TW/productbatch.lang index 452636819653f..85b1d27f3a611 100644 --- a/htdocs/langs/zh_TW/productbatch.lang +++ b/htdocs/langs/zh_TW/productbatch.lang @@ -1,21 +1,22 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use batch/serial number -ProductStatusOnBatch=Yes (Batch/serial required) -ProductStatusNotOnBatch=No (Batch/serial not used) +ManageLotSerial=Use lot/serial number +ProductStatusOnBatch=Yes (lot/serial required) +ProductStatusNotOnBatch=No (lot/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 +Batch=Lot/Serial +atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number +batch_number=Lot/Serial number +BatchNumberShort=Lot/Serial 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 +DetailBatchNumber=Lot/Serial details +DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Lot/Serial: %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. +WhenProductBatchModuleOnOptionAreForced=When module Lot/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/zh_TW/projects.lang b/htdocs/langs/zh_TW/projects.lang index af14269d041cc..f5bf8fc79664a 100644 --- a/htdocs/langs/zh_TW/projects.lang +++ b/htdocs/langs/zh_TW/projects.lang @@ -14,6 +14,7 @@ MyTasksDesc=這種觀點是有限的項目或任務你是一個接觸（不管 OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=這種觀點提出的所有項目，您可閱讀任務。 TasksDesc=這種觀點提出的所有項目和任務（您的用戶權限批準你認為一切）。 +AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. ProjectsArea=項目領域 NewProject=新項目 AddProject=Create project diff --git a/htdocs/langs/zh_TW/stocks.lang b/htdocs/langs/zh_TW/stocks.lang index 9c1b117b91eb6..32d119b32bbad 100644 --- a/htdocs/langs/zh_TW/stocks.lang +++ b/htdocs/langs/zh_TW/stocks.lang @@ -16,6 +16,7 @@ CancelSending=取消發送 DeleteSending=刪除發送 Stock=庫存 Stocks=庫存 +StocksByLotSerial=Stock by lot/serial Movement=轉讓 Movements=轉讓 ErrorWarehouseRefRequired=倉庫引用的名稱是必需的 @@ -78,6 +79,7 @@ IdWarehouse=編號倉庫 DescWareHouse=說明倉庫 LieuWareHouse=本地化倉庫 WarehousesAndProducts=倉庫和產品 +WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial) AverageUnitPricePMPShort=投入品平均價格 AverageUnitPricePMP=投入品平均價格 SellPriceMin=銷售單價 @@ -131,4 +133,7 @@ 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. +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" 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 +NoPendingReceptionOnSupplierOrder=No pending reception due to opened supplier order +ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). diff --git a/htdocs/langs/zh_TW/suppliers.lang b/htdocs/langs/zh_TW/suppliers.lang index 23bc2d647a7bd..91acd97750438 100644 --- a/htdocs/langs/zh_TW/suppliers.lang +++ b/htdocs/langs/zh_TW/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) +UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission) diff --git a/htdocs/langs/zh_TW/trips.lang b/htdocs/langs/zh_TW/trips.lang index fc99f600d2588..6dc462f3cdf73 100644 --- a/htdocs/langs/zh_TW/trips.lang +++ b/htdocs/langs/zh_TW/trips.lang @@ -69,11 +69,9 @@ 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 @@ -101,26 +99,4 @@ ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to sta 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 e298bd0a687aee4a151c0bd305fe6306b1e7baa8 Mon Sep 17 00:00:00 2001 From: "David Avigni (Ankapi)" Date: Wed, 22 Apr 2015 15:23:52 +0200 Subject: [PATCH 045/264] Fixed hook "pdf generation", executeHooks misnamed: replacement "adterPDFCreation" with "afterPDFCreation" --- htdocs/core/modules/cheque/pdf/pdf_blochet.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php b/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php index 5d1222da6ddd5..aef8770a50139 100644 --- a/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php +++ b/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php @@ -188,7 +188,7 @@ function write_file($_dir, $number, $outputlangs) $hookmanager->initHooks(array('pdfgeneration')); $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs); global $action; - $reshook=$hookmanager->executeHooks('adterPDFCreation',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks + $reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks if (! empty($conf->global->MAIN_UMASK)) @chmod($file, octdec($conf->global->MAIN_UMASK)); From 208ac31bf8977fe60c181b6aec4e53929d9c34d9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 22 Apr 2015 17:39:09 +0200 Subject: [PATCH 046/264] Fix test for es --- htdocs/core/lib/price.lib.php | 8 +++--- test/phpunit/PricesTest.php | 50 +++++++++++++++++------------------ 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/htdocs/core/lib/price.lib.php b/htdocs/core/lib/price.lib.php index a31fc3c6b0000..e6fa9682703e9 100644 --- a/htdocs/core/lib/price.lib.php +++ b/htdocs/core/lib/price.lib.php @@ -40,8 +40,8 @@ * @param float $pu Unit price (HT or TTC selon price_base_type) * @param float $remise_percent_ligne Discount for line * @param float $txtva 0=do not apply standard tax, Vat rate=apply - * @param float $uselocaltax1_rate 0=do not use this localtax, >0=apply, -1=autodetect according to seller - * @param float $uselocaltax2_rate 0=do not use this localtax, >0=apply, -1=autodetect according to seller + * @param float $uselocaltax1_rate 0=do not use this localtax, >0=apply and get value from localtaxes_array (or database if empty), -1=autodetect according to seller if we must apply, get value from localtaxes_array (or database if empty) + * @param float $uselocaltax2_rate 0=do not use this localtax, >0=apply and get value from localtaxes_array (or database if empty), -1=autodetect according to seller if we must apply, get value from localtaxes_array (or database if empty) * @param float $remise_percent_global 0 * @param string $price_base_type HT=Unit price parameter is HT, TTC=Unit price parameter is TTC * @param int $info_bits Miscellaneous informations on line @@ -90,7 +90,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt dol_syslog("calcul_price_total Warning: function is called with parameter localtaxes_array that is missing", LOG_WARNING); } // Too verbose. Enable for debug only - //dol_syslog("calcul_price_total qty=".$qty." pu=".$pu." remiserpercent_ligne=".$remise_percent_ligne." txtva=".$txtva." uselocaltax1_rate=".$uselocaltax1_rate." uselocaltax2_rate=".$uselocaltax2_rate); + //dol_syslog("Price.lib::calcul_price_total qty=".$qty." pu=".$pu." remiserpercent_ligne=".$remise_percent_ligne." txtva=".$txtva." uselocaltax1_rate=".$uselocaltax1_rate." uselocaltax2_rate=".$uselocaltax2_rate.' remise_percent_global='.$remise_percent_global.' price_base_type='.$ice_base_type.' type='.$type.' progress='.$progress); $countryid=$seller->country_id; if ($uselocaltax1_rate < 0) $uselocaltax1_rate=$seller->localtax1_assuj; @@ -109,7 +109,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt $localtax2_type = $localtaxes_array[2]; $localtax2_rate = $localtaxes_array[3]; } - else + else // deprecated method. values and type for localtaxes must be provided by caller and loade with getLocalTaxesFromRate { $sql = "SELECT taux, localtax1, localtax2, localtax1_type, localtax2_type"; $sql.= " FROM ".MAIN_DB_PREFIX."c_tva as cv"; diff --git a/test/phpunit/PricesTest.php b/test/phpunit/PricesTest.php index e7c566ad79d88..7992b08614bdc 100755 --- a/test/phpunit/PricesTest.php +++ b/test/phpunit/PricesTest.php @@ -139,7 +139,7 @@ public function testCalculPriceTotal() /* * Country France */ - + // qty=1, unit_price=1.24, discount_line=0, vat_rate=10, price_base_type='HT' (method we provide value) $mysoc->country_code='FR'; $mysoc->country_id=1; @@ -148,11 +148,11 @@ public function testCalculPriceTotal() // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) $this->assertEquals(array(1.24, 0.12, 1.36, 1.24, 0.124, 1.364, 1.24, 0.12, 1.36, 0, 0, 0, 0, 0, 0, 0),$result1,'Test1 FR'); - + /* * Country Spain */ - + // 10 * 10 HT - 0% discount with 10% vat, seller not using localtax1, not localtax2 (method we provide value) $mysoc->country_code='ES'; $mysoc->country_id=4; @@ -172,9 +172,9 @@ public function testCalculPriceTotal() print __METHOD__." result2=".join(', ',$result2)."\n"; // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) $this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0),$result2,'Test2 ES'); - + // -------------------------------------------------------- - + // 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1 type 3, 0% localtax2 type 5 (method we provide value) $mysoc->country_code='ES'; $mysoc->country_id=4; @@ -184,7 +184,7 @@ public function testCalculPriceTotal() print __METHOD__." result2=".join(', ',$result2)."\n"; // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) $this->assertEquals(array(100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0, 0.14, 0, 0, 1.4, 0),$result2,'Test3 ES'); - + // 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1 type 3, 0% localtax2 type 5 (other method autodetect) $mysoc->country_code='ES'; $mysoc->country_id=4; @@ -194,19 +194,19 @@ public function testCalculPriceTotal() print __METHOD__." result2=".join(', ',$result2)."\n"; // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) $this->assertEquals(array(100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0, 0.14, 0, 0, 1.4, 0),$result2,'Test4 ES'); - + // -------------------------------------------------------- - - // 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 19% localtax2 type 5 (method we provide value) + + // 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 21% localtax2 type 5 (method we provide value) $mysoc->country_code='ES'; $mysoc->country_id=4; $mysoc->localtax1_assuj=0; $mysoc->localtax2_assuj=1; - $result2=calcul_price_total(10, 10, 0, 10, 0, -19, 0, 'HT', 0, 0); + $result2=calcul_price_total(10, 10, 0, 10, 0, -1, 0, 'HT', 0, 0); // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) - $this->assertEquals(array(100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19, 0, -1.90, 0, 0, -19),$result2,'Test5 ES'); + $this->assertEquals(array(100, 10, 89, 10, 1, 8.9, 100, 10, 89, 0, -21, 0, -2.10, 0, 0, -21),$result2,'Test5 ES'); - // 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1 type 3, 0% localtax2 type 5 (other method autodetect) + // 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 21% localtax2 type 5 (other method autodetect) $mysoc->country_code='ES'; $mysoc->country_id=4; $mysoc->localtax1_assuj=0; @@ -214,19 +214,19 @@ public function testCalculPriceTotal() $result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 0); print __METHOD__." result2=".join(', ',$result2)."\n"; // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) - $this->assertEquals(array(100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19, 0, -1.90, 0, 0, -19),$result2,'Test6 ES'); - + $this->assertEquals(array(100, 10, 89, 10, 1, 8.9, 100, 10, 89, 0, -21, 0, -2.10, 0, 0, -21),$result2,'Test6 ES'); + // -------------------------------------------------------- - - // Credit Note: 10 * -10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 19% localtax2 type 5 (method we provide value) + + // Credit Note: 10 * -10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 21% localtax2 type 5 (method we provide value) $mysoc->country_code='ES'; $mysoc->country_id=4; $mysoc->localtax1_assuj=0; $mysoc->localtax2_assuj=1; - $result2=calcul_price_total(10, -10, 0, 10, 0, 19, 0, 'HT', 0, 0); + $result2=calcul_price_total(10, -10, 0, 10, 0, 1, 0, 'HT', 0, 0); print __METHOD__." result2=".join(', ',$result2)."\n"; // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) - $this->assertEquals(array(-100, -10, -91, -10, -1, -9.1, -100, -10,- 91, 0, 19, 0, 1.90, 0, 0, 19),$result2,'Test7 ES'); + $this->assertEquals(array(-100, -10, -89, -10, -1, -8.9, -100, -10, -89, 0, 21, 0, 2.1, 0, 0, 21),$result2,'Test7 ES'); // Credit Note: 10 * -10 HT - 0% discount with 10% vat and 1.4% localtax1 type 3, 0% localtax2 type 5 (other method autodetect) $mysoc->country_code='ES'; @@ -235,13 +235,13 @@ public function testCalculPriceTotal() $mysoc->localtax2_assuj=1; $result2=calcul_price_total(10, -10, 0, 10, -1, -1, 0, 'HT', 0, 0); print __METHOD__." result2=".join(', ',$result2)."\n"; - $this->assertEquals(array(-100, -10, -91, -10, -1, -9.1, -100, -10,- 91, 0, 19, 0, 1.90, 0, 0, 19),$result2,'Test8 ES'); - - + $this->assertEquals(array(-100, -10, -89, -10, -1, -8.9, -100, -10, -89, 0, 21, 0, 2.1, 0, 0, 21),$result2,'Test8 ES'); + + /* - * Country Côte d'Ivoire + * Country Côte d'Ivoire */ - + // 10 * 10 HT - 0% discount with 18% vat, seller using localtax1 type 2, not localtax2 (method we provide value) $mysoc->country_code='CI'; $mysoc->country_id=21; @@ -253,7 +253,7 @@ public function testCalculPriceTotal() print __METHOD__." result3=".join(', ',$result3)."\n"; // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) $this->assertEquals(array(100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0, 0.885, 0, 0, 8.85, 0),$result3,'Test9 CI'); - + // 10 * 10 HT - 0% discount with 18% vat, seller using localtax1 type 2, not localtax2 (other method autodetect) $mysoc->country_code='CI'; $mysoc->country_id=21; @@ -263,7 +263,7 @@ public function testCalculPriceTotal() print __METHOD__." result3=".join(', ',$result3)."\n"; // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) $this->assertEquals(array(100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0, 0.885, 0, 0, 8.85, 0),$result3,'Test10 CI'); - + return true; } From 7c8281d2fe11b15a785a05e6869089a9de7306dc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 22 Apr 2015 18:30:58 +0200 Subject: [PATCH 047/264] search travis pb --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5bc5f49b2e530..ca2574bc846a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -128,7 +128,7 @@ script: - php upgrade.php 3.6.0 3.7.0 ignoredbversion > upgrade360370.log - php upgrade2.php 3.6.0 3.7.0 ignoredbversion > upgrade360370-2.log - php upgrade.php 3.7.0 3.8.0 ignoredbversion > upgrade370380.log -# - cat upgrade370380.log + - cat upgrade370380.log - php upgrade2.php 3.7.0 3.8.0 ignoredbversion > upgrade370380-2.log # - cat upgrade370380-2.log - cd ../.. From 7f5377d219271b1e5a2309392df02b01467a45c2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 22 Apr 2015 19:25:20 +0200 Subject: [PATCH 048/264] Fix #2695 --- htdocs/core/modules/cheque/pdf/pdf_blochet.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php b/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php index aa61f5eb7aa5f..9ae3f08a87e85 100644 --- a/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php +++ b/htdocs/core/modules/cheque/pdf/pdf_blochet.class.php @@ -188,7 +188,7 @@ function write_file($_dir, $number, $outputlangs) $hookmanager->initHooks(array('pdfgeneration')); $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs); global $action; - $reshook=$hookmanager->executeHooks('adterPDFCreation',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks + $reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks if (! empty($conf->global->MAIN_UMASK)) @chmod($_file, octdec($conf->global->MAIN_UMASK)); From 9ef809e91b8fee41e6fe6f1047ebba582d9c3f64 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 22 Apr 2015 20:28:21 +0200 Subject: [PATCH 049/264] Fix migration tools --- ChangeLog | 1 + htdocs/install/mysql/migration/3.7.0-3.8.0.sql | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index cba51f133465e..2fb5387c179ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -40,6 +40,7 @@ Dolibarr better: trigger ORDER_SUPPLIER_CREATE instead. - 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'" +- All fields "fk_societe" were renamed into "fk_soc". ***** ChangeLog for 3.7 compared to 3.6.* ***** 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 53cf461fe370c..9b6f1ce465178 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 @@ -581,8 +581,6 @@ alter table llx_facture_fourn_det add fk_unit integer default NULL; ALTER TABLE llx_facture_fourn_det ADD CONSTRAINT fk_facture_fourn_det_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid); -ALTER TABLE llx_user DROP INDEX uk_user_fk_societe; -ALTER TABLE llx_user ADD INDEX idx_user_fk_societe (fk_soc); -- Feature request: A page to merge two thirdparties into one #2613 @@ -594,7 +592,11 @@ ALTER TABLE llx_categorie_fournisseur DROP FOREIGN KEY fk_categorie_fournisseur_ ALTER TABLE llx_categorie_fournisseur CHANGE COLUMN fk_societe fk_soc INTEGER NOT NULL; ALTER TABLE llx_categorie_fournisseur ADD CONSTRAINT fk_categorie_fournisseur_fk_soc FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid); -ALTER TABLE llx_user CHANGE COLUMN fk_societe fk_soc INTEGER NOT NULL; -ALTER TABLE llx_societe CHANGE COLUMN fk_societe fk_soc INTEGER NOT NULL; +ALTER TABLE llx_user DROP INDEX uk_user_fk_societe; +ALTER TABLE llx_user DROP INDEX idx_user_fk_societe; +ALTER TABLE llx_user CHANGE COLUMN fk_societe fk_soc INTEGER; +ALTER TABLE llx_user ADD INDEX idx_user_fk_societe (fk_soc); + + From 47ecb91a3ef03044d76b37303ce933b97dd27caf Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 22 Apr 2015 21:17:49 +0200 Subject: [PATCH 050/264] Avoid DOS attack when high number of tasks --- 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 eafe92c5aa4f1..6d1fb4d846263 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -350,7 +350,7 @@ print ''; } -else +else if ($id > 0 || ! empty($ref)) { /* * Fiche projet en mode visu From 6b15cafb4e5ddbdf987342a782269551c9c88ebb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 22 Apr 2015 21:38:34 +0200 Subject: [PATCH 051/264] Add protection to request some module to be on for AllTests --- test/phpunit/AllTests.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php index 2c56ff7db44f6..94e8ba1478efb 100644 --- a/test/phpunit/AllTests.php +++ b/test/phpunit/AllTests.php @@ -38,6 +38,11 @@ print "Error: Default language for company to run tests must be set to en_US or auto. Current is ".$langs->defaultlang."\n"; exit; } +if (! empty($conf->adherents->enabled)) +{ + print "Error: Module member must be enabled to have significatn results.\n"; + exit; +} if (! empty($conf->google->enabled)) { print "Warning: Google module should not be enabled.\n"; @@ -63,7 +68,7 @@ class AllTests */ public static function suite() { - + $suite = new PHPUnit_Framework_TestSuite('PHPUnit Framework'); //require_once dirname(__FILE__).'/CoreTest.php'; From 807824aaad2e296fc92c8ffd6cacc3717ce1fc93 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 22 Apr 2015 21:48:59 +0200 Subject: [PATCH 052/264] Fix warnings --- htdocs/core/modules/modFournisseur.class.php | 3 ++- htdocs/install/mysql/migration/3.7.0-3.8.0.sql | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php index 13ef54c177093..569cfe07253bc 100644 --- a/htdocs/core/modules/modFournisseur.class.php +++ b/htdocs/core/modules/modFournisseur.class.php @@ -468,7 +468,8 @@ function __construct($db) case 'sellist': $tmp=''; $tmpparam=unserialize($obj->param); // $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null - if ($tmpparam['options'] && is_array($tmpparam['options'])) $tmp=array_shift(array_keys($tmpparam['options'])); + $tmpkey=array_keys($tmpparam['options']); + if ($tmpparam['options'] && is_array($tmpparam['options'])) $tmp=array_shift($tmpkey); if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter="List:".$tmp; break; } 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 9b6f1ce465178..a923d1ad09bee 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 @@ -18,6 +18,11 @@ -- -- 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); + +-- IVORY COST (id country=21) +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values (211, 21, '0','0',0,0,0,0,'IVA Rate 0',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values (212, 21, '18','0',7.5,2,0,0,'IVA standard rate',1); + -- Loan create table llx_loan ( From 305030ae6c53ea12a04013408c2845e685093d2a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 22 Apr 2015 21:58:12 +0200 Subject: [PATCH 053/264] Fix test to match new field names of note --- htdocs/core/modules/modAdherent.class.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php index 56037c9fb163e..a1c90f242a64f 100644 --- a/htdocs/core/modules/modAdherent.class.php +++ b/htdocs/core/modules/modAdherent.class.php @@ -173,9 +173,9 @@ function __construct($db) $this->export_code[$r]=$this->rights_class.'_'.$r; $this->export_label[$r]='MembersAndSubscriptions'; $this->export_permission[$r]=array(array("adherent","export")); - $this->export_fields_array[$r]=array('a.rowid'=>'Id','a.civility'=>"UserTitle",'a.lastname'=>"Lastname",'a.firstname'=>"Firstname",'a.login'=>"Login",'a.morphy'=>'Nature','a.societe'=>'Company','a.address'=>"Address",'a.zip'=>"Zip",'a.town'=>"Town",'d.nom'=>"State",'co.code'=>"CountryCode",'co.label'=>"Country",'a.phone'=>"PhonePro",'a.phone_perso'=>"PhonePerso",'a.phone_mobile'=>"PhoneMobile",'a.email'=>"Email",'a.birth'=>"Birthday",'a.statut'=>"Status",'a.photo'=>"Photo",'a.note'=>"Note",'a.datec'=>'DateCreation','a.datevalid'=>'DateValidation','a.tms'=>'DateLastModification','a.datefin'=>'DateEndSubscription','ta.rowid'=>'MemberTypeId','ta.libelle'=>'MemberTypeLabel','c.rowid'=>'SubscriptionId','c.dateadh'=>'DateSubscription','c.cotisation'=>'Amount'); - $this->export_TypeFields_array[$r]=array('a.civility'=>"Text",'a.lastname'=>"Text",'a.firstname'=>"Text",'a.login'=>"Text",'a.morphy'=>'Text','a.societe'=>'Text','a.address'=>"Text",'a.zip'=>"Text",'a.town'=>"Text",'d.nom'=>"Text",'co.code'=>'Text','co.label'=>"Text",'a.phone'=>"Text",'a.phone_perso'=>"Text",'a.phone_mobile'=>"Text",'a.email'=>"Text",'a.birth'=>"Date",'a.statut'=>"Status",'a.note'=>"Text",'a.datec'=>'Date','a.datevalid'=>'Date','a.tms'=>'Date','a.datefin'=>'Date','ta.rowid'=>'List:fk_adherent_type:libelle','ta.libelle'=>'Text','c.dateadh'=>'Date','c.cotisation'=>'Number'); - $this->export_entities_array[$r]=array('a.rowid'=>'member','a.civility'=>"member",'a.lastname'=>"member",'a.firstname'=>"member",'a.login'=>"member",'a.morphy'=>'member','a.societe'=>'member','a.address'=>"member",'a.zip'=>"member",'a.town'=>"member",'d.nom'=>"member",'co.code'=>"member",'co.label'=>"member",'a.phone'=>"member",'a.phone_perso'=>"member",'a.phone_mobile'=>"member",'a.email'=>"member",'a.birth'=>"member",'a.statut'=>"member",'a.photo'=>"member",'a.note'=>"member",'a.datec'=>'member','a.datevalid'=>'member','a.tms'=>'member','a.datefin'=>'member','ta.rowid'=>'member_type','ta.libelle'=>'member_type','c.rowid'=>'subscription','c.dateadh'=>'subscription','c.cotisation'=>'subscription'); + $this->export_fields_array[$r]=array('a.rowid'=>'Id','a.civility'=>"UserTitle",'a.lastname'=>"Lastname",'a.firstname'=>"Firstname",'a.login'=>"Login",'a.morphy'=>'Nature','a.societe'=>'Company','a.address'=>"Address",'a.zip'=>"Zip",'a.town'=>"Town",'d.nom'=>"State",'co.code'=>"CountryCode",'co.label'=>"Country",'a.phone'=>"PhonePro",'a.phone_perso'=>"PhonePerso",'a.phone_mobile'=>"PhoneMobile",'a.email'=>"Email",'a.birth'=>"Birthday",'a.statut'=>"Status",'a.photo'=>"Photo",'a.note_public'=>"NotePublic",'a.note_private'=>"NotePrivate",'a.datec'=>'DateCreation','a.datevalid'=>'DateValidation','a.tms'=>'DateLastModification','a.datefin'=>'DateEndSubscription','ta.rowid'=>'MemberTypeId','ta.libelle'=>'MemberTypeLabel','c.rowid'=>'SubscriptionId','c.dateadh'=>'DateSubscription','c.cotisation'=>'Amount'); + $this->export_TypeFields_array[$r]=array('a.civility'=>"Text",'a.lastname'=>"Text",'a.firstname'=>"Text",'a.login'=>"Text",'a.morphy'=>'Text','a.societe'=>'Text','a.address'=>"Text",'a.zip'=>"Text",'a.town'=>"Text",'d.nom'=>"Text",'co.code'=>'Text','co.label'=>"Text",'a.phone'=>"Text",'a.phone_perso'=>"Text",'a.phone_mobile'=>"Text",'a.email'=>"Text",'a.birth'=>"Date",'a.statut'=>"Status",'a.note_public'=>"Text",'a.note_private'=>"Text",'a.datec'=>'Date','a.datevalid'=>'Date','a.tms'=>'Date','a.datefin'=>'Date','ta.rowid'=>'List:fk_adherent_type:libelle','ta.libelle'=>'Text','c.dateadh'=>'Date','c.cotisation'=>'Number'); + $this->export_entities_array[$r]=array('a.rowid'=>'member','a.civility'=>"member",'a.lastname'=>"member",'a.firstname'=>"member",'a.login'=>"member",'a.morphy'=>'member','a.societe'=>'member','a.address'=>"member",'a.zip'=>"member",'a.town'=>"member",'d.nom'=>"member",'co.code'=>"member",'co.label'=>"member",'a.phone'=>"member",'a.phone_perso'=>"member",'a.phone_mobile'=>"member",'a.email'=>"member",'a.birth'=>"member",'a.statut'=>"member",'a.photo'=>"member",'a.note_public'=>"member",'a.note_private'=>"member",'a.datec'=>'member','a.datevalid'=>'member','a.tms'=>'member','a.datefin'=>'member','ta.rowid'=>'member_type','ta.libelle'=>'member_type','c.rowid'=>'subscription','c.dateadh'=>'subscription','c.cotisation'=>'subscription'); // Add extra fields $sql="SELECT name, label FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'adherent' AND entity = ".$conf->entity; @@ -211,7 +211,7 @@ function __construct($db) $this->import_entities_array[$r]=array(); // We define here only fields that use another icon that the one defined into import_icon $this->import_tables_array[$r]=array('a'=>MAIN_DB_PREFIX.'adherent','extra'=>MAIN_DB_PREFIX.'adherent_extrafields'); $this->import_tables_creator_array[$r]=array('a'=>'fk_user_author'); // Fields to store import user id - $this->import_fields_array[$r]=array('a.civility'=>"UserTitle",'a.lastname'=>"Lastname*",'a.firstname'=>"Firstname",'a.login'=>"Login*","a.pass"=>"Password","a.fk_adherent_type"=>"MemberType*",'a.morphy'=>'Nature*','a.societe'=>'Company','a.address'=>"Address",'a.zip'=>"Zip",'a.town'=>"Town",'a.state_id'=>'StateId','a.country'=>"CountryId",'a.phone'=>"PhonePro",'a.phone_perso'=>"PhonePerso",'a.phone_mobile'=>"PhoneMobile",'a.email'=>"Email",'a.birth'=>"Birthday",'a.statut'=>"Status*",'a.photo'=>"Photo",'a.note'=>"Note",'a.datec'=>'DateCreation','a.datefin'=>'DateEndSubscription'); + $this->import_fields_array[$r]=array('a.civility'=>"UserTitle",'a.lastname'=>"Lastname*",'a.firstname'=>"Firstname",'a.login'=>"Login*","a.pass"=>"Password","a.fk_adherent_type"=>"MemberType*",'a.morphy'=>'Nature*','a.societe'=>'Company','a.address'=>"Address",'a.zip'=>"Zip",'a.town'=>"Town",'a.state_id'=>'StateId','a.country'=>"CountryId",'a.phone'=>"PhonePro",'a.phone_perso'=>"PhonePerso",'a.phone_mobile'=>"PhoneMobile",'a.email'=>"Email",'a.birth'=>"Birthday",'a.statut'=>"Status*",'a.photo'=>"Photo",'a.note_public'=>"NotePublic",'a.note_private'=>"NotePrivate",'a.datec'=>'DateCreation','a.datefin'=>'DateEndSubscription'); // Add extra fields $sql="SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'adherent' AND entity = ".$conf->entity; $resql=$this->db->query($sql); @@ -227,7 +227,7 @@ function __construct($db) // End add extra fields $this->import_fieldshidden_array[$r]=array('extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'adherent'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent) $this->import_regex_array[$r]=array('a.civility'=>'code@'.MAIN_DB_PREFIX.'c_civility','a.fk_adherent_type'=>'rowid@'.MAIN_DB_PREFIX.'adherent_type','a.morphy'=>'(phy|mor)','a.statut'=>'^[0|1]','a.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$','a.datefin'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$'); - $this->import_examplevalues_array[$r]=array('a.civility'=>"MR",'a.lastname'=>'Smith','a.firstname'=>'John','a.login'=>'jsmith','a.pass'=>'passofjsmith','a.fk_adherent_type'=>'1','a.morphy'=>'"mor" or "phy"','a.societe'=>'JS company','a.address'=>'21 jump street','a.zip'=>'55000','a.town'=>'New York','a.country'=>'1','a.email'=>'jsmith@example.com','a.birth'=>'1972-10-10','a.statut'=>"0 or 1",'a.note'=>"This is a comment on member",'a.datec'=>dol_print_date($now,'%Y-%m-%d'),'a.datefin'=>dol_print_date(dol_time_plus_duree($now, 1, 'y'),'%Y-%m-%d')); + $this->import_examplevalues_array[$r]=array('a.civility'=>"MR",'a.lastname'=>'Smith','a.firstname'=>'John','a.login'=>'jsmith','a.pass'=>'passofjsmith','a.fk_adherent_type'=>'1','a.morphy'=>'"mor" or "phy"','a.societe'=>'JS company','a.address'=>'21 jump street','a.zip'=>'55000','a.town'=>'New York','a.country'=>'1','a.email'=>'jsmith@example.com','a.birth'=>'1972-10-10','a.statut'=>"0 or 1",'a.note_public'=>"This is a public comment on member",'a.note_private'=>"This is private comment on member",'a.datec'=>dol_print_date($now,'%Y-%m-%d'),'a.datefin'=>dol_print_date(dol_time_plus_duree($now, 1, 'y'),'%Y-%m-%d')); } From e2635f66f5cc3690670d577362d21ecde0de024c Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Wed, 22 Apr 2015 22:10:50 +0200 Subject: [PATCH 054/264] Fix test for es --- dev/initdata/mysqldump_dolibarr_3.7.0.sql | 2 +- test/phpunit/PricesTest.php | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dev/initdata/mysqldump_dolibarr_3.7.0.sql b/dev/initdata/mysqldump_dolibarr_3.7.0.sql index 3dda50178284a..d560b93510e93 100644 --- a/dev/initdata/mysqldump_dolibarr_3.7.0.sql +++ b/dev/initdata/mysqldump_dolibarr_3.7.0.sql @@ -1796,7 +1796,7 @@ CREATE TABLE `llx_c_tva` ( LOCK TABLES `llx_c_tva` WRITE; /*!40000 ALTER TABLE `llx_c_tva` DISABLE KEYS */; -INSERT INTO `llx_c_tva` VALUES (11,1,20,'0','0','0','0',0,'VAT standard rate (France hors DOM-TOM)',1,NULL,NULL),(12,1,8.5,'0','0','0','0',0,'VAT standard rate (DOM sauf Guyane et Saint-Martin)',0,NULL,NULL),(13,1,8.5,'0','0','0','0',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,NULL,NULL),(14,1,5.5,'0','0','0','0',0,'VAT reduced rate (France hors DOM-TOM)',1,NULL,NULL),(15,1,0,'0','0','0','0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(16,1,2.1,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(21,2,21,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(22,2,6,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(23,2,0,'0','0','0','0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(24,2,12,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(31,3,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(32,3,10,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(33,3,4,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(34,3,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(41,4,21,'5.2','3','-21','1',0,'VAT standard rate',1,NULL,NULL),(42,4,10,'1.4','3','-21','1',0,'VAT reduced rate',1,NULL,NULL),(43,4,4,'0.5','3','-21','1',0,'VAT super-reduced rate',1,NULL,NULL),(44,4,0,'0','3','-21','1',0,'VAT Rate 0',1,NULL,NULL),(51,5,19,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(52,5,7,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(53,5,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(61,6,7.6,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(62,6,3.6,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(63,6,2.4,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(64,6,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(71,7,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(72,7,17.5,'0','0','0','0',0,'VAT standard rate before 2011',1,NULL,NULL),(73,7,5,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(74,7,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(91,9,17,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(92,9,13,'0','0','0','0',0,'VAT reduced rate 0',1,NULL,NULL),(93,9,3,'0','0','0','0',0,'VAT super reduced rate 0',1,NULL,NULL),(94,9,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(101,10,6,'0','0','0','0',0,'VAT 6%',1,NULL,NULL),(102,10,12,'1','4','0','0',0,'VAT 12%',1,NULL,NULL),(103,10,18,'0','0','0','0',0,'VAT 18%',1,NULL,NULL),(104,10,7.5,'1','4','0','0',0,'VAT 6% Majoré à 25% (7.5%)',1,NULL,NULL),(105,10,15,'1','4','0','0',0,'VAT 12% Majoré à 25% (15%)',1,NULL,NULL),(106,10,22.5,'1','4','0','0',0,'VAT 18% Majoré à 25% (22.5%)',1,NULL,NULL),(107,10,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(111,11,0,'0','0','0','0',0,'No Sales Tax',1,NULL,NULL),(112,11,4,'0','0','0','0',0,'Sales Tax 4%',1,NULL,NULL),(113,11,6,'0','0','0','0',0,'Sales Tax 6%',1,NULL,NULL),(121,12,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(122,12,14,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(123,12,10,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(124,12,7,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(125,12,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(141,14,7,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(142,14,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(143,14,5,'9.975','1','0','0',0,'TPS and TVQ rate',1,NULL,NULL),(171,17,19,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(172,17,6,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(173,17,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(201,20,25,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(202,20,12,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(203,20,6,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(204,20,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(231,23,21,'0','0','0','0',0,'IVA standard rate',1,NULL,NULL),(232,23,10.5,'0','0','0','0',0,'IVA reduced rate',1,NULL,NULL),(233,23,0,'0','0','0','0',0,'IVA Rate 0',1,NULL,NULL),(251,25,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(252,25,12,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(253,25,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(254,25,5,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(271,27,20,'0','0','0','0',0,'VAT standard rate (France hors DOM-TOM)',1,NULL,NULL),(272,27,8.5,'0','0','0','0',0,'VAT standard rate (DOM sauf Guyane et Saint-Martin)',0,NULL,NULL),(273,27,8.5,'0','0','0','0',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,NULL,NULL),(274,27,5.5,'0','0','0','0',0,'VAT reduced rate (France hors DOM-TOM)',0,NULL,NULL),(275,27,0,'0','0','0','0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(276,27,2.1,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(277,27,7,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(281,28,10,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(282,28,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(411,41,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(412,41,10,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(413,41,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(461,46,0,'0','0','0','0',0,'No VAT',1,NULL,NULL),(462,46,15,'0','0','0','0',0,'VAT 15%',1,NULL,NULL),(463,46,7.5,'0','0','0','0',0,'VAT 7.5%',1,NULL,NULL),(591,59,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(592,59,7,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(593,59,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(671,67,19,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(672,67,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(801,80,25,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(802,80,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(861,86,13,'0','0','0','0',0,'IVA 13',1,NULL,NULL),(862,86,0,'0','0','0','0',0,'SIN IVA',1,NULL,NULL),(1141,114,0,'0','0','0','0',0,'No ISV',1,NULL,NULL),(1142,114,12,'0','0','0','0',0,'ISV 12%',1,NULL,NULL),(1161,116,25.5,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1162,116,7,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1163,116,0,'0','0','0','0',0,'VAT rate 0',1,NULL,NULL),(1171,117,12.5,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1172,117,4,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1173,117,1,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(1174,117,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1231,123,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1232,123,5,'0','0','0','0',0,'VAT Rate 5',1,NULL,NULL),(1401,140,15,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1402,140,12,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1403,140,6,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1404,140,3,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(1405,140,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1521,152,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1522,152,15,'0','0','0','0',0,'VAT Rate 15',1,NULL,NULL),(1541,154,0,'0','0','0','0',0,'No VAT',1,NULL,NULL),(1542,154,16,'0','0','0','0',0,'VAT 16%',1,NULL,NULL),(1543,154,10,'0','0','0','0',0,'VAT Frontero',1,NULL,NULL),(1662,166,15,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1663,166,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1731,173,25,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1732,173,14,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1733,173,8,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1734,173,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1841,184,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1842,184,7,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1843,184,3,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1844,184,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1881,188,24,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1882,188,9,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1883,188,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1884,188,5,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1931,193,0,'0','0','0','0',0,'No VAT in SPM',1,NULL,NULL),(2011,201,19,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(2012,201,10,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(2013,201,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(2021,202,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(2022,202,8.5,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(2023,202,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(2321,232,0,'0','0','0','0',0,'No VAT',1,NULL,NULL),(2322,232,12,'0','0','0','0',0,'VAT 12%',1,NULL,NULL),(2323,232,8,'0','0','0','0',0,'VAT 8%',1,NULL,NULL),(2461,246,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(2462,4,15,'0','0','0','0',0,'aaaa',1,NULL,NULL); +INSERT INTO `llx_c_tva` VALUES (11,1,20,'0','0','0','0',0,'VAT standard rate (France hors DOM-TOM)',1,NULL,NULL),(12,1,8.5,'0','0','0','0',0,'VAT standard rate (DOM sauf Guyane et Saint-Martin)',0,NULL,NULL),(13,1,8.5,'0','0','0','0',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,NULL,NULL),(14,1,5.5,'0','0','0','0',0,'VAT reduced rate (France hors DOM-TOM)',1,NULL,NULL),(15,1,0,'0','0','0','0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(16,1,2.1,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(21,2,21,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(22,2,6,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(23,2,0,'0','0','0','0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(24,2,12,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(31,3,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(32,3,10,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(33,3,4,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(34,3,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(41,4,21,'5.2','3','-19','5',0,'VAT standard rate',1,NULL,NULL),(42,4,10,'1.4','3','-19','5',0,'VAT reduced rate',1,NULL,NULL),(43,4,4,'0.5','3','-19','5',0,'VAT super-reduced rate',1,NULL,NULL),(44,4,0,'0','3','-19','5',0,'VAT Rate 0',1,NULL,NULL),(51,5,19,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(52,5,7,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(53,5,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(61,6,7.6,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(62,6,3.6,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(63,6,2.4,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(64,6,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(71,7,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(72,7,17.5,'0','0','0','0',0,'VAT standard rate before 2011',1,NULL,NULL),(73,7,5,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(74,7,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(91,9,17,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(92,9,13,'0','0','0','0',0,'VAT reduced rate 0',1,NULL,NULL),(93,9,3,'0','0','0','0',0,'VAT super reduced rate 0',1,NULL,NULL),(94,9,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(101,10,6,'0','0','0','0',0,'VAT 6%',1,NULL,NULL),(102,10,12,'1','4','0','0',0,'VAT 12%',1,NULL,NULL),(103,10,18,'0','0','0','0',0,'VAT 18%',1,NULL,NULL),(104,10,7.5,'1','4','0','0',0,'VAT 6% Majoré à 25% (7.5%)',1,NULL,NULL),(105,10,15,'1','4','0','0',0,'VAT 12% Majoré à 25% (15%)',1,NULL,NULL),(106,10,22.5,'1','4','0','0',0,'VAT 18% Majoré à 25% (22.5%)',1,NULL,NULL),(107,10,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(111,11,0,'0','0','0','0',0,'No Sales Tax',1,NULL,NULL),(112,11,4,'0','0','0','0',0,'Sales Tax 4%',1,NULL,NULL),(113,11,6,'0','0','0','0',0,'Sales Tax 6%',1,NULL,NULL),(121,12,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(122,12,14,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(123,12,10,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(124,12,7,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(125,12,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(141,14,7,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(142,14,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(143,14,5,'9.975','1','0','0',0,'TPS and TVQ rate',1,NULL,NULL),(171,17,19,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(172,17,6,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(173,17,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(201,20,25,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(202,20,12,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(203,20,6,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(204,20,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(231,23,21,'0','0','0','0',0,'IVA standard rate',1,NULL,NULL),(232,23,10.5,'0','0','0','0',0,'IVA reduced rate',1,NULL,NULL),(233,23,0,'0','0','0','0',0,'IVA Rate 0',1,NULL,NULL),(251,25,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(252,25,12,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(253,25,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(254,25,5,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(271,27,20,'0','0','0','0',0,'VAT standard rate (France hors DOM-TOM)',1,NULL,NULL),(272,27,8.5,'0','0','0','0',0,'VAT standard rate (DOM sauf Guyane et Saint-Martin)',0,NULL,NULL),(273,27,8.5,'0','0','0','0',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,NULL,NULL),(274,27,5.5,'0','0','0','0',0,'VAT reduced rate (France hors DOM-TOM)',0,NULL,NULL),(275,27,0,'0','0','0','0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(276,27,2.1,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(277,27,7,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(281,28,10,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(282,28,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(411,41,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(412,41,10,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(413,41,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(461,46,0,'0','0','0','0',0,'No VAT',1,NULL,NULL),(462,46,15,'0','0','0','0',0,'VAT 15%',1,NULL,NULL),(463,46,7.5,'0','0','0','0',0,'VAT 7.5%',1,NULL,NULL),(591,59,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(592,59,7,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(593,59,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(671,67,19,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(672,67,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(801,80,25,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(802,80,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(861,86,13,'0','0','0','0',0,'IVA 13',1,NULL,NULL),(862,86,0,'0','0','0','0',0,'SIN IVA',1,NULL,NULL),(1141,114,0,'0','0','0','0',0,'No ISV',1,NULL,NULL),(1142,114,12,'0','0','0','0',0,'ISV 12%',1,NULL,NULL),(1161,116,25.5,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1162,116,7,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1163,116,0,'0','0','0','0',0,'VAT rate 0',1,NULL,NULL),(1171,117,12.5,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1172,117,4,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1173,117,1,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(1174,117,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1231,123,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1232,123,5,'0','0','0','0',0,'VAT Rate 5',1,NULL,NULL),(1401,140,15,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1402,140,12,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1403,140,6,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1404,140,3,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(1405,140,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1521,152,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1522,152,15,'0','0','0','0',0,'VAT Rate 15',1,NULL,NULL),(1541,154,0,'0','0','0','0',0,'No VAT',1,NULL,NULL),(1542,154,16,'0','0','0','0',0,'VAT 16%',1,NULL,NULL),(1543,154,10,'0','0','0','0',0,'VAT Frontero',1,NULL,NULL),(1662,166,15,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1663,166,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1731,173,25,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1732,173,14,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1733,173,8,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1734,173,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1841,184,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1842,184,7,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1843,184,3,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1844,184,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1881,188,24,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1882,188,9,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1883,188,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1884,188,5,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1931,193,0,'0','0','0','0',0,'No VAT in SPM',1,NULL,NULL),(2011,201,19,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(2012,201,10,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(2013,201,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(2021,202,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(2022,202,8.5,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(2023,202,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(2321,232,0,'0','0','0','0',0,'No VAT',1,NULL,NULL),(2322,232,12,'0','0','0','0',0,'VAT 12%',1,NULL,NULL),(2323,232,8,'0','0','0','0',0,'VAT 8%',1,NULL,NULL),(2461,246,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(2462,4,15,'0','0','0','0',0,'aaaa',1,NULL,NULL); /*!40000 ALTER TABLE `llx_c_tva` ENABLE KEYS */; UNLOCK TABLES; diff --git a/test/phpunit/PricesTest.php b/test/phpunit/PricesTest.php index 7992b08614bdc..24686d51e2e1b 100755 --- a/test/phpunit/PricesTest.php +++ b/test/phpunit/PricesTest.php @@ -197,14 +197,14 @@ public function testCalculPriceTotal() // -------------------------------------------------------- - // 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 21% localtax2 type 5 (method we provide value) + // 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 19% localtax2 type 5 (method we provide value) $mysoc->country_code='ES'; $mysoc->country_id=4; $mysoc->localtax1_assuj=0; $mysoc->localtax2_assuj=1; - $result2=calcul_price_total(10, 10, 0, 10, 0, -1, 0, 'HT', 0, 0); + $result2=calcul_price_total(10, 10, 0, 10, 0, -19, 0, 'HT', 0, 0); // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) - $this->assertEquals(array(100, 10, 89, 10, 1, 8.9, 100, 10, 89, 0, -21, 0, -2.10, 0, 0, -21),$result2,'Test5 ES'); + $this->assertEquals(array(100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19, 0, -1.90, 0, 0, -19),$result2,'Test5 ES'); // 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 21% localtax2 type 5 (other method autodetect) $mysoc->country_code='ES'; @@ -214,19 +214,19 @@ public function testCalculPriceTotal() $result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 0); print __METHOD__." result2=".join(', ',$result2)."\n"; // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) - $this->assertEquals(array(100, 10, 89, 10, 1, 8.9, 100, 10, 89, 0, -21, 0, -2.10, 0, 0, -21),$result2,'Test6 ES'); + $this->assertEquals(array(100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19, 0, -1.90, 0, 0, -19),$result2,'Test6 ES'); // -------------------------------------------------------- - // Credit Note: 10 * -10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 21% localtax2 type 5 (method we provide value) + // Credit Note: 10 * -10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 19% localtax2 type 5 (method we provide value) $mysoc->country_code='ES'; $mysoc->country_id=4; $mysoc->localtax1_assuj=0; $mysoc->localtax2_assuj=1; - $result2=calcul_price_total(10, -10, 0, 10, 0, 1, 0, 'HT', 0, 0); + $result2=calcul_price_total(10, -10, 0, 10, 0, 19, 0, 'HT', 0, 0); print __METHOD__." result2=".join(', ',$result2)."\n"; // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) - $this->assertEquals(array(-100, -10, -89, -10, -1, -8.9, -100, -10, -89, 0, 21, 0, 2.1, 0, 0, 21),$result2,'Test7 ES'); + $this->assertEquals(array(-100, -10, -91, -10, -1, -9.1, -100, -10,- 91, 0, 19, 0, 1.90, 0, 0, 19),$result2,'Test7 ES'); // Credit Note: 10 * -10 HT - 0% discount with 10% vat and 1.4% localtax1 type 3, 0% localtax2 type 5 (other method autodetect) $mysoc->country_code='ES'; @@ -235,7 +235,7 @@ public function testCalculPriceTotal() $mysoc->localtax2_assuj=1; $result2=calcul_price_total(10, -10, 0, 10, -1, -1, 0, 'HT', 0, 0); print __METHOD__." result2=".join(', ',$result2)."\n"; - $this->assertEquals(array(-100, -10, -89, -10, -1, -8.9, -100, -10, -89, 0, 21, 0, 2.1, 0, 0, 21),$result2,'Test8 ES'); + $this->assertEquals(array(-100, -10, -91, -10, -1, -9.1, -100, -10,- 91, 0, 19, 0, 1.90, 0, 0, 19),$result2,'Test8 ES'); /* From 93d93210889ae683c505cd91fb65d6e72d468663 Mon Sep 17 00:00:00 2001 From: Francis Appels Date: Wed, 22 Apr 2015 23:27:09 +0200 Subject: [PATCH 055/264] FIX: can show print page after product save Add product id to form action to be able show print page from product card after save. --- htdocs/product/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/product/card.php b/htdocs/product/card.php index b5f34e20a8d08..2525e5c3d7b58 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -1080,7 +1080,7 @@ print_fiche_titre($langs->trans('Modify').' '.$type.' : '.(is_object($object->oldcopy)?$object->oldcopy->ref:$object->ref), ""); // Main official, simple, and not duplicated code - print '
'."\n"; + print ''."\n"; print ''; print ''; print ''; From 1ed573f98bcc66b2b299192baa4958e70ad6fd90 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Wed, 22 Apr 2015 23:31:24 +0200 Subject: [PATCH 056/264] Fix: #2694 Bug: Warning: Invalid argument supplied for foreach() in commande.class.php on line 852 --- htdocs/core/class/commonobject.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 46d280f87631c..d36e71fb6a4ec 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -3,7 +3,7 @@ * Copyright (C) 2005-2013 Regis Houssin * Copyright (C) 2010-2013 Juanjo Menent * Copyright (C) 2012 Christophe Battarel - * Copyright (C) 2010-2014 Juanjo Menent + * Copyright (C) 2010-2015 Juanjo Menent * Copyright (C) 2012-2013 Christophe Battarel * Copyright (C) 2011-2014 Philippe Grand * Copyright (C) 2012-2014 Marcos García @@ -36,7 +36,7 @@ abstract class CommonObject { public $db; public $error; - public $errors; + public $errors=array(); // Array use for errors public $canvas; // Contains canvas name if it is public $context=array(); // Use to pass context information From f7ab53be8e49f5dcec37caea2efbafddbd68d768 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Wed, 22 Apr 2015 23:40:43 +0200 Subject: [PATCH 057/264] Fix test for es. Dumps 3.5 et 3.6 --- dev/initdata/mysqldump_dolibarr_3.5.0.sql | 2 +- dev/initdata/mysqldump_dolibarr_3.6.0.sql | 2 +- htdocs/core/class/commonobject.class.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev/initdata/mysqldump_dolibarr_3.5.0.sql b/dev/initdata/mysqldump_dolibarr_3.5.0.sql index 43a0479a67887..48d82c71998ff 100644 --- a/dev/initdata/mysqldump_dolibarr_3.5.0.sql +++ b/dev/initdata/mysqldump_dolibarr_3.5.0.sql @@ -1617,7 +1617,7 @@ CREATE TABLE `llx_c_tva` ( LOCK TABLES `llx_c_tva` WRITE; /*!40000 ALTER TABLE `llx_c_tva` DISABLE KEYS */; -INSERT INTO `llx_c_tva` VALUES (11,1,20,0,'0',0,'0',0,'VAT standard rate (France hors DOM-TOM)',1,NULL,NULL),(12,1,8.5,0,'0',0,'0',0,'VAT standard rate (DOM sauf Guyane et Saint-Martin)',0,NULL,NULL),(13,1,8.5,0,'0',0,'0',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,NULL,NULL),(14,1,5.5,0,'0',0,'0',0,'VAT reduced rate (France hors DOM-TOM)',1,NULL,NULL),(15,1,0,0,'0',0,'0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(16,1,2.1,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(21,2,21,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(22,2,6,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(23,2,0,0,'0',0,'0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(24,2,12,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(31,3,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(32,3,10,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(33,3,4,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(34,3,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(41,4,21,5.2,'3',-21,'1',0,'VAT standard rate',1,NULL,NULL),(42,4,10,1.4,'3',-21,'1',0,'VAT reduced rate',1,NULL,NULL),(43,4,4,0.5,'3',-21,'1',0,'VAT super-reduced rate',1,NULL,NULL),(44,4,0,0,'3',-21,'1',0,'VAT Rate 0',1,NULL,NULL),(51,5,19,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(52,5,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(53,5,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(61,6,7.6,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(62,6,3.6,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(63,6,2.4,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(64,6,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(71,7,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(72,7,17.5,0,'0',0,'0',0,'VAT standard rate before 2011',1,NULL,NULL),(73,7,5,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(74,7,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(91,9,17,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(92,9,13,0,'0',0,'0',0,'VAT reduced rate 0',1,NULL,NULL),(93,9,3,0,'0',0,'0',0,'VAT super reduced rate 0',1,NULL,NULL),(94,9,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(101,10,6,0,'0',0,'0',0,'VAT 6%',1,NULL,NULL),(102,10,12,1,'4',0,'0',0,'VAT 12%',1,NULL,NULL),(103,10,18,0,'0',0,'0',0,'VAT 18%',1,NULL,NULL),(104,10,7.5,1,'4',0,'0',0,'VAT 6% Majoré à 25% (7.5%)',1,NULL,NULL),(105,10,15,1,'4',0,'0',0,'VAT 12% Majoré à 25% (15%)',1,NULL,NULL),(106,10,22.5,1,'4',0,'0',0,'VAT 18% Majoré à 25% (22.5%)',1,NULL,NULL),(107,10,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(111,11,0,0,'0',0,'0',0,'No Sales Tax',1,NULL,NULL),(112,11,4,0,'0',0,'0',0,'Sales Tax 4%',1,NULL,NULL),(113,11,6,0,'0',0,'0',0,'Sales Tax 6%',1,NULL,NULL),(121,12,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(122,12,14,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(123,12,10,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(124,12,7,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(125,12,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(141,14,7,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(142,14,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(143,14,5,9.975,'1',0,'0',0,'TPS and TVQ rate',1,NULL,NULL),(171,17,19,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(172,17,6,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(173,17,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(201,20,25,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(202,20,12,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(203,20,6,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(204,20,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(231,23,21,0,'0',0,'0',0,'IVA standard rate',1,NULL,NULL),(232,23,10.5,0,'0',0,'0',0,'IVA reduced rate',1,NULL,NULL),(233,23,0,0,'0',0,'0',0,'IVA Rate 0',1,NULL,NULL),(251,25,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(252,25,12,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(253,25,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(254,25,5,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(271,27,20,0,'0',0,'0',0,'VAT standard rate (France hors DOM-TOM)',1,NULL,NULL),(272,27,8.5,0,'0',0,'0',0,'VAT standard rate (DOM sauf Guyane et Saint-Martin)',0,NULL,NULL),(273,27,8.5,0,'0',0,'0',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,NULL,NULL),(274,27,5.5,0,'0',0,'0',0,'VAT reduced rate (France hors DOM-TOM)',0,NULL,NULL),(275,27,0,0,'0',0,'0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(276,27,2.1,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(277,27,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(281,28,10,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(282,28,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(411,41,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(412,41,10,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(413,41,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(461,46,0,0,'0',0,'0',0,'No VAT',1,NULL,NULL),(462,46,15,0,'0',0,'0',0,'VAT 15%',1,NULL,NULL),(463,46,7.5,0,'0',0,'0',0,'VAT 7.5%',1,NULL,NULL),(591,59,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(592,59,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(593,59,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(671,67,19,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(672,67,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(801,80,25,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(802,80,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(861,86,13,0,'0',0,'0',0,'IVA 13',1,NULL,NULL),(862,86,0,0,'0',0,'0',0,'SIN IVA',1,NULL,NULL),(1141,114,0,0,'0',0,'0',0,'No ISV',1,NULL,NULL),(1142,114,12,0,'0',0,'0',0,'ISV 12%',1,NULL,NULL),(1161,116,25.5,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1162,116,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1163,116,0,0,'0',0,'0',0,'VAT rate 0',1,NULL,NULL),(1171,117,12.5,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1172,117,4,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1173,117,1,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(1174,117,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1231,123,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1232,123,5,0,'0',0,'0',0,'VAT Rate 5',1,NULL,NULL),(1401,140,15,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1402,140,12,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1403,140,6,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1404,140,3,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(1405,140,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1521,152,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1522,152,15,0,'0',0,'0',0,'VAT Rate 15',1,NULL,NULL),(1541,154,0,0,'0',0,'0',0,'No VAT',1,NULL,NULL),(1542,154,16,0,'0',0,'0',0,'VAT 16%',1,NULL,NULL),(1543,154,10,0,'0',0,'0',0,'VAT Frontero',1,NULL,NULL),(1662,166,15,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1663,166,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1731,173,25,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1732,173,14,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1733,173,8,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1734,173,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1841,184,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1842,184,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1843,184,3,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1844,184,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1881,188,24,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1882,188,9,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1883,188,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1884,188,5,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1931,193,0,0,'0',0,'0',0,'No VAT in SPM',1,NULL,NULL),(2011,201,19,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(2012,201,10,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(2013,201,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(2021,202,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(2022,202,8.5,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(2023,202,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(2321,232,0,0,'0',0,'0',0,'No VAT',1,NULL,NULL),(2322,232,12,0,'0',0,'0',0,'VAT 12%',1,NULL,NULL),(2323,232,8,0,'0',0,'0',0,'VAT 8%',1,NULL,NULL),(2461,246,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(2462,4,15,0,'0',0,'0',0,'aaaa',1,NULL,NULL); +INSERT INTO `llx_c_tva` VALUES (11,1,20,0,'0',0,'0',0,'VAT standard rate (France hors DOM-TOM)',1,NULL,NULL),(12,1,8.5,0,'0',0,'0',0,'VAT standard rate (DOM sauf Guyane et Saint-Martin)',0,NULL,NULL),(13,1,8.5,0,'0',0,'0',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,NULL,NULL),(14,1,5.5,0,'0',0,'0',0,'VAT reduced rate (France hors DOM-TOM)',1,NULL,NULL),(15,1,0,0,'0',0,'0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(16,1,2.1,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(21,2,21,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(22,2,6,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(23,2,0,0,'0',0,'0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(24,2,12,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(31,3,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(32,3,10,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(33,3,4,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(34,3,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(41,4,21,5.2,'3',-19,'5',0,'VAT standard rate',1,NULL,NULL),(42,4,10,1.4,'3',-19,'5',0,'VAT reduced rate',1,NULL,NULL),(43,4,4,0.5,'3',-19,'5',0,'VAT super-reduced rate',1,NULL,NULL),(44,4,0,0,'3',-19,'5',0,'VAT Rate 0',1,NULL,NULL),(51,5,19,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(52,5,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(53,5,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(61,6,7.6,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(62,6,3.6,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(63,6,2.4,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(64,6,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(71,7,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(72,7,17.5,0,'0',0,'0',0,'VAT standard rate before 2011',1,NULL,NULL),(73,7,5,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(74,7,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(91,9,17,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(92,9,13,0,'0',0,'0',0,'VAT reduced rate 0',1,NULL,NULL),(93,9,3,0,'0',0,'0',0,'VAT super reduced rate 0',1,NULL,NULL),(94,9,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(101,10,6,0,'0',0,'0',0,'VAT 6%',1,NULL,NULL),(102,10,12,1,'4',0,'0',0,'VAT 12%',1,NULL,NULL),(103,10,18,0,'0',0,'0',0,'VAT 18%',1,NULL,NULL),(104,10,7.5,1,'4',0,'0',0,'VAT 6% Majoré à 25% (7.5%)',1,NULL,NULL),(105,10,15,1,'4',0,'0',0,'VAT 12% Majoré à 25% (15%)',1,NULL,NULL),(106,10,22.5,1,'4',0,'0',0,'VAT 18% Majoré à 25% (22.5%)',1,NULL,NULL),(107,10,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(111,11,0,0,'0',0,'0',0,'No Sales Tax',1,NULL,NULL),(112,11,4,0,'0',0,'0',0,'Sales Tax 4%',1,NULL,NULL),(113,11,6,0,'0',0,'0',0,'Sales Tax 6%',1,NULL,NULL),(121,12,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(122,12,14,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(123,12,10,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(124,12,7,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(125,12,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(141,14,7,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(142,14,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(143,14,5,9.975,'1',0,'0',0,'TPS and TVQ rate',1,NULL,NULL),(171,17,19,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(172,17,6,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(173,17,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(201,20,25,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(202,20,12,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(203,20,6,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(204,20,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(231,23,21,0,'0',0,'0',0,'IVA standard rate',1,NULL,NULL),(232,23,10.5,0,'0',0,'0',0,'IVA reduced rate',1,NULL,NULL),(233,23,0,0,'0',0,'0',0,'IVA Rate 0',1,NULL,NULL),(251,25,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(252,25,12,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(253,25,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(254,25,5,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(271,27,20,0,'0',0,'0',0,'VAT standard rate (France hors DOM-TOM)',1,NULL,NULL),(272,27,8.5,0,'0',0,'0',0,'VAT standard rate (DOM sauf Guyane et Saint-Martin)',0,NULL,NULL),(273,27,8.5,0,'0',0,'0',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,NULL,NULL),(274,27,5.5,0,'0',0,'0',0,'VAT reduced rate (France hors DOM-TOM)',0,NULL,NULL),(275,27,0,0,'0',0,'0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(276,27,2.1,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(277,27,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(281,28,10,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(282,28,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(411,41,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(412,41,10,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(413,41,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(461,46,0,0,'0',0,'0',0,'No VAT',1,NULL,NULL),(462,46,15,0,'0',0,'0',0,'VAT 15%',1,NULL,NULL),(463,46,7.5,0,'0',0,'0',0,'VAT 7.5%',1,NULL,NULL),(591,59,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(592,59,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(593,59,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(671,67,19,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(672,67,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(801,80,25,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(802,80,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(861,86,13,0,'0',0,'0',0,'IVA 13',1,NULL,NULL),(862,86,0,0,'0',0,'0',0,'SIN IVA',1,NULL,NULL),(1141,114,0,0,'0',0,'0',0,'No ISV',1,NULL,NULL),(1142,114,12,0,'0',0,'0',0,'ISV 12%',1,NULL,NULL),(1161,116,25.5,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1162,116,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1163,116,0,0,'0',0,'0',0,'VAT rate 0',1,NULL,NULL),(1171,117,12.5,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1172,117,4,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1173,117,1,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(1174,117,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1231,123,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1232,123,5,0,'0',0,'0',0,'VAT Rate 5',1,NULL,NULL),(1401,140,15,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1402,140,12,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1403,140,6,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1404,140,3,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(1405,140,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1521,152,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1522,152,15,0,'0',0,'0',0,'VAT Rate 15',1,NULL,NULL),(1541,154,0,0,'0',0,'0',0,'No VAT',1,NULL,NULL),(1542,154,16,0,'0',0,'0',0,'VAT 16%',1,NULL,NULL),(1543,154,10,0,'0',0,'0',0,'VAT Frontero',1,NULL,NULL),(1662,166,15,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1663,166,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1731,173,25,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1732,173,14,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1733,173,8,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1734,173,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1841,184,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1842,184,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1843,184,3,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1844,184,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1881,188,24,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1882,188,9,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1883,188,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1884,188,5,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1931,193,0,0,'0',0,'0',0,'No VAT in SPM',1,NULL,NULL),(2011,201,19,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(2012,201,10,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(2013,201,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(2021,202,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(2022,202,8.5,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(2023,202,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(2321,232,0,0,'0',0,'0',0,'No VAT',1,NULL,NULL),(2322,232,12,0,'0',0,'0',0,'VAT 12%',1,NULL,NULL),(2323,232,8,0,'0',0,'0',0,'VAT 8%',1,NULL,NULL),(2461,246,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(2462,4,15,0,'0',0,'0',0,'aaaa',1,NULL,NULL); /*!40000 ALTER TABLE `llx_c_tva` ENABLE KEYS */; UNLOCK TABLES; diff --git a/dev/initdata/mysqldump_dolibarr_3.6.0.sql b/dev/initdata/mysqldump_dolibarr_3.6.0.sql index b1b8d77aa3c31..e0a55acc8e2c6 100644 --- a/dev/initdata/mysqldump_dolibarr_3.6.0.sql +++ b/dev/initdata/mysqldump_dolibarr_3.6.0.sql @@ -1652,7 +1652,7 @@ CREATE TABLE `llx_c_tva` ( LOCK TABLES `llx_c_tva` WRITE; /*!40000 ALTER TABLE `llx_c_tva` DISABLE KEYS */; -INSERT INTO `llx_c_tva` VALUES (11,1,20,0,'0',0,'0',0,'VAT standard rate (France hors DOM-TOM)',1,NULL,NULL),(12,1,8.5,0,'0',0,'0',0,'VAT standard rate (DOM sauf Guyane et Saint-Martin)',0,NULL,NULL),(13,1,8.5,0,'0',0,'0',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,NULL,NULL),(14,1,5.5,0,'0',0,'0',0,'VAT reduced rate (France hors DOM-TOM)',1,NULL,NULL),(15,1,0,0,'0',0,'0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(16,1,2.1,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(21,2,21,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(22,2,6,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(23,2,0,0,'0',0,'0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(24,2,12,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(31,3,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(32,3,10,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(33,3,4,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(34,3,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(41,4,21,5.2,'3',-21,'1',0,'VAT standard rate',1,NULL,NULL),(42,4,10,1.4,'3',-21,'1',0,'VAT reduced rate',1,NULL,NULL),(43,4,4,0.5,'3',-21,'1',0,'VAT super-reduced rate',1,NULL,NULL),(44,4,0,0,'3',-21,'1',0,'VAT Rate 0',1,NULL,NULL),(51,5,19,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(52,5,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(53,5,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(61,6,7.6,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(62,6,3.6,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(63,6,2.4,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(64,6,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(71,7,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(72,7,17.5,0,'0',0,'0',0,'VAT standard rate before 2011',1,NULL,NULL),(73,7,5,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(74,7,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(91,9,17,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(92,9,13,0,'0',0,'0',0,'VAT reduced rate 0',1,NULL,NULL),(93,9,3,0,'0',0,'0',0,'VAT super reduced rate 0',1,NULL,NULL),(94,9,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(101,10,6,0,'0',0,'0',0,'VAT 6%',1,NULL,NULL),(102,10,12,1,'4',0,'0',0,'VAT 12%',1,NULL,NULL),(103,10,18,0,'0',0,'0',0,'VAT 18%',1,NULL,NULL),(104,10,7.5,1,'4',0,'0',0,'VAT 6% Majoré à 25% (7.5%)',1,NULL,NULL),(105,10,15,1,'4',0,'0',0,'VAT 12% Majoré à 25% (15%)',1,NULL,NULL),(106,10,22.5,1,'4',0,'0',0,'VAT 18% Majoré à 25% (22.5%)',1,NULL,NULL),(107,10,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(111,11,0,0,'0',0,'0',0,'No Sales Tax',1,NULL,NULL),(112,11,4,0,'0',0,'0',0,'Sales Tax 4%',1,NULL,NULL),(113,11,6,0,'0',0,'0',0,'Sales Tax 6%',1,NULL,NULL),(121,12,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(122,12,14,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(123,12,10,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(124,12,7,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(125,12,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(141,14,7,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(142,14,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(143,14,5,9.975,'1',0,'0',0,'TPS and TVQ rate',1,NULL,NULL),(171,17,19,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(172,17,6,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(173,17,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(201,20,25,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(202,20,12,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(203,20,6,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(204,20,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(231,23,21,0,'0',0,'0',0,'IVA standard rate',1,NULL,NULL),(232,23,10.5,0,'0',0,'0',0,'IVA reduced rate',1,NULL,NULL),(233,23,0,0,'0',0,'0',0,'IVA Rate 0',1,NULL,NULL),(251,25,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(252,25,12,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(253,25,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(254,25,5,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(271,27,20,0,'0',0,'0',0,'VAT standard rate (France hors DOM-TOM)',1,NULL,NULL),(272,27,8.5,0,'0',0,'0',0,'VAT standard rate (DOM sauf Guyane et Saint-Martin)',0,NULL,NULL),(273,27,8.5,0,'0',0,'0',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,NULL,NULL),(274,27,5.5,0,'0',0,'0',0,'VAT reduced rate (France hors DOM-TOM)',0,NULL,NULL),(275,27,0,0,'0',0,'0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(276,27,2.1,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(277,27,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(281,28,10,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(282,28,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(411,41,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(412,41,10,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(413,41,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(461,46,0,0,'0',0,'0',0,'No VAT',1,NULL,NULL),(462,46,15,0,'0',0,'0',0,'VAT 15%',1,NULL,NULL),(463,46,7.5,0,'0',0,'0',0,'VAT 7.5%',1,NULL,NULL),(591,59,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(592,59,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(593,59,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(671,67,19,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(672,67,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(801,80,25,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(802,80,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(861,86,13,0,'0',0,'0',0,'IVA 13',1,NULL,NULL),(862,86,0,0,'0',0,'0',0,'SIN IVA',1,NULL,NULL),(1141,114,0,0,'0',0,'0',0,'No ISV',1,NULL,NULL),(1142,114,12,0,'0',0,'0',0,'ISV 12%',1,NULL,NULL),(1161,116,25.5,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1162,116,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1163,116,0,0,'0',0,'0',0,'VAT rate 0',1,NULL,NULL),(1171,117,12.5,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1172,117,4,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1173,117,1,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(1174,117,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1231,123,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1232,123,5,0,'0',0,'0',0,'VAT Rate 5',1,NULL,NULL),(1401,140,15,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1402,140,12,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1403,140,6,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1404,140,3,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(1405,140,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1521,152,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1522,152,15,0,'0',0,'0',0,'VAT Rate 15',1,NULL,NULL),(1541,154,0,0,'0',0,'0',0,'No VAT',1,NULL,NULL),(1542,154,16,0,'0',0,'0',0,'VAT 16%',1,NULL,NULL),(1543,154,10,0,'0',0,'0',0,'VAT Frontero',1,NULL,NULL),(1662,166,15,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1663,166,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1731,173,25,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1732,173,14,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1733,173,8,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1734,173,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1841,184,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1842,184,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1843,184,3,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1844,184,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1881,188,24,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1882,188,9,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1883,188,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1884,188,5,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1931,193,0,0,'0',0,'0',0,'No VAT in SPM',1,NULL,NULL),(2011,201,19,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(2012,201,10,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(2013,201,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(2021,202,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(2022,202,8.5,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(2023,202,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(2321,232,0,0,'0',0,'0',0,'No VAT',1,NULL,NULL),(2322,232,12,0,'0',0,'0',0,'VAT 12%',1,NULL,NULL),(2323,232,8,0,'0',0,'0',0,'VAT 8%',1,NULL,NULL),(2461,246,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(2462,4,15,0,'0',0,'0',0,'aaaa',1,NULL,NULL); +INSERT INTO `llx_c_tva` VALUES (11,1,20,0,'0',0,'0',0,'VAT standard rate (France hors DOM-TOM)',1,NULL,NULL),(12,1,8.5,0,'0',0,'0',0,'VAT standard rate (DOM sauf Guyane et Saint-Martin)',0,NULL,NULL),(13,1,8.5,0,'0',0,'0',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,NULL,NULL),(14,1,5.5,0,'0',0,'0',0,'VAT reduced rate (France hors DOM-TOM)',1,NULL,NULL),(15,1,0,0,'0',0,'0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(16,1,2.1,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(21,2,21,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(22,2,6,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(23,2,0,0,'0',0,'0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(24,2,12,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(31,3,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(32,3,10,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(33,3,4,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(34,3,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(41,4,21,5.2,'3',-19,'5',0,'VAT standard rate',1,NULL,NULL),(42,4,10,1.4,'3',-19,'5',0,'VAT reduced rate',1,NULL,NULL),(43,4,4,0.5,'3',-19,'5',0,'VAT super-reduced rate',1,NULL,NULL),(44,4,0,0,'3',-19,'5',0,'VAT Rate 0',1,NULL,NULL),(51,5,19,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(52,5,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(53,5,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(61,6,7.6,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(62,6,3.6,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(63,6,2.4,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(64,6,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(71,7,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(72,7,17.5,0,'0',0,'0',0,'VAT standard rate before 2011',1,NULL,NULL),(73,7,5,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(74,7,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(91,9,17,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(92,9,13,0,'0',0,'0',0,'VAT reduced rate 0',1,NULL,NULL),(93,9,3,0,'0',0,'0',0,'VAT super reduced rate 0',1,NULL,NULL),(94,9,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(101,10,6,0,'0',0,'0',0,'VAT 6%',1,NULL,NULL),(102,10,12,1,'4',0,'0',0,'VAT 12%',1,NULL,NULL),(103,10,18,0,'0',0,'0',0,'VAT 18%',1,NULL,NULL),(104,10,7.5,1,'4',0,'0',0,'VAT 6% Majoré à 25% (7.5%)',1,NULL,NULL),(105,10,15,1,'4',0,'0',0,'VAT 12% Majoré à 25% (15%)',1,NULL,NULL),(106,10,22.5,1,'4',0,'0',0,'VAT 18% Majoré à 25% (22.5%)',1,NULL,NULL),(107,10,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(111,11,0,0,'0',0,'0',0,'No Sales Tax',1,NULL,NULL),(112,11,4,0,'0',0,'0',0,'Sales Tax 4%',1,NULL,NULL),(113,11,6,0,'0',0,'0',0,'Sales Tax 6%',1,NULL,NULL),(121,12,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(122,12,14,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(123,12,10,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(124,12,7,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(125,12,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(141,14,7,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(142,14,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(143,14,5,9.975,'1',0,'0',0,'TPS and TVQ rate',1,NULL,NULL),(171,17,19,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(172,17,6,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(173,17,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(201,20,25,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(202,20,12,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(203,20,6,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(204,20,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(231,23,21,0,'0',0,'0',0,'IVA standard rate',1,NULL,NULL),(232,23,10.5,0,'0',0,'0',0,'IVA reduced rate',1,NULL,NULL),(233,23,0,0,'0',0,'0',0,'IVA Rate 0',1,NULL,NULL),(251,25,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(252,25,12,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(253,25,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(254,25,5,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(271,27,20,0,'0',0,'0',0,'VAT standard rate (France hors DOM-TOM)',1,NULL,NULL),(272,27,8.5,0,'0',0,'0',0,'VAT standard rate (DOM sauf Guyane et Saint-Martin)',0,NULL,NULL),(273,27,8.5,0,'0',0,'0',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,NULL,NULL),(274,27,5.5,0,'0',0,'0',0,'VAT reduced rate (France hors DOM-TOM)',0,NULL,NULL),(275,27,0,0,'0',0,'0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(276,27,2.1,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(277,27,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(281,28,10,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(282,28,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(411,41,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(412,41,10,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(413,41,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(461,46,0,0,'0',0,'0',0,'No VAT',1,NULL,NULL),(462,46,15,0,'0',0,'0',0,'VAT 15%',1,NULL,NULL),(463,46,7.5,0,'0',0,'0',0,'VAT 7.5%',1,NULL,NULL),(591,59,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(592,59,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(593,59,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(671,67,19,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(672,67,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(801,80,25,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(802,80,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(861,86,13,0,'0',0,'0',0,'IVA 13',1,NULL,NULL),(862,86,0,0,'0',0,'0',0,'SIN IVA',1,NULL,NULL),(1141,114,0,0,'0',0,'0',0,'No ISV',1,NULL,NULL),(1142,114,12,0,'0',0,'0',0,'ISV 12%',1,NULL,NULL),(1161,116,25.5,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1162,116,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1163,116,0,0,'0',0,'0',0,'VAT rate 0',1,NULL,NULL),(1171,117,12.5,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1172,117,4,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1173,117,1,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(1174,117,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1231,123,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1232,123,5,0,'0',0,'0',0,'VAT Rate 5',1,NULL,NULL),(1401,140,15,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1402,140,12,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1403,140,6,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1404,140,3,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(1405,140,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1521,152,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1522,152,15,0,'0',0,'0',0,'VAT Rate 15',1,NULL,NULL),(1541,154,0,0,'0',0,'0',0,'No VAT',1,NULL,NULL),(1542,154,16,0,'0',0,'0',0,'VAT 16%',1,NULL,NULL),(1543,154,10,0,'0',0,'0',0,'VAT Frontero',1,NULL,NULL),(1662,166,15,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1663,166,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1731,173,25,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1732,173,14,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1733,173,8,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1734,173,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1841,184,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1842,184,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1843,184,3,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1844,184,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1881,188,24,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1882,188,9,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1883,188,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1884,188,5,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1931,193,0,0,'0',0,'0',0,'No VAT in SPM',1,NULL,NULL),(2011,201,19,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(2012,201,10,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(2013,201,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(2021,202,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(2022,202,8.5,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(2023,202,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(2321,232,0,0,'0',0,'0',0,'No VAT',1,NULL,NULL),(2322,232,12,0,'0',0,'0',0,'VAT 12%',1,NULL,NULL),(2323,232,8,0,'0',0,'0',0,'VAT 8%',1,NULL,NULL),(2461,246,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(2462,4,15,0,'0',0,'0',0,'aaaa',1,NULL,NULL); /*!40000 ALTER TABLE `llx_c_tva` ENABLE KEYS */; UNLOCK TABLES; diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index e84aa42edee07..b659e05c72ab4 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -50,7 +50,7 @@ abstract class CommonObject /** * @var string[] Array of error strings */ - public $errors; + public $errors=array(); /** * @var string Can be used to pass information when only object is provied to method From 3ae8428a12b06794827cf8884fefe2e31e3b782f Mon Sep 17 00:00:00 2001 From: aspangaro Date: Thu, 23 Apr 2015 07:26:09 +0200 Subject: [PATCH 058/264] New: Add search field for value date in vat payment list --- htdocs/compta/tva/reglement.php | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/htdocs/compta/tva/reglement.php b/htdocs/compta/tva/reglement.php index 45a6907649251..14cdedc821cd2 100644 --- a/htdocs/compta/tva/reglement.php +++ b/htdocs/compta/tva/reglement.php @@ -26,6 +26,8 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; $langs->load("compta"); $langs->load("bills"); @@ -38,6 +40,8 @@ $search_ref = GETPOST('search_ref','int'); $search_label = GETPOST('search_label','alpha'); $search_amount = GETPOST('search_amount','alpha'); +$month = GETPOST("month","int"); +$year = GETPOST("year","int"); $sortfield = GETPOST("sortfield",'alpha'); $sortorder = GETPOST("sortorder",'alpha'); $page = GETPOST("page",'int'); @@ -71,6 +75,8 @@ $search_ref=""; $search_label=""; $search_amount=""; + $year=""; + $month=""; $typeid=""; } @@ -81,6 +87,7 @@ llxHeader(); $form = new Form($db); +$formother=new FormOther($db); $tva_static = new Tva($db); $sql = "SELECT t.rowid, t.amount, t.label, t.datev as dm, t.fk_typepayment as type, t.num_payment, pst.code as payment_code"; @@ -90,6 +97,17 @@ if ($search_ref) $sql.=" AND t.rowid=".$search_ref; if ($search_label) $sql.=" AND t.label LIKE '%".$db->escape($search_label)."%'"; if ($search_amount) $sql.=" AND t.amount='".$db->escape(price2num(trim($search_amount)))."'"; +if ($month > 0) +{ + if ($year > 0) + $sql.= " AND t.datev 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(t.datev, '%m') = '$month'"; +} +else if ($year > 0) +{ + $sql.= " AND t.datev BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'"; +} if ($filtre) { $filtre=str_replace(":","=",$filtre); $sql .= " AND ".$filtre; @@ -119,7 +137,7 @@ print '
 '; + print ''; + $syear = $year; + $formother->select_year($syear?$syear:-1,'year',1, 20, 5); + print ''; $form->select_types_paiements($typeid,'typeid','',0,0,1,16); @@ -158,7 +180,7 @@ $tva_static->ref=$obj->rowid; print "".$tva_static->getNomUrl(1)."".dol_trunc($obj->label,40)."'.dol_print_date($db->jdate($obj->dm),'day')."'.dol_print_date($db->jdate($obj->dm),'day')."
'; /* - * Ajouter une ligne de contact + * Add a new contact line * Non affiche en mode modification de ligne */ if ($action != 'editline' && $user->rights->projet->creer) @@ -318,7 +337,7 @@ print ''; print ''; From 4f3fe82e9383cdfcce70ef02ecc2bb3489d1fd1a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 23 Apr 2015 15:22:50 +0200 Subject: [PATCH 062/264] NEW Add filter on task ref and task label into list of tasks --- htdocs/core/lib/functions.lib.php | 5 +++-- htdocs/projet/class/task.class.php | 10 ++++++---- htdocs/projet/tasks/index.php | 25 +++++++++++++++++++++++-- 3 files changed, 32 insertions(+), 8 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 36487801ad01c..dc4e8c9e081f3 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -4957,9 +4957,10 @@ function dol_getmypid() * 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 integer $numeric 0=value is list of keywords, 1=value is a numeric test + * @param integer $nofinaland Do now output the final 'AND' * @return string $res The statement to append to the SQL query */ -function natural_search($fields, $value, $numeric=0) +function natural_search($fields, $value, $numeric=0, $nofinaland) { global $db,$langs; @@ -5014,7 +5015,7 @@ function natural_search($fields, $value, $numeric=0) if ($newres) $res = $res . ($res ? ' AND ' : '') . ($i2 > 1 ? '(' : '') .$newres . ($i2 > 1 ? ')' : ''); $j++; } - $res = " AND (" . $res . ")"; + $res = ($nofinaland?"":" AND ")."(" . $res . ")"; //print 'xx'.$res.'yy'; return $res; } diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index 3fb2586625e69..81625730950f4 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -561,9 +561,10 @@ function initAsSpecimen() * @param int $mode 0=Return list of tasks and their projects, 1=Return projects and tasks if exists * @param string $filteronprojref Filter on project ref * @param string $filteronprojstatus Filter on project status + * @param string $morewherefilter Add more filter into where SQL request * @return array Array of tasks */ - function getTasksArray($usert=0, $userp=0, $projectid=0, $socid=0, $mode=0, $filteronprojref='', $filteronprojstatus=-1) + function getTasksArray($usert=0, $userp=0, $projectid=0, $socid=0, $mode=0, $filteronprojref='', $filteronprojstatus=-1, $morewherefilter='') { global $conf; @@ -573,8 +574,8 @@ function getTasksArray($usert=0, $userp=0, $projectid=0, $socid=0, $mode=0, $fil // List of tasks (does not care about permissions. Filtering will be done later) $sql = "SELECT p.rowid as projectid, p.ref, p.title as plabel, p.public, p.fk_statut,"; - $sql.= " t.rowid as taskid, t.label, t.description, t.fk_task_parent, t.duration_effective, t.progress,"; - $sql.= " t.dateo as date_start, t.datee as date_end, t.planned_workload, t.ref as ref_task,t.rang"; + $sql.= " t.rowid as taskid, t.ref as taskref, t.label, t.description, t.fk_task_parent, t.duration_effective, t.progress,"; + $sql.= " t.dateo as date_start, t.datee as date_end, t.planned_workload, t.rang"; if ($mode == 0) { $sql.= " FROM ".MAIN_DB_PREFIX."projet as p"; @@ -594,6 +595,7 @@ function getTasksArray($usert=0, $userp=0, $projectid=0, $socid=0, $mode=0, $fil } if ($filteronprojref) $sql.= " AND p.ref LIKE '%".$filteronprojref."%'"; if ($filteronprojstatus > -1) $sql.= " AND p.fk_statut = ".$filteronprojstatus; + if ($morewherefilter) $sql.=" AND (".$morewherefilter.")"; $sql.= " ORDER BY p.ref, t.rang, t.dateo"; //print $sql;exit; @@ -629,7 +631,7 @@ function getTasksArray($usert=0, $userp=0, $projectid=0, $socid=0, $mode=0, $fil { $tasks[$i] = new Task($this->db); $tasks[$i]->id = $obj->taskid; - $tasks[$i]->ref = $obj->ref_task; + $tasks[$i]->ref = $obj->taskref; $tasks[$i]->fk_project = $obj->projectid; $tasks[$i]->projectref = $obj->ref; $tasks[$i]->projectlabel = $obj->plabel; diff --git a/htdocs/projet/tasks/index.php b/htdocs/projet/tasks/index.php index eec483907b018..c9e30d30f7d98 100644 --- a/htdocs/projet/tasks/index.php +++ b/htdocs/projet/tasks/index.php @@ -36,6 +36,8 @@ $search_project=GETPOST('search_project'); if (! isset($_GET['search_status']) && ! isset($_POST['search_status'])) $search_status=1; else $search_status=GETPOST('search_status'); +$search_task_ref=GETPOST('search_task_ref'); +$search_task_label=GETPOST('search_task_label'); // Security check @@ -56,9 +58,19 @@ { $search_project=""; $search_status=""; + $search_task_ref=""; + $search_task_label=""; } if (empty($search_status)) $search_status=1; + +/* + * Actions + */ + +// None + + /* * View */ @@ -93,7 +105,10 @@ // Get list of tasks in tasksarray and taskarrayfiltered // We need all tasks (even not limited to a user because a task assigned to a user can have a parent that is not assigned to him and we need such parents). -$tasksarray=$taskstatic->getTasksArray(0, 0, $projectstatic->id, $socid, 0, $search_project, $search_status); +$morewherefilter=''; +if ($search_task_ref) $morewherefilter.=natural_search('t.ref', $search_task_ref, 0, 1); +if ($search_task_label) $morewherefilter.=natural_search('t.label', $search_task_label, 0, 1); +$tasksarray=$taskstatic->getTasksArray(0, 0, $projectstatic->id, $socid, 0, $search_project, $search_status, $morewherefilter); // We load also tasks limited to a particular user $tasksrole=($mine ? $taskstatic->getUserRolesForProjectsOrTasks(0,$user,$projectstatic->id,0) : ''); @@ -126,7 +141,13 @@ foreach($projectstatic->statuts_short as $key => $val) $listofstatus[$key]=$langs->trans($val); print $form->selectarray('search_status', $listofstatus, $search_status); print ''; -print ''; +print ''; +print ''; // Status - Percent - print '
'; // On recupere les id des users deja selectionnes $contactsofproject=$projectstatic->getListContactId('internal'); - $form->select_users($user->id,'contactid',0,'',0,'',$contactsofproject); + print $form->select_dolusers((GETPOST('contactid')?GETPOST('contactid'):$user->id), 'contactid', 0, '', 0, '', $contactsofproject, 0, 0, 0, '', 1); print ''; $formcompany->selectTypeContact($object, '', 'type','internal','rowid'); From c97c5e0cfd4e635bbaeea0db0fae006731486fc3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 23 Apr 2015 13:54:49 +0200 Subject: [PATCH 061/264] Fix selection of user was lost --- htdocs/projet/tasks/time.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index 9951902ec5b24..43f7f9f19abf9 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -375,10 +375,13 @@ print ''; print img_object('','user','class="hideonsmartphone"'); $contactsoftask=$object->getListContactId('internal'); - if (count($contactsoftask)>0) { + if (count($contactsoftask)>0) + { $userid=$contactsoftask[0]; - print $form->select_dolusers($userid,'userid',0,'',0,'',$contactsoftask); - }else { + print $form->select_dolusers((GETPOST('userid')?GETPOST('userid'):$userid),'userid',0,'',0,'',$contactsoftask); + } + else + { print img_error($langs->trans('FirstAddRessourceToAllocateTime')).$langs->trans('FirstAddRessourceToAllocateTime'); } print ''; +print ''; +print ''; +print ''; +print ''; +print ''; print ' '; print ''; print ''; From 0e141f2c1bf964701666d4cc91339899a9a64eb6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 23 Apr 2015 15:35:32 +0200 Subject: [PATCH 063/264] Fix css --- htdocs/comm/action/index.php | 2 +- htdocs/theme/eldy/style.css.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 431b7bd14b6f3..b5b22177c98c3 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -1372,7 +1372,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa print ''; + print ''; if ($event->type_code != 'BIRTHDAY' && $event->type_code != 'ICALEVENT') print $event->getLibStatut(3,1); else print ' '; print '
'; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 8ab891d388d23..d5a4b0b372280 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -2477,6 +2477,8 @@ min-height: 20px; } table.cal_event td { border: none; padding-: 2px; padding-: 2px; padding-top: 0px; padding-bottom: 0px; } +table.cal_event td.cal_event { padding: 4px 4px !important; } +table.cal_event td.cal_event_right { padding: 4px 4px !important; } 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; } From 94ff635cc2ffcaca7970ae7a1aa5539d0520647c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 23 Apr 2015 16:20:25 +0200 Subject: [PATCH 064/264] NEW Add filter on user contact or user task into task list --- htdocs/langs/en_US/projects.lang | 2 ++ htdocs/projet/class/task.class.php | 22 +++++++++++++++------- htdocs/projet/tasks/index.php | 25 ++++++++++++++++++++++++- 3 files changed, 41 insertions(+), 8 deletions(-) diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index dde2aa7d4691c..18c9b82de965f 100644 --- a/htdocs/langs/en_US/projects.lang +++ b/htdocs/langs/en_US/projects.lang @@ -144,3 +144,5 @@ InputPerDay=Input per day InputPerWeek=Input per week InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s +ProjectsWithThisUserAsContact=Projects with this user as contact +TasksWithThisUserAsContact=Tasks assigned to this user \ No newline at end of file diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index 81625730950f4..43e0a5a111448 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -562,9 +562,11 @@ function initAsSpecimen() * @param string $filteronprojref Filter on project ref * @param string $filteronprojstatus Filter on project status * @param string $morewherefilter Add more filter into where SQL request + * @param string $filteronprojuser Filter on user that is a contact of project + * @param string $filterontaskuse Filter on user assigned to task * @return array Array of tasks */ - function getTasksArray($usert=0, $userp=0, $projectid=0, $socid=0, $mode=0, $filteronprojref='', $filteronprojstatus=-1, $morewherefilter='') + function getTasksArray($usert=0, $userp=0, $projectid=0, $socid=0, $mode=0, $filteronprojref='', $filteronprojstatus=-1, $morewherefilter='',$filteronprojuser=0,$filterontaskuse=0) { global $conf; @@ -580,19 +582,25 @@ function getTasksArray($usert=0, $userp=0, $projectid=0, $socid=0, $mode=0, $fil { $sql.= " FROM ".MAIN_DB_PREFIX."projet as p"; $sql.= ", ".MAIN_DB_PREFIX."projet_task as t"; - $sql.= " WHERE t.fk_projet = p.rowid"; - $sql.= " AND p.entity = ".$conf->entity; - if ($socid) $sql.= " AND p.fk_soc = ".$socid; - if ($projectid) $sql.= " AND p.rowid in (".$projectid.")"; + $sql.= " WHERE p.entity = ".$conf->entity; + $sql.= " AND t.fk_projet = p.rowid"; } if ($mode == 1) { $sql.= " FROM ".MAIN_DB_PREFIX."projet as p"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t on t.fk_projet = p.rowid"; $sql.= " WHERE p.entity = ".$conf->entity; - if ($socid) $sql.= " AND p.fk_soc = ".$socid; - if ($projectid) $sql.= " AND p.rowid in (".$projectid.")"; } + if ($filteronprojuser) + { + // TODO + } + if ($filterontaskuser) + { + // TODO + } + if ($socid) $sql.= " AND p.fk_soc = ".$socid; + if ($projectid) $sql.= " AND p.rowid in (".$projectid.")"; if ($filteronprojref) $sql.= " AND p.ref LIKE '%".$filteronprojref."%'"; if ($filteronprojstatus > -1) $sql.= " AND p.fk_statut = ".$filteronprojstatus; if ($morewherefilter) $sql.=" AND (".$morewherefilter.")"; diff --git a/htdocs/projet/tasks/index.php b/htdocs/projet/tasks/index.php index c9e30d30f7d98..bc184133954af 100644 --- a/htdocs/projet/tasks/index.php +++ b/htdocs/projet/tasks/index.php @@ -38,6 +38,8 @@ else $search_status=GETPOST('search_status'); $search_task_ref=GETPOST('search_task_ref'); $search_task_label=GETPOST('search_task_label'); +$search_project_user=GETPOST('search_project_user'); +$search_task_user=GETPOST('search_task_user'); // Security check @@ -108,7 +110,7 @@ $morewherefilter=''; if ($search_task_ref) $morewherefilter.=natural_search('t.ref', $search_task_ref, 0, 1); if ($search_task_label) $morewherefilter.=natural_search('t.label', $search_task_label, 0, 1); -$tasksarray=$taskstatic->getTasksArray(0, 0, $projectstatic->id, $socid, 0, $search_project, $search_status, $morewherefilter); +$tasksarray=$taskstatic->getTasksArray(0, 0, $projectstatic->id, $socid, 0, $search_project, $search_status, $morewherefilter, $search_project_user, $search_task_user); // We load also tasks limited to a particular user $tasksrole=($mine ? $taskstatic->getUserRolesForProjectsOrTasks(0,$user,$projectstatic->id,0) : ''); @@ -116,6 +118,27 @@ print ''; print ''; +// If the user can view users +if ($user->rights->user->user->lire) +{ + $moreforfilter.=($moreforfilter?'   ':''); + $moreforfilter.=$langs->trans('ProjectsWithThisUserAsContact'). ' '; + $moreforfilter.=$form->select_dolusers($search_project_user,'search_project_user',1); +} +if ($user->rights->user->user->lire) +{ + $moreforfilter.=($moreforfilter?'   ':''); + $moreforfilter.=$langs->trans('TasksWithThisUserAsContact'). ' '; + $moreforfilter.=$form->select_dolusers($search_task_user,'search_task_user',1); +} +if (! empty($moreforfilter)) +{ + print ''; + print ''; +} + print ''; print ''; print ''; From 58008cef94e2a3b1513cb5e588a268423fe3f597 Mon Sep 17 00:00:00 2001 From: Gauthier Date: Thu, 23 Apr 2015 15:54:49 +0200 Subject: [PATCH 065/264] NEW : display linked object in edit mode when we create an event from an order, propal... --- htdocs/comm/action/card.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index c15b1fe4f3299..447d2264f41d1 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -746,6 +746,9 @@ function setdatefields() } if(!empty($origin) && !empty($originid)) { + include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; + print ''; + print ''; print ''; print ''; } From f07c174c9c7b141569b4864993c07fbc89ed6969 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 23 Apr 2015 17:52:05 +0200 Subject: [PATCH 066/264] FIX: moved built-in bug report system to GitHub Issues Improved environment informations and presentation --- htdocs/main.inc.php | 61 +++++++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 27 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 5d15d77d17431..9a990fae78262 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1,16 +1,16 @@ - * Copyright (C) 2003 Xavier Dutoit - * Copyright (C) 2004-2015 Laurent Destailleur - * Copyright (C) 2004 Sebastien Di Cintio - * Copyright (C) 2004 Benoit Mortier - * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2011-2014 Philippe Grand - * Copyright (C) 2008 Matteli - * Copyright (C) 2011-2013 Juanjo Menent - * Copyright (C) 2012 Christophe Battarel - * Copyright (C) 2014 Marcos García - * Copyright (C) 2014-2015 Marcos García +/* Copyright (C) 2002-2007 Rodolphe Quiedeville + * Copyright (C) 2003 Xavier Dutoit + * Copyright (C) 2004-2015 Laurent Destailleur + * Copyright (C) 2004 Sebastien Di Cintio + * Copyright (C) 2004 Benoit Mortier + * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2011-2014 Philippe Grand + * Copyright (C) 2008 Matteli + * Copyright (C) 2011-2013 Juanjo Menent + * Copyright (C) 2012 Christophe Battarel + * Copyright (C) 2014-2015 Marcos García + * Copyright (C) 2015 Raphaël Doursenaud * * 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 @@ -1662,21 +1662,28 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me } } - // Link to bugtrack - if (! empty($conf->global->MAIN_BUGTRACK_ENABLELINK)) - { - require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; - - $bugbaseurl='https://doliforge.org/tracker/?'; - $bugbaseurl.='func=add&group_id=144&atid=246'; - $bugbaseurl.="&details="; - $bugbaseurl.=urlencode("\n\n\n\n\n-------------\n"); - $bugbaseurl.=urlencode($langs->trans("Version").": ".DOL_VERSION."\n"); - $bugbaseurl.=urlencode($langs->trans("Server").": ".$_SERVER["SERVER_SOFTWARE"]."\n"); - $bugbaseurl.=urlencode($langs->trans("PHP").": ".version_php()."\n"); - $bugbaseurl.=urlencode($langs->trans("Url").": ".$_SERVER["REQUEST_URI"]."\n"); - print ''; - } + // Link to bugtrack + if (! empty($conf->global->MAIN_BUGTRACK_ENABLELINK)) + { + require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; + + $bugbaseurl = 'https://github.com/Dolibarr/dolibarr/issues/new'; + $bugbaseurl.= '?title='; + $bugbaseurl.= urlencode("Bug: "); + $bugbaseurl.= '&body='; + $bugbaseurl.= urlencode("# Environment\n"); + $bugbaseurl.= urlencode("- **Version**: " . DOL_VERSION . "\n"); + $bugbaseurl.= urlencode("- **OS**: " . php_uname('s') . "\n"); + $bugbaseurl.= urlencode("- **Web server**: " . $_SERVER["SERVER_SOFTWARE"] . "\n"); + $bugbaseurl.= urlencode("- **PHP**: " . php_sapi_name() . ' ' . phpversion() . "\n"); + $bugbaseurl.= urlencode("- **Database**: " . $db::LABEL . ' ' . $db->getVersion() . "\n"); + $bugbaseurl.= urlencode("- **URL**: " . $_SERVER["REQUEST_URI"] . "\n"); + $bugbaseurl.= urlencode("\n"); + $bugbaseurl.= urlencode("# Report\n"); + print '

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

'; + } print "\n"; print "\n"; From 6a9539b1677fe8c27fccd3620ad373c9d4553a2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 23 Apr 2015 20:29:13 +0200 Subject: [PATCH 067/264] Fix: documented mobiledetect external library --- COPYRIGHT | 1 + 1 file changed, 1 insertion(+) diff --git a/COPYRIGHT b/COPYRIGHT index 3c7cb5bf1cf8a..73d5a03572ee6 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -17,6 +17,7 @@ ChromePHP 4.3.3 Apache Software License 2.0 Yes CKEditor 4.3.3 LGPL-2.1+ Yes Editor WYSIWYG FPDI 1.5.2 Apache Software License 2.0 Yes PDF templates management GeoIP 1.4 LGPL-2.1+ Yes Sample code to make geoip convert (not into deb package) +Mobiledetect 2.8.3 MIT License Yes Detect mobile devices browsers NuSoap 0.9.5 LGPL 2.1+ Yes Library to develop SOAP Web services (not into rpm and deb package) PEAR Mail_MIME 1.8.9 BSD Yes NuSoap dependency odtPHP 1.0.1 GPL-2+ b Yes Library to build/edit ODT files From 7281ea21e61071899d105e36d9f86a6d112b5735 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 23 Apr 2015 20:27:21 +0200 Subject: [PATCH 068/264] Qual: moved mobiledetect external library External libraries resides in the include directory --- htdocs/core/lib/functions.lib.php | 2 +- .../class => includes/mobiledetect}/mobiledetect.class.php | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename htdocs/{core/class => includes/mobiledetect}/mobiledetect.class.php (100%) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index dc4e8c9e081f3..78f08b50f556b 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -139,7 +139,7 @@ function getEntity($element=false, $shared=0) */ function getBrowserInfo($user_agent) { - include_once DOL_DOCUMENT_ROOT.'/core/class/mobiledetect.class.php'; + include_once DOL_DOCUMENT_ROOT.'/includes/mobiledetect/mobiledetect.class.php'; $name='unknown'; $version=''; diff --git a/htdocs/core/class/mobiledetect.class.php b/htdocs/includes/mobiledetect/mobiledetect.class.php similarity index 100% rename from htdocs/core/class/mobiledetect.class.php rename to htdocs/includes/mobiledetect/mobiledetect.class.php From d47b9a759ab9d1accdd779bce07023eebebcf382 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 24 Apr 2015 00:33:02 +0200 Subject: [PATCH 069/264] FIX migration error --- htdocs/install/mysql/migration/3.6.0-3.7.0.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 0c055fc5aeae2..6102997c3ad63 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 @@ -207,8 +207,9 @@ UPDATE llx_product SET fk_barcode_type = NULL WHERE fk_barcode_type NOT IN (SELE -- fk_user_author ALTER TABLE llx_product_price ADD INDEX idx_product_price_fk_user_author (fk_user_author); UPDATE llx_product_price set fk_user_author = null where fk_user_author = 0; +UPDATE llx_product_price set fk_user_author = null where fk_user_author not in (select rowid from llx_user); ALTER TABLE llx_product_price ADD CONSTRAINT fk_product_price_user_author FOREIGN KEY (fk_user_author) REFERENCES llx_user (rowid); --- fk_user_author +-- fk_product ALTER TABLE llx_product_price ADD INDEX idx_product_price_fk_product (fk_product); DELETE from llx_product_price where fk_product NOT IN (SELECT rowid from llx_product); ALTER TABLE llx_product_price ADD CONSTRAINT fk_product_price_product FOREIGN KEY (fk_product) REFERENCES llx_product (rowid); From e0d2c43086ec4965b5f6e9ba41f3c15d23c08566 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 24 Apr 2015 01:15:29 +0200 Subject: [PATCH 070/264] fix phpcs --- htdocs/core/lib/functions.lib.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index dc4e8c9e081f3..8574c8f836457 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -1648,8 +1648,8 @@ function isValidEmail($address, $acceptsupervisorkey=0) /** * Return true if phone number syntax is ok - * - * TODO: Decide what to do with this + * TODO Decide what to do with this + * * @param string $phone phone (Ex: "0601010101") * @return boolean true if phone syntax is OK, false if KO or empty string */ @@ -4957,10 +4957,10 @@ function dol_getmypid() * 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 integer $numeric 0=value is list of keywords, 1=value is a numeric test - * @param integer $nofinaland Do now output the final 'AND' + * @param integer $nofinaland 1=Do now output the final 'AND' * @return string $res The statement to append to the SQL query */ -function natural_search($fields, $value, $numeric=0, $nofinaland) +function natural_search($fields, $value, $numeric=0, $nofinaland=0) { global $db,$langs; From 576cd57a9451b11636ee6a737c2e50360f5701c2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 24 Apr 2015 10:59:18 +0200 Subject: [PATCH 071/264] NEW Can edit internal label of invoice even when closed (this is a private information) --- htdocs/fourn/facture/card.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index ab67027884fd5..01574caa2b218 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -1788,8 +1788,8 @@ print ''; // Label - print ''; - print ''; + print ''; + print ''; /* * List of payments From 7d3482036d6a15bca758bbe926f5241a67750397 Mon Sep 17 00:00:00 2001 From: Alexis Algoud Date: Fri, 24 Apr 2015 17:40:53 +0200 Subject: [PATCH 072/264] FIX event not linked to contact on creation --- 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 6ff654aadd1f6..999b8e24868d2 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -280,7 +280,7 @@ function add($user,$notrigger=0) $sql.= (isset($this->socid) && $this->socid > 0?" '".$this->socid."'":"null").","; $sql.= (isset($this->fk_project) && $this->fk_project > 0?" '".$this->fk_project."'":"null").","; $sql.= " '".$this->db->escape($this->note)."',"; - $sql.= (isset($this->contactid) && $this->contactid > 0?"'".$this->contactid."'":"null").","; + $sql.= (isset($this->contact->id) && $this->contact->id > 0?"'".$this->contact->id."'":"null").","; $sql.= (isset($user->id) && $user->id > 0 ? "'".$user->id."'":"null").","; $sql.= ($userownerid>0?"'".$userownerid."'":"null").","; $sql.= ($userdoneid>0?"'".$userdoneid."'":"null").","; From 125c821bc4be3f497777492de3fd0ada9474e066 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 24 Apr 2015 20:47:45 +0200 Subject: [PATCH 073/264] add comment --- htdocs/install/mysql/tables/llx_stock_mouvement.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.sql index c757b5df7e15f..a367c6952c5a5 100644 --- a/htdocs/install/mysql/tables/llx_stock_mouvement.sql +++ b/htdocs/install/mysql/tables/llx_stock_mouvement.sql @@ -32,7 +32,7 @@ create table llx_stock_mouvement type_mouvement smallint, fk_user_author integer, label varchar(255), -- comment on movement - inventorycode varchar(128), + inventorycode varchar(128), -- code used to group different movement line into one operation (may be an inventory, a mass picking) fk_origin integer, origintype varchar(32) )ENGINE=innodb; From 13b4d860647d56f1fb0f735c459ff67f4ad69746 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 24 Apr 2015 21:29:02 +0200 Subject: [PATCH 074/264] Better fix for #2709 --- htdocs/comm/action/class/actioncomm.class.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 999b8e24868d2..bda4362bed9cb 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -210,6 +210,8 @@ function add($user,$notrigger=0) if ($this->elementtype=='commande') $this->elementtype='order'; if ($this->elementtype=='contrat') $this->elementtype='contract'; + if (is_object($this->contact) && $this->contact->id > 0 && ! ($this->contactid > 0)) $this->contactid = $this->contact->id; // For backward compatibility. Using this->contact->xx is deprecated + $userownerid=$this->userownerid; $userdoneid=$this->userdoneid; @@ -274,13 +276,13 @@ function add($user,$notrigger=0) $sql.= "'".$this->db->idate($now)."',"; $sql.= (strval($this->datep)!=''?"'".$this->db->idate($this->datep)."'":"null").","; $sql.= (strval($this->datef)!=''?"'".$this->db->idate($this->datef)."'":"null").","; - $sql.= (isset($this->durationp) && $this->durationp >= 0 && $this->durationp != ''?"'".$this->durationp."'":"null").","; // deprecated + $sql.= ((isset($this->durationp) && $this->durationp >= 0 && $this->durationp != '')?"'".$this->durationp."'":"null").","; // deprecated $sql.= (isset($this->type_id)?$this->type_id:"null").","; $sql.= (isset($this->type_code)?" '".$this->type_code."'":"null").","; - $sql.= (isset($this->socid) && $this->socid > 0?" '".$this->socid."'":"null").","; - $sql.= (isset($this->fk_project) && $this->fk_project > 0?" '".$this->fk_project."'":"null").","; + $sql.= ((isset($this->socid) && $this->socid > 0)?" '".$this->socid."'":"null").","; + $sql.= ((isset($this->fk_project) && $this->fk_project > 0)?" '".$this->fk_project."'":"null").","; $sql.= " '".$this->db->escape($this->note)."',"; - $sql.= (isset($this->contact->id) && $this->contact->id > 0?"'".$this->contact->id."'":"null").","; + $sql.= ((isset($this->contactid) && $this->contactid > 0)?"'".$this->contactid."'":"null").","; $sql.= (isset($user->id) && $user->id > 0 ? "'".$user->id."'":"null").","; $sql.= ($userownerid>0?"'".$userownerid."'":"null").","; $sql.= ($userdoneid>0?"'".$userdoneid."'":"null").","; From 60a56da37025473ed38aea9de88f6d11b7d8bb18 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 25 Apr 2015 22:20:10 +0200 Subject: [PATCH 075/264] Some change into css. Tabs background are now white so main content is black on white (better contrast). Fix editfieldval for date. --- build/debian/README.howto | 5 +- htdocs/admin/company.php | 4 +- htdocs/comm/propal.php | 29 +++---- htdocs/core/class/html.form.class.php | 54 ++++++------- htdocs/core/lib/agenda.lib.php | 18 ++--- htdocs/langs/ar_SA/categories.lang | 4 +- htdocs/langs/en_US/categories.lang | 4 +- htdocs/theme/eldy/style.css.php | 104 ++++++++++++++++++-------- 8 files changed, 125 insertions(+), 97 deletions(-) diff --git a/build/debian/README.howto b/build/debian/README.howto index aa104332584a3..eba9e65191549 100644 --- a/build/debian/README.howto +++ b/build/debian/README.howto @@ -261,7 +261,8 @@ x.y.z+dfsgw Note: If there was errors solved manually after get-orig-sources.sh, you may need to make a git commit -* Add an entry into debian/changelog +* Fix debian/* files used to build package. +Add an entry into debian/changelog > dch -v x.y.z+dfsgw-v "My comment" will add entry. For example: dch -v x.y.z+dfsgw-1 "New upstream release." for a new version (x.y.z = version, w start from 1 and increaed for each new import) Then modify changelog to replace "version" or "unstable" with "UNRELEASED". @@ -269,7 +270,7 @@ Then check/modify also the user/date signature: - Date must have format reported by "date -R" - Name and email must match value into debian/control file (Entry added here is used by next step). -* We try to build package +* Try to build package > rm -fr ../build-area; git-buildpackage -us -uc Note: You can use git-buildpackage -us -uc --git-ignore-new if you want to test build with uncommited file diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index f9e5cd99e5df7..561e299b93755 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -371,7 +371,7 @@ print '
'; + print $moreforfilter; + print '
'.$langs->trans("Project").''.$langs->trans("ProjectStatus").'
'.$langs->trans("LinkedObject").''.dolGetElementUrl($originid,$origin,1).'
'.$form->editfieldkey("Label",'label',$object->label,$object,($object->statutrights->fournisseur->facture->creer)).''.$form->editfieldval("Label",'label',$object->label,$object,($object->statutrights->fournisseur->facture->creer)).'
'.$form->editfieldkey("Label",'label',$object->label,$object,($user->rights->fournisseur->facture->creer)).''.$form->editfieldval("Label",'label',$object->label,$object,($user->rights->fournisseur->facture->creer)).''; print ''; + print ''; // Statut print ''; - print ''; + print ''; // Project if (! empty($conf->projet->enabled)) { diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php index 2bda2eb6b9125..d92d508238940 100644 --- a/htdocs/core/tpl/objectline_create.tpl.php +++ b/htdocs/core/tpl/objectline_create.tpl.php @@ -102,7 +102,7 @@ $coldisplay=0; } ?> - global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>> + - + element == 'askpricesupplier') { ?> - + - - - - - global->PRODUCT_USE_UNITS) { - print ''; } ?> - + situation_cycle_ref) { $coldisplay++; - print ''; + print ''; } if (! empty($usemargins)) { ?> - '; + echo ''; $coldisplay++; } if (! empty($conf->global->DISPLAY_MARK_RATES)) { - echo ''; + echo ''; $coldisplay++; } } @@ -277,7 +277,7 @@ } } ?> - Date: Mon, 27 Apr 2015 02:34:15 +0200 Subject: [PATCH 086/264] Fix translation --- htdocs/langs/en_US/admin.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index a529bdaec945c..6505aef89d8aa 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -974,7 +974,7 @@ 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) +MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps) UnitPriceOfProduct=Net unit price of a product TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding ParameterActiveForNextInputOnly=Parameter effective for next input only From 2e05a4f1be9ecce1c2b1d9e5a1270a89d7fceb8d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 27 Apr 2015 03:21:55 +0200 Subject: [PATCH 087/264] Fix #2713 --- .../public/emailing/mailing-unsubscribe.php | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/htdocs/public/emailing/mailing-unsubscribe.php b/htdocs/public/emailing/mailing-unsubscribe.php index 2bf42cb4bbac8..61e8ccdb0d60f 100644 --- a/htdocs/public/emailing/mailing-unsubscribe.php +++ b/htdocs/public/emailing/mailing-unsubscribe.php @@ -1,7 +1,7 @@ - * Copyright (C) 2005-2011 Laurent Destailleur + * Copyright (C) 2005-2015 Laurent Destailleur * Copyright (C) 2012 Florian Henry * Copyright (C) 2014 Juanjo Menent * @@ -72,30 +72,35 @@ function llxFooter() { } if (! empty($tag) && ($unsuscrib=='1')) { - //Udate status of mail in Destinaries maling list + // Update status of mail in recipient mailing list table $statut='3'; $sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles SET statut=".$statut." WHERE tag='".$db->escape($tag)."'"; dol_syslog("public/emailing/mailing-unsubscribe.php : Mail unsubcribe : ".$sql, LOG_DEBUG); $resql=$db->query($sql); + if (! $resql) dol_print_error($db); - //Update status communication of thirdparty prospect + // Update status communication of thirdparty prospect $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=-1 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE tag='".$db->escape($tag)."' AND source_type='thirdparty' AND source_id is not null)"; dol_syslog("public/emailing/mailing-unsubscribe.php : Mail unsubcribe thirdparty : ".$sql, LOG_DEBUG); $resql=$db->query($sql); + if (! $resql) dol_print_error($db); - //Update status communication of contact prospect - $sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET no_email=1 WHERE rowid IN (SELECT sc.rowid FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.tag = '".$db->escape($tag)."' AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)"; + // Update status communication of contact prospect + $sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET no_email=1 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE tag = '".$db->escape($tag)."' AND source_type='contact' AND source_id is not null)"; dol_syslog("public/emailing/mailing-unsubscribe.php : Mail unsubcribe contact : ".$sql, LOG_DEBUG); $resql=$db->query($sql); + if (! $resql) dol_print_error($db); + $sql = "SELECT mc.email"; $sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc"; $sql .= " WHERE mc.tag='".$db->escape($tag)."'"; $resql=$db->query($sql); + if (! $resql) dol_print_error($db); $obj = $db->fetch_object($resql); @@ -106,8 +111,8 @@ function llxFooter() { } print "\n"; print "\n"; print ''."\n"; - print ''."\n"; - print ''."\n"; + print ''."\n"; + print ''."\n"; print "".$langs->trans("MailUnsubcribe")."\n"; print ''."\n"; print ' + + + +
+

+
+
+ +

Response:

+
+ +

Additional Template Data:

+ +

Restler v

+
+ + \ No newline at end of file From a6b0f6cfac2fd54250f99713e500a04e340de56d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 30 Apr 2015 11:48:32 +0200 Subject: [PATCH 121/264] Allow exporting projects without a third party FIX #2729 --- htdocs/core/modules/modProjet.class.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php index db0b0d765c388..e32911c3759a2 100644 --- a/htdocs/core/modules/modProjet.class.php +++ b/htdocs/core/modules/modProjet.class.php @@ -280,11 +280,9 @@ function __construct($db) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'projet_extrafields as extra ON p.rowid = extra.fk_object'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX."projet_task as pt ON p.rowid = pt.fk_projet"; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'projet_task_extrafields as extra2 ON pt.rowid = extra2.fk_object'; - $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX."projet_task_time as ptt ON pt.rowid = ptt.fk_task,"; - $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'societe as s'; - $this->export_sql_end[$r] .=' WHERE p.fk_soc = s.rowid'; - $this->export_sql_end[$r] .=' AND p.entity = '.$conf->entity; - + $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX."projet_task_time as ptt ON pt.rowid = ptt.fk_task"; + $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON p.fk_soc = s.rowid'; + $this->export_sql_end[$r] .=' WHERE p.entity = '.$conf->entity; } From 93937fe7f3cb4ad097830fdca590f4b7ec9058d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Thu, 30 Apr 2015 11:48:32 +0200 Subject: [PATCH 122/264] Allow exporting projects without a third party FIX #2729 --- htdocs/core/modules/modProjet.class.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php index 6bc21adb44595..f76158d3a0ca6 100644 --- a/htdocs/core/modules/modProjet.class.php +++ b/htdocs/core/modules/modProjet.class.php @@ -286,11 +286,9 @@ function __construct($db) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'projet_extrafields as extra ON p.rowid = extra.fk_object'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX."projet_task as pt ON p.rowid = pt.fk_projet"; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'projet_task_extrafields as extra2 ON pt.rowid = extra2.fk_object'; - $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX."projet_task_time as ptt ON pt.rowid = ptt.fk_task,"; - $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'societe as s'; - $this->export_sql_end[$r] .=' WHERE p.fk_soc = s.rowid'; - $this->export_sql_end[$r] .=' AND p.entity = '.$conf->entity; - + $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX."projet_task_time as ptt ON pt.rowid = ptt.fk_task"; + $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON p.fk_soc = s.rowid'; + $this->export_sql_end[$r] .=' WHERE p.entity = '.$conf->entity; } From 31a8e38d372b350350515bec894d6d3162502b74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Fri, 1 May 2015 16:01:57 +0200 Subject: [PATCH 123/264] Allow exporting projects without a third party FIX #2729 Conflicts: htdocs/core/modules/modProjet.class.php --- htdocs/core/modules/modProjet.class.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php index 7bc9a51c0228b..e11e801a77bf6 100644 --- a/htdocs/core/modules/modProjet.class.php +++ b/htdocs/core/modules/modProjet.class.php @@ -292,11 +292,9 @@ function __construct($db) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'projet_extrafields as extra ON p.rowid = extra.fk_object'; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX."projet_task as pt ON p.rowid = pt.fk_projet"; $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'projet_task_extrafields as extra2 ON pt.rowid = extra2.fk_object'; - $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX."projet_task_time as ptt ON pt.rowid = ptt.fk_task,"; - $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'societe as s'; - $this->export_sql_end[$r] .=' WHERE p.fk_soc = s.rowid'; - $this->export_sql_end[$r] .=' AND p.entity IN ('.getEntity('project',1).')'; - + $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX."projet_task_time as ptt ON pt.rowid = ptt.fk_task"; + $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON p.fk_soc = s.rowid'; + $this->export_sql_end[$r] .=' WHERE p.entity = '.$conf->entity; } From 30c901c2661879f1b0ad4c037732a9e65d915b66 Mon Sep 17 00:00:00 2001 From: jfefe Date: Fri, 1 May 2015 16:12:30 +0200 Subject: [PATCH 124/264] Begin REST API implementation with thirdparty classes and methods needed. Work in progress ! --- htdocs/api/class/api.class.php | 90 +++++++++++ htdocs/api/index.php | 8 + htdocs/public/api/index.php | 95 ++++++++++++ htdocs/societe/class/api_thirdparty.class.php | 143 ++++++++++++++++++ 4 files changed, 336 insertions(+) create mode 100644 htdocs/api/class/api.class.php create mode 100644 htdocs/api/index.php create mode 100644 htdocs/public/api/index.php create mode 100644 htdocs/societe/class/api_thirdparty.class.php diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php new file mode 100644 index 0000000000000..298beb685d6c6 --- /dev/null +++ b/htdocs/api/class/api.class.php @@ -0,0 +1,90 @@ + + * + * 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 . + */ + +use Luracast\Restler\Restler; + +/** + * Class for API + */ +class DolibarrApi { + + /** + * @var DoliDb $db Database object + */ + static protected $db; + + /** + * @var Restler $r Restler object + */ + var $r; + + /** + * Constructor + * + * @var DoliDB $db Database handler + */ + function __construct($db) { + $this->db = $db; + $this->r = new Restler(); + } + + /** + * Executed method when API is called without parameter + * + * Display a short message an return a http code 200 + * @return array + */ + function index() + { + return array( + 'success' => array( + 'code' => 200, + 'message' => __class__.' is up and running!' + ) + ); + } + + + /** + * Clean sensible object datas + * @var object $object Object to clean + * @return array Array of cleaned object properties + * + * @todo use an array for properties to clean + * + */ + protected function cleanObjectDatas($object){ + + unset($object->db); + + return array($object); + } + +} + +/** + * API init + * This class exists to show 200 code when request url root /api/ + * + */ +class DolibarrApiInit extends DolibarrApi { + + function __construct() { + + } + +} \ No newline at end of file diff --git a/htdocs/api/index.php b/htdocs/api/index.php new file mode 100644 index 0000000000000..3ac00faa65fb8 --- /dev/null +++ b/htdocs/api/index.php @@ -0,0 +1,8 @@ + + * + * 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 . + */ + +/** + * \defgroup api Module DolibarrApi + * \brief API loader + * Search files htdocs//class/api_.class.php + * \file htdocs/api/indexphp + * + * @todo User authentication with api_key + * + * + */ +if (! defined("NOLOGIN")) define("NOLOGIN",'1'); + +$res=0; +if (! $res && file_exists("../../main.inc.php")) $res=@include '../../main.inc.php'; +if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../dolibarr/htdocs/main.inc.php'; // For custom directory +if (! $res) die("Include of main fails"); + +require_once DOL_DOCUMENT_ROOT.'/includes/restler/vendor/autoload.php'; +require_once DOL_DOCUMENT_ROOT.'/api/class/api.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; + +$api = new DolibarrApi($db); + +$api->r->setSupportedFormats('JsonFormat', 'XmlFormat'); +$api->r->addAPIClass('Luracast\\Restler\\Resources'); //this creates resources.json at API Root +$api->r->addAPIClass('DolibarrApiInit',''); // Just for url root page + +$modulesdir = dolGetModulesDirs(); +foreach ($modulesdir as $dir) +{ + /* + * Search available module + */ + dol_syslog("Scan directory ".$dir." for API modules"); + + $handle=@opendir(dol_osencode($dir)); + if (is_resource($handle)) + { + while (($file = readdir($handle))!==false) + { + if (is_readable($dir.$file) && preg_match("/^(mod.*)\.class\.php$/i",$file,$reg)) + { + $modulename=$reg[1]; + + // Defined if module is enabled + $enabled=true; + $part=$obj=strtolower(preg_replace('/^mod/i','',$modulename)); + //if ($part == 'propale') $part='propal'; + if ($part == 'societe') { + $obj = 'thirdparty'; + } + if (empty($conf->$part->enabled)) $enabled=false; + + if ($enabled) + { + /* + * If exists, load the API class for enable module + * + * Search a file api_.class.php into /htdocs//class directory + * + * @todo : take care of externals module! + * @todo : use getElementProperties() function + */ + $file = DOL_DOCUMENT_ROOT.'/'.$part."/class/api_".$obj.".class.php"; + + $classname = ucwords($obj).'Api'; + if (file_exists($file)) + { + require_once $file; + $api->r->addAPIClass($classname,''); + } + } + } + } + } +} + +$api->r->handle(); //serve the response \ No newline at end of file diff --git a/htdocs/societe/class/api_thirdparty.class.php b/htdocs/societe/class/api_thirdparty.class.php new file mode 100644 index 0000000000000..bd5581ef6a5f6 --- /dev/null +++ b/htdocs/societe/class/api_thirdparty.class.php @@ -0,0 +1,143 @@ + + * + * 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 . + */ + + use Luracast\Restler\RestException; + + +/** + * + * API class for thirdparty object + * + * @smart-auto-routing false + * + */ +class ThirdpartyApi extends DolibarrApi { + + static $FIELDS = array( + 'name', + 'email' + ); + + /** + * @var Societe $company {@type Societe} + */ + public $company; + + /** + * Constructor + * + * @url thirdparty/ + * + */ + function __construct() + { + global $db; + $this->db = $db; + $this->company = new Societe($this->db); + } + + /** + * Get properties of a thirdparty object + * + * Return an array with thirdparty informations + * + * @url GET thirdparty/{id} + * @param int $id ID of thirdparty + * @return array|mixed data without useless information + * @throws RestException + */ + function get($id) + { + $result = $this->company->fetch($id); + if( ! $result ) { + throw new RestException(404, 'Thirdparty not found'); + } + + return $this->cleanObjectDatas($this->company); + } + + /** + * Fetch a list of thirdparties + * + * @url GET /thirdparties/list + * + * @return array Array of thirdparty objects + */ + function getList() { + + $result = $this->company->fetch_all($id); + if( ! $result ) { + throw new RestException(404, 'Thirdparties not found'); + } + + return $this->cleanObjectDatas($this->company->lines); + + } + /** + * Create thirdparty object + * + * @url POST thirdparty/ + * @param type $request_data + * @return type + */ + function post($request_data = NULL) + { + return $this->company->create($this->_validate($request_data)); + } + + /** + * Update thirdparty + * + * @url PUT thirdparty/{id} + * @param type $id + * @param type $request_data + * @return type$this->company + */ + function put($id, $request_data = NULL) + { + return $this->company->update($id, $this->_validate($request_data)); + } + + /** + * Delete thirdparty + * + * @url DELETE thirdparty/{id} + * @param type $id + * @return type + */ + function delete($id) + { + return $this->company->delete($id); + } + + /** + * Validate fields before create or update object + * @param type $data + * @return array + * @throws RestException + */ + private function _validate($data) + { + $thirdparty = array(); + foreach (ThirdpartyApi::$FIELDS as $field) { + if (!isset($data[$field])) + throw new RestException(400, "$field field missing"); + $thirdparty[$field] = $data[$field]; + } + return $thirdparty; + } +} From d406830e06900daba4506f932f1643b2408cec64 Mon Sep 17 00:00:00 2001 From: jfefe Date: Fri, 1 May 2015 16:13:58 +0200 Subject: [PATCH 125/264] NEW : add an explorer for REST API consultation & documentation --- htdocs/public/api/explorer/css/screen.css | 1538 +++++++++++++ .../api/explorer/images/pet_store_api.png | Bin 0 -> 824 bytes .../public/api/explorer/images/throbber.gif | Bin 0 -> 9257 bytes htdocs/public/api/explorer/index.html | 95 + .../public/api/explorer/lib/backbone-min.js | 38 + .../api/explorer/lib/handlebars-1.0.rc.1.js | 1920 +++++++++++++++++ .../lib/handlebars.runtime-1.0.0.beta.6.js | 223 ++ .../api/explorer/lib/jquery-1.8.0.min.js | 2 + .../api/explorer/lib/jquery.ba-bbq.min.js | 18 + .../api/explorer/lib/jquery.slideto.min.js | 1 + .../api/explorer/lib/jquery.wiggle.min.js | 8 + htdocs/public/api/explorer/lib/swagger.js | 694 ++++++ .../public/api/explorer/lib/underscore-min.js | 32 + htdocs/public/api/explorer/swagger-ui.js | 1238 +++++++++++ htdocs/public/api/explorer/swagger-ui.min.js | 1 + 15 files changed, 5808 insertions(+) create mode 100644 htdocs/public/api/explorer/css/screen.css create mode 100644 htdocs/public/api/explorer/images/pet_store_api.png create mode 100644 htdocs/public/api/explorer/images/throbber.gif create mode 100644 htdocs/public/api/explorer/index.html create mode 100644 htdocs/public/api/explorer/lib/backbone-min.js create mode 100644 htdocs/public/api/explorer/lib/handlebars-1.0.rc.1.js create mode 100644 htdocs/public/api/explorer/lib/handlebars.runtime-1.0.0.beta.6.js create mode 100644 htdocs/public/api/explorer/lib/jquery-1.8.0.min.js create mode 100644 htdocs/public/api/explorer/lib/jquery.ba-bbq.min.js create mode 100644 htdocs/public/api/explorer/lib/jquery.slideto.min.js create mode 100644 htdocs/public/api/explorer/lib/jquery.wiggle.min.js create mode 100644 htdocs/public/api/explorer/lib/swagger.js create mode 100644 htdocs/public/api/explorer/lib/underscore-min.js create mode 100644 htdocs/public/api/explorer/swagger-ui.js create mode 100644 htdocs/public/api/explorer/swagger-ui.min.js diff --git a/htdocs/public/api/explorer/css/screen.css b/htdocs/public/api/explorer/css/screen.css new file mode 100644 index 0000000000000..e16ad7b6a73d0 --- /dev/null +++ b/htdocs/public/api/explorer/css/screen.css @@ -0,0 +1,1538 @@ +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +b, u, i, center, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td, +article, aside, canvas, details, embed, +figure, figcaption, footer, header, hgroup, +menu, nav, output, ruby, section, summary, +time, mark, audio, video { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + font: inherit; + vertical-align: baseline; +} + +body { + line-height: 1; +} + +ol, ul { + list-style: none; +} + +table { + border-collapse: collapse; + border-spacing: 0; +} + +caption, th, td { + text-align: left; + font-weight: normal; + vertical-align: middle; +} + +q, blockquote { + quotes: none; +} + +q:before, q:after, blockquote:before, blockquote:after { + content: ""; + content: none; +} + +a img { + border: none; +} + +article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary { + display: block; +} + +h1 a, h2 a, h3 a, h4 a, h5 a, h6 a { + text-decoration: none; +} + +h1 a:hover, h2 a:hover, h3 a:hover, h4 a:hover, h5 a:hover, h6 a:hover { + text-decoration: underline; +} + +h1 span.divider, h2 span.divider, h3 span.divider, h4 span.divider, h5 span.divider, h6 span.divider { + color: #aaaaaa; +} + +h1 { + color: #547f00; + color: black; + font-size: 1.5em; + line-height: 1.3em; + padding: 10px 0 10px 0; + font-family: "Droid Sans", sans-serif; + font-weight: bold; +} + +h2 { + color: #89bf04; + color: black; + font-size: 1.3em; + padding: 10px 0 10px 0; +} + +h2 a { + color: black; +} + +h2 span.sub { + font-size: 0.7em; + color: #999999; + font-style: italic; +} + +h2 span.sub a { + color: #777777; +} + +h3 { + color: black; + font-size: 1.1em; + padding: 10px 0 10px 0; +} + +div.heading_with_menu { + float: none; + clear: both; + overflow: hidden; + display: block; +} + +div.heading_with_menu h1, div.heading_with_menu h2, div.heading_with_menu h3, div.heading_with_menu h4, div.heading_with_menu h5, div.heading_with_menu h6 { + display: block; + clear: none; + float: left; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; + width: 60%; +} + +div.heading_with_menu ul { + display: block; + clear: none; + float: right; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; + margin-top: 10px; +} + +.body-textarea { + width: 300px; + height: 100px; +} + +p { + line-height: 1.4em; + padding: 0 0 10px 0; + color: #333333; +} + +ol { + margin: 0px 0 10px 0; + padding: 0 0 0 18px; + list-style-type: decimal; +} + +ol li { + padding: 5px 0px; + font-size: 0.9em; + color: #333333; +} + +mark { + padding: 2px; + color: #7e7b6d; + font-weight: bold; + background: rgba(255, 255, 255, 0.8); +} + +tag { + font-family: Verdana,Arial,Helvetica,sans-serif; + background-color: #999999; + padding: 1px 3px 2px; + font-size: xx-small; + font-weight: bold; + color: #ffffff; + letter-spacing: 1px; + white-space: nowrap; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} + +.markdown h3 { + color: #547f00; +} + +.markdown h4 { + color: #666666; +} + +.markdown pre { + font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace; + background-color: #fcf6db; + border: 1px solid black; + border-color: #e5e0c6; + padding: 10px; + margin: 0 0 10px 0; +} + +.markdown pre code { + line-height: 1.6em; +} + +.markdown p code, .markdown li code { + font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace; + background-color: #f0f0f0; + color: black; + padding: 1px 3px; +} + +.markdown ol, .markdown ul { + font-family: "Droid Sans", sans-serif; + margin: 5px 0 10px 0; + padding: 0 0 0 18px; + list-style-type: disc; +} + +.markdown ol li, .markdown ul li { + padding: 3px 0px; + line-height: 1.4em; + color: #333333; +} + +div.gist { + margin: 20px 0 25px 0 !important; +} + +p.big, div.big p { + font-size: 1em; + margin-bottom: 10px; +} + +span.weak { + color: #666666; +} + +span.blank, span.empty { + color: #888888; + font-style: italic; +} + +a { + color: #547f00; +} + +strong { + font-family: "Droid Sans", sans-serif; + font-weight: bold; + font-weight: bold; +} + +.code { + font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace; +} + +pre { + font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace; + background-color: #fcf6db; + border: 1px solid black; + border-color: #e5e0c6; + padding: 10px; + /* white-space: pre-line */ +} + +pre code { + line-height: 1.6em; +} + +.required { + font-weight: bold; +} + +table.fullwidth { + width: 100%; +} + +table thead tr th { + padding: 5px; + font-size: 0.9em; + color: #666666; + border-bottom: 1px solid #999999; +} + +table tbody tr.offset { + background-color: #f5f5f5; +} + +table tbody tr td { + padding: 6px; + font-size: 0.9em; + border-bottom: 1px solid #cccccc; + vertical-align: top; + line-height: 1.3em; +} + +table tbody tr:last-child td { + border-bottom: none; +} + +table tbody tr.offset { + background-color: #f0f0f0; +} + +form.form_box { + background-color: #ebf3f9; + border: 1px solid black; + border-color: #c3d9ec; + padding: 10px; +} + +form.form_box label { + color: #0f6ab4 !important; +} + +form.form_box input[type=submit] { + display: block; + padding: 10px; +} + +form.form_box p { + font-size: 0.9em; + padding: 0 0 15px 0; + color: #7e7b6d; +} + +form.form_box p a { + color: #646257; +} + +form.form_box p strong { + color: black; +} + +form.form_box p.weak { + font-size: 0.8em; +} + +form.formtastic fieldset.inputs ol li p.inline-hints { + margin-left: 0; + font-style: italic; + font-size: 0.9em; + margin: 0; +} + +form.formtastic fieldset.inputs ol li label { + display: block; + clear: both; + width: auto; + padding: 0 0 3px 0; + color: #666666; +} + +form.formtastic fieldset.inputs ol li label abbr { + padding-left: 3px; + color: #888888; +} + +form.formtastic fieldset.inputs ol li.required label { + color: black; +} + +form.formtastic fieldset.inputs ol li.string input, form.formtastic fieldset.inputs ol li.url input, form.formtastic fieldset.inputs ol li.numeric input { + display: block; + padding: 4px; + width: auto; + clear: both; +} + +form.formtastic fieldset.inputs ol li.string input.title, form.formtastic fieldset.inputs ol li.url input.title, form.formtastic fieldset.inputs ol li.numeric input.title { + font-size: 1.3em; +} + +form.formtastic fieldset.inputs ol li.text textarea { + font-family: "Droid Sans", sans-serif; + height: 250px; + padding: 4px; + display: block; + clear: both; +} + +form.formtastic fieldset.inputs ol li.select select { + display: block; + clear: both; +} + +form.formtastic fieldset.inputs ol li.boolean { + float: none; + clear: both; + overflow: hidden; + display: block; +} + +form.formtastic fieldset.inputs ol li.boolean input { + display: block; + float: left; + clear: none; + margin: 0 5px 0 0; +} + +form.formtastic fieldset.inputs ol li.boolean label { + display: block; + float: left; + clear: none; + margin: 0; + padding: 0; +} + +form.formtastic fieldset.buttons { + margin: 0; + padding: 0; +} + +form.fullwidth ol li.string input, form.fullwidth ol li.url input, form.fullwidth ol li.text textarea, form.fullwidth ol li.numeric input { + width: 500px !important; +} + +body { + font-family: "Droid Sans", sans-serif; +} + +body #content_message { + margin: 10px 15px; + font-style: italic; + color: #999999; +} + +body #header { + background-color: #646257; + padding: 14px; +} + +body #header a#logo { + font-size: 1.5em; + font-weight: bold; + text-decoration: none; + background: transparent url(http://luracast.com/images/restler3-icon.png) no-repeat left center; + padding: 20px 0 20px 40px; + color: white; +} + +body #header form#api_selector { + display: block; + clear: none; + float: right; +} + +body #header form#api_selector .input { + display: block; + clear: none; + float: left; + margin: 0 10px 0 0; +} + +body #header form#api_selector .input input { + font-size: 0.9em; + padding: 3px; + margin: 0; +} + +body #header form#api_selector .input input#input_baseUrl { + width: 400px; +} + +body #header form#api_selector .input input#input_apiKey { + width: 200px; +} + +body #header form#api_selector .input a#explore { + display: block; + text-decoration: none; + font-weight: bold; + padding: 6px 8px; + font-size: 0.9em; + color: white; + background-color: #000000; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + -o-border-radius: 4px; + -ms-border-radius: 4px; + -khtml-border-radius: 4px; + border-radius: 4px; +} + +body #header form#api_selector .input a#explore:hover { + background-color: #a41e22; +} + +body p#colophon { + margin: 0 15px 40px 15px; + padding: 10px 0; + font-size: 0.8em; + border-top: 1px solid #dddddd; + font-family: "Droid Sans", sans-serif; + color: #999999; + font-style: italic; +} + +body p#colophon a { + text-decoration: none; + color: #547f00; +} + +body ul#resources { + font-family: "Droid Sans", sans-serif; + font-size: 0.9em; +} + +body ul#resources li.resource { + border-bottom: 1px solid #dddddd; +} + +body ul#resources li.resource:last-child { + border-bottom: none; +} + +body ul#resources li.resource div.heading { + border: 1px solid transparent; + float: none; + clear: both; + overflow: hidden; + display: block; +} + +body ul#resources li.resource div.heading h2 { + color: #999999; + padding-left: 0px; + display: block; + clear: none; + float: left; + font-family: "Droid Sans", sans-serif; + font-weight: bold; +} + +body ul#resources li.resource div.heading h2 a { + color: #999999; +} + +body ul#resources li.resource div.heading h2 a:hover { + color: black; +} + +body ul#resources li.resource div.heading ul.options { + float: none; + clear: both; + overflow: hidden; + margin: 0; + padding: 0; + display: block; + clear: none; + float: right; + margin: 14px 10px 0 0; +} + +body ul#resources li.resource div.heading ul.options li { + float: left; + clear: none; + margin: 0; + padding: 2px 10px; + border-right: 1px solid #dddddd; +} + +body ul#resources li.resource div.heading ul.options li:first-child, body ul#resources li.resource div.heading ul.options li.first { + padding-left: 0; +} + +body ul#resources li.resource div.heading ul.options li:last-child, body ul#resources li.resource div.heading ul.options li.last { + padding-right: 0; + border-right: none; +} + +body ul#resources li.resource div.heading ul.options li { + color: #666666; + font-size: 0.9em; +} + +body ul#resources li.resource div.heading ul.options li a { + color: #aaaaaa; + text-decoration: none; +} + +body ul#resources li.resource div.heading ul.options li a:hover { + text-decoration: underline; + color: black; +} + +body ul#resources li.resource:hover div.heading h2 a, body ul#resources li.resource.active div.heading h2 a { + color: black; +} + +body ul#resources li.resource:hover div.heading ul.options li a, body ul#resources li.resource.active div.heading ul.options li a { + color: #555555; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get { + float: none; + clear: both; + overflow: hidden; + display: block; + margin: 0 0 10px 0; + padding: 0 0 0 0px; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading { + float: none; + clear: both; + overflow: hidden; + display: block; + margin: 0 0 0 0; + padding: 0; + background-color: #e7f0f7; + border: 1px solid black; + border-color: #c3d9ec; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading h3 { + display: block; + clear: none; + float: left; + width: auto; + margin: 0; + padding: 0; + line-height: 1.1em; + color: black; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading h3 span { + margin: 0; + padding: 0; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading h3 span.http_method a { + text-transform: uppercase; + background-color: #0f6ab4; + text-decoration: none; + color: white; + display: inline-block; + width: 50px; + font-size: 0.7em; + text-align: center; + padding: 7px 0 4px 0; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + -o-border-radius: 2px; + -ms-border-radius: 2px; + -khtml-border-radius: 2px; + border-radius: 2px; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading h3 span.path { + padding-left: 10px; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading h3 span.path a { + color: black; + text-decoration: none; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading h3 span.path a:hover { + text-decoration: underline; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options { + float: none; + clear: both; + overflow: hidden; + margin: 0; + padding: 0; + display: block; + clear: none; + float: right; + margin: 6px 10px 0 0; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li { + float: left; + clear: none; + margin: 0; + padding: 2px 10px; + border-right: 1px solid #dddddd; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li:first-child, body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li.first { + padding-left: 0; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li:last-child, body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li.last { + padding-right: 0; + border-right: none; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li { + border-right-color: #c3d9ec; + color: #0f6ab4; + font-size: 0.9em; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li a { + color: #0f6ab4; + text-decoration: none; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li a:hover, body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li a:active, body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li a.active { + text-decoration: underline; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content { + background-color: #ebf3f9; + border: 1px solid black; + border-color: #c3d9ec; + border-top: none; + padding: 10px; + -moz-border-radius-bottomleft: 6px; + -webkit-border-bottom-left-radius: 6px; + -o-border-bottom-left-radius: 6px; + -ms-border-bottom-left-radius: 6px; + -khtml-border-bottom-left-radius: 6px; + border-bottom-left-radius: 6px; + -moz-border-radius-bottomright: 6px; + -webkit-border-bottom-right-radius: 6px; + -o-border-bottom-right-radius: 6px; + -ms-border-bottom-right-radius: 6px; + -khtml-border-bottom-right-radius: 6px; + border-bottom-right-radius: 6px; + margin: 0 0 20px 0; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content h4 { + color: #0f6ab4; + font-size: 1.1em; + margin: 0; + padding: 15px 0 5px 0px; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content form input[type='text'].error { + outline: 2px solid black; + outline-color: #cc0000; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content div.sandbox_header { + float: none; + clear: both; + overflow: hidden; + display: block; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content div.sandbox_header input.submit { + display: block; + clear: none; + float: left; + padding: 6px 8px; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content div.sandbox_header img { + display: block; + display: block; + clear: none; + float: right; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content div.sandbox_header a { + padding: 4px 0 0 10px; + color: #6fa5d2; + display: inline-block; + font-size: 0.9em; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content div.response div.block { + background-color: #fcf6db; + border: 1px solid black; + border-color: #e5e0c6; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content div.response div.block pre { + font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace; + padding: 10px; + font-size: 0.9em; + max-height: 400px; + overflow-y: auto; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post { + float: none; + clear: both; + overflow: hidden; + display: block; + margin: 0 0 10px 0; + padding: 0 0 0 0px; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading { + float: none; + clear: both; + overflow: hidden; + display: block; + margin: 0 0 0 0; + padding: 0; + background-color: #e7f6ec; + border: 1px solid black; + border-color: #c3e8d1; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading h3 { + display: block; + clear: none; + float: left; + width: auto; + margin: 0; + padding: 0; + line-height: 1.1em; + color: black; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading h3 span { + margin: 0; + padding: 0; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading h3 span.http_method a { + text-transform: uppercase; + background-color: #10a54a; + text-decoration: none; + color: white; + display: inline-block; + width: 50px; + font-size: 0.7em; + text-align: center; + padding: 7px 0 4px 0; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + -o-border-radius: 2px; + -ms-border-radius: 2px; + -khtml-border-radius: 2px; + border-radius: 2px; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading h3 span.path { + padding-left: 10px; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading h3 span.path a { + color: black; + text-decoration: none; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading h3 span.path a:hover { + text-decoration: underline; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options { + float: none; + clear: both; + overflow: hidden; + margin: 0; + padding: 0; + display: block; + clear: none; + float: right; + margin: 6px 10px 0 0; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li { + float: left; + clear: none; + margin: 0; + padding: 2px 10px; + border-right: 1px solid #dddddd; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li:first-child, body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li.first { + padding-left: 0; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li:last-child, body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li.last { + padding-right: 0; + border-right: none; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li { + border-right-color: #c3e8d1; + color: #10a54a; + font-size: 0.9em; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li a { + color: #10a54a; + text-decoration: none; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li a:hover, body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li a:active, body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li a.active { + text-decoration: underline; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content { + background-color: #ebf7f0; + border: 1px solid black; + border-color: #c3e8d1; + border-top: none; + padding: 10px; + -moz-border-radius-bottomleft: 6px; + -webkit-border-bottom-left-radius: 6px; + -o-border-bottom-left-radius: 6px; + -ms-border-bottom-left-radius: 6px; + -khtml-border-bottom-left-radius: 6px; + border-bottom-left-radius: 6px; + -moz-border-radius-bottomright: 6px; + -webkit-border-bottom-right-radius: 6px; + -o-border-bottom-right-radius: 6px; + -ms-border-bottom-right-radius: 6px; + -khtml-border-bottom-right-radius: 6px; + border-bottom-right-radius: 6px; + margin: 0 0 20px 0; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content h4 { + color: #10a54a; + font-size: 1.1em; + margin: 0; + padding: 15px 0 5px 0px; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content form input[type='text'].error { + outline: 2px solid black; + outline-color: #cc0000; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content div.sandbox_header { + float: none; + clear: both; + overflow: hidden; + display: block; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content div.sandbox_header input.submit { + display: block; + clear: none; + float: left; + padding: 6px 8px; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content div.sandbox_header img { + display: block; + display: block; + clear: none; + float: right; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content div.sandbox_header a { + padding: 4px 0 0 10px; + color: #6fc992; + display: inline-block; + font-size: 0.9em; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content div.response div.block { + background-color: #fcf6db; + border: 1px solid black; + border-color: #e5e0c6; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content div.response div.block pre { + font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace; + padding: 10px; + font-size: 0.9em; + max-height: 400px; + overflow-y: auto; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put { + float: none; + clear: both; + overflow: hidden; + display: block; + margin: 0 0 10px 0; + padding: 0 0 0 0px; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading { + float: none; + clear: both; + overflow: hidden; + display: block; + margin: 0 0 0 0; + padding: 0; + background-color: #f9f2e9; + border: 1px solid black; + border-color: #f0e0ca; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading h3 { + display: block; + clear: none; + float: left; + width: auto; + margin: 0; + padding: 0; + line-height: 1.1em; + color: black; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading h3 span { + margin: 0; + padding: 0; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading h3 span.http_method a { + text-transform: uppercase; + background-color: #c5862b; + text-decoration: none; + color: white; + display: inline-block; + width: 50px; + font-size: 0.7em; + text-align: center; + padding: 7px 0 4px 0; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + -o-border-radius: 2px; + -ms-border-radius: 2px; + -khtml-border-radius: 2px; + border-radius: 2px; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading h3 span.path { + padding-left: 10px; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading h3 span.path a { + color: black; + text-decoration: none; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading h3 span.path a:hover { + text-decoration: underline; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options { + float: none; + clear: both; + overflow: hidden; + margin: 0; + padding: 0; + display: block; + clear: none; + float: right; + margin: 6px 10px 0 0; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li { + float: left; + clear: none; + margin: 0; + padding: 2px 10px; + border-right: 1px solid #dddddd; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li:first-child, body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li.first { + padding-left: 0; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li:last-child, body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li.last { + padding-right: 0; + border-right: none; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li { + border-right-color: #f0e0ca; + color: #c5862b; + font-size: 0.9em; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li a { + color: #c5862b; + text-decoration: none; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li a:hover, body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li a:active, body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li a.active { + text-decoration: underline; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content { + background-color: #faf5ee; + border: 1px solid black; + border-color: #f0e0ca; + border-top: none; + padding: 10px; + -moz-border-radius-bottomleft: 6px; + -webkit-border-bottom-left-radius: 6px; + -o-border-bottom-left-radius: 6px; + -ms-border-bottom-left-radius: 6px; + -khtml-border-bottom-left-radius: 6px; + border-bottom-left-radius: 6px; + -moz-border-radius-bottomright: 6px; + -webkit-border-bottom-right-radius: 6px; + -o-border-bottom-right-radius: 6px; + -ms-border-bottom-right-radius: 6px; + -khtml-border-bottom-right-radius: 6px; + border-bottom-right-radius: 6px; + margin: 0 0 20px 0; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content h4 { + color: #c5862b; + font-size: 1.1em; + margin: 0; + padding: 15px 0 5px 0px; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content form input[type='text'].error { + outline: 2px solid black; + outline-color: #cc0000; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content div.sandbox_header { + float: none; + clear: both; + overflow: hidden; + display: block; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content div.sandbox_header input.submit { + display: block; + clear: none; + float: left; + padding: 6px 8px; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content div.sandbox_header img { + display: block; + display: block; + clear: none; + float: right; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content div.sandbox_header a { + padding: 4px 0 0 10px; + color: #dcb67f; + display: inline-block; + font-size: 0.9em; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content div.response div.block { + background-color: #fcf6db; + border: 1px solid black; + border-color: #e5e0c6; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content div.response div.block pre { + font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace; + padding: 10px; + font-size: 0.9em; + max-height: 400px; + overflow-y: auto; +} + + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch { + float: none; + clear: both; + overflow: hidden; + display: block; + margin: 0 0 10px 0; + padding: 0 0 0 0px; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading { + float: none; + clear: both; + overflow: hidden; + display: block; + margin: 0 0 0 0; + padding: 0; + background-color: #FCE9E3; + border: 1px solid black; + border-color: #F5D5C3; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading h3 { + display: block; + clear: none; + float: left; + width: auto; + margin: 0; + padding: 0; + line-height: 1.1em; + color: black; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading h3 span { + margin: 0; + padding: 0; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading h3 span.http_method a { + text-transform: uppercase; + background-color: #D38042; + text-decoration: none; + color: white; + display: inline-block; + width: 50px; + font-size: 0.7em; + text-align: center; + padding: 7px 0 4px 0; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + -o-border-radius: 2px; + -ms-border-radius: 2px; + -khtml-border-radius: 2px; + border-radius: 2px; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading h3 span.path { + padding-left: 10px; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading h3 span.path a { + color: black; + text-decoration: none; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading h3 span.path a:hover { + text-decoration: underline; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options { + float: none; + clear: both; + overflow: hidden; + margin: 0; + padding: 0; + display: block; + clear: none; + float: right; + margin: 6px 10px 0 0; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li { + float: left; + clear: none; + margin: 0; + padding: 2px 10px; + border-right: 1px solid #dddddd; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li:first-child, body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li.first { + padding-left: 0; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li:last-child, body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li.last { + padding-right: 0; + border-right: none; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li { + border-right-color: #f0cecb; + color: #D38042; + font-size: 0.9em; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li a { + color: #D38042; + text-decoration: none; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li a:hover, body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li a:active, body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li a.active { + text-decoration: underline; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content { + background-color: #faf0ef; + border: 1px solid black; + border-color: #f0cecb; + border-top: none; + padding: 10px; + -moz-border-radius-bottomleft: 6px; + -webkit-border-bottom-left-radius: 6px; + -o-border-bottom-left-radius: 6px; + -ms-border-bottom-left-radius: 6px; + -khtml-border-bottom-left-radius: 6px; + border-bottom-left-radius: 6px; + -moz-border-radius-bottomright: 6px; + -webkit-border-bottom-right-radius: 6px; + -o-border-bottom-right-radius: 6px; + -ms-border-bottom-right-radius: 6px; + -khtml-border-bottom-right-radius: 6px; + border-bottom-right-radius: 6px; + margin: 0 0 20px 0; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content h4 { + color: #D38042; + font-size: 1.1em; + margin: 0; + padding: 15px 0 5px 0px; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content form input[type='text'].error { + outline: 2px solid black; + outline-color: #F5D5C3; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content div.sandbox_header { + float: none; + clear: both; + overflow: hidden; + display: block; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content div.sandbox_header input.submit { + display: block; + clear: none; + float: left; + padding: 6px 8px; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content div.sandbox_header img { + display: block; + display: block; + clear: none; + float: right; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content div.sandbox_header a { + padding: 4px 0 0 10px; + color: #dcb67f; + display: inline-block; + font-size: 0.9em; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content div.response div.block { + background-color: #fcf6db; + border: 1px solid black; + border-color: #e5e0c6; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content div.response div.block pre { + font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace; + padding: 10px; + font-size: 0.9em; + max-height: 400px; + overflow-y: auto; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete { + float: none; + clear: both; + overflow: hidden; + display: block; + margin: 0 0 10px 0; + padding: 0 0 0 0px; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading { + float: none; + clear: both; + overflow: hidden; + display: block; + margin: 0 0 0 0; + padding: 0; + background-color: #f5e8e8; + border: 1px solid black; + border-color: #e8c6c7; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading h3 { + display: block; + clear: none; + float: left; + width: auto; + margin: 0; + padding: 0; + line-height: 1.1em; + color: black; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading h3 span { + margin: 0; + padding: 0; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading h3 span.http_method a { + text-transform: uppercase; + background-color: #a41e22; + text-decoration: none; + color: white; + display: inline-block; + width: 50px; + font-size: 0.7em; + text-align: center; + padding: 7px 0 4px 0; + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + -o-border-radius: 2px; + -ms-border-radius: 2px; + -khtml-border-radius: 2px; + border-radius: 2px; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading h3 span.path { + padding-left: 10px; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading h3 span.path a { + color: black; + text-decoration: none; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading h3 span.path a:hover { + text-decoration: underline; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options { + float: none; + clear: both; + overflow: hidden; + margin: 0; + padding: 0; + display: block; + clear: none; + float: right; + margin: 6px 10px 0 0; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li { + float: left; + clear: none; + margin: 0; + padding: 2px 10px; + border-right: 1px solid #dddddd; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li:first-child, body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li.first { + padding-left: 0; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li:last-child, body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li.last { + padding-right: 0; + border-right: none; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li { + border-right-color: #e8c6c7; + color: #a41e22; + font-size: 0.9em; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li a { + color: #a41e22; + text-decoration: none; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li a:hover, body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li a:active, body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li a.active { + text-decoration: underline; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content { + background-color: #f7eded; + border: 1px solid black; + border-color: #e8c6c7; + border-top: none; + padding: 10px; + -moz-border-radius-bottomleft: 6px; + -webkit-border-bottom-left-radius: 6px; + -o-border-bottom-left-radius: 6px; + -ms-border-bottom-left-radius: 6px; + -khtml-border-bottom-left-radius: 6px; + border-bottom-left-radius: 6px; + -moz-border-radius-bottomright: 6px; + -webkit-border-bottom-right-radius: 6px; + -o-border-bottom-right-radius: 6px; + -ms-border-bottom-right-radius: 6px; + -khtml-border-bottom-right-radius: 6px; + border-bottom-right-radius: 6px; + margin: 0 0 20px 0; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content h4 { + color: #a41e22; + font-size: 1.1em; + margin: 0; + padding: 15px 0 5px 0px; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content form input[type='text'].error { + outline: 2px solid black; + outline-color: #cc0000; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content div.sandbox_header { + float: none; + clear: both; + overflow: hidden; + display: block; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content div.sandbox_header input.submit { + display: block; + clear: none; + float: left; + padding: 6px 8px; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content div.sandbox_header img { + display: block; + display: block; + clear: none; + float: right; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content div.sandbox_header a { + padding: 4px 0 0 10px; + color: #c8787a; + display: inline-block; + font-size: 0.9em; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content div.response div.block { + background-color: #fcf6db; + border: 1px solid black; + border-color: #e5e0c6; +} + +body ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content div.response div.block pre { + font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace; + padding: 10px; + font-size: 0.9em; + max-height: 400px; + overflow-y: auto; +} + + +.model-signature { + font-family: "Droid Sans", sans-serif; + font-size: 1em; + line-height: 1.5em; +} +.model-signature span { + font-size: 0.9em; + line-height: 1.5em; +} +.model-signature span:nth-child(odd) { color:#333; } +.model-signature span:nth-child(even) { color:#C5862B; } diff --git a/htdocs/public/api/explorer/images/pet_store_api.png b/htdocs/public/api/explorer/images/pet_store_api.png new file mode 100644 index 0000000000000000000000000000000000000000..f9f9cd4aeb35a108c4b2f1dddb59977d56c595d8 GIT binary patch literal 824 zcmV-81IPS{P)n=Rd;8mVwQNY4k4xJQ%YT}s;WA7;r!W@XgqjG_4og} z8w>{OB9REiMa8-B85td+y}bji^~2KA`Md4j-u{zw=H%Da@83%_8qEnl9k1WK;pWX- zb-lg)pQYAreK@>)*5Clqni{IZVYGG+NY67Bp-^bn;L{Nbh44I6CIK+n7p8#U?;fCA zYMFcy%UEjup4fgnli%NyzSe*@419QuU9lJ|T$?f9w?HIQ$RwEJGK7^!y7LhxIgVJp z9c!kB{0aydM1epU1NJ=h(}2X?Y{qn70yEN$dwm~favs=VbQ+T?!AvSl{P~PE zS&zsJbTQttne>kdM4$jBhLMFy@I1)3u-4cAzrY*l!o9eK^w%+jqY!oi(Ri8sMauvK zwnCP#%3hEH#FtNqq{iT(?=_JA_8XC>5Y8Y@!wmxKb|A87ZbpHA`+%v~0pt{5Nko1L zLKR^25YExt1lH7L1{t{|P z@n)yHyZf~3>LZ@#&CNw1rA#OlY^|)UJQKUrlKKO&x%wPhH}6&e0000K^a6u zQ3;5MiU^7p6*M3qDk!2=YEcHMQ>nzEYP;R`e2C@r+U+?#XaC*&gKPcB#k$`o&;7mu zYNhYYXe|Uo84#4ZIko#rcU5K8*yFL{qT47O&^5fZH$ zVZ@%(l~vVHjnm;H@KL8@r%yUHoo;rbHI_4lIH(_nsTT>S2`DFOD~uCb9_dF4`#QgI zy7ldMcLs+A_s%|e1pRPrbX-tpeNP!9(IpMFTce`t_5U%lP99z%&i6`1d~ zWeM!Rxc50<+d$e^9LT`?B+aMK~apR zHm?q;p<7{wN2g|I^aGlSws;VP84j(z%aQwvAWv83Z$}p(% zZ^?2;gxg(ey_`V5J7{;!o;o;KslW@z5EP~JGs|U)J7dF&(ff#A=6vU?cGQ$-4+;Jf z-ggJEa!yStn`_EWvl)#yhm6XVs}UUbsi;+agri;mCfjH^Uy;lH+Zw^h)4N?oZgZz4 zJk(fTZ|Bi^;+s_M=~+d#vyoxEPzTlOS=mX@sbl*uRj>=MaMr}cFIY8i?UM61>86uB zV$DlOUCiUJwbzJMP@D$urzK|lL2-PC!p1l47V-ZG<5Ev0Z5h~Kx?`KOp7gkAjV93A z-Gc7MrlxTf?wF;CbNc@tCHJH{TB3c;#{SVu%97}tyAM2n&|9W_?qv}$*Jt*%7Yxb# zV0;d;7|lDEltJYS+U)#aiJO};?_Jyy_4%syQ(uy?-J-Yx-9O5nKRk@@XSS~X<(2u~ zV-LamWm~!iqtH9wkpf8mAXZhOD&L#aA_%)4h2M;1M5jt zIR>Us+%W-GXa_f^opKg=DSrAs)AXeRa;Hp0aC1OgbxQ%Qr_QvTleM1jkR!2mkcX$3 ztsR8~G9iqh(-FJ@F_rQBIYDXV_6s7G9SxaVF^laZqcx$!D97m|7t16j6@Jt6UdDRy49Qyvs|c>RuA|@b%}`*wU}2^7q;&Vtc6@lb zcXl)T!6nYDzmMJ~%n$KNXyNlCG)GkJ4!82;v6@d3>s5r~E+3!O?049JDr14Y^PeMI02R`0lJ^=oJ zYd|*u9|SU(j7hY?+<=(?fP*mtV*zFhOrz6%{VA?ozdm&(Jf^V zMfPZ?>l`mS3{Uq8IM;e!+1YjJy2!mzK$O|wPeU{*QSbs9m+@`f5KxO3PBnQ=%RsZg%go*fJ`*w9TL{-WgZVIA$!YV}3BRcfeXaR$x#b zW)Tpd#8E4)^MyYdkH;4_;ChJuw%n+Be7Ko4;w-nHvyo$d_0e-YiF78Df&)_)(}fcr_r0mPH(4RRYWIu+d@t0&Ss@O^s! zOKyX&13)%N@83r^;QsgN{rl(!0|RF1FA)b1{CRXAy&1ySz@>olPiR4r$aMdq&_=nK zq|cFs8phWJ1@%dZ-gXd{zDbTILD>)qEvH-NU*Rf1b2J1Ri79`rBFl@ z8E^0I)OqEi{pH(a24b9YPG;Kz@t-qZW;3Mpe`MRlmYx{7bH-XZ&`RQ7Rb^%}gc&X| zd}Q-FZf|RWxHU?PR!(C?80zu(^l>*h{#ulSiid(O!J(8P-41bNM3tnX@U6NS5yo0? zdcF)~xFE&+&|gZ$23dV5t~?$$&ymZ;F8j7GGMncGSsDo%>J`26=&l=X#rSKv_64;0 zr;k6no@=gV`P)K!=kaHl>q?!`X>(A;84tg^Md<`zA%qbRLby1Z=fn*ZRdNqs%Tq|3 zOt}lZu0q9oKJhgz&+^7PCt$=UFW=R*w?a1)ePoL*`R$Gxj?TU@12tTHsT$giHQU+sqf;fS0FpT!< z z#UR4L_rT;lfRLVo8|3$7cmuxwjY5rmYs&kR6z_LRhf9-=4QalKQYEWw^4-EBI3j$& zA>$Im_{ZA>0`)E_&m%x6a)BThkx=e|aMkOrK9zb1YzqpQ&WZ^$)2T>CwTCuYRn5y) z3fVXg-@R5&Bf4?WUTyD|hBDe2>xEh|o-y}o5Se~+Ob!5xN>CaAN!<4)F zwNh!Y7B?@AigokFYNJL`0Vz&-ekrY95-n3M<%GR<;SzXRmO7(zd+gf|$Thb%;pby2 zyd{5TJ?|JYUgpSlJ0=LB@k6#d&opuPGq^qJAIumfhigC2qAX0OEnYnT@O;bA?X1O5 zpLe9|%_H+Yki!Rv$7Kvjv8r7Z?$<>G)g*%D*V#s&kz>Z3V1 z3!ZKh9H8Nl9IdhEW_rY#oYdDCLTe+nQ{(d2pBX8%CmxL+1`|b#Vb!?IY!kT7$PDWAP9$FY=e9KSK{DEH|408! zl-$lv)U8$EB{~es&j>rYg%{{JRvIl8@NK}L=xDAEVv(o#W@3LUDc*m?yKSPR0O|nY zAh;*QuBdpja8HzP8Uw`ce-r*LrUA47ZvZ)ff3k4^>;dFcof}9eXeeM<0OVj&CKDVK zpUKKIF%hSmry!pwK68UX>zOF@dv}B4Gg)^2GQmN7@A?zG!xO6dT*Cq0+r{eY6}AfU zf`|~y!?^R*nB0!iTcg|CgM}ou^H*s~5)%h;Xh;PYOM!|Yhfk$w;@`1Dx1y!EZrM&^zMat!^Wz# z=Z{;Pa0w21oA1X3*9=`*c7o3ePa^k%Vzu>2C_7DaZJ8FW5GJv|t>`Ym;_S>7g_3XI zdRb!Ppd`ErK`pUDHRsJd9@)bu>}s1)nKsyAR7h21<1u{DX1gd_Vf;^zdUpFPeSHHR z7AMgw^{FlFlK91CGMafKt`$FLhq#^=->@Uok7pqW6&#Zs4*E(i5-jog43A*qC@!(8 z8&F}pofRcMVmcJd=f;fvlfAR!ZqeaTE?#TQ^jQM0ioaJf8m^!Kdv^`f5kEsD0=gX#4={QE1$3A4K~V$ITKEd){XVLx?i6K*D>JF6E=i znqF^X#&UX}rfB|#A9%y|sR5i6B5gyk>8@Q+xHg|^5iz7C2}YkGF)nuP4LX#k2tRBP z=!VnWnXea(K#Wvg2&0f{!mXuuWaPpsoZ)3TSaEp;i|_)CvP=4wjI; zH%7tcLM8dQXsHW*#|}%TG9yiGpyjBltpcpXkpl8zg~x zD{QG)2Z8x$vfjgDc(J6i|OHoLX&!<+m^<$S3DtA8Mf!{ z7;g1}0uqJ0Mxuy%=#BFX5;Xh9JkrA$d}neS9T;$F$kXn}ss zF{Jn}9EDk=>h)sMy$YXfhKIDxr7U@3xl+uI|N5y!>?{aVn703L1Qgb$ql%JT^lsGD%)~)(H?Spj$zNt)h)Raob z@KyVB@&ngE0rtMW4!UTqGX>{&KHJAWqb)oYq9O)e)nmN0jVa;LNbKXx04a+8&O;q) zHBzGejrqt7Dk$Z2VR%%K#`!((pXE*MR{jGtv|q$p5#v9N0f^6B9IB!Q6(y$TmHRLM zsYXm2jn3f{9T)KVVzotDx=Ng8q0Z*VDZOkd5C!p0PRoFt>NyVEc9*%YR&2>Nq~$AI zXOQfjJ&wpGMe~I8y=cC(QR4=W2GWccFK(3`d&gN+)qWtW-`*}mZI%KDRl4@rUv1%d zxFO82lhW$xQyYxJg8tOZyXm1As%kEFNn)eW{R61M>af@wr(YW{R@+eL2 zx?SovK+867$F%T;Dfeajw|kiQ81GcOnS$Y4+hp8g_w1P8_~79d9p$*M1_Ei81$H$Ti6oi?ZW)&tmsJa7RV1LKddm7R*qL54L7j zvCr1Mrb;l!=m^TbJun-C_6$7w81E1eAQC^6s4>rZ4&I5+yyu$kha%Z&d+|S7Ki#{2 zy}%Giz|eR|G?ychX%%=eL`W(aLarb(L4jd>J+wlX;xMV9H8J!l&i?~Mw7)jlIuLD% zyq+AK92j#kC`ycv$SJ|E7!FBParx#v<3_rZ-DLQ@>`#sdl5}immok8&`{YgF|+< z`tB>e%6G{=B4?V-be>`&*}0d*f?$yBX@w+rJht@O+=^zttqB2p=IiA17#YD$4-fih z@$gJ95mGmFhN!d;3Ag4#>3o`>%L{G=9<}qOJ$wDN)%)MN6bVsAPG4oKB3+8r6!Qf9 z3m8?jIpWcEJbt6|f?Y4nMXK(--YZ|GA2_aRS!do%J9S7?Q&4FYL@sPilq}e4tlYa& z?f+we^=FH^Z9|dnXZghblW!IYGIAT{``58&7vZBybh+GuIPP{h*J?&vf7i8rv6qgx zab9~l+K`tvC7pWtlS!5lt(n#Yl}PAR(v01oXjc0F?T0w>+*p#PtE?Tf_hMrEaZ!^V zbv_>=4xibc0TUxg^I>TS?HR4fdiWl`@6{7|WU9G68l7tOz2p>oIe~NNr!>Q&PHm`4 z98R?g(IT*nl#{_|*WO_h0X78;WwMp?A^Zi)W@BX5q==TdOl?~J6HK(0b(xD6?m3e3 z#+zMaSJb(W$h5+d+6vujSjyi_R80c9>7h;0YlUFDvN`iNGu&5HQ5^e>6x?&JSc4V$6_I1jJ4vnCVbkU`Gz=Uy#~OI( zlL-$UAE$pVCsD_rICM#Q!ltzcqDphp5L|ZrqUm>=H%x!RjMrF#*?BN2shvUg=H;)& zy~_xWl*k$~9Hl6PIq({dELPE-r4*YNs7?5{>dlC`EcK~lPKB_8V)G@H)UZFF8$tXT z@^raW#Hq4OJGFL2Aye|HU&_NL%dYans6?ltqEBz`Q|m=@Zh4=-p2r;}q(Nbsk$fUI zP|(Ns2>MDvZi1H7<55frlQn#%?`WY3g`+fRuC#UJx%#d!zxEu3=}zF514S=6f@?~$ zeuSB=6E7r3ya|; z@K7M3VBrls6c{M*M_{AB_fVjgQ|F(FuK(@=1eWeVMSpLglllqV6Rg-L_46;?^IskS z)x6|SR1^gGl6amWjkb1dX}^8DumNXNmhsfxKA#;bBBIZE@0gma5yQY(FX>|N~Y^mgq`xc zdxOf6r{9u#_e0gV3(fdBTdV2Sc4SN5ZmP?cB4?KR + + Restler API Explorer + + + + + + + + + + + + + + + + + + + + + +
+   +
+ +
+ +
+ + + + \ No newline at end of file diff --git a/htdocs/public/api/explorer/lib/backbone-min.js b/htdocs/public/api/explorer/lib/backbone-min.js new file mode 100644 index 0000000000000..c1c0d4fff28ff --- /dev/null +++ b/htdocs/public/api/explorer/lib/backbone-min.js @@ -0,0 +1,38 @@ +// Backbone.js 0.9.2 + +// (c) 2010-2012 Jeremy Ashkenas, DocumentCloud Inc. +// Backbone may be freely distributed under the MIT license. +// For all details and documentation: +// http://backbonejs.org +(function(){var l=this,y=l.Backbone,z=Array.prototype.slice,A=Array.prototype.splice,g;g="undefined"!==typeof exports?exports:l.Backbone={};g.VERSION="0.9.2";var f=l._;!f&&"undefined"!==typeof require&&(f=require("underscore"));var i=l.jQuery||l.Zepto||l.ender;g.setDomLibrary=function(a){i=a};g.noConflict=function(){l.Backbone=y;return this};g.emulateHTTP=!1;g.emulateJSON=!1;var p=/\s+/,k=g.Events={on:function(a,b,c){var d,e,f,g,j;if(!b)return this;a=a.split(p);for(d=this._callbacks||(this._callbacks= +{});e=a.shift();)f=(j=d[e])?j.tail:{},f.next=g={},f.context=c,f.callback=b,d[e]={tail:g,next:j?j.next:f};return this},off:function(a,b,c){var d,e,h,g,j,q;if(e=this._callbacks){if(!a&&!b&&!c)return delete this._callbacks,this;for(a=a?a.split(p):f.keys(e);d=a.shift();)if(h=e[d],delete e[d],h&&(b||c))for(g=h.tail;(h=h.next)!==g;)if(j=h.callback,q=h.context,b&&j!==b||c&&q!==c)this.on(d,j,q);return this}},trigger:function(a){var b,c,d,e,f,g;if(!(d=this._callbacks))return this;f=d.all;a=a.split(p);for(g= +z.call(arguments,1);b=a.shift();){if(c=d[b])for(e=c.tail;(c=c.next)!==e;)c.callback.apply(c.context||this,g);if(c=f){e=c.tail;for(b=[b].concat(g);(c=c.next)!==e;)c.callback.apply(c.context||this,b)}}return this}};k.bind=k.on;k.unbind=k.off;var o=g.Model=function(a,b){var c;a||(a={});b&&b.parse&&(a=this.parse(a));if(c=n(this,"defaults"))a=f.extend({},c,a);b&&b.collection&&(this.collection=b.collection);this.attributes={};this._escapedAttributes={};this.cid=f.uniqueId("c");this.changed={};this._silent= +{};this._pending={};this.set(a,{silent:!0});this.changed={};this._silent={};this._pending={};this._previousAttributes=f.clone(this.attributes);this.initialize.apply(this,arguments)};f.extend(o.prototype,k,{changed:null,_silent:null,_pending:null,idAttribute:"id",initialize:function(){},toJSON:function(){return f.clone(this.attributes)},get:function(a){return this.attributes[a]},escape:function(a){var b;if(b=this._escapedAttributes[a])return b;b=this.get(a);return this._escapedAttributes[a]=f.escape(null== +b?"":""+b)},has:function(a){return null!=this.get(a)},set:function(a,b,c){var d,e;f.isObject(a)||null==a?(d=a,c=b):(d={},d[a]=b);c||(c={});if(!d)return this;d instanceof o&&(d=d.attributes);if(c.unset)for(e in d)d[e]=void 0;if(!this._validate(d,c))return!1;this.idAttribute in d&&(this.id=d[this.idAttribute]);var b=c.changes={},h=this.attributes,g=this._escapedAttributes,j=this._previousAttributes||{};for(e in d){a=d[e];if(!f.isEqual(h[e],a)||c.unset&&f.has(h,e))delete g[e],(c.silent?this._silent: +b)[e]=!0;c.unset?delete h[e]:h[e]=a;!f.isEqual(j[e],a)||f.has(h,e)!=f.has(j,e)?(this.changed[e]=a,c.silent||(this._pending[e]=!0)):(delete this.changed[e],delete this._pending[e])}c.silent||this.change(c);return this},unset:function(a,b){(b||(b={})).unset=!0;return this.set(a,null,b)},clear:function(a){(a||(a={})).unset=!0;return this.set(f.clone(this.attributes),a)},fetch:function(a){var a=a?f.clone(a):{},b=this,c=a.success;a.success=function(d,e,f){if(!b.set(b.parse(d,f),a))return!1;c&&c(b,d)}; +a.error=g.wrapError(a.error,b,a);return(this.sync||g.sync).call(this,"read",this,a)},save:function(a,b,c){var d,e;f.isObject(a)||null==a?(d=a,c=b):(d={},d[a]=b);c=c?f.clone(c):{};if(c.wait){if(!this._validate(d,c))return!1;e=f.clone(this.attributes)}a=f.extend({},c,{silent:!0});if(d&&!this.set(d,c.wait?a:c))return!1;var h=this,i=c.success;c.success=function(a,b,e){b=h.parse(a,e);if(c.wait){delete c.wait;b=f.extend(d||{},b)}if(!h.set(b,c))return false;i?i(h,a):h.trigger("sync",h,a,c)};c.error=g.wrapError(c.error, +h,c);b=this.isNew()?"create":"update";b=(this.sync||g.sync).call(this,b,this,c);c.wait&&this.set(e,a);return b},destroy:function(a){var a=a?f.clone(a):{},b=this,c=a.success,d=function(){b.trigger("destroy",b,b.collection,a)};if(this.isNew())return d(),!1;a.success=function(e){a.wait&&d();c?c(b,e):b.trigger("sync",b,e,a)};a.error=g.wrapError(a.error,b,a);var e=(this.sync||g.sync).call(this,"delete",this,a);a.wait||d();return e},url:function(){var a=n(this,"urlRoot")||n(this.collection,"url")||t(); +return this.isNew()?a:a+("/"==a.charAt(a.length-1)?"":"/")+encodeURIComponent(this.id)},parse:function(a){return a},clone:function(){return new this.constructor(this.attributes)},isNew:function(){return null==this.id},change:function(a){a||(a={});var b=this._changing;this._changing=!0;for(var c in this._silent)this._pending[c]=!0;var d=f.extend({},a.changes,this._silent);this._silent={};for(c in d)this.trigger("change:"+c,this,this.get(c),a);if(b)return this;for(;!f.isEmpty(this._pending);){this._pending= +{};this.trigger("change",this,a);for(c in this.changed)!this._pending[c]&&!this._silent[c]&&delete this.changed[c];this._previousAttributes=f.clone(this.attributes)}this._changing=!1;return this},hasChanged:function(a){return!arguments.length?!f.isEmpty(this.changed):f.has(this.changed,a)},changedAttributes:function(a){if(!a)return this.hasChanged()?f.clone(this.changed):!1;var b,c=!1,d=this._previousAttributes,e;for(e in a)if(!f.isEqual(d[e],b=a[e]))(c||(c={}))[e]=b;return c},previous:function(a){return!arguments.length|| +!this._previousAttributes?null:this._previousAttributes[a]},previousAttributes:function(){return f.clone(this._previousAttributes)},isValid:function(){return!this.validate(this.attributes)},_validate:function(a,b){if(b.silent||!this.validate)return!0;var a=f.extend({},this.attributes,a),c=this.validate(a,b);if(!c)return!0;b&&b.error?b.error(this,c,b):this.trigger("error",this,c,b);return!1}});var r=g.Collection=function(a,b){b||(b={});b.model&&(this.model=b.model);b.comparator&&(this.comparator=b.comparator); +this._reset();this.initialize.apply(this,arguments);a&&this.reset(a,{silent:!0,parse:b.parse})};f.extend(r.prototype,k,{model:o,initialize:function(){},toJSON:function(a){return this.map(function(b){return b.toJSON(a)})},add:function(a,b){var c,d,e,g,i,j={},k={},l=[];b||(b={});a=f.isArray(a)?a.slice():[a];c=0;for(d=a.length;c=b))this.iframe=i('
'; print ''; - print ''; + print ''; if (! empty($mysoc->logo_mini)) { print ''.img_delete($langs->trans("Delete")).''; @@ -756,7 +756,7 @@ print ''; @@ -1860,23 +1863,9 @@ // Delivery date $langs->load('deliveries'); print ''; print ''; diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 00eca8b661a5a..ad11e08c4ca72 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -74,7 +74,7 @@ public function __construct($db) * Output key field for an editable field * * @param string $text Text of label or key to translate - * @param string $htmlname Name of select field + * @param string $htmlname Name of select field ('edit' prefix will be added) * @param string $preselected Name of Value to show/edit (not used in this function) * @param object $object Object * @param boolean $perm Permission to allow button to edit parameter @@ -167,11 +167,11 @@ function editfieldval($text, $htmlname, $value, $object, $perm, $typeofdata='str } else if ($typeofdata == 'day' || $typeofdata == 'datepicker') { - $ret.=$this->form_date($_SERVER['PHP_SELF'].'?id='.$object->id,$value,$htmlname); + $ret.=$this->select_date($value,$htmlname,0,0,1,'form'.$htmlname,1,0,1); } - else if ($typeofdata == 'datehourpicker') + else if ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker') { - $ret.=$this->form_date($_SERVER['PHP_SELF'].'?id='.$object->id,$value,$htmlname,1,1); + $ret.=$this->select_date($value,$htmlname,1,1,1,'form'.$htmlname,1,0,1); } else if (preg_match('/^select;/',$typeofdata)) { @@ -191,14 +191,14 @@ function editfieldval($text, $htmlname, $value, $object, $perm, $typeofdata='str $ret.=$doleditor->Create(1); } $ret.=''; - if ($typeofdata != 'day' && $typeofdata != 'datepicker' && $typeofdata != 'datehourpicker') - { + //if ($typeofdata != 'day' && $typeofdata != 'dayhour' && $typeofdata != 'datepicker' && $typeofdata != 'datehourpicker') + //{ $ret.=''; - } + //} $ret.='
'; print $mysoc->logo; - print ''; + print ''; // On propose la generation de la vignette si elle n'existe pas if (!is_file($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini) && preg_match('/(\.jpg|\.jpeg|\.png)$/i',$mysoc->logo)) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index c4ef27645d473..8fe870f8cdca0 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -64,6 +64,7 @@ $ref = GETPOST('ref', 'alpha'); $socid = GETPOST('socid', 'int'); $action = GETPOST('action', 'alpha'); +$cancel = GETPOST('cancel', 'alpha'); $origin = GETPOST('origin', 'alpha'); $originid = GETPOST('originid', 'int'); $confirm = GETPOST('confirm', 'alpha'); @@ -113,6 +114,8 @@ if (empty($reshook)) { + if ($cancel) $action = ''; + include DOL_DOCUMENT_ROOT . '/core/actions_setnotes.inc.php'; // Must be include, not includ_once // Action clone object @@ -232,7 +235,7 @@ } else if ($action == 'setdate_livraison' && $user->rights->propal->creer) { - $result = $object->set_date_livraison($user, dol_mktime(12, 0, 0, $_POST['liv_month'], $_POST['liv_day'], $_POST['liv_year'])); + $result = $object->set_date_livraison($user, dol_mktime(12, 0, 0, $_POST['date_livraisonmonth'], $_POST['date_livraisonday'], $_POST['date_livraisonyear'])); if ($result < 0) dol_print_error($db, $object->error); } @@ -256,7 +259,7 @@ $object->fetch_thirdparty(); $datep = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear')); - $date_delivery = dol_mktime(12, 0, 0, GETPOST('liv_month'), GETPOST('liv_day'), GETPOST('liv_year')); + $date_delivery = dol_mktime(12, 0, 0, GETPOST('date_livraisonmonth'), GETPOST('date_livraisonday'), GETPOST('date_livraisonyear')); $duration = GETPOST('duree_validite'); if (empty($datep)) { @@ -1437,9 +1440,9 @@ $syear = date("Y", $tmpdte); $smonth = date("m", $tmpdte); $sday = date("d", $tmpdte); - $form->select_date($syear."-".$smonth."-".$sday, 'liv_', '', '', '', "addprop"); + $form->select_date($syear."-".$smonth."-".$sday, 'date_livraison', '', '', '', "addprop"); } else { - $form->select_date(-1, 'liv_', '', '', '', "addprop", 1, 1); + $form->select_date(-1, 'date_livraison', '', '', '', "addprop", 1, 1); } print '
'; - print ''; - if ($action != 'editdate_livraison' && ! empty($object->brouillon)) - print ''; - print '
'; - print $langs->trans('DeliveryDate'); - print 'id . '">' . img_edit($langs->transnoentitiesnoconv('SetDeliveryDate'), 1) . '
'; + print $form->editfieldkey($langs->trans('DeliveryDate'), 'date_livraison', $object->date_livraison, $object, $user->rights->propal->creer); print '		'; - if ($action == 'editdate_livraison') { - print ''; - print ''; - print ''; - $form->select_date($object->date_livraison, 'liv_', '', '', '', "editdate_livraison"); - print ''; - print ''; - } else { - print dol_print_date($object->date_livraison, 'daytext'); - } + print $form->editfieldval($langs->trans('DeliveryDate'), 'date_livraison', $object->date_livraison, $object, $user->rights->propal->creer, 'day'); print '
'; $ret.=''; if (preg_match('/ckeditor|textarea/',$typeofdata)) $ret.='
'."\n"; $ret.=''; $ret.='
'."\n"; $ret.=''."\n"; } @@ -208,7 +208,7 @@ function editfieldval($text, $htmlname, $value, $object, $perm, $typeofdata='str elseif ($typeofdata == 'amount') $ret.=($value != '' ? price($value,'',$langs,0,-1,-1,$conf->currency) : ''); elseif (preg_match('/^text/',$typeofdata) || preg_match('/^note/',$typeofdata)) $ret.=dol_htmlentitiesbr($value); elseif ($typeofdata == 'day' || $typeofdata == 'datepicker') $ret.=dol_print_date($value,'day'); - elseif ($typeofdata == 'datehourpicker') $ret.=dol_print_date($value,'dayhour'); + elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker') $ret.=dol_print_date($value,'dayhour'); else if (preg_match('/^select;/',$typeofdata)) { $arraydata=explode(',',preg_replace('/^select;/','',$typeofdata)); @@ -1332,7 +1332,7 @@ function select_dolusers($selected='', $htmlname='userid', $show_empty=0, $exclu $nodatarole=($comboenhancement?' data-role="none"':''); } - $out.= ''; if ($show_empty) $out.= ''."\n"; if ($show_every) $out.= ''."\n"; @@ -3475,32 +3475,32 @@ function formInputReason($page, $selected='', $htmlname='demandreason', $addempt * @return void * @see select_date */ - function form_date($page, $selected, $htmlname, $displayhour=0, $displaymin=0) + function form_date($page, $selected, $htmlname, $displayhour=0, $displaymin=0, $noouput=0) { global $langs; + $ret=''; + if ($htmlname != "none") { - print '
'; - print ''; - print ''; - print ''; - print ''; - print ''; - print '
'; - print $this->select_date($selected,$htmlname,$displayhour,$displaymin,1,'form'.$htmlname); - print '
'; + $ret.='
'; + $ret.=''; + $ret.=''; + $ret.=''; + $ret.=''; + $ret.=''; + $ret.='
'; + $ret.=$this->select_date($selected,$htmlname,$displayhour,$displaymin,1,'form'.$htmlname); + $ret.='
'; } else { - if ($selected) - { - $this->load_cache_types_paiements(); - print $this->cache_types_paiements[$selected]['label']; - } else { - print " "; - } + if ($displayhour) $ret.=dol_print_date($selected,'dayhour'); + else $ret.=dol_print_date($selected,'day'); } + + if (empty($noouput)) print $ret; + return $ret; } @@ -4776,7 +4776,7 @@ function select_dolgroups($selected='', $htmlname='groupid', $show_empty=0, $exc $nodatarole=($comboenhancement?' data-role="none"':''); } - $out.= ''; $num = $this->db->num_rows($resql); $i = 0; diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php index 38e783765f9a1..8013896d7bd78 100644 --- a/htdocs/core/lib/agenda.lib.php +++ b/htdocs/core/lib/agenda.lib.php @@ -64,16 +64,16 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh print '
'; if (! empty($conf->browser->phone)) print '
'; - else print ''; - print ''; - print ''; + print ''; + print ''; + $prevsits_total_amount = 0; + foreach ($prevsits as $situation) { + $prevsits_total_amount += $situation->total_ht; + } + $prevsits_total_amount += $object->total_ht; - print ''; print ''; + + // Previous situation(s) deduction(s) + for ($i = 0; $i < count($prevsits); $i++) { + print ''; + + print ''; + print ''; + } } } - } // Amount print ''; - print ''; - print ''; + print ''; + print ''; print ''; // Amount Local Taxes if (($mysoc->localtax1_assuj == "1" && $mysoc->useLocalTax(1)) || $object->total_localtax1 != 0) // Localtax1 { print ''; - print ''; + print ''; } if (($mysoc->localtax2_assuj == "1" && $mysoc->useLocalTax(2)) || $object->total_localtax2 != 0) // Localtax2 { print ''; - print ''; + print ''; } // Revenue stamp @@ -3367,7 +3368,7 @@ if ($action != 'editrevenuestamp' && ! empty($object->brouillon) && $user->rights->facture->creer) print ''; print '
'; + else print ''; print '
'; print ''; if ($canedit) { print ''; - print ''; - print ''; print ''; - print ''; } @@ -100,7 +100,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh if (! empty($conf->societe->enabled) && $user->rights->societe->lire) { print ''; - print ''; - print ''; + print ''; print "'; $label = ($langs->trans("PaymentType" . $objp->payment_code) != ("PaymentType" . $objp->payment_code)) ? $langs->trans("PaymentType" . $objp->payment_code) : $objp->payment_label; print ''; - if (! empty($conf->banque->enabled)) { + if (! empty($conf->banque->enabled)) + { $bankaccountstatic->id = $objp->baid; $bankaccountstatic->ref = $objp->ref; $bankaccountstatic->label = $objp->ref; @@ -3082,7 +3077,8 @@ dol_print_error($db); } - if ($object->type != Facture::TYPE_CREDIT_NOTE) { + if ($object->type != Facture::TYPE_CREDIT_NOTE) + { // Total already paid print ''; print ''; print ''; - } else // Credit note + } + else // Credit note { // Total already paid back print ''; print '
'; + print ''; print $langs->trans("ActionsToDoBy").'   '; - print ''; + print ''; print $form->select_dolusers($filtert, 'usertodo', 1, '', ! $canedit); if (empty($conf->dol_optimize_smallscreen)) print '   '.$langs->trans("or") . ' '.$langs->trans("Group").'   '; print $form->select_dolgroups($usergroupid, 'usergroup', 1, '', ! $canedit); @@ -83,16 +83,16 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh $formactions=new FormActions($db); print '
'; + print ''; print $langs->trans("Type"); - print '  '; + print '  '; print $formactions->select_type_actions($actioncode, "actioncode", '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : 0)); print '
'; + print ''; print $langs->trans("Status"); - print '  '; + print '  '; $formactions->form_select_status_action('formaction',$status,1,'status',1,2); print '
'; + print ''; print $langs->trans("ThirdParty").'   '; print ''; print $form->select_thirdparty($socid, 'socid'); @@ -124,7 +124,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh { // Filter on hours print '
'.$langs->trans("WorkingTimeRange").''.$langs->trans("WorkingTimeRange").'"; print ''; if (empty($conf->dol_use_jmobile)) print ' - '; diff --git a/htdocs/langs/ar_SA/categories.lang b/htdocs/langs/ar_SA/categories.lang index 967a890615706..faf94a352fa51 100644 --- a/htdocs/langs/ar_SA/categories.lang +++ b/htdocs/langs/ar_SA/categories.lang @@ -51,7 +51,7 @@ 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 +CompanyHasNoCategory=This thirdparty 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 @@ -94,7 +94,7 @@ 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 +CatContactList=List of contact tags/categories CatSupLinks=Links between suppliers and tags/categories CatCusLinks=Links between customers/prospects and tags/categories CatProdLinks=Links between products/services and tags/categories diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang index a73526ca08abe..9c3a956727eed 100644 --- a/htdocs/langs/en_US/categories.lang +++ b/htdocs/langs/en_US/categories.lang @@ -51,7 +51,7 @@ MemberIsInCategories=This member is linked to following members tags/categories ContactIsInCategories=This contact is linked 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 +CompanyHasNoCategory=This thirdparty 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=Add to tag/category @@ -94,7 +94,7 @@ 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 +CatContactList=List of contact tags/categories CatSupLinks=Links between suppliers and tags/categories CatCusLinks=Links between customers/prospects and tags/categories CatProdLinks=Links between products/services and tags/categories diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index d5a4b0b372280..496aeef731fb0 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -97,7 +97,7 @@ $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 +$colorbacktabcard1='255,255,255'; // card $colorbacktabcard2=($colred-15).','.($colgreen-15).','.($colblue-15); $colorbacktabactive=($colred-15).','.($colgreen-15).','.($colblue-15); $colorbacklineimpair1='255,255,255'; // line impair @@ -106,7 +106,7 @@ $colorbacklinepair1=(244+round($isred/3)).','.(244+round($isgreen/3)).','.(244+round($isblue/3)); // line pair $colorbacklinepair2=(250+round($isred/3)).','.(250+round($isgreen/3)).','.(250+round($isblue/3)); // line pair $colorbacklinepairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)); // line pair -$colorbackbody='#f9f9f9'; +$colorbackbody='#f3f3f3'; $colortext='40,40,40'; $fontsize='12'; $fontsizesmaller='11'; @@ -121,10 +121,10 @@ $conf->global->THEME_ELDY_VERMENU_BACK2='240,240,240'; $conf->global->THEME_ELDY_BACKTITLE1='140,160,185'; // title of arrays $conf->global->THEME_ELDY_BACKTITLE2='230,230,230'; + $conf->global->THEME_ELDY_BACKTABCARD1='255,255,255'; $conf->global->THEME_ELDY_BACKTABCARD2='210,210,210'; // card - $conf->global->THEME_ELDY_BACKTABCARD1='234,234,234'; $conf->global->THEME_ELDY_BACKTABACTIVE='234,234,234'; - $conf->global->THEME_ELDY_BACKBODY='#f9f9f9;'; + $conf->global->THEME_ELDY_BACKBODY='#f3f3f3;'; $conf->global->THEME_ELDY_LINEIMPAIR1='255,255,255'; $conf->global->THEME_ELDY_LINEIMPAIR2='255,255,255'; $conf->global->THEME_ELDY_LINEIMPAIRHOVER='238,246,252'; @@ -168,10 +168,6 @@ $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] : ''); @@ -188,7 +184,7 @@ $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='444'; } +else { $colortextbacktab='111'; } $usecss3=true; @@ -552,6 +548,7 @@ #pictotitle { margin-right: 8px; + margin-bottom: 4px; } @@ -1010,7 +1007,7 @@ } -.menu_contenu { padding-top: 1px; } +.menu_contenu { padding-top: 3px; padding-top: 2px; } #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; } @@ -1407,11 +1404,12 @@ -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; + border-right: 1px solid #AAA; + border-bottom: 1px solid #AAA; + border-left: 1px solid #AAA; + border-top: 1px solid #BBB; width: auto; +/* 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%); @@ -1421,6 +1419,8 @@ background: rgb(); +*/ + background: rgb(); -moz-box-shadow: 3px 3px 4px #DDD; -webkit-box-shadow: 3px 3px 4px #DDD; @@ -1452,7 +1452,6 @@ 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; @@ -1461,15 +1460,19 @@ -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 #BBB; border-left: 1px solid #BBB; border-top: 1px solid #CCC; - +*/ +/* background-image: -o-linear-gradient(bottom, rgb() 35%, rgb() 100%); background-image: -moz-linear-gradient(bottom, rgb() 35%, rgb() 100%); @@ -1478,28 +1481,40 @@ background-image: linear-gradient(bottom, rgb() 35%, rgb() 100%); background-image: none !important; +*/ + background: rgb(); + + border-right: 1px solid #BBB; + border-left: 1px solid #BBB; + border-top: 1px solid #CCC; + margin: 0 0.2em 0 0.2em !important; + color: #444; } .tabactive { +/* -/* 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: #; + color: # !important; + background: rgb() !important; + -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); + margin-bottom: 0 0.2em 0 0.2em !important; + border-right: 1px solid #AAA !important; + border-left: 1px solid #AAA !important; + border-top: 1px solid #BBB !important; } 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: ; @@ -1693,6 +1708,10 @@ margin: 0px !important; padding: 0px !important; } +tr.nocellnopadd td.nobordernopadding, tr.nocellnopadd td.nocellnopadd +{ + border: 0px; +} .notopnoleft { border-collapse: collapse; @@ -1720,6 +1739,13 @@ padding: 1px 2px 1px 3px; /* t r b l */ } +.border tbody tr, .border tbody tr td { + height: 20px; +} +div.tabBar table.border tr { + height: 20px; +} + table.border td, div.border div div.tagtd { padding: 2px 2px 2px 2px; border: 1px solid #D0D0D0; @@ -1753,11 +1779,6 @@ 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: #CCC; border-left-style: solid; @@ -1798,11 +1819,22 @@ border: 0px !important; padding: 0px 0px !important; } -table.nobordernopadding td { - border: 0px !important; - padding: 0px 0px !important; +table.nobordernopadding tr td { + border: 0px; + padding: 0 3px 0 0 !important; +} +table.border tr td table.nobordernopadding tr td { + padding-top: 0px; + padding-bottom: 0px; +} +td.borderright { + border: none; /* to erase value for table.nobordernopadding td */ + border-right-width: 1px !important; + border-right-color: #BBB !important; + border-right-style: solid !important; } + /* For lists */ table.liste { @@ -1921,10 +1953,13 @@ background-color: #f9f9f9; } -tr.pair td, tr.impair td { +tr.pair td, tr.impair td, form.impair div.tagtd, form.pair div.tagtd { padding: 5px 2px; border-bottom: 1px solid #ddd; } +tr.pair td .nobordernopadding tr td, tr.impair td .nobordernopadding tr td { + border-bottom: 0px !important; +} div.liste_titre .tagtd { vertical-align: middle; } @@ -1952,11 +1987,14 @@ border-bottom: 1px solid #FDFFFF; text-align: ; } +tr.liste_titre th, th.liste_titre, form.liste_titre div, div.liste_titre +{ + border-bottom: 1px solid #FDFFFF; +} 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; } From 025d8c2a71ae7fe310d017bc5dffa7723a60e294 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 25 Apr 2015 23:22:44 +0200 Subject: [PATCH 076/264] Clean script migration --- htdocs/install/mysql/migration/3.7.0-3.8.0.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 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 a923d1ad09bee..9ce5af1a8eb07 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 @@ -22,6 +22,9 @@ -- IVORY COST (id country=21) insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values (211, 21, '0','0',0,0,0,0,'IVA Rate 0',1); insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values (212, 21, '18','0',7.5,2,0,0,'IVA standard rate',1); +-- Taiwan VAT Rates +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 2131, 213, '5', '0', 'VAT 5%', 1); + -- Loan create table llx_loan @@ -125,9 +128,6 @@ CREATE TABLE llx_printing ALTER TABLE llx_product_fournisseur_price ADD COLUMN fk_price_expression integer DEFAULT NULL; --- Taiwan VAT Rates -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 2131, 213, '5', '0', 'VAT 5%', 1); - -- Add situation invoices ALTER TABLE llx_facture ADD COLUMN situation_cycle_ref smallint; ALTER TABLE llx_facture ADD COLUMN situation_counter smallint; From 24aea45da740c87ac098ac0fa058be5a06e6f967 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 26 Apr 2015 16:14:03 +0200 Subject: [PATCH 077/264] Fix also xml file of CRLF --- dev/fixdosfiles.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev/fixdosfiles.sh b/dev/fixdosfiles.sh index bab5c37b68d82..75dde68dcaea3 100755 --- a/dev/fixdosfiles.sh +++ b/dev/fixdosfiles.sh @@ -17,14 +17,14 @@ fi # To detec if [ "x$1" = "xlist" ] then - find . \( -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.txt" \) -exec file "{}" + | grep CRLF -# find . \( -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.txt" \) -exec file "{}" + | grep -v 'htdocs\/includes' | grep CRLF + find . \( -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.txt" -o -iname "*.xml" \) -exec file "{}" + | grep CRLF +# find . \( -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.txt" -o -iname "*.xml" \) -exec file "{}" + | grep -v 'htdocs\/includes' | grep CRLF fi # To convert if [ "x$1" = "xfix" ] then - for fic in `find . \( -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.txt" \) -exec file "{}" + | grep CRLF | awk -F':' '{ print $1 }' ` + for fic in `find . \( -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.txt" -o -iname "*.xml"\) -exec file "{}" + | grep CRLF | awk -F':' '{ print $1 }' ` do echo "Fix file $fic" dos2unix $fic From 7b9d9c4d0a13bc21c2a236f74b5daf7374631fba Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 26 Apr 2015 16:25:02 +0200 Subject: [PATCH 078/264] Fix lang --- htdocs/langs/en_US/admin.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index be2e2795a0317..a529bdaec945c 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -386,7 +386,7 @@ ExtrafieldParamHelpradio=Parameters list have to be like key,value

for e 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 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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (vat is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) +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 (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (localtax is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
6 : local tax apply on services including vat (localtax is calculated on amount + tax) SMS=SMS LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s RefreshPhoneLink=Refresh link From 4235d74aac076ba01e95fed95d8f66674ec2b5b0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 26 Apr 2015 16:45:24 +0200 Subject: [PATCH 079/264] Fix tests for ES --- htdocs/core/lib/price.lib.php | 2 +- test/phpunit/PricesTest.php | 30 ++++++++++++++++++++---------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/htdocs/core/lib/price.lib.php b/htdocs/core/lib/price.lib.php index e6fa9682703e9..528abfcd6a536 100644 --- a/htdocs/core/lib/price.lib.php +++ b/htdocs/core/lib/price.lib.php @@ -115,7 +115,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt $sql.= " FROM ".MAIN_DB_PREFIX."c_tva as cv"; $sql.= " WHERE cv.taux = ".$txtva; $sql.= " AND cv.fk_pays = ".$countryid; - dol_syslog("calcul_price_total search vat information", LOG_DEBUG); + dol_syslog("calcul_price_total search vat information using old deprecated method", LOG_WARNING); $resql = $db->query($sql); if ($resql) { diff --git a/test/phpunit/PricesTest.php b/test/phpunit/PricesTest.php index 24686d51e2e1b..b8a942d5899fd 100755 --- a/test/phpunit/PricesTest.php +++ b/test/phpunit/PricesTest.php @@ -197,16 +197,16 @@ public function testCalculPriceTotal() // -------------------------------------------------------- - // 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 19% localtax2 type 5 (method we provide value) + // 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 19% localtax2 type 5 (method we provide value), we provide a service and not a product $mysoc->country_code='ES'; $mysoc->country_id=4; $mysoc->localtax1_assuj=0; $mysoc->localtax2_assuj=1; - $result2=calcul_price_total(10, 10, 0, 10, 0, -19, 0, 'HT', 0, 0); + $result2=calcul_price_total(10, 10, 0, 10, 0, -19, 0, 'HT', 0, 1); // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) - $this->assertEquals(array(100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19, 0, -1.90, 0, 0, -19),$result2,'Test5 ES'); + $this->assertEquals(array(100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19, 0, -1.90, 0, 0, -19),$result2,'Test5 ES for service'); - // 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 21% localtax2 type 5 (other method autodetect) + // 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 21% localtax2 type 5 (other method autodetect), we provide a service and not a product $mysoc->country_code='ES'; $mysoc->country_id=4; $mysoc->localtax1_assuj=0; @@ -214,11 +214,21 @@ public function testCalculPriceTotal() $result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 0); print __METHOD__." result2=".join(', ',$result2)."\n"; // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) - $this->assertEquals(array(100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19, 0, -1.90, 0, 0, -19),$result2,'Test6 ES'); + $this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0),$result2,'Test6 ES for product'); + + // 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 21% localtax2 type 5 (other method autodetect), we provide a product and not a service + $mysoc->country_code='ES'; + $mysoc->country_id=4; + $mysoc->localtax1_assuj=0; + $mysoc->localtax2_assuj=1; + $result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 1); + print __METHOD__." result2=".join(', ',$result2)."\n"; + // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) + $this->assertEquals(array(100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19, 0, -1.90, 0, 0, -19),$result2,'Test6 ES for service'); // -------------------------------------------------------- - // Credit Note: 10 * -10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 19% localtax2 type 5 (method we provide value) + // Credit Note: 10 * -10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 19% localtax2 type 5 (method we provide value), we provide a product and not a service $mysoc->country_code='ES'; $mysoc->country_id=4; $mysoc->localtax1_assuj=0; @@ -226,16 +236,16 @@ public function testCalculPriceTotal() $result2=calcul_price_total(10, -10, 0, 10, 0, 19, 0, 'HT', 0, 0); print __METHOD__." result2=".join(', ',$result2)."\n"; // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) - $this->assertEquals(array(-100, -10, -91, -10, -1, -9.1, -100, -10,- 91, 0, 19, 0, 1.90, 0, 0, 19),$result2,'Test7 ES'); + $this->assertEquals(array(-100, -10, -110, -10, -1, -11, -100, -10, -110, 0, 0, 0, 0, 0, 0, 0),$result2,'Test7 ES for product'); - // Credit Note: 10 * -10 HT - 0% discount with 10% vat and 1.4% localtax1 type 3, 0% localtax2 type 5 (other method autodetect) + // Credit Note: 10 * -10 HT - 0% discount with 10% vat and 1.4% localtax1 type 3, 0% localtax2 type 5 (other method autodetect), we provide a service and not a product $mysoc->country_code='ES'; $mysoc->country_id=4; $mysoc->localtax1_assuj=0; $mysoc->localtax2_assuj=1; - $result2=calcul_price_total(10, -10, 0, 10, -1, -1, 0, 'HT', 0, 0); + $result2=calcul_price_total(10, -10, 0, 10, -1, -1, 0, 'HT', 0, 1); print __METHOD__." result2=".join(', ',$result2)."\n"; - $this->assertEquals(array(-100, -10, -91, -10, -1, -9.1, -100, -10,- 91, 0, 19, 0, 1.90, 0, 0, 19),$result2,'Test8 ES'); + $this->assertEquals(array(-100, -10, -91, -10, -1, -9.1, -100, -10, -91, 0, 19, 0, 1.90, 0, 0, 19),$result2,'Test8 ES for service'); /* From 1abcd5f4fe934a852457bd573fb22a44bb4b1e72 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 26 Apr 2015 16:58:00 +0200 Subject: [PATCH 080/264] Fix test for vat calculation --- test/phpunit/PricesTest.php | 147 +++++++++++++++++++++++++++--------- 1 file changed, 110 insertions(+), 37 deletions(-) diff --git a/test/phpunit/PricesTest.php b/test/phpunit/PricesTest.php index 5f0b503d9119c..b8a942d5899fd 100755 --- a/test/phpunit/PricesTest.php +++ b/test/phpunit/PricesTest.php @@ -1,20 +1,21 @@ +/* Copyright (C) 2010 Laurent Destailleur + * 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 + * 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. * -* 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/phpunit/PricesTest.php @@ -81,6 +82,8 @@ public static function setUpBeforeClass() print __METHOD__."\n"; } + + // tear down after class public static function tearDownAfterClass() { global $conf,$user,$langs,$db; @@ -133,51 +136,121 @@ public function testCalculPriceTotal() global $mysoc; $mysoc=new Societe($db); + /* + * Country France + */ + // qty=1, unit_price=1.24, discount_line=0, vat_rate=10, price_base_type='HT' (method we provide value) $mysoc->country_code='FR'; $mysoc->country_id=1; $result1=calcul_price_total(1, 1.24, 0, 10, 0, 0, 0, 'HT', 0, 0); print __METHOD__." result1=".join(', ',$result1)."\n"; // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) - $this->assertEquals(array(1.24, 0.12, 1.36, 1.24, 0.124, 1.364, 1.24, 0.12, 1.36, 0, 0, 0, 0, 0, 0, 0),$result1,'Test1'); + $this->assertEquals(array(1.24, 0.12, 1.36, 1.24, 0.124, 1.364, 1.24, 0.12, 1.36, 0, 0, 0, 0, 0, 0, 0),$result1,'Test1 FR'); + + + /* + * Country Spain + */ + + // 10 * 10 HT - 0% discount with 10% vat, seller not using localtax1, not localtax2 (method we provide value) + $mysoc->country_code='ES'; + $mysoc->country_id=4; + $mysoc->localtax1_assuj=0; + $mysoc->localtax2_assuj=0; + $result2=calcul_price_total(10, 10, 0, 10, 0, 0, 0, 'HT', 0, 0); // 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1, 0% localtax2 + print __METHOD__." result2=".join(', ',$result2)."\n"; + // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) + $this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0),$result2,'Test1 ES'); - // 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1 type 1, 0% localtax2 type 0 (method we provide value) + // 10 * 10 HT - 0% discount with 10% vat, seller not using localtax1, not localtax2 (other method autodetect) + $mysoc->country_code='ES'; + $mysoc->country_id=4; + $mysoc->localtax1_assuj=0; + $mysoc->localtax2_assuj=0; + $result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 0); // 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1, 0% localtax2 + print __METHOD__." result2=".join(', ',$result2)."\n"; + // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) + $this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0),$result2,'Test2 ES'); + + // -------------------------------------------------------- + + // 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1 type 3, 0% localtax2 type 5 (method we provide value) $mysoc->country_code='ES'; $mysoc->country_id=4; $mysoc->localtax1_assuj=1; $mysoc->localtax2_assuj=0; $result2=calcul_price_total(10, 10, 0, 10, 1.4, 0, 0, 'HT', 0, 0); print __METHOD__." result2=".join(', ',$result2)."\n"; - $this->assertEquals(array(100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0, 0.14, 0, 0, 1.4, 0),$result2,'Test2'); + // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) + $this->assertEquals(array(100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0, 0.14, 0, 0, 1.4, 0),$result2,'Test3 ES'); - // 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1 type 1, 0% localtax2 type 0 (other method autodetect) + // 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1 type 3, 0% localtax2 type 5 (other method autodetect) $mysoc->country_code='ES'; $mysoc->country_id=4; $mysoc->localtax1_assuj=1; $mysoc->localtax2_assuj=0; $result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 0); print __METHOD__." result2=".join(', ',$result2)."\n"; - $this->assertEquals(array(100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0, 0.14, 0, 0, 1.4, 0),$result2,'Test3 ES'); + // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) + $this->assertEquals(array(100, 10, 111.4, 10, 1, 11.14, 100, 10, 111.4, 1.4, 0, 0.14, 0, 0, 1.4, 0),$result2,'Test4 ES'); + + // -------------------------------------------------------- - // 10 * 10 HT - 0% discount with 10% vat, seller not using localtax1, nor localtax2 (method we provide value) + // 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 19% localtax2 type 5 (method we provide value), we provide a service and not a product $mysoc->country_code='ES'; $mysoc->country_id=4; $mysoc->localtax1_assuj=0; - $mysoc->localtax2_assuj=0; - $result3=calcul_price_total(10, 10, 0, 10, 0, 0, 0, 'HT', 0, 0); // 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1, 0% localtax2 - print __METHOD__." result3=".join(', ',$result3)."\n"; - // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) - $this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0),$result3,'Test4'); + $mysoc->localtax2_assuj=1; + $result2=calcul_price_total(10, 10, 0, 10, 0, -19, 0, 'HT', 0, 1); + // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) + $this->assertEquals(array(100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19, 0, -1.90, 0, 0, -19),$result2,'Test5 ES for service'); - // 10 * 10 HT - 0% discount with 10% vat, seller not using localtax1, nor localtax2 (other method autodetect) + // 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 21% localtax2 type 5 (other method autodetect), we provide a service and not a product $mysoc->country_code='ES'; $mysoc->country_id=4; $mysoc->localtax1_assuj=0; - $mysoc->localtax2_assuj=0; - $result3=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 0); // 10 * 10 HT - 0% discount with 10% vat and 1.4% localtax1, 0% localtax2 - print __METHOD__." result3=".join(', ',$result3)."\n"; - // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) - $this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0),$result3,'Test5'); + $mysoc->localtax2_assuj=1; + $result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 0); + print __METHOD__." result2=".join(', ',$result2)."\n"; + // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) + $this->assertEquals(array(100, 10, 110, 10, 1, 11, 100, 10, 110, 0, 0, 0, 0, 0, 0, 0),$result2,'Test6 ES for product'); + + // 10 * 10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 21% localtax2 type 5 (other method autodetect), we provide a product and not a service + $mysoc->country_code='ES'; + $mysoc->country_id=4; + $mysoc->localtax1_assuj=0; + $mysoc->localtax2_assuj=1; + $result2=calcul_price_total(10, 10, 0, 10, -1, -1, 0, 'HT', 0, 1); + print __METHOD__." result2=".join(', ',$result2)."\n"; + // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) + $this->assertEquals(array(100, 10, 91, 10, 1, 9.1, 100, 10, 91, 0, -19, 0, -1.90, 0, 0, -19),$result2,'Test6 ES for service'); + + // -------------------------------------------------------- + + // Credit Note: 10 * -10 HT - 0% discount with 10% vat and 0% localtax1 type 3, 19% localtax2 type 5 (method we provide value), we provide a product and not a service + $mysoc->country_code='ES'; + $mysoc->country_id=4; + $mysoc->localtax1_assuj=0; + $mysoc->localtax2_assuj=1; + $result2=calcul_price_total(10, -10, 0, 10, 0, 19, 0, 'HT', 0, 0); + print __METHOD__." result2=".join(', ',$result2)."\n"; + // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) + $this->assertEquals(array(-100, -10, -110, -10, -1, -11, -100, -10, -110, 0, 0, 0, 0, 0, 0, 0),$result2,'Test7 ES for product'); + + // Credit Note: 10 * -10 HT - 0% discount with 10% vat and 1.4% localtax1 type 3, 0% localtax2 type 5 (other method autodetect), we provide a service and not a product + $mysoc->country_code='ES'; + $mysoc->country_id=4; + $mysoc->localtax1_assuj=0; + $mysoc->localtax2_assuj=1; + $result2=calcul_price_total(10, -10, 0, 10, -1, -1, 0, 'HT', 0, 1); + print __METHOD__." result2=".join(', ',$result2)."\n"; + $this->assertEquals(array(-100, -10, -91, -10, -1, -9.1, -100, -10, -91, 0, 19, 0, 1.90, 0, 0, 19),$result2,'Test8 ES for service'); + + + /* + * Country Côte d'Ivoire + */ // 10 * 10 HT - 0% discount with 18% vat, seller using localtax1 type 2, not localtax2 (method we provide value) $mysoc->country_code='CI'; @@ -189,8 +262,8 @@ public function testCalculPriceTotal() $result3=calcul_price_total(10, 10, 0, 18, 7.5, 0, 0, 'HT', 0, 0); // 10 * 10 HT - 0% discount with 18% vat and 7.5% localtax1, 0% localtax2 print __METHOD__." result3=".join(', ',$result3)."\n"; // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) - $this->assertEquals(array(100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0, 0.885, 0, 0, 8.85, 0),$result3,'Test6 CI'); - + $this->assertEquals(array(100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0, 0.885, 0, 0, 8.85, 0),$result3,'Test9 CI'); + // 10 * 10 HT - 0% discount with 18% vat, seller using localtax1 type 2, not localtax2 (other method autodetect) $mysoc->country_code='CI'; $mysoc->country_id=21; @@ -199,8 +272,8 @@ public function testCalculPriceTotal() $result3=calcul_price_total(10, 10, 0, 18, -1, -1, 0, 'HT', 0, 0); // 10 * 10 HT - 0% discount with 18% vat and 7.5% localtax1, 0% localtax2 print __METHOD__." result3=".join(', ',$result3)."\n"; // result[0,1,2,3,4,5,6,7,8] (total_ht, total_vat, total_ttc, pu_ht, pu_tva, pu_ttc, total_ht_without_discount, total_vat_without_discount, total_ttc_without_discount) - $this->assertEquals(array(100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0, 0.885, 0, 0, 8.85, 0),$result3,'Test7 CI'); - + $this->assertEquals(array(100, 18, 126.85, 10, 1.8, 12.685, 100, 18, 126.85, 8.85, 0, 0.885, 0, 0, 8.85, 0),$result3,'Test10 CI'); + return true; } @@ -233,9 +306,9 @@ public function testUpdatePrice() $newlocalobject=new Facture($this->savdb); $newlocalobject->fetch($invoiceid); - $this->assertEquals(2.48,$newlocalobject->total_ht); - $this->assertEquals(0.24,$newlocalobject->total_tva); - $this->assertEquals(2.72,$newlocalobject->total_ttc); + $this->assertEquals(2.48,$newlocalobject->total_ht, "testUpdatePrice test1"); + $this->assertEquals(0.24,$newlocalobject->total_tva, "testUpdatePrice test2"); + $this->assertEquals(2.72,$newlocalobject->total_ttc, "testUpdatePrice test3"); // Two lines of 1.24 give 2.48 HT and 2.73 TTC with global vat rounding mode @@ -249,7 +322,7 @@ public function testUpdatePrice() $newlocalobject=new Facture($this->savdb); $newlocalobject->fetch($invoiceid); - $this->assertEquals(2.48,$newlocalobject->total_ht); + $this->assertEquals(2.48,$newlocalobject->total_ht, "testUpdatePrice test4"); //$this->assertEquals(0.25,$newlocalobject->total_tva); //$this->assertEquals(2.73,$newlocalobject->total_ttc); } From 2f070b0e1ba02bfc7186709a2e3551bca6d18596 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 26 Apr 2015 17:56:41 +0200 Subject: [PATCH 081/264] Fix data to match spanish current setup --- dev/initdata/mysqldump_dolibarr_3.5.0.sql | 4 ++-- dev/initdata/mysqldump_dolibarr_3.6.0.sql | 2 +- dev/initdata/mysqldump_dolibarr_3.7.0.sql | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dev/initdata/mysqldump_dolibarr_3.5.0.sql b/dev/initdata/mysqldump_dolibarr_3.5.0.sql index 20d07dc91bb1e..48d82c71998ff 100644 --- a/dev/initdata/mysqldump_dolibarr_3.5.0.sql +++ b/dev/initdata/mysqldump_dolibarr_3.5.0.sql @@ -1617,7 +1617,7 @@ CREATE TABLE `llx_c_tva` ( LOCK TABLES `llx_c_tva` WRITE; /*!40000 ALTER TABLE `llx_c_tva` DISABLE KEYS */; -INSERT INTO `llx_c_tva` VALUES (11,1,20,0,'0',0,'0',0,'VAT standard rate (France hors DOM-TOM)',1,NULL,NULL),(12,1,8.5,0,'0',0,'0',0,'VAT standard rate (DOM sauf Guyane et Saint-Martin)',0,NULL,NULL),(13,1,8.5,0,'0',0,'0',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,NULL,NULL),(14,1,5.5,0,'0',0,'0',0,'VAT reduced rate (France hors DOM-TOM)',1,NULL,NULL),(15,1,0,0,'0',0,'0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(16,1,2.1,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(21,2,21,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(22,2,6,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(23,2,0,0,'0',0,'0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(24,2,12,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(31,3,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(32,3,10,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(33,3,4,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(34,3,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(41,4,21,5.2,'3',-21,'1',0,'VAT standard rate',1,NULL,NULL),(42,4,10,1.4,'3',-21,'1',0,'VAT reduced rate',1,NULL,NULL),(43,4,4,0.5,'3',-21,'1',0,'VAT super-reduced rate',1,NULL,NULL),(44,4,0,0,'3',-21,'1',0,'VAT Rate 0',1,NULL,NULL),(51,5,19,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(52,5,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(53,5,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(61,6,7.6,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(62,6,3.6,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(63,6,2.4,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(64,6,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(71,7,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(72,7,17.5,0,'0',0,'0',0,'VAT standard rate before 2011',1,NULL,NULL),(73,7,5,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(74,7,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(91,9,17,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(92,9,13,0,'0',0,'0',0,'VAT reduced rate 0',1,NULL,NULL),(93,9,3,0,'0',0,'0',0,'VAT super reduced rate 0',1,NULL,NULL),(94,9,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(101,10,6,0,'0',0,'0',0,'VAT 6%',1,NULL,NULL),(102,10,12,1,'4',0,'0',0,'VAT 12%',1,NULL,NULL),(103,10,18,0,'0',0,'0',0,'VAT 18%',1,NULL,NULL),(104,10,7.5,1,'4',0,'0',0,'VAT 6% Majoré à 25% (7.5%)',1,NULL,NULL),(105,10,15,1,'4',0,'0',0,'VAT 12% Majoré à 25% (15%)',1,NULL,NULL),(106,10,22.5,1,'4',0,'0',0,'VAT 18% Majoré à 25% (22.5%)',1,NULL,NULL),(107,10,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(111,11,0,0,'0',0,'0',0,'No Sales Tax',1,NULL,NULL),(112,11,4,0,'0',0,'0',0,'Sales Tax 4%',1,NULL,NULL),(113,11,6,0,'0',0,'0',0,'Sales Tax 6%',1,NULL,NULL),(121,12,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(122,12,14,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(123,12,10,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(124,12,7,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(125,12,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(141,14,7,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(142,14,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(143,14,5,9.975,'1',0,'0',0,'TPS and TVQ rate',1,NULL,NULL),(171,17,19,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(172,17,6,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(173,17,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(201,20,25,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(202,20,12,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(203,20,6,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(204,20,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(231,23,21,0,'0',0,'0',0,'IVA standard rate',1,NULL,NULL),(232,23,10.5,0,'0',0,'0',0,'IVA reduced rate',1,NULL,NULL),(233,23,0,0,'0',0,'0',0,'IVA Rate 0',1,NULL,NULL),(251,25,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(252,25,12,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(253,25,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(254,25,5,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(271,27,20,0,'0',0,'0',0,'VAT standard rate (France hors DOM-TOM)',1,NULL,NULL),(272,27,8.5,0,'0',0,'0',0,'VAT standard rate (DOM sauf Guyane et Saint-Martin)',0,NULL,NULL),(273,27,8.5,0,'0',0,'0',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,NULL,NULL),(274,27,5.5,0,'0',0,'0',0,'VAT reduced rate (France hors DOM-TOM)',0,NULL,NULL),(275,27,0,0,'0',0,'0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(276,27,2.1,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(277,27,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(281,28,10,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(282,28,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(411,41,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(412,41,10,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(413,41,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(461,46,0,0,'0',0,'0',0,'No VAT',1,NULL,NULL),(462,46,15,0,'0',0,'0',0,'VAT 15%',1,NULL,NULL),(463,46,7.5,0,'0',0,'0',0,'VAT 7.5%',1,NULL,NULL),(591,59,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(592,59,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(593,59,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(671,67,19,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(672,67,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(801,80,25,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(802,80,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(861,86,13,0,'0',0,'0',0,'IVA 13',1,NULL,NULL),(862,86,0,0,'0',0,'0',0,'SIN IVA',1,NULL,NULL),(1141,114,0,0,'0',0,'0',0,'No ISV',1,NULL,NULL),(1142,114,12,0,'0',0,'0',0,'ISV 12%',1,NULL,NULL),(1161,116,25.5,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1162,116,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1163,116,0,0,'0',0,'0',0,'VAT rate 0',1,NULL,NULL),(1171,117,12.5,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1172,117,4,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1173,117,1,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(1174,117,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1231,123,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1232,123,5,0,'0',0,'0',0,'VAT Rate 5',1,NULL,NULL),(1401,140,15,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1402,140,12,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1403,140,6,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1404,140,3,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(1405,140,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1521,152,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1522,152,15,0,'0',0,'0',0,'VAT Rate 15',1,NULL,NULL),(1541,154,0,0,'0',0,'0',0,'No VAT',1,NULL,NULL),(1542,154,16,0,'0',0,'0',0,'VAT 16%',1,NULL,NULL),(1543,154,10,0,'0',0,'0',0,'VAT Frontero',1,NULL,NULL),(1662,166,15,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1663,166,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1731,173,25,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1732,173,14,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1733,173,8,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1734,173,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1841,184,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1842,184,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1843,184,3,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1844,184,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1881,188,24,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1882,188,9,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1883,188,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1884,188,5,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1931,193,0,0,'0',0,'0',0,'No VAT in SPM',1,NULL,NULL),(2011,201,19,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(2012,201,10,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(2013,201,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(2021,202,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(2022,202,8.5,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(2023,202,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(2321,232,0,0,'0',0,'0',0,'No VAT',1,NULL,NULL),(2322,232,12,0,'0',0,'0',0,'VAT 12%',1,NULL,NULL),(2323,232,8,0,'0',0,'0',0,'VAT 8%',1,NULL,NULL),(2461,246,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(2462,4,15,0,'0',0,'0',0,'aaaa',1,NULL,NULL); +INSERT INTO `llx_c_tva` VALUES (11,1,20,0,'0',0,'0',0,'VAT standard rate (France hors DOM-TOM)',1,NULL,NULL),(12,1,8.5,0,'0',0,'0',0,'VAT standard rate (DOM sauf Guyane et Saint-Martin)',0,NULL,NULL),(13,1,8.5,0,'0',0,'0',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,NULL,NULL),(14,1,5.5,0,'0',0,'0',0,'VAT reduced rate (France hors DOM-TOM)',1,NULL,NULL),(15,1,0,0,'0',0,'0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(16,1,2.1,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(21,2,21,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(22,2,6,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(23,2,0,0,'0',0,'0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(24,2,12,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(31,3,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(32,3,10,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(33,3,4,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(34,3,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(41,4,21,5.2,'3',-19,'5',0,'VAT standard rate',1,NULL,NULL),(42,4,10,1.4,'3',-19,'5',0,'VAT reduced rate',1,NULL,NULL),(43,4,4,0.5,'3',-19,'5',0,'VAT super-reduced rate',1,NULL,NULL),(44,4,0,0,'3',-19,'5',0,'VAT Rate 0',1,NULL,NULL),(51,5,19,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(52,5,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(53,5,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(61,6,7.6,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(62,6,3.6,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(63,6,2.4,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(64,6,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(71,7,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(72,7,17.5,0,'0',0,'0',0,'VAT standard rate before 2011',1,NULL,NULL),(73,7,5,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(74,7,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(91,9,17,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(92,9,13,0,'0',0,'0',0,'VAT reduced rate 0',1,NULL,NULL),(93,9,3,0,'0',0,'0',0,'VAT super reduced rate 0',1,NULL,NULL),(94,9,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(101,10,6,0,'0',0,'0',0,'VAT 6%',1,NULL,NULL),(102,10,12,1,'4',0,'0',0,'VAT 12%',1,NULL,NULL),(103,10,18,0,'0',0,'0',0,'VAT 18%',1,NULL,NULL),(104,10,7.5,1,'4',0,'0',0,'VAT 6% Majoré à 25% (7.5%)',1,NULL,NULL),(105,10,15,1,'4',0,'0',0,'VAT 12% Majoré à 25% (15%)',1,NULL,NULL),(106,10,22.5,1,'4',0,'0',0,'VAT 18% Majoré à 25% (22.5%)',1,NULL,NULL),(107,10,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(111,11,0,0,'0',0,'0',0,'No Sales Tax',1,NULL,NULL),(112,11,4,0,'0',0,'0',0,'Sales Tax 4%',1,NULL,NULL),(113,11,6,0,'0',0,'0',0,'Sales Tax 6%',1,NULL,NULL),(121,12,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(122,12,14,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(123,12,10,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(124,12,7,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(125,12,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(141,14,7,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(142,14,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(143,14,5,9.975,'1',0,'0',0,'TPS and TVQ rate',1,NULL,NULL),(171,17,19,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(172,17,6,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(173,17,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(201,20,25,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(202,20,12,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(203,20,6,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(204,20,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(231,23,21,0,'0',0,'0',0,'IVA standard rate',1,NULL,NULL),(232,23,10.5,0,'0',0,'0',0,'IVA reduced rate',1,NULL,NULL),(233,23,0,0,'0',0,'0',0,'IVA Rate 0',1,NULL,NULL),(251,25,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(252,25,12,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(253,25,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(254,25,5,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(271,27,20,0,'0',0,'0',0,'VAT standard rate (France hors DOM-TOM)',1,NULL,NULL),(272,27,8.5,0,'0',0,'0',0,'VAT standard rate (DOM sauf Guyane et Saint-Martin)',0,NULL,NULL),(273,27,8.5,0,'0',0,'0',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,NULL,NULL),(274,27,5.5,0,'0',0,'0',0,'VAT reduced rate (France hors DOM-TOM)',0,NULL,NULL),(275,27,0,0,'0',0,'0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(276,27,2.1,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(277,27,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(281,28,10,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(282,28,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(411,41,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(412,41,10,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(413,41,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(461,46,0,0,'0',0,'0',0,'No VAT',1,NULL,NULL),(462,46,15,0,'0',0,'0',0,'VAT 15%',1,NULL,NULL),(463,46,7.5,0,'0',0,'0',0,'VAT 7.5%',1,NULL,NULL),(591,59,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(592,59,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(593,59,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(671,67,19,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(672,67,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(801,80,25,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(802,80,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(861,86,13,0,'0',0,'0',0,'IVA 13',1,NULL,NULL),(862,86,0,0,'0',0,'0',0,'SIN IVA',1,NULL,NULL),(1141,114,0,0,'0',0,'0',0,'No ISV',1,NULL,NULL),(1142,114,12,0,'0',0,'0',0,'ISV 12%',1,NULL,NULL),(1161,116,25.5,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1162,116,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1163,116,0,0,'0',0,'0',0,'VAT rate 0',1,NULL,NULL),(1171,117,12.5,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1172,117,4,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1173,117,1,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(1174,117,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1231,123,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1232,123,5,0,'0',0,'0',0,'VAT Rate 5',1,NULL,NULL),(1401,140,15,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1402,140,12,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1403,140,6,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1404,140,3,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(1405,140,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1521,152,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1522,152,15,0,'0',0,'0',0,'VAT Rate 15',1,NULL,NULL),(1541,154,0,0,'0',0,'0',0,'No VAT',1,NULL,NULL),(1542,154,16,0,'0',0,'0',0,'VAT 16%',1,NULL,NULL),(1543,154,10,0,'0',0,'0',0,'VAT Frontero',1,NULL,NULL),(1662,166,15,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1663,166,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1731,173,25,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1732,173,14,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1733,173,8,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1734,173,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1841,184,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1842,184,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1843,184,3,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1844,184,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1881,188,24,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1882,188,9,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1883,188,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1884,188,5,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1931,193,0,0,'0',0,'0',0,'No VAT in SPM',1,NULL,NULL),(2011,201,19,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(2012,201,10,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(2013,201,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(2021,202,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(2022,202,8.5,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(2023,202,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(2321,232,0,0,'0',0,'0',0,'No VAT',1,NULL,NULL),(2322,232,12,0,'0',0,'0',0,'VAT 12%',1,NULL,NULL),(2323,232,8,0,'0',0,'0',0,'VAT 8%',1,NULL,NULL),(2461,246,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(2462,4,15,0,'0',0,'0',0,'aaaa',1,NULL,NULL); /*!40000 ALTER TABLE `llx_c_tva` ENABLE KEYS */; UNLOCK TABLES; @@ -2634,7 +2634,7 @@ CREATE TABLE `llx_const` ( LOCK TABLES `llx_const` WRITE; /*!40000 ALTER TABLE `llx_const` DISABLE KEYS */; -INSERT INTO `llx_const` VALUES (5,'SYSLOG_LEVEL',0,'7','chaine',0,'Level of debug info to show','2010-07-08 11:17:57'),(8,'MAIN_UPLOAD_DOC',0,'2048','chaine',0,'Max size for file upload (0 means no upload allowed)','2010-07-08 11:17:57'),(9,'MAIN_SEARCHFORM_SOCIETE',0,'1','yesno',0,'Show form for quick company search','2010-07-08 11:17:57'),(10,'MAIN_SEARCHFORM_CONTACT',0,'1','yesno',0,'Show form for quick contact search','2010-07-08 11:17:57'),(11,'MAIN_SEARCHFORM_PRODUITSERVICE',0,'1','yesno',0,'Show form for quick product search','2010-07-08 11:17:58'),(12,'MAIN_SEARCHFORM_ADHERENT',0,'1','yesno',0,'Show form for quick member search','2010-07-08 11:17:58'),(16,'MAIN_SIZE_LISTE_LIMIT',0,'25','chaine',0,'Longueur maximum des listes','2010-07-08 11:17:58'),(17,'MAIN_SHOW_WORKBOARD',0,'1','yesno',0,'Affichage tableau de bord de travail Dolibarr','2010-07-08 11:17:58'),(29,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',1,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2010-07-08 11:17:58'),(33,'SOCIETE_NOLIST_COURRIER',0,'1','yesno',0,'Liste les fichiers du repertoire courrier','2010-07-08 11:17:58'),(35,'SOCIETE_CODECOMPTA_ADDON',1,'mod_codecompta_panicum','yesno',0,'Module to control third parties codes','2010-07-08 11:17:58'),(36,'ADHERENT_MAIL_REQUIRED',1,'1','yesno',0,'EMail required to create a new member','2010-07-08 11:17:58'),(37,'ADHERENT_MAIL_FROM',1,'adherents@domain.com','chaine',0,'Sender EMail for automatic emails','2010-07-08 11:17:58'),(38,'ADHERENT_MAIL_RESIL',1,'Your subscription has been resiliated.\r\nWe hope to see you soon again','texte',0,'Mail resiliation','2010-07-08 11:17:58'),(39,'ADHERENT_MAIL_VALID',1,'Your subscription has been validated.\r\nThis is a remind of your personal information :\r\n\r\n%INFOS%\r\n\r\n','texte',0,'Mail de validation','2010-07-08 11:17:59'),(40,'ADHERENT_MAIL_COTIS',1,'Hello %PRENOM%,\r\nThanks for your subscription.\r\nThis email confirms that your subscription has been received and processed.\r\n\r\n','texte',0,'Mail de validation de cotisation','2010-07-08 11:17:59'),(41,'ADHERENT_MAIL_VALID_SUBJECT',1,'Your subscription has been validated','chaine',0,'Sujet du mail de validation','2010-07-08 11:17:59'),(42,'ADHERENT_MAIL_RESIL_SUBJECT',1,'Resiliating your subscription','chaine',0,'Sujet du mail de resiliation','2010-07-08 11:17:59'),(43,'ADHERENT_MAIL_COTIS_SUBJECT',1,'Receipt of your subscription','chaine',0,'Sujet du mail de validation de cotisation','2010-07-08 11:17:59'),(44,'MAILING_EMAIL_FROM',1,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2010-07-08 11:17:59'),(45,'ADHERENT_USE_MAILMAN',1,'0','yesno',0,'Utilisation de Mailman','2010-07-08 11:17:59'),(46,'ADHERENT_MAILMAN_UNSUB_URL',1,'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&user=%EMAIL%','chaine',0,'Url de desinscription aux listes mailman','2010-07-08 11:17:59'),(47,'ADHERENT_MAILMAN_URL',1,'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&send_welcome_msg_to_this_batch=1&subscribees=%EMAIL%','chaine',0,'Url pour les inscriptions mailman','2010-07-08 11:17:59'),(48,'ADHERENT_MAILMAN_LISTS',1,'test-test,test-test2','chaine',0,'Listes auxquelles inscrire les nouveaux adherents','2010-07-08 11:17:59'),(49,'ADHERENT_MAILMAN_ADMINPW',1,'','chaine',0,'Mot de passe Admin des liste mailman','2010-07-08 11:17:59'),(50,'ADHERENT_MAILMAN_SERVER',1,'lists.domain.com','chaine',0,'Serveur hebergeant les interfaces d Admin des listes mailman','2010-07-08 11:17:59'),(51,'ADHERENT_MAILMAN_LISTS_COTISANT',1,'','chaine',0,'Liste(s) auxquelles les nouveaux cotisants sont inscris automatiquement','2010-07-08 11:17:59'),(52,'ADHERENT_USE_SPIP',1,'0','yesno',0,'Utilisation de SPIP ?','2010-07-08 11:17:59'),(53,'ADHERENT_USE_SPIP_AUTO',1,'0','yesno',0,'Utilisation de SPIP automatiquement','2010-07-08 11:17:59'),(54,'ADHERENT_SPIP_USER',1,'user','chaine',0,'user spip','2010-07-08 11:17:59'),(55,'ADHERENT_SPIP_PASS',1,'pass','chaine',0,'Pass de connection','2010-07-08 11:17:59'),(56,'ADHERENT_SPIP_SERVEUR',1,'localhost','chaine',0,'serveur spip','2010-07-08 11:17:59'),(57,'ADHERENT_SPIP_DB',1,'spip','chaine',0,'db spip','2010-07-08 11:17:59'),(58,'ADHERENT_CARD_HEADER_TEXT',1,'%ANNEE%','chaine',0,'Texte imprime sur le haut de la carte adherent','2010-07-08 11:17:59'),(59,'ADHERENT_CARD_FOOTER_TEXT',1,'Association AZERTY','chaine',0,'Texte imprime sur le bas de la carte adherent','2010-07-08 11:17:59'),(61,'FCKEDITOR_ENABLE_USER',1,'1','yesno',0,'Activation fckeditor sur notes utilisateurs','2010-07-08 11:17:59'),(62,'FCKEDITOR_ENABLE_SOCIETE',1,'1','yesno',0,'Activation fckeditor sur notes societe','2010-07-08 11:17:59'),(63,'FCKEDITOR_ENABLE_PRODUCTDESC',1,'1','yesno',0,'Activation fckeditor sur notes produits','2010-07-08 11:17:59'),(64,'FCKEDITOR_ENABLE_MEMBER',1,'1','yesno',0,'Activation fckeditor sur notes adherent','2010-07-08 11:17:59'),(65,'FCKEDITOR_ENABLE_MAILING',1,'1','yesno',0,'Activation fckeditor sur emailing','2010-07-08 11:17:59'),(66,'OSC_DB_HOST',1,'localhost','chaine',0,'Host for OSC database for OSCommerce module 1','2010-07-08 11:17:59'),(67,'DON_ADDON_MODEL',1,'html_cerfafr','chaine',0,'','2010-07-08 11:18:00'),(68,'PROPALE_ADDON',1,'mod_propale_marbre','chaine',0,'','2010-07-08 11:18:00'),(69,'PROPALE_ADDON_PDF',1,'azur','chaine',0,'','2010-07-08 11:18:00'),(70,'COMMANDE_ADDON',1,'mod_commande_marbre','chaine',0,'','2010-07-08 11:18:00'),(71,'COMMANDE_ADDON_PDF',1,'einstein','chaine',0,'','2010-07-08 11:18:00'),(72,'COMMANDE_SUPPLIER_ADDON',1,'mod_commande_fournisseur_muguet','chaine',0,'','2010-07-08 11:18:00'),(73,'COMMANDE_SUPPLIER_ADDON_PDF',1,'muscadet','chaine',0,'','2010-07-08 11:18:00'),(74,'EXPEDITION_ADDON',1,'enlevement','chaine',0,'','2010-07-08 11:18:00'),(76,'FICHEINTER_ADDON',1,'pacific','chaine',0,'','2010-07-08 11:18:00'),(77,'FICHEINTER_ADDON_PDF',1,'soleil','chaine',0,'','2010-07-08 11:18:00'),(79,'FACTURE_ADDON_PDF',1,'crabe','chaine',0,'','2010-07-08 11:18:00'),(80,'PROPALE_VALIDITY_DURATION',1,'15','chaine',0,'Durée de validitée des propales','2010-07-08 11:18:00'),(230,'COMPANY_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/thirdparties','chaine',0,NULL,'2010-07-08 11:26:20'),(238,'LIVRAISON_ADDON_PDF',1,'typhon','chaine',0,'Nom du gestionnaire de generation des commandes en PDF','2010-07-08 11:26:27'),(239,'LIVRAISON_ADDON_NUMBER',1,'mod_livraison_jade','chaine',0,'Nom du gestionnaire de numerotation des bons de livraison','2013-03-20 13:17:36'),(242,'MAIN_SUBMODULE_EXPEDITION',1,'1','chaine',0,'','2010-07-08 11:26:34'),(245,'FACTURE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/invoices','chaine',0,NULL,'2010-07-08 11:28:53'),(249,'DON_FORM',1,'fsfe.fr.php','chaine',0,'Nom du gestionnaire de formulaire de dons','2010-07-08 11:29:00'),(252,'MAIN_MODULE_ADHERENT',1,'1',NULL,0,NULL,'2010-07-08 11:29:05'),(253,'ADHERENT_BANK_USE_AUTO',1,'','yesno',0,'Insertion automatique des cotisation dans le compte banquaire','2010-07-08 11:29:05'),(254,'ADHERENT_BANK_ACCOUNT',1,'','chaine',0,'ID du Compte banquaire utilise','2010-07-08 11:29:05'),(255,'ADHERENT_BANK_CATEGORIE',1,'','chaine',0,'ID de la categorie banquaire des cotisations','2010-07-08 11:29:05'),(256,'ADHERENT_ETIQUETTE_TYPE',1,'L7163','chaine',0,'Type d etiquette (pour impression de planche d etiquette)','2010-07-08 11:29:05'),(260,'MAIN_MODULE_STOCK',1,'1',NULL,0,NULL,'2010-07-08 11:29:18'),(269,'PROJECT_ADDON_PDF',1,'baleine','chaine',0,'Nom du gestionnaire de generation des projets en PDF','2010-07-08 11:29:33'),(270,'PROJECT_ADDON',1,'mod_project_simple','chaine',0,'Nom du gestionnaire de numerotation des projets','2010-07-08 11:29:33'),(271,'MAIN_MODULE_MAILING',1,'1',NULL,0,NULL,'2010-07-08 11:29:37'),(272,'MAIN_MODULE_EXPORT',1,'1',NULL,0,NULL,'2010-07-08 11:29:41'),(273,'MAIN_MODULE_IMPORT',1,'1',NULL,0,NULL,'2010-07-08 11:29:45'),(274,'MAIN_MODULE_CATEGORIE',1,'1',NULL,0,NULL,'2010-07-08 11:29:59'),(275,'MAIN_MODULE_BOOKMARK',1,'1',NULL,0,NULL,'2010-07-08 11:30:03'),(276,'MAIN_MODULE_WEBSERVICES',1,'1',NULL,0,NULL,'2010-07-08 11:30:30'),(278,'MAIN_MODULE_GEOIPMAXMIND',1,'1',NULL,0,NULL,'2010-07-08 11:30:36'),(279,'MAIN_MODULE_EXTERNALRSS',1,'1',NULL,0,NULL,'2010-07-08 11:30:38'),(292,'MAIN_MODULE_FCKEDITOR',1,'1',NULL,0,NULL,'2010-07-08 11:56:27'),(368,'STOCK_USERSTOCK_AUTOCREATE',1,'1','chaine',0,'','2010-07-08 22:44:59'),(369,'EXPEDITION_ADDON_PDF',1,'merou','chaine',0,'','2010-07-08 22:58:07'),(370,'MAIN_SUBMODULE_LIVRAISON',1,'1','chaine',0,'','2010-07-08 23:00:29'),(377,'FACTURE_ADDON',1,'mod_facture_terre','chaine',0,'','2010-07-08 23:08:12'),(380,'ADHERENT_CARD_TEXT',1,'%TYPE% n° %ID%\r\n%PRENOM% %NOM%\r\n<%EMAIL%>\r\n%ADRESSE%\r\n%CP% %VILLE%\r\n%PAYS%','',0,'Texte imprime sur la carte adherent','2010-07-08 23:14:46'),(381,'ADHERENT_CARD_TEXT_RIGHT',1,'aaa','',0,'','2010-07-08 23:14:55'),(384,'PRODUIT_SOUSPRODUITS',1,'1','chaine',0,'','2010-07-08 23:22:12'),(385,'PRODUIT_USE_SEARCH_TO_SELECT',1,'1','chaine',0,'','2010-07-08 23:22:19'),(386,'STOCK_CALCULATE_ON_SHIPMENT',1,'1','chaine',0,'','2010-07-08 23:23:21'),(387,'STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER',1,'1','chaine',0,'','2010-07-08 23:23:26'),(392,'MAIN_AGENDA_XCAL_EXPORTKEY',1,'dolibarr','chaine',0,'','2010-07-08 23:27:50'),(393,'MAIN_AGENDA_EXPORT_PAST_DELAY',1,'100','chaine',0,'','2010-07-08 23:27:50'),(523,'MAIN_AGENDA_ACTIONAUTO_COMPANY_CREATE',1,'1','chaine',0,'','2010-07-10 12:48:49'),(524,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_VALIDATE',1,'1','chaine',0,'','2010-07-10 12:48:49'),(525,'MAIN_AGENDA_ACTIONAUTO_PROPAL_VALIDATE',1,'1','chaine',0,'','2010-07-10 12:48:49'),(526,'MAIN_AGENDA_ACTIONAUTO_PROPAL_SENTBYMAIL',1,'1','chaine',0,'','2010-07-10 12:48:49'),(527,'MAIN_AGENDA_ACTIONAUTO_ORDER_VALIDATE',1,'1','chaine',0,'','2010-07-10 12:48:49'),(528,'MAIN_AGENDA_ACTIONAUTO_ORDER_SENTBYMAIL',1,'1','chaine',0,'','2010-07-10 12:48:49'),(529,'MAIN_AGENDA_ACTIONAUTO_BILL_VALIDATE',1,'1','chaine',0,'','2010-07-10 12:48:49'),(530,'MAIN_AGENDA_ACTIONAUTO_BILL_PAYED',1,'1','chaine',0,'','2010-07-10 12:48:49'),(531,'MAIN_AGENDA_ACTIONAUTO_BILL_CANCEL',1,'1','chaine',0,'','2010-07-10 12:48:49'),(532,'MAIN_AGENDA_ACTIONAUTO_BILL_SENTBYMAIL',1,'1','chaine',0,'','2010-07-10 12:48:49'),(533,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2010-07-10 12:48:50'),(534,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2010-07-10 12:48:50'),(602,'MAIN_MODULE_PROJET',1,'1',NULL,0,NULL,'2010-07-11 13:26:54'),(610,'CASHDESK_ID_THIRDPARTY',1,'7','chaine',0,'','2010-07-11 17:08:18'),(611,'CASHDESK_ID_BANKACCOUNT_CASH',1,'3','chaine',0,'','2010-07-11 17:08:18'),(612,'CASHDESK_ID_BANKACCOUNT_CHEQUE',1,'1','chaine',0,'','2010-07-11 17:08:18'),(613,'CASHDESK_ID_BANKACCOUNT_CB',1,'1','chaine',0,'','2010-07-11 17:08:18'),(614,'CASHDESK_ID_WAREHOUSE',1,'2','chaine',0,'','2010-07-11 17:08:18'),(660,'LDAP_USER_DN',1,'ou=users,dc=my-domain,dc=com','chaine',0,NULL,'2010-07-18 10:25:27'),(661,'LDAP_GROUP_DN',1,'ou=groups,dc=my-domain,dc=com','chaine',0,NULL,'2010-07-18 10:25:27'),(662,'LDAP_FILTER_CONNECTION',1,'&(objectClass=user)(objectCategory=person)','chaine',0,NULL,'2010-07-18 10:25:27'),(663,'LDAP_FIELD_LOGIN',1,'uid','chaine',0,NULL,'2010-07-18 10:25:27'),(664,'LDAP_FIELD_FULLNAME',1,'cn','chaine',0,NULL,'2010-07-18 10:25:27'),(665,'LDAP_FIELD_NAME',1,'sn','chaine',0,NULL,'2010-07-18 10:25:27'),(666,'LDAP_FIELD_FIRSTNAME',1,'givenname','chaine',0,NULL,'2010-07-18 10:25:27'),(667,'LDAP_FIELD_MAIL',1,'mail','chaine',0,NULL,'2010-07-18 10:25:27'),(668,'LDAP_FIELD_PHONE',1,'telephonenumber','chaine',0,NULL,'2010-07-18 10:25:27'),(669,'LDAP_FIELD_FAX',1,'facsimiletelephonenumber','chaine',0,NULL,'2010-07-18 10:25:27'),(670,'LDAP_FIELD_MOBILE',1,'mobile','chaine',0,NULL,'2010-07-18 10:25:27'),(671,'LDAP_SERVER_TYPE',1,'openldap','chaine',0,'','2010-07-18 10:25:46'),(672,'LDAP_SERVER_PROTOCOLVERSION',1,'3','chaine',0,'','2010-07-18 10:25:47'),(673,'LDAP_SERVER_HOST',1,'localhost','chaine',0,'','2010-07-18 10:25:47'),(674,'LDAP_SERVER_PORT',1,'389','chaine',0,'','2010-07-18 10:25:47'),(675,'LDAP_SERVER_USE_TLS',1,'0','chaine',0,'','2010-07-18 10:25:47'),(676,'LDAP_SYNCHRO_ACTIVE',1,'dolibarr2ldap','chaine',0,'','2010-07-18 10:25:47'),(677,'LDAP_CONTACT_ACTIVE',1,'1','chaine',0,'','2010-07-18 10:25:47'),(678,'LDAP_MEMBER_ACTIVE',1,'1','chaine',0,'','2010-07-18 10:25:47'),(807,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_VALIDATE',1,'1','chaine',0,NULL,'2011-07-18 17:27:52'),(808,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_SENTBYMAIL',1,'1','chaine',0,NULL,'2011-07-18 17:27:52'),(834,'MAIN_MODULE_CASHDESK',1,'1',NULL,0,NULL,'2011-07-18 17:30:24'),(969,'MAIN_MODULE_PRELEVEMENT',1,'1',NULL,0,NULL,'2011-07-18 18:01:59'),(973,'MAIN_MODULE_WORKFLOW',1,'1',NULL,0,NULL,'2011-07-18 18:02:20'),(974,'MAIN_MODULE_WORKFLOW_TRIGGERS',1,'1','chaine',0,NULL,'2011-07-18 18:02:20'),(975,'WORKFLOW_PROPAL_AUTOCREATE_ORDER',1,'1','chaine',0,'','2011-07-18 18:02:24'),(978,'MAIN_MODULE_NOTIFICATION',1,'1',NULL,0,NULL,'2011-07-18 18:03:06'),(979,'PRELEVEMENT_USER',1,'1','chaine',0,'','2011-07-18 18:05:50'),(980,'PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR',1,'1234567','chaine',0,'','2011-07-18 18:05:50'),(981,'PRELEVEMENT_ID_BANKACCOUNT',1,'1','chaine',0,'','2011-07-18 18:05:50'),(983,'FACTURE_RIB_NUMBER',1,'1','chaine',0,'','2011-07-18 18:35:14'),(984,'FACTURE_CHQ_NUMBER',1,'1','chaine',0,'','2011-07-18 18:35:14'),(1016,'GOOGLE_DUPLICATE_INTO_GCAL',1,'1','chaine',0,'','2011-07-18 21:40:20'),(1018,'MAIN_MODULE_SYSLOG',0,'1',NULL,0,NULL,'2011-07-20 11:36:47'),(1098,'MAIN_INFO_SOCIETE_LOGO',1,'dolibarr_125x125.png','chaine',0,'','2011-07-28 18:42:09'),(1099,'MAIN_INFO_SOCIETE_LOGO_SMALL',1,'dolibarr_125x125_small.png','chaine',0,'','2011-07-28 18:42:09'),(1100,'MAIN_INFO_SOCIETE_LOGO_MINI',1,'dolibarr_125x125_mini.png','chaine',0,'','2011-07-28 18:42:09'),(1138,'MAIN_VERSION_LAST_INSTALL',0,'3.1.0-beta','chaine',0,'Dolibarr version when install','2011-07-28 23:05:02'),(1152,'SOCIETE_CODECLIENT_ADDON',1,'mod_codeclient_monkey','chaine',0,'','2011-07-29 20:50:02'),(1231,'MAIN_UPLOAD_DOC',1,'2048','chaine',0,'','2011-07-29 21:04:00'),(1234,'MAIN_UMASK',1,'0664','chaine',0,'','2011-07-29 21:04:11'),(1240,'MAIN_LOGEVENTS_USER_LOGIN',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1241,'MAIN_LOGEVENTS_USER_LOGIN_FAILED',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1242,'MAIN_LOGEVENTS_USER_LOGOUT',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1243,'MAIN_LOGEVENTS_USER_CREATE',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1244,'MAIN_LOGEVENTS_USER_MODIFY',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1245,'MAIN_LOGEVENTS_USER_NEW_PASSWORD',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1246,'MAIN_LOGEVENTS_USER_ENABLEDISABLE',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1247,'MAIN_LOGEVENTS_USER_DELETE',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1248,'MAIN_LOGEVENTS_GROUP_CREATE',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1249,'MAIN_LOGEVENTS_GROUP_MODIFY',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1250,'MAIN_LOGEVENTS_GROUP_DELETE',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1251,'MAIN_BOXES_MAXLINES',1,'5','',0,'','2011-07-29 21:05:42'),(1379,'CABINETMED_RHEUMATOLOGY_ON',1,'1','chaine',1,'Enable features for rheumatology','2011-08-01 21:47:53'),(1482,'EXPEDITION_ADDON_NUMBER',1,'mod_expedition_safor','chaine',0,'Nom du gestionnaire de numerotation des expeditions','2011-08-05 17:53:11'),(1490,'CONTRACT_ADDON',1,'mod_contract_serpis','chaine',0,'Nom du gestionnaire de numerotation des contrats','2011-08-05 18:11:58'),(1677,'COMMANDE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/orders','chaine',0,NULL,'2012-12-08 13:11:02'),(1698,'PRODUCT_CODEPRODUCT_ADDON',1,'mod_codeproduct_leopard','yesno',0,'Module to control product codes','2012-12-08 13:11:25'),(1718,'MAIN_MODULE_TAX',1,'1',NULL,0,NULL,'2012-12-08 13:12:41'),(1719,'ACCOUNTING_USEDICTTOEDIT',1,'1','chaine',1,'','2012-12-08 13:15:00'),(1724,'PROPALE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/proposals','chaine',0,NULL,'2012-12-08 13:17:14'),(1730,'OPENSTREETMAP_ENABLE_MAPS',1,'1','chaine',0,'','2012-12-08 13:22:47'),(1731,'OPENSTREETMAP_ENABLE_MAPS_CONTACTS',1,'1','chaine',0,'','2012-12-08 13:22:47'),(1732,'OPENSTREETMAP_ENABLE_MAPS_MEMBERS',1,'1','chaine',0,'','2012-12-08 13:22:47'),(1733,'OPENSTREETMAP_MAPS_ZOOM_LEVEL',1,'15','chaine',0,'','2012-12-08 13:22:47'),(1737,'MAIN_INFO_SOCIETE_COUNTRY',2,'1:FR:France','chaine',0,'','2013-02-26 21:56:28'),(1738,'MAIN_INFO_SOCIETE_NOM',2,'aaa','chaine',0,'','2012-12-08 14:08:14'),(1739,'MAIN_INFO_SOCIETE_STATE',2,'0','chaine',0,'','2013-02-27 14:20:27'),(1740,'MAIN_MONNAIE',2,'EUR','chaine',0,'','2012-12-08 14:08:14'),(1741,'MAIN_LANG_DEFAULT',2,'auto','chaine',0,'','2012-12-08 14:08:14'),(1742,'MAIN_MAIL_EMAIL_FROM',2,'dolibarr-robot@domain.com','chaine',0,'EMail emetteur pour les emails automatiques Dolibarr','2012-12-08 14:08:14'),(1743,'MAIN_MENU_STANDARD',2,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs internes','2013-02-11 19:43:54'),(1744,'MAIN_MENUFRONT_STANDARD',2,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs externes','2013-02-11 19:43:54'),(1745,'MAIN_MENU_SMARTPHONE',2,'iphone_backoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs internes','2012-12-08 14:08:14'),(1746,'MAIN_MENUFRONT_SMARTPHONE',2,'iphone_frontoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs externes','2012-12-08 14:08:14'),(1747,'MAIN_THEME',2,'eldy','chaine',0,'Default theme','2012-12-08 14:08:14'),(1748,'MAIN_DELAY_ACTIONS_TODO',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées','2012-12-08 14:08:14'),(1749,'MAIN_DELAY_ORDERS_TO_PROCESS',2,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes clients non traitées','2012-12-08 14:08:14'),(1750,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées','2012-12-08 14:08:14'),(1751,'MAIN_DELAY_PROPALS_TO_CLOSE',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales à cloturer','2012-12-08 14:08:14'),(1752,'MAIN_DELAY_PROPALS_TO_BILL',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales non facturées','2012-12-08 14:08:14'),(1753,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures client impayées','2012-12-08 14:08:14'),(1754,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',2,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures fournisseur impayées','2012-12-08 14:08:14'),(1755,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',2,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2012-12-08 14:08:14'),(1756,'MAIN_DELAY_RUNNING_SERVICES',2,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services expirés','2012-12-08 14:08:14'),(1757,'MAIN_DELAY_MEMBERS',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur cotisations adhérent en retard','2012-12-08 14:08:14'),(1758,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',2,'62','chaine',0,'Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire','2012-12-08 14:08:14'),(1759,'MAILING_EMAIL_FROM',2,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2012-12-08 14:08:14'),(1760,'MAIN_INFO_SOCIETE_COUNTRY',3,'1:FR:France','chaine',0,'','2013-02-26 21:56:28'),(1761,'MAIN_INFO_SOCIETE_NOM',3,'bbb','chaine',0,'','2012-12-08 14:08:20'),(1762,'MAIN_INFO_SOCIETE_STATE',3,'0','chaine',0,'','2013-02-27 14:20:27'),(1763,'MAIN_MONNAIE',3,'EUR','chaine',0,'','2012-12-08 14:08:20'),(1764,'MAIN_LANG_DEFAULT',3,'auto','chaine',0,'','2012-12-08 14:08:20'),(1765,'MAIN_MAIL_EMAIL_FROM',3,'dolibarr-robot@domain.com','chaine',0,'EMail emetteur pour les emails automatiques Dolibarr','2012-12-08 14:08:20'),(1766,'MAIN_MENU_STANDARD',3,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs internes','2013-02-11 19:43:54'),(1767,'MAIN_MENUFRONT_STANDARD',3,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs externes','2013-02-11 19:43:54'),(1768,'MAIN_MENU_SMARTPHONE',3,'iphone_backoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs internes','2012-12-08 14:08:20'),(1769,'MAIN_MENUFRONT_SMARTPHONE',3,'iphone_frontoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs externes','2012-12-08 14:08:20'),(1770,'MAIN_THEME',3,'eldy','chaine',0,'Default theme','2012-12-08 14:08:20'),(1771,'MAIN_DELAY_ACTIONS_TODO',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées','2012-12-08 14:08:20'),(1772,'MAIN_DELAY_ORDERS_TO_PROCESS',3,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes clients non traitées','2012-12-08 14:08:20'),(1773,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées','2012-12-08 14:08:20'),(1774,'MAIN_DELAY_PROPALS_TO_CLOSE',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales à cloturer','2012-12-08 14:08:20'),(1775,'MAIN_DELAY_PROPALS_TO_BILL',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales non facturées','2012-12-08 14:08:20'),(1776,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures client impayées','2012-12-08 14:08:20'),(1777,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',3,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures fournisseur impayées','2012-12-08 14:08:20'),(1778,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',3,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2012-12-08 14:08:20'),(1779,'MAIN_DELAY_RUNNING_SERVICES',3,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services expirés','2012-12-08 14:08:20'),(1780,'MAIN_DELAY_MEMBERS',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur cotisations adhérent en retard','2012-12-08 14:08:20'),(1781,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',3,'62','chaine',0,'Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire','2012-12-08 14:08:20'),(1782,'MAILING_EMAIL_FROM',3,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2012-12-08 14:08:20'),(1803,'SYSLOG_FILE',1,'DOL_DATA_ROOT/dolibarr.log','chaine',0,'','2012-12-08 14:15:08'),(1804,'SYSLOG_HANDLERS',1,'[\"mod_syslog_file\"]','chaine',0,'','2012-12-08 14:15:08'),(1805,'MAIN_MODULE_SKINCOLOREDITOR',3,'1',NULL,0,NULL,'2012-12-08 14:35:40'),(1806,'MAIN_MODULE_SKINCOLOREDITOR_TABS_0',3,'user:+tabskincoloreditors:ColorEditor:skincoloreditor@skincoloreditor:/skincoloreditor/usercolors.php?id=__ID__','chaine',0,NULL,'2012-12-08 14:35:40'),(1867,'MAIN_MODULE_PAYPAL',1,'1',NULL,0,NULL,'2012-12-11 22:53:56'),(1922,'PAYPAL_API_SANDBOX',1,'1','chaine',0,'','2012-12-12 12:11:05'),(1923,'PAYPAL_API_USER',1,'seller_1355312017_biz_api1.nltechno.com','chaine',0,'','2012-12-12 12:11:05'),(1924,'PAYPAL_API_PASSWORD',1,'1355312040','chaine',0,'','2012-12-12 12:11:05'),(1925,'PAYPAL_API_SIGNATURE',1,'AXqqdsWBzvfn0q5iNmbuiDv1y.3EAXIMWyl4C5KvDReR9HDwwAd6dQ4Q','chaine',0,'','2012-12-12 12:11:05'),(1926,'PAYPAL_API_INTEGRAL_OR_PAYPALONLY',1,'integral','chaine',0,'','2012-12-12 12:11:05'),(1927,'PAYPAL_SECURITY_TOKEN',1,'50c82fab36bb3b6aa83e2a50691803b2','chaine',0,'','2012-12-12 12:11:05'),(1928,'PAYPAL_SECURITY_TOKEN_UNIQUE',1,'0','chaine',0,'','2012-12-12 12:11:05'),(1929,'PAYPAL_ADD_PAYMENT_URL',1,'1','chaine',0,'','2012-12-12 12:11:05'),(1980,'MAIN_PDF_FORMAT',1,'EUA4','chaine',0,'','2012-12-12 19:58:05'),(1981,'MAIN_PROFID1_IN_ADDRESS',1,'0','chaine',0,'','2012-12-12 19:58:05'),(1982,'MAIN_PROFID2_IN_ADDRESS',1,'0','chaine',0,'','2012-12-12 19:58:05'),(1983,'MAIN_PROFID3_IN_ADDRESS',1,'0','chaine',0,'','2012-12-12 19:58:05'),(1984,'MAIN_PROFID4_IN_ADDRESS',1,'0','chaine',0,'','2012-12-12 19:58:05'),(1985,'MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT',1,'0','chaine',0,'','2012-12-12 19:58:05'),(1990,'MAIN_SMS_SENDMODE',1,'ovh','chaine',0,'This is to enable OVH SMS engine','2012-12-17 21:19:01'),(2040,'MAIN_MAIL_SMTP_PORT',0,'465','chaine',0,'','2012-12-19 12:58:10'),(2041,'MAIN_MAIL_SMTP_SERVER',0,'smtp.mail.com','chaine',0,'','2012-12-19 12:58:10'),(2044,'MAIN_MAIL_EMAIL_TLS',0,'1','chaine',0,'','2012-12-19 12:58:10'),(2251,'FCKEDITOR_TEST',1,'Test
\r\n\"\"fdfs','chaine',0,'','2012-12-19 19:12:24'),(2293,'SYSTEMTOOLS_MYSQLDUMP',1,'/usr/bin/mysqldump','chaine',0,'','2012-12-27 02:02:00'),(2305,'MAIN_MODULE_PROPALE',1,'1',NULL,0,NULL,'2013-01-02 20:33:16'),(2307,'MAIN_MODULE_CONTRAT',1,'1',NULL,0,NULL,'2013-01-02 20:33:17'),(2310,'MAIN_MODULE_EXPEDITION',1,'1',NULL,0,NULL,'2013-01-02 20:33:18'),(2313,'MAIN_MODULE_FILEMANAGER',1,'1',NULL,0,NULL,'2013-01-02 20:33:20'),(2314,'MAIN_MODULE_FILEMANAGER_CSS',1,'/filemanager/css/filemanager.css.php','chaine',0,NULL,'2013-01-02 20:33:20'),(2315,'MAIN_MODULE_FICHEINTER',1,'1',NULL,0,NULL,'2013-01-02 20:33:21'),(2321,'MAIN_MODULE_HOLIDAY',1,'1',NULL,0,NULL,'2013-01-02 20:33:24'),(2322,'MAIN_MODULE_HOLIDAY_TABS_0',1,'user:+paidholidays:CPTitreMenu:holiday:$user->rights->holiday->write:/holiday/index.php?mainmenu=holiday&id=__ID__','chaine',0,NULL,'2013-01-02 20:33:24'),(2786,'MAIN_SOAP_DEBUG',1,'1','chaine',1,'','2013-01-13 12:37:21'),(2835,'MAIN_USE_CONNECT_TIMEOUT',1,'10','chaine',0,'','2013-01-16 19:28:50'),(2836,'MAIN_USE_RESPONSE_TIMEOUT',1,'30','chaine',0,'','2013-01-16 19:28:50'),(2837,'MAIN_PROXY_USE',1,'0','chaine',0,'','2013-01-16 19:28:50'),(2838,'MAIN_PROXY_HOST',1,'localhost','chaine',0,'','2013-01-16 19:28:50'),(2839,'MAIN_PROXY_PORT',1,'8080','chaine',0,'','2013-01-16 19:28:50'),(2840,'MAIN_PROXY_USER',1,'aaa','chaine',0,'','2013-01-16 19:28:50'),(2841,'MAIN_PROXY_PASS',1,'bbb','chaine',0,'','2013-01-16 19:28:50'),(2848,'OVHSMS_NICK',1,'BN196-OVH','chaine',0,'','2013-01-16 19:32:36'),(2849,'OVHSMS_PASS',1,'bigone-10','chaine',0,'','2013-01-16 19:32:36'),(2850,'OVHSMS_SOAPURL',1,'https://www.ovh.com/soapi/soapi-re-1.55.wsdl','chaine',0,'','2013-01-16 19:32:36'),(2854,'THEME_ELDY_RGB',1,'bfbf00','chaine',0,'','2013-01-18 10:02:53'),(2855,'THEME_ELDY_ENABLE_PERSONALIZED',1,'0','chaine',0,'','2013-01-18 10:02:55'),(2858,'MAIN_SESSION_TIMEOUT',1,'2000','chaine',0,'','2013-01-19 17:01:53'),(2862,'TICKET_ADDON',1,'mod_ticket_avenc','chaine',0,'Nom du gestionnaire de numerotation des tickets','2013-01-19 17:16:10'),(2866,'MAIN_MODULE_PRODUCT',1,'1',NULL,0,NULL,'2013-01-19 17:16:10'),(2867,'FACSIM_ADDON',1,'mod_facsim_alcoy','chaine',0,'','2013-01-19 17:16:25'),(2868,'POS_SERVICES',1,'0','chaine',0,'','2013-01-19 17:16:51'),(2869,'POS_USE_TICKETS',1,'1','chaine',0,'','2013-01-19 17:16:51'),(2870,'POS_MAX_TTC',1,'100','chaine',0,'','2013-01-19 17:16:51'),(3190,'MAIN_MODULE_HOLIDAY',2,'1',NULL,0,NULL,'2013-02-01 08:52:34'),(3191,'MAIN_MODULE_HOLIDAY_TABS_0',2,'user:+paidholidays:CPTitreMenu:holiday:$user->rights->holiday->write:/holiday/index.php?mainmenu=holiday&id=__ID__','chaine',0,NULL,'2013-02-01 08:52:34'),(3195,'INVOICE_SUPPLIER_ADDON_PDF',1,'canelle','chaine',0,'','2013-02-10 19:50:27'),(3199,'MAIN_FORCE_RELOAD_PAGE',1,'1','chaine',0,NULL,'2013-02-12 16:22:55'),(3217,'MAIN_PDF_TITLE_BACKGROUND_COLOR',1,'240,240,240','chaine',1,'','2013-02-13 15:18:02'),(3223,'OVH_THIRDPARTY_IMPORT',1,'2','chaine',0,'','2013-02-13 16:20:18'),(3241,'COMPANY_USE_SEARCH_TO_SELECT',1,'2','chaine',0,'','2013-02-17 14:33:39'),(3409,'AGENDA_USE_EVENT_TYPE',1,'1','chaine',0,'','2013-02-27 18:12:24'),(3886,'MAIN_REMOVE_INSTALL_WARNING',1,'1','chaine',1,'','2013-03-02 18:32:50'),(4013,'MAIN_DELAY_ACTIONS_TODO',1,'7','chaine',0,'','2013-03-06 08:59:12'),(4014,'MAIN_DELAY_PROPALS_TO_CLOSE',1,'31','chaine',0,'','2013-03-06 08:59:12'),(4015,'MAIN_DELAY_PROPALS_TO_BILL',1,'7','chaine',0,'','2013-03-06 08:59:12'),(4016,'MAIN_DELAY_ORDERS_TO_PROCESS',1,'2','chaine',0,'','2013-03-06 08:59:12'),(4017,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',1,'31','chaine',0,'','2013-03-06 08:59:12'),(4018,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',1,'7','chaine',0,'','2013-03-06 08:59:12'),(4019,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',1,'2','chaine',0,'','2013-03-06 08:59:12'),(4020,'MAIN_DELAY_RUNNING_SERVICES',1,'-15','chaine',0,'','2013-03-06 08:59:12'),(4021,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',1,'62','chaine',0,'','2013-03-06 08:59:13'),(4022,'MAIN_DELAY_MEMBERS',1,'31','chaine',0,'','2013-03-06 08:59:13'),(4023,'MAIN_DISABLE_METEO',1,'0','chaine',0,'','2013-03-06 08:59:13'),(4044,'ADHERENT_VAT_FOR_SUBSCRIPTIONS',1,'0','',0,'','2013-03-06 16:06:38'),(4047,'ADHERENT_BANK_USE',1,'bankviainvoice','',0,'','2013-03-06 16:12:30'),(4049,'PHPSANE_SCANIMAGE',1,'/usr/bin/scanimage','chaine',0,'','2013-03-06 21:54:13'),(4050,'PHPSANE_PNMTOJPEG',1,'/usr/bin/pnmtojpeg','chaine',0,'','2013-03-06 21:54:13'),(4051,'PHPSANE_PNMTOTIFF',1,'/usr/bin/pnmtotiff','chaine',0,'','2013-03-06 21:54:13'),(4052,'PHPSANE_OCR',1,'/usr/bin/gocr','chaine',0,'','2013-03-06 21:54:13'),(4548,'ECM_AUTO_TREE_ENABLED',1,'1','chaine',0,'','2013-03-10 15:57:21'),(4555,'WEBSERVICES_KEY',1,'dolibarrkey','chaine',0,'','2013-03-13 10:19:31'),(4579,'MAIN_MODULE_AGENDA',2,'1',NULL,0,NULL,'2013-03-13 15:29:19'),(4580,'MAIN_AGENDA_ACTIONAUTO_COMPANY_CREATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4581,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4582,'MAIN_AGENDA_ACTIONAUTO_PROPAL_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4583,'MAIN_AGENDA_ACTIONAUTO_PROPAL_SENTBYMAIL',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4584,'MAIN_AGENDA_ACTIONAUTO_ORDER_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4585,'MAIN_AGENDA_ACTIONAUTO_ORDER_SENTBYMAIL',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4586,'MAIN_AGENDA_ACTIONAUTO_BILL_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4587,'MAIN_AGENDA_ACTIONAUTO_BILL_PAYED',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4588,'MAIN_AGENDA_ACTIONAUTO_BILL_CANCEL',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4589,'MAIN_AGENDA_ACTIONAUTO_BILL_SENTBYMAIL',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4590,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4591,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4592,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4593,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_SENTBYMAIL',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4594,'MAIN_AGENDA_ACTIONAUTO_BILL_UNVALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4595,'MAIN_MODULE_GOOGLE',2,'1',NULL,0,NULL,'2013-03-13 15:29:47'),(4596,'MAIN_MODULE_GOOGLE_TABS_0',2,'agenda:+gcal:MenuAgendaGoogle:google@google:$conf->google->enabled && $conf->global->GOOGLE_ENABLE_AGENDA:/google/index.php','chaine',0,NULL,'2013-03-13 15:29:47'),(4597,'MAIN_MODULE_GOOGLE_TABS_1',2,'user:+gsetup:GoogleUserConf:google@google:$conf->google->enabled && $conf->global->GOOGLE_DUPLICATE_INTO_GCAL:/google/admin/google_calsync_user.php?id=__ID__','chaine',0,NULL,'2013-03-13 15:29:47'),(4598,'MAIN_MODULE_GOOGLE_TRIGGERS',2,'1','chaine',0,NULL,'2013-03-13 15:29:47'),(4599,'MAIN_MODULE_GOOGLE_HOOKS',2,'[\"toprightmenu\"]','chaine',0,NULL,'2013-03-13 15:29:47'),(4688,'GOOGLE_ENABLE_AGENDA',2,'1','chaine',0,'','2013-03-13 15:36:29'),(4689,'GOOGLE_AGENDA_NAME1',2,'eldy','chaine',0,'','2013-03-13 15:36:29'),(4690,'GOOGLE_AGENDA_SRC1',2,'eldy10@mail.com','chaine',0,'','2013-03-13 15:36:29'),(4691,'GOOGLE_AGENDA_COLOR1',2,'BE6D00','chaine',0,'','2013-03-13 15:36:29'),(4692,'GOOGLE_AGENDA_COLOR2',2,'7A367A','chaine',0,'','2013-03-13 15:36:29'),(4693,'GOOGLE_AGENDA_COLOR3',2,'7A367A','chaine',0,'','2013-03-13 15:36:29'),(4694,'GOOGLE_AGENDA_COLOR4',2,'7A367A','chaine',0,'','2013-03-13 15:36:29'),(4695,'GOOGLE_AGENDA_COLOR5',2,'7A367A','chaine',0,'','2013-03-13 15:36:29'),(4696,'GOOGLE_AGENDA_TIMEZONE',2,'Europe/Paris','chaine',0,'','2013-03-13 15:36:29'),(4697,'GOOGLE_AGENDA_NB',2,'5','chaine',0,'','2013-03-13 15:36:29'),(4702,'MAIN_FEATURES_LEVEL',0,'1','chaine',1,'Level of features to show (0=stable only, 1=stable+experimental, 2=stable+experimental+development','2013-03-13 18:41:52'),(4711,'GOOGLE_ENABLE_AGENDA',1,'1','chaine',0,'','2013-03-13 19:37:38'),(4712,'GOOGLE_AGENDA_NAME1',1,'asso master','chaine',0,'','2013-03-13 19:37:38'),(4713,'GOOGLE_AGENDA_SRC1',1,'assodolibarr@mail.com','chaine',0,'','2013-03-13 19:37:38'),(4714,'GOOGLE_AGENDA_COLOR1',1,'1B887A','chaine',0,'','2013-03-13 19:37:38'),(4715,'GOOGLE_AGENDA_COLOR2',1,'7A367A','chaine',0,'','2013-03-13 19:37:38'),(4716,'GOOGLE_AGENDA_COLOR3',1,'7A367A','chaine',0,'','2013-03-13 19:37:38'),(4717,'GOOGLE_AGENDA_COLOR4',1,'7A367A','chaine',0,'','2013-03-13 19:37:38'),(4718,'GOOGLE_AGENDA_COLOR5',1,'7A367A','chaine',0,'','2013-03-13 19:37:38'),(4719,'GOOGLE_AGENDA_TIMEZONE',1,'Europe/Paris','chaine',0,'','2013-03-13 19:37:38'),(4720,'GOOGLE_AGENDA_NB',1,'5','chaine',0,'','2013-03-13 19:37:38'),(4725,'SOCIETE_CODECLIENT_ADDON',2,'mod_codeclient_leopard','chaine',0,'Module to control third parties codes','2013-03-13 20:21:35'),(4726,'SOCIETE_CODECOMPTA_ADDON',2,'mod_codecompta_panicum','chaine',0,'Module to control third parties codes','2013-03-13 20:21:35'),(4727,'SOCIETE_FISCAL_MONTH_START',2,'','chaine',0,'Mettre le numero du mois du debut d\\\'annee fiscale, ex: 9 pour septembre','2013-03-13 20:21:35'),(4728,'MAIN_SEARCHFORM_SOCIETE',2,'1','yesno',0,'Show form for quick company search','2013-03-13 20:21:35'),(4729,'MAIN_SEARCHFORM_CONTACT',2,'1','yesno',0,'Show form for quick contact search','2013-03-13 20:21:35'),(4730,'COMPANY_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/thirdparties','chaine',0,NULL,'2013-03-13 20:21:35'),(4743,'MAIN_MODULE_CLICKTODIAL',2,'1',NULL,0,NULL,'2013-03-13 20:30:28'),(4744,'MAIN_MODULE_NOTIFICATION',2,'1',NULL,0,NULL,'2013-03-13 20:30:34'),(4745,'MAIN_MODULE_WEBSERVICES',2,'1',NULL,0,NULL,'2013-03-13 20:30:41'),(4746,'MAIN_MODULE_PROPALE',2,'1',NULL,0,NULL,'2013-03-13 20:32:38'),(4747,'PROPALE_ADDON_PDF',2,'azur','chaine',0,'Nom du gestionnaire de generation des propales en PDF','2013-03-13 20:32:38'),(4748,'PROPALE_ADDON',2,'mod_propale_marbre','chaine',0,'Nom du gestionnaire de numerotation des propales','2013-03-13 20:32:38'),(4749,'PROPALE_VALIDITY_DURATION',2,'15','chaine',0,'Duration of validity of business proposals','2013-03-13 20:32:38'),(4750,'PROPALE_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/proposals','chaine',0,NULL,'2013-03-13 20:32:38'),(4752,'MAIN_MODULE_TAX',2,'1',NULL,0,NULL,'2013-03-13 20:32:47'),(4753,'MAIN_MODULE_DON',2,'1',NULL,0,NULL,'2013-03-13 20:32:54'),(4754,'DON_ADDON_MODEL',2,'html_cerfafr','chaine',0,'Nom du gestionnaire de generation de recu de dons','2013-03-13 20:32:54'),(4755,'POS_USE_TICKETS',2,'1','chaine',0,'','2013-03-13 20:33:09'),(4756,'POS_MAX_TTC',2,'100','chaine',0,'','2013-03-13 20:33:09'),(4757,'MAIN_MODULE_POS',2,'1',NULL,0,NULL,'2013-03-13 20:33:09'),(4758,'TICKET_ADDON',2,'mod_ticket_avenc','chaine',0,'Nom du gestionnaire de numerotation des tickets','2013-03-13 20:33:09'),(4759,'MAIN_MODULE_BANQUE',2,'1',NULL,0,NULL,'2013-03-13 20:33:09'),(4760,'MAIN_MODULE_FACTURE',2,'1',NULL,0,NULL,'2013-03-13 20:33:09'),(4761,'FACTURE_ADDON_PDF',2,'crabe','chaine',0,'Name of PDF model of invoice','2013-03-13 20:33:09'),(4762,'FACTURE_ADDON',2,'mod_facture_terre','chaine',0,'Name of numbering numerotation rules of invoice','2013-03-13 20:33:09'),(4763,'FACTURE_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/invoices','chaine',0,NULL,'2013-03-13 20:33:09'),(4764,'MAIN_MODULE_SOCIETE',2,'1',NULL,0,NULL,'2013-03-13 20:33:09'),(4765,'MAIN_MODULE_PRODUCT',2,'1',NULL,0,NULL,'2013-03-13 20:33:09'),(4766,'PRODUCT_CODEPRODUCT_ADDON',2,'mod_codeproduct_leopard','chaine',0,'Module to control product codes','2013-03-13 20:33:09'),(4767,'MAIN_SEARCHFORM_PRODUITSERVICE',2,'1','yesno',0,'Show form for quick product search','2013-03-13 20:33:09'),(4772,'FACSIM_ADDON',2,'mod_facsim_alcoy','chaine',0,'','2013-03-13 20:33:32'),(4773,'MAIN_MODULE_MAILING',2,'1',NULL,0,NULL,'2013-03-13 20:33:37'),(4774,'MAIN_MODULE_OPENSURVEY',2,'1',NULL,0,NULL,'2013-03-13 20:33:42'),(4782,'AGENDA_USE_EVENT_TYPE',2,'1','chaine',0,'','2013-03-13 20:53:36'),(4884,'AGENDA_DISABLE_EXT',2,'1','chaine',0,'','2013-03-13 22:03:40'),(4919,'MAIN_MODULE_COMPTABILITE',1,'1',NULL,0,NULL,'2013-03-20 20:04:28'),(4922,'MAIN_MODULE_BANQUE',1,'1',NULL,0,NULL,'2013-03-20 20:04:28'),(4928,'COMMANDE_SUPPLIER_ADDON_NUMBER',1,'mod_commande_fournisseur_muguet','chaine',0,'Nom du gestionnaire de numerotation des commandes fournisseur','2013-03-22 09:24:29'),(4929,'INVOICE_SUPPLIER_ADDON_NUMBER',1,'mod_facture_fournisseur_cactus','chaine',0,'Nom du gestionnaire de numerotation des factures fournisseur','2013-03-22 09:24:29'),(4986,'MAIN_MODULE_CRON',1,'1',NULL,0,NULL,'2013-03-23 17:24:25'),(5001,'MAIN_CRON_KEY',0,'bc54582fe30d5d4a830c6f582ec28810','chaine',0,'','2013-03-23 17:54:53'),(5009,'CRON_KEY',0,'2c2e755c20be2014098f629865598006','chaine',0,'','2013-03-23 18:06:24'),(5075,'MAIN_MENU_STANDARD',1,'eldy_menu.php','chaine',0,'','2013-03-24 02:51:13'),(5076,'MAIN_MENU_SMARTPHONE',1,'eldy_menu.php','chaine',0,'','2013-03-24 02:51:13'),(5077,'MAIN_MENUFRONT_STANDARD',1,'eldy_menu.php','chaine',0,'','2013-03-24 02:51:13'),(5078,'MAIN_MENUFRONT_SMARTPHONE',1,'eldy_menu.php','chaine',0,'','2013-03-24 02:51:13'),(5079,'MAIN_MODULE_OPENSURVEY',1,'1',NULL,0,NULL,'2013-03-24 02:57:18'),(5083,'FCKEDITOR_ENABLE_USERSIGN',1,'1','chaine',1,'','2013-03-24 15:59:39'),(5102,'MAIN_INFO_SOCIETE_COUNTRY',1,'1:FR:France','chaine',0,'','2013-03-24 18:34:54'),(5103,'MAIN_INFO_SOCIETE_NOM',1,'MyBigCompany','chaine',0,'','2013-03-24 18:34:54'),(5104,'MAIN_INFO_SOCIETE_ADDRESS',1,'21 Jump street','chaine',0,'','2013-03-24 18:34:54'),(5105,'MAIN_INFO_SOCIETE_TOWN',1,'MyTown','chaine',0,'','2013-03-24 18:34:54'),(5106,'MAIN_INFO_SOCIETE_ZIP',1,'75500','chaine',0,'','2013-03-24 18:34:54'),(5107,'MAIN_INFO_SOCIETE_STATE',1,'0','chaine',0,'','2013-03-24 18:34:54'),(5108,'MAIN_MONNAIE',1,'EUR','chaine',0,'','2013-03-24 18:34:54'),(5109,'MAIN_INFO_SOCIETE_TEL',1,'09123123','chaine',0,'','2013-03-24 18:34:54'),(5110,'MAIN_INFO_SOCIETE_FAX',1,'09123124','chaine',0,'','2013-03-24 18:34:54'),(5111,'MAIN_INFO_SOCIETE_MAIL',1,'myemail@mybigcompany.com','chaine',0,'','2013-03-24 18:34:54'),(5112,'MAIN_INFO_SOCIETE_WEB',1,'http://www.dolibarr.org','chaine',0,'','2013-03-24 18:34:54'),(5113,'MAIN_INFO_SOCIETE_NOTE',1,'This is note about my company','chaine',0,'','2013-03-24 18:34:54'),(5114,'MAIN_INFO_CAPITAL',1,'10000','chaine',0,'','2013-03-24 18:34:54'),(5115,'MAIN_INFO_SOCIETE_FORME_JURIDIQUE',1,'0','chaine',0,'','2013-03-24 18:34:54'),(5116,'MAIN_INFO_TVAINTRA',1,'IN1234567','chaine',0,'','2013-03-24 18:34:54'),(5117,'SOCIETE_FISCAL_MONTH_START',1,'0','chaine',0,'','2013-03-24 18:34:54'),(5118,'FACTURE_TVAOPTION',1,'reel','chaine',0,'','2013-03-24 18:34:54'),(5119,'MAIN_LANG_DEFAULT',1,'en_US','chaine',0,'','2013-03-24 18:35:07'),(5120,'MAIN_MULTILANGS',1,'1','chaine',0,'','2013-03-24 18:35:07'),(5121,'MAIN_SIZE_LISTE_LIMIT',1,'25','chaine',0,'','2013-03-24 18:35:07'),(5122,'MAIN_DISABLE_JAVASCRIPT',1,'0','chaine',0,'','2013-03-24 18:35:07'),(5123,'MAIN_BUTTON_HIDE_UNAUTHORIZED',1,'0','chaine',0,'','2013-03-24 18:35:07'),(5124,'MAIN_START_WEEK',1,'1','chaine',0,'','2013-03-24 18:35:07'),(5125,'MAIN_SHOW_LOGO',1,'0','chaine',0,'','2013-03-24 18:35:07'),(5126,'MAIN_FIRSTNAME_NAME_POSITION',1,'0','chaine',0,'','2013-03-24 18:35:07'),(5127,'MAIN_THEME',1,'eldy','chaine',0,'','2013-03-24 18:35:07'),(5128,'MAIN_SEARCHFORM_CONTACT',1,'1','chaine',0,'','2013-03-24 18:35:07'),(5129,'MAIN_SEARCHFORM_SOCIETE',1,'1','chaine',0,'','2013-03-24 18:35:07'),(5130,'MAIN_SEARCHFORM_PRODUITSERVICE',1,'1','chaine',0,'','2013-03-24 18:35:07'),(5131,'MAIN_SEARCHFORM_ADHERENT',1,'1','chaine',0,'','2013-03-24 18:35:07'),(5132,'MAIN_HELPCENTER_DISABLELINK',0,'1','chaine',0,'','2013-03-24 18:35:07'),(5133,'MAIN_HOME',1,'__(NoteSomeFeaturesAreDisabled)__
\r\n
\r\n__(SomeTranslationAreUncomplete)__','chaine',0,'','2013-03-24 18:35:07'),(5134,'MAIN_HELP_DISABLELINK',0,'0','chaine',0,'','2013-03-24 18:35:07'),(5135,'MAIN_BUGTRACK_ENABLELINK',1,'0','chaine',0,'','2013-03-24 18:35:07'),(5137,'MAIN_AGENDA_ACTIONAUTO_BILL_UNVALIDATE',1,'1','chaine',0,NULL,'2013-09-08 23:06:08'),(5139,'SOCIETE_ADD_REF_IN_LIST',1,'','yesno',0,'Display customer ref into select list','2013-09-08 23:06:08'),(5150,'PROJECT_TASK_ADDON_PDF',1,'','chaine',0,'Name of PDF/ODT tasks manager class','2013-09-08 23:06:14'),(5151,'PROJECT_TASK_ADDON',1,'mod_task_simple','chaine',0,'Name of Numbering Rule task manager class','2013-09-08 23:06:14'),(5152,'PROJECT_TASK_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/tasks','chaine',0,'','2013-09-08 23:06:14'),(5164,'MAIN_AGENDA_ACTIONAUTO_COMPANY_SENTBYMAIL',1,'1','chaine',0,NULL,'2013-11-06 23:35:12'),(5190,'MAIN_MODULE_GOOGLE',1,'1',NULL,0,NULL,'2013-11-07 00:01:39'),(5191,'MAIN_MODULE_GOOGLE_TABS_0',1,'agenda:+gcal:MenuAgendaGoogle:google@google:$conf->google->enabled && $conf->global->GOOGLE_ENABLE_AGENDA:/google/index.php','chaine',0,NULL,'2013-11-07 00:01:39'),(5192,'MAIN_MODULE_GOOGLE_TABS_1',1,'user:+gsetup:GoogleUserConf:google@google:$conf->google->enabled && $conf->global->GOOGLE_DUPLICATE_INTO_GCAL:/google/admin/google_calsync_user.php?id=__ID__','chaine',0,NULL,'2013-11-07 00:01:39'),(5193,'MAIN_MODULE_GOOGLE_TRIGGERS',1,'1','chaine',0,NULL,'2013-11-07 00:01:39'),(5194,'MAIN_MODULE_GOOGLE_HOOKS',1,'[\"toprightmenu\"]','chaine',0,NULL,'2013-11-07 00:01:39'),(5195,'GOOGLE_DUPLICATE_INTO_THIRDPARTIES',1,'1','chaine',0,'','2013-11-07 00:02:34'),(5196,'GOOGLE_DUPLICATE_INTO_CONTACTS',1,'0','chaine',0,'','2013-11-07 00:02:34'),(5197,'GOOGLE_DUPLICATE_INTO_MEMBERS',1,'0','chaine',0,'','2013-11-07 00:02:34'),(5198,'GOOGLE_CONTACT_LOGIN',1,'eldy10@mail.com','chaine',0,'','2013-11-07 00:02:34'),(5199,'GOOGLE_CONTACT_PASSWORD',1,'bidon','chaine',0,'','2013-11-07 00:02:34'),(5200,'GOOGLE_TAG_PREFIX',1,'Dolibarr (Thirdparties)','chaine',0,'','2013-11-07 00:02:34'),(5201,'GOOGLE_TAG_PREFIX_CONTACTS',1,'Dolibarr (Contacts/Addresses)','chaine',0,'','2013-11-07 00:02:34'),(5202,'GOOGLE_TAG_PREFIX_MEMBERS',1,'Dolibarr (Members)','chaine',0,'','2013-11-07 00:02:34'),(5203,'MODULE_GOOGLE_DEBUG',1,'1','chaine',1,'','2013-11-07 00:16:31'),(5221,'MAIN_MODULE_AGENDA',1,'1',NULL,0,NULL,'2014-04-05 14:19:21'),(5222,'MAIN_MODULE_SOCIETE',1,'1',NULL,0,NULL,'2014-04-05 14:19:21'),(5223,'MAIN_MODULE_SERVICE',1,'1',NULL,0,NULL,'2014-04-05 14:19:22'),(5224,'MAIN_MODULE_COMMANDE',1,'1',NULL,0,NULL,'2014-04-05 14:19:22'),(5225,'MAIN_MODULE_FACTURE',1,'1',NULL,0,NULL,'2014-04-05 14:19:22'),(5226,'MAIN_MODULE_FOURNISSEUR',1,'1',NULL,0,NULL,'2014-04-05 14:19:22'),(5227,'MAIN_MODULE_USER',0,'1',NULL,0,NULL,'2014-04-05 14:19:22'),(5228,'MAIN_MODULE_DEPLACEMENT',1,'1',NULL,0,NULL,'2014-04-05 14:19:22'),(5229,'MAIN_MODULE_DON',1,'1',NULL,0,NULL,'2014-04-05 14:19:22'),(5230,'MAIN_MODULE_ECM',1,'1',NULL,0,NULL,'2014-04-05 14:19:22'),(5231,'MAIN_VERSION_LAST_UPGRADE',0,'3.5.2','chaine',0,'Dolibarr version for last upgrade','2014-04-05 14:19:24'),(5233,'MAIN_DISABLE_ALL_MAILS',1,'1','chaine',0,'','2014-04-05 14:20:25'),(5234,'MAIN_MAIL_SENDMODE',0,'mail','chaine',0,'','2014-04-05 14:20:25'),(5235,'MAIN_MAIL_SMTPS_ID',0,'eldy10@mail.com','chaine',0,'','2014-04-05 14:20:25'),(5236,'MAIN_MAIL_SMTPS_PW',0,'bidon','chaine',0,'','2014-04-05 14:20:25'); +INSERT INTO `llx_const` VALUES (5,'SYSLOG_LEVEL',0,'7','chaine',0,'Level of debug info to show','2010-07-08 11:17:57'),(8,'MAIN_UPLOAD_DOC',0,'2048','chaine',0,'Max size for file upload (0 means no upload allowed)','2010-07-08 11:17:57'),(9,'MAIN_SEARCHFORM_SOCIETE',0,'1','yesno',0,'Show form for quick company search','2010-07-08 11:17:57'),(10,'MAIN_SEARCHFORM_CONTACT',0,'1','yesno',0,'Show form for quick contact search','2010-07-08 11:17:57'),(11,'MAIN_SEARCHFORM_PRODUITSERVICE',0,'1','yesno',0,'Show form for quick product search','2010-07-08 11:17:58'),(12,'MAIN_SEARCHFORM_ADHERENT',0,'1','yesno',0,'Show form for quick member search','2010-07-08 11:17:58'),(16,'MAIN_SIZE_LISTE_LIMIT',0,'25','chaine',0,'Longueur maximum des listes','2010-07-08 11:17:58'),(17,'MAIN_SHOW_WORKBOARD',0,'1','yesno',0,'Affichage tableau de bord de travail Dolibarr','2010-07-08 11:17:58'),(29,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',1,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2010-07-08 11:17:58'),(33,'SOCIETE_NOLIST_COURRIER',0,'1','yesno',0,'Liste les fichiers du repertoire courrier','2010-07-08 11:17:58'),(35,'SOCIETE_CODECOMPTA_ADDON',1,'mod_codecompta_panicum','yesno',0,'Module to control third parties codes','2010-07-08 11:17:58'),(36,'ADHERENT_MAIL_REQUIRED',1,'1','yesno',0,'EMail required to create a new member','2010-07-08 11:17:58'),(37,'ADHERENT_MAIL_FROM',1,'adherents@domain.com','chaine',0,'Sender EMail for automatic emails','2010-07-08 11:17:58'),(38,'ADHERENT_MAIL_RESIL',1,'Your subscription has been resiliated.\r\nWe hope to see you soon again','texte',0,'Mail resiliation','2010-07-08 11:17:58'),(39,'ADHERENT_MAIL_VALID',1,'Your subscription has been validated.\r\nThis is a remind of your personal information :\r\n\r\n%INFOS%\r\n\r\n','texte',0,'Mail de validation','2010-07-08 11:17:59'),(40,'ADHERENT_MAIL_COTIS',1,'Hello %PRENOM%,\r\nThanks for your subscription.\r\nThis email confirms that your subscription has been received and processed.\r\n\r\n','texte',0,'Mail de validation de cotisation','2010-07-08 11:17:59'),(41,'ADHERENT_MAIL_VALID_SUBJECT',1,'Your subscription has been validated','chaine',0,'Sujet du mail de validation','2010-07-08 11:17:59'),(42,'ADHERENT_MAIL_RESIL_SUBJECT',1,'Resiliating your subscription','chaine',0,'Sujet du mail de resiliation','2010-07-08 11:17:59'),(43,'ADHERENT_MAIL_COTIS_SUBJECT',1,'Receipt of your subscription','chaine',0,'Sujet du mail de validation de cotisation','2010-07-08 11:17:59'),(44,'MAILING_EMAIL_FROM',1,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2010-07-08 11:17:59'),(45,'ADHERENT_USE_MAILMAN',1,'0','yesno',0,'Utilisation de Mailman','2010-07-08 11:17:59'),(46,'ADHERENT_MAILMAN_UNSUB_URL',1,'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&user=%EMAIL%','chaine',0,'Url de desinscription aux listes mailman','2010-07-08 11:17:59'),(47,'ADHERENT_MAILMAN_URL',1,'http://lists.domain.com/cgi-bin/mailman/admin/%LISTE%/members?adminpw=%MAILMAN_ADMINPW%&send_welcome_msg_to_this_batch=1&subscribees=%EMAIL%','chaine',0,'Url pour les inscriptions mailman','2010-07-08 11:17:59'),(48,'ADHERENT_MAILMAN_LISTS',1,'test-test,test-test2','chaine',0,'Listes auxquelles inscrire les nouveaux adherents','2010-07-08 11:17:59'),(49,'ADHERENT_MAILMAN_ADMINPW',1,'','chaine',0,'Mot de passe Admin des liste mailman','2010-07-08 11:17:59'),(50,'ADHERENT_MAILMAN_SERVER',1,'lists.domain.com','chaine',0,'Serveur hebergeant les interfaces d Admin des listes mailman','2010-07-08 11:17:59'),(51,'ADHERENT_MAILMAN_LISTS_COTISANT',1,'','chaine',0,'Liste(s) auxquelles les nouveaux cotisants sont inscris automatiquement','2010-07-08 11:17:59'),(52,'ADHERENT_USE_SPIP',1,'0','yesno',0,'Utilisation de SPIP ?','2010-07-08 11:17:59'),(53,'ADHERENT_USE_SPIP_AUTO',1,'0','yesno',0,'Utilisation de SPIP automatiquement','2010-07-08 11:17:59'),(54,'ADHERENT_SPIP_USER',1,'user','chaine',0,'user spip','2010-07-08 11:17:59'),(55,'ADHERENT_SPIP_PASS',1,'pass','chaine',0,'Pass de connection','2010-07-08 11:17:59'),(56,'ADHERENT_SPIP_SERVEUR',1,'localhost','chaine',0,'serveur spip','2010-07-08 11:17:59'),(57,'ADHERENT_SPIP_DB',1,'spip','chaine',0,'db spip','2010-07-08 11:17:59'),(58,'ADHERENT_CARD_HEADER_TEXT',1,'%ANNEE%','chaine',0,'Texte imprime sur le haut de la carte adherent','2010-07-08 11:17:59'),(59,'ADHERENT_CARD_FOOTER_TEXT',1,'Association AZERTY','chaine',0,'Texte imprime sur le bas de la carte adherent','2010-07-08 11:17:59'),(61,'FCKEDITOR_ENABLE_USER',1,'1','yesno',0,'Activation fckeditor sur notes utilisateurs','2010-07-08 11:17:59'),(62,'FCKEDITOR_ENABLE_SOCIETE',1,'1','yesno',0,'Activation fckeditor sur notes societe','2010-07-08 11:17:59'),(63,'FCKEDITOR_ENABLE_PRODUCTDESC',1,'1','yesno',0,'Activation fckeditor sur notes produits','2010-07-08 11:17:59'),(64,'FCKEDITOR_ENABLE_MEMBER',1,'1','yesno',0,'Activation fckeditor sur notes adherent','2010-07-08 11:17:59'),(65,'FCKEDITOR_ENABLE_MAILING',1,'1','yesno',0,'Activation fckeditor sur emailing','2010-07-08 11:17:59'),(66,'OSC_DB_HOST',1,'localhost','chaine',0,'Host for OSC database for OSCommerce module 1','2010-07-08 11:17:59'),(67,'DON_ADDON_MODEL',1,'html_cerfafr','chaine',0,'','2010-07-08 11:18:00'),(68,'PROPALE_ADDON',1,'mod_propale_marbre','chaine',0,'','2010-07-08 11:18:00'),(69,'PROPALE_ADDON_PDF',1,'azur','chaine',0,'','2010-07-08 11:18:00'),(70,'COMMANDE_ADDON',1,'mod_commande_marbre','chaine',0,'','2010-07-08 11:18:00'),(71,'COMMANDE_ADDON_PDF',1,'einstein','chaine',0,'','2010-07-08 11:18:00'),(72,'COMMANDE_SUPPLIER_ADDON',1,'mod_commande_fournisseur_muguet','chaine',0,'','2010-07-08 11:18:00'),(73,'COMMANDE_SUPPLIER_ADDON_PDF',1,'muscadet','chaine',0,'','2010-07-08 11:18:00'),(74,'EXPEDITION_ADDON',1,'enlevement','chaine',0,'','2010-07-08 11:18:00'),(76,'FICHEINTER_ADDON',1,'pacific','chaine',0,'','2010-07-08 11:18:00'),(77,'FICHEINTER_ADDON_PDF',1,'soleil','chaine',0,'','2010-07-08 11:18:00'),(79,'FACTURE_ADDON_PDF',1,'crabe','chaine',0,'','2010-07-08 11:18:00'),(80,'PROPALE_VALIDITY_DURATION',1,'15','chaine',0,'Durée de validitée des propales','2010-07-08 11:18:00'),(230,'COMPANY_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/thirdparties','chaine',0,NULL,'2010-07-08 11:26:20'),(238,'LIVRAISON_ADDON_PDF',1,'typhon','chaine',0,'Nom du gestionnaire de generation des commandes en PDF','2010-07-08 11:26:27'),(239,'LIVRAISON_ADDON_NUMBER',1,'mod_livraison_jade','chaine',0,'Nom du gestionnaire de numerotation des bons de livraison','2013-03-20 13:17:36'),(242,'MAIN_SUBMODULE_EXPEDITION',1,'1','chaine',0,'','2010-07-08 11:26:34'),(245,'FACTURE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/invoices','chaine',0,NULL,'2010-07-08 11:28:53'),(249,'DON_FORM',1,'fsfe.fr.php','chaine',0,'Nom du gestionnaire de formulaire de dons','2010-07-08 11:29:00'),(252,'MAIN_MODULE_ADHERENT',1,'1',NULL,0,NULL,'2010-07-08 11:29:05'),(253,'ADHERENT_BANK_USE_AUTO',1,'','yesno',0,'Insertion automatique des cotisation dans le compte banquaire','2010-07-08 11:29:05'),(254,'ADHERENT_BANK_ACCOUNT',1,'','chaine',0,'ID du Compte banquaire utilise','2010-07-08 11:29:05'),(255,'ADHERENT_BANK_CATEGORIE',1,'','chaine',0,'ID de la categorie banquaire des cotisations','2010-07-08 11:29:05'),(256,'ADHERENT_ETIQUETTE_TYPE',1,'L7163','chaine',0,'Type d etiquette (pour impression de planche d etiquette)','2010-07-08 11:29:05'),(260,'MAIN_MODULE_STOCK',1,'1',NULL,0,NULL,'2010-07-08 11:29:18'),(269,'PROJECT_ADDON_PDF',1,'baleine','chaine',0,'Nom du gestionnaire de generation des projets en PDF','2010-07-08 11:29:33'),(270,'PROJECT_ADDON',1,'mod_project_simple','chaine',0,'Nom du gestionnaire de numerotation des projets','2010-07-08 11:29:33'),(271,'MAIN_MODULE_MAILING',1,'1',NULL,0,NULL,'2010-07-08 11:29:37'),(272,'MAIN_MODULE_EXPORT',1,'1',NULL,0,NULL,'2010-07-08 11:29:41'),(273,'MAIN_MODULE_IMPORT',1,'1',NULL,0,NULL,'2010-07-08 11:29:45'),(274,'MAIN_MODULE_CATEGORIE',1,'1',NULL,0,NULL,'2010-07-08 11:29:59'),(275,'MAIN_MODULE_BOOKMARK',1,'1',NULL,0,NULL,'2010-07-08 11:30:03'),(276,'MAIN_MODULE_WEBSERVICES',1,'1',NULL,0,NULL,'2010-07-08 11:30:30'),(278,'MAIN_MODULE_GEOIPMAXMIND',1,'1',NULL,0,NULL,'2010-07-08 11:30:36'),(279,'MAIN_MODULE_EXTERNALRSS',1,'1',NULL,0,NULL,'2010-07-08 11:30:38'),(292,'MAIN_MODULE_FCKEDITOR',1,'1',NULL,0,NULL,'2010-07-08 11:56:27'),(368,'STOCK_USERSTOCK_AUTOCREATE',1,'1','chaine',0,'','2010-07-08 22:44:59'),(369,'EXPEDITION_ADDON_PDF',1,'merou','chaine',0,'','2010-07-08 22:58:07'),(370,'MAIN_SUBMODULE_LIVRAISON',1,'1','chaine',0,'','2010-07-08 23:00:29'),(377,'FACTURE_ADDON',1,'mod_facture_terre','chaine',0,'','2010-07-08 23:08:12'),(380,'ADHERENT_CARD_TEXT',1,'%TYPE% n° %ID%\r\n%PRENOM% %NOM%\r\n<%EMAIL%>\r\n%ADRESSE%\r\n%CP% %VILLE%\r\n%PAYS%','',0,'Texte imprime sur la carte adherent','2010-07-08 23:14:46'),(381,'ADHERENT_CARD_TEXT_RIGHT',1,'aaa','',0,'','2010-07-08 23:14:55'),(384,'PRODUIT_SOUSPRODUITS',1,'1','chaine',0,'','2010-07-08 23:22:12'),(385,'PRODUIT_USE_SEARCH_TO_SELECT',1,'1','chaine',0,'','2010-07-08 23:22:19'),(386,'STOCK_CALCULATE_ON_SHIPMENT',1,'1','chaine',0,'','2010-07-08 23:23:21'),(387,'STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER',1,'1','chaine',0,'','2010-07-08 23:23:26'),(392,'MAIN_AGENDA_XCAL_EXPORTKEY',1,'dolibarr','chaine',0,'','2010-07-08 23:27:50'),(393,'MAIN_AGENDA_EXPORT_PAST_DELAY',1,'100','chaine',0,'','2010-07-08 23:27:50'),(523,'MAIN_AGENDA_ACTIONAUTO_COMPANY_CREATE',1,'1','chaine',0,'','2010-07-10 12:48:49'),(524,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_VALIDATE',1,'1','chaine',0,'','2010-07-10 12:48:49'),(525,'MAIN_AGENDA_ACTIONAUTO_PROPAL_VALIDATE',1,'1','chaine',0,'','2010-07-10 12:48:49'),(526,'MAIN_AGENDA_ACTIONAUTO_PROPAL_SENTBYMAIL',1,'1','chaine',0,'','2010-07-10 12:48:49'),(527,'MAIN_AGENDA_ACTIONAUTO_ORDER_VALIDATE',1,'1','chaine',0,'','2010-07-10 12:48:49'),(528,'MAIN_AGENDA_ACTIONAUTO_ORDER_SENTBYMAIL',1,'1','chaine',0,'','2010-07-10 12:48:49'),(529,'MAIN_AGENDA_ACTIONAUTO_BILL_VALIDATE',1,'1','chaine',0,'','2010-07-10 12:48:49'),(530,'MAIN_AGENDA_ACTIONAUTO_BILL_PAYED',1,'1','chaine',0,'','2010-07-10 12:48:49'),(531,'MAIN_AGENDA_ACTIONAUTO_BILL_CANCEL',1,'1','chaine',0,'','2010-07-10 12:48:49'),(532,'MAIN_AGENDA_ACTIONAUTO_BILL_SENTBYMAIL',1,'1','chaine',0,'','2010-07-10 12:48:49'),(533,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2010-07-10 12:48:50'),(534,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2010-07-10 12:48:50'),(602,'MAIN_MODULE_PROJET',1,'1',NULL,0,NULL,'2010-07-11 13:26:54'),(610,'CASHDESK_ID_THIRDPARTY',1,'7','chaine',0,'','2010-07-11 17:08:18'),(611,'CASHDESK_ID_BANKACCOUNT_CASH',1,'3','chaine',0,'','2010-07-11 17:08:18'),(612,'CASHDESK_ID_BANKACCOUNT_CHEQUE',1,'1','chaine',0,'','2010-07-11 17:08:18'),(613,'CASHDESK_ID_BANKACCOUNT_CB',1,'1','chaine',0,'','2010-07-11 17:08:18'),(614,'CASHDESK_ID_WAREHOUSE',1,'2','chaine',0,'','2010-07-11 17:08:18'),(660,'LDAP_USER_DN',1,'ou=users,dc=my-domain,dc=com','chaine',0,NULL,'2010-07-18 10:25:27'),(661,'LDAP_GROUP_DN',1,'ou=groups,dc=my-domain,dc=com','chaine',0,NULL,'2010-07-18 10:25:27'),(662,'LDAP_FILTER_CONNECTION',1,'&(objectClass=user)(objectCategory=person)','chaine',0,NULL,'2010-07-18 10:25:27'),(663,'LDAP_FIELD_LOGIN',1,'uid','chaine',0,NULL,'2010-07-18 10:25:27'),(664,'LDAP_FIELD_FULLNAME',1,'cn','chaine',0,NULL,'2010-07-18 10:25:27'),(665,'LDAP_FIELD_NAME',1,'sn','chaine',0,NULL,'2010-07-18 10:25:27'),(666,'LDAP_FIELD_FIRSTNAME',1,'givenname','chaine',0,NULL,'2010-07-18 10:25:27'),(667,'LDAP_FIELD_MAIL',1,'mail','chaine',0,NULL,'2010-07-18 10:25:27'),(668,'LDAP_FIELD_PHONE',1,'telephonenumber','chaine',0,NULL,'2010-07-18 10:25:27'),(669,'LDAP_FIELD_FAX',1,'facsimiletelephonenumber','chaine',0,NULL,'2010-07-18 10:25:27'),(670,'LDAP_FIELD_MOBILE',1,'mobile','chaine',0,NULL,'2010-07-18 10:25:27'),(671,'LDAP_SERVER_TYPE',1,'openldap','chaine',0,'','2010-07-18 10:25:46'),(672,'LDAP_SERVER_PROTOCOLVERSION',1,'3','chaine',0,'','2010-07-18 10:25:47'),(673,'LDAP_SERVER_HOST',1,'localhost','chaine',0,'','2010-07-18 10:25:47'),(674,'LDAP_SERVER_PORT',1,'389','chaine',0,'','2010-07-18 10:25:47'),(675,'LDAP_SERVER_USE_TLS',1,'0','chaine',0,'','2010-07-18 10:25:47'),(676,'LDAP_SYNCHRO_ACTIVE',1,'dolibarr2ldap','chaine',0,'','2010-07-18 10:25:47'),(677,'LDAP_CONTACT_ACTIVE',1,'1','chaine',0,'','2010-07-18 10:25:47'),(678,'LDAP_MEMBER_ACTIVE',1,'1','chaine',0,'','2010-07-18 10:25:47'),(807,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_VALIDATE',1,'1','chaine',0,NULL,'2011-07-18 17:27:52'),(808,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_SENTBYMAIL',1,'1','chaine',0,NULL,'2011-07-18 17:27:52'),(834,'MAIN_MODULE_CASHDESK',1,'1',NULL,0,NULL,'2011-07-18 17:30:24'),(969,'MAIN_MODULE_PRELEVEMENT',1,'1',NULL,0,NULL,'2011-07-18 18:01:59'),(973,'MAIN_MODULE_WORKFLOW',1,'1',NULL,0,NULL,'2011-07-18 18:02:20'),(974,'MAIN_MODULE_WORKFLOW_TRIGGERS',1,'1','chaine',0,NULL,'2011-07-18 18:02:20'),(975,'WORKFLOW_PROPAL_AUTOCREATE_ORDER',1,'1','chaine',0,'','2011-07-18 18:02:24'),(978,'MAIN_MODULE_NOTIFICATION',1,'1',NULL,0,NULL,'2011-07-18 18:03:06'),(979,'PRELEVEMENT_USER',1,'1','chaine',0,'','2011-07-18 18:05:50'),(980,'PRELEVEMENT_NUMERO_NATIONAL_EMETTEUR',1,'1234567','chaine',0,'','2011-07-18 18:05:50'),(981,'PRELEVEMENT_ID_BANKACCOUNT',1,'1','chaine',0,'','2011-07-18 18:05:50'),(983,'FACTURE_RIB_NUMBER',1,'1','chaine',0,'','2011-07-18 18:35:14'),(984,'FACTURE_CHQ_NUMBER',1,'1','chaine',0,'','2011-07-18 18:35:14'),(1016,'GOOGLE_DUPLICATE_INTO_GCAL',1,'1','chaine',0,'','2011-07-18 21:40:20'),(1018,'MAIN_MODULE_SYSLOG',0,'1',NULL,0,NULL,'2011-07-20 11:36:47'),(1098,'MAIN_INFO_SOCIETE_LOGO',1,'dolibarr_125x125.png','chaine',0,'','2011-07-28 18:42:09'),(1099,'MAIN_INFO_SOCIETE_LOGO_SMALL',1,'dolibarr_125x125_small.png','chaine',0,'','2011-07-28 18:42:09'),(1100,'MAIN_INFO_SOCIETE_LOGO_MINI',1,'dolibarr_125x125_mini.png','chaine',0,'','2011-07-28 18:42:09'),(1138,'MAIN_VERSION_LAST_INSTALL',0,'3.1.0-beta','chaine',0,'Dolibarr version when install','2011-07-28 23:05:02'),(1152,'SOCIETE_CODECLIENT_ADDON',1,'mod_codeclient_monkey','chaine',0,'','2011-07-29 20:50:02'),(1231,'MAIN_UPLOAD_DOC',1,'2048','chaine',0,'','2011-07-29 21:04:00'),(1234,'MAIN_UMASK',1,'0664','chaine',0,'','2011-07-29 21:04:11'),(1240,'MAIN_LOGEVENTS_USER_LOGIN',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1241,'MAIN_LOGEVENTS_USER_LOGIN_FAILED',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1242,'MAIN_LOGEVENTS_USER_LOGOUT',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1243,'MAIN_LOGEVENTS_USER_CREATE',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1244,'MAIN_LOGEVENTS_USER_MODIFY',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1245,'MAIN_LOGEVENTS_USER_NEW_PASSWORD',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1246,'MAIN_LOGEVENTS_USER_ENABLEDISABLE',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1247,'MAIN_LOGEVENTS_USER_DELETE',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1248,'MAIN_LOGEVENTS_GROUP_CREATE',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1249,'MAIN_LOGEVENTS_GROUP_MODIFY',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1250,'MAIN_LOGEVENTS_GROUP_DELETE',1,'1','chaine',0,'','2011-07-29 21:05:01'),(1251,'MAIN_BOXES_MAXLINES',1,'5','',0,'','2011-07-29 21:05:42'),(1379,'CABINETMED_RHEUMATOLOGY_ON',1,'1','chaine',1,'Enable features for rheumatology','2011-08-01 21:47:53'),(1482,'EXPEDITION_ADDON_NUMBER',1,'mod_expedition_safor','chaine',0,'Nom du gestionnaire de numerotation des expeditions','2011-08-05 17:53:11'),(1490,'CONTRACT_ADDON',1,'mod_contract_serpis','chaine',0,'Nom du gestionnaire de numerotation des contrats','2011-08-05 18:11:58'),(1677,'COMMANDE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/orders','chaine',0,NULL,'2012-12-08 13:11:02'),(1698,'PRODUCT_CODEPRODUCT_ADDON',1,'mod_codeproduct_leopard','yesno',0,'Module to control product codes','2012-12-08 13:11:25'),(1718,'MAIN_MODULE_TAX',1,'1',NULL,0,NULL,'2012-12-08 13:12:41'),(1719,'ACCOUNTING_USEDICTTOEDIT',1,'1','chaine',1,'','2012-12-08 13:15:00'),(1724,'PROPALE_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/proposals','chaine',0,NULL,'2012-12-08 13:17:14'),(1730,'OPENSTREETMAP_ENABLE_MAPS',1,'1','chaine',0,'','2012-12-08 13:22:47'),(1731,'OPENSTREETMAP_ENABLE_MAPS_CONTACTS',1,'1','chaine',0,'','2012-12-08 13:22:47'),(1732,'OPENSTREETMAP_ENABLE_MAPS_MEMBERS',1,'1','chaine',0,'','2012-12-08 13:22:47'),(1733,'OPENSTREETMAP_MAPS_ZOOM_LEVEL',1,'15','chaine',0,'','2012-12-08 13:22:47'),(1737,'MAIN_INFO_SOCIETE_COUNTRY',2,'1:FR:France','chaine',0,'','2013-02-26 21:56:28'),(1738,'MAIN_INFO_SOCIETE_NOM',2,'aaa','chaine',0,'','2012-12-08 14:08:14'),(1739,'MAIN_INFO_SOCIETE_STATE',2,'0','chaine',0,'','2013-02-27 14:20:27'),(1740,'MAIN_MONNAIE',2,'EUR','chaine',0,'','2012-12-08 14:08:14'),(1741,'MAIN_LANG_DEFAULT',2,'auto','chaine',0,'','2012-12-08 14:08:14'),(1742,'MAIN_MAIL_EMAIL_FROM',2,'dolibarr-robot@domain.com','chaine',0,'EMail emetteur pour les emails automatiques Dolibarr','2012-12-08 14:08:14'),(1743,'MAIN_MENU_STANDARD',2,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs internes','2013-02-11 19:43:54'),(1744,'MAIN_MENUFRONT_STANDARD',2,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs externes','2013-02-11 19:43:54'),(1745,'MAIN_MENU_SMARTPHONE',2,'iphone_backoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs internes','2012-12-08 14:08:14'),(1746,'MAIN_MENUFRONT_SMARTPHONE',2,'iphone_frontoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs externes','2012-12-08 14:08:14'),(1747,'MAIN_THEME',2,'eldy','chaine',0,'Default theme','2012-12-08 14:08:14'),(1748,'MAIN_DELAY_ACTIONS_TODO',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées','2012-12-08 14:08:14'),(1749,'MAIN_DELAY_ORDERS_TO_PROCESS',2,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes clients non traitées','2012-12-08 14:08:14'),(1750,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées','2012-12-08 14:08:14'),(1751,'MAIN_DELAY_PROPALS_TO_CLOSE',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales à cloturer','2012-12-08 14:08:14'),(1752,'MAIN_DELAY_PROPALS_TO_BILL',2,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales non facturées','2012-12-08 14:08:14'),(1753,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures client impayées','2012-12-08 14:08:14'),(1754,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',2,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures fournisseur impayées','2012-12-08 14:08:14'),(1755,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',2,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2012-12-08 14:08:14'),(1756,'MAIN_DELAY_RUNNING_SERVICES',2,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services expirés','2012-12-08 14:08:14'),(1757,'MAIN_DELAY_MEMBERS',2,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur cotisations adhérent en retard','2012-12-08 14:08:14'),(1758,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',2,'62','chaine',0,'Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire','2012-12-08 14:08:14'),(1759,'MAILING_EMAIL_FROM',2,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2012-12-08 14:08:14'),(1760,'MAIN_INFO_SOCIETE_COUNTRY',3,'1:FR:France','chaine',0,'','2013-02-26 21:56:28'),(1761,'MAIN_INFO_SOCIETE_NOM',3,'bbb','chaine',0,'','2012-12-08 14:08:20'),(1762,'MAIN_INFO_SOCIETE_STATE',3,'0','chaine',0,'','2013-02-27 14:20:27'),(1763,'MAIN_MONNAIE',3,'EUR','chaine',0,'','2012-12-08 14:08:20'),(1764,'MAIN_LANG_DEFAULT',3,'auto','chaine',0,'','2012-12-08 14:08:20'),(1765,'MAIN_MAIL_EMAIL_FROM',3,'dolibarr-robot@domain.com','chaine',0,'EMail emetteur pour les emails automatiques Dolibarr','2012-12-08 14:08:20'),(1766,'MAIN_MENU_STANDARD',3,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs internes','2013-02-11 19:43:54'),(1767,'MAIN_MENUFRONT_STANDARD',3,'eldy_menu.php','chaine',0,'Module de gestion de la barre de menu du haut pour utilisateurs externes','2013-02-11 19:43:54'),(1768,'MAIN_MENU_SMARTPHONE',3,'iphone_backoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs internes','2012-12-08 14:08:20'),(1769,'MAIN_MENUFRONT_SMARTPHONE',3,'iphone_frontoffice.php','chaine',0,'Module de gestion de la barre de menu smartphone pour utilisateurs externes','2012-12-08 14:08:20'),(1770,'MAIN_THEME',3,'eldy','chaine',0,'Default theme','2012-12-08 14:08:20'),(1771,'MAIN_DELAY_ACTIONS_TODO',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur actions planifiées non réalisées','2012-12-08 14:08:20'),(1772,'MAIN_DELAY_ORDERS_TO_PROCESS',3,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes clients non traitées','2012-12-08 14:08:20'),(1773,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur commandes fournisseurs non traitées','2012-12-08 14:08:20'),(1774,'MAIN_DELAY_PROPALS_TO_CLOSE',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales à cloturer','2012-12-08 14:08:20'),(1775,'MAIN_DELAY_PROPALS_TO_BILL',3,'7','chaine',0,'Tolérance de retard avant alerte (en jours) sur propales non facturées','2012-12-08 14:08:20'),(1776,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures client impayées','2012-12-08 14:08:20'),(1777,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',3,'2','chaine',0,'Tolérance de retard avant alerte (en jours) sur factures fournisseur impayées','2012-12-08 14:08:20'),(1778,'MAIN_DELAY_NOT_ACTIVATED_SERVICES',3,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services à activer','2012-12-08 14:08:20'),(1779,'MAIN_DELAY_RUNNING_SERVICES',3,'0','chaine',0,'Tolérance de retard avant alerte (en jours) sur services expirés','2012-12-08 14:08:20'),(1780,'MAIN_DELAY_MEMBERS',3,'31','chaine',0,'Tolérance de retard avant alerte (en jours) sur cotisations adhérent en retard','2012-12-08 14:08:20'),(1781,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',3,'62','chaine',0,'Tolérance de retard avant alerte (en jours) sur rapprochements bancaires à faire','2012-12-08 14:08:20'),(1782,'MAILING_EMAIL_FROM',3,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','2012-12-08 14:08:20'),(1803,'SYSLOG_FILE',1,'DOL_DATA_ROOT/dolibarr.log','chaine',0,'','2012-12-08 14:15:08'),(1804,'SYSLOG_HANDLERS',1,'[\"mod_syslog_file\"]','chaine',0,'','2012-12-08 14:15:08'),(1805,'MAIN_MODULE_SKINCOLOREDITOR',3,'1',NULL,0,NULL,'2012-12-08 14:35:40'),(1806,'MAIN_MODULE_SKINCOLOREDITOR_TABS_0',3,'user:+tabskincoloreditors:ColorEditor:skincoloreditor@skincoloreditor:/skincoloreditor/usercolors.php?id=__ID__','chaine',0,NULL,'2012-12-08 14:35:40'),(1867,'MAIN_MODULE_PAYPAL',1,'1',NULL,0,NULL,'2012-12-11 22:53:56'),(1922,'PAYPAL_API_SANDBOX',1,'1','chaine',0,'','2012-12-12 12:11:05'),(1923,'PAYPAL_API_USER',1,'seller_1355312017_biz_api1.nltechno.com','chaine',0,'','2012-12-12 12:11:05'),(1924,'PAYPAL_API_PASSWORD',1,'1355312040','chaine',0,'','2012-12-12 12:11:05'),(1925,'PAYPAL_API_SIGNATURE',1,'AXqqdsWBzvfn0q5iNmbuiDv1y.3EAXIMWyl4C5KvDReR9HDwwAd6dQ4Q','chaine',0,'','2012-12-12 12:11:05'),(1926,'PAYPAL_API_INTEGRAL_OR_PAYPALONLY',1,'integral','chaine',0,'','2012-12-12 12:11:05'),(1927,'PAYPAL_SECURITY_TOKEN',1,'50c82fab36bb3b6aa83e2a50691803b2','chaine',0,'','2012-12-12 12:11:05'),(1928,'PAYPAL_SECURITY_TOKEN_UNIQUE',1,'0','chaine',0,'','2012-12-12 12:11:05'),(1929,'PAYPAL_ADD_PAYMENT_URL',1,'1','chaine',0,'','2012-12-12 12:11:05'),(1980,'MAIN_PDF_FORMAT',1,'EUA4','chaine',0,'','2012-12-12 19:58:05'),(1981,'MAIN_PROFID1_IN_ADDRESS',1,'0','chaine',0,'','2012-12-12 19:58:05'),(1982,'MAIN_PROFID2_IN_ADDRESS',1,'0','chaine',0,'','2012-12-12 19:58:05'),(1983,'MAIN_PROFID3_IN_ADDRESS',1,'0','chaine',0,'','2012-12-12 19:58:05'),(1984,'MAIN_PROFID4_IN_ADDRESS',1,'0','chaine',0,'','2012-12-12 19:58:05'),(1985,'MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT',1,'0','chaine',0,'','2012-12-12 19:58:05'),(1990,'MAIN_SMS_SENDMODE',1,'ovh','chaine',0,'This is to enable OVH SMS engine','2012-12-17 21:19:01'),(2040,'MAIN_MAIL_SMTP_PORT',0,'465','chaine',0,'','2012-12-19 12:58:10'),(2041,'MAIN_MAIL_SMTP_SERVER',0,'smtp.mail.com','chaine',0,'','2012-12-19 12:58:10'),(2044,'MAIN_MAIL_EMAIL_TLS',0,'1','chaine',0,'','2012-12-19 12:58:10'),(2251,'FCKEDITOR_TEST',1,'Test
\r\n\"\"fdfs','chaine',0,'','2012-12-19 19:12:24'),(2293,'SYSTEMTOOLS_MYSQLDUMP',1,'/usr/bin/mysqldump','chaine',0,'','2012-12-27 02:02:00'),(2305,'MAIN_MODULE_PROPALE',1,'1',NULL,0,NULL,'2013-01-02 20:33:16'),(2307,'MAIN_MODULE_CONTRAT',1,'1',NULL,0,NULL,'2013-01-02 20:33:17'),(2310,'MAIN_MODULE_EXPEDITION',1,'1',NULL,0,NULL,'2013-01-02 20:33:18'),(2315,'MAIN_MODULE_FICHEINTER',1,'1',NULL,0,NULL,'2013-01-02 20:33:21'),(2321,'MAIN_MODULE_HOLIDAY',1,'1',NULL,0,NULL,'2013-01-02 20:33:24'),(2322,'MAIN_MODULE_HOLIDAY_TABS_0',1,'user:+paidholidays:CPTitreMenu:holiday:$user->rights->holiday->write:/holiday/index.php?mainmenu=holiday&id=__ID__','chaine',0,NULL,'2013-01-02 20:33:24'),(2786,'MAIN_SOAP_DEBUG',1,'1','chaine',1,'','2013-01-13 12:37:21'),(2835,'MAIN_USE_CONNECT_TIMEOUT',1,'10','chaine',0,'','2013-01-16 19:28:50'),(2836,'MAIN_USE_RESPONSE_TIMEOUT',1,'30','chaine',0,'','2013-01-16 19:28:50'),(2837,'MAIN_PROXY_USE',1,'0','chaine',0,'','2013-01-16 19:28:50'),(2838,'MAIN_PROXY_HOST',1,'localhost','chaine',0,'','2013-01-16 19:28:50'),(2839,'MAIN_PROXY_PORT',1,'8080','chaine',0,'','2013-01-16 19:28:50'),(2840,'MAIN_PROXY_USER',1,'aaa','chaine',0,'','2013-01-16 19:28:50'),(2841,'MAIN_PROXY_PASS',1,'bbb','chaine',0,'','2013-01-16 19:28:50'),(2848,'OVHSMS_NICK',1,'BN196-OVH','chaine',0,'','2013-01-16 19:32:36'),(2849,'OVHSMS_PASS',1,'bigone-10','chaine',0,'','2013-01-16 19:32:36'),(2850,'OVHSMS_SOAPURL',1,'https://www.ovh.com/soapi/soapi-re-1.55.wsdl','chaine',0,'','2013-01-16 19:32:36'),(2854,'THEME_ELDY_RGB',1,'bfbf00','chaine',0,'','2013-01-18 10:02:53'),(2855,'THEME_ELDY_ENABLE_PERSONALIZED',1,'0','chaine',0,'','2013-01-18 10:02:55'),(2858,'MAIN_SESSION_TIMEOUT',1,'2000','chaine',0,'','2013-01-19 17:01:53'),(2862,'TICKET_ADDON',1,'mod_ticket_avenc','chaine',0,'Nom du gestionnaire de numerotation des tickets','2013-01-19 17:16:10'),(2866,'MAIN_MODULE_PRODUCT',1,'1',NULL,0,NULL,'2013-01-19 17:16:10'),(2867,'FACSIM_ADDON',1,'mod_facsim_alcoy','chaine',0,'','2013-01-19 17:16:25'),(2868,'POS_SERVICES',1,'0','chaine',0,'','2013-01-19 17:16:51'),(2869,'POS_USE_TICKETS',1,'1','chaine',0,'','2013-01-19 17:16:51'),(2870,'POS_MAX_TTC',1,'100','chaine',0,'','2013-01-19 17:16:51'),(3190,'MAIN_MODULE_HOLIDAY',2,'1',NULL,0,NULL,'2013-02-01 08:52:34'),(3191,'MAIN_MODULE_HOLIDAY_TABS_0',2,'user:+paidholidays:CPTitreMenu:holiday:$user->rights->holiday->write:/holiday/index.php?mainmenu=holiday&id=__ID__','chaine',0,NULL,'2013-02-01 08:52:34'),(3195,'INVOICE_SUPPLIER_ADDON_PDF',1,'canelle','chaine',0,'','2013-02-10 19:50:27'),(3199,'MAIN_FORCE_RELOAD_PAGE',1,'1','chaine',0,NULL,'2013-02-12 16:22:55'),(3217,'MAIN_PDF_TITLE_BACKGROUND_COLOR',1,'240,240,240','chaine',1,'','2013-02-13 15:18:02'),(3223,'OVH_THIRDPARTY_IMPORT',1,'2','chaine',0,'','2013-02-13 16:20:18'),(3241,'COMPANY_USE_SEARCH_TO_SELECT',1,'2','chaine',0,'','2013-02-17 14:33:39'),(3409,'AGENDA_USE_EVENT_TYPE',1,'1','chaine',0,'','2013-02-27 18:12:24'),(3886,'MAIN_REMOVE_INSTALL_WARNING',1,'1','chaine',1,'','2013-03-02 18:32:50'),(4013,'MAIN_DELAY_ACTIONS_TODO',1,'7','chaine',0,'','2013-03-06 08:59:12'),(4014,'MAIN_DELAY_PROPALS_TO_CLOSE',1,'31','chaine',0,'','2013-03-06 08:59:12'),(4015,'MAIN_DELAY_PROPALS_TO_BILL',1,'7','chaine',0,'','2013-03-06 08:59:12'),(4016,'MAIN_DELAY_ORDERS_TO_PROCESS',1,'2','chaine',0,'','2013-03-06 08:59:12'),(4017,'MAIN_DELAY_CUSTOMER_BILLS_UNPAYED',1,'31','chaine',0,'','2013-03-06 08:59:12'),(4018,'MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS',1,'7','chaine',0,'','2013-03-06 08:59:12'),(4019,'MAIN_DELAY_SUPPLIER_BILLS_TO_PAY',1,'2','chaine',0,'','2013-03-06 08:59:12'),(4020,'MAIN_DELAY_RUNNING_SERVICES',1,'-15','chaine',0,'','2013-03-06 08:59:12'),(4021,'MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE',1,'62','chaine',0,'','2013-03-06 08:59:13'),(4022,'MAIN_DELAY_MEMBERS',1,'31','chaine',0,'','2013-03-06 08:59:13'),(4023,'MAIN_DISABLE_METEO',1,'0','chaine',0,'','2013-03-06 08:59:13'),(4044,'ADHERENT_VAT_FOR_SUBSCRIPTIONS',1,'0','',0,'','2013-03-06 16:06:38'),(4047,'ADHERENT_BANK_USE',1,'bankviainvoice','',0,'','2013-03-06 16:12:30'),(4049,'PHPSANE_SCANIMAGE',1,'/usr/bin/scanimage','chaine',0,'','2013-03-06 21:54:13'),(4050,'PHPSANE_PNMTOJPEG',1,'/usr/bin/pnmtojpeg','chaine',0,'','2013-03-06 21:54:13'),(4051,'PHPSANE_PNMTOTIFF',1,'/usr/bin/pnmtotiff','chaine',0,'','2013-03-06 21:54:13'),(4052,'PHPSANE_OCR',1,'/usr/bin/gocr','chaine',0,'','2013-03-06 21:54:13'),(4548,'ECM_AUTO_TREE_ENABLED',1,'1','chaine',0,'','2013-03-10 15:57:21'),(4555,'WEBSERVICES_KEY',1,'dolibarrkey','chaine',0,'','2013-03-13 10:19:31'),(4579,'MAIN_MODULE_AGENDA',2,'1',NULL,0,NULL,'2013-03-13 15:29:19'),(4580,'MAIN_AGENDA_ACTIONAUTO_COMPANY_CREATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4581,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4582,'MAIN_AGENDA_ACTIONAUTO_PROPAL_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4583,'MAIN_AGENDA_ACTIONAUTO_PROPAL_SENTBYMAIL',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4584,'MAIN_AGENDA_ACTIONAUTO_ORDER_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4585,'MAIN_AGENDA_ACTIONAUTO_ORDER_SENTBYMAIL',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4586,'MAIN_AGENDA_ACTIONAUTO_BILL_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4587,'MAIN_AGENDA_ACTIONAUTO_BILL_PAYED',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4588,'MAIN_AGENDA_ACTIONAUTO_BILL_CANCEL',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4589,'MAIN_AGENDA_ACTIONAUTO_BILL_SENTBYMAIL',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4590,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4591,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4592,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_VALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4593,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_SENTBYMAIL',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4594,'MAIN_AGENDA_ACTIONAUTO_BILL_UNVALIDATE',2,'1','chaine',0,NULL,'2013-03-13 15:29:19'),(4595,'MAIN_MODULE_GOOGLE',2,'1',NULL,0,NULL,'2013-03-13 15:29:47'),(4596,'MAIN_MODULE_GOOGLE_TABS_0',2,'agenda:+gcal:MenuAgendaGoogle:google@google:$conf->google->enabled && $conf->global->GOOGLE_ENABLE_AGENDA:/google/index.php','chaine',0,NULL,'2013-03-13 15:29:47'),(4597,'MAIN_MODULE_GOOGLE_TABS_1',2,'user:+gsetup:GoogleUserConf:google@google:$conf->google->enabled && $conf->global->GOOGLE_DUPLICATE_INTO_GCAL:/google/admin/google_calsync_user.php?id=__ID__','chaine',0,NULL,'2013-03-13 15:29:47'),(4598,'MAIN_MODULE_GOOGLE_TRIGGERS',2,'1','chaine',0,NULL,'2013-03-13 15:29:47'),(4599,'MAIN_MODULE_GOOGLE_HOOKS',2,'[\"toprightmenu\"]','chaine',0,NULL,'2013-03-13 15:29:47'),(4688,'GOOGLE_ENABLE_AGENDA',2,'1','chaine',0,'','2013-03-13 15:36:29'),(4689,'GOOGLE_AGENDA_NAME1',2,'eldy','chaine',0,'','2013-03-13 15:36:29'),(4690,'GOOGLE_AGENDA_SRC1',2,'eldy10@mail.com','chaine',0,'','2013-03-13 15:36:29'),(4691,'GOOGLE_AGENDA_COLOR1',2,'BE6D00','chaine',0,'','2013-03-13 15:36:29'),(4692,'GOOGLE_AGENDA_COLOR2',2,'7A367A','chaine',0,'','2013-03-13 15:36:29'),(4693,'GOOGLE_AGENDA_COLOR3',2,'7A367A','chaine',0,'','2013-03-13 15:36:29'),(4694,'GOOGLE_AGENDA_COLOR4',2,'7A367A','chaine',0,'','2013-03-13 15:36:29'),(4695,'GOOGLE_AGENDA_COLOR5',2,'7A367A','chaine',0,'','2013-03-13 15:36:29'),(4696,'GOOGLE_AGENDA_TIMEZONE',2,'Europe/Paris','chaine',0,'','2013-03-13 15:36:29'),(4697,'GOOGLE_AGENDA_NB',2,'5','chaine',0,'','2013-03-13 15:36:29'),(4702,'MAIN_FEATURES_LEVEL',0,'1','chaine',1,'Level of features to show (0=stable only, 1=stable+experimental, 2=stable+experimental+development','2013-03-13 18:41:52'),(4711,'GOOGLE_ENABLE_AGENDA',1,'1','chaine',0,'','2013-03-13 19:37:38'),(4712,'GOOGLE_AGENDA_NAME1',1,'asso master','chaine',0,'','2013-03-13 19:37:38'),(4713,'GOOGLE_AGENDA_SRC1',1,'assodolibarr@mail.com','chaine',0,'','2013-03-13 19:37:38'),(4714,'GOOGLE_AGENDA_COLOR1',1,'1B887A','chaine',0,'','2013-03-13 19:37:38'),(4715,'GOOGLE_AGENDA_COLOR2',1,'7A367A','chaine',0,'','2013-03-13 19:37:38'),(4716,'GOOGLE_AGENDA_COLOR3',1,'7A367A','chaine',0,'','2013-03-13 19:37:38'),(4717,'GOOGLE_AGENDA_COLOR4',1,'7A367A','chaine',0,'','2013-03-13 19:37:38'),(4718,'GOOGLE_AGENDA_COLOR5',1,'7A367A','chaine',0,'','2013-03-13 19:37:38'),(4719,'GOOGLE_AGENDA_TIMEZONE',1,'Europe/Paris','chaine',0,'','2013-03-13 19:37:38'),(4720,'GOOGLE_AGENDA_NB',1,'5','chaine',0,'','2013-03-13 19:37:38'),(4725,'SOCIETE_CODECLIENT_ADDON',2,'mod_codeclient_leopard','chaine',0,'Module to control third parties codes','2013-03-13 20:21:35'),(4726,'SOCIETE_CODECOMPTA_ADDON',2,'mod_codecompta_panicum','chaine',0,'Module to control third parties codes','2013-03-13 20:21:35'),(4727,'SOCIETE_FISCAL_MONTH_START',2,'','chaine',0,'Mettre le numero du mois du debut d\\\'annee fiscale, ex: 9 pour septembre','2013-03-13 20:21:35'),(4728,'MAIN_SEARCHFORM_SOCIETE',2,'1','yesno',0,'Show form for quick company search','2013-03-13 20:21:35'),(4729,'MAIN_SEARCHFORM_CONTACT',2,'1','yesno',0,'Show form for quick contact search','2013-03-13 20:21:35'),(4730,'COMPANY_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/thirdparties','chaine',0,NULL,'2013-03-13 20:21:35'),(4743,'MAIN_MODULE_CLICKTODIAL',2,'1',NULL,0,NULL,'2013-03-13 20:30:28'),(4744,'MAIN_MODULE_NOTIFICATION',2,'1',NULL,0,NULL,'2013-03-13 20:30:34'),(4745,'MAIN_MODULE_WEBSERVICES',2,'1',NULL,0,NULL,'2013-03-13 20:30:41'),(4746,'MAIN_MODULE_PROPALE',2,'1',NULL,0,NULL,'2013-03-13 20:32:38'),(4747,'PROPALE_ADDON_PDF',2,'azur','chaine',0,'Nom du gestionnaire de generation des propales en PDF','2013-03-13 20:32:38'),(4748,'PROPALE_ADDON',2,'mod_propale_marbre','chaine',0,'Nom du gestionnaire de numerotation des propales','2013-03-13 20:32:38'),(4749,'PROPALE_VALIDITY_DURATION',2,'15','chaine',0,'Duration of validity of business proposals','2013-03-13 20:32:38'),(4750,'PROPALE_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/proposals','chaine',0,NULL,'2013-03-13 20:32:38'),(4752,'MAIN_MODULE_TAX',2,'1',NULL,0,NULL,'2013-03-13 20:32:47'),(4753,'MAIN_MODULE_DON',2,'1',NULL,0,NULL,'2013-03-13 20:32:54'),(4754,'DON_ADDON_MODEL',2,'html_cerfafr','chaine',0,'Nom du gestionnaire de generation de recu de dons','2013-03-13 20:32:54'),(4755,'POS_USE_TICKETS',2,'1','chaine',0,'','2013-03-13 20:33:09'),(4756,'POS_MAX_TTC',2,'100','chaine',0,'','2013-03-13 20:33:09'),(4757,'MAIN_MODULE_POS',2,'1',NULL,0,NULL,'2013-03-13 20:33:09'),(4758,'TICKET_ADDON',2,'mod_ticket_avenc','chaine',0,'Nom du gestionnaire de numerotation des tickets','2013-03-13 20:33:09'),(4759,'MAIN_MODULE_BANQUE',2,'1',NULL,0,NULL,'2013-03-13 20:33:09'),(4760,'MAIN_MODULE_FACTURE',2,'1',NULL,0,NULL,'2013-03-13 20:33:09'),(4761,'FACTURE_ADDON_PDF',2,'crabe','chaine',0,'Name of PDF model of invoice','2013-03-13 20:33:09'),(4762,'FACTURE_ADDON',2,'mod_facture_terre','chaine',0,'Name of numbering numerotation rules of invoice','2013-03-13 20:33:09'),(4763,'FACTURE_ADDON_PDF_ODT_PATH',2,'DOL_DATA_ROOT/doctemplates/invoices','chaine',0,NULL,'2013-03-13 20:33:09'),(4764,'MAIN_MODULE_SOCIETE',2,'1',NULL,0,NULL,'2013-03-13 20:33:09'),(4765,'MAIN_MODULE_PRODUCT',2,'1',NULL,0,NULL,'2013-03-13 20:33:09'),(4766,'PRODUCT_CODEPRODUCT_ADDON',2,'mod_codeproduct_leopard','chaine',0,'Module to control product codes','2013-03-13 20:33:09'),(4767,'MAIN_SEARCHFORM_PRODUITSERVICE',2,'1','yesno',0,'Show form for quick product search','2013-03-13 20:33:09'),(4772,'FACSIM_ADDON',2,'mod_facsim_alcoy','chaine',0,'','2013-03-13 20:33:32'),(4773,'MAIN_MODULE_MAILING',2,'1',NULL,0,NULL,'2013-03-13 20:33:37'),(4774,'MAIN_MODULE_OPENSURVEY',2,'1',NULL,0,NULL,'2013-03-13 20:33:42'),(4782,'AGENDA_USE_EVENT_TYPE',2,'1','chaine',0,'','2013-03-13 20:53:36'),(4884,'AGENDA_DISABLE_EXT',2,'1','chaine',0,'','2013-03-13 22:03:40'),(4919,'MAIN_MODULE_COMPTABILITE',1,'1',NULL,0,NULL,'2013-03-20 20:04:28'),(4922,'MAIN_MODULE_BANQUE',1,'1',NULL,0,NULL,'2013-03-20 20:04:28'),(4928,'COMMANDE_SUPPLIER_ADDON_NUMBER',1,'mod_commande_fournisseur_muguet','chaine',0,'Nom du gestionnaire de numerotation des commandes fournisseur','2013-03-22 09:24:29'),(4929,'INVOICE_SUPPLIER_ADDON_NUMBER',1,'mod_facture_fournisseur_cactus','chaine',0,'Nom du gestionnaire de numerotation des factures fournisseur','2013-03-22 09:24:29'),(4986,'MAIN_MODULE_CRON',1,'1',NULL,0,NULL,'2013-03-23 17:24:25'),(5001,'MAIN_CRON_KEY',0,'bc54582fe30d5d4a830c6f582ec28810','chaine',0,'','2013-03-23 17:54:53'),(5009,'CRON_KEY',0,'2c2e755c20be2014098f629865598006','chaine',0,'','2013-03-23 18:06:24'),(5075,'MAIN_MENU_STANDARD',1,'eldy_menu.php','chaine',0,'','2013-03-24 02:51:13'),(5076,'MAIN_MENU_SMARTPHONE',1,'eldy_menu.php','chaine',0,'','2013-03-24 02:51:13'),(5077,'MAIN_MENUFRONT_STANDARD',1,'eldy_menu.php','chaine',0,'','2013-03-24 02:51:13'),(5078,'MAIN_MENUFRONT_SMARTPHONE',1,'eldy_menu.php','chaine',0,'','2013-03-24 02:51:13'),(5079,'MAIN_MODULE_OPENSURVEY',1,'1',NULL,0,NULL,'2013-03-24 02:57:18'),(5083,'FCKEDITOR_ENABLE_USERSIGN',1,'1','chaine',1,'','2013-03-24 15:59:39'),(5102,'MAIN_INFO_SOCIETE_COUNTRY',1,'1:FR:France','chaine',0,'','2013-03-24 18:34:54'),(5103,'MAIN_INFO_SOCIETE_NOM',1,'MyBigCompany','chaine',0,'','2013-03-24 18:34:54'),(5104,'MAIN_INFO_SOCIETE_ADDRESS',1,'21 Jump street','chaine',0,'','2013-03-24 18:34:54'),(5105,'MAIN_INFO_SOCIETE_TOWN',1,'MyTown','chaine',0,'','2013-03-24 18:34:54'),(5106,'MAIN_INFO_SOCIETE_ZIP',1,'75500','chaine',0,'','2013-03-24 18:34:54'),(5107,'MAIN_INFO_SOCIETE_STATE',1,'0','chaine',0,'','2013-03-24 18:34:54'),(5108,'MAIN_MONNAIE',1,'EUR','chaine',0,'','2013-03-24 18:34:54'),(5109,'MAIN_INFO_SOCIETE_TEL',1,'09123123','chaine',0,'','2013-03-24 18:34:54'),(5110,'MAIN_INFO_SOCIETE_FAX',1,'09123124','chaine',0,'','2013-03-24 18:34:54'),(5111,'MAIN_INFO_SOCIETE_MAIL',1,'myemail@mybigcompany.com','chaine',0,'','2013-03-24 18:34:54'),(5112,'MAIN_INFO_SOCIETE_WEB',1,'http://www.dolibarr.org','chaine',0,'','2013-03-24 18:34:54'),(5113,'MAIN_INFO_SOCIETE_NOTE',1,'This is note about my company','chaine',0,'','2013-03-24 18:34:54'),(5114,'MAIN_INFO_CAPITAL',1,'10000','chaine',0,'','2013-03-24 18:34:54'),(5115,'MAIN_INFO_SOCIETE_FORME_JURIDIQUE',1,'0','chaine',0,'','2013-03-24 18:34:54'),(5116,'MAIN_INFO_TVAINTRA',1,'IN1234567','chaine',0,'','2013-03-24 18:34:54'),(5117,'SOCIETE_FISCAL_MONTH_START',1,'0','chaine',0,'','2013-03-24 18:34:54'),(5118,'FACTURE_TVAOPTION',1,'reel','chaine',0,'','2013-03-24 18:34:54'),(5119,'MAIN_LANG_DEFAULT',1,'en_US','chaine',0,'','2013-03-24 18:35:07'),(5120,'MAIN_MULTILANGS',1,'1','chaine',0,'','2013-03-24 18:35:07'),(5121,'MAIN_SIZE_LISTE_LIMIT',1,'25','chaine',0,'','2013-03-24 18:35:07'),(5122,'MAIN_DISABLE_JAVASCRIPT',1,'0','chaine',0,'','2013-03-24 18:35:07'),(5123,'MAIN_BUTTON_HIDE_UNAUTHORIZED',1,'0','chaine',0,'','2013-03-24 18:35:07'),(5124,'MAIN_START_WEEK',1,'1','chaine',0,'','2013-03-24 18:35:07'),(5125,'MAIN_SHOW_LOGO',1,'0','chaine',0,'','2013-03-24 18:35:07'),(5126,'MAIN_FIRSTNAME_NAME_POSITION',1,'0','chaine',0,'','2013-03-24 18:35:07'),(5127,'MAIN_THEME',1,'eldy','chaine',0,'','2013-03-24 18:35:07'),(5128,'MAIN_SEARCHFORM_CONTACT',1,'1','chaine',0,'','2013-03-24 18:35:07'),(5129,'MAIN_SEARCHFORM_SOCIETE',1,'1','chaine',0,'','2013-03-24 18:35:07'),(5130,'MAIN_SEARCHFORM_PRODUITSERVICE',1,'1','chaine',0,'','2013-03-24 18:35:07'),(5131,'MAIN_SEARCHFORM_ADHERENT',1,'1','chaine',0,'','2013-03-24 18:35:07'),(5132,'MAIN_HELPCENTER_DISABLELINK',0,'1','chaine',0,'','2013-03-24 18:35:07'),(5133,'MAIN_HOME',1,'__(NoteSomeFeaturesAreDisabled)__
\r\n
\r\n__(SomeTranslationAreUncomplete)__','chaine',0,'','2013-03-24 18:35:07'),(5134,'MAIN_HELP_DISABLELINK',0,'0','chaine',0,'','2013-03-24 18:35:07'),(5135,'MAIN_BUGTRACK_ENABLELINK',1,'0','chaine',0,'','2013-03-24 18:35:07'),(5137,'MAIN_AGENDA_ACTIONAUTO_BILL_UNVALIDATE',1,'1','chaine',0,NULL,'2013-09-08 23:06:08'),(5139,'SOCIETE_ADD_REF_IN_LIST',1,'','yesno',0,'Display customer ref into select list','2013-09-08 23:06:08'),(5150,'PROJECT_TASK_ADDON_PDF',1,'','chaine',0,'Name of PDF/ODT tasks manager class','2013-09-08 23:06:14'),(5151,'PROJECT_TASK_ADDON',1,'mod_task_simple','chaine',0,'Name of Numbering Rule task manager class','2013-09-08 23:06:14'),(5152,'PROJECT_TASK_ADDON_PDF_ODT_PATH',1,'DOL_DATA_ROOT/doctemplates/tasks','chaine',0,'','2013-09-08 23:06:14'),(5164,'MAIN_AGENDA_ACTIONAUTO_COMPANY_SENTBYMAIL',1,'1','chaine',0,NULL,'2013-11-06 23:35:12'),(5190,'MAIN_MODULE_GOOGLE',1,'1',NULL,0,NULL,'2013-11-07 00:01:39'),(5191,'MAIN_MODULE_GOOGLE_TABS_0',1,'agenda:+gcal:MenuAgendaGoogle:google@google:$conf->google->enabled && $conf->global->GOOGLE_ENABLE_AGENDA:/google/index.php','chaine',0,NULL,'2013-11-07 00:01:39'),(5192,'MAIN_MODULE_GOOGLE_TABS_1',1,'user:+gsetup:GoogleUserConf:google@google:$conf->google->enabled && $conf->global->GOOGLE_DUPLICATE_INTO_GCAL:/google/admin/google_calsync_user.php?id=__ID__','chaine',0,NULL,'2013-11-07 00:01:39'),(5193,'MAIN_MODULE_GOOGLE_TRIGGERS',1,'1','chaine',0,NULL,'2013-11-07 00:01:39'),(5194,'MAIN_MODULE_GOOGLE_HOOKS',1,'[\"toprightmenu\"]','chaine',0,NULL,'2013-11-07 00:01:39'),(5195,'GOOGLE_DUPLICATE_INTO_THIRDPARTIES',1,'1','chaine',0,'','2013-11-07 00:02:34'),(5196,'GOOGLE_DUPLICATE_INTO_CONTACTS',1,'0','chaine',0,'','2013-11-07 00:02:34'),(5197,'GOOGLE_DUPLICATE_INTO_MEMBERS',1,'0','chaine',0,'','2013-11-07 00:02:34'),(5198,'GOOGLE_CONTACT_LOGIN',1,'eldy10@mail.com','chaine',0,'','2013-11-07 00:02:34'),(5199,'GOOGLE_CONTACT_PASSWORD',1,'bidon','chaine',0,'','2013-11-07 00:02:34'),(5200,'GOOGLE_TAG_PREFIX',1,'Dolibarr (Thirdparties)','chaine',0,'','2013-11-07 00:02:34'),(5201,'GOOGLE_TAG_PREFIX_CONTACTS',1,'Dolibarr (Contacts/Addresses)','chaine',0,'','2013-11-07 00:02:34'),(5202,'GOOGLE_TAG_PREFIX_MEMBERS',1,'Dolibarr (Members)','chaine',0,'','2013-11-07 00:02:34'),(5203,'MODULE_GOOGLE_DEBUG',1,'1','chaine',1,'','2013-11-07 00:16:31'),(5221,'MAIN_MODULE_AGENDA',1,'1',NULL,0,NULL,'2014-04-05 14:19:21'),(5222,'MAIN_MODULE_SOCIETE',1,'1',NULL,0,NULL,'2014-04-05 14:19:21'),(5223,'MAIN_MODULE_SERVICE',1,'1',NULL,0,NULL,'2014-04-05 14:19:22'),(5224,'MAIN_MODULE_COMMANDE',1,'1',NULL,0,NULL,'2014-04-05 14:19:22'),(5225,'MAIN_MODULE_FACTURE',1,'1',NULL,0,NULL,'2014-04-05 14:19:22'),(5226,'MAIN_MODULE_FOURNISSEUR',1,'1',NULL,0,NULL,'2014-04-05 14:19:22'),(5227,'MAIN_MODULE_USER',0,'1',NULL,0,NULL,'2014-04-05 14:19:22'),(5228,'MAIN_MODULE_DEPLACEMENT',1,'1',NULL,0,NULL,'2014-04-05 14:19:22'),(5229,'MAIN_MODULE_DON',1,'1',NULL,0,NULL,'2014-04-05 14:19:22'),(5230,'MAIN_MODULE_ECM',1,'1',NULL,0,NULL,'2014-04-05 14:19:22'),(5231,'MAIN_VERSION_LAST_UPGRADE',0,'3.5.2','chaine',0,'Dolibarr version for last upgrade','2014-04-05 14:19:24'),(5233,'MAIN_DISABLE_ALL_MAILS',1,'1','chaine',0,'','2014-04-05 14:20:25'),(5234,'MAIN_MAIL_SENDMODE',0,'mail','chaine',0,'','2014-04-05 14:20:25'),(5235,'MAIN_MAIL_SMTPS_ID',0,'eldy10@mail.com','chaine',0,'','2014-04-05 14:20:25'),(5236,'MAIN_MAIL_SMTPS_PW',0,'bidon','chaine',0,'','2014-04-05 14:20:25'); /*!40000 ALTER TABLE `llx_const` ENABLE KEYS */; UNLOCK TABLES; diff --git a/dev/initdata/mysqldump_dolibarr_3.6.0.sql b/dev/initdata/mysqldump_dolibarr_3.6.0.sql index b1b8d77aa3c31..e0a55acc8e2c6 100644 --- a/dev/initdata/mysqldump_dolibarr_3.6.0.sql +++ b/dev/initdata/mysqldump_dolibarr_3.6.0.sql @@ -1652,7 +1652,7 @@ CREATE TABLE `llx_c_tva` ( LOCK TABLES `llx_c_tva` WRITE; /*!40000 ALTER TABLE `llx_c_tva` DISABLE KEYS */; -INSERT INTO `llx_c_tva` VALUES (11,1,20,0,'0',0,'0',0,'VAT standard rate (France hors DOM-TOM)',1,NULL,NULL),(12,1,8.5,0,'0',0,'0',0,'VAT standard rate (DOM sauf Guyane et Saint-Martin)',0,NULL,NULL),(13,1,8.5,0,'0',0,'0',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,NULL,NULL),(14,1,5.5,0,'0',0,'0',0,'VAT reduced rate (France hors DOM-TOM)',1,NULL,NULL),(15,1,0,0,'0',0,'0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(16,1,2.1,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(21,2,21,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(22,2,6,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(23,2,0,0,'0',0,'0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(24,2,12,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(31,3,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(32,3,10,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(33,3,4,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(34,3,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(41,4,21,5.2,'3',-21,'1',0,'VAT standard rate',1,NULL,NULL),(42,4,10,1.4,'3',-21,'1',0,'VAT reduced rate',1,NULL,NULL),(43,4,4,0.5,'3',-21,'1',0,'VAT super-reduced rate',1,NULL,NULL),(44,4,0,0,'3',-21,'1',0,'VAT Rate 0',1,NULL,NULL),(51,5,19,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(52,5,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(53,5,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(61,6,7.6,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(62,6,3.6,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(63,6,2.4,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(64,6,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(71,7,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(72,7,17.5,0,'0',0,'0',0,'VAT standard rate before 2011',1,NULL,NULL),(73,7,5,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(74,7,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(91,9,17,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(92,9,13,0,'0',0,'0',0,'VAT reduced rate 0',1,NULL,NULL),(93,9,3,0,'0',0,'0',0,'VAT super reduced rate 0',1,NULL,NULL),(94,9,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(101,10,6,0,'0',0,'0',0,'VAT 6%',1,NULL,NULL),(102,10,12,1,'4',0,'0',0,'VAT 12%',1,NULL,NULL),(103,10,18,0,'0',0,'0',0,'VAT 18%',1,NULL,NULL),(104,10,7.5,1,'4',0,'0',0,'VAT 6% Majoré à 25% (7.5%)',1,NULL,NULL),(105,10,15,1,'4',0,'0',0,'VAT 12% Majoré à 25% (15%)',1,NULL,NULL),(106,10,22.5,1,'4',0,'0',0,'VAT 18% Majoré à 25% (22.5%)',1,NULL,NULL),(107,10,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(111,11,0,0,'0',0,'0',0,'No Sales Tax',1,NULL,NULL),(112,11,4,0,'0',0,'0',0,'Sales Tax 4%',1,NULL,NULL),(113,11,6,0,'0',0,'0',0,'Sales Tax 6%',1,NULL,NULL),(121,12,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(122,12,14,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(123,12,10,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(124,12,7,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(125,12,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(141,14,7,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(142,14,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(143,14,5,9.975,'1',0,'0',0,'TPS and TVQ rate',1,NULL,NULL),(171,17,19,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(172,17,6,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(173,17,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(201,20,25,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(202,20,12,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(203,20,6,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(204,20,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(231,23,21,0,'0',0,'0',0,'IVA standard rate',1,NULL,NULL),(232,23,10.5,0,'0',0,'0',0,'IVA reduced rate',1,NULL,NULL),(233,23,0,0,'0',0,'0',0,'IVA Rate 0',1,NULL,NULL),(251,25,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(252,25,12,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(253,25,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(254,25,5,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(271,27,20,0,'0',0,'0',0,'VAT standard rate (France hors DOM-TOM)',1,NULL,NULL),(272,27,8.5,0,'0',0,'0',0,'VAT standard rate (DOM sauf Guyane et Saint-Martin)',0,NULL,NULL),(273,27,8.5,0,'0',0,'0',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,NULL,NULL),(274,27,5.5,0,'0',0,'0',0,'VAT reduced rate (France hors DOM-TOM)',0,NULL,NULL),(275,27,0,0,'0',0,'0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(276,27,2.1,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(277,27,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(281,28,10,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(282,28,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(411,41,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(412,41,10,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(413,41,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(461,46,0,0,'0',0,'0',0,'No VAT',1,NULL,NULL),(462,46,15,0,'0',0,'0',0,'VAT 15%',1,NULL,NULL),(463,46,7.5,0,'0',0,'0',0,'VAT 7.5%',1,NULL,NULL),(591,59,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(592,59,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(593,59,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(671,67,19,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(672,67,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(801,80,25,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(802,80,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(861,86,13,0,'0',0,'0',0,'IVA 13',1,NULL,NULL),(862,86,0,0,'0',0,'0',0,'SIN IVA',1,NULL,NULL),(1141,114,0,0,'0',0,'0',0,'No ISV',1,NULL,NULL),(1142,114,12,0,'0',0,'0',0,'ISV 12%',1,NULL,NULL),(1161,116,25.5,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1162,116,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1163,116,0,0,'0',0,'0',0,'VAT rate 0',1,NULL,NULL),(1171,117,12.5,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1172,117,4,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1173,117,1,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(1174,117,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1231,123,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1232,123,5,0,'0',0,'0',0,'VAT Rate 5',1,NULL,NULL),(1401,140,15,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1402,140,12,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1403,140,6,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1404,140,3,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(1405,140,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1521,152,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1522,152,15,0,'0',0,'0',0,'VAT Rate 15',1,NULL,NULL),(1541,154,0,0,'0',0,'0',0,'No VAT',1,NULL,NULL),(1542,154,16,0,'0',0,'0',0,'VAT 16%',1,NULL,NULL),(1543,154,10,0,'0',0,'0',0,'VAT Frontero',1,NULL,NULL),(1662,166,15,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1663,166,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1731,173,25,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1732,173,14,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1733,173,8,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1734,173,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1841,184,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1842,184,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1843,184,3,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1844,184,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1881,188,24,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1882,188,9,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1883,188,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1884,188,5,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1931,193,0,0,'0',0,'0',0,'No VAT in SPM',1,NULL,NULL),(2011,201,19,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(2012,201,10,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(2013,201,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(2021,202,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(2022,202,8.5,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(2023,202,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(2321,232,0,0,'0',0,'0',0,'No VAT',1,NULL,NULL),(2322,232,12,0,'0',0,'0',0,'VAT 12%',1,NULL,NULL),(2323,232,8,0,'0',0,'0',0,'VAT 8%',1,NULL,NULL),(2461,246,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(2462,4,15,0,'0',0,'0',0,'aaaa',1,NULL,NULL); +INSERT INTO `llx_c_tva` VALUES (11,1,20,0,'0',0,'0',0,'VAT standard rate (France hors DOM-TOM)',1,NULL,NULL),(12,1,8.5,0,'0',0,'0',0,'VAT standard rate (DOM sauf Guyane et Saint-Martin)',0,NULL,NULL),(13,1,8.5,0,'0',0,'0',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,NULL,NULL),(14,1,5.5,0,'0',0,'0',0,'VAT reduced rate (France hors DOM-TOM)',1,NULL,NULL),(15,1,0,0,'0',0,'0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(16,1,2.1,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(21,2,21,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(22,2,6,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(23,2,0,0,'0',0,'0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(24,2,12,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(31,3,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(32,3,10,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(33,3,4,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(34,3,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(41,4,21,5.2,'3',-19,'5',0,'VAT standard rate',1,NULL,NULL),(42,4,10,1.4,'3',-19,'5',0,'VAT reduced rate',1,NULL,NULL),(43,4,4,0.5,'3',-19,'5',0,'VAT super-reduced rate',1,NULL,NULL),(44,4,0,0,'3',-19,'5',0,'VAT Rate 0',1,NULL,NULL),(51,5,19,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(52,5,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(53,5,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(61,6,7.6,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(62,6,3.6,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(63,6,2.4,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(64,6,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(71,7,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(72,7,17.5,0,'0',0,'0',0,'VAT standard rate before 2011',1,NULL,NULL),(73,7,5,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(74,7,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(91,9,17,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(92,9,13,0,'0',0,'0',0,'VAT reduced rate 0',1,NULL,NULL),(93,9,3,0,'0',0,'0',0,'VAT super reduced rate 0',1,NULL,NULL),(94,9,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(101,10,6,0,'0',0,'0',0,'VAT 6%',1,NULL,NULL),(102,10,12,1,'4',0,'0',0,'VAT 12%',1,NULL,NULL),(103,10,18,0,'0',0,'0',0,'VAT 18%',1,NULL,NULL),(104,10,7.5,1,'4',0,'0',0,'VAT 6% Majoré à 25% (7.5%)',1,NULL,NULL),(105,10,15,1,'4',0,'0',0,'VAT 12% Majoré à 25% (15%)',1,NULL,NULL),(106,10,22.5,1,'4',0,'0',0,'VAT 18% Majoré à 25% (22.5%)',1,NULL,NULL),(107,10,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(111,11,0,0,'0',0,'0',0,'No Sales Tax',1,NULL,NULL),(112,11,4,0,'0',0,'0',0,'Sales Tax 4%',1,NULL,NULL),(113,11,6,0,'0',0,'0',0,'Sales Tax 6%',1,NULL,NULL),(121,12,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(122,12,14,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(123,12,10,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(124,12,7,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(125,12,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(141,14,7,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(142,14,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(143,14,5,9.975,'1',0,'0',0,'TPS and TVQ rate',1,NULL,NULL),(171,17,19,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(172,17,6,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(173,17,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(201,20,25,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(202,20,12,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(203,20,6,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(204,20,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(231,23,21,0,'0',0,'0',0,'IVA standard rate',1,NULL,NULL),(232,23,10.5,0,'0',0,'0',0,'IVA reduced rate',1,NULL,NULL),(233,23,0,0,'0',0,'0',0,'IVA Rate 0',1,NULL,NULL),(251,25,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(252,25,12,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(253,25,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(254,25,5,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(271,27,20,0,'0',0,'0',0,'VAT standard rate (France hors DOM-TOM)',1,NULL,NULL),(272,27,8.5,0,'0',0,'0',0,'VAT standard rate (DOM sauf Guyane et Saint-Martin)',0,NULL,NULL),(273,27,8.5,0,'0',0,'0',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,NULL,NULL),(274,27,5.5,0,'0',0,'0',0,'VAT reduced rate (France hors DOM-TOM)',0,NULL,NULL),(275,27,0,0,'0',0,'0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(276,27,2.1,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(277,27,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(281,28,10,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(282,28,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(411,41,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(412,41,10,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(413,41,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(461,46,0,0,'0',0,'0',0,'No VAT',1,NULL,NULL),(462,46,15,0,'0',0,'0',0,'VAT 15%',1,NULL,NULL),(463,46,7.5,0,'0',0,'0',0,'VAT 7.5%',1,NULL,NULL),(591,59,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(592,59,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(593,59,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(671,67,19,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(672,67,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(801,80,25,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(802,80,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(861,86,13,0,'0',0,'0',0,'IVA 13',1,NULL,NULL),(862,86,0,0,'0',0,'0',0,'SIN IVA',1,NULL,NULL),(1141,114,0,0,'0',0,'0',0,'No ISV',1,NULL,NULL),(1142,114,12,0,'0',0,'0',0,'ISV 12%',1,NULL,NULL),(1161,116,25.5,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1162,116,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1163,116,0,0,'0',0,'0',0,'VAT rate 0',1,NULL,NULL),(1171,117,12.5,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1172,117,4,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1173,117,1,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(1174,117,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1231,123,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1232,123,5,0,'0',0,'0',0,'VAT Rate 5',1,NULL,NULL),(1401,140,15,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1402,140,12,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1403,140,6,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1404,140,3,0,'0',0,'0',0,'VAT super-reduced rate',1,NULL,NULL),(1405,140,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1521,152,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1522,152,15,0,'0',0,'0',0,'VAT Rate 15',1,NULL,NULL),(1541,154,0,0,'0',0,'0',0,'No VAT',1,NULL,NULL),(1542,154,16,0,'0',0,'0',0,'VAT 16%',1,NULL,NULL),(1543,154,10,0,'0',0,'0',0,'VAT Frontero',1,NULL,NULL),(1662,166,15,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1663,166,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1731,173,25,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1732,173,14,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1733,173,8,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1734,173,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1841,184,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1842,184,7,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1843,184,3,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1844,184,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1881,188,24,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(1882,188,9,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1883,188,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(1884,188,5,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(1931,193,0,0,'0',0,'0',0,'No VAT in SPM',1,NULL,NULL),(2011,201,19,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(2012,201,10,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(2013,201,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(2021,202,20,0,'0',0,'0',0,'VAT standard rate',1,NULL,NULL),(2022,202,8.5,0,'0',0,'0',0,'VAT reduced rate',1,NULL,NULL),(2023,202,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(2321,232,0,0,'0',0,'0',0,'No VAT',1,NULL,NULL),(2322,232,12,0,'0',0,'0',0,'VAT 12%',1,NULL,NULL),(2323,232,8,0,'0',0,'0',0,'VAT 8%',1,NULL,NULL),(2461,246,0,0,'0',0,'0',0,'VAT Rate 0',1,NULL,NULL),(2462,4,15,0,'0',0,'0',0,'aaaa',1,NULL,NULL); /*!40000 ALTER TABLE `llx_c_tva` ENABLE KEYS */; UNLOCK TABLES; diff --git a/dev/initdata/mysqldump_dolibarr_3.7.0.sql b/dev/initdata/mysqldump_dolibarr_3.7.0.sql index 9e92081351909..d560b93510e93 100644 --- a/dev/initdata/mysqldump_dolibarr_3.7.0.sql +++ b/dev/initdata/mysqldump_dolibarr_3.7.0.sql @@ -1796,7 +1796,7 @@ CREATE TABLE `llx_c_tva` ( LOCK TABLES `llx_c_tva` WRITE; /*!40000 ALTER TABLE `llx_c_tva` DISABLE KEYS */; -INSERT INTO `llx_c_tva` VALUES (11,1,20,'0','0','0','0',0,'VAT standard rate (France hors DOM-TOM)',1,NULL,NULL),(12,1,8.5,'0','0','0','0',0,'VAT standard rate (DOM sauf Guyane et Saint-Martin)',0,NULL,NULL),(13,1,8.5,'0','0','0','0',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,NULL,NULL),(14,1,5.5,'0','0','0','0',0,'VAT reduced rate (France hors DOM-TOM)',1,NULL,NULL),(15,1,0,'0','0','0','0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(16,1,2.1,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(21,2,21,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(22,2,6,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(23,2,0,'0','0','0','0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(24,2,12,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(31,3,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(32,3,10,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(33,3,4,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(34,3,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(41,4,21,'5.2','3','-21','1',0,'VAT standard rate',1,NULL,NULL),(42,4,10,'1.4','3','-21','1',0,'VAT reduced rate',1,NULL,NULL),(43,4,4,'0.5','3','-21','1',0,'VAT super-reduced rate',1,NULL,NULL),(44,4,0,'0','3','-21','1',0,'VAT Rate 0',1,NULL,NULL),(51,5,19,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(52,5,7,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(53,5,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(61,6,7.6,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(62,6,3.6,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(63,6,2.4,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(64,6,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(71,7,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(72,7,17.5,'0','0','0','0',0,'VAT standard rate before 2011',1,NULL,NULL),(73,7,5,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(74,7,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(91,9,17,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(92,9,13,'0','0','0','0',0,'VAT reduced rate 0',1,NULL,NULL),(93,9,3,'0','0','0','0',0,'VAT super reduced rate 0',1,NULL,NULL),(94,9,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(101,10,6,'0','0','0','0',0,'VAT 6%',1,NULL,NULL),(102,10,12,'1','4','0','0',0,'VAT 12%',1,NULL,NULL),(103,10,18,'0','0','0','0',0,'VAT 18%',1,NULL,NULL),(104,10,7.5,'1','4','0','0',0,'VAT 6% Majoré à 25% (7.5%)',1,NULL,NULL),(105,10,15,'1','4','0','0',0,'VAT 12% Majoré à 25% (15%)',1,NULL,NULL),(106,10,22.5,'1','4','0','0',0,'VAT 18% Majoré à 25% (22.5%)',1,NULL,NULL),(107,10,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(111,11,0,'0','0','0','0',0,'No Sales Tax',1,NULL,NULL),(112,11,4,'0','0','0','0',0,'Sales Tax 4%',1,NULL,NULL),(113,11,6,'0','0','0','0',0,'Sales Tax 6%',1,NULL,NULL),(121,12,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(122,12,14,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(123,12,10,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(124,12,7,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(125,12,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(141,14,7,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(142,14,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(143,14,5,'9.975','1','0','0',0,'TPS and TVQ rate',1,NULL,NULL),(171,17,19,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(172,17,6,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(173,17,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(201,20,25,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(202,20,12,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(203,20,6,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(204,20,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(231,23,21,'0','0','0','0',0,'IVA standard rate',1,NULL,NULL),(232,23,10.5,'0','0','0','0',0,'IVA reduced rate',1,NULL,NULL),(233,23,0,'0','0','0','0',0,'IVA Rate 0',1,NULL,NULL),(251,25,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(252,25,12,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(253,25,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(254,25,5,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(271,27,20,'0','0','0','0',0,'VAT standard rate (France hors DOM-TOM)',1,NULL,NULL),(272,27,8.5,'0','0','0','0',0,'VAT standard rate (DOM sauf Guyane et Saint-Martin)',0,NULL,NULL),(273,27,8.5,'0','0','0','0',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,NULL,NULL),(274,27,5.5,'0','0','0','0',0,'VAT reduced rate (France hors DOM-TOM)',0,NULL,NULL),(275,27,0,'0','0','0','0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(276,27,2.1,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(277,27,7,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(281,28,10,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(282,28,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(411,41,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(412,41,10,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(413,41,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(461,46,0,'0','0','0','0',0,'No VAT',1,NULL,NULL),(462,46,15,'0','0','0','0',0,'VAT 15%',1,NULL,NULL),(463,46,7.5,'0','0','0','0',0,'VAT 7.5%',1,NULL,NULL),(591,59,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(592,59,7,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(593,59,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(671,67,19,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(672,67,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(801,80,25,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(802,80,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(861,86,13,'0','0','0','0',0,'IVA 13',1,NULL,NULL),(862,86,0,'0','0','0','0',0,'SIN IVA',1,NULL,NULL),(1141,114,0,'0','0','0','0',0,'No ISV',1,NULL,NULL),(1142,114,12,'0','0','0','0',0,'ISV 12%',1,NULL,NULL),(1161,116,25.5,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1162,116,7,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1163,116,0,'0','0','0','0',0,'VAT rate 0',1,NULL,NULL),(1171,117,12.5,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1172,117,4,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1173,117,1,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(1174,117,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1231,123,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1232,123,5,'0','0','0','0',0,'VAT Rate 5',1,NULL,NULL),(1401,140,15,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1402,140,12,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1403,140,6,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1404,140,3,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(1405,140,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1521,152,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1522,152,15,'0','0','0','0',0,'VAT Rate 15',1,NULL,NULL),(1541,154,0,'0','0','0','0',0,'No VAT',1,NULL,NULL),(1542,154,16,'0','0','0','0',0,'VAT 16%',1,NULL,NULL),(1543,154,10,'0','0','0','0',0,'VAT Frontero',1,NULL,NULL),(1662,166,15,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1663,166,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1731,173,25,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1732,173,14,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1733,173,8,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1734,173,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1841,184,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1842,184,7,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1843,184,3,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1844,184,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1881,188,24,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1882,188,9,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1883,188,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1884,188,5,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1931,193,0,'0','0','0','0',0,'No VAT in SPM',1,NULL,NULL),(2011,201,19,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(2012,201,10,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(2013,201,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(2021,202,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(2022,202,8.5,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(2023,202,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(2321,232,0,'0','0','0','0',0,'No VAT',1,NULL,NULL),(2322,232,12,'0','0','0','0',0,'VAT 12%',1,NULL,NULL),(2323,232,8,'0','0','0','0',0,'VAT 8%',1,NULL,NULL),(2461,246,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(2462,4,15,'0','0','0','0',0,'aaaa',1,NULL,NULL); +INSERT INTO `llx_c_tva` VALUES (11,1,20,'0','0','0','0',0,'VAT standard rate (France hors DOM-TOM)',1,NULL,NULL),(12,1,8.5,'0','0','0','0',0,'VAT standard rate (DOM sauf Guyane et Saint-Martin)',0,NULL,NULL),(13,1,8.5,'0','0','0','0',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,NULL,NULL),(14,1,5.5,'0','0','0','0',0,'VAT reduced rate (France hors DOM-TOM)',1,NULL,NULL),(15,1,0,'0','0','0','0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(16,1,2.1,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(21,2,21,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(22,2,6,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(23,2,0,'0','0','0','0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(24,2,12,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(31,3,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(32,3,10,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(33,3,4,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(34,3,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(41,4,21,'5.2','3','-19','5',0,'VAT standard rate',1,NULL,NULL),(42,4,10,'1.4','3','-19','5',0,'VAT reduced rate',1,NULL,NULL),(43,4,4,'0.5','3','-19','5',0,'VAT super-reduced rate',1,NULL,NULL),(44,4,0,'0','3','-19','5',0,'VAT Rate 0',1,NULL,NULL),(51,5,19,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(52,5,7,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(53,5,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(61,6,7.6,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(62,6,3.6,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(63,6,2.4,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(64,6,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(71,7,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(72,7,17.5,'0','0','0','0',0,'VAT standard rate before 2011',1,NULL,NULL),(73,7,5,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(74,7,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(91,9,17,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(92,9,13,'0','0','0','0',0,'VAT reduced rate 0',1,NULL,NULL),(93,9,3,'0','0','0','0',0,'VAT super reduced rate 0',1,NULL,NULL),(94,9,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(101,10,6,'0','0','0','0',0,'VAT 6%',1,NULL,NULL),(102,10,12,'1','4','0','0',0,'VAT 12%',1,NULL,NULL),(103,10,18,'0','0','0','0',0,'VAT 18%',1,NULL,NULL),(104,10,7.5,'1','4','0','0',0,'VAT 6% Majoré à 25% (7.5%)',1,NULL,NULL),(105,10,15,'1','4','0','0',0,'VAT 12% Majoré à 25% (15%)',1,NULL,NULL),(106,10,22.5,'1','4','0','0',0,'VAT 18% Majoré à 25% (22.5%)',1,NULL,NULL),(107,10,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(111,11,0,'0','0','0','0',0,'No Sales Tax',1,NULL,NULL),(112,11,4,'0','0','0','0',0,'Sales Tax 4%',1,NULL,NULL),(113,11,6,'0','0','0','0',0,'Sales Tax 6%',1,NULL,NULL),(121,12,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(122,12,14,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(123,12,10,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(124,12,7,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(125,12,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(141,14,7,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(142,14,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(143,14,5,'9.975','1','0','0',0,'TPS and TVQ rate',1,NULL,NULL),(171,17,19,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(172,17,6,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(173,17,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(201,20,25,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(202,20,12,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(203,20,6,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(204,20,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(231,23,21,'0','0','0','0',0,'IVA standard rate',1,NULL,NULL),(232,23,10.5,'0','0','0','0',0,'IVA reduced rate',1,NULL,NULL),(233,23,0,'0','0','0','0',0,'IVA Rate 0',1,NULL,NULL),(251,25,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(252,25,12,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(253,25,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(254,25,5,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(271,27,20,'0','0','0','0',0,'VAT standard rate (France hors DOM-TOM)',1,NULL,NULL),(272,27,8.5,'0','0','0','0',0,'VAT standard rate (DOM sauf Guyane et Saint-Martin)',0,NULL,NULL),(273,27,8.5,'0','0','0','0',1,'VAT standard rate (DOM sauf Guyane et Saint-Martin), non perçu par le vendeur mais récupérable par acheteur',0,NULL,NULL),(274,27,5.5,'0','0','0','0',0,'VAT reduced rate (France hors DOM-TOM)',0,NULL,NULL),(275,27,0,'0','0','0','0',0,'VAT Rate 0 ou non applicable',1,NULL,NULL),(276,27,2.1,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(277,27,7,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(281,28,10,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(282,28,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(411,41,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(412,41,10,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(413,41,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(461,46,0,'0','0','0','0',0,'No VAT',1,NULL,NULL),(462,46,15,'0','0','0','0',0,'VAT 15%',1,NULL,NULL),(463,46,7.5,'0','0','0','0',0,'VAT 7.5%',1,NULL,NULL),(591,59,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(592,59,7,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(593,59,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(671,67,19,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(672,67,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(801,80,25,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(802,80,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(861,86,13,'0','0','0','0',0,'IVA 13',1,NULL,NULL),(862,86,0,'0','0','0','0',0,'SIN IVA',1,NULL,NULL),(1141,114,0,'0','0','0','0',0,'No ISV',1,NULL,NULL),(1142,114,12,'0','0','0','0',0,'ISV 12%',1,NULL,NULL),(1161,116,25.5,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1162,116,7,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1163,116,0,'0','0','0','0',0,'VAT rate 0',1,NULL,NULL),(1171,117,12.5,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1172,117,4,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1173,117,1,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(1174,117,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1231,123,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1232,123,5,'0','0','0','0',0,'VAT Rate 5',1,NULL,NULL),(1401,140,15,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1402,140,12,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1403,140,6,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1404,140,3,'0','0','0','0',0,'VAT super-reduced rate',1,NULL,NULL),(1405,140,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1521,152,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1522,152,15,'0','0','0','0',0,'VAT Rate 15',1,NULL,NULL),(1541,154,0,'0','0','0','0',0,'No VAT',1,NULL,NULL),(1542,154,16,'0','0','0','0',0,'VAT 16%',1,NULL,NULL),(1543,154,10,'0','0','0','0',0,'VAT Frontero',1,NULL,NULL),(1662,166,15,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1663,166,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1731,173,25,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1732,173,14,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1733,173,8,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1734,173,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1841,184,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1842,184,7,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1843,184,3,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1844,184,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1881,188,24,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(1882,188,9,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1883,188,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(1884,188,5,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(1931,193,0,'0','0','0','0',0,'No VAT in SPM',1,NULL,NULL),(2011,201,19,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(2012,201,10,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(2013,201,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(2021,202,20,'0','0','0','0',0,'VAT standard rate',1,NULL,NULL),(2022,202,8.5,'0','0','0','0',0,'VAT reduced rate',1,NULL,NULL),(2023,202,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(2321,232,0,'0','0','0','0',0,'No VAT',1,NULL,NULL),(2322,232,12,'0','0','0','0',0,'VAT 12%',1,NULL,NULL),(2323,232,8,'0','0','0','0',0,'VAT 8%',1,NULL,NULL),(2461,246,0,'0','0','0','0',0,'VAT Rate 0',1,NULL,NULL),(2462,4,15,'0','0','0','0',0,'aaaa',1,NULL,NULL); /*!40000 ALTER TABLE `llx_c_tva` ENABLE KEYS */; UNLOCK TABLES; @@ -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 1e237defb04987daad1b369329946e062b072d3b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 26 Apr 2015 17:59:02 +0200 Subject: [PATCH 082/264] Fix phpcs --- htdocs/core/class/html.form.class.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index ad11e08c4ca72..28f81fc490a46 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -3467,15 +3467,16 @@ function formInputReason($page, $selected='', $htmlname='demandreason', $addempt /** * Show a form + html select a date * - * @param string $page Page - * @param string $selected Date preselected - * @param string $htmlname Html name of date input fields or 'none' - * @param int $displayhour Display hour selector - * @param int $displaymin Display minutes selector + * @param string $page Page + * @param string $selected Date preselected + * @param string $htmlname Html name of date input fields or 'none' + * @param int $displayhour Display hour selector + * @param int $displaymin Display minutes selector + * @param int $nooutput 1=No print output, return string * @return void * @see select_date */ - function form_date($page, $selected, $htmlname, $displayhour=0, $displaymin=0, $noouput=0) + function form_date($page, $selected, $htmlname, $displayhour=0, $displaymin=0, $nooutput=0) { global $langs; @@ -3499,7 +3500,7 @@ function form_date($page, $selected, $htmlname, $displayhour=0, $displaymin=0, $ else $ret.=dol_print_date($selected,'day'); } - if (empty($noouput)) print $ret; + if (empty($nooutput)) print $ret; return $ret; } From a0c27620b233eebd80308253b71d41ee0e0fe49e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 26 Apr 2015 18:28:08 +0200 Subject: [PATCH 083/264] Fix to match spanish new vat value --- test/phpunit/FunctionsLibTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php index 7856a47e0e9e7..dd3602ff8f7d7 100755 --- a/test/phpunit/FunctionsLibTest.php +++ b/test/phpunit/FunctionsLibTest.php @@ -824,7 +824,7 @@ public function testGetDefaultLocalTax() $vat1=get_default_localtax($companyes,$companyes,1,0); $vat2=get_default_localtax($companyes,$companyes,2,0); $this->assertEquals(5.2,$vat1); - $this->assertEquals(-21,$vat2); + $this->assertEquals(-19,$vat2); // Test RULE ES-IT $vat1=get_default_localtax($companyes,$companyit,1,0); From 5b3b180c10d9686e8f32435e198a8e6de1a4643a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 27 Apr 2015 01:36:13 +0200 Subject: [PATCH 084/264] NEW Web service to create or update product can correct stock during creation/update. --- htdocs/product/class/product.class.php | 2 +- .../webservices/server_productorservice.php | 88 ++++++++++++++++++- 2 files changed, 86 insertions(+), 4 deletions(-) diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index e4f2a9d02c08f..228f790438b85 100755 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -3131,7 +3131,7 @@ function getLibFinished() * @param double $nbpiece nb of units * @param int $movement 0 = add, 1 = remove * @param string $label Label of stock movement - * @param double $price Price to use for stock eval + * @param double $price Unit price HT of product, used to calculate average weighted price (PMP in french). If 0, average weighted price is not changed. * @param string $inventorycode Inventory code * @return int <0 if KO, >0 if OK */ diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php index 474988fa6e867..e74a0d815d34d 100644 --- a/htdocs/webservices/server_productorservice.php +++ b/htdocs/webservices/server_productorservice.php @@ -73,7 +73,7 @@ 'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'), 'login' => array('name'=>'login','type'=>'xsd:string'), 'password' => array('name'=>'password','type'=>'xsd:string'), - 'entity' => array('name'=>'entity','type'=>'xsd:string'), + 'entity' => array('name'=>'entity','type'=>'xsd:string') ) ); // Define WSDL Return object @@ -85,7 +85,7 @@ '', array( 'result_code' => array('name'=>'result_code','type'=>'xsd:string'), - 'result_label' => array('name'=>'result_label','type'=>'xsd:string'), + 'result_label' => array('name'=>'result_label','type'=>'xsd:string') ) ); @@ -122,6 +122,8 @@ 'stock_alert' => array('name'=>'stock_alert','type'=>'xsd:string'), 'stock_real' => array('name'=>'stock_real','type'=>'xsd:string'), 'stock_pmp' => array('name'=>'stock_pmp','type'=>'xsd:string'), + 'warehouse_ref' => array('name'=>'warehouse_ref','type'=>'xsd:string'), // Used only for create or update to set which warehouse to use for stock correction if stock_real differs from database + 'canvas' => array('name'=>'canvas','type'=>'xsd:string'), 'import_key' => array('name'=>'import_key','type'=>'xsd:string'), @@ -562,6 +564,46 @@ function createProductOrService($authentication,$product) $error++; } + if (! $error) + { + // Update stock if stock count is provided and differs from database after creation or update + if (isset($product['stock_real']) && $product['stock_real'] != '' && ! empty($conf->global->stock->enabled)) + { + require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; + + $savstockreal=$newobject->stock_reel; + $newobject->load_stock(); // This overwrite ->stock_reel + $getstockreal = $newobject->stock_reel; + + if ($savstockreal != $getstockreal) + { + $warehouse = new Entrepot($this->db); + $warehouse->fetch(0, $product['warehouse_ref']); + if ($warehouse->id > 0) + { + if (($savstockreal - $getstockreal) > 0) + { + $result=$newobject->correct_stock($fuser, $warehouse->id, ($savstockreal - $getstockreal), 0, 'Correction from external call (Web Service)', 0, 'WS'.dol_print_date($now,'dayhourlog')); + } + if (($savstockreal - $getstockreal) > 0) + { + $result=$newobject->correct_stock($fuser, $warehouse->id, ($savstockreal - $getstockreal), 1, 'Correction from external call (Web Service)', 0, 'WS'.dol_print_date($now,'dayhourlog')); + } + if ($result <= 0) + { + $error++; + $newobject->error='You set a different value for stock, but correction of stock count (before='.$getstockreal.', after='.$savstockreal.') fails with error '.$newobject->error; + } + } + else + { + $error++; + $newobject->error='You set a different value for stock but we failed to find warehouse '.$product['warehouse_ref'].' to make correction.'; + } + } + } + } + if (! $error) { $db->commit(); @@ -691,6 +733,46 @@ function updateProductOrService($authentication,$product) { $error++; } + else + { + // Update stock if stock count is provided and differs from database after creation or update + if (isset($product['stock_real']) && $product['stock_real'] != '' && ! empty($conf->global->stock->enabled)) + { + require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; + + $savstockreal=$newobject->stock_reel; + $newobject->load_stock(); // This overwrite ->stock_reel + $getstockreal = $newobject->stock_reel; + + if ($savstockreal != $getstockreal) + { + $warehouse = new Entrepot($this->db); + $warehouse->fetch(0, $product['warehouse_ref']); + if ($warehouse->id > 0) + { + if (($savstockreal - $getstockreal) > 0) + { + $result=$newobject->correct_stock($fuser, $warehouse->id, ($savstockreal - $getstockreal), 0, 'Correction from external call (Web Service)', 0, 'WS'.dol_print_date($now,'dayhourlog')); + } + if (($savstockreal - $getstockreal) > 0) + { + $result=$newobject->correct_stock($fuser, $warehouse->id, ($savstockreal - $getstockreal), 1, 'Correction from external call (Web Service)', 0, 'WS'.dol_print_date($now,'dayhourlog')); + } + if ($result <= 0) + { + $error++; + $newobject->error='You set a different value for stock, but correction of stock count (before='.$getstockreal.', after='.$savstockreal.') fails with error '.$newobject->error; + } + } + else + { + $error++; + $newobject->error='You set a different value for stock but we failed to find warehouse '.$product['warehouse_ref'].' to make correction.'; + } + } + } + } + if (! $error) { if ($newobject->price_base_type == 'HT') @@ -717,7 +799,7 @@ function updateProductOrService($authentication,$product) $objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref); } else - { + { $db->rollback(); $error++; $errorcode='KO'; From 4e04f75c66b31c496b92c81c33d22116a2b35cb6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 27 Apr 2015 02:33:44 +0200 Subject: [PATCH 085/264] Fix css --- htdocs/compta/facture.php | 125 +++++++++++----------- htdocs/core/tpl/objectline_create.tpl.php | 30 +++--- htdocs/theme/eldy/style.css.php | 3 + 3 files changed, 81 insertions(+), 77 deletions(-) diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index a78e64f675e79..152dde9dee37c 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -2947,16 +2947,7 @@ print '
'; // $form->form_remise_dispo($_SERVER["PHP_SELF"].'?facid='.$object->id, 0, 'remise_id_for_payment', $soc->id, $absolute_creditnote, // $filtercreditnote, $resteapayer); - $form->form_remise_dispo($_SERVER["PHP_SELF"] . '?facid=' . $object->id, 0, 'remise_id_for_payment', $soc->id, $absolute_creditnote, $filtercreditnote, 0); // We - // must - // allow - // credit - // not - // even - // if - // amount - // is - // higher + $form->form_remise_dispo($_SERVER["PHP_SELF"] . '?facid=' . $object->id, 0, 'remise_id_for_payment', $soc->id, $absolute_creditnote, $filtercreditnote, 0); // We allow credit note even if amount is higher } } if (! $absolute_discount && ! $absolute_creditnote) { @@ -3044,14 +3035,17 @@ $sql .= ' ORDER BY p.datep, p.tms'; $result = $db->query($sql); - if ($result) { + if ($result) + { $num = $db->num_rows($result); $i = 0; // if ($object->type != 2) // { - if ($num > 0) { - while ($i < $num) { + if ($num > 0) + { + while ($i < $num) + { $objp = $db->fetch_object($result); $var = ! $var; print '
'; @@ -3059,7 +3053,8 @@ print dol_print_date($db->jdate($objp->dp), 'day') . '' . $label . ' ' . $objp->num_paiement . '
'; if ($object->type != Facture::TYPE_DEPOSIT) @@ -3101,11 +3097,13 @@ $sql .= " FROM " . MAIN_DB_PREFIX . "societe_remise_except as re"; $sql .= " WHERE fk_facture = " . $object->id; $resql = $db->query($sql); - if ($resql) { + if ($resql) + { $num = $db->num_rows($resql); $i = 0; $invoice = new Facture($db); - while ($i < $num) { + while ($i < $num) + { $obj = $db->fetch_object($resql); $invoice->fetch($obj->fk_facture_source); print '
'; @@ -3173,7 +3171,8 @@ print ' :' . price($resteapayeraffiche) . ' 
'; @@ -3219,7 +3218,8 @@ print 'id . '">' . img_edit($langs->trans('SetConditions'), 1) . '
'; print '		'; - if ($object->type != Facture::TYPE_CREDIT_NOTE) { + if ($object->type != Facture::TYPE_CREDIT_NOTE) + { if ($action == 'editconditions') { $form->form_conditions_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->cond_reglement_id, 'cond_reglement_id'); } else { @@ -3239,7 +3239,8 @@ print 'id . '">' . img_edit($langs->trans('SetDate'), 1) . '
'; print '		'; - if ($object->type != Facture::TYPE_CREDIT_NOTE) { + if ($object->type != Facture::TYPE_CREDIT_NOTE) + { if ($action == 'editpaymentterm') { $form->form_date($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->date_lim_reglement, 'paymentterm'); } else { @@ -3294,67 +3295,67 @@ // Situations if (! empty($conf->global->INVOICE_US_SITUATION)) { - if ($object->type == 5 && ($object->situation_counter > 1)) - { - $prevsits = $object->get_prev_sits(); - print '
'; - print $langs->trans('SituationAmount'); - print ' '; + if ($object->type == 5 && ($object->situation_counter > 1)) + { + $prevsits = $object->get_prev_sits(); + print '
'; + print $langs->trans('SituationAmount'); + print ' '; - print $prevsits[0]->situation_counter; - for ($i = 1; $i < count($prevsits); $i++) { + print $prevsits[0]->situation_counter; + for ($i = 1; $i < count($prevsits); $i++) { + print ' + '; + print $prevsits[$i]->situation_counter; + } print ' + '; - print $prevsits[$i]->situation_counter; - } - print ' + '; - print $object->situation_counter; - - print ''; - - $prevsits_total_amount = 0; - foreach ($prevsits as $situation) { - $prevsits_total_amount += $situation->total_ht; - } - $prevsits_total_amount += $object->total_ht; + print $object->situation_counter; - print price($prevsits_total_amount); - print '' . $langs->trans('Currency' . $conf->currency) . '
'; - // Previous situation(s) deduction(s) - for ($i = 0; $i < count($prevsits); $i++) { - print '
'; - print ''; - print $langs->trans('SituationDeduction'); - print ' '; - print $prevsits[$i]->situation_counter; - print ''; - print '- ' . price($prevsits[$i]->total_ht); + print price($prevsits_total_amount); print '' . $langs->trans('Currency' . $conf->currency) . '
'; + print ''; + print $langs->trans('SituationDeduction'); + print ' '; + print $prevsits[$i]->situation_counter; + print ''; + print '- ' . price($prevsits[$i]->total_ht); + print '' . $langs->trans('Currency' . $conf->currency) . '
' . $langs->trans('AmountHT') . '' . price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency) . '
' . $langs->trans('AmountVAT') . '' . price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency) . '
' . price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency) . '
' . $langs->trans('AmountVAT') . '' . price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency) . '
' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '' . price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency) . '
' . price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency) . '
' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '' . price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency) . '
' . price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency) . '
id . '">' . img_edit($langs->trans('SetRevenuStamp'), 1) . '
'; - print '
'; + print ''; if ($action == 'editrevenuestamp') { print '
'; print ''; @@ -3383,11 +3384,11 @@ } // Total with tax - print '
' . $langs->trans('AmountTTC') . '' . price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency) . '
' . $langs->trans('AmountTTC') . '' . price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency) . '
' . $langs->trans('Status') . '' . ($object->getLibStatut(4, $totalpaye)) . '
' . ($object->getLibStatut(4, $totalpaye)) . '
global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>> Create(); ?> tva_assuj == "0") echo '0'; else echo $form->load_tva('tva_tx', (isset($_POST["tva_tx"])?$_POST["tva_tx"]:-1), $seller, $buyer); ?> + "> + "> "> + "> '; + print ''; print $form->selectUnits($line->fk_unit, "units"); print 'remise_percent); ?>">%remise_percent); ?>">% %% + product->enabled) || ! empty($conf->service->enabled)) { ?> @@ -261,12 +261,12 @@ { if (! empty($conf->global->DISPLAY_MARGIN_RATES)) { - echo '%%%% +