From 7f1adc6a6ab53fce7e3a5d7f910cd90109ffc27e Mon Sep 17 00:00:00 2001 From: Ferran Marcet Date: Tue, 7 Nov 2017 09:46:39 +0100 Subject: [PATCH 0001/1074] FIX: Saving wrong localtax on order addline --- htdocs/commande/class/commande.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index c326efa7e49..0ea9302b221 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -1360,8 +1360,8 @@ class Commande extends CommonOrder $this->line->vat_src_code=$vat_src_code; $this->line->tva_tx=$txtva; - $this->line->localtax1_tx=$localtaxes_type[1]; - $this->line->localtax2_tx=$localtaxes_type[3]; + $this->line->localtax1_tx=$txlocaltax1; + $this->line->localtax2_tx=$txlocaltax2; $this->line->localtax1_type=$localtaxes_type[0]; $this->line->localtax2_type=$localtaxes_type[2]; $this->line->fk_product=$fk_product; From 8fa7b924d5975f5d69d8571bc31a04dd15acfb5f Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Sat, 9 Dec 2017 12:08:50 +0100 Subject: [PATCH 0002/1074] enhance image using awesome icon --- htdocs/core/lib/functions.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 9683517f377..ba842682221 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -6245,7 +6245,7 @@ function dol_validElement($element) * Return img flag of country for a language code or country code * * @param string $codelang Language code (en_IN, fr_CA...) or Country code (IN, FR) - * @param string $moreatt Add more attribute on img tag (For example 'style="float: right"') + * @param string $moreatt Add more attribute on img tag (For example 'style="float: right"') * @return string HTML img string with flag. */ function picto_from_langcode($codelang, $moreatt = '') @@ -6258,7 +6258,7 @@ function picto_from_langcode($codelang, $moreatt = '') if ($codelang == 'auto') { - return img_picto_common($langs->trans('AutoDetectLang'), 'flags/int.png', $moreatt); + return ''; } $langtocountryflag = array( From ab558ee5fae5fbbaa92452160e80d8664e83453a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 14 Dec 2017 09:49:55 +0100 Subject: [PATCH 0003/1074] Update product.php --- htdocs/product/admin/product.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php index 2757234251d..69355a7f1e8 100644 --- a/htdocs/product/admin/product.php +++ b/htdocs/product/admin/product.php @@ -56,7 +56,6 @@ $select_pricing_rules=array( ); if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { - $langs->load("admin"); $select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY'] = $langs->trans('PriceByQuantity').' ('.$langs->trans("VersionExperimental").')'; // TODO If this is enabled, price must be hidden when price by qty is enabled, also price for quantity must be used when adding product into order/propal/invoice $select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY&PRODUIT_MULTIPRICES'] = $langs->trans('MultiPricesAbility') . '+' . $langs->trans('PriceByQuantity').' ('.$langs->trans("VersionExperimental").')'; } From a33411b8bd5842f1f201aaa03475d596b9c5f233 Mon Sep 17 00:00:00 2001 From: dolibarr95 <24292300+dolibarr95@users.noreply.github.com> Date: Wed, 20 Dec 2017 09:06:11 +0100 Subject: [PATCH 0004/1074] Create 7.0.0-8.0.0.sql --- .../install/mysql/migration/7.0.0-8.0.0.sql | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 htdocs/install/mysql/migration/7.0.0-8.0.0.sql diff --git a/htdocs/install/mysql/migration/7.0.0-8.0.0.sql b/htdocs/install/mysql/migration/7.0.0-8.0.0.sql new file mode 100644 index 00000000000..e9a72ab9360 --- /dev/null +++ b/htdocs/install/mysql/migration/7.0.0-8.0.0.sql @@ -0,0 +1,26 @@ +-- +-- Be carefull to requests order. +-- This file must be loaded by calling /install/index.php page +-- when current version is 7.0.0 or higher. +-- +-- To rename a table: ALTER TABLE llx_table RENAME TO llx_table_new; +-- To add a column: ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol; +-- To rename a column: ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60); +-- To drop a column: ALTER TABLE llx_table DROP COLUMN oldname; +-- To change type of field: ALTER TABLE llx_table MODIFY COLUMN name varchar(60); +-- To drop a foreign key: ALTER TABLE llx_table DROP FOREIGN KEY fk_name; +-- To drop an index: -- VMYSQL4.0 DROP INDEX nomindex on llx_table +-- To drop an index: -- VPGSQL8.0 DROP INDEX nomindex +-- To restrict request to Mysql version x.y minimum use -- VMYSQLx.y +-- To restrict request to Pgsql version x.y minimum use -- VPGSQLx.y +-- To make pk to be auto increment (mysql): -- VMYSQL4.3 ALTER TABLE llx_c_shipment_mode CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT; +-- To make pk to be auto increment (postgres): -- VPGSQL8.2 NOT POSSIBLE. MUST DELETE/CREATE TABLE +-- To set a field as NULL: -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NULL; +-- To set a field as NULL: -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name DROP NOT NULL; +-- To set a field as NOT NULL: -- VMYSQL4.3 ALTER TABLE llx_table MODIFY COLUMN name varchar(60) NOT NULL; +-- To set a field as NOT NULL: -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET NOT NULL; +-- To set a field as default NULL: -- VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET DEFAULT NULL; +-- Note: fields with type BLOB/TEXT can't have default value. + +-- For 8.0 +ALTER TABLE llx_societe ADD COLUMN fk_entrepot int DEFAULT 0; From 28214598943d0bbb46013fb661448954e5a584d0 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 20 Dec 2017 11:36:51 +0100 Subject: [PATCH 0005/1074] Fix: avoid php warning --- htdocs/compta/paiement.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 7a494113090..fc65c6f05c3 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -102,7 +102,7 @@ if (empty($reshook)) $tmpinvoice=new Facture($db); foreach ($_POST as $key => $value) { - if (substr($key,0,7) == 'amount_') + if (substr($key,0,7) == 'amount_' && GETPOST($key) != '') { $cursorfacid = substr($key,7); $amounts[$cursorfacid] = price2num(trim(GETPOST($key))); From 7da1f706e5ffcc84f18f12ff7ccf736d41aa7921 Mon Sep 17 00:00:00 2001 From: fappels Date: Wed, 20 Dec 2017 12:25:30 +0100 Subject: [PATCH 0006/1074] Error in send_mail trigger is not system error --- htdocs/core/actions_sendmails.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php index 5a8d32efde5..f7806cdd38a 100644 --- a/htdocs/core/actions_sendmails.inc.php +++ b/htdocs/core/actions_sendmails.inc.php @@ -445,7 +445,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO if ($error) { - dol_print_error($db); + // error message event set by trigger interface } else { From 3f6b3b51caf0b35842951b2da88232cea36aa193 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 20 Dec 2017 15:09:58 +0100 Subject: [PATCH 0007/1074] Fix css --- htdocs/core/class/html.form.class.php | 8 ++++---- htdocs/theme/eldy/style.css.php | 2 ++ htdocs/theme/md/style.css.php | 2 ++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 71b7b42fdcd..2c5e41ce75a 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -166,7 +166,7 @@ class Form $ret.=''; $ret.=''; $ret.=''; - if (empty($notabletag)) $ret.=''; + if (empty($notabletag)) $ret.='
'; if (empty($notabletag)) $ret.=''; if (! empty($arrayfields['s.nom']['checked'])) { From 4bc2e80ba897b358612af78a43b34530fd7f85a1 Mon Sep 17 00:00:00 2001 From: fappels Date: Wed, 20 Dec 2017 17:20:40 +0100 Subject: [PATCH 0009/1074] Fix sending expense reports --- htdocs/core/actions_sendmails.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php index f7806cdd38a..1544bd36fce 100644 --- a/htdocs/core/actions_sendmails.inc.php +++ b/htdocs/core/actions_sendmails.inc.php @@ -113,7 +113,7 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO $result=$object->fetch($id); $sendtosocid=0; // Thirdparty on object - if (method_exists($object,"fetch_thirdparty") && ! in_array($object->element, array('societe','member','user'))) + if (method_exists($object,"fetch_thirdparty") && ! in_array($object->element, array('societe','member','user','expensereport'))) { $result=$object->fetch_thirdparty(); if ($object->element == 'user' && $result == 0) $result=1; // Even if not found, we consider ok From e308124ed6d473f6b0694586c3a29b3eb4831320 Mon Sep 17 00:00:00 2001 From: AlainRnet Date: Wed, 20 Dec 2017 17:41:26 +0100 Subject: [PATCH 0010/1074] Show total number of records by category There is so much information missing in these categories and it is also not possible to sort or display other information than currently displayed. Here is a small hack to display the total number of record(s) in the list header of each category. --- htdocs/categories/viewcat.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index daa5ade05b5..255dc4888aa 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -353,7 +353,7 @@ if ($type == Categorie::TYPE_PRODUCT) print "
"; print "
'; if (preg_match('/^(string|email)/',$typeofdata)) { @@ -189,7 +189,7 @@ class Form $morealt=' style="width: '.$cols.'"'; $cols=''; } - $ret.=''; + $ret.=''; } else if ($typeofdata == 'day' || $typeofdata == 'datepicker') { @@ -4170,12 +4170,12 @@ class Form { print $langs->trans("CompanyHasAbsoluteDiscount",price($amount,0,$langs,0,0,-1,$conf->currency)); } - elseif ($filter=="fk_facture_source IS NULL OR (fk_facture_source IS NOT NULL AND (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%'))") + elseif ($filter=="fk_facture_source IS NULL OR (fk_facture_source IS NOT NULL AND (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%'))") { // Replace trans key with CompanyHasDownPaymentOrCommercialDiscount print $langs->trans("CompanyHasAbsoluteDiscount",price($amount,0,$langs,0,0,-1,$conf->currency)); } - else + else { print $langs->trans("CompanyHasCreditNote",price($amount,0,$langs,0,0,-1,$conf->currency)); } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 7f294d78e4e..8586a77b687 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -3479,6 +3479,7 @@ td.gtaskname { background: url() right top no-repeat; cursor: pointer; margin-right: 3px; + margin-top: 3px; } .editkey_datepicker { @@ -3486,6 +3487,7 @@ td.gtaskname { margin-right: 3px; cursor: pointer; margin-right: 3px; + margin-top: 3px; } .editval_textarea.active:hover, .editval_ckeditor.active:hover, .editval_string.active:hover, .editval_email.active:hover, .editval_numeric.active:hover, .editval_select.active:hover, .editval_autocomplete.active:hover, .editval_datepicker.active:hover { diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 5a56d027b15..fe947935ec5 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -3549,12 +3549,14 @@ td.gtaskname { background: url() right top no-repeat; cursor: pointer; margin-right: 3px; + margin-top: 3px; } .editkey_datepicker { background: url() right center no-repeat; cursor: pointer; margin-right: 3px; + margin-top: 3px; } .editval_textarea.active:hover, .editval_ckeditor.active:hover, .editval_string.active:hover, .editval_email.active:hover, .editval_numeric.active:hover, .editval_select.active:hover, .editval_autocomplete.active:hover, .editval_datepicker.active:hover { From dc930dd6c54e43dcc290a0341d15c1ebc35df8f4 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Wed, 20 Dec 2017 16:46:49 +0100 Subject: [PATCH 0008/1074] FIX: Bad name alias showing in name of third column --- htdocs/societe/list.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php index ca94bcee799..63f237416d7 100644 --- a/htdocs/societe/list.php +++ b/htdocs/societe/list.php @@ -7,6 +7,7 @@ * Copyright (C) 2015 Florian Henry * Copyright (C) 2016 Josep Lluis Amador * Copyright (C) 2016 Ferran Marcet + * Copyright (C) 2017 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 @@ -975,6 +976,8 @@ while ($i < min($num, $limit)) $companystatic->fk_prospectlevel=$obj->fk_prospectlevel; + $companystatic->name_alias=$obj->name_alias =''; + print '
\n"; - print '\n"; + print '\n"; if (count($prods) > 0) { @@ -402,7 +402,7 @@ if ($type == Categorie::TYPE_SUPPLIER) { print "
"; print '
'.$langs->trans("ProductsAndServices")."
'.$langs->trans("ProductsAndServices")." (".count($prods).")
'."\n"; - print '\n"; + print '\n"; if (count($socs) > 0) { @@ -451,7 +451,7 @@ if($type == Categorie::TYPE_CUSTOMER) { print "
"; print '
'.$langs->trans("Suppliers")."
'.$langs->trans("Suppliers")." (".count($socs).")
'."\n"; - print '\n"; + print '\n"; if (count($socs) > 0) { @@ -507,7 +507,7 @@ if ($type == Categorie::TYPE_MEMBER) { print "
"; print "
'.$langs->trans("Customers")."
'.$langs->trans("Customers")." (".count($socs).")
\n"; - print '\n"; + print '\n"; if (count($prods) > 0) { @@ -558,7 +558,7 @@ if ($type == Categorie::TYPE_CONTACT) { print "
"; print '
'.$langs->trans("Member")."
'.$langs->trans("Member")." (".count($prods).")
'."\n"; - print '\n"; + print '\n"; if (count($contacts) > 0) { @@ -613,7 +613,7 @@ if ($type == Categorie::TYPE_ACCOUNT) { print "
"; print "
'.$langs->trans("Contact")."
'.$langs->trans("Contact")." (".count($contacts).")
\n"; - print '\n"; + print '\n"; if (count($accounts) > 0) { @@ -666,7 +666,7 @@ if ($type == Categorie::TYPE_PROJECT) { print "
"; print "
'.$langs->trans("Account")."
'.$langs->trans("Account")." (".count($accounts).")
\n"; - print '\n"; + print '\n"; if (count($projects) > 0) { From ae7f8c3fe499bd061ce157cb948314a785508bdb Mon Sep 17 00:00:00 2001 From: arnaud Date: Thu, 21 Dec 2017 12:01:30 +0100 Subject: [PATCH 0011/1074] FIX search on contact list --- htdocs/contact/list.php | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index 7508381e6cd..5aacbc2f16f 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -68,6 +68,9 @@ $search_categ_thirdparty=GETPOST("search_categ_thirdparty",'int'); $search_categ_supplier=GETPOST("search_categ_supplier",'int'); $search_status=GETPOST("search_status",'int'); $search_type=GETPOST('search_type','alpha'); +$search_zip=GETPOST('search_zip','alpha'); +$search_town=GETPOST('search_town','alpha'); + if ($search_status=='') $search_status=1; // always display activ customer first $optioncss = GETPOST('optioncss','alpha'); @@ -289,7 +292,7 @@ if (strlen($search_poste)) $sql.= natural_search('p.poste', $search_pos if (strlen($search_phone_perso)) $sql.= natural_search('p.phone_perso', $search_phone_perso); if (strlen($search_phone_pro)) $sql.= natural_search('p.phone', $search_phone); if (strlen($search_phone_mobile)) $sql.= natural_search('p.phone_mobile', $search_phone_mobile); -if (strlen($search_fax)) $sql.= natural_search('p.phone_fax', $search_fax); +if (strlen($search_fax)) $sql.= natural_search('p.fax', $search_fax); if (strlen($search_skype)) $sql.= natural_search('p.skype', $search_skype); if (strlen($search_email)) $sql.= natural_search('p.email', $search_email); if ($search_status != '' && $search_status >= 0) $sql.= " AND p.statut = ".$db->escape($search_status); @@ -396,6 +399,7 @@ if ($search_email != '') $param.='&search_email='.urlencode($search_email); if ($search_status != '') $param.='&search_status='.urlencode($search_status); if ($search_priv == '0' || $search_priv == '1') $param.="&search_priv=".urlencode($search_priv); if ($optioncss != '') $param.='&optioncss='.$optioncss; + // Add $param from extra fields foreach ($search_array_options as $key => $val) { @@ -491,12 +495,6 @@ if (! empty($arrayfields['p.firstname']['checked'])) print ''; print ''; } -if (! empty($arrayfields['p.poste']['checked'])) -{ - print ''; -} if (! empty($arrayfields['p.zip']['checked'])) { print ''; } +if (! empty($arrayfields['p.poste']['checked'])) +{ + print ''; +} if (! empty($arrayfields['p.phone']['checked'])) { print ''; print ''; print ''; print ''; From b1ce3fc5c806b44512f51b436681a276df540e8c Mon Sep 17 00:00:00 2001 From: arnaud Date: Thu, 21 Dec 2017 12:12:50 +0100 Subject: [PATCH 0013/1074] FIX stats trad for customerinvoice --- htdocs/langs/fr_FR/other.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang index 346fcf42934..066e1ec5015 100644 --- a/htdocs/langs/fr_FR/other.lang +++ b/htdocs/langs/fr_FR/other.lang @@ -172,7 +172,7 @@ NumberOfSupplierOrders=Nombre de commandes fournisseurs NumberOfSupplierInvoices=Nombre de factures fournisseurs NumberOfUnitsProposals=Quantités présentes dans les propositions commerciales NumberOfUnitsCustomerOrders=Quantités présentes dans les commandes clients -NumberOfUnitsCustomerInvoices=Quantités présentes dans les factures fournisseurs +NumberOfUnitsCustomerInvoices=Quantités présentes dans les factures clients NumberOfUnitsSupplierProposals=Quantités présentes dans les demande de prix NumberOfUnitsSupplierOrders=Quantités présentes dans les commandes fournisseurs NumberOfUnitsSupplierInvoices=Quantités présentes dans les factures fournisseurs From 4a5988accbb770b74105baacd5a034689272128c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 21 Dec 2017 12:47:49 +0100 Subject: [PATCH 0014/1074] FIX security vulnerability reported by ADLab of Venustech --- htdocs/adherents/subscription/info.php | 6 +++--- htdocs/cashdesk/tpl/facturation1.tpl.php | 8 ++++++++ htdocs/cashdesk/tpl/liste_articles.tpl.php | 8 ++++++++ htdocs/cashdesk/tpl/menu.tpl.php | 8 ++++++++ htdocs/cashdesk/tpl/ticket.tpl.php | 9 +++++++++ htdocs/cashdesk/tpl/validation1.tpl.php | 8 ++++++++ htdocs/cashdesk/tpl/validation2.tpl.php | 8 ++++++++ htdocs/comm/multiprix.php | 13 +++++++------ htdocs/fourn/index.php | 14 +++++++------- htdocs/main.inc.php | 3 ++- 10 files changed, 68 insertions(+), 17 deletions(-) diff --git a/htdocs/adherents/subscription/info.php b/htdocs/adherents/subscription/info.php index c83771d22ff..05856c35f75 100644 --- a/htdocs/adherents/subscription/info.php +++ b/htdocs/adherents/subscription/info.php @@ -36,7 +36,7 @@ $langs->load("users"); if (!$user->rights->adherent->lire) accessforbidden(); -$rowid=isset($_GET["rowid"])?$_GET["rowid"]:$_POST["rowid"]; +$rowid=GETPOST("rowid",'int'); @@ -44,10 +44,10 @@ $rowid=isset($_GET["rowid"])?$_GET["rowid"]:$_POST["rowid"]; * View */ -llxHeader(); - $form = new Form($db); +llxHeader(); + $object = new Subscription($db); $result = $object->fetch($rowid); diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php index 580012847f5..4372f422518 100644 --- a/htdocs/cashdesk/tpl/facturation1.tpl.php +++ b/htdocs/cashdesk/tpl/facturation1.tpl.php @@ -19,6 +19,14 @@ * */ +// Protection to avoid direct call of template +if (empty($langs) || ! is_object($langs)) +{ + print "Error, template page can't be called as URL"; + exit; +} + + $langs->load("main"); $langs->load("bills"); $langs->load("cashdesk"); diff --git a/htdocs/cashdesk/tpl/liste_articles.tpl.php b/htdocs/cashdesk/tpl/liste_articles.tpl.php index e4b6bc14436..65f48b0603c 100644 --- a/htdocs/cashdesk/tpl/liste_articles.tpl.php +++ b/htdocs/cashdesk/tpl/liste_articles.tpl.php @@ -17,6 +17,14 @@ * */ +// Protection to avoid direct call of template +if (empty($langs) || ! is_object($langs)) +{ + print "Error, template page can't be called as URL"; + exit; +} + + require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; diff --git a/htdocs/cashdesk/tpl/menu.tpl.php b/htdocs/cashdesk/tpl/menu.tpl.php index fd9bcbca77c..4197db6b1b0 100644 --- a/htdocs/cashdesk/tpl/menu.tpl.php +++ b/htdocs/cashdesk/tpl/menu.tpl.php @@ -19,6 +19,14 @@ * along with this program. If not, see . */ +// Protection to avoid direct call of template +if (empty($langs) || ! is_object($langs)) +{ + print "Error, template page can't be called as URL"; + exit; +} + + include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; include_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php'; diff --git a/htdocs/cashdesk/tpl/ticket.tpl.php b/htdocs/cashdesk/tpl/ticket.tpl.php index 82b84ba3b56..3937c9dbde3 100644 --- a/htdocs/cashdesk/tpl/ticket.tpl.php +++ b/htdocs/cashdesk/tpl/ticket.tpl.php @@ -16,6 +16,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + +// Protection to avoid direct call of template +if (empty($langs) || ! is_object($langs)) +{ + print "Error, template page can't be called as URL"; + exit; +} + + include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; $langs->load("main"); diff --git a/htdocs/cashdesk/tpl/validation1.tpl.php b/htdocs/cashdesk/tpl/validation1.tpl.php index bb3d63a9e58..2a390b99c65 100644 --- a/htdocs/cashdesk/tpl/validation1.tpl.php +++ b/htdocs/cashdesk/tpl/validation1.tpl.php @@ -16,6 +16,14 @@ * along with this program. If not, see . */ +// Protection to avoid direct call of template +if (empty($langs) || ! is_object($langs)) +{ + print "Error, template page can't be called as URL"; + exit; +} + + $langs->load("main"); $langs->load("bills"); $langs->load("banks"); diff --git a/htdocs/cashdesk/tpl/validation2.tpl.php b/htdocs/cashdesk/tpl/validation2.tpl.php index a6e2fe2a3f3..a9889451bda 100644 --- a/htdocs/cashdesk/tpl/validation2.tpl.php +++ b/htdocs/cashdesk/tpl/validation2.tpl.php @@ -17,6 +17,14 @@ * */ +// Protection to avoid direct call of template +if (empty($langs) || ! is_object($langs)) +{ + print "Error, template page can't be called as URL"; + exit; +} + + $langs->load("main"); $langs->load("bills"); diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php index 80c6305fcec..dd4e6cef1fa 100644 --- a/htdocs/comm/multiprix.php +++ b/htdocs/comm/multiprix.php @@ -30,7 +30,8 @@ require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; $langs->load("orders"); $langs->load("companies"); -$_socid = $_GET["id"]; +$id = GETPOST('id','int'); +$_socid = GETPOST("id",'int'); // Security check if ($user->societe_id > 0) { @@ -45,10 +46,10 @@ if ($user->societe_id > 0) if ($_POST["action"] == 'setpricelevel') { $soc = New Societe($db); - $soc->fetch($_GET["id"]); + $soc->fetch($id); $soc->set_price_level($_POST["price_level"],$user); - header("Location: multiprix.php?id=".$_GET["id"]); + header("Location: multiprix.php?id=".$id); exit; } @@ -87,7 +88,7 @@ if ($_socid > 0) print '
'; print ''; print ''; - + dol_fiche_head($head, $tabchoice, $langs->trans("ThirdParty"), 0, 'company'); print '
'.$langs->trans("Project")."
'.$langs->trans("Project")." (".count($projects).")
'; - print ''; - print ''; @@ -509,6 +507,12 @@ if (! empty($arrayfields['p.town']['checked'])) print ''; print ''; + print ''; + print ''; From 4ba039d2296d6e09c2f1e15ffa8a9e443231b0fc Mon Sep 17 00:00:00 2001 From: arnaud Date: Thu, 21 Dec 2017 12:07:29 +0100 Subject: [PATCH 0012/1074] FIX trans unactivate on contractline --- htdocs/contrat/card.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index 43f086fbab4..a1a38d04626 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -1840,7 +1840,7 @@ else { $tmpaction='unactivateline'; $tmpactionpicto='playstop'; - $tmpactiontext=$langs->trans("Unactivate"); + $tmpactiontext=$langs->trans("Disable"); } if (($tmpaction=='activateline' && $user->rights->contrat->activer) || ($tmpaction=='unactivateline' && $user->rights->contrat->desactiver)) { @@ -1982,7 +1982,7 @@ else print '
'.$langs->trans("Comment").''; - print '   '; + print '   '; print ''; print '
'; @@ -122,12 +123,12 @@ if ($_socid > 0) print "
"; dol_fiche_end(); - + print '
'; print ""; - + print '

'; diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php index 690835a5e99..8f34077ab34 100644 --- a/htdocs/fourn/index.php +++ b/htdocs/fourn/index.php @@ -33,7 +33,7 @@ $langs->load("orders"); $langs->load("companies"); // Security check -$socid = isset($_GET["socid"])?$_GET["socid"]:''; +$socid = GETPOST("socid", 'int'); if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'societe',$socid,''); @@ -81,7 +81,7 @@ if ($resql) while ($i < $num) { $row = $db->fetch_row($resql); - + print ''; print ''.$langs->trans($commande->statuts[$row[1]]).''; @@ -132,7 +132,7 @@ if (! empty($conf->fournisseur->enabled)) $var = true; while ($i < $num) { - + $obj = $db->fetch_object($resql); print ''; $commandestatic->id=$obj->rowid; @@ -151,7 +151,7 @@ if (! empty($conf->fournisseur->enabled)) } if ($total>0) { - + print ''.$langs->trans("Total").''.price($total).""; } print ""; @@ -190,7 +190,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- while ($i < $num && $i < 20) { $obj = $db->fetch_object($resql); - + print ''; $facturestatic->ref=$obj->ref; $facturestatic->id=$obj->rowid; @@ -263,7 +263,7 @@ if ($resql) while ($obj = $db->fetch_object($resql) ) { - + print ''; print ''.img_object($langs->trans("ShowSupplier"),"company").''; @@ -300,7 +300,7 @@ if (count($companystatic->SupplierCategories)) foreach ($companystatic->SupplierCategories as $rowid => $label) { - + print "\n"; print ''; $categstatic->id=$rowid; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 4febe121156..d5a692ca86e 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -81,7 +81,8 @@ function test_sql_and_script_inject($val, $type) // For SQL Injection (only GET and POST are used to be included into bad escaped SQL requests) if ($type != 2) { - $inj += preg_match('/delete\s+from/i', $val); + $inj += preg_match('/updatexml^(/i', $val); + $inj += preg_match('/delete\s+from/i', $val); $inj += preg_match('/create\s+table/i', $val); $inj += preg_match('/update.+set.+=/i', $val); $inj += preg_match('/insert\s+into/i', $val); From 62f895e2ecadd533683dbb3a9cfa070a741045ec Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 21 Dec 2017 13:31:39 +0100 Subject: [PATCH 0015/1074] Fix: avoid infinite loop --- htdocs/core/actions_builddoc.inc.php | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/htdocs/core/actions_builddoc.inc.php b/htdocs/core/actions_builddoc.inc.php index 70876d4bf9a..420715e3d97 100644 --- a/htdocs/core/actions_builddoc.inc.php +++ b/htdocs/core/actions_builddoc.inc.php @@ -33,7 +33,7 @@ // Build doc if ($action == 'builddoc' && $permissioncreate) { - + if (is_numeric(GETPOST('model'))) { $error=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Model")); @@ -48,13 +48,13 @@ if ($action == 'builddoc' && $permissioncreate) dol_print_error('Object must have been loaded by a fetch'); exit; }*/ - + // Save last template used to generate document if (GETPOST('model')) { $object->setDocModel($user, GETPOST('model','alpha')); } - + // Special case to force bank account //if (property_exists($object, 'fk_bank')) //{ @@ -76,13 +76,13 @@ if ($action == 'builddoc' && $permissioncreate) $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang($newlang); } - + // To be sure vars is defined if (empty($hidedetails)) $hidedetails=0; if (empty($hidedesc)) $hidedesc=0; if (empty($hideref)) $hideref=0; if (empty($moreparams)) $moreparams=null; - + $result= $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams); if ($result <= 0) { @@ -91,11 +91,15 @@ if ($action == 'builddoc' && $permissioncreate) } else { - if (empty($donotredirect)) // This is se when include is done by bulk action "Bill Orders" + if (empty($donotredirect)) // This is set when include is done by bulk action "Bill Orders" { setEventMessages($langs->trans("FileGenerated"), null); - header('Location: '.$_SERVER['REQUEST_URI'].'#builddoc'); + $urltoredirect = $_SERVER['REQUEST_URI']; + $urltoredirect = preg_replace('/#builddoc$/', '', $urltoredirect); + $urltoredirect = preg_replace('/action=builddoc&?/', '', $urltoredirect); // To avoid infinite loop + + header('Location: '.$urltoredirect.'#builddoc'); exit; } } From 6a62e139604dbbd5729e57df2433b37a5950c35c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 21 Dec 2017 13:32:16 +0100 Subject: [PATCH 0016/1074] FIX security vulnerability reported by ADLab of Venustech --- htdocs/accountancy/tpl/export_journal.tpl.php | 9 ++ .../default/tpl/adherentcard_create.tpl.php | 9 +- .../default/tpl/adherentcard_edit.tpl.php | 9 +- .../default/tpl/adherentcard_view.tpl.php | 10 +- .../adherents/tpl/linkedobjectblock.tpl.php | 11 +- .../comm/propal/tpl/linkedobjectblock.tpl.php | 12 +- htdocs/commande/tpl/linkedobjectblock.tpl.php | 13 ++- htdocs/compta/facture/card.php | 2 +- .../facture/tpl/linkedobjectblock.tpl.php | 15 ++- .../tpl/linkedobjectblockForRec.tpl.php | 11 +- .../default/tpl/contactcard_create.tpl.php | 9 +- .../default/tpl/contactcard_edit.tpl.php | 9 +- .../default/tpl/contactcard_view.tpl.php | 9 +- htdocs/contrat/tpl/linkedobjectblock.tpl.php | 10 +- htdocs/core/tpl/admin_extrafields_add.tpl.php | 23 ++-- .../core/tpl/admin_extrafields_edit.tpl.php | 27 +++-- .../core/tpl/admin_extrafields_view.tpl.php | 12 +- htdocs/core/tpl/ajax/fileupload_main.tpl.php | 9 +- htdocs/core/tpl/ajax/fileupload_view.tpl.php | 9 +- htdocs/core/tpl/ajaxrow.tpl.php | 8 ++ htdocs/core/tpl/bloc_showhide.tpl.php | 7 ++ htdocs/core/tpl/contacts.tpl.php | 8 ++ .../tpl/document_actions_post_headers.tpl.php | 8 ++ htdocs/core/tpl/extrafields_view.tpl.php | 8 ++ htdocs/core/tpl/login.tpl.php | 8 ++ htdocs/core/tpl/notes.tpl.php | 8 ++ htdocs/core/tpl/objectline_create.tpl.php | 7 ++ htdocs/core/tpl/objectline_edit.tpl.php | 13 ++- htdocs/core/tpl/objectline_view.tpl.php | 8 ++ htdocs/core/tpl/originproductline.tpl.php | 9 +- htdocs/core/tpl/passwordforgotten.tpl.php | 8 ++ htdocs/core/tpl/resource_add.tpl.php | 8 ++ htdocs/core/tpl/resource_view.tpl.php | 14 ++- htdocs/ecm/tpl/enablefiletreeajax.tpl.php | 8 ++ .../expedition/tpl/linkedobjectblock.tpl.php | 13 ++- .../tpl/linkedobjectblock.tpl.php | 11 +- .../fichinter/tpl/linkedobjectblock.tpl.php | 11 +- .../commande/tpl/linkedobjectblock.tpl.php | 13 ++- .../facture/tpl/linkedobjectblock.tpl.php | 16 ++- htdocs/main.inc.php | 2 +- .../template/core/tpl/mytemplate.tpl.php | 8 ++ .../canvas/product/tpl/card_create.tpl.php | 8 ++ .../canvas/product/tpl/card_edit.tpl.php | 8 ++ .../canvas/product/tpl/card_view.tpl.php | 8 ++ .../product/canvas/product/tpl/list.tpl.php | 11 +- .../canvas/service/tpl/card_create.tpl.php | 9 +- .../canvas/service/tpl/card_edit.tpl.php | 8 ++ .../canvas/service/tpl/card_view.tpl.php | 8 ++ .../product/canvas/service/tpl/list.tpl.php | 11 +- .../product/inventory/tpl/inventory.tpl.php | 108 ++++++++++-------- .../product/stock/tpl/stockcorrection.tpl.php | 8 ++ .../product/stock/tpl/stocktransfer.tpl.php | 8 ++ .../canvas/company/tpl/card_create.tpl.php | 9 +- .../canvas/company/tpl/card_edit.tpl.php | 9 +- .../canvas/company/tpl/card_view.tpl.php | 9 +- .../canvas/individual/tpl/card_create.tpl.php | 9 +- .../canvas/individual/tpl/card_edit.tpl.php | 9 +- .../canvas/individual/tpl/card_view.tpl.php | 9 +- .../tpl/linesalesrepresentative.tpl.php | 9 +- .../tpl/linkedobjectblock.tpl.php | 11 +- 60 files changed, 562 insertions(+), 129 deletions(-) diff --git a/htdocs/accountancy/tpl/export_journal.tpl.php b/htdocs/accountancy/tpl/export_journal.tpl.php index b5b6920e853..d9d158607b6 100644 --- a/htdocs/accountancy/tpl/export_journal.tpl.php +++ b/htdocs/accountancy/tpl/export_journal.tpl.php @@ -15,6 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + + $prefix = $conf->global->ACCOUNTING_EXPORT_PREFIX_SPEC; $format = $conf->global->ACCOUNTING_EXPORT_FORMAT; $nodateexport = $conf->global->ACCOUNTING_EXPORT_NO_DATE_IN_FILENAME; diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php index f0a50e2e9ba..81f34706966 100644 --- a/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php +++ b/htdocs/adherents/canvas/default/tpl/adherentcard_create.tpl.php @@ -14,8 +14,15 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * */ + +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + ?> diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php index 8f3af3fe8df..4a699b75a22 100644 --- a/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php +++ b/htdocs/adherents/canvas/default/tpl/adherentcard_edit.tpl.php @@ -14,9 +14,16 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * */ +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + + $contact = $GLOBALS['objcanvas']->control->object; ?> diff --git a/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php b/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php index e426429ae05..f19ba96c167 100644 --- a/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php +++ b/htdocs/adherents/canvas/default/tpl/adherentcard_view.tpl.php @@ -14,10 +14,18 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * */ +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + + $contact = $GLOBALS['objcanvas']->control->object; + ?> diff --git a/htdocs/adherents/tpl/linkedobjectblock.tpl.php b/htdocs/adherents/tpl/linkedobjectblock.tpl.php index 19324812beb..118f51a1a89 100644 --- a/htdocs/adherents/tpl/linkedobjectblock.tpl.php +++ b/htdocs/adherents/tpl/linkedobjectblock.tpl.php @@ -15,8 +15,15 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * */ + +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + ?> @@ -33,7 +40,7 @@ $var=true; $total=0; foreach($linkedObjectBlock as $key => $objectlink) { - + ?> > trans("Subscription"); ?> diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php index f797025a5de..cc8c6fe0547 100644 --- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php +++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php @@ -22,6 +22,14 @@ * \ingroup propal * \brief Template to show objects linked to proposals */ + +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + ?> @@ -40,7 +48,7 @@ $var=true; foreach($linkedObjectBlock as $key => $objectlink) { $ilink++; - + $trclass=($var?'pair':'impair'); if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total'; ?> @@ -71,7 +79,7 @@ if (count($linkedObjectBlock) > 1) - diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php index 629cd3c0fb0..39479ba220b 100644 --- a/htdocs/commande/tpl/linkedobjectblock.tpl.php +++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php @@ -15,8 +15,15 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * */ + +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + ?> @@ -36,7 +43,7 @@ $var=true; foreach($linkedObjectBlock as $key => $objectlink) { $ilink++; - + $trclass=($var?'pair':'impair'); if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total'; ?> @@ -76,7 +83,7 @@ if (count($linkedObjectBlock) > 1) - diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index fd9386672e2..e6c30abda2d 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -2538,7 +2538,7 @@ if ($action == 'create') print '    0 ? 'checked':'').' /> "; print '
    0 ? 'checked':'').' /> "; print ''; - + print ''; } } diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php index 63c16afae15..ca3ec7c89c0 100644 --- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php +++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php @@ -15,8 +15,15 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * */ + +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + ?> @@ -36,7 +43,7 @@ $var=true; foreach($linkedObjectBlock as $key => $objectlink) { $ilink++; - + $trclass=($var?'pair':'impair'); if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total'; ?> @@ -54,7 +61,7 @@ foreach($linkedObjectBlock as $key => $objectlink) $total = $total + $sign * $objectlink->total_ht; echo price($objectlink->total_ht); } - else + else { echo ''.price($objectlink->total_ht).''; } @@ -76,7 +83,7 @@ if (count($linkedObjectBlock) > 1) - diff --git a/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php index 2e7858fdb08..288e852de71 100644 --- a/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php +++ b/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php @@ -15,8 +15,15 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * */ + +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + ?> @@ -36,7 +43,7 @@ $var=true; foreach($linkedObjectBlock as $key => $objectlink) { $ilink++; - + $trclass=($var?'pair':'impair'); if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total'; ?> diff --git a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php index fbd1d1909a8..1561f046845 100644 --- a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php +++ b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php @@ -13,8 +13,15 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * */ + +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + ?> diff --git a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php index 56e91894cdd..1eaccff5a1f 100644 --- a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php +++ b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php @@ -13,9 +13,16 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * */ +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + + $contact = $GLOBALS['objcanvas']->control->object; ?> diff --git a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php index 5dc1c12808f..6041e7c3e2c 100644 --- a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php +++ b/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php @@ -13,9 +13,16 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * */ +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + + $contact = $GLOBALS['objcanvas']->control->object; ?> diff --git a/htdocs/contrat/tpl/linkedobjectblock.tpl.php b/htdocs/contrat/tpl/linkedobjectblock.tpl.php index a2da6cef24e..eae46dad772 100644 --- a/htdocs/contrat/tpl/linkedobjectblock.tpl.php +++ b/htdocs/contrat/tpl/linkedobjectblock.tpl.php @@ -14,6 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + ?> @@ -33,7 +41,7 @@ $var=true; foreach($linkedObjectBlock as $key => $objectlink) { $ilink++; - + $trclass=($var?'pair':'impair'); if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total'; ?> diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php index 62821372e56..d9ba847925d 100644 --- a/htdocs/core/tpl/admin_extrafields_add.tpl.php +++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php @@ -26,6 +26,13 @@ * $elementtype */ +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + ?> @@ -56,11 +63,11 @@ // Case of computed field console.log(type); - if (type == '' || type == 'varchar' || type == 'int' || type == 'double' || type == 'price') { - jQuery("tr.extra_computed_value").show(); + if (type == '' || type == 'varchar' || type == 'int' || type == 'double' || type == 'price') { + jQuery("tr.extra_computed_value").show(); } else { computed_value.val(''); jQuery("tr.extra_computed_value").hide(); - } + } if (computed_value.val()) { console.log("We enter a computed formula"); @@ -75,7 +82,7 @@ jQuery("#default_value, #unique, #required, #alwayseditable, #ishidden, #list").attr('disabled', false); jQuery("tr.extra_default_value, tr.extra_unique, tr.extra_required, tr.extra_alwayseditable, tr.extra_ishidden, tr.extra_list").show(); } - + if (type == 'date') { size.val('').prop('disabled', true); unique.removeAttr('disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); } else if (type == 'datetime') { size.val('').prop('disabled', true); unique.removeAttr('disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();} else if (type == 'double') { size.val('24,8').removeAttr('disabled'); unique.removeAttr('disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();} @@ -90,8 +97,8 @@ else if (type == 'checkbox') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();} else if (type == 'chkbxlst') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").show();jQuery("#helplink").hide();} else if (type == 'link') { size.val('').prop('disabled', true); unique.removeAttr('disabled'); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").show();} - else if (type == 'separate') { - size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); required.val('').prop('disabled', true); + else if (type == 'separate') { + size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); required.val('').prop('disabled', true); jQuery("#value_choice").hide();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide(); } else { // type = string @@ -102,12 +109,12 @@ if (type == 'separate') { required.removeAttr('checked').prop('disabled', true); alwayseditable.removeAttr('checked').prop('disabled', true); list.val('').prop('disabled', true); - jQuery('#size, #default_value').val('').prop('disabled', true); + jQuery('#size, #default_value').val('').prop('disabled', true); } else { default_value.removeAttr('disabled'); - required.removeAttr('disabled'); alwayseditable.removeAttr('disabled'); list.val('').removeAttr('disabled'); + required.removeAttr('disabled'); alwayseditable.removeAttr('disabled'); list.val('').removeAttr('disabled'); } } init_typeoffields(''); diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php index 6f049c506a3..b8d3cba1d59 100644 --- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php +++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php @@ -25,6 +25,13 @@ * $elementtype */ +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + ?> @@ -54,11 +61,11 @@ ?> // Case of computed field - if (type == 'varchar' || type == 'int' || type == 'double' || type == 'price') { - jQuery("tr.extra_computed_value").show(); + if (type == 'varchar' || type == 'int' || type == 'double' || type == 'price') { + jQuery("tr.extra_computed_value").show(); } else { computed_value.val(''); jQuery("tr.extra_computed_value").hide(); - } + } if (computed_value.val()) { console.log("We enter a computed formula"); @@ -73,7 +80,7 @@ jQuery("#default_value, #unique, #required, #alwayseditable, #ishidden, #list").attr('disabled', false); jQuery("tr.extra_default_value, tr.extra_unique, tr.extra_required, tr.extra_alwayseditable, tr.extra_ishidden, tr.extra_list").show(); } - + if (type == 'date') { size.val('').prop('disabled', true); unique.removeAttr('disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); } else if (type == 'datetime') { size.val('').prop('disabled', true); unique.removeAttr('disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();} else if (type == 'double') { size.removeAttr('disabled'); unique.removeAttr('disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();} @@ -91,19 +98,19 @@ else if (type == 'separate') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); required.val('').prop('disabled', true); default_value.val('').prop('disabled', true); jQuery("#value_choice").hide();jQuery("#helpselect").hide();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();jQuery("#helplink").hide();} else { // type = string size.val('').prop('disabled', true); - unique.removeAttr('disabled'); + unique.removeAttr('disabled'); } if (type == 'separate') { - required.removeAttr('checked').prop('disabled', true); alwayseditable.removeAttr('checked').prop('disabled', true); list.val('').prop('disabled', true); - jQuery('#size, #default_value').val('').prop('disabled', true); + required.removeAttr('checked').prop('disabled', true); alwayseditable.removeAttr('checked').prop('disabled', true); list.val('').prop('disabled', true); + jQuery('#size, #default_value').val('').prop('disabled', true); } else { default_value.removeAttr('disabled'); - required.removeAttr('disabled'); alwayseditable.removeAttr('disabled'); list.val('').removeAttr('disabled'); - } + required.removeAttr('disabled'); alwayseditable.removeAttr('disabled'); list.val('').removeAttr('disabled'); + } } init_typeoffields(jQuery("#type").val()); jQuery("#type").change(function() { @@ -113,7 +120,7 @@ // If we enter a formula, we disable other fields jQuery("#computed_value").keyup(function() { init_typeoffields(jQuery('#type').val()); - }); + }); }); diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php index a6d7e735735..6d3bb43f3b2 100644 --- a/htdocs/core/tpl/admin_extrafields_view.tpl.php +++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php @@ -22,6 +22,14 @@ * $extrafield * $elementtype */ + +// Protection to avoid direct call of template +if (empty($langs) || ! is_object($langs)) +{ + print "Error, template page can't be called as URL"; + exit; +} + ?> @@ -56,7 +64,7 @@ if (count($extrafields->attribute_type)) { foreach($extrafields->attribute_type as $key => $value) { - + print ''; print "".$extrafields->attribute_pos[$key]."\n"; print "".$extrafields->attribute_label[$key]."\n"; @@ -77,7 +85,7 @@ else { $colspan=9; if (! empty($conf->global->MAIN_CAN_HIDE_EXTRAFIELDS)) $colspan++; - + print ''; print ''; print $langs->trans("None"); diff --git a/htdocs/core/tpl/ajax/fileupload_main.tpl.php b/htdocs/core/tpl/ajax/fileupload_main.tpl.php index 034e9ebc3fc..93f0826e160 100644 --- a/htdocs/core/tpl/ajax/fileupload_main.tpl.php +++ b/htdocs/core/tpl/ajax/fileupload_main.tpl.php @@ -13,8 +13,15 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * */ + +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + ?> diff --git a/htdocs/core/tpl/ajax/fileupload_view.tpl.php b/htdocs/core/tpl/ajax/fileupload_view.tpl.php index 0c048933473..482a3aef8e4 100644 --- a/htdocs/core/tpl/ajax/fileupload_view.tpl.php +++ b/htdocs/core/tpl/ajax/fileupload_view.tpl.php @@ -13,8 +13,15 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * */ + +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + ?> diff --git a/htdocs/core/tpl/ajaxrow.tpl.php b/htdocs/core/tpl/ajaxrow.tpl.php index a5d8ab039b8..af300528111 100644 --- a/htdocs/core/tpl/ajaxrow.tpl.php +++ b/htdocs/core/tpl/ajaxrow.tpl.php @@ -19,6 +19,14 @@ * You can use this if you want to be abale to drag and drop rows of a table. * You must add id="tablelines" on table level tag and have ($nboflines or count($object->lines) or count($taskarray) > 0) */ + +// Protection to avoid direct call of template +if (empty($object) || ! is_object($object)) +{ + print "Error, template page can't be called as URL"; + exit; +} + ?> diff --git a/htdocs/core/tpl/bloc_showhide.tpl.php b/htdocs/core/tpl/bloc_showhide.tpl.php index 2c5d71c79d5..c572012ca60 100644 --- a/htdocs/core/tpl/bloc_showhide.tpl.php +++ b/htdocs/core/tpl/bloc_showhide.tpl.php @@ -16,6 +16,13 @@ * along with this program. If not, see . */ +// Protection to avoid direct call of template +if (empty($blocname)) +{ + print "Error, template page can't be called as URL"; + exit; +} + $hide = true; // Hide by default if (isset($parameters['showblocbydefault'])) $hide=(empty($parameters['showblocbydefault']) ? true : false); if (isset($object->extraparams[$blocname]['showhide'])) $hide = (empty($object->extraparams[$blocname]['showhide']) ? true : false); diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php index c7b3ea7342f..27d57d3e48a 100644 --- a/htdocs/core/tpl/contacts.tpl.php +++ b/htdocs/core/tpl/contacts.tpl.php @@ -21,6 +21,14 @@ * $withproject (if we are on task contact) */ +// Protection to avoid direct call of template +if (empty($object) || ! is_object($object)) +{ + print "Error, template page can't be called as URL"; + exit; +} + + require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; diff --git a/htdocs/core/tpl/document_actions_post_headers.tpl.php b/htdocs/core/tpl/document_actions_post_headers.tpl.php index e613c479ee0..63046fefa3f 100644 --- a/htdocs/core/tpl/document_actions_post_headers.tpl.php +++ b/htdocs/core/tpl/document_actions_post_headers.tpl.php @@ -24,6 +24,14 @@ // $modulepart = for download // $param = param to add to download links +// Protection to avoid direct call of template +if (empty($langs) || ! is_object($langs)) +{ + print "Error, template page can't be called as URL"; + exit; +} + + $langs->load("link"); if (empty($relativepathwithnofile)) $relativepathwithnofile=''; if (empty($permtoedit)) $permtoedit=-1; diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php index 0f1d581c99f..433e8d07094 100644 --- a/htdocs/core/tpl/extrafields_view.tpl.php +++ b/htdocs/core/tpl/extrafields_view.tpl.php @@ -24,6 +24,14 @@ * $parameters * $cols */ + +// Protection to avoid direct call of template +if (empty($object) || ! is_object($object)) +{ + print "Error, template page can't be called as URL"; + exit; +} + ?> array('js'=>..., 'table'=>...); +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + + header('Cache-Control: Public, must-revalidate'); header("Content-type: text/html; charset=".$conf->file->character_set_client); diff --git a/htdocs/core/tpl/notes.tpl.php b/htdocs/core/tpl/notes.tpl.php index 2538e052ae4..da3ad8fb234 100644 --- a/htdocs/core/tpl/notes.tpl.php +++ b/htdocs/core/tpl/notes.tpl.php @@ -17,6 +17,14 @@ * along with this program. If not, see . */ +// Protection to avoid direct call of template +if (empty($object) || ! is_object($object)) +{ + print "Error, template page can't be called as URL"; + exit; +} + + // $cssclass must be defined by caller. For example cssclass='fieldtitle" $module = $object->element; $note_public = 'note_public'; diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php index b123a6e91c2..d44008704be 100644 --- a/htdocs/core/tpl/objectline_create.tpl.php +++ b/htdocs/core/tpl/objectline_create.tpl.php @@ -30,6 +30,13 @@ * $inputalsopricewithtax (0 by default, 1 to also show column with unit price including tax) */ +// Protection to avoid direct call of template +if (empty($object) || ! is_object($object)) +{ + print "Error, template page can't be called as URL"; + exit; +} + $usemargins=0; if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php index 2f839e06281..3b62c0e7814 100644 --- a/htdocs/core/tpl/objectline_edit.tpl.php +++ b/htdocs/core/tpl/objectline_edit.tpl.php @@ -30,6 +30,13 @@ * $inputalsopricewithtax (0 by default, 1 to also show column with unit price including tax) */ +// Protection to avoid direct call of template +if (empty($object) || ! is_object($object)) +{ + print "Error, template page can't be called as URL"; + exit; +} + $usemargins=0; if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) $usemargins=1; @@ -266,21 +273,21 @@ jQuery(document).ready(function() if (event.which != 9 && (event.which < 37 ||event.which > 40) && jQuery("#price_ht").val() != '') { jQuery("#price_ttc").val(''); jQuery("#multicurrency_subprice").val(''); - } + } }); jQuery("#price_ttc").keyup(function(event) { // console.log(event.which); // discard event tag and arrows if (event.which != 9 && (event.which < 37 || event.which > 40) && jQuery("#price_ttc").val() != '') { jQuery("#price_ht").val(''); jQuery("#multicurrency_subprice").val(''); - } + } }); jQuery("#multicurrency_subprice").keyup(function(event) { // console.log(event.which); // discard event tag and arrows if (event.which != 9 && (event.which < 37 || event.which > 40) && jQuery("#price_ttc").val() != '') { jQuery("#price_ht").val(''); jQuery("#price_ttc").val(''); - } + } }); . - * */ + +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + ?> diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php index 9e155be88c9..bdcca51b4e7 100644 --- a/htdocs/core/tpl/passwordforgotten.tpl.php +++ b/htdocs/core/tpl/passwordforgotten.tpl.php @@ -16,6 +16,14 @@ * along with this program. If not, see . */ +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + + header('Cache-Control: Public, must-revalidate'); header("Content-type: text/html; charset=".$conf->file->character_set_client); diff --git a/htdocs/core/tpl/resource_add.tpl.php b/htdocs/core/tpl/resource_add.tpl.php index 28c42c85b71..af1d25aaee1 100644 --- a/htdocs/core/tpl/resource_add.tpl.php +++ b/htdocs/core/tpl/resource_add.tpl.php @@ -1,6 +1,14 @@ 0) foreach ($linked_resources as $linked_resource) { - + $object_resource = fetchObjectByElement($linked_resource['resource_id'],$linked_resource['resource_type']); - + //$element_id = $linked_resource['rowid']; - + if ($mode == 'edit' && $linked_resource['rowid'] == GETPOST('lineid')) { diff --git a/htdocs/ecm/tpl/enablefiletreeajax.tpl.php b/htdocs/ecm/tpl/enablefiletreeajax.tpl.php index bbcbb7090a4..d002281ae34 100644 --- a/htdocs/ecm/tpl/enablefiletreeajax.tpl.php +++ b/htdocs/ecm/tpl/enablefiletreeajax.tpl.php @@ -16,6 +16,14 @@ * * Output javascript for interactions code of ecm module */ + +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + ?> diff --git a/htdocs/expedition/tpl/linkedobjectblock.tpl.php b/htdocs/expedition/tpl/linkedobjectblock.tpl.php index b55654f4786..88811da2eab 100644 --- a/htdocs/expedition/tpl/linkedobjectblock.tpl.php +++ b/htdocs/expedition/tpl/linkedobjectblock.tpl.php @@ -14,8 +14,15 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * */ + +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + ?> @@ -34,7 +41,7 @@ $var=true; foreach($linkedObjectBlock as $key => $objectlink) { $ilink++; - + $trclass=($var?'pair':'impair'); if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total'; ?> @@ -73,7 +80,7 @@ if (count($linkedObjectBlock) > 1) - diff --git a/htdocs/expensereport/tpl/linkedobjectblock.tpl.php b/htdocs/expensereport/tpl/linkedobjectblock.tpl.php index 7fec53bf3d8..95894a8987e 100644 --- a/htdocs/expensereport/tpl/linkedobjectblock.tpl.php +++ b/htdocs/expensereport/tpl/linkedobjectblock.tpl.php @@ -15,8 +15,15 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * */ + +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + ?> @@ -32,7 +39,7 @@ $var=true; $total=0; foreach($linkedObjectBlock as $key => $objectlink) { - + ?> > trans("ExpenseReport"); ?> diff --git a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php index 455f383fd4a..5d180f0aa82 100644 --- a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php +++ b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php @@ -13,8 +13,15 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * */ + +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + ?> @@ -33,7 +40,7 @@ $var=true; foreach($linkedObjectBlock as $key => $objectlink) { $ilink++; - + $trclass=($var?'pair':'impair'); if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total'; ?> diff --git a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php index 232d12fad3d..113115f9ff8 100644 --- a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php +++ b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php @@ -14,8 +14,15 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * */ + +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + ?> @@ -35,7 +42,7 @@ $var=true; foreach($linkedObjectBlock as $key => $objectlink) { $ilink++; - + $trclass=($var?'pair':'impair'); if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total'; ?> @@ -66,7 +73,7 @@ if (count($linkedObjectBlock) > 1) - diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php index e8154cd8259..ce72f5be42e 100644 --- a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php +++ b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php @@ -17,6 +17,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + ?> @@ -36,7 +44,7 @@ $var=true; foreach($linkedObjectBlock as $key => $objectlink) { $ilink++; - + $trclass=($var?'pair':'impair'); if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total'; ?> @@ -54,7 +62,7 @@ foreach($linkedObjectBlock as $key => $objectlink) $total = $total + $sign * $objectlink->total_ht; echo price($objectlink->total_ht); } - else + else { echo ''.price($objectlink->total_ht).''; } @@ -62,7 +70,7 @@ foreach($linkedObjectBlock as $key => $objectlink) getLibStatut(3); ?> ">transnoentitiesnoconv("RemoveLink")); ?> - 1) { @@ -76,7 +84,7 @@ if (count($linkedObjectBlock) > 1) - diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index d5a692ca86e..2b4ad4de3c5 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -81,7 +81,7 @@ function test_sql_and_script_inject($val, $type) // For SQL Injection (only GET and POST are used to be included into bad escaped SQL requests) if ($type != 2) { - $inj += preg_match('/updatexml^(/i', $val); + $inj += preg_match('/updatexml\(/i', $val); $inj += preg_match('/delete\s+from/i', $val); $inj += preg_match('/create\s+table/i', $val); $inj += preg_match('/update.+set.+=/i', $val); diff --git a/htdocs/modulebuilder/template/core/tpl/mytemplate.tpl.php b/htdocs/modulebuilder/template/core/tpl/mytemplate.tpl.php index 9d399c44e85..3684ded0092 100644 --- a/htdocs/modulebuilder/template/core/tpl/mytemplate.tpl.php +++ b/htdocs/modulebuilder/template/core/tpl/mytemplate.tpl.php @@ -23,5 +23,13 @@ * Put detailed description here. */ +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + + /** Your code here. */ echo "Hello world!"; diff --git a/htdocs/product/canvas/product/tpl/card_create.tpl.php b/htdocs/product/canvas/product/tpl/card_create.tpl.php index 514c5d213d5..e763605f701 100644 --- a/htdocs/product/canvas/product/tpl/card_create.tpl.php +++ b/htdocs/product/canvas/product/tpl/card_create.tpl.php @@ -15,6 +15,14 @@ * along with this program. If not, see . */ +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + + $object=$GLOBALS['object']; $statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell")); diff --git a/htdocs/product/canvas/product/tpl/card_edit.tpl.php b/htdocs/product/canvas/product/tpl/card_edit.tpl.php index 686ad7217b7..c64c5dbe1e4 100644 --- a/htdocs/product/canvas/product/tpl/card_edit.tpl.php +++ b/htdocs/product/canvas/product/tpl/card_edit.tpl.php @@ -15,6 +15,14 @@ * along with this program. If not, see . */ +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + + $object=$GLOBALS['object']; $statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell")); diff --git a/htdocs/product/canvas/product/tpl/card_view.tpl.php b/htdocs/product/canvas/product/tpl/card_view.tpl.php index 771005781cd..44b1f96203b 100644 --- a/htdocs/product/canvas/product/tpl/card_view.tpl.php +++ b/htdocs/product/canvas/product/tpl/card_view.tpl.php @@ -15,6 +15,14 @@ * along with this program. If not, see . */ +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + + $object=$GLOBALS['object']; ?> diff --git a/htdocs/product/canvas/product/tpl/list.tpl.php b/htdocs/product/canvas/product/tpl/list.tpl.php index db7cac7e51c..e5c315e8148 100644 --- a/htdocs/product/canvas/product/tpl/list.tpl.php +++ b/htdocs/product/canvas/product/tpl/list.tpl.php @@ -13,8 +13,15 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * */ + +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + ?> @@ -69,7 +76,7 @@ if ($searchfield['enabled']) { if ($searchfield['search']) { ?> - '; $searchpicto=$form->showFilterAndCheckAddButtons(0); print $searchpicto; diff --git a/htdocs/product/canvas/service/tpl/card_create.tpl.php b/htdocs/product/canvas/service/tpl/card_create.tpl.php index e25f69d8848..46db54d63b8 100644 --- a/htdocs/product/canvas/service/tpl/card_create.tpl.php +++ b/htdocs/product/canvas/service/tpl/card_create.tpl.php @@ -13,9 +13,16 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * */ +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + + $object=$GLOBALS['object']; $statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell")); diff --git a/htdocs/product/canvas/service/tpl/card_edit.tpl.php b/htdocs/product/canvas/service/tpl/card_edit.tpl.php index 27348b7820d..06d1b3ff612 100644 --- a/htdocs/product/canvas/service/tpl/card_edit.tpl.php +++ b/htdocs/product/canvas/service/tpl/card_edit.tpl.php @@ -15,6 +15,14 @@ * along with this program. If not, see . */ +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + + $object=$GLOBALS['object']; $statutarray=array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell")); diff --git a/htdocs/product/canvas/service/tpl/card_view.tpl.php b/htdocs/product/canvas/service/tpl/card_view.tpl.php index fd5d9ad73bf..fc129132dee 100644 --- a/htdocs/product/canvas/service/tpl/card_view.tpl.php +++ b/htdocs/product/canvas/service/tpl/card_view.tpl.php @@ -15,6 +15,14 @@ * along with this program. If not, see . */ +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + + $object=$GLOBALS['object']; ?> diff --git a/htdocs/product/canvas/service/tpl/list.tpl.php b/htdocs/product/canvas/service/tpl/list.tpl.php index ee2a894de98..9951c71fcc3 100644 --- a/htdocs/product/canvas/service/tpl/list.tpl.php +++ b/htdocs/product/canvas/service/tpl/list.tpl.php @@ -13,8 +13,15 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * */ + +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + ?> @@ -69,7 +76,7 @@ if ($searchfield['enabled']) { if ($searchfield['search']) { ?> - '; $searchpicto=$form->showFilterAndCheckAddButtons(0); print $searchpicto; diff --git a/htdocs/product/inventory/tpl/inventory.tpl.php b/htdocs/product/inventory/tpl/inventory.tpl.php index 05de0f4c002..cf74aa21bdc 100644 --- a/htdocs/product/inventory/tpl/inventory.tpl.php +++ b/htdocs/product/inventory/tpl/inventory.tpl.php @@ -1,12 +1,22 @@ + @@ -76,37 +86,37 @@
- + - +

- +
Cet inventaire est validé
- + - + $row) { - + + foreach ($lines as $k=>$row) { + $total_pmp+=$row['pmp_stock']; $total_pa+=$row['pa_stock']; $total_pmp_actual+=$row['pmp_actual']; $total_pa_actual+=$row['pa_actual']; - + if($i%20 === 0) { _headerList($view); @@ -126,18 +136,18 @@ if(!empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)){ echo ''; $total_current_pa+=$row['current_pa_stock']; - } - + } + ?> rights->stock->changePMP)) { - echo ''; + echo ''; } ?> @@ -145,8 +155,8 @@ if(!empty($conf->global->INVENTORY_USE_MIN_PA_IF_NO_LAST_PA)){ echo ''; $total_current_pa_actual+=$row['current_pa_actual']; - } - + } + ?> @@ -154,25 +164,25 @@ -
'.price($row['current_pa_stock']).'    - + '.$row['pmp_new'].''.$row['pmp_new'].''.price($row['current_pa_actual']).'
- + status != 1) { ?>
trans('Modify') ?> - rights->stock->changePMP)) { echo ''.$langs->trans('ApplyPMP').''; } - + if ($can_validate == 1) { ?> trans('RegulateStock') ?> @@ -193,13 +203,13 @@ trans('Delete') ?> - +

Date de création : getDate('datec') ?>
Dernière mise à jour : getDate('tms') ?>

- - + + diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php index 4242121177c..732fa8c889d 100644 --- a/htdocs/product/stock/tpl/stockcorrection.tpl.php +++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php @@ -17,6 +17,14 @@ * $object must be defined * $backtopage */ + +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + ?> diff --git a/htdocs/product/stock/tpl/stocktransfer.tpl.php b/htdocs/product/stock/tpl/stocktransfer.tpl.php index 6d028da5663..18f6b831cf2 100644 --- a/htdocs/product/stock/tpl/stocktransfer.tpl.php +++ b/htdocs/product/stock/tpl/stocktransfer.tpl.php @@ -17,6 +17,14 @@ * $object must be defined * $backtopage */ + +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + ?> diff --git a/htdocs/societe/canvas/company/tpl/card_create.tpl.php b/htdocs/societe/canvas/company/tpl/card_create.tpl.php index d542f0553ba..80740381e05 100644 --- a/htdocs/societe/canvas/company/tpl/card_create.tpl.php +++ b/htdocs/societe/canvas/company/tpl/card_create.tpl.php @@ -14,8 +14,15 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * */ + +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + ?> diff --git a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php index 1f6201ec829..82474ae405f 100644 --- a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php +++ b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php @@ -14,9 +14,16 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * */ +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + + $contact = $GLOBALS['objcanvas']->control->object; ?> diff --git a/htdocs/societe/canvas/company/tpl/card_view.tpl.php b/htdocs/societe/canvas/company/tpl/card_view.tpl.php index 21645f14d00..3865e9b95a0 100644 --- a/htdocs/societe/canvas/company/tpl/card_view.tpl.php +++ b/htdocs/societe/canvas/company/tpl/card_view.tpl.php @@ -13,9 +13,16 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * */ +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + + $soc = $GLOBALS['objcanvas']->control->object; ?> diff --git a/htdocs/societe/canvas/individual/tpl/card_create.tpl.php b/htdocs/societe/canvas/individual/tpl/card_create.tpl.php index 1be20214c35..ba5aaf68e44 100644 --- a/htdocs/societe/canvas/individual/tpl/card_create.tpl.php +++ b/htdocs/societe/canvas/individual/tpl/card_create.tpl.php @@ -14,8 +14,15 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * */ + +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + ?> diff --git a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php index 90543958902..76db85282db 100644 --- a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php +++ b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php @@ -14,8 +14,15 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * */ + +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + ?> diff --git a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php index 10136048ae6..359f4ec7b44 100644 --- a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php +++ b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php @@ -13,9 +13,16 @@ * * You should have received a copy of the GNU General Public License * along with this program. If not, see . - * */ +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + + $object = $GLOBALS['objcanvas']->control->object; ?> diff --git a/htdocs/societe/tpl/linesalesrepresentative.tpl.php b/htdocs/societe/tpl/linesalesrepresentative.tpl.php index 3ec07697ec7..dc6d6ec4d08 100644 --- a/htdocs/societe/tpl/linesalesrepresentative.tpl.php +++ b/htdocs/societe/tpl/linesalesrepresentative.tpl.php @@ -1,5 +1,12 @@ '; print ' - From 6a96a9765f4654d7d6b913f5dfa168c31aeb3dfb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 21 Dec 2017 15:04:04 +0100 Subject: [PATCH 0017/1074] Transifex sync --- htdocs/core/js/lib_gravatar.js.php | 172 ++++++++++++++++++++++++++ htdocs/langs/fr_FR/accountancy.lang | 29 +++-- htdocs/langs/fr_FR/admin.lang | 86 ++++++------- htdocs/langs/fr_FR/agenda.lang | 2 +- htdocs/langs/fr_FR/banks.lang | 2 +- htdocs/langs/fr_FR/bills.lang | 12 +- htdocs/langs/fr_FR/compta.lang | 40 +++--- htdocs/langs/fr_FR/dict.lang | 46 +++---- htdocs/langs/fr_FR/ecm.lang | 12 +- htdocs/langs/fr_FR/errors.lang | 11 +- htdocs/langs/fr_FR/holiday.lang | 4 +- htdocs/langs/fr_FR/install.lang | 4 +- htdocs/langs/fr_FR/languages.lang | 2 +- htdocs/langs/fr_FR/mails.lang | 6 +- htdocs/langs/fr_FR/main.lang | 54 ++++---- htdocs/langs/fr_FR/members.lang | 6 +- htdocs/langs/fr_FR/modulebuilder.lang | 10 +- htdocs/langs/fr_FR/opensurvey.lang | 2 +- htdocs/langs/fr_FR/other.lang | 12 +- htdocs/langs/fr_FR/paypal.lang | 2 +- htdocs/langs/fr_FR/printing.lang | 4 +- htdocs/langs/fr_FR/productbatch.lang | 2 +- htdocs/langs/fr_FR/products.lang | 16 +-- htdocs/langs/fr_FR/projects.lang | 19 +-- htdocs/langs/fr_FR/salaries.lang | 4 +- htdocs/langs/fr_FR/stocks.lang | 16 +-- htdocs/langs/fr_FR/stripe.lang | 2 +- htdocs/langs/fr_FR/suppliers.lang | 2 +- htdocs/langs/fr_FR/trips.lang | 90 +++++++------- htdocs/langs/fr_FR/users.lang | 2 +- htdocs/langs/fr_FR/website.lang | 27 ++-- htdocs/langs/fr_FR/withdrawals.lang | 4 +- htdocs/langs/fr_FR/workflow.lang | 14 +-- 33 files changed, 459 insertions(+), 257 deletions(-) create mode 100644 htdocs/core/js/lib_gravatar.js.php diff --git a/htdocs/core/js/lib_gravatar.js.php b/htdocs/core/js/lib_gravatar.js.php new file mode 100644 index 00000000000..bb850be8d5d --- /dev/null +++ b/htdocs/core/js/lib_gravatar.js.php @@ -0,0 +1,172 @@ + + * + * 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 htdocs/core/js/lib_gravatar.js.php + * \brief File that include javascript functions (included if option use_javascript activated) + * JQuery (providing object $) library must be loaded before this file. + */ + +//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language +//if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1'); +if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); +//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); // Not disabled cause need to do translations +if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK',1); +if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); +if (! defined('NOLOGIN')) define('NOLOGIN',1); +if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU',1); +if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1); +if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); + +session_cache_limiter(FALSE); + +require_once '../../main.inc.php'; + +// Define javascript type +top_httphead('text/javascript; charset=UTF-8'); +// Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access. +if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate'); +else header('Cache-Control: no-cache'); + +?> + +function get_avatar_from_service(service, userid, size) { + // this return the url that redirects to the according user image/avatar/profile picture + // implemented services: google profiles, facebook, gravatar, twitter, tumblr, default fallback + // for google use get_avatar_from_service('google', profile-name or user-id , size-in-px ) + // for facebook use get_avatar_from_service('facebook', vanity url or user-id , size-in-px or size-as-word ) + // for gravatar use get_avatar_from_service('gravatar', md5 hash email@adress, size-in-px ) + // for twitter use get_avatar_from_service('twitter', username, size-in-px or size-as-word ) + // for tumblr use get_avatar_from_service('tumblr', blog-url, size-in-px ) + // everything else will go to the fallback + // google and gravatar scale the avatar to any site, others will guided to the next best version + var url = ''; + + switch (service) { + + case "google": + // see http://googlesystem.blogspot.com/2011/03/unedited-google-profile-pictures.html (couldn't find a better link) + // available sizes: all, google rescales for you + url = "http://profiles.google.com/s2/photos/profile/" + userid + "?sz=" + size; + break; + + case "facebook": + // see https://developers.facebook.com/docs/reference/api/ + // available sizes: square (50x50), small (50xH) , normal (100xH), large (200xH) + var sizeparam = ''; + if (isNumberOrNot(size)) { + if (size >= 200) { + sizeparam = 'large' + }; + if (size >= 100 && size < 200) { + sizeparam = 'normal' + }; + if (size >= 50 && size < 100) { + sizeparam = 'small' + }; + if (size < 50) { + sizeparam = 'square' + }; + } else { + sizeparam = size; + } + url = "https://graph.facebook.com/" + userid + "/picture?type=" + sizeparam; + break; + + case "gravatar": + // see http://en.gravatar.com/site/implement/images/ + // available sizes: all, gravatar rescales for you + url = "http://www.gravatar.com/avatar/" + userid + "?s=" + size + break; + + case "twitter": + // see https://dev.twitter.com/docs/api/1/get/users/profile_image/%3Ascreen_name + // available sizes: bigger (73x73), normal (48x48), mini (24x24), no param will give you full size + var sizeparam = ''; + if (isNumberOrNot(size)) { + if (size >= 73) { + sizeparam = 'bigger' + }; + if (size >= 48 && size < 73) { + sizeparam = 'normal' + }; + if (size < 48) { + sizeparam = 'mini' + }; + } else { + sizeparam = size; + } + + url = "http://api.twitter.com/1/users/profile_image?screen_name=" + userid + "&size=" + sizeparam; + break; + + case "tumblr": + // see http://www.tumblr.com/docs/en/api/v2#blog-avatar + //TODO do something smarter with the ranges + // available sizes: 16, 24, 30, 40, 48, 64, 96, 128, 512 + var sizeparam = ''; + if (size >= 512) { + sizeparam = 512 + }; + if (size >= 128 && size < 512) { + sizeparam = 128 + }; + if (size >= 96 && size < 128) { + sizeparam = 96 + }; + if (size >= 64 && size < 96) { + sizeparam = 64 + }; + if (size >= 48 && size < 64) { + sizeparam = 48 + }; + if (size >= 40 && size < 48) { + sizeparam = 40 + }; + if (size >= 30 && size < 40) { + sizeparam = 30 + }; + if (size >= 24 && size < 30) { + sizeparam = 24 + }; + if (size < 24) { + sizeparam = 16 + }; + + url = "http://api.tumblr.com/v2/blog/" + userid + "/avatar/" + sizeparam; + break; + + default: + // http://www.iconfinder.com/icondetails/23741/128/avatar_devil_evil_green_monster_vampire_icon + // find your own + url = "http://i.imgur.com/RLiDK.png"; // 48x48 + } + + + return url; +} + + +// helper methods + +function isNumberOrNot(n) { + // see http://stackoverflow.com/questions/18082/validate-numbers-in-javascript-isnumeric + return !isNaN(parseFloat(n)) && isFinite(n); +} + +// End of lib_gravatar.js.php diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang index 332c80b6385..4da556cbeb3 100644 --- a/htdocs/langs/fr_FR/accountancy.lang +++ b/htdocs/langs/fr_FR/accountancy.lang @@ -8,7 +8,7 @@ ACCOUNTING_EXPORT_AMOUNT=Exporter le montant ACCOUNTING_EXPORT_DEVISE=Exporter la devise Selectformat=Sélectionnez le format du fichier ACCOUNTING_EXPORT_FORMAT=Sélectionnez le format du fichier -ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type +ACCOUNTING_EXPORT_ENDLINE=Caractère utilisé pour le retour chariot ACCOUNTING_EXPORT_PREFIX_SPEC=Spécifiez le préfixe pour le nom du fichier ThisService=Ce service ThisProduct=Ce produit @@ -32,7 +32,7 @@ DeleteCptCategory=Supprimer le code comptable du groupe ConfirmDeleteCptCategory=Êtes-vous sur de vouloir supprimer ce compte comptable du groupe comptable ? JournalizationInLedgerStatus=Statut de journalisation AlreadyInGeneralLedger=Enregistrement déjà présent dans le grand livre -NotYetInGeneralLedger=non encore envoyé dans le grand livre +NotYetInGeneralLedger=Pas encore envoyé dans le grand livre GroupIsEmptyCheckSetup=Le groupe est vide. Vérifier la configuration du groupe personnalisé DetailByAccount=Afficher le détail par compte AccountWithNonZeroValues=Comptes avec valeurs non nulles @@ -60,7 +60,7 @@ AccountancyAreaDescContrib=Étape %s : Définissez les comptes comptables des d AccountancyAreaDescDonation=Étape %s : Définissez le compte comptable par défaut des dons. Pour cela, suivez le menu suivant %s. AccountancyAreaDescMisc=Étape %s : Définissez le compte par défaut obligatoire et les comptes comptables par défaut pour les transactions diverses. Pour cela, utilisez l'entrée du menu suivant %s. AccountancyAreaDescLoan=Étape %s : Définissez les comptes comptables par défaut des emprunts. Pour cela, suivez le menu suivant %s. -AccountancyAreaDescBank=STEP %s: Define accounting accounts and journal code for each bank and financial accounts. For this, use the menu entry %s. +AccountancyAreaDescBank=Étape %s : Définissez les comptes comptables et les codes des journaux de chaque compte bancaire et financier. Vous pouvez commencer à partir de la page %s. AccountancyAreaDescProd=Étape %s : Définissez les comptes comptables sur vos produits/services. Pour cela, suivez le menu suivant %s. AccountancyAreaDescBind=Étape %s : Vérifier que la liaison entre les %s lignes existantes et le compte comptable est faite, ainsi l'application sera capable d'inscrire les transaction dans le grand livre en un seul clic. Compléter les liaisons manquantes. Pour cela, suivez le menu suivant %s. @@ -151,14 +151,14 @@ Docdate=Date Docref=Référence Code_tiers=Tiers LabelAccount=Libellé du compte -LabelOperation=Label operation +LabelOperation=Libellé opération Sens=Sens Codejournal=Journal NumPiece=Numéro de pièce TransactionNumShort=Num. transaction AccountingCategory=Groupes personnalisés GroupByAccountAccounting=Grouper par compte comptable -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=Vous pouvez définir ici les regroupements de compte comptable. Ces regroupements seront utilisés dans le rapport %s pour afficher vos recettes/dépenses avec les données regroupés comme défini. ByAccounts=Par compte comptable ByPredefinedAccountGroups=Par groupes prédéfinis ByPersonalizedAccountGroups=Par groupes personnalisés @@ -168,12 +168,12 @@ DeleteMvt=Supprimer les lignes du grand livre DelYear=Année à supprimer DelJournal=Journal à supprimer ConfirmDeleteMvt=Cela supprimera toutes les lignes du grand livre pour l'année et/ou d'un journal spécifique. Un critère au moins est requis. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvtPartial=Cette action effacera les écritures de votre grand livre (toutes les lignes liées à une même transaction seront effacées) DelBookKeeping=Supprimer l'enregistrement du grand livre FinanceJournal=Journal de trésorerie ExpenseReportsJournal=Journal des notes de frais DescFinanceJournal=Journal de trésorerie comprenant tous les types de paiements par compte bancaire / caisse -DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=Ceci est une vue des enregistrements qui sont liés à un compte comptable produits/services et qui peuvent être enregistrés dans le grand livre. VATAccountNotDefined=Compte de la TVA non défini ThirdpartyAccountNotDefined=Compte pour le tiers non défini ProductAccountNotDefined=Compte pour le produit non défini @@ -194,7 +194,7 @@ UnknownAccountForThirdpartyBlocking=Compte de tiers inconnu. Erreur bloquante. Pcgtype=Groupe de comptes comptables Pcgsubtype=Sous-groupe de comptes comptables -PcgtypeDesc=Group and subgroup of account are used as predefined 'filter' and 'grouping' criterias for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report. +PcgtypeDesc=Le groupe et le sous-groupe d'un compte comptable sont prédéfinis comme critère de 'filtre' et 'regroupement' pour certains rapports comptables. Par exemple, 'INCOME' or 'EXPENSE' sont regroupés pour construire le rapport des recettes/dépenses. TotalVente=Total chiffre affaires hors taxe TotalMarge=Total marge @@ -220,7 +220,7 @@ MvtNotCorrectlyBalanced=Mouvement non équilibré. Crédit = %s. Débit = %s FicheVentilation=Fiche lien GeneralLedgerIsWritten=Les transactions sont enregistrées dans le grand livre GeneralLedgerSomeRecordWasNotRecorded=Certaines des opérations n'ont pu être enregistrées. S'il n'y a pas d'autres messages, c'est probablement car elles sont déjà enregistrées. -NoNewRecordSaved=No more record to journalize +NoNewRecordSaved=Plus d'enregistrements à journaliser ListOfProductsWithoutAccountingAccount=Liste des produits non liés à un compte comptable ChangeBinding=Changer les liens @@ -244,7 +244,6 @@ ErrorAccountingJournalIsAlreadyUse=Le journal est déjà utilisé ## Export ExportDraftJournal=Exporter le journal brouillon Modelcsv=Modèle d'export -OptionsDeactivatedForThisExportModel=Pour ce modèle d'export, les options sont désactivées Selectmodelcsv=Sélectionner un modèle d'export Modelcsv_normal=Export standard Modelcsv_CEGID=Export vers CEGID Expert comptabilité @@ -254,20 +253,20 @@ Modelcsv_ciel=Export vers Sage Ciel Compta ou Compta Evolution Modelcsv_quadratus=Export vers Quadratus QuadraCompta Modelcsv_ebp=Export vers EBP Modelcsv_cogilog=Export vers Cogilog -Modelcsv_agiris=Export vers Agiris (Test) -Modelcsv_configurable=Export Configurable +Modelcsv_agiris=Export vers Agiris +Modelcsv_configurable=Export configurable ChartofaccountsId=Id plan comptable ## Tools - Init accounting account on product / service InitAccountancy=Initialisation comptabilité -InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases. +InitAccountancyDesc=Cette page peut être utilisée pour initialiser un compte comptable sur les produits et services qui ne disposent pas de compte comptable défini pour les ventes et les achats. DefaultBindingDesc=Cette page peut être utilisée pour définir un compte par défaut à utiliser pour la ventilation des transactions sur le paiement des salaires, les dons, les charges sociales et fiscales et la TVA lorsqu'aucun compte spécifique n'a été défini. Options=Options OptionModeProductSell=Mode ventes OptionModeProductBuy=Mode achats OptionModeProductSellDesc=Afficher tous les produits/services avec le compte comptable pour les ventes. OptionModeProductBuyDesc=Afficher tous les produits/services avec le compte comptable pour les achats. -CleanFixHistory=Remove accounting code from lines that not exists into charts of account +CleanFixHistory=Effacer les données comptables des lignes qui n'existent pas dans le plan comptable CleanHistory=Réinitialiser tous les liens pour l'année sélectionnée PredefinedGroups=Groupes prédéfinis WithoutValidAccount=Sans compte dédié valide @@ -289,4 +288,4 @@ Binded=Lignes liées ToBind=Lignes à lier UseMenuToSetBindindManualy=L'autodection n'est pas possible, utilisez le menu %s pour effectuer la liaison manuellement -WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate. +WarningReportNotReliable=Attention : ce rapport n'est pas basé sur le grand livre et ne contient donc pas les écritures manuelles qui lui ont été ajoutées. Une fonctionnalité améliorée sera présente dans les prochaines versions. diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 14f6e9e6298..021dff351de 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -41,7 +41,7 @@ NoSessionFound=Votre PHP ne semble pas pouvoir lister les sessions actives. Le r DBStoringCharset=Encodage base pour stockage données DBSortingCharset=Encodage base pour tri données ClientCharset=Client charset -ClientSortingCharset=Client collation +ClientSortingCharset=En-cas client WarningModuleNotActive=Le module %s doit être activé pour utiliser cette fonction. WarningOnlyPermissionOfActivatedModules=Attention, seules les permissions en rapport avec les modules activés sont affichées ici. Vous pouvez activer d'autres modules sur la page Accueil->Configuration->Modules. DolibarrSetup=Installation ou mise à jour de Dolibarr @@ -131,7 +131,7 @@ HoursOnThisPageAreOnServerTZ=Attention, contrairement à d'autres écrans, les h Box=Widget Boxes=Widgets MaxNbOfLinesForBoxes=Nombre maximum de lignes dans les widgets -AllWidgetsWereEnabled=All available widgets are enabled +AllWidgetsWereEnabled=Tous les widgets disponibles ont été activés PositionByDefault=Position par défaut Position=Position MenusDesc=Les gestionnaires de menu définissent le contenu des deux barres de menus (la barre horizontale et la barre verticale). Il est possible de mettre un gestionnaire différent selon que l'utilisateur est interne ou externe. @@ -198,7 +198,7 @@ ModulesMarketPlaceDesc=D'autres modules/extensions sont disponibles en télécha ModulesDeployDesc=Si les permissions de votre système de fichier le permettent , vous pouvez utiliser cet outil pour déployer un module externe. Le module sera alors visible dans l'onglet %s. ModulesMarketPlaces=Rechercher un module/application externe ModulesDevelopYourModule=Développer son propre module/application -ModulesDevelopDesc=You can develop or find a partner to develop for you, your personalised module +ModulesDevelopDesc=Vous pouvez développer vous-même ou trouver un partenaire pour faire développer votre module personnalisé DOLISTOREdescriptionLong=Instead of switching on www.dolistore.com web site to find an external module, you can use this embedded tool that will make the seach on the external market place for you (may be slow, need an internet access)... NewModule=Nouveau FreeModule=Gratuit @@ -263,7 +263,7 @@ NewByMonth=Mois suivant Emails=Emails EMailsSetup=Configuration Emails EMailsDesc=Cette page permet de remplacer les paramètres PHP en rapport avec l'envoi d'emails. Dans la plupart des cas, sur des OS comme Unix/Linux, les paramètres PHP sont déjà corrects et cette page est inutile. -EmailSenderProfiles=Emails sender profiles +EmailSenderProfiles=Expéditeur des e-mails MAIN_MAIL_SMTP_PORT=Port du serveur SMTP/SMTPS (Par défaut dans php.ini: %s) MAIN_MAIL_SMTP_SERVER=Nom d'hôte ou adresse IP du serveur SMTP/SMTPS (Par défaut dans php.ini: %s) MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Port du serveur SMTP/SMTPS (Non défini dans le PHP sur les systèmes de type Unix) @@ -280,7 +280,7 @@ MAIN_MAIL_EMAIL_STARTTLS= Utiliser le cryptage TTS (STARTTLS) MAIN_DISABLE_ALL_SMS=Désactiver globalement tout envoi de SMS (pour mode test ou démos) MAIN_SMS_SENDMODE=Méthode d'envoi des SMS MAIN_MAIL_SMS_FROM=Numéro de téléphone par défaut pour l'envoi des SMS -MAIN_MAIL_DEFAULT_FROMTYPE=Sender email by default for manual sendings (User email or Company email) +MAIN_MAIL_DEFAULT_FROMTYPE=Expéditeur par défaut des e-mails pour les envois manuels (e-mail utilisateur ou de la société) UserEmail=Email utilisateur CompanyEmail=Email institution FeatureNotAvailableOnLinux=Fonctionnalité non disponible sous systèmes Unix. Tester votre sendmail localement. @@ -374,7 +374,7 @@ PDFDesc=Vous pouvez définir ici des options globales sur la génération des PD PDFAddressForging=Règles de fabrication des zones adresses HideAnyVATInformationOnPDF=Cacher toutes les informations en rapport avec la TVA sur les PDF générés PDFLocaltax=Règles pour %s -HideLocalTaxOnPDF=Ne pas afficher le taux de %s dans la colonne taxe +HideLocalTaxOnPDF=Cacher le taux de %s dans la colonne taxe HideDescOnPDF=Cacher la description des produits sur les PDF générés HideRefOnPDF=Cacher la référence des produits sur les PDF générés HideDetailsOnPDF=Cacher les détails des lignes de produits sur les PDF générés @@ -414,8 +414,8 @@ ExtrafieldParamHelpselect=La liste doit être de la forme clef,valeur (où la cl ExtrafieldParamHelpcheckbox=La liste doit être de la forme clef,valeur (où la clé ne peut être '0')

par exemple :
1,valeur1
2,valeur2
3,valeur3
... ExtrafieldParamHelpradio=La liste doit être de la forme clef,valeur (où la clé ne peut être '0')

par exemple :
1,valeur1
2,valeur2
3,valeur3
... ExtrafieldParamHelpsellist=Les paramètres de la liste viennent d'une table
Syntax : table_name:label_field:id_field::filter
Exemple : c_typent:libelle:id::filter

-idfilter est nécessairement une clé primaire int
- filter peut être un simple test (e.g. active=1) pour seulement montrer les valeurs actives
Vous pouvez aussi utiliser $ID$ dans le filtre qui est le ID actuel de l'objet
Pour faire un SELECT dans le filtre, utilisez $SEL$
Si vous voulez filtrer sur un extrafield, utilisez la syntaxe extra.fieldcode=... (ou fieldcode est le code de l'extrafield)

Pour avoir une liste qui dépend d'un autre attribut complémentaire:
\n
c_typent:libelle:id:options_parent_list_code|parent_column:filter

Pour avoir une liste qui dépend d'une autre liste:
\nc_typent:libelle:id:parent_list_code|parent_column:filter -ExtrafieldParamHelpchkbxlst=List of values 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
You can also use $ID$ in filter witch is the current id of current object
To do a SELECT in filter use $SEL$
if you want to filter on extrafields use syntax extra.fieldcode=... (where field code is the code of extrafield)

In order to have the list depending on another complementary attribute list :
c_typent:libelle:id:options_parent_list_code|parent_column:filter

In order to have the list depending on another list:
c_typent:libelle:id:parent_list_code|parent_column:filter -ExtrafieldParamHelplink=Les paramètres doivent être ObjectName: Classpath
Syntaxe: ObjectName:Classpath
Exemple: Société:societe/class/societe.class.php +ExtrafieldParamHelpchkbxlst=Les paramètres de la liste proviennent d'une table
:\nSyntaxe : nom_de_la_table:libelle_champ:id_champ::filtre
\nExemple : c_typent:libelle:id::filter

le filtre peut n'est qu'un test (ex : active=1) pour n'afficher que les valeurs actives.
Vous pouvez aussi utiliser $ID$ dans les filtres pour indiquer l'ID de l'élément courant.
\nPour utiliser un SELECT dans un filtre, utilisez $SEL$
\nPour filtrer sur un attribut supplémentaire, utilisez la syntaxe\nextra.fieldcode=... (ou fieldcode est le code de l'attribut supplémentaire)

Pour afficher une liste dépendant d'un autre attribut supplémentaire :
c_typent:libelle:id:options_code_liste_parente|colonne_parente:filtre

Pour afficher une liste dépendant d'une autre liste :
c_typent:libelle:id:code_liste_parente|colonne_parente:filter +ExtrafieldParamHelplink=Les paramètres doivent être ObjectName: Classpath
Syntaxe: ObjectName:Classpath
Exemple: Societe:societe/class/societe.class.php 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 taxe locale est calculée sur le montant hors taxe)
2 : taxe locale sur les produits et services avant tva (la taxe locale est calculée sur le montant + tva)
3 : taxe locale uniquement sur les produits hors tva (la taxe locale est calculée sur le montant hors taxe)
4 : taxe locale uniquement sur les produits avant tva (la taxe locale est calculée sur le montant + tva)
5 : taxe locale uniquement sur les services hors tva (la taxe locale est calculée sur le montant hors taxe)
6 : taxe locale uniquement sur les service avant tva (la taxe locale est calculée sur le montant + tva) @@ -443,9 +443,9 @@ DisplayCompanyInfo=Afficher l'adresse de la société DisplayCompanyManagers=Afficher le nom des responsables DisplayCompanyInfoAndManagers=Afficher l'adresse du tiers et le nom de son responsable EnableAndSetupModuleCron=Si vous voulez avoir cette facture récurrente générée automatiquement, le module *%s* doit être activé et correctement configuré. Dans le cas contraire, la génération des factures doit être effectuée manuellement à partir de ce modèle avec le bouton *Créer*. Notez que même si vous avez activé la génération automatique, vous pouvez toujours lancer en toute sécurité la génération manuelle. La génération en double sur une même période n'est pas possibles. -ModuleCompanyCodeAquarium=Return an accounting code built by:
%s followed by third party supplier code for a supplier accounting code,
%s followed by third party customer code for a customer accounting code. +ModuleCompanyCodeAquarium=Renvoie un code comptable composé de :
%s suivi du code tiers fournisseur pour le code compta fournisseur,
%s suivi du code tiers client pour le code compta client. ModuleCompanyCodePanicum=Retourne un code comptable vide -ModuleCompanyCodeDigitaria=Accounting 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. +ModuleCompanyCodeDigitaria=Renvoie un code comptable composé suivant le code tiers. Le code est composé du caractère 'C' en première position suivi des 5 premiers caractères du code tiers. Use3StepsApproval=Par défaut, les commandes fournisseurs nécessitent d'être créées et approuvées en deux étapes/utilisateurs (une étape/utilisateur pour créer et une étape/utilisateur pour approuver. Si un utilisateur à les deux permissions, ces deux actions sont effectuées en une seule fois). Cette option ajoute la nécessité d'une approbation par une troisième étape/utilisateur, si le montant de la commande est supérieur au montant d'une valeur définie (soit 3 étapes nécessaire: 1 =Validation, 2=Première approbation et 3=seconde approbation si le montant l'exige).
Laissez le champ vide si une seule approbation (2 étapes) sont suffisantes, placez une valeur très faibe (0.1) si une deuxième approbation (3 étapes) est toujours exigée. UseDoubleApproval=Activer l'approbation en trois étapes si le montant HT est supérieur à... WarningPHPMail=Attention : Certains serveurs de messagerie (Yahoo) ne permettent pas l'envoi d'e-mails depuis un autre serveur que le leur si l'adresse d'envoi utilisée est une adresse Yahoo (myemail@yahoo.fr, myemail@yahoo.com...) Votre configuration actuelle utilise le serveur de l'application pour l'envoi d'e-mails. Le serveur de certains destinataires (compatibles avec le protocole restrictif DMARC) demanderont aux serveurs Yahoo l'autorisation de recevoir les e-mails et Yahoo la refusera car le serveur n'est pas un serveur appartenant à Yahoo, aussi une partie de vos e-mails envoyés risquent de ne pas être reçus.\n
Si votre fournisseur d'e-mail (comme Yahoo) impose cette restriction, vous devrez modifier votre configuration et opter pour l'autre méthode d'envoi "SMTP server" et saisissez les identifiants SMTP de votre compte fournis par votre fournisseur d'e-mail (à demander à votre fournisseur d'e-mail) @@ -465,8 +465,8 @@ ProductDocumentTemplates=Modèle de document pour la fiche produit FreeLegalTextOnExpenseReports=Mention complémentaire sur les notes de frais WatermarkOnDraftExpenseReports=Filigrane sur les notes de frais AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable) -FilesAttachedToEmail=Attach file -SendEmailsReminders=Send agenda reminders by emails +FilesAttachedToEmail=Joindre le fichier +SendEmailsReminders=Envoyer des alertes agenda par e-mails # Modules Module0Name=Utilisateurs & groupes Module0Desc=Gestion des utilisateurs / employés et groupes @@ -539,7 +539,7 @@ Module320Desc=Ajout de flux d'informations RSS dans les écrans Dolibarr Module330Name=Marque-pages Module330Desc=Gestion des marque-pages Module400Name=Projets/Opportunités/Affaires -Module400Desc=Gestion des projets, opportunités ou affaires. Vous pouvez ensuite assigner tous les autres éléments (facture, commande, proposition, intervention, ...) à ces projets et avoir une vue transverse depuis cette vue projet. +Module400Desc=Gestion des projets, opportunités/affaires et/ou tâches. Vous pouvez aussi assigner tous les autres éléments (facture, commande, proposition, intervention, ...) à ces projets et avoir une vue transverse depuis la vue projet. Module410Name=Webcalendar Module410Desc=Interface avec le calendrier Webcalendar Module500Name=Dépenses spéciales @@ -549,7 +549,7 @@ Module510Desc=Enregistrer et suivre le paiement des salaires des employés Module520Name=Emprunt Module520Desc=Gestion des emprunts Module600Name=Notifications d'événements métiers -Module600Desc=Envoi de notifications par e-mails (déclenchées par des événements métiers) aux utilisateurs (configuration faite sur chaque fiche utilisateur), contacts de tiers (configuration faite sur chaque fiche tiers) ou à adresses e-mails spécifiques. +Module600Desc=Envoi de notifications par e-mails (déclenchées par des événements métiers) aux utilisateurs (configuration faite sur chaque fiche utilisateur), contacts de tiers (configuration faite sur chaque fiche tiers) ou vers des adresses e-mails spécifiques. Module600Long=Note that this module is dedicated to send real time emails when a dedicated business event occurs. If you are looking for a feature to send reminders by email of your agenda events, go into setup of module Agenda. Module700Name=Dons Module700Desc=Gestion des dons @@ -589,13 +589,13 @@ Module3100Desc=Ajouter un bouton Skype dans les fiches utilisateurs / tiers / co Module3200Name=Logs inaltérables Module3200Desc=Activez la journalisation de certains événements métiers (création, modification de facture dans une trace inaltérable (informations non réversibles). Ce module permet d'être compatible avec les exigences des lois de certains pays (comme par exemple la loi Finance 2016 ou norme 525 en France). Module4000Name=GRH -Module4000Desc=Human resources management (management of department, employee contracts and feelings) +Module4000Desc=Gestion des ressources humaines (gestion du département, contrats des employés et appréciations) Module5000Name=Multi-société Module5000Desc=Permet de gérer plusieurs sociétés Module6000Name=Workflow Module6000Desc=Gérer le Workflow Module10000Name=Sites internet -Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name. +Module10000Desc=Créer des sites internet publics avec un éditeur WYSIWYG. Indiquer à votre serveur web (Apache, Nginx, ...) le chemin d'accès au à dossier pour mettre votre site en ligne avec votre propre nom de domaine. Module20000Name=Gestion des demandes de congés Module20000Desc=Déclaration et suivi des congés des employés Module39000Name=Numéros de Lot/Série @@ -884,7 +884,7 @@ DictionaryTypeContact=Types de contacts/adresses DictionaryEcotaxe=Barèmes Eco-participation (DEEE) DictionaryPaperFormat=Format papiers DictionaryFormatCards=Formats des cartes -DictionaryFees=Expense report - Types of expense report lines +DictionaryFees=Note de frais - Types de lignes de notes de frais DictionarySendingMethods=Méthodes d'expédition DictionaryStaff=Effectifs DictionaryAvailability=Délai de livraison @@ -898,12 +898,13 @@ DictionaryUnits=Unités DictionaryProspectStatus=Statuts de prospection DictionaryHolidayTypes=Type de congés DictionaryOpportunityStatus=Statut d'opportunités pour les affaires/projets -DictionaryExpenseTaxCat=Expense report - Transportation categories -DictionaryExpenseTaxRange=Expense report - Range by transportation category +DictionaryExpenseTaxCat=Note de frais - catégories de déplacement +DictionaryExpenseTaxRange=Note de frais - Tri par catégorie de déplacement SetupSaved=Configuration sauvegardée SetupNotSaved=Configuration non enregistrée BackToModuleList=Retour liste des modules BackToDictionaryList=Retour liste des dictionnaires +TypeOfRevenueStamp=Type of revenue stamp VATManagement=Gestion TVA VATIsUsedDesc=Le taux de TVA proposé par défaut lors de la création de proposition commerciale, facture, commande, etc... répond à la règle standard suivante :
Si vendeur non assujetti à TVA, TVA par défaut=0. Fin de règle.
Si le (pays vendeur= pays acheteur) alors TVA par défaut=TVA du produit vendu. Fin de règle.
Si vendeur et acheteur dans Communauté européenne et bien vendu= moyen de transport neuf (auto, bateau, avion), TVA par défaut=0 (La TVA doit être payée par acheteur au centre d'impôts de son pays et non au vendeur). Fin de règle.
Si vendeur et acheteur dans Communauté européenne et acheteur= particulier alors TVA par défaut=TVA du produit vendu (TVA pays vendeur si < seuil du pays et si avant 01/01/2015, TVA pays acheteur après le 01/01/2015). Fin de règle.
Si vendeur et acheteur dans Communauté européenne et acheteur= entreprise alors TVA par défaut=0. Fin de règle.
Sinon TVA proposée par défaut=0. Fin de règle.
VATIsNotUsedDesc=Le taux de TVA proposé par défaut est 0. C'est le cas d'associations, particuliers ou certaines petites sociétés. @@ -1094,11 +1095,11 @@ ShowProfIdInAddress=Afficher l'identifiant professionnel dans les adresses sur l ShowVATIntaInAddress=Cacher l'identifiant de TVA Intracommunautaire dans les adresses sur les documents TranslationUncomplete=Traduction partielle MAIN_DISABLE_METEO=Désactiver la vue météo -MeteoStdMod=Standard mode -MeteoStdModEnabled=Standard mode enabled -MeteoPercentageMod=Percentage mode -MeteoPercentageModEnabled=Percentage mode enabled -MeteoUseMod=Click to use %s +MeteoStdMod=Mode standard +MeteoStdModEnabled=Mode standard activé +MeteoPercentageMod=Mode pourcentage +MeteoPercentageModEnabled=Mode pourcentage activé +MeteoUseMod=Cliquez pour utiliser %s TestLoginToAPI=Tester connexion à l'API ProxyDesc=Certaines fonctions de Dolibarr nécessitent que le serveur ait accès à internet. Définissez ici les paramètres de ces accès. Si le serveur Dolibarr est derrière un proxy, ces paramètres indiquent à Dolibarr comment le traverser. ExternalAccess=Accès externes @@ -1132,7 +1133,7 @@ SendmailOptionMayHurtBuggedMTA=La fonction d'envoi de mails par la méthode "PHP TranslationSetup=Configuration de la traduction TranslationKeySearch=Rechercher une traduction TranslationOverwriteKey=Ajouter une traduction -TranslationDesc=How to set displayed application language :
* Systemwide: menu Home - Setup - Display
* Per user: Use the User display setup tab on user card (click on username at the top of the screen). +TranslationDesc=Pour sélectionner la langue d'affichage de l'environnement :
* langue par défaut : menu Accueil - Configuration - Affichage
* langue par utilisateur: Onglet Interface utilisateur de la fiche utilisateur (Accès a la fiche de l'utilisateur depuis l'identifiant dans l'angle supérieur droit de l'écran). TranslationOverwriteDesc=Vous pouvez aussi écraser des valeurs en complétant/corrigeant le tableau suivant. Choisissez votre code de langue depuis la liste déroulante "%s", choisissez le code trouvé dans le fichier lang dans le champ "%s", et dans "%s" la nouvelle valeur que vous souhaitez utiliser comme nouvelle traduction. TranslationOverwriteDesc2=Vous pouvez utiliser l'autre onglet pour vous aider à connaître la clé de traduction à utiliser TranslationString=Traduction @@ -1170,7 +1171,7 @@ SetupPerso=Selon votre configuration PasswordPatternDesc=Description du masque du mot de passe ##### Users setup ##### RuleForGeneratedPasswords=Règle pour la génération des mots de passe proposés et leur validation -DisableForgetPasswordLinkOnLogonPage=Ne pas afficher le lien "Mot de passe oublié" sur la page de connexion +DisableForgetPasswordLinkOnLogonPage=Cacher le lien "Mot de passe oublié" sur la page de connexion UsersSetup=Configuration du module utilisateurs UserMailRequired=Email requis pour créer un nouvel utilisateur ##### HRM setup ##### @@ -1178,7 +1179,7 @@ HRMSetup=Configuration du module GRH ##### Company setup ##### CompanySetup=Configuration du module Tiers CompanyCodeChecker=Modèle de génération et contrôle des codes tiers (clients/fournisseurs) -AccountCodeManager=Module de génération de comptes comptables (clients et fournisseurs) +AccountCodeManager=Module de génération de comptes comptables (client et fournisseur) NotificationsDesc=Les notifications activent l'envoi d'e-mails automatiques pour certains événements de Dolibarr. L'envoi de ces e-mails automatiques est défini selon : NotificationsDescUser=* par utilisateurs, utilisateur par utilisateur. NotificationsDescContact=* par tiers de contacts (clients ou fournisseur), contact par contact. @@ -1271,7 +1272,7 @@ LDAPSynchronizeUsers=Organisation des objets utilisateurs dans le LDAP LDAPSynchronizeGroups=Organisation des objets groupes dans le LDAP LDAPSynchronizeContacts=Organisation des objets contacts dans le LDAP LDAPSynchronizeMembers=Organisation des objets adhérents dans le LDAP -LDAPSynchronizeMembersTypes=Organization of foundation's members types in LDAP +LDAPSynchronizeMembersTypes=Types d'adhérents de l'annuaire LDAP de l'association LDAPPrimaryServer=Serveur primaire LDAPSecondaryServer=Serveur secondaire LDAPServerPort=Port du serveur @@ -1295,7 +1296,7 @@ LDAPDnContactActive=Synchronisation des contacts LDAPDnContactActiveExample=Synchronisation activée/désactivée LDAPDnMemberActive=Synchronisation des adhérents LDAPDnMemberActiveExample=Synchronisation activée/désactivée -LDAPDnMemberTypeActive=Members types' synchronization +LDAPDnMemberTypeActive=Synchronisation des types d'adhérents LDAPDnMemberTypeActiveExample=Synchronisation activée/désactivée LDAPContactDn=DN des contacts Dolibarr LDAPContactDnExample=DN complet (ex : ou=contacts,dc=my-domain,dc=com) @@ -1303,8 +1304,8 @@ LDAPMemberDn=DN des adhérents LDAPMemberDnExample=DN complet (ex : ou=members,dc=society,dc=com) LDAPMemberObjectClassList=Liste des objectClass LDAPMemberObjectClassListExample=Liste des objectClass définissant les attributs d'un enregistrement (ex : top,inetOrgPerson ou top,user for active directory) -LDAPMemberTypeDn=Dolibarr members types DN -LDAPMemberTypepDnExample=Complete DN (ex: ou=memberstypes,dc=example,dc=com) +LDAPMemberTypeDn=DN des types d'adhérents +LDAPMemberTypepDnExample=DN complet (ex : ou=memberstypes,dc=example,dc=com) LDAPMemberTypeObjectClassList=Liste des objectClass LDAPMemberTypeObjectClassListExample=Liste des objectClass définissant les attributs d'un enregistrement (ex : top,groupOfUniqueNames) LDAPUserObjectClassList=Liste des objectClass @@ -1318,7 +1319,7 @@ LDAPTestSynchroContact=Tester synchronisation contacts LDAPTestSynchroUser=Tester synchronisation utilisateur LDAPTestSynchroGroup=Tester synchronisation groupe LDAPTestSynchroMember=Tester synchronisation adhérent -LDAPTestSynchroMemberType=Test member type synchronization +LDAPTestSynchroMemberType=Test de la synchronisation du type d'adhérent LDAPTestSearch= Tester une recherche LDAP LDAPSynchroOK=Test de synchronisation réalisé avec succès LDAPSynchroKO=Échec du test de synchronisation @@ -1384,7 +1385,7 @@ LDAPDescContact=Cette page permet de définir le nom des attributs de l'arbre LD LDAPDescUsers=Cette page permet de définir le nom des attributs de l'arbre LDAP pour chaque information des utilisateurs Dolibarr. LDAPDescGroups=Cette page permet de définir le nom des attributs de l'arbre LDAP pour chaque information des groupes utilisateurs Dolibarr. LDAPDescMembers=Cette page permet de définir le nom des attributs de l'arbre LDAP pour chaque information des membres du module adhérents Dolibarr. -LDAPDescMembersTypes=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members types. +LDAPDescMembersTypes=Cette page permet de définir le nom des attributs de l'arbre LDAP pour chaque information des membres du module adhérents Dolibarr. LDAPDescValues=Les valeurs exemples sont adaptées à OpenLDAP avec les schémas suivant chargés: core.schema, cosine.schema, inetorgperson.schema). Si vous utilisez les valeurs suggérées et OpenLDAP, modifiez votre fichier de configuration LDAP slapd.conf pour avoir tous ces schémas actifs. ForANonAnonymousAccess=Pour un accès authentifié (pour accès en écriture par exemple) PerfDolibarr=Rapport de configuration/optimisation sur la performance @@ -1408,7 +1409,7 @@ CompressionOfResources=Compression des réponses HTTP CompressionOfResourcesDesc=Par exemple, en utilisant la directive Apache "AddOutputFilterByType DEFLATE" TestNotPossibleWithCurrentBrowsers=Une détection automatique n'est pas possible avec le navigateur courant DefaultValuesDesc=Vous pouvez définir/forcer ici la valeur par défaut que vous voulez obtenir lorsque vous créez un nouvel enregistrement, et/ou les filtres par défaut ou ordre de tri des listes. -DefaultCreateForm=Default values (on forms to create) +DefaultCreateForm=Valeurs par défaut (sur les formulaires de création) DefaultSearchFilters=Filtres de recherche par défaut DefaultSortOrder=Ordre de tri par défaut DefaultFocus=Champs par défaut ayant le focus @@ -1628,7 +1629,7 @@ ProjectsSetup=Configuration du module Projets ProjectsModelModule=Modèles de document de rapport projets TasksNumberingModules=Modèles de numérotation des références tâches TaskModelModule=Modèles de document de rapport tâches -UseSearchToSelectProject=Wait you press a key before loading content of project combo list (This may increase performance if you have a large number of project, but it is less convenient) +UseSearchToSelectProject=Attendre que vous ayez appuyé sur une touche avant de charger le contenu de la liste déroulante des projets (Cela peut augmenter les performances si vous avez un grand nombre de projets) ##### ECM (GED) ##### ##### Fiscal Year ##### AccountingPeriods=Période fiscales @@ -1653,8 +1654,8 @@ TypePaymentDesc=0:Type de paiement client, 1:Type de paiement fournisseur, 2:Pai IncludePath=Chemin Include (défini dans la variable %s) ExpenseReportsSetup=Configuration du module Notes de frais TemplatePDFExpenseReports=Modèles de documents pour générer les document de Notes de frais -ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index -ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules +ExpenseReportsIkSetup=Configuration du module Notes de frais - Index des frais kilométriques +ExpenseReportsRulesSetup=Configuration du module Notes de frais - Règles ExpenseReportNumberingModules=Modèle de numérotation des notes de frais NoModueToManageStockIncrease=Aucun module capable d'assurer l'augmentation de stock en automatique a été activé. La réduction de stock se fera donc uniquement sur mise à jour manuelle. YouMayFindNotificationsFeaturesIntoModuleNotification=Vous pouvez trouver d'autres options pour la notification par Email en activant et configurant le module "Notification". @@ -1689,7 +1690,7 @@ UnicodeCurrency=Saisissez ici entre accolades, la liste du numéro des octets qu ColorFormat=La couleur RVB au format HEX est, par exemple: FF0000 PositionIntoComboList=Position de la ligne dans des listes déroulantes SellTaxRate=Taux de TVA -RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases. +RecuperableOnly=Oui pour une TVA "Non Perçue mais Récupérable" dédiée à certains pays comme la France. Gardez la valeur à "Non" dans tous les autres cas. UrlTrackingDesc=Si le fournisseur ou le service de transport offrent une page ou un site Web pour vérifier l'état de votre envoi, vous pouvez l'entrer ici. Vous pouvez utiliser la clé {TRACKID} dans les paramètres d'URL afin que le système la remplace par la valeur du numéro de suivi entré sur la fiche d'expédition. OpportunityPercent=Lorsque vous créez une opportunité, vous aurez défini un montant estimatif de projet/affaire. Selon le statut de l'opportunité, ce montant peut être multiplié par ce taux pour évaluer montant probable que vos opportunités sont susceptibles de générer. La valeur est un pourcentage (entre 0 et 100). TemplateForElement=Cet enregistrement modèle est dédié à quel élément @@ -1712,8 +1713,8 @@ MailToSendSupplierOrder=Pour l'envoi de commande fournisseur MailToSendSupplierInvoice=Pour l'envoi de facture fournisseur MailToSendContract=Pour envoyer un contrat MailToThirdparty=Envoi email depuis la fiche Tiers -MailToMember=To send email from member page -MailToUser=To send email from user page +MailToMember=Pour envoyer un e-mail depuis la fiche d'un adhérent +MailToUser=Pour envoyer un e-mail depuis la page utilisateur ByDefaultInList=Afficher par défaut sur les vues listes YouUseLastStableVersion=Vous utilisez la dernière version stable TitleExampleForMajorRelease=Exemple de message que vous pouvez utiliser pour annonce une nouvelle version majeure (n'hésitez pas à l'utilisez pour vos propres news) @@ -1724,11 +1725,11 @@ MultiPriceRuleDesc=Quand l'option « Plusieurs niveaux de prix par produit/servi ModelModulesProduct=Modèles des documents de produits ToGenerateCodeDefineAutomaticRuleFirst=Pour pouvoir générer automatiquement des codes, vous devez d'abord définir un gestionnaire pour définir automatiquement le numéro du code-barre. SeeSubstitutionVars=Voir * note pour la liste des variables de substitutions possibles -SeeChangeLog=See ChangeLog file (english only) +SeeChangeLog=Voir le fichier changeLog (anglais) AllPublishers=Tous les éditeurs UnknownPublishers=Editeurs inconnus AddRemoveTabs=Ajout ou suppression des onglets -AddDataTables=Add object tables +AddDataTables=Ajouter les tables des objets AddDictionaries=Ajout de dictionnaires AddData=Ajouter des entrées d'objets ou de dictionnaires AddBoxes=Ajout de widgets @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Ressource UseSearchToSelectResource=Utilisez un champ avec auto-complétion pour choisir les ressources (plutôt qu'une liste déroulante). DisabledResourceLinkUser=Supprimer le lien entre la ressource et l'utilisateur DisabledResourceLinkContact=Désactiver le lient entre la ressource et le contact/adresse +ConfirmUnactivation=Confirmer réinitialisation du module diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang index 5a384a5440a..3479884bab3 100644 --- a/htdocs/langs/fr_FR/agenda.lang +++ b/htdocs/langs/fr_FR/agenda.lang @@ -12,7 +12,7 @@ Event=Evénement Events=Événements EventsNb=Nombre d'événements ListOfActions=Liste des événements -EventReports=Event reports +EventReports=Rapport des évènements Location=Lieu ToUserOfGroup=à tout utilisateur du groupe EventOnFullDay=Événement sur la(les) journée(s) diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang index 8e83498eb9b..f33cfe70dd6 100644 --- a/htdocs/langs/fr_FR/banks.lang +++ b/htdocs/langs/fr_FR/banks.lang @@ -159,4 +159,4 @@ VariousPayments=Opérations diverses ShowVariousPayment=Afficher les opérations diverses AddVariousPayment=Ajouter paiements divers YourSEPAMandate=Votre mandat SEPA -FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to +FindYourSEPAMandate=Voici votre mandat SEPA pour autoriser notre société à réaliser les prélèvements depuis votre compte bancaire. Merci de retourner ce mandat signé (scan du document signé) ou en l'envoyant par courrier à diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang index ab8a6378500..a4475f93e3b 100644 --- a/htdocs/langs/fr_FR/bills.lang +++ b/htdocs/langs/fr_FR/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Factures fournisseur impayées pour %s BillsLate=Retards de paiement BillsStatistics=Statistiques factures clients BillsStatisticsSuppliers=Statistiques factures fournisseurs +DisabledBecauseDispatchedInBookkeeping=Action désactivée car facture transférée dans le grand livre +DisabledBecauseNotLastInvoice=Action désactivée car facture non supprimable. Des factures ont été créées après cet facture et cela va créer un trou dans la numérotation des factures. DisabledBecauseNotErasable=Désactivé car non supprimable InvoiceStandard=Facture standard InvoiceStandardAsk=Facture standard @@ -334,9 +336,9 @@ FrequencyPer_y=Tout les %s an(s) FrequencyUnit=Unité de fréquence toolTipFrequency=Exemples:
déclarer 7 / jour: génèrera une factures tous les 7 jours
déclarer 3 / mois: génèrera une facture tous les 3 mois. NextDateToExecution=Date pour la prochaine génération de facture -NextDateToExecutionShort=Date next gen. +NextDateToExecutionShort=Date de prochaine génération DateLastGeneration=Date de la dernière génération -DateLastGenerationShort=Date latest gen. +DateLastGenerationShort=Date de dernière génération MaxPeriodNumber=Nombre maximum de génération NbOfGenerationDone=Nombre de génération déjà réalisées NbOfGenerationDoneShort=Nb de génération réalisée @@ -514,6 +516,6 @@ DeleteRepeatableInvoice=Supprimer facture modèle ConfirmDeleteRepeatableInvoice=Est-ce votre sûr de vouloir supprimer la facture modèle ? CreateOneBillByThird=Créer une facture par tiers (sinon, une facture par commande) BillCreated=%s facture(s) créée(s) -StatusOfGeneratedDocuments=Status of document generation -DoNotGenerateDoc=Do not generate document file -AutogenerateDoc=Auto generate document file +StatusOfGeneratedDocuments=Statut de génération du document +DoNotGenerateDoc=Ne pas générer le fichier +AutogenerateDoc=Auto-génerer le fichier diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang index 77f5850ad23..dcbb8229788 100644 --- a/htdocs/langs/fr_FR/compta.lang +++ b/htdocs/langs/fr_FR/compta.lang @@ -35,30 +35,30 @@ VATReceived=TVA collectée VATToCollect=TVA payée VATSummary=Balance de TVA VATPaid=TVA payée -LT1Summary=Tax 2 summary -LT2Summary=Tax 3 summary +LT1Summary=Résumé taxe 2 +LT2Summary=Résumé taxe 3 LT1SummaryES=Balance RE LT2SummaryES=Balance de IRPF -LT1SummaryIN=CGST Balance -LT2SummaryIN=SGST Balance -LT1Paid=Tax 2 paid -LT2Paid=Tax 3 paid +LT1SummaryIN=Balance CGST +LT2SummaryIN=Balance de TVA +LT1Paid=Taxe 2 payée +LT2Paid=Taxe 3 payée LT1PaidES=RE Payé LT2PaidES=IRPF Payée -LT1PaidIN=CGST Paid -LT2PaidIN=SGST Paid -LT1Customer=Tax 2 sales -LT1Supplier=Tax 2 purchases +LT1PaidIN=TVA payée +LT2PaidIN=TVA payée +LT1Customer=Taxe de vente 2 +LT1Supplier=Taxe 2 sur les achats LT1CustomerES=RE ventes LT1SupplierES=RE achats -LT1CustomerIN=CGST sales -LT1SupplierIN=CGST purchases -LT2Customer=Tax 3 sales -LT2Supplier=Tax 3 purchases +LT1CustomerIN=TVA sur ventes +LT1SupplierIN=TVA sur les achats +LT2Customer=Taxe 3 sur les ventes +LT2Supplier=Taxe 3 sur les achats LT2CustomerES=IRPF ventes LT2SupplierES=IRPF achats -LT2CustomerIN=SGST sales -LT2SupplierIN=SGST purchases +LT2CustomerIN=TVA sur les ventes +LT2SupplierIN=TVA sur les achats VATCollected=TVA récupérée ToPay=A payer SpecialExpensesArea=Espace des paiements particuliers @@ -150,7 +150,7 @@ AnnualByCompaniesDueDebtMode=Bilan des recettes et dépenses, détaillé par reg AnnualByCompaniesInputOutputMode=Bilan des recettes et dépenses, détaillé par regroupements prédéfinis, mode %sRecettes-Dépenses%s dit comptabilité de caisse. SeeReportInInputOutputMode=Cliquer sur %sRecettes-Dépenses%s dit comptabilité de caisse pour un calcul sur les paiements effectivement réalisés SeeReportInDueDebtMode=Cliquer sur %sCréances-Dettes%s dit comptabilité d'engagement pour un calcul sur les factures émises -SeeReportInBookkeepingMode=See report %sBookeeping%s for a calculation on bookkeeping table analysis +SeeReportInBookkeepingMode=Voir le %sGrand livre%s pour un calcul basé sur l'analyse des valeurs correspondantes RulesAmountWithTaxIncluded=- Les montants affichés sont les montants taxe incluse RulesResultDue=- Il comprend les factures impayées, les dépenses, la TVA, les dons, qu'ils soient payées ou non. Il comprend également les salaires versés.
- Il est basé sur la date de validation des factures et de la TVA et à la date prévue pour les dépenses. Pour les salaires définis avec le module de salaire, la date de paiement de la valeur est utilisée. RulesResultInOut=- Il comprend les paiements réels effectués sur les factures, les dépenses, la TVA et les salaires.
- Il est basé sur les dates de paiement des factures, les dépenses, la TVA et les salaires. La date du don pour le don. @@ -159,7 +159,7 @@ RulesCAIn=- Il inclut les règlements effectivement reçus des factures clients. RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME" RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME" RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts grouped by personalized groups -SeePageForSetup=See menu %s for setup +SeePageForSetup=Voir le menu %s pour la configuration DepositsAreNotIncluded=- Les factures d'acomptes ne sont pas incluses DepositsAreIncluded=- Les factures d'acomptes sont incluses LT2ReportByCustomersInInputOutputModeES=Rapport par client des IRPF @@ -216,7 +216,7 @@ ACCOUNTING_VAT_SOLD_ACCOUNT=Compte comptable par défaut pour l'encaissement de ACCOUNTING_VAT_BUY_ACCOUNT=Compte comptable par défaut pour le paiement de la TVA - TVA sur les achats (utilisé si non défini au niveau de la configuration du dictionnaire de TVA) ACCOUNTING_VAT_PAY_ACCOUNT=Compte comptable par défaut pour le paiement de la TVA ACCOUNTING_ACCOUNT_CUSTOMER=Compte comptable utilisé pour le tiers client -ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Le compte comptable dédié défini sur la carte tierce sera utilisé pour l'affectation du compte secondaire uniquement. Celui-ci sera utilisé pour le grand livre général et comme valeur par défaut de la comptabilité secondaire si le compte dépendant d'un autre sur un tiers n'est pas défini +ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Le compte comptable dédié défini sur la fiche tiers sera utilisé pour l'affectation du compte auxiliaire uniquement. Celui-ci sera utilisé pour la comptabilité générale et comme valeur par défaut de la comptabilité auxiliaire si le compte comptable client dédié du ties n'est pas défini. ACCOUNTING_ACCOUNT_SUPPLIER=Compte comptable utilisé pour le tiers fournisseur ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Le compte comptable dédié défini sur la carte tierce sera utilisé pour l'affectation du compte secondaire uniquement. Celui-ci sera utilisé pour le grand livre général et comme valeur par défaut de la comptabilité du sous-compte rendu si le compte d'affectation spécialisé du fournisseur sur un tiers n'est pas défini. CloneTax=Cloner une charge sociale/fiscale @@ -234,4 +234,4 @@ ImportDataset_tax_vat=Paiements de TVA ErrorBankAccountNotFound=Erreur: compte banque non trouvé FiscalPeriod=Période fiscale ListSocialContributionAssociatedProject=Liste des charges sociales liées au projet -DeleteFromCat=Remove from accounting group +DeleteFromCat=Supprimer du groupe comptable diff --git a/htdocs/langs/fr_FR/dict.lang b/htdocs/langs/fr_FR/dict.lang index 4462463612a..06c67cf97dd 100644 --- a/htdocs/langs/fr_FR/dict.lang +++ b/htdocs/langs/fr_FR/dict.lang @@ -327,30 +327,30 @@ PaperFormatCAP5=Format P5 Canadien PaperFormatCAP6=Format P6 Canadien #### Expense report categories #### ExpAutoCat=Voiture -ExpCycloCat=Moped -ExpMotoCat=Motorbike -ExpAuto3CV=3 CV +ExpCycloCat=2 roues +ExpMotoCat=Moto +ExpAuto3CV=3 cv ExpAuto4CV=4 CV -ExpAuto5CV=5 CV +ExpAuto5CV=5 cv ExpAuto6CV=6 CV -ExpAuto7CV=7 CV -ExpAuto8CV=8 CV +ExpAuto7CV=7 cv +ExpAuto8CV=8 cv ExpAuto9CV=9 CV -ExpAuto10CV=10 CV -ExpAuto11CV=11 CV -ExpAuto12CV=12 CV -ExpAuto3PCV=3 CV and more +ExpAuto10CV=10 cv +ExpAuto11CV=11 cv +ExpAuto12CV=12 cv +ExpAuto3PCV=3 cv et plus ExpAuto4PCV=4 CV et plus -ExpAuto5PCV=5 CV and more -ExpAuto6PCV=6 CV and more -ExpAuto7PCV=7 CV and more -ExpAuto8PCV=8 CV and more -ExpAuto9PCV=9 CV and more -ExpAuto10PCV=10 CV and more -ExpAuto11PCV=11 CV and more -ExpAuto12PCV=12 CV and more -ExpAuto13PCV=13 CV and more -ExpCyclo=Capacity lower to 50cm3 -ExpMoto12CV=Motorbike 1 or 2 CV -ExpMoto345CV=Motorbike 3, 4 or 5 CV -ExpMoto5PCV=Motorbike 5 CV and more +ExpAuto5PCV=5 cv et plus +ExpAuto6PCV=6 cv et plus +ExpAuto7PCV=7 cv et plus +ExpAuto8PCV=8 cv et plus +ExpAuto9PCV=9 cv et plus +ExpAuto10PCV=10 cv et plus +ExpAuto11PCV=11 cv et plus +ExpAuto12PCV=12 cv et plus +ExpAuto13PCV=13 cv et plus +ExpCyclo=Capacité inférieure à 50 cm3 +ExpMoto12CV=2 roues 1 ou 2 cv +ExpMoto345CV=2 roues 3, 4 ou 5 cv +ExpMoto5PCV=2 roues 5 cv et plus diff --git a/htdocs/langs/fr_FR/ecm.lang b/htdocs/langs/fr_FR/ecm.lang index a8ddd457707..dd9acb251de 100644 --- a/htdocs/langs/fr_FR/ecm.lang +++ b/htdocs/langs/fr_FR/ecm.lang @@ -6,7 +6,7 @@ ECMSectionAuto=Répertoire automatique ECMSectionsManual=Arborescence manuelle ECMSectionsAuto=Arborescence automatique ECMSections=Répertoires -ECMRoot=ECM Root +ECMRoot=Racine ECMNewSection=Nouveau répertoire ECMAddSection=Ajouter répertoire ECMCreationDate=Date de création @@ -18,7 +18,7 @@ ECMArea=Espace GED ECMAreaDesc=L'espace GED (Gestion Électronique de Documents) vous permet de stocker dans Dolibarr et retrouver rapidement tout type de documents. ECMAreaDesc2=* Les répertoires automatiques sont alimentés automatiquement lors de l'ajout d'un document depuis une fiche objet (proposition commerciale, facture...).
* Les répertoires manuels peuvent être utilisés pour stocker des documents divers, non liés à un objet particulier. ECMSectionWasRemoved=Le répertoire %s a été effacé. -ECMSectionWasCreated=Directory %s has been created. +ECMSectionWasCreated=Le répertoire %s a été créé. ECMSearchByKeywords=Recherche par mots-clés ECMSearchByEntity=Recherche par objet ECMSectionOfDocuments=Répertoires des documents @@ -42,9 +42,9 @@ ECMDirectoryForFiles=Répertoire relatif pour les fichiers CannotRemoveDirectoryContainsFiles=Suppression impossible car des fichiers sont présents ECMFileManager=Gestionnaire de fichier ECMSelectASection=Sélectionner un répertoire sur l'arbre de gauche… -DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory. +DirNotSynchronizedSyncFirst=Ce répertoire a été crée ou modifié en dehors du module GED. Cliquer sur le bouton "Rafraîchir" afin de resyncroniser les informations sur disque et la base pour voir le contenu de ce répertoire. ReSyncListOfDir=Resynchroniser la liste des répertoires HashOfFileContent=Hash du contenu du fichier -FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it) -FileSharedViaALink=File shared via a link -NoDirectoriesFound=No directories found +FileNotYetIndexedInDatabase=Fichier non indexé dans la base de données. Téléchargez le à nouveau +FileSharedViaALink=Fichier partagé via un lien +NoDirectoriesFound=Aucun répertoire trouvé diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang index 1847b9235a2..9941fc8d08f 100644 --- a/htdocs/langs/fr_FR/errors.lang +++ b/htdocs/langs/fr_FR/errors.lang @@ -155,11 +155,12 @@ ErrorPriceExpression19=Expression introuvable ErrorPriceExpression20=Expression vide ErrorPriceExpression21=Résultat '%s' vide ErrorPriceExpression22=Résultat négatif '%s' -ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression23=Inconnu ou variable non défini '%s' in %s +ErrorPriceExpression24=La variable '%s' existe mais n'a aucune valeur ErrorPriceExpressionInternal=Erreur interne '%s' ErrorPriceExpressionUnknown=Erreur inconnue '%s' ErrorSrcAndTargetWarehouseMustDiffers=Les entrepôts source et destination doivent être différents -ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on product '%s' requiring lot/serial information +ErrorTryToMakeMoveOnProductRequiringBatchData=Erreur, vous essayez de faire un mouvement de stock sans lot/numéro de série, sur le produit '%s' qui exige un lot/numéro de série. 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' @@ -198,13 +199,13 @@ ErrorNoWarehouseDefined=Erreur, aucun entrepôts défini. ErrorBadLinkSourceSetButBadValueForRef=Le lien que vous utilisez n'est pas valide. Une 'source' pour le paiement est définie, mais la valeur pour 'ref' n'est pas valide. ErrorTooManyErrorsProcessStopped=Trop d'erreurs, Le processus a été arrêté. ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=La validation de masse n'est pas possible lorsque l'option pour augmenter / diminuer le stock est définie sur cette action (vous devez valider un par un afin que vous puissiez définir l'entrepôt pour augmenter / diminuer) -ErrorObjectMustHaveStatusDraftToBeValidated=L'objet %s doit être au statut brouillon pour être validé +ErrorObjectMustHaveStatusDraftToBeValidated=L'objet %s doit être au statut 'Brouillon' pour être validé ErrorObjectMustHaveLinesToBeValidated=L'objet %s doit contenir des lignes ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Seules les factures validées peuvent être envoyées à l'aide de l'action de masse "Envoyer par courrier électronique". ErrorChooseBetweenFreeEntryOrPredefinedProduct=Vous devez choisir si l'article est un produit prédéfini ou non ErrorDiscountLargerThanRemainToPaySplitItBefore=La réduction que vous essayez d'appliquer est supérieure au montant du paiement. Auparavant, divisez le rabais en 2 rabais plus petits. -ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently. -ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference. +ErrorFileNotFoundWithSharedLink=Fichier non trouvé. Peut que la clé de partage a été modifié ou le fichier a été récemment supprimé. +ErrorProductBarCodeAlreadyExists=Le code-barre du produit %s existe déjà sur une autre référence de produit ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number. # Warnings diff --git a/htdocs/langs/fr_FR/holiday.lang b/htdocs/langs/fr_FR/holiday.lang index 7ae2bedd2fc..a44463d0d1b 100644 --- a/htdocs/langs/fr_FR/holiday.lang +++ b/htdocs/langs/fr_FR/holiday.lang @@ -79,8 +79,8 @@ HolidaysCancelation=Annulation de la demande de congés EmployeeLastname=Nom du salarié EmployeeFirstname=Prénom du salarié TypeWasDisabledOrRemoved=Le type de congés (id %s) a été désactivé ou supprimé -LastHolidays=Latest %s leave requests -AllHolidays=All leave requests +LastHolidays=Les %s dernières demandes de congés +AllHolidays=Toutes les demandes de congés ## Configuration du Module ## LastUpdateCP=Dernière mise à jour automatique de l'allocation des congés diff --git a/htdocs/langs/fr_FR/install.lang b/htdocs/langs/fr_FR/install.lang index e5ecf62dd18..93ec1fd75f0 100644 --- a/htdocs/langs/fr_FR/install.lang +++ b/htdocs/langs/fr_FR/install.lang @@ -140,7 +140,8 @@ KeepDefaultValuesMamp=Vous utilisez l'assistant d'installation DoliMamp. Les val KeepDefaultValuesProxmox=Vous utilisez l'assistant d'installation depuis une application Proxmox. Les valeurs présentes ici sont pré-remplies. Leur modification ne doit être effectuée qu'en connaissance de cause. UpgradeExternalModule=Lancer le processus de mise à jour d'un module externe SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' -NothingToDelete=Nothing to clean/delete +NothingToDelete=Rien a supprimer +NothingToDo=Rien à faire ######### # upgrade MigrationFixData=Correction de données dé-normalisées @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Mettre à jour le champ "entity" de la table "llx_societe_remise MigrationRemiseExceptEntity=Mettre à jour le champ "entity" de la table "llx_societe_remise_except" MigrationReloadModule=Rechargement du module %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Afficher les choix non disponibles HideNotAvailableOptions=Cacher les choix non disponibles ErrorFoundDuringMigration=Une erreur est survenu lors du processus de migration, aussi l'étape suivante ne peut pas être réalisée. Pour ignorer les erreurs, vous pouvez cliquer ici, mais l'application ou certaines fonctionnalités risquent de présenter des dysfonctionnements jusqu'à la résolution de la ou des erreurs diff --git a/htdocs/langs/fr_FR/languages.lang b/htdocs/langs/fr_FR/languages.lang index 9edfbb11e0b..bd7f12da153 100644 --- a/htdocs/langs/fr_FR/languages.lang +++ b/htdocs/langs/fr_FR/languages.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - languages Language_ar_AR=Arabe -Language_ar_EG=Arabic (Egypt) +Language_ar_EG=Arabe (Egypte) Language_ar_SA=Arabe Language_bn_BD=Bengalais Language_bg_BG=Bulgare diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang index bd3447e18f7..c1cf29b884e 100644 --- a/htdocs/langs/fr_FR/mails.lang +++ b/htdocs/langs/fr_FR/mails.lang @@ -67,12 +67,12 @@ MailingStatusRead=Lu YourMailUnsubcribeOK=L'adresse email %s est bien désinscrite de la liste. ActivateCheckReadKey=Clé de sécurité permettant le chiffrement des URL utilisées dans les fonctions d'accusé de lecture et de désinscription EMailSentToNRecipients=Email envoyé à %s destinataires. -EMailSentForNElements=%s e-mails envoyés +EMailSentForNElements=Email envoyé pour %s enregistrements XTargetsAdded=%s destinataires ajoutés dans la liste cible OnlyPDFattachmentSupported=Si les documents PDF ont déjà été générés pour les objets à envoyer, ils seront ajoutés à l'e-mail en pièce jointe. Sinon, aucun e-mail ne sera envoyé. (Notez de plus que seuls les documents PDF sont gérés pour l'attachement aux pièces jointes dans l'envoi en masse dans cette version) AllRecipientSelected=Les destinataires des %s enregistrements sélectionnés (si leur email est connu). GroupEmails=Regroupement emails -OneEmailPerRecipient=One email per recipient (by default, one email per record selected) +OneEmailPerRecipient=Un e-mail par destinataire (par défaut, un e-mail par enregistrement sélectionné) WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them. ResultOfMailSending=Résultat de l'envoi d'EMail en masse NbSelected=Nb sélectionné @@ -159,7 +159,7 @@ NoContactWithCategoryFound=Pas de contact/adresses avec cette catégorie NoContactLinkedToThirdpartieWithCategoryFound=Pas de contact/adresses associés à un ters avec cette catégorie OutGoingEmailSetup=Configuration email sortant InGoingEmailSetup=Configuration email entrant -OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing) +OutGoingEmailSetupForEmailing=Configuration des e-mail sortant (pour les e-mails de masse) DefaultOutgoingEmailSetup=Configuration des emails sortant Information=Information diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index edbea114c3b..8cc450e29d9 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -77,7 +77,7 @@ FileGenerated=Le fichier a été généré avec succès FileSaved=Fichier enregistré avec succès FileUploaded=Le fichier a été transféré avec succès FileTransferComplete=Fichier(s) correctement envoyé(s) -FilesDeleted=Suppression effectuée +FilesDeleted=Fichier(s) supprimé(s) avec succès FileWasNotUploaded=Un fichier a été sélectionné pour attachement mais n'a pas encore été uploadé. Cliquez sur "Joindre ce fichier" pour cela. NbOfEntries=Nb d'entrées GoToWikiHelpPage=Consulter l'aide (nécessite un accès internet) @@ -105,7 +105,7 @@ ReturnCodeLastAccessInError=Code retour dernier accès en base en erreur InformationLastAccessInError=Information sur le dernier accès en base en erreur DolibarrHasDetectedError=Dolibarr a détecté une erreur technique YouCanSetOptionDolibarrMainProdToZero=You can read log file or set option $dolibarr_main_prod to '0' in your config file to get more information. -InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to remove such notices) +InformationToHelpDiagnose=Voici les informations qui pourront aider au diagnostic (Vous pouvez fixer l'option $dolibarr_main_prod sur '1' pour supprimer quelques notifications) MoreInformation=Plus d'information TechnicalInformation=Informations techniques TechnicalID=Numéro technique @@ -266,10 +266,10 @@ DateApprove2=Date approbation (deuxième approbation) RegistrationDate=Date d'inscription UserCreation=Création de l'utilisateur UserModification=Modification de l'utilisateur -UserValidation=Validation user +UserValidation=Validation de l'utilisateur UserCreationShort=Création de l'utilisateur UserModificationShort=Modification de l'utilisateur -UserValidationShort=Valid. user +UserValidationShort=Utilisateur actif DurationYear=an DurationMonth=mois DurationWeek=semaine @@ -374,15 +374,15 @@ TotalLT1IN=Total CGST TotalLT2IN=Total SGST HT=HT TTC=TTC -INCVATONLY=Inc. VAT +INCVATONLY=TVA incluse INCT=TTC VAT=TVA VATIN=IGST VATs=TVA -VATINs=IGST taxes -LT1=Sales tax 2 +VATINs=Taxes IGST +LT1=Taxe de vente 2 LT1Type=Type de la taxe de vente 2 -LT2=Sales tax 3 +LT2=Taxe de vente 3 LT2Type=Type de la taxe de vente 3 LT1ES=RE LT2ES=IRPF @@ -425,7 +425,7 @@ ContactsAddressesForCompany=Contacts/adresses de ce tiers AddressesForCompany=Adresses de ce tiers ActionsOnCompany=Événements vis à vis de ce tiers ActionsOnMember=Événements vis à vis de cet adhérent -ActionsOnProduct=Events about this product +ActionsOnProduct=Événements liés au produit NActionsLate=%s en retard RequestAlreadyDone=Requête déjà enregistrée Filter=Filtre @@ -548,8 +548,20 @@ MonthShort09=Sep. MonthShort10=Oct. MonthShort11=Nov. MonthShort12=Déc. +MonthVeryShort01=J +MonthVeryShort02=F +MonthVeryShort03=L +MonthVeryShort04=A +MonthVeryShort05=M +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=S +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Fichiers et documents joints -JoinMainDoc=Join main document +JoinMainDoc=Joindre le document principal DateFormatYYYYMM=YYYY-MM DateFormatYYYYMMDD=YYYY-MM-DD DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS @@ -678,7 +690,7 @@ Page=Page Notes=Notes AddNewLine=Ajout nouvelle ligne AddFile=Ajouter fichier -FreeZone=N'est pas un produit/service prédéfini +FreeZone=Produit/service non prédéfini FreeLineOfType=Ligne libre de type CloneMainAttributes=Cloner l'objet avec ces attributs principaux PDFMerge=Fusion PDF @@ -726,7 +738,7 @@ LinkToIntervention=Lier à une intervention CreateDraft=Créer brouillon SetToDraft=Retour en brouillon ClickToEdit=Cliquer ici pour éditer -EditWithEditor=Edit with CKEditor +EditWithEditor=Editer avec CKEditor EditWithTextEditor=Éditer avec l'éditeur de texte EditHTMLSource=Éditer la source HTML ObjectDeleted=Objet %s supprimé @@ -762,7 +774,7 @@ SetBankAccount=Définir compte bancaire AccountCurrency=Devise du compte ViewPrivateNote=Voir les notes XMoreLines=%s ligne(s) cachées -ShowMoreLines=Afficher plus +ShowMoreLines=Afficher plus/moins de lignes PublicUrl=URL publique AddBox=Ajouter boite SelectElementAndClick=Sélectionnez un élément et cliquez %s @@ -790,8 +802,8 @@ TooManyRecordForMassAction=Trop d'enregistrements sélectionnés pour l'action d NoRecordSelected=Aucu enregistrement sélectionné MassFilesArea=Zone des fichiers générés en masse ShowTempMassFilesArea=Afficher la zone des fichiers générés en masse -ConfirmMassDeletion=Bulk delete confirmation -ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ? +ConfirmMassDeletion=Confirmation de suppression en masse +ConfirmMassDeletionQuestion=Êtes-vous sur de vouloir supprimer la %s valeur sélectionnée ? RelatedObjects=Objets liés ClassifyBilled=Classer facturé Progress=Progression @@ -813,7 +825,7 @@ SomeTranslationAreUncomplete=Certains languages pourraient n'être que partielle DirectDownloadLink=Lien de téléchargement direct (public/externe) DirectDownloadInternalLink=Lien de téléchargement direct (requiert d'être logué et autorisé) Download=Téléchargement -DownloadDocument=Download document +DownloadDocument=Télécharger le document ActualizeCurrency=Mettre à jour le taux de devise Fiscalyear=Exercice fiscal ModuleBuilder=Générateur de Module @@ -822,7 +834,7 @@ BulkActions=Actions de masse ClickToShowHelp=Cliquez pour montrer l'info-bulle d'aide WebSite=Site web WebSites=Sites web -WebSiteAccounts=Web site accounts +WebSiteAccounts=Comptes du site web ExpenseReport=Note de frais ExpenseReports=Notes de frais HR=HR @@ -830,10 +842,10 @@ HRAndBank=HR et banque AutomaticallyCalculated=Calculé automatiquement TitleSetToDraft=Retour à l'état de brouillon ConfirmSetToDraft=Etes vous sûr de vouloir revenir à l'état Brouillon ? -ImportId=Import id +ImportId=Id import Events=Événements EMailTemplates=Modèles des courriels -FileNotShared=File not shared to exernal public +FileNotShared=Fichier non partagé en public Project=Projet Projects=Projets Rights=Permissions @@ -873,7 +885,7 @@ Select2NotFound=Aucun enregistrement trouvé Select2Enter=Entrez Select2MoreCharacter=caractère ou plus Select2MoreCharacters=caractères ou plus -Select2MoreCharactersMore=Search syntax:
| OR (a|b)
* Any character (a*b)
^ Start with (^ab)
$ End with (ab$)
+Select2MoreCharactersMore=Syntaxe de recherche:
| OU (a|b)
* n'importe quel caractère (a*b)
^ Commence par (^ab)
$ Finit par (ab$)
Select2LoadingMoreResults=Charger plus de résultats... Select2SearchInProgress=Recherche en cours... SearchIntoThirdparties=Tiers @@ -896,7 +908,7 @@ SearchIntoExpenseReports=Notes de frais SearchIntoLeaves=Congés CommentLink=Commentaires NbComments=Nombre de commentaires -CommentPage=Comments space +CommentPage=Commentaires CommentAdded=Commentaire ajouté CommentDeleted=Commentaire supprimé Everybody=Tout le monde diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang index cc9fb4b660d..38b9cc35245 100644 --- a/htdocs/langs/fr_FR/members.lang +++ b/htdocs/langs/fr_FR/members.lang @@ -58,10 +58,10 @@ PaymentSubscription=Paiement cotisation SubscriptionEndDate=Date de fin adhésion MembersTypeSetup=Configuration des types d'adhérents MemberTypeModified=Type d'adhérent modifié -DeleteAMemberType=Delete a member type -ConfirmDeleteMemberType=Are you sure you want to delete this member type? +DeleteAMemberType=Supprimer un type d'adhérent +ConfirmDeleteMemberType=Êtes-vous sur de vouloir supprimer cet adhérent ? MemberTypeDeleted=Type d'adhérent supprimé -MemberTypeCanNotBeDeleted=Member type can not be deleted +MemberTypeCanNotBeDeleted=Ce type d'adhérent ne peut pas être supprimé NewSubscription=Nouvelle adhésion NewSubscriptionDesc=Ce formulaire permet de vous inscrire comme nouvel adhérent de l'association. Pour un renouvellement (si vous êtes déjà adhérent), contactez plutôt l'association par email %s. Subscription=Adhésion/cotisation diff --git a/htdocs/langs/fr_FR/modulebuilder.lang b/htdocs/langs/fr_FR/modulebuilder.lang index c508d2e5204..ad72e5dc09e 100644 --- a/htdocs/langs/fr_FR/modulebuilder.lang +++ b/htdocs/langs/fr_FR/modulebuilder.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - loan ModuleBuilderDesc=Cet outil est réservé aux utilisateurs avancés ou développeurs. Il donne accès aux outil de création ou d'édition de modules additionnels (Cliquez ici pour plus d'information). -EnterNameOfModuleDesc=Saisissez le nom du module (sans espace) pour le créer. Utilisez les majuscules pour identifier les mots (par exemple : MonModule, BoutiqueECommerce,...) +EnterNameOfModuleDesc=Saisissez le nom du module/application à créer, sans espaces. Utilisez les majuscules pour identifier les mots (par exemple : MonModule, BoutiqueECommerce,...) EnterNameOfObjectDesc=Entrez le nom de l'objet à créer sans espaces. Utilisez les majuscules pour séparer des mots (par exemple: MyObject, Student, Teacher ...). Le fichier de classe CRUD, mais aussi le fichier API, les pages à afficher / ajouter / éditer / supprimer des objets et des fichiers SQL seront générés. ModuleBuilderDesc2=Chemin ou les modules sont générés/modifiés ( premier répertoire alternatif défini dans %s):%s ModuleBuilderDesc3=Modules générés/éditables trouvés : %s @@ -58,7 +58,7 @@ ArrayOfKeyValuesDesc=Tableau des clés et valeurs si le champ est une liste à c WidgetFile=Fichier Widget ReadmeFile=Fichier Readme ChangeLog=Fichier ChangeLog -TestClassFile=File for PHP Unit Test class +TestClassFile=Fichier de tests unitaires PHP SqlFile=Fichier SQL PageForLib=Fichier pour les librairies PHP SqlFileExtraFields=Fichier SQL pour les attributs complémentaires @@ -86,9 +86,9 @@ SeeIDsInUse=Voir les IDs utilisés dans votre installation SeeReservedIDsRangeHere=Voir la plage des ID réservés ToolkitForDevelopers=Boîte à outils pour développeurs Dolibarr TryToUseTheModuleBuilder=If you have knowledge in SQL and PHP, you can try to use the native module builder wizard. Just enable the module and use the wizard by clicking the on the top right menu. Warning: This is a developer feature, bad use may breaks your application. -SeeTopRightMenu=See on the top right menu +SeeTopRightMenu=Voir à droite de votre barre de menu principal AddLanguageFile=Ajouter le fichier de langue YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages") DropTableIfEmpty=(Delete table if empty) -TableDoesNotExists=The table %s does not exists -TableDropped=Table %s deleted +TableDoesNotExists=La table %s n'existe pas +TableDropped=La table %s a été supprimée diff --git a/htdocs/langs/fr_FR/opensurvey.lang b/htdocs/langs/fr_FR/opensurvey.lang index a4d3bbc09cb..bd4b51b1d6a 100644 --- a/htdocs/langs/fr_FR/opensurvey.lang +++ b/htdocs/langs/fr_FR/opensurvey.lang @@ -57,4 +57,4 @@ ErrorInsertingComment=Il y a eu une erreur à l'enregistrement de votre commenta MoreChoices=Entrez plus de choix pour les votants SurveyExpiredInfo=Le sondage a été fermé ou le délai de vote est expiré EmailSomeoneVoted=%s a rempli une ligne.\nVous pouvez trouver le sondage via le lien:\n%s -ShowSurvey=Show survey +ShowSurvey=Afficher le sondage diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang index 99ac2485f20..231c2f382e7 100644 --- a/htdocs/langs/fr_FR/other.lang +++ b/htdocs/langs/fr_FR/other.lang @@ -3,7 +3,7 @@ SecurityCode=Code de sécurité NumberingShort=N° Tools=Outils TMenuTools=Outils -ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.

All the tools can be reached in the left menu. +ToolsDesc=Cet espace regroupe divers outils non accessibles par les autres entrées du menu.

La liste de ces outils est accessible depuis le menu sur le côté.. Birthday=Anniversaire BirthdayDate=Date anniversaire DateToBirth=Date de naissance @@ -19,15 +19,15 @@ TextNextMonthOfInvoice=Le mois suivant (texte) la date de facturation ZipFileGeneratedInto=Fichier zip généré dans %s DocFileGeneratedInto=Fichier doc généré dans %s. JumpToLogin=Déconnecté. Aller à la page de connexion ... -MessageForm=Message on online payment form +MessageForm=Message sur l'écran de paiement en ligne MessageOK=Message sur page de retour de paiement validé MessageKO=Message sur page de retour de paiement annulé YearOfInvoice=Année de la date de facturation PreviousYearOfInvoice=Année précédente de la date de facturation NextYearOfInvoice=Année suivante de la date de facturation -DateNextInvoiceBeforeGen=Date of next invoice (before generation) -DateNextInvoiceAfterGen=Date of next invoice (after generation) +DateNextInvoiceBeforeGen=Date de la prochaine génération (avant génération) +DateNextInvoiceAfterGen=Date de la prochaine facture (après génération) Notify_FICHINTER_ADD_CONTACT=Contact ajouté à l'intervention Notify_FICHINTER_VALIDATE=Validation fiche intervention @@ -76,7 +76,7 @@ MaxSize=Taille maximum AttachANewFile=Ajouter un nouveau fichier/document LinkedObject=Objet lié NbOfActiveNotifications=Nombre de notifications (nb de destinataires emails) -PredefinedMailTest=__(Bonjour)__,\nCeci est un mail de test envoyé à __EMAIL__.\nLes deux lignes sont séparées par un saut de ligne.\n\n__USER_SIGNATURE__ +PredefinedMailTest=__(Hello)__,\nCeci est un mail de test envoyé à __EMAIL__.\nLes deux lignes sont séparées par un saut de ligne.\n\n__USER_SIGNATURE__ PredefinedMailTestHtml=__(Hello)__\nCeci est un message de test (le mot test doit être en gras).
Les 2 lignes sont séparées par un retour à la ligne.

__SIGNATURE__ PredefinedMailContentSendInvoice=__(Hello)__\n\nVeuillez trouver, ci-joint, la facture __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nNous voulons porter à votre connaissance le fait que la facture __REF__ semble non payée. Aussi, voici la facture à nouveau en pièce jointe pour rappel.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__ @@ -225,6 +225,8 @@ IfAmountHigherThan=Si le montant est supérieur à %s SourcesRepository=Répertoire pour les sources Chart=Graphique PassEncoding=Codage du mot de passe +PermissionsAdd=Permissions ajoutés +PermissionsDelete=Permissions retirées ##### Export ##### ExportsArea=Espace exports diff --git a/htdocs/langs/fr_FR/paypal.lang b/htdocs/langs/fr_FR/paypal.lang index 3747f46cd7b..5e9ba594b9d 100644 --- a/htdocs/langs/fr_FR/paypal.lang +++ b/htdocs/langs/fr_FR/paypal.lang @@ -15,7 +15,7 @@ ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page ThisIsTransactionId=Voici l'identifiant de la transaction: %s PAYPAL_ADD_PAYMENT_URL=Ajouter l'URL de paiement Paypal lors de l'envoi d'un document par email PredefinedMailContentLink=Vous pouvez cliquer sur le lien sécurisé ci-dessous pour effectuer votre paiement (Paypal) si ce dernier n'a pas encore été fait.\n\n%s\n\n -YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode +YouAreCurrentlyInSandboxMode=Vous travaillez actuellement dans le mode "bac à sable" de %s NewOnlinePaymentReceived=Nouveau paiement en ligne reçu NewOnlinePaymentFailed=Nouvelle tentative de paiement en ligne échouée ONLINE_PAYMENT_SENDEMAIL=Email à prévenir en cas de paiement (succès ou non) diff --git a/htdocs/langs/fr_FR/printing.lang b/htdocs/langs/fr_FR/printing.lang index 111a61872f6..434f43fdeb7 100644 --- a/htdocs/langs/fr_FR/printing.lang +++ b/htdocs/langs/fr_FR/printing.lang @@ -9,8 +9,8 @@ PrintingDriverDesc=Paramètres de configuration pour le driver d'impression ListDrivers=Liste des drivers PrintTestDesc=Liste des imprimantes FileWasSentToPrinter=Le fichier %s a été envoyé à l'imprimante -ViaModule=via the module -NoActivePrintingModuleFound=No active driver to print document. Check setup of module %s. +ViaModule=via le module +NoActivePrintingModuleFound=Pas de driver actif pour imprimer le document. Vérifier la configuration du module %s PleaseSelectaDriverfromList=Sélection un driver dans la liste PleaseConfigureDriverfromList=Configurez le driver sélectionné depuis la liste SetupDriver=Configuration du driver diff --git a/htdocs/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang index 06167a5dec0..e9bb86ac121 100644 --- a/htdocs/langs/fr_FR/productbatch.lang +++ b/htdocs/langs/fr_FR/productbatch.lang @@ -21,4 +21,4 @@ ProductDoesNotUseBatchSerial=Ce produit n'utilise pas les numéros de lot/série ProductLotSetup=Configuration du module lot/série ShowCurrentStockOfLot=Afficher le stock actuel pour le couple produit / lot ShowLogOfMovementIfLot=Afficher l'historique des mouvements de couple produit / lot -StockDetailPerBatch=Stock detail per lot +StockDetailPerBatch=Stock détaillé par lot diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang index 16e7436f2c8..1737242f4ba 100644 --- a/htdocs/langs/fr_FR/products.lang +++ b/htdocs/langs/fr_FR/products.lang @@ -22,8 +22,8 @@ MassBarcodeInit=Initialisation codes-barre MassBarcodeInitDesc=Cette page peut être utilisée pour initialiser un code-barre sur des objets qui ne disposent pas de code-barre défini. Vérifiez avant que l'installation du module code-barres est complète. ProductAccountancyBuyCode=Code comptable (achat) ProductAccountancySellCode=Code comptable (vente) -ProductAccountancySellIntraCode=Accounting code (sale intra-community) -ProductAccountancySellExportCode=Accounting code (sale export) +ProductAccountancySellIntraCode=Code comptable (vente intra-communautaire) +ProductAccountancySellExportCode=Code comptable (vente à l'export) ProductOrService=Produit ou Service ProductsAndServices=Produits et Services ProductsOrServices=Produits ou Services @@ -143,7 +143,7 @@ RowMaterial=Matière première CloneProduct=Cloner produit/service ConfirmCloneProduct=Êtes-vous sûr de vouloir cloner le produit ou service %s ? CloneContentProduct=Cloner les informations générales du produit/service -ClonePricesProduct=Clone prices +ClonePricesProduct=Cloner les prix CloneCompositionProduct=Cloner le produits packagés CloneCombinationsProduct=Cloner les variantes ProductIsUsed=Ce produit est utilisé @@ -153,7 +153,7 @@ BuyingPrices=Prix d'achat CustomerPrices=Prix clients SuppliersPrices=Prix fournisseurs SuppliersPricesOfProductsOrServices=Prix fournisseurs (des produits ou services) -CustomCode=Customs/Commodity/HS code +CustomCode=Nomenclature douanière/Code SH CountryOrigin=Pays d'origine Nature=Nature ShortLabel=Libellé court @@ -202,8 +202,8 @@ UseMultipriceRules=Utilisation des règles de niveau de prix (définies dans la PercentVariationOver=%% de variation sur %s PercentDiscountOver=%% de remis sur %s KeepEmptyForAutoCalculation=Laisser vide pour un calcul automatique à partir des données de poids ou de volume des produits. -VariantRefExample=Example: COL -VariantLabelExample=Example: Color +VariantRefExample=Exemple : COL +VariantLabelExample=Exemple : couleur ### composition fabrication Build=Fabriquer ProductsMultiPrice=Produits et prix pour chaque niveau de prix @@ -287,8 +287,8 @@ ConfirmDeleteProductBuyPrice=Êtes-vous sur de vouloir supprimer ce prix d'achat SubProduct=Sous-produit ProductSheet=Fiche produit ServiceSheet=Fiche service -PossibleValues=Possible values -GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...) +PossibleValues=Valeurs possibles +GoOnMenuToCreateVairants=Allez sur le menu %s - %s pour ajouter les attributs de variantes (comme les couleurs, tailles, ...) #Attributes VariantAttributes=Attributs de variante diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang index 2d87db5bfb0..acfe6547395 100644 --- a/htdocs/langs/fr_FR/projects.lang +++ b/htdocs/langs/fr_FR/projects.lang @@ -76,7 +76,7 @@ Time=Temps ListOfTasks=Liste de tâches GoToListOfTimeConsumed=Aller à la liste des temps consommés GoToListOfTasks=Aller à la liste des tâches -GanttView=Gantt View +GanttView=Vue Gantt ListProposalsAssociatedProject=Liste des propositions commerciales associées au projet ListOrdersAssociatedProject=Liste des commandes clients associées au projet ListInvoicesAssociatedProject=Liste des factures clients associées au projet @@ -88,7 +88,7 @@ ListShippingAssociatedProject=Liste des expéditions associées avec le projet ListFichinterAssociatedProject=Liste des interventions associées au projet ListExpenseReportsAssociatedProject=Liste des notes de frais associées avec ce projet ListDonationsAssociatedProject=Liste des dons associés au projet -ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project +ListVariousPaymentsAssociatedProject=Liste des frais divers liés au projet ListActionsAssociatedProject=Liste des événements associés au projet ListTaskTimeUserProject=Liste du temps consommé sur les tâches d'un projet ActivityOnProjectToday=Activité projet aujourd'hui @@ -97,7 +97,7 @@ ActivityOnProjectThisWeek=Activité sur les projets cette semaine ActivityOnProjectThisMonth=Activité sur les projets ce mois ActivityOnProjectThisYear=Activité sur les projets cette année ChildOfProjectTask=Fille du projet/tâche -ChildOfTask=Child of task +ChildOfTask=Enfant de la tâche NotOwnerOfProject=Non responsable de ce projet privé AffectedTo=Affecté à CantRemoveProject=Ce projet ne peut être supprimé car il est référencé par de nombreux objets (factures, commandes ou autre). voir la liste sur l'onglet Reférents. @@ -109,7 +109,7 @@ AlsoCloseAProject=Fermer également le projet (laissez-le ouvert si vous devez s ReOpenAProject=Réouvrir projet ConfirmReOpenAProject=Êtes-vous sûr de vouloir rouvrir ce projet ? ProjectContact=Contacts projet -TaskContact=Task contacts +TaskContact=Contact de tâche ActionsOnProject=Événements sur le projet YouAreNotContactOfProject=Vous n'êtes pas contact de ce projet privé UserIsNotContactOfProject=L'utilisateur n'est pas un contact/adresse de ce projet privé @@ -117,7 +117,7 @@ DeleteATimeSpent=Suppression du temps consommé ConfirmDeleteATimeSpent=Êtes-vous sûr de vouloir supprimer ce temps consommé ? DoNotShowMyTasksOnly=Voir aussi les tâches qui ne me sont pas affectées ShowMyTasksOnly=Ne voir que les tâches qui me sont affectées -TaskRessourceLinks=Contacts task +TaskRessourceLinks=Contacts de la tâche ProjectsDedicatedToThisThirdParty=Projets dédiés à ce tiers NoTasks=Aucune tâche pour ce projet LinkedToAnotherCompany=Liés à autre société @@ -171,13 +171,13 @@ ProjectMustBeValidatedFirst=Le projet doit être validé d'abord FirstAddRessourceToAllocateTime=Affecter un utilisateur pour saisir des temps InputPerDay=Saisie par jour InputPerWeek=Saisie par semaine -InputDetail=Input detail +InputDetail=Saisir le détail TimeAlreadyRecorded=C'est le temps passé déjà enregistré pour cette tâche/jour et pour l'utilisateur %s ProjectsWithThisUserAsContact=Projets avec cet utilisateur comme contact TasksWithThisUserAsContact=Tâches assignées à cet utilisateur ResourceNotAssignedToProject=Non assigné au projet ResourceNotAssignedToTheTask=Non assigné à la tache -TimeSpentBy=Time spent by +TimeSpentBy=Temps consommé par TasksAssignedTo=Tâches assignées à AssignTaskToMe=M'assigner la tâche AssignTaskToUser=Assigner tâche à %s @@ -211,9 +211,12 @@ OppStatusPENDING=En attente OppStatusWON=Gagné OppStatusLOST=Perdu Budget=Budget +AllowToLinkFromOtherCompany=Allow to link project from other company

Supported values :
- Keep empty: Can link any project of the company (default)
- "all" : Can link any projects, even project of other companies
- A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
LatestProjects=Les %s derniers projets LatestModifiedProjects=Les %s derniers projets modifiés OtherFilteredTasks=Autres tâches filtrées +NoAssignedTasks=Aucune tâche assignée (assignez-vous le projet/tâche depuis la liste déroulante en haut pour pouvoir saisir du temps dessus) # Comments trans -AllowCommentOnTask=Allow user comments on tasks +AllowCommentOnTask=Autoriser les utilisateurs à ajouter des commentaires sur les tâches AllowCommentOnProject=Autoriser les commentaires utilisateur sur les projets + diff --git a/htdocs/langs/fr_FR/salaries.lang b/htdocs/langs/fr_FR/salaries.lang index f8d14ff8bb1..8e15fd2488c 100644 --- a/htdocs/langs/fr_FR/salaries.lang +++ b/htdocs/langs/fr_FR/salaries.lang @@ -13,5 +13,5 @@ TJM=Tarif journalier moyen CurrentSalary=Salaire actuel THMDescription=Cette valeur peut être utilisé pour calculer le coût horaire consommé dans un projet suivi par utilisateurs si le module projet est utilisé TJMDescription=Cette valeur est actuellement seulement une information et n'est utilisé pour aucun calcul -LastSalaries=Latest %s salary payments -AllSalaries=All salary payments +LastSalaries=Les %s derniers règlements de salaires +AllSalaries=Tous les règlements de salaires diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang index df1827a3baf..3c7fe6f6584 100644 --- a/htdocs/langs/fr_FR/stocks.lang +++ b/htdocs/langs/fr_FR/stocks.lang @@ -22,7 +22,7 @@ Movements=Mouvements ErrorWarehouseRefRequired=Le nom de référence de l'entrepôt est obligatoire ListOfWarehouses=Liste des entrepôts ListOfStockMovements=Liste des mouvements de stock -MovementId=Movement ID +MovementId=Id du mouvement StockMovementForId=ID mouvement %d ListMouvementStockProject=Liste des mouvements de stocks associés au projet StocksArea=Espace entrepôts @@ -56,7 +56,7 @@ IndependantSubProductStock=Le stock du produit et le stock des sous-produits son QtyDispatched=Quantité ventilée QtyDispatchedShort=Qté ventilée QtyToDispatchShort=Qté à ventiler -OrderDispatch=Item receipts +OrderDispatch=Biens reçus RuleForStockManagementDecrease=Règle de gestion des décrémentations automatiques de stock (la décrémentation manuelle est toujours possible, même si une décrémentation automatique est activée) RuleForStockManagementIncrease=Règle de gestion des incrémentations de stock (l'incrémentation manuelle est toujours possible, même si une incrémentation automatique est activée) DeStockOnBill=Décrémenter les stocks physiques sur validation des factures/avoirs clients @@ -72,7 +72,7 @@ NoPredefinedProductToDispatch=Pas de produits prédéfinis dans cet objet. Aucun DispatchVerb=Ventiler StockLimitShort=Limite pour alerte StockLimit=Limite stock pour alerte -StockLimitDesc=(empty) means no warning.
0 can be used for a warning as soon as stock is empty. +StockLimitDesc=(vide) n'affichera aucune icone d'alerte.
0 peut être saisi pour afficher une alerte en cas de stock nul. PhysicalStock=Stock physique RealStock=Stock réel RealStockDesc=Le stock physique ou réel est le stock présent dans les entrepôts. @@ -131,11 +131,11 @@ StockMustBeEnoughForInvoice=Le niveau de stock doit être suffisant pour ajouter StockMustBeEnoughForOrder=Le niveau de stock doit être suffisant pour ajouter ce produit/service à la commande (la vérification est faite sur le stock réel lors de l'ajout de la ligne de commande, quelquesoit la règle de modification automatique de stock) StockMustBeEnoughForShipment= Le niveau de stock doit être suffisant pour ajouter ce produit/service à l'expédition (la vérification est faite sur le stock réel lors de l'ajout de la ligne à l'expédition, quelquesoit la règle de modification automatique de stock) MovementLabel=Libellé du mouvement -DateMovement=Date of movement +DateMovement=Date de mouvement InventoryCode=Code mouvement ou inventaire IsInPackage=Inclus dans un package WarehouseAllowNegativeTransfer=Le stock peut être négatif -qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks. +qtyToTranferIsNotEnough=La quantité de produits dans l'entrepôt de départ n'est pas suffisante et votre configuration n'autorise pas un stock négatif ShowWarehouse=Afficher entrepôt MovementCorrectStock=Correction du stock pour le produit %s MovementTransferStock=Transfert de stock du produit %s dans un autre entrepôt @@ -177,7 +177,7 @@ SelectFournisseur=Filtre fournisseur inventoryOnDate=Inventaire INVENTORY_DISABLE_VIRTUAL=Autoriser à ne pas déstocker les produits enfants d'un kit dans l'inventaire INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Utiliser le prix d'achat si aucun dernier prix d'achat n'a pu être trouvé -INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement have date of inventory +INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Le mouvement de stock a la date d'inventaire inventoryChangePMPPermission=Autoriser à changer la valeur PMP d'un produit ColumnNewPMP=Nouvelle unité PMP OnlyProdsInStock=N'ajoutez pas un produit sans stock @@ -198,5 +198,5 @@ ExitEditMode=Quitter l'édition inventoryDeleteLine=Effacer ligne RegulateStock=Réguler le stock ListInventory=Liste -StockSupportServices=Stock management support services -StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service" +StockSupportServices=La gestion des stock s'applique aussi aux services +StockSupportServicesDesc=Par défaut, seul les produits/services de type "produit" peuvent bénéficier d'une gestion de stock. En activant ce paramètre, et si le module Services est activé, la gestion de stock pourra être appliquée aux articles de type "service". diff --git a/htdocs/langs/fr_FR/stripe.lang b/htdocs/langs/fr_FR/stripe.lang index 8af4fd7cb80..0ec18ab7f03 100644 --- a/htdocs/langs/fr_FR/stripe.lang +++ b/htdocs/langs/fr_FR/stripe.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - stripe StripeSetup=Configuration module Stripe -StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via Stripe. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...) +StripeDesc=Ce module offre des pages pour autoriser les paiements sur Stripe par les clients. Elles peuvent êtres utilisées pour un paiement libre ou un paiement sur un objet particulier de Dolibarr ( facture, commande, ... ) StripeOrCBDoPayment=Payez avec une carte bancaire ou Stripe FollowingUrlAreAvailableToMakePayments=Les URL suivantes sont disponibles pour permettre à un client de faire un paiement PaymentForm=Formulaire de paiement diff --git a/htdocs/langs/fr_FR/suppliers.lang b/htdocs/langs/fr_FR/suppliers.lang index d3e1a7e9594..2f9b93ff323 100644 --- a/htdocs/langs/fr_FR/suppliers.lang +++ b/htdocs/langs/fr_FR/suppliers.lang @@ -43,5 +43,5 @@ NotTheGoodQualitySupplier=Mauvaise qualité ReputationForThisProduct=Réputation BuyerName=Nom de l'acheteur AllProductServicePrices=Tous les prix du produits / service -AllProductReferencesOfSupplier=All product / service references of supplier +AllProductReferencesOfSupplier=Toutes les références des produits/services du fournisseur BuyingPriceNumShort=Prix fournisseurs diff --git a/htdocs/langs/fr_FR/trips.lang b/htdocs/langs/fr_FR/trips.lang index a9a2631ac00..3b4a7fad4e3 100644 --- a/htdocs/langs/fr_FR/trips.lang +++ b/htdocs/langs/fr_FR/trips.lang @@ -10,8 +10,8 @@ ListOfFees=Liste des notes de frais TypeFees=Types de déplacement et notes de frais ShowTrip=Afficher la note de frais NewTrip=Nouvelle note de frais -LastExpenseReports=Latest %s expense reports -AllExpenseReports=All expense reports +LastExpenseReports=Les %s dernières notes de frais +AllExpenseReports=Toutes les notes de frais CompanyVisited=Société/organisation visitée FeesKilometersOrAmout=Montant ou kilomètres DeleteTrip=Supprimer les notes de frais / déplacements @@ -49,29 +49,29 @@ TF_PEAGE=Péage TF_ESSENCE=Carburant TF_HOTEL=Hôtel TF_TAXI=Taxi -EX_KME=Mileage costs -EX_FUE=Fuel CV +EX_KME=frais kilométriques +EX_FUE=Carburant EX_HOT=Hôtel -EX_PAR=Parking CV -EX_TOL=Toll CV +EX_PAR=Stationnement +EX_TOL=Péage EX_TAX=Taxes diverses -EX_IND=Indemnity transportation subscription -EX_SUM=Maintenance supply -EX_SUO=Office supplies -EX_CAR=Car rental +EX_IND=Indemnité de transport +EX_SUM=Frais d'entretien +EX_SUO=Fournitures administratives +EX_CAR=Location de voiture EX_DOC=Documentation -EX_CUR=Customers receiving -EX_OTR=Other receiving -EX_POS=Postage -EX_CAM=CV maintenance and repair -EX_EMM=Employees meal -EX_GUM=Guests meal +EX_CUR=Réception clients +EX_OTR=Autres réceptions +EX_POS=Frais d'expédition +EX_CAM=Entretien et réparation +EX_EMM=Frais de bouche +EX_GUM=Repas invités EX_BRE=Petit déjeuner -EX_FUE_VP=Fuel PV -EX_TOL_VP=Toll PV -EX_PAR_VP=Parking PV -EX_CAM_VP=PV maintenance and repair -DefaultCategoryCar=Default transportation mode +EX_FUE_VP=Carburant +EX_TOL_VP=Péage +EX_PAR_VP=Stationnement +EX_CAM_VP=Entretien et réparation +DefaultCategoryCar=Mode de déplacement par défaut DefaultRangeNumber=Default range number ErrorDoubleDeclaration=Vous avez déclaré une autre note de frais dans une période similaire. @@ -114,43 +114,43 @@ ExpenseReportsToApprove=Notes de frais à approuver ExpenseReportsToPay=Notes de frais à payer CloneExpenseReport=Cloner la note de frais ConfirmCloneExpenseReport=Êtes-vous sûr de vouloir cloner cette note de frais ? -ExpenseReportsIk=Expense report milles index -ExpenseReportsRules=Expense report rules +ExpenseReportsIk=index des frais kilométriques des notes de frais +ExpenseReportsRules=Règle de note de frais ExpenseReportIkDesc=You can modify the calculation of kilometers expense by category and range who they are previously defined. d is the distance in kilometers -ExpenseReportRulesDesc=You can create or update any rules of calculation. This part will be used when user will create a new expense report +ExpenseReportRulesDesc=Vous pouvez créer ou mettre à jour toutes les règles de calcul. Cette règle sera utilisée à la création d'une note de frais par un utilisateur. expenseReportOffset=Décalage expenseReportCoef=Coefficient -expenseReportTotalForFive=Example with d = 5 +expenseReportTotalForFive=Exemple avec d = 5 expenseReportRangeFromTo=de %d à %d -expenseReportRangeMoreThan=more than %d -expenseReportCoefUndefined=(value not defined) -expenseReportCatDisabled=Category disabled - see the c_exp_tax_cat dictionary +expenseReportRangeMoreThan=Plus de %d +expenseReportCoefUndefined=(valeur non définie) +expenseReportCatDisabled=Catégorie désactivée - Voir la dictionnaire c_exp_tax_cat dictionary expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionay expenseReportPrintExample=offset + (d x coef) = %s -ExpenseReportApplyTo=Apply to -ExpenseReportDomain=Domain to apply -ExpenseReportLimitOn=Limit on +ExpenseReportApplyTo=Appliquer à +ExpenseReportDomain=Nom de domaine à utiliser +ExpenseReportLimitOn=Limite sur ExpenseReportDateStart=Date début ExpenseReportDateEnd=Date fin ExpenseReportLimitAmount=Montant limite ExpenseReportRestrictive=Restrictive AllExpenseReport=Tout type de note de frais -OnExpense=Expense line -ExpenseReportRuleSave=Expense report rule saved +OnExpense=Ligne de dépense +ExpenseReportRuleSave=Règle de calcul enregistrée ExpenseReportRuleErrorOnSave=Erreur: %s -RangeNum=Range %d +RangeNum=Plage %d ExpenseReportConstraintViolationError=Constraint violation id [%s]: %s is superior to %s %s -byEX_DAY=by day (limitation to %s) -byEX_MON=by month (limitation to %s) -byEX_YEA=by year (limitation to %s) -byEX_EXP=by line (limitation to %s) +byEX_DAY=par jour (limité à %s) +byEX_MON=par mois (limité à%s) +byEX_YEA=par an (limité à %s) +byEX_EXP=par ligne (limité à %s) ExpenseReportConstraintViolationWarning=Constraint violation id [%s]: %s is superior to %s %s -nolimitbyEX_DAY=by day (no limitation) -nolimitbyEX_MON=by month (no limitation) -nolimitbyEX_YEA=by year (no limitation) -nolimitbyEX_EXP=by line (no limitation) +nolimitbyEX_DAY=par jour (sans limite) +nolimitbyEX_MON=par mois (sans limite) +nolimitbyEX_YEA=par an (sans limite) +nolimitbyEX_EXP=par ligne (sans limite) -CarCategory=Category of car -ExpenseRangeOffset=Offset amount: %s -RangeIk=Mileage range +CarCategory=Catégorie de voiture +ExpenseRangeOffset=Montant décalage: %s +RangeIk=Barème kilométrique diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang index a937a320c11..68e4c1d2200 100644 --- a/htdocs/langs/fr_FR/users.lang +++ b/htdocs/langs/fr_FR/users.lang @@ -97,7 +97,7 @@ UseTypeFieldToChange=Modifier le champ Type pour changer OpenIDURL=URL OpenID LoginUsingOpenID=Se connecter par OpenID WeeklyHours=Heures de travail (par semaine) -ExpectedWorkedHours=Expected worked hours per week +ExpectedWorkedHours=Heures de travail prévues par semaine ColorUser=Couleur de l'utilisateur DisabledInMonoUserMode=Désactivé en mode maintenance UserAccountancyCode=Code comptable de l'utilisateur diff --git a/htdocs/langs/fr_FR/website.lang b/htdocs/langs/fr_FR/website.lang index daa54f635ce..de951903e25 100644 --- a/htdocs/langs/fr_FR/website.lang +++ b/htdocs/langs/fr_FR/website.lang @@ -3,15 +3,17 @@ Shortname=Code WebsiteSetupDesc=Créer ici autant d'entrée que de nombre différents de sites web que nécessaire.\nEnsuite, aller dans le menu Sites Web pour les éditer. DeleteWebsite=Effacer site web ConfirmDeleteWebsite=Êtes-vous sûr de vouloir supprimer ce site web. Toutes les pages et le contenu seront également supprimés. +WEBSITE_TYPE_CONTAINER=Type de page / conteneur WEBSITE_PAGENAME=Nom/alias de la page -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL du fichier de la feuille de style (CSS) externe WEBSITE_CSS_INLINE=Contenu du fichier CSS (commun à toute les pages) WEBSITE_JS_INLINE=Contenu du fichier Javascript (commun à toutes les pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Fichier robot (robots.txt) WEBSITE_HTACCESS=Fichier .htaccess du site web +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Nom ou alias de la page.
Cet alias est également utilisé pour forger une URL SEO lorsque le site Web est exécuté à partir d'un hôte virtuel d'un serveur Web (comme Apache, Nginx, ...). Utilisez le bouton "%s" pour modifier cet alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Répertoire de médias EditCss=Editer l'en-tête HTML ou Style/CSS EditMenu=Modifier menu @@ -37,23 +39,28 @@ PreviewSiteServedByWebServer=Prévisualiser %s dans un nouvel onglet.

. L PreviewSiteServedByDolibarr=Aperçu %s dans un nouvel onglet.

Le %s sera servi par le serveur Dolibarr donc aucun serveur Web supplémentaire (comme Apache, Nginx, IIS) n'est nécessaire.
L'inconvénient est que l'URL des pages ne sont pas sexy et commencent par un chemin de votre Dolibarr.
URL servie par Dolibarr:
%s

Pour utiliser votre propre serveur web externe pour servir ce site web, créez un virtual host sur vote serveur web qui pointe sur le répertoire
%s
ensuite entrez le nom de ce virtual host et cliquer sur le bouton d'affichage de l'aperçu. VirtualHostUrlNotDefined=URL du virtual host servit par le serveur web externe non défini NoPageYet=Pas de page pour l'instant -SyntaxHelp=Help on specific syntax tips -YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

You can also include content of another Page/Container with the following syntax:
<?php includeContainer('alias_of_container_to_include.php'); ?>

To include a link to download a file stored into the documents directory, use the document.php wrapper:
Example, for a file into documents/ecm (need to be logged), syntax is:
<a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
For a file shared with a share link (open access using the sharing hash key of file), syntax is:
<a href="/document.php?hashp=publicsharekeyoffile">
For a file into documents/medias (open directory for public access), syntax is:
<a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

To include an image stored into the documents directory, use the viewimage.php wrapper:
Example, for an image into documents/medias (open access), syntax is:
<a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
+SyntaxHelp=Aide sur quelques astuces spécifiques de syntaxe +YouCanEditHtmlSourceckeditor=Vous pouvez éditer le code source en activant l'éditeur HTML avec le bouton "Source". +YouCanEditHtmlSource=
You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

You can also include content of another Page/Container with the following syntax:
<?php includeContainer('alias_of_container_to_include'); ?>

To include a link to download a file stored into the documents directory, use the document.php wrapper:
Example, for a file into documents/ecm (need to be logged), syntax is:
<a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
For a file into documents/medias (open directory for public access), syntax is:
<a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
For a file shared with a share link (open access using the sharing hash key of file), syntax is:
<a href="/document.php?hashp=publicsharekeyoffile">

To include an image stored into the documents directory, use the viewimage.php wrapper:
Example, for an image into documents/medias (open access), syntax is:
<a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
ClonePage=Cloner la page/contenair CloneSite=Cloner le site -SiteAdded=Web site added +SiteAdded=Site web ajouté ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page. PageIsANewTranslation=La nouvelle page est une traduction de la page en cours ? LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page. -ParentPageId=Parent page ID +ParentPageId=Id de la page parent WebsiteId=ID site web CreateByFetchingExternalPage=Create page/container by fetching page from external URL... -OrEnterPageInfoManually=Or create empty page from scratch... +OrEnterPageInfoManually=Ou créer une nouvelle page FetchAndCreate=Récupérer et Créer ExportSite=Exporter site IDOfPage=Id de page +Banner=Bandeau +BlogPost=Article de Blog WebsiteAccount=Web site account -WebsiteAccounts=Web site accounts -AddWebsiteAccount=Create web site account +WebsiteAccounts=Comptes du site web +AddWebsiteAccount=Créer un compte sur le site web BackToListOfThirdParty=Retour à la liste pour le Tiers +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/fr_FR/withdrawals.lang b/htdocs/langs/fr_FR/withdrawals.lang index 981cbf9da02..8d4b3ab1177 100644 --- a/htdocs/langs/fr_FR/withdrawals.lang +++ b/htdocs/langs/fr_FR/withdrawals.lang @@ -12,7 +12,7 @@ WithdrawalsLines=Lignes de prélèvements RequestStandingOrderToTreat=Demandes de prélèvements à traiter RequestStandingOrderTreated=Demandes de prélèvements traitées NotPossibleForThisStatusOfWithdrawReceiptORLine=Fonction non disponible. Le statut du bon de prélèvement doit être mis 'à créditer' avant d'effectuer un rejet sur des lignes spécifiques. -NbOfInvoiceToWithdraw=Nb. of qualified invoice with waiting direct debit order +NbOfInvoiceToWithdraw=Nombre de factures qualifiées en attente de prélèvement NbOfInvoiceToWithdrawWithInfo=Nombre de factures en attente de prélèvement pour les clients ayant des informations bancaires définies InvoiceWaitingWithdraw=Factures en attente de prélèvement AmountToWithdraw=Somme à prélever @@ -74,7 +74,7 @@ IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Toutefois, si la facture a au moins u DoStandingOrdersBeforePayments=Cet onglet vous permet de demander un prélèvement. Une fois la demande faite, allez dans le menu Banque->Prélèvement pour gérer l'ordre de prélèvement. Lorsque l'ordre de paiement est fermé, le paiement sur la facture sera automatiquement enregistrée, et la facture fermée si le reste à payer est nul. WithdrawalFile=Fichier de prélèvement SetToStatusSent=Mettre au statut "Fichier envoyé" -ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null +ThisWillAlsoAddPaymentOnInvoice=Cette action enregistrera les règlements des factures et les classera au statut "Payé" si le solde est nul StatisticsByLineStatus=Statistiques par statut des lignes RUM=RUM RUMLong=Référence Unique de Mandat diff --git a/htdocs/langs/fr_FR/workflow.lang b/htdocs/langs/fr_FR/workflow.lang index a05bc8db4df..154d1aaf3d7 100644 --- a/htdocs/langs/fr_FR/workflow.lang +++ b/htdocs/langs/fr_FR/workflow.lang @@ -8,13 +8,13 @@ descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Créer automatiquement une facture client descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Créer une facture client automatiquement à la validation d'un contrat descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Créer automatiquement une facture client à la cloture d'un commande (la facture sera du même montant que la commande) # Autoclassify customer proposal or order -descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classer la/les proposition(s) commerciale(s) source(s) facturée(s) au classement facturé de la commande (et si le montant des deux documents est le même) -descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classer la/les proposition(s) commerciale(s) facturée(s) à la validation d'une facture client (si la facture est du même montant que la commande) -descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classer la/les commande(s) client(s) source(s) facturée à la validation de la facture client (et si le montant des deux documents est le même) -descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classer la/les commande(s) client(s) source(s) facturée au classement payé de la facture client (et si le montant des deux documents est le même) -descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update) +descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classer la/les proposition(s) commerciale(s) source(s) facturée(s) au classement facturé de la commande (et si le montant de la commande est le même que le total des propositions liées) +descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classer la/les proposition(s) commerciale(s) source facturée(s) à la validation d'une facture client (et si le montant de la facture est le même que la somme des propositions liées) +descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classer la/les commande(s) client(s) source(s) facturée(s) à la validation de la facture client (et si le montant de la facture est le même que le montant total des commandes liées) +descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classer la/les commande(s) client(s) source(s) à Facturée quand une facture client est passée à Payé (et si le montant de la facture est identique à la somme des commandes sources) +descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classer la commande source à expédiée à la validation d'une expédition (et si les quantités expédiées dans le bon d'expédition sont les même que dans la commande mise à jour) # Autoclassify supplier order -descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals) -descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders) +descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classer la ou les proposition(s) commerciale(s) fournisseur sources facturées quand une facture fournisseur est validée (et si le montant de la facture est le même que le total des propositions sources liées) +descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classer la ou les commande(s) fournisseur(s) de source(s) à facturée(s) lorsque la facture fournisseur est validée (et si le montant de la facture est le même que le montant total des commandes liées) AutomaticCreation=Création automatique AutomaticClassification=Classification automatique From aad0da25134dd51c4fb78d3be652ed2ef5a3fda2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 21 Dec 2017 16:50:18 +0100 Subject: [PATCH 0018/1074] Fix maxi debug of APIs (clean output fields) --- htdocs/adherents/class/api_members.class.php | 4 +- .../class/api_memberstypes.class.php | 2 +- .../class/api_subscriptions.class.php | 2 +- htdocs/api/class/api.class.php | 49 +- .../categories/class/api_categories.class.php | 2 +- .../comm/propal/class/api_proposals.class.php | 10 +- htdocs/comm/propal/class/propal.class.php | 5 + htdocs/commande/class/api_orders.class.php | 20 +- htdocs/commande/class/commande.class.php | 4 +- .../bank/class/api_bankaccounts.class.php | 2 +- .../facture/class/api_invoices.class.php | 20 +- htdocs/compta/facture/class/facture.class.php | 2 +- htdocs/contrat/class/api_contracts.class.php | 9 +- htdocs/contrat/class/contrat.class.php | 1 + htdocs/core/lib/functions2.lib.php | 3 + .../expedition/class/api_shipments.class.php | 659 ++++++++++++++++++ htdocs/expedition/class/expedition.class.php | 44 +- .../class/api_expensereports.class.php | 6 +- htdocs/societe/class/api_contacts.class.php | 25 + .../societe/class/api_thirdparties.class.php | 3 + htdocs/user/class/api_users.class.php | 2 +- 21 files changed, 828 insertions(+), 46 deletions(-) create mode 100644 htdocs/expedition/class/api_shipments.class.php diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php index 453b45f59b3..217ab47c0ab 100644 --- a/htdocs/adherents/class/api_members.class.php +++ b/htdocs/adherents/class/api_members.class.php @@ -225,13 +225,13 @@ class Members extends DolibarrApi // If there is no error, update() returns the number of affected rows // so if the update is a no op, the return value is zero. - if($member->update(DolibarrApiAccess::$user) >= 0) + if ($member->update(DolibarrApiAccess::$user) >= 0) { return $this->get($id); } else { - throw new RestException(500, $this->task->error); + throw new RestException(500, $member->error); } } diff --git a/htdocs/adherents/class/api_memberstypes.class.php b/htdocs/adherents/class/api_memberstypes.class.php index 6e793d7229d..26d3d115f75 100644 --- a/htdocs/adherents/class/api_memberstypes.class.php +++ b/htdocs/adherents/class/api_memberstypes.class.php @@ -209,7 +209,7 @@ class MembersTypes extends DolibarrApi } else { - throw new RestException(500, $this->task->error); + throw new RestException(500, $membertype->error); } } diff --git a/htdocs/adherents/class/api_subscriptions.class.php b/htdocs/adherents/class/api_subscriptions.class.php index 60a243e6d90..3ae4f6f39d5 100644 --- a/htdocs/adherents/class/api_subscriptions.class.php +++ b/htdocs/adherents/class/api_subscriptions.class.php @@ -198,7 +198,7 @@ class Subscriptions extends DolibarrApi } else { - throw new RestException(500, $this->task->error); + throw new RestException(500, $subscription->error); } } diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php index 66ab13bc8fb..df87efcd8c3 100644 --- a/htdocs/api/class/api.class.php +++ b/htdocs/api/class/api.class.php @@ -97,6 +97,7 @@ class DolibarrApi // Remove $db object property for object unset($object->db); unset($object->ismultientitymanaged); + unset($object->restrictiononfksoc); // Remove linkedObjects. We should already have linkedObjectIds that avoid huge responses unset($object->linkedObjects); @@ -104,7 +105,6 @@ class DolibarrApi unset($object->lignes); // we don't want lignes, we want only ->lines unset($object->fields); - unset($object->oldline); unset($object->error); @@ -141,6 +141,8 @@ class DolibarrApi unset($object->picto); unset($object->facturee); // Replace with billed + unset($object->fieldsforcombobox); + unset($object->comments); unset($object->skip_update_total); unset($object->context); @@ -157,23 +159,48 @@ class DolibarrApi unset($object->oldcopy); // If object has lines, remove $db property - if(isset($object->lines) && count($object->lines) > 0) { + if (isset($object->lines) && is_array($object->lines) && count($object->lines) > 0) { $nboflines = count($object->lines); for ($i=0; $i < $nboflines; $i++) { $this->_cleanObjectDatas($object->lines[$i]); + + unset($object->lines[$i]->contact); + unset($object->lines[$i]->contact_id); + unset($object->lines[$i]->country); + unset($object->lines[$i]->country_id); + unset($object->lines[$i]->country_code); + unset($object->lines[$i]->mode_reglement_id); + unset($object->lines[$i]->mode_reglement_code); + unset($object->lines[$i]->mode_reglement); + unset($object->lines[$i]->cond_reglement_id); + unset($object->lines[$i]->cond_reglement_code); + unset($object->lines[$i]->cond_reglement); + unset($object->lines[$i]->fk_delivery_address); + unset($object->lines[$i]->fk_projet); + unset($object->lines[$i]->thirdparty); + unset($object->lines[$i]->user); + unset($object->lines[$i]->model_pdf); + unset($object->lines[$i]->modelpdf); + unset($object->lines[$i]->note_public); + unset($object->lines[$i]->note_private); + unset($object->lines[$i]->fk_incoterms); + unset($object->lines[$i]->libelle_incoterms); + unset($object->lines[$i]->location_incoterms); + unset($object->lines[$i]->name); + unset($object->lines[$i]->lastname); + unset($object->lines[$i]->firstname); + unset($object->lines[$i]->civility_id); + unset($object->lines[$i]->fk_multicurrency); + unset($object->lines[$i]->multicurrency_code); + unset($object->lines[$i]->shipping_method_id); } } - // If object has linked objects, remove $db property - /* - if(isset($object->linkedObjects) && count($object->linkedObjects) > 0) { - foreach($object->linkedObjects as $type_object => $linked_object) { - foreach($linked_object as $object2clean) { - $this->_cleanObjectDatas($object2clean); - } - } - }*/ + if (! empty($object->thirdparty) && is_object($object->thirdparty)) + { + $this->_cleanObjectDatas($object->thirdparty); + } return $object; } diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php index ddf0495bcc1..46332f9f979 100644 --- a/htdocs/categories/class/api_categories.class.php +++ b/htdocs/categories/class/api_categories.class.php @@ -223,7 +223,7 @@ class Categories extends DolibarrApi } else { - throw new RestException(500, $this->task->error); + throw new RestException(500, $this->category->error); } } diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php index 160f6999c40..96e3e6d2509 100644 --- a/htdocs/comm/propal/class/api_proposals.class.php +++ b/htdocs/comm/propal/class/api_proposals.class.php @@ -389,12 +389,16 @@ class Proposals extends DolibarrApi throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); } + // TODO Check the lineid $lineid is a line of ojbect + $updateRes = $this->propal->deleteline($lineid); if ($updateRes > 0) { return $this->get($id); } - - return false; + else + { + throw new RestException(405, $this->propal->error); + } } /** @@ -442,7 +446,7 @@ class Proposals extends DolibarrApi } else { - throw new RestException(500, $this->task->error); + throw new RestException(500, $this->propal->error); } } diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 84ad5707fe2..1386baa6b45 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -804,6 +804,8 @@ class Propal extends CommonObject if ($this->statut == self::STATUS_DRAFT) { + $this->db->begin(); + $line=new PropaleLigne($this->db); // For triggers @@ -813,15 +815,18 @@ class Propal extends CommonObject { $this->update_price(1); + $this->db->commit(); return 1; } else { + $this->db->rollback(); return -1; } } else { + $this->error='ErrorDeleteLineNotAllowedByObjectStatus'; return -2; } } diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php index c15befe46e2..5d0f9722e37 100644 --- a/htdocs/commande/class/api_orders.class.php +++ b/htdocs/commande/class/api_orders.class.php @@ -372,19 +372,23 @@ class Orders extends DolibarrApi $result = $this->commande->fetch($id); if( ! $result ) { - throw new RestException(404, 'Commande not found'); + throw new RestException(404, 'Order not found'); } if( ! DolibarrApi::_checkAccessToResource('commande',$this->commande->id)) { throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); } - $request_data = (object) $request_data; + // TODO Check the lineid $lineid is a line of ojbect + $updateRes = $this->commande->deleteline(DolibarrApiAccess::$user,$lineid); if ($updateRes > 0) { return $this->get($id); } - return false; + else + { + throw new RestException(405, $this->commande->error); + } } /** @@ -434,7 +438,7 @@ class Orders extends DolibarrApi } else { - throw new RestException(500, $this->task->error); + throw new RestException(500, $this->commande->error); } } @@ -534,7 +538,7 @@ class Orders extends DolibarrApi * @url POST {id}/reopen * * @return int - * + * * @throws 304 * @throws 400 * @throws 401 @@ -545,7 +549,7 @@ class Orders extends DolibarrApi if(! DolibarrApiAccess::$user->rights->commande->creer) { throw new RestException(401); - } + } if(empty($id)) { throw new RestException(400, 'Order ID is mandatory'); } @@ -572,7 +576,7 @@ class Orders extends DolibarrApi * @url POST {id}/setinvoiced * * @return int - * + * * @throws 400 * @throws 401 * @throws 404 @@ -582,7 +586,7 @@ class Orders extends DolibarrApi if(! DolibarrApiAccess::$user->rights->commande->creer) { throw new RestException(401); - } + } if(empty($id)) { throw new RestException(400, 'Order ID is mandatory'); } diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 35ead22c32f..4d094712c57 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -2074,7 +2074,6 @@ class Commande extends CommonOrder */ function deleteline($user=null, $lineid=0) { - if ($this->statut == self::STATUS_DRAFT) { $this->db->begin(); @@ -2137,7 +2136,8 @@ class Commande extends CommonOrder } else { - return -1; + $this->error='ErrorDeleteLineNotAllowedByObjectStatus'; + return -1; } } diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php index 0da039a1a88..ffe01f41e7a 100644 --- a/htdocs/compta/bank/class/api_bankaccounts.class.php +++ b/htdocs/compta/bank/class/api_bankaccounts.class.php @@ -196,7 +196,7 @@ class BankAccounts extends DolibarrApi } else { - throw new RestException(500, $this->task->error); + throw new RestException(500, $account->error); } } diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php index e6a2be07184..9500dd02a58 100644 --- a/htdocs/compta/facture/class/api_invoices.class.php +++ b/htdocs/compta/facture/class/api_invoices.class.php @@ -240,7 +240,7 @@ class Invoices extends DolibarrApi } if(! DolibarrApiAccess::$user->rights->facture->creer) { throw new RestException(401); - } + } if(empty($orderid)) { throw new RestException(400, 'Order ID is mandatory'); } @@ -380,18 +380,24 @@ class Invoices extends DolibarrApi throw new RestException(404, 'Invoice not found'); } - $result = $this->invoice->deleteline($lineid); - if( $result < 0) { + // TODO Check the lineid $lineid is a line of ojbect + + $updateRes = $this->invoice->deleteline($lineid); + if ($updateRes > 0) { + return $this->get($id); + } + else + { throw new RestException(405, $this->invoice->error); } - $result = $this->invoice->fetch($id); + /*$result = $this->invoice->fetch($id); $this->invoice->getLinesArray(); $result = array(); foreach ($this->invoice->lines as $line) { array_push($result,$this->_cleanObjectDatas($line)); - } + }*/ return $result; } @@ -508,10 +514,10 @@ class Invoices extends DolibarrApi $request_data->fk_parent_line = 0; } - // calculate pa_ht + // calculate pa_ht $marginInfos = getMarginInfos($request_data->subprice, $request_data->remise_percent, $request_data->tva_tx, $request_data->localtax1_tx, $request_data->localtax2_tx, $request_data->fk_fournprice, $request_data->pa_ht); $pa_ht = $marginInfos[0]; - + $updateRes = $this->invoice->addline( $request_data->desc, $request_data->subprice, diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 0d96236a6ab..c5f9ae7fc92 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -3009,7 +3009,7 @@ class Facture extends CommonInvoice if (! $this->brouillon) { - $this->error='ErrorBadStatus'; + $this->error='ErrorDeleteLineNotAllowedByObjectStatus'; return -1; } diff --git a/htdocs/contrat/class/api_contracts.class.php b/htdocs/contrat/class/api_contracts.class.php index 04f17985f4d..689b0465fd4 100644 --- a/htdocs/contrat/class/api_contracts.class.php +++ b/htdocs/contrat/class/api_contracts.class.php @@ -450,11 +450,16 @@ class Contracts extends DolibarrApi throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); } + // TODO Check the lineid $lineid is a line of ojbect + $updateRes = $this->contract->deleteline($lineid, DolibarrApiAccess::$user); if ($updateRes > 0) { return $this->get($id); } - return false; + else + { + throw new RestException(405, $this->contract->error); + } } /** @@ -489,7 +494,7 @@ class Contracts extends DolibarrApi } else { - throw new RestException(500, $this->task->error); + throw new RestException(500, $this->contract->error); } } diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index 1b52ac278ec..de2f89a5cd8 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -1758,6 +1758,7 @@ class Contrat extends CommonObject } else { + $this->error = 'ErrorDeleteLineNotAllowedByObjectStatus'; return -2; } } diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php index 2add3e04b63..9f0869aac1d 100644 --- a/htdocs/core/lib/functions2.lib.php +++ b/htdocs/core/lib/functions2.lib.php @@ -2223,6 +2223,9 @@ function getModuleDirForApiClass($module) elseif ($module == 'order' || $module == 'orders') { $moduledirforclass = 'commande'; } + elseif ($module == 'shipments') { + $moduledirforclass = 'expedition'; + } elseif ($module == 'facture' || $module == 'invoice' || $module == 'invoices') { $moduledirforclass = 'compta/facture'; } diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php new file mode 100644 index 00000000000..23d4e284484 --- /dev/null +++ b/htdocs/expedition/class/api_shipments.class.php @@ -0,0 +1,659 @@ + + * Copyright (C) 2016 Laurent Destailleur + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + + use Luracast\Restler\RestException; + + require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php'; + +/** + * API class for shipments + * + * @access protected + * @class DolibarrApiAccess {@requires user,external} + */ +class Shipments extends DolibarrApi +{ + + /** + * @var array $FIELDS Mandatory fields, checked when create and update object + */ + static $FIELDS = array( + 'socid', + 'origin_id', + 'origin_type' + ); + + /** + * @var Expedition $shipment {@type Expedition} + */ + public $shipment; + + /** + * Constructor + */ + function __construct() + { + global $db, $conf; + $this->db = $db; + $this->shipment = new Expedition($this->db); + } + + /** + * Get properties of a shipment object + * + * Return an array with shipment informations + * + * @param int $id ID of shipment + * @return array|mixed data without useless information + * + * @throws RestException + */ + function get($id) + { + if(! DolibarrApiAccess::$user->rights->expedition->lire) { + throw new RestException(401); + } + + $result = $this->shipment->fetch($id); + if( ! $result ) { + throw new RestException(404, 'Shipment not found'); + } + + if( ! DolibarrApi::_checkAccessToResource('expedition',$this->shipment->id)) { + throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); + } + + $this->shipment->fetchObjectLinked(); + return $this->_cleanObjectDatas($this->shipment); + } + + + + /** + * List shipments + * + * Get a list of shipments + * + * @param string $sortfield Sort field + * @param string $sortorder Sort order + * @param int $limit Limit for list + * @param int $page Page number + * @param string $thirdparty_ids Thirdparty ids to filter shipments of. {@example '1' or '1,2,3'} {@pattern /^[0-9,]*$/i} + * @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')" + * @return array Array of shipment objects + * + * @throws RestException + */ + function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '') { + global $db, $conf; + + $obj_ret = array(); + + // case of external user, $thirdparty_ids param is ignored and replaced by user's socid + $socids = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : $thirdparty_ids; + + // If the internal user must only see his customers, force searching by him + $search_sale = 0; + if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id; + + $sql = "SELECT t.rowid"; + if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects) + $sql.= " FROM ".MAIN_DB_PREFIX."expedition as t"; + + if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale + + $sql.= ' WHERE t.entity IN ('.getEntity('expedition').')'; + if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc"; + if ($socids) $sql.= " AND t.fk_soc IN (".$socids.")"; + if ($search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale + // Insert sale filter + if ($search_sale > 0) + { + $sql .= " AND sc.fk_user = ".$search_sale; + } + // Add sql filters + if ($sqlfilters) + { + if (! DolibarrApi::_checkFilters($sqlfilters)) + { + throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters); + } + $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)'; + $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")"; + } + + $sql.= $db->order($sortfield, $sortorder); + if ($limit) { + if ($page < 0) + { + $page = 0; + } + $offset = $limit * $page; + + $sql.= $db->plimit($limit + 1, $offset); + } + + dol_syslog("API Rest request"); + $result = $db->query($sql); + + if ($result) + { + $num = $db->num_rows($result); + $min = min($num, ($limit <= 0 ? $num : $limit)); + while ($i < $min) + { + $obj = $db->fetch_object($result); + $shipment_static = new Expedition($db); + if($shipment_static->fetch($obj->rowid)) { + $obj_ret[] = $this->_cleanObjectDatas($shipment_static); + } + $i++; + } + } + else { + throw new RestException(503, 'Error when retrieve commande list : '.$db->lasterror()); + } + if( ! count($obj_ret)) { + throw new RestException(404, 'No shipment found'); + } + return $obj_ret; + } + + /** + * Create shipment object + * + * @param array $request_data Request data + * @return int ID of shipment + */ + function post($request_data = NULL) + { + if(! DolibarrApiAccess::$user->rights->expedition->creer) { + throw new RestException(401, "Insuffisant rights"); + } + // Check mandatory fields + $result = $this->_validate($request_data); + + foreach($request_data as $field => $value) { + $this->shipment->$field = $value; + } + /*if (isset($request_data["lines"])) { + $lines = array(); + foreach ($request_data["lines"] as $line) { + array_push($lines, (object) $line); + } + $this->shipment->lines = $lines; + }*/ + + if ($this->shipment->create(DolibarrApiAccess::$user) < 0) { + throw new RestException(500, "Error creating shipment", array_merge(array($this->shipment->error), $this->shipment->errors)); + } + + return $this->shipment->id; + } + + /** + * Get lines of an shipment + * + * @param int $id Id of shipment + * + * @url GET {id}/lines + * + * @return int + */ + /* + function getLines($id) { + if(! DolibarrApiAccess::$user->rights->expedition->lire) { + throw new RestException(401); + } + + $result = $this->shipment->fetch($id); + if( ! $result ) { + throw new RestException(404, 'Shipment not found'); + } + + if( ! DolibarrApi::_checkAccessToResource('expedition',$this->shipment->id)) { + throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); + } + $this->shipment->getLinesArray(); + $result = array(); + foreach ($this->shipment->lines as $line) { + array_push($result,$this->_cleanObjectDatas($line)); + } + return $result; + } + */ + + /** + * Add a line to given shipment + * + * @param int $id Id of shipment to update + * @param array $request_data ShipmentLine data + * + * @url POST {id}/lines + * + * @return int + */ + /* + function postLine($id, $request_data = NULL) { + if(! DolibarrApiAccess::$user->rights->expedition->creer) { + throw new RestException(401); + } + + $result = $this->shipment->fetch($id); + if( ! $result ) { + throw new RestException(404, 'Shipment not found'); + } + + if( ! DolibarrApi::_checkAccessToResource('expedition',$this->shipment->id)) { + throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); + } + $request_data = (object) $request_data; + $updateRes = $this->shipment->addline( + $request_data->desc, + $request_data->subprice, + $request_data->qty, + $request_data->tva_tx, + $request_data->localtax1_tx, + $request_data->localtax2_tx, + $request_data->fk_product, + $request_data->remise_percent, + $request_data->info_bits, + $request_data->fk_remise_except, + 'HT', + 0, + $request_data->date_start, + $request_data->date_end, + $request_data->product_type, + $request_data->rang, + $request_data->special_code, + $fk_parent_line, + $request_data->fk_fournprice, + $request_data->pa_ht, + $request_data->label, + $request_data->array_options, + $request_data->fk_unit, + $request_data->origin, + $request_data->origin_id, + $request_data->multicurrency_subprice + ); + + if ($updateRes > 0) { + return $updateRes; + + } + return false; + }*/ + + /** + * Update a line to given shipment + * + * @param int $id Id of shipment to update + * @param int $lineid Id of line to update + * @param array $request_data ShipmentLine data + * + * @url PUT {id}/lines/{lineid} + * + * @return object + */ + /* + function putLine($id, $lineid, $request_data = NULL) { + if(! DolibarrApiAccess::$user->rights->expedition->creer) { + throw new RestException(401); + } + + $result = $this->shipment->fetch($id); + if( ! $result ) { + throw new RestException(404, 'Shipment not found'); + } + + if( ! DolibarrApi::_checkAccessToResource('expedition',$this->shipment->id)) { + throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); + } + $request_data = (object) $request_data; + $updateRes = $this->shipment->updateline( + $lineid, + $request_data->desc, + $request_data->subprice, + $request_data->qty, + $request_data->remise_percent, + $request_data->tva_tx, + $request_data->localtax1_tx, + $request_data->localtax2_tx, + 'HT', + $request_data->info_bits, + $request_data->date_start, + $request_data->date_end, + $request_data->product_type, + $request_data->fk_parent_line, + 0, + $request_data->fk_fournprice, + $request_data->pa_ht, + $request_data->label, + $request_data->special_code, + $request_data->array_options, + $request_data->fk_unit, + $request_data->multicurrency_subprice + ); + + if ($updateRes > 0) { + $result = $this->get($id); + unset($result->line); + return $this->_cleanObjectDatas($result); + } + return false; + }*/ + + /** + * Delete a line to given shipment + * + * + * @param int $id Id of shipment to update + * @param int $lineid Id of line to delete + * + * @url DELETE {id}/lines/{lineid} + * + * @return int + * @throws 401 + * @throws 404 + */ + function deleteLine($id, $lineid) { + if(! DolibarrApiAccess::$user->rights->expedition->creer) { + throw new RestException(401); + } + + $result = $this->shipment->fetch($id); + if( ! $result ) { + throw new RestException(404, 'Shipment not found'); + } + + if( ! DolibarrApi::_checkAccessToResource('expedition',$this->shipment->id)) { + throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); + } + + // TODO Check the lineid $lineid is a line of ojbect + + $request_data = (object) $request_data; + $updateRes = $this->shipment->deleteline(DolibarrApiAccess::$user, $lineid); + if ($updateRes > 0) { + return $this->get($id); + } + else + { + throw new RestException(405, $this->shipment->error); + } + } + + /** + * Update shipment general fields (won't touch lines of shipment) + * + * @param int $id Id of shipment to update + * @param array $request_data Datas + * + * @return int + */ + function put($id, $request_data = NULL) { + if (! DolibarrApiAccess::$user->rights->expedition->creer) { + throw new RestException(401); + } + + $result = $this->shipment->fetch($id); + if (! $result) { + throw new RestException(404, 'Shipment not found'); + } + + if (! DolibarrApi::_checkAccessToResource('expedition',$this->shipment->id)) { + throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); + } + foreach($request_data as $field => $value) { + if ($field == 'id') continue; + $this->shipment->$field = $value; + } + + if ($this->shipment->update(DolibarrApiAccess::$user) > 0) + { + return $this->get($id); + } + else + { + throw new RestException(500, $this->shipment->error); + } + } + + /** + * Delete shipment + * + * @param int $id Shipment ID + * + * @return array + */ + function delete($id) + { + if(! DolibarrApiAccess::$user->rights->shipment->supprimer) { + throw new RestException(401); + } + $result = $this->shipment->fetch($id); + if( ! $result ) { + throw new RestException(404, 'Shipment not found'); + } + + if( ! DolibarrApi::_checkAccessToResource('expedition',$this->shipment->id)) { + throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); + } + + if( ! $this->shipment->delete(DolibarrApiAccess::$user)) { + throw new RestException(500, 'Error when deleting shipment : '.$this->shipment->error); + } + + return array( + 'success' => array( + 'code' => 200, + 'message' => 'Shipment deleted' + ) + ); + + } + + /** + * Validate a shipment + * + * This may record stock movements if module stock is enabled and option to + * decrease stock on shipment is on. + * + * @param int $id Shipment ID + * @param int $notrigger 1=Does not execute triggers, 0= execute triggers + * + * @url POST {id}/validate + * + * @return array + * FIXME An error 403 is returned if the request has an empty body. + * Error message: "Forbidden: Content type `text/plain` is not supported." + * Workaround: send this in the body + * { + * "notrigger": 0 + * } + */ + function validate($id, $notrigger=0) + { + if(! DolibarrApiAccess::$user->rights->expedition->creer) { + throw new RestException(401); + } + $result = $this->shipment->fetch($id); + if( ! $result ) { + throw new RestException(404, 'Shipment not found'); + } + + if( ! DolibarrApi::_checkAccessToResource('expedition',$this->shipment->id)) { + throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); + } + + $result = $this->shipment->valid(DolibarrApiAccess::$user, $notrigger); + if ($result == 0) { + throw new RestException(304, 'Error nothing done. May be object is already validated'); + } + if ($result < 0) { + throw new RestException(500, 'Error when validating Shipment: '.$this->shipment->error); + } + $result = $this->shipment->fetch($id); + if( ! $result ) { + throw new RestException(404, 'Shipment not found'); + } + + if( ! DolibarrApi::_checkAccessToResource('expedition',$this->shipment->id)) { + throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); + } + + $this->shipment->fetchObjectLinked(); + return $this->_cleanObjectDatas($this->shipment); + } + + + /** + * Classify the shipment as invoiced + * + * @param int $id Id of the shipment + * + * @url POST {id}/setinvoiced + * + * @return int + * + * @throws 400 + * @throws 401 + * @throws 404 + * @throws 405 + */ +/* function setinvoiced($id) { + + if(! DolibarrApiAccess::$user->rights->expedition->creer) { + throw new RestException(401); + } + if(empty($id)) { + throw new RestException(400, 'Shipment ID is mandatory'); + } + $result = $this->shipment->fetch($id); + if( ! $result ) { + throw new RestException(404, 'Shipment not found'); + } + + $result = $this->shipment->classifyBilled(DolibarrApiAccess::$user); + if( $result < 0) { + throw new RestException(400, $this->shipment->error); + } + return $result; + } +*/ + + + /** + * Create a shipment using an existing order. + * + * @param int $orderid Id of the order + * + * @url POST /createfromorder/{orderid} + * + * @return int + * @throws 400 + * @throws 401 + * @throws 404 + * @throws 405 + */ + /* + function createShipmentFromOrder($orderid) { + + require_once DOL_DOCUMENT_ROOT . '/commande/class/commande.class.php'; + + if(! DolibarrApiAccess::$user->rights->expedition->lire) { + throw new RestException(401); + } + if(! DolibarrApiAccess::$user->rights->expedition->creer) { + throw new RestException(401); + } + if(empty($proposalid)) { + throw new RestException(400, 'Order ID is mandatory'); + } + + $order = new Commande($this->db); + $result = $order->fetch($proposalid); + if( ! $result ) { + throw new RestException(404, 'Order not found'); + } + + $result = $this->shipment->createFromOrder($order, DolibarrApiAccess::$user); + if( $result < 0) { + throw new RestException(405, $this->shipment->error); + } + $this->shipment->fetchObjectLinked(); + return $this->_cleanObjectDatas($this->shipment); + } + */ + + /** + * Clean sensible object datas + * + * @param object $object Object to clean + * @return array Array of cleaned object properties + */ + function _cleanObjectDatas($object) { + + $object = parent::_cleanObjectDatas($object); + + unset($object->thirdparty); // id already returned + + unset($object->note); + unset($object->address); + unset($object->barcode_type); + unset($object->barcode_type_code); + unset($object->barcode_type_label); + unset($object->barcode_type_coder); + + if (! empty($object->lines) && is_array($object->lines)) + { + foreach ($object->lines as $line) + { + unset($line->tva_tx); + unset($line->vat_src_code); + unset($line->total_ht); + unset($line->total_ttc); + unset($line->total_tva); + unset($line->total_localtax1); + unset($line->total_localtax2); + unset($line->remise_percent); + } + } + + return $object; + } + + /** + * Validate fields before create or update object + * + * @param array $data Array with data to verify + * @return array + * @throws RestException + */ + function _validate($data) + { + $shipment = array(); + foreach (Shipments::$FIELDS as $field) { + if (!isset($data[$field])) + throw new RestException(400, "$field field missing"); + $shipment[$field] = $data[$field]; + + } + return $shipment; + } +} diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index 88d43335603..9817e232e9e 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -523,9 +523,6 @@ class Expedition extends CommonObject if ($this->statut == 0) $this->brouillon = 1; - $file = $conf->expedition->dir_output . "/" .get_exdir($this->id, 2, 0, 0, $this, 'shipment') . "/" . $this->id.".pdf"; - $this->pdf_filename = $file; - // Tracking url $this->GetUrlTrackingStatus($obj->tracking_number); @@ -1457,6 +1454,47 @@ class Expedition extends CommonObject } } + /** + * Delete detail line + * + * @param User $user User making deletion + * @param int $lineid Id of line to delete + * @return int >0 if OK, <0 if KO + */ + function deleteline($user, $lineid) + { + global $user; + + if ($this->statut == self::STATUS_DRAFT) + { + $this->db->begin(); + + $line=new ExpeditionLigne($this->db); + + // For triggers + $line->fetch($lineid); + + if ($line->delete($user) > 0) + { + //$this->update_price(1); + + $this->db->commit(); + return 1; + } + else + { + $this->db->rollback(); + return -1; + } + } + else + { + $this->error='ErrorDeleteLineNotAllowedByObjectStatus'; + return -2; + } + } + + /** * Return clicable link of object (with eventually picto) * diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php index 07250466fc0..e68c9338b92 100644 --- a/htdocs/expensereport/class/api_expensereports.class.php +++ b/htdocs/expensereport/class/api_expensereports.class.php @@ -361,7 +361,9 @@ class ExpenseReports extends DolibarrApi if( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) { throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); } - $request_data = (object) $request_data; + + // TODO Check the lineid $lineid is a line of ojbect + $updateRes = $this->expensereport->deleteline($lineid); if ($updateRes == 1) { return $this->get($id); @@ -402,7 +404,7 @@ class ExpenseReports extends DolibarrApi } else { - throw new RestException(500, $this->task->error); + throw new RestException(500, $this->expensereport->error); } } diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php index 84442aaefac..3270bc144c2 100644 --- a/htdocs/societe/class/api_contacts.class.php +++ b/htdocs/societe/class/api_contacts.class.php @@ -357,6 +357,30 @@ class Contacts extends DolibarrApi return $result; } + + /** + * Clean sensible object datas + * + * @param object $object Object to clean + * @return array Array of cleaned object properties + */ + function _cleanObjectDatas($object) { + + $object = parent::_cleanObjectDatas($object); + + unset($object->total_ht); + unset($object->total_tva); + unset($object->total_localtax1); + unset($object->total_localtax2); + unset($object->total_ttc); + + unset($object->note); + unset($object->lines); + unset($object->thirdparty); + + return $object; + } + /** * Validate fields before create or update object * @@ -372,6 +396,7 @@ class Contacts extends DolibarrApi throw new RestException(400, "$field field missing"); $contact[$field] = $data[$field]; } + return $contact; } } diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php index 1dc0eeb334b..9fd95a13a65 100644 --- a/htdocs/societe/class/api_thirdparties.class.php +++ b/htdocs/societe/class/api_thirdparties.class.php @@ -500,6 +500,9 @@ class Thirdparties extends DolibarrApi unset($object->total_localtax2); unset($object->total_ttc); + unset($object->lines); + unset($object->thirdparty); + return $object; } diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php index 0145fd5eead..c30cacd72c0 100644 --- a/htdocs/user/class/api_users.class.php +++ b/htdocs/user/class/api_users.class.php @@ -222,7 +222,7 @@ class Users extends DolibarrApi } else { - throw new RestException(500, $this->task->error); + throw new RestException(500, $this->useraccount->error); } } From d069ccdb7fe1787f5293981207ab97045f420042 Mon Sep 17 00:00:00 2001 From: KHELIFA Date: Thu, 21 Dec 2017 16:58:37 +0100 Subject: [PATCH 0019/1074] Core Modele PDF: Fix globale variable for hide payment mode with PROPALE_PDF_HIDE_PAYMENTTERMMODE and SUPPLIER_PROPOSAL_PDF_SHOW_PAYMENTTERMMODE - Fix hide payment condition for supplier proposal --- .../modules/propale/doc/pdf_azur.modules.php | 2 +- .../supplier_proposal/doc/pdf_aurore.modules.php | 16 +--------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php index 76ab2ae7655..dc687b0d2c9 100644 --- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php +++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php @@ -869,7 +869,7 @@ class pdf_azur extends ModelePDFPropales $posy=$pdf->GetY()+3; } - if (empty($conf->global->PROPALE_PDF_HIDE_PAYMENTTERMCOND)) + if (empty($conf->global->PROPALE_PDF_HIDE_PAYMENTTERMMODE)) { // Check a payment mode is defined /* Not required on a proposal diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php index d48543442f4..ecdd99d140f 100644 --- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php +++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php @@ -716,22 +716,8 @@ class pdf_aurore extends ModelePDFSupplierProposal $posy=$pdf->GetY()+3; } - else { - $pdf->SetFont('','B', $default_font_size - 2); - $pdf->SetXY($this->marge_gauche, $posy); - $titre = $outputlangs->transnoentities("PaymentConditions").':'; - $pdf->MultiCell(80, 4, $titre, 0, 'L'); - $pdf->SetFont('','', $default_font_size - 2); - $pdf->SetXY($posxval, $posy); - - $lib_condition_paiement=str_replace('\n',"\n",$lib_condition_paiement); - $pdf->MultiCell(80, 4, $lib_condition_paiement,0,'L'); - - $posy=$pdf->GetY()+3; - } - - if (! empty($conf->global->SUPPLIER_PROPOSAL_PDF_SHOW_PAYMENTTERMCOND)) + if (! empty($conf->global->SUPPLIER_PROPOSAL_PDF_SHOW_PAYMENTTERMMODE)) { // Show payment mode if ($object->mode_reglement_code From 27a9a81f996443b2167a28664bf0887d0365b0fd Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 21 Dec 2017 23:48:33 +0100 Subject: [PATCH 0020/1074] Fix link to contracts --- htdocs/contrat/class/contrat.class.php | 7 +++++++ htdocs/product/stats/contrat.php | 22 +++++++++++++--------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index de2f89a5cd8..a48cd3255d2 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -1340,6 +1340,13 @@ class Contrat extends CommonObject dol_syslog(get_class($this)."::addline $desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $date_start, $date_end, $price_base_type, $pu_ttc, $info_bits, $rang"); + // Check parameters + if ($fk_product <= 0 && empty($desc)) + { + $this->error="DescRequiredForFreeProductLines"; + return -1; + } + if ($this->statut >= 0) { $this->db->begin(); diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php index 7882f251dbd..ef3723e2e55 100644 --- a/htdocs/product/stats/contrat.php +++ b/htdocs/product/stats/contrat.php @@ -119,7 +119,7 @@ if ($id > 0 || ! empty($ref)) $sql.= ' sum('.$db->ifsql("cd.statut=4 AND cd.date_fin_validite > '".$db->idate($now)."'",1,0).") as nb_running,"; $sql.= ' sum('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.date_fin_validite <= '".$db->idate($now)."')",1,0).') as nb_late,'; $sql.= ' sum('.$db->ifsql("cd.statut=5",1,0).') as nb_closed,'; - $sql.= " c.rowid as rowid, c.date_contrat, c.statut as statut,"; + $sql.= " c.rowid as rowid, c.ref, c.ref_customer, c.ref_supplier, c.date_contrat, c.statut as statut,"; $sql.= " s.nom as name, s.rowid as socid, s.code_client"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -131,7 +131,7 @@ if ($id > 0 || ! empty($ref)) $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; - $sql.= " GROUP BY c.rowid, c.date_contrat, c.statut, s.nom, s.rowid, s.code_client"; + $sql.= " GROUP BY c.rowid, c.ref, c.ref_customer, c.ref_supplier, c.date_contrat, c.statut, s.nom, s.rowid, s.code_client"; $sql.= $db->order($sortfield, $sortorder); $sql.= $db->plimit($conf->liste_limit +1, $offset); @@ -168,12 +168,12 @@ if ($id > 0 || ! empty($ref)) print_liste_field_titre("CustomerCode",$_SERVER["PHP_SELF"],"s.code_client","","&id=".$product->id,'',$sortfield,$sortorder); print_liste_field_titre("Date",$_SERVER["PHP_SELF"],"c.date_contrat","","&id=".$product->id,'align="center"',$sortfield,$sortorder); //print_liste_field_titre("AmountHT"),$_SERVER["PHP_SELF"],"c.amount","","&id=".$product->id,'align="right"',$sortfield,$sortorder); - print_liste_field_titre($staticcontratligne->LibStatut(0,3),$_SERVER["PHP_SELF"],"",'','','width="16"',$sortfield,$sortorder,'maxwidthsearch '); - print_liste_field_titre($staticcontratligne->LibStatut(4,3),$_SERVER["PHP_SELF"],"",'','','width="16"',$sortfield,$sortorder,'maxwidthsearch '); - print_liste_field_titre($staticcontratligne->LibStatut(5,3),$_SERVER["PHP_SELF"],"",'','','width="16"',$sortfield,$sortorder,'maxwidthsearch '); + print_liste_field_titre($staticcontratligne->LibStatut(0,3),$_SERVER["PHP_SELF"],"",'','','align="center" width="16"',$sortfield,$sortorder,'maxwidthsearch '); + print_liste_field_titre($staticcontratligne->LibStatut(4,3),$_SERVER["PHP_SELF"],"",'','','align="center" width="16"',$sortfield,$sortorder,'maxwidthsearch '); + print_liste_field_titre($staticcontratligne->LibStatut(5,3),$_SERVER["PHP_SELF"],"",'','','align="center" width="16"',$sortfield,$sortorder,'maxwidthsearch '); print "\n"; - $contratstatic=new Contrat($db); + $contracttmp=new Contrat($db); if ($num > 0) { @@ -182,11 +182,15 @@ if ($id > 0 || ! empty($ref)) { $objp = $db->fetch_object($result); + $contracttmp->id = $objp->rowid; + $contracttmp->ref = $objp->ref; + $contracttmp->ref_customer = $objp->ref_customer; + $contracttmp->ref_supplier = $objp->ref_supplier; print ''; - print '\n"; + print '\n"; print ''; print "\n"; print "'; print ''; print ''; @@ -935,7 +940,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) print '
'; print $langs->trans('SalesRepresentatives'); diff --git a/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php b/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php index d313eca10bd..8c49e42f557 100644 --- a/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php +++ b/htdocs/supplier_proposal/tpl/linkedobjectblock.tpl.php @@ -17,6 +17,13 @@ * along with this program. If not, see . */ +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + ?> @@ -33,7 +40,7 @@ $var=true; foreach($linkedObjectBlock as $key => $objectlink) { $ilink++; - + $trclass=($var?'pair':'impair'); if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total'; ?> @@ -64,7 +71,7 @@ if (count($linkedObjectBlock) > 1)
'.img_object($langs->trans("ShowContract"),"contract").' '; - print $objp->rowid; - print "'; + print $contracttmp->getNomUrl(1); + print "'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).'".$objp->code_client.""; From 207730bf63de6c4c67454d0c3352379f05b9de52 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 22 Dec 2017 00:22:33 +0100 Subject: [PATCH 0021/1074] Css --- htdocs/theme/eldy/style.css.php | 2 +- htdocs/theme/md/style.css.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index da830a05441..2ec397adc40 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -2126,7 +2126,7 @@ div.tabsElem { margin-top: 1px; } /* To avoid overlap of tabs when not browser */ div.tabsElem a { - font-weight: normal !important; + /* font-weight: normal !important; */ } div.tabBar { color: #; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 65b8c2c1a35..53d5f580e04 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -2201,7 +2201,7 @@ a.tabTitle { a.tab:link, a.tab:visited, a.tab:hover, a.tab#active { font-family: ; - padding: 7px 9px 7px; + padding: 12px 9px 12px; margin: 0em 0.2em; text-decoration: none; white-space: nowrap; From d1cfbc29062fdf7fa0a5ec9dd339c8a0f3cfa730 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 22 Dec 2017 01:03:40 +0100 Subject: [PATCH 0022/1074] Code comment --- htdocs/core/modules/syslog/mod_syslog_file.php | 2 +- htdocs/main.inc.php | 17 ++--------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/htdocs/core/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php index 34207496ea4..92a70ab3f62 100644 --- a/htdocs/core/modules/syslog/mod_syslog_file.php +++ b/htdocs/core/modules/syslog/mod_syslog_file.php @@ -109,7 +109,7 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface if (empty($conf->global->SYSLOG_FILE)) $tmp=DOL_DATA_ROOT.'/dolibarr.log'; else $tmp=str_replace('DOL_DATA_ROOT', DOL_DATA_ROOT, $conf->global->SYSLOG_FILE); - if (! empty($conf->global->SYSLOG_FILE_ONEPERSESSION)) + if (! empty($conf->global->SYSLOG_FILE_ONEPERSESSION)) // file depend on session name that is same for all user, not per user value of the session id { $suffixinfilename = '_'.session_name(); } diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 07779a02392..c165d39bcbc 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -215,8 +215,8 @@ $sessiontimeout='DOLSESSTIMEOUT_'.$prefix; if (! empty($_COOKIE[$sessiontimeout])) ini_set('session.gc_maxlifetime',$_COOKIE[$sessiontimeout]); session_name($sessionname); session_set_cookie_params(0, '/', null, false, true); // Add tag httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start. -// This create lock released until session_write_close() or end of page. -// We need this lock as long as we read/write $_SESSION ['vars']. We can close released when finished. +// This create lock, released when session_write_close() or end of page. +// We need this lock as long as we read/write $_SESSION ['vars']. We can remove lock when finished. if (! defined('NOSESSION')) { session_start(); @@ -1260,19 +1260,6 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs print ''."\n"; print ''."\n"; } - // jQuery DataTables - /* Removed a old hidden problematic feature never used in Dolibarr. If an external module need datatable, the module must provide all lib it needs and manage version problems with other dolibarr components - if (! empty($conf->global->MAIN_USE_JQUERY_DATATABLES) || (defined('REQUIRE_JQUERY_DATATABLES') && constant('REQUIRE_JQUERY_DATATABLES'))) - { - print ''."\n"; - print ''."\n"; - print ''."\n"; - print ''."\n"; - print ''."\n"; - print ''."\n"; - print ''."\n"; - print ''."\n"; - }*/ // jQuery Timepicker if (! empty($conf->global->MAIN_USE_JQUERY_TIMEPICKER) || defined('REQUIRE_JQUERY_TIMEPICKER')) { From ff245aa646494834d41ed51ca0df5bf23b64c21c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 22 Dec 2017 10:56:52 +0100 Subject: [PATCH 0023/1074] BUG Fix of old hidden feature price per quantity --- .../install/mysql/migration/6.0.0-7.0.0.sql | 16 +++ .../mysql/tables/llx_product_price_by_qty.sql | 10 ++ htdocs/langs/en_US/products.lang | 1 + htdocs/product/admin/product.php | 13 +-- htdocs/product/class/product.class.php | 17 +-- htdocs/product/price.php | 109 ++++++++++-------- 6 files changed, 104 insertions(+), 62 deletions(-) diff --git a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql index fea6c1a51e6..14fc29dedf8 100644 --- a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql +++ b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql @@ -71,6 +71,22 @@ ALTER TABLE llx_website_page ADD COLUMN type_container varchar(16) NOT NULL DEFA -- For 7.0 +ALTER TABLE llx_product_price_by_qty ADD COLUMN quantity double DEFAULT NULL; +ALTER TABLE llx_product_price_by_qty ADD COLUMN unitprice double(24,8) DEFAULT 0; + +ALTER TABLE llx_product_price_by_qty ADD COLUMN price_base_type varchar(3) DEFAULT 'HT'; +ALTER TABLE llx_product_price_by_qty ADD COLUMN fk_multicurrency integer; +ALTER TABLE llx_product_price_by_qty ADD COLUMN multicurrency_code varchar(255); +ALTER TABLE llx_product_price_by_qty ADD COLUMN multicurrency_tx double(24,8) DEFAULT 1; +ALTER TABLE llx_product_price_by_qty ADD COLUMN multicurrency_price double(24,8) DEFAULT NULL; +ALTER TABLE llx_product_price_by_qty ADD COLUMN multicurrency_price_ttc double(24,8) DEFAULT NULL; + +-- VMYSQL4.0 DROP INDEX uk_product_price_by_qty_level on llx_product_price_by_qty; +-- VPGSQL8.0 DROP INDEX uk_product_price_by_qty_level; + +ALTER TABLE llx_product_price_by_qty ADD UNIQUE INDEX uk_product_price_by_qty_level (fk_product_price, quantity); + + ALTER TABLE llx_accounting_bookkeeping ADD INDEX idx_accounting_bookkeeping_fk_doc (fk_doc); ALTER TABLE llx_c_revenuestamp ADD COLUMN revenuestamp_type varchar(16) DEFAULT 'fixed' NOT NULL; diff --git a/htdocs/install/mysql/tables/llx_product_price_by_qty.sql b/htdocs/install/mysql/tables/llx_product_price_by_qty.sql index 2b91647b80a..9dbeb530a34 100644 --- a/htdocs/install/mysql/tables/llx_product_price_by_qty.sql +++ b/htdocs/install/mysql/tables/llx_product_price_by_qty.sql @@ -17,6 +17,8 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -- +-- This table is used to defined price by qty when a line into llx_product_price +-- is set with price_by_qty = 1 -- ============================================================================ create table llx_product_price_by_qty @@ -24,12 +26,20 @@ create table llx_product_price_by_qty rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, fk_product_price integer NOT NULL, price double(24,8) DEFAULT 0, + price_base_type varchar(3) DEFAULT 'HT', quantity double DEFAULT NULL, remise_percent double NOT NULL DEFAULT 0, remise double NOT NULL DEFAULT 0, unitprice double(24,8) DEFAULT 0, fk_user_creat integer, fk_user_modif integer, + + fk_multicurrency integer, + multicurrency_code varchar(255), + multicurrency_tx double(24,8) DEFAULT 1, + multicurrency_price double(24,8) DEFAULT NULL, + multicurrency_price_ttc double(24,8) DEFAULT NULL, + tms timestamp, import_key varchar(14) )ENGINE=innodb; diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang index a1d81183c41..179175041b8 100644 --- a/htdocs/langs/en_US/products.lang +++ b/htdocs/langs/en_US/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Current price AlwaysUseNewPrice=Always use current price of product/service AlwaysUseFixedPrice=Use the fixed price PriceByQuantity=Different prices by quantity +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Quantity range MultipriceRules=Price segment rules UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php index 78829e489a6..abfe82d0dff 100644 --- a/htdocs/product/admin/product.php +++ b/htdocs/product/admin/product.php @@ -36,8 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php'; -$langs->load("admin"); -$langs->load("products"); +$langs->loadLangs(array("admin","products")); // Security check if (! $user->admin || (empty($conf->product->enabled) && empty($conf->service->enabled))) @@ -55,12 +54,10 @@ $select_pricing_rules=array( 'PRODUIT_MULTIPRICES'=>$langs->trans('MultiPricesAbility'), // Several prices according to a customer level 'PRODUIT_CUSTOMER_PRICES'=>$langs->trans('PriceByCustomer'), // Different price for each customer ); -if ($conf->global->MAIN_FEATURES_LEVEL >= 2) -{ - $langs->load("admin"); - $select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY'] = $langs->trans('PriceByQuantity').' ('.$langs->trans("VersionExperimental").')'; // TODO If this is enabled, price must be hidden when price by qty is enabled, also price for quantity must be used when adding product into order/propal/invoice - $select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY&PRODUIT_MULTIPRICES'] = $langs->trans('MultiPricesAbility') . '+' . $langs->trans('PriceByQuantity').' ('.$langs->trans("VersionExperimental").')'; -} +$keyforparam='PRODUIT_CUSTOMER_PRICES_BY_QTY'; +if ($conf->global->MAIN_FEATURES_LEVEL >= 2 || ! empty($conf->global->$keyforparam)) $select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY'] = $langs->trans('PriceByQuantity').' ('.$langs->trans("VersionExperimental").')'; // TODO If this is enabled, price must be hidden when price by qty is enabled, also price for quantity must be used when adding product into order/propal/invoice +$keyforparam='PRODUIT_CUSTOMER_PRICES_BY_QTY&PRODUIT_MULTIPRICES'; +if ($conf->global->MAIN_FEATURES_LEVEL >= 2 || ! empty($conf->global->$keyforparam)) $select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY&PRODUIT_MULTIPRICES'] = $langs->trans('MultiPricesAbility') . '+' . $langs->trans('PriceByQuantity').' ('.$langs->trans("VersionExperimental").')'; // Clean param if (! empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_MULTIPRICES_LIMIT)) { diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 6868005f54f..ab6430d9d83 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -1483,12 +1483,14 @@ class Product extends CommonObject * @param int $rowid Line id to delete * @return int <0 if KO, >0 if OK */ - function log_price_delete($user,$rowid) + function log_price_delete($user, $rowid) { + $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_price_by_qty"; + $sql.= " WHERE fk_product_price=".$rowid; + $resql=$this->db->query($sql); + $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_price"; $sql.= " WHERE rowid=".$rowid; - - dol_syslog(get_class($this)."::log_price_delete", LOG_DEBUG); $resql=$this->db->query($sql); if ($resql) { @@ -1499,7 +1501,6 @@ class Product extends CommonObject $this->error=$this->db->lasterror(); return -1; } - } @@ -1642,13 +1643,13 @@ class Product extends CommonObject * @param double $newminprice New price min * @param int $level 0=standard, >0 = level if multilevel prices * @param int $newnpr 0=Standard vat rate, 1=Special vat rate for French NPR VAT - * @param int $newpsq 1 if it has price by quantity + * @param int $newpbq 1 if it has price by quantity * @param int $ignore_autogen Used to avoid infinite loops * @param array $localtaxes_array Array with localtaxes info array('0'=>type1,'1'=>rate1,'2'=>type2,'3'=>rate2) (loaded by getLocalTaxesFromRate(vatrate, 0, ...) function). * @param string $newdefaultvatcode Default vat code * @return int <0 if KO, >0 if OK */ - function updatePrice($newprice, $newpricebase, $user, $newvat='',$newminprice='', $level=0, $newnpr=0, $newpsq=0, $ignore_autogen=0, $localtaxes_array=array(), $newdefaultvatcode='') + function updatePrice($newprice, $newpricebase, $user, $newvat='',$newminprice='', $level=0, $newnpr=0, $newpbq=0, $ignore_autogen=0, $localtaxes_array=array(), $newdefaultvatcode='') { global $conf,$langs; @@ -1667,7 +1668,7 @@ class Product extends CommonObject // Price will be modified ONLY when the first one is the one that is being modified if (!empty($conf->global->PRODUIT_MULTIPRICES) && !$ignore_autogen && $this->price_autogen && ($level == 1)) { - return $this->generateMultiprices($user, $newprice, $newpricebase, $newvat, $newnpr, $newpsq); + return $this->generateMultiprices($user, $newprice, $newpricebase, $newvat, $newnpr, $newpbq); } if (! empty($newminprice) && ($newminprice > $newprice)) @@ -1781,7 +1782,7 @@ class Product extends CommonObject $this->localtax2_type = $localtaxtype2; // Price by quantity - $this->price_by_qty = $newpsq; + $this->price_by_qty = $newpbq; $this->_log_price($user,$level); // Save price for level into table product_price diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 3b33ea952b2..6b77ee3a0ee 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -379,32 +379,35 @@ if (empty($reshook)) if ($action == 'delete' && $user->rights->produit->supprimer) { - $result = $object->log_price_delete($user, $_GET ["lineid"]); + $result = $object->log_price_delete($user, GETPOST('lineid','int')); if ($result < 0) { setEventMessages($object->error, $object->errors, 'errors'); } } - /** - * *************************************************** - * Price by quantity - * *************************************************** - */ - if ($action == 'activate_price_by_qty') { // Activating product price by quantity add a new price, specified as by quantity - - $level = GETPOST('level'); - + // Set Price by quantity + if ($action == 'activate_price_by_qty') + { + // Activating product price by quantity add a new price line with price_by_qty set to 1 + $level = GETPOST('level','int'); $object->updatePrice(0, $object->price_base_type, $user, $object->tva_tx, 0, $level, $object->tva_npr, 1); } + // Unset Price by quantity + if ($action == 'disable_price_by_qty') + { + // Disabling product price by quantity add a new price line with price_by_qty set to 0 + $level = GETPOST('level','int'); + $object->updatePrice(0, $object->price_base_type, $user, $object->tva_tx, 0, $level, $object->tva_npr, 0); + } if ($action == 'edit_price_by_qty') { // Edition d'un prix par quantité - $rowid = GETPOST('rowid'); + $rowid = GETPOST('rowid','int'); } + // Add or update price by quantity if ($action == 'update_price_by_qty') - { // Ajout / Mise à jour d'un prix par quantité - + { // Récupération des variables $rowid = GETPOST('rowid'); $priceid = GETPOST('priceid'); @@ -415,11 +418,11 @@ if (empty($reshook)) $remise = 0; // TODO : allow discount by amount when available on documents if (empty($quantity)) { - $error ++; + $error++; setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Qty")), null, 'errors'); } if (empty($newprice)) { - $error ++; + $error++; setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Price")), null, 'errors'); } if (! $error) { @@ -442,11 +445,13 @@ if (empty($reshook)) $sql .= " WHERE rowid = " . GETPOST('rowid'); $result = $db->query($sql); + if (! $result) dol_print_error($db); } else { $sql = "INSERT INTO " . MAIN_DB_PREFIX . "product_price_by_qty (fk_product_price,price,unitprice,quantity,remise_percent,remise) values ("; $sql .= $priceid . ',' . $price . ',' . $unitPrice . ',' . $quantity . ',' . $remise_percent . ',' . $remise . ')'; $result = $db->query($sql); + if (! $result) dol_print_error($db); } } } @@ -920,8 +925,8 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) if ($action != 'edit_price_by_qty' && ($user->rights->produit->creer || $user->rights->service->creer)) { print '
'; print ''; - print ''; - print ''; + print ''; // id in product_price + print ''; // id in product_price print '
 ' . $object->price_base_type . '
'; } else { print $langs->trans("No"); - print ' (' . $langs->trans("Activate") . ')'; + print '  (' . $langs->trans("Activate") . ')'; } print ''; } @@ -983,40 +988,66 @@ else if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) // TODO Fix the form inside tr instead of td { print '' . $langs->trans("PriceByQuantity"); - if ($object->prices_by_qty [0] == 0) { - print ' ' . $langs->trans("Activate"); + if ($object->prices_by_qty[0] == 0) { + print '  (' . $langs->trans("Activate").')'; + } + else + { + print '  (' . $langs->trans("DisablePriceByQty").')'; } print ''; - if ($object->prices_by_qty [0] == 1) { + if ($object->prices_by_qty [0] == 1) + { print ''; print ''; - print ''; - print ''; + //print ''; + print ''; + print ''; + print ''; print ''; print ''; print ''; print ''; - foreach ($object->prices_by_qty_list [0] as $ii => $prices) + if ($action != 'edit_price_by_qty') { + print ''; // FIXME a form into a table is not allowed + print ''; + print ''; // id in product_price + print ''; // id in product_price_by_qty + + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + + print ''; + } + foreach ($object->prices_by_qty_list[0] as $ii => $prices) { if ($action == 'edit_price_by_qty' && $rowid == $prices['rowid'] && ($user->rights->produit->creer || $user->rights->service->creer)) { print ''; print ''; - print ''; - print ''; - print ''; + print ''; // id in product_price + print ''; // id in product_price_by_qty + print ''; print ''; - print ''; - // print ''; + print ''; + print ''; + print ''; print ''; print ''; print ''; print ''; } else { - print ''; + print ''; print ''; print ''; + print ''; print ''; print ''; print ''; } } - if ($action != 'edit_price_by_qty') { - print ''; // FIXME a form into a table is not allowed - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - // print ''; - print ''; - print ''; - print ''; - print ''; - } - print '
' . $langs->trans("PriceByQuantityRange") . '' . $langs->trans("HT") . '' . $langs->trans("PriceByQuantityRange") . '' . $langs->trans("Quantity") . '' . $langs->trans("Price") . '' . $langs->trans("UnitPrice") . '' . $langs->trans("Discount") . ' 
' . $object->price_base_type . '  %
 ' . $object->price_base_type . ' ' . $object->price_base_type . '  %
' . $prices['quantity'] . '' . price($prices['price']) . '' . price($prices['unitprice']) . '' . price($prices['remise_percent']) . ' %'; @@ -1032,21 +1063,6 @@ else print '
 ' . $object->price_base_type . '  %
'; } else { print $langs->trans("No"); @@ -1071,7 +1087,8 @@ dol_fiche_end(); /* */ /* ************************************************************************** */ -if (! $action || $action == 'delete' || $action == 'showlog_customer_price' || $action == 'showlog_default_price' || $action == 'add_customer_price') +if (! $action || $action == 'delete' || $action == 'showlog_customer_price' || $action == 'showlog_default_price' || $action == 'add_customer_price' + || $action == 'activate_price_by_qty' || $action == 'disable_price_by_qty') { print "\n" . '
' . "\n"; From 2b056b01774f78ae7461de0c39ed676bdfcb5388 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 22 Dec 2017 10:56:52 +0100 Subject: [PATCH 0024/1074] BUG Fix of old hidden feature price per quantity --- htdocs/core/class/html.form.class.php | 19 +- htdocs/core/tpl/objectline_create.tpl.php | 27 ++- .../install/mysql/migration/6.0.0-7.0.0.sql | 16 ++ .../mysql/tables/llx_product_price_by_qty.sql | 10 + htdocs/langs/en_US/products.lang | 1 + htdocs/product/admin/product.php | 13 +- htdocs/product/class/product.class.php | 30 +-- htdocs/product/price.php | 178 +++++++++++------- 8 files changed, 202 insertions(+), 92 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index bba38e459c4..4f347fb9f0e 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -1909,8 +1909,9 @@ class Form $sql = "SELECT "; $sql.= $selectFields . $selectFieldsGrouped; //Price by customer - if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid)) { - $sql.=' ,pcp.rowid as idprodcustprice, pcp.price as custprice, pcp.price_ttc as custprice_ttc,'; + if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid)) + { + $sql.=', pcp.rowid as idprodcustprice, pcp.price as custprice, pcp.price_ttc as custprice_ttc,'; $sql.=' pcp.price_base_type as custprice_base_type, pcp.tva_tx as custtva_tx'; $selectFields.= ", idprodcustprice, custprice, custprice_ttc, custprice_base_type, custtva_tx"; } @@ -2045,7 +2046,7 @@ class Form if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) && !empty($objp->price_by_qty) && $objp->price_by_qty == 1) { // Price by quantity will return many prices for the same product - $sql = "SELECT rowid, quantity, price, unitprice, remise_percent, remise"; + $sql = "SELECT rowid, quantity, price, unitprice, remise_percent, remise, price_base_type"; $sql.= " FROM ".MAIN_DB_PREFIX."product_price_by_qty"; $sql.= " WHERE fk_product_price=".$objp->price_rowid; $sql.= " ORDER BY quantity ASC"; @@ -2059,12 +2060,17 @@ class Form while ($nb_prices && $j < $nb_prices) { $objp2 = $this->db->fetch_object($result2); + $objp->price_by_qty_rowid = $objp2->rowid; + $objp->price_by_qty_price_base_type = $objp2->price_base_type; + $objp->price_by_qty_quantity = $objp2->quantity; + $objp->price_by_qty_unitprice = $objp2->unitprice; + $objp->price_by_qty_remise_percent = $objp2->remise_percent; + // For backward compatibility $objp->quantity = $objp2->quantity; $objp->price = $objp2->price; $objp->unitprice = $objp2->unitprice; $objp->remise_percent = $objp2->remise_percent; $objp->remise = $objp2->remise; - $objp->price_by_qty_rowid = $objp2->rowid; $this->constructProductListOption($objp, $opt, $optJson, 0, $selected, $hidepriceinlabel); @@ -2164,7 +2170,10 @@ class Form $opt = '
'; print '
'; print ''; -// MultiPrix +// Price per customer segment/level if (! empty($conf->global->PRODUIT_MULTIPRICES)) { // Price and min price are variable (depends on level of company). @@ -893,7 +898,6 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) print ''; print ''; print ''; - // print ''; print ''; print ''; print ''; @@ -920,8 +924,8 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) if ($action != 'edit_price_by_qty' && ($user->rights->produit->creer || $user->rights->service->creer)) { print ''; print ''; - print ''; - print ''; + print ''; // id in product_price + print ''; // id in product_price print ''; print ''; print ''; @@ -935,7 +939,7 @@ if (! empty($conf->global->PRODUIT_MULTIPRICES)) print '
 ' . $object->price_base_type . '  %
 ' . $object->price_base_type . '
'; } else { print $langs->trans("No"); - print ' (' . $langs->trans("Activate") . ')'; + print '  (' . $langs->trans("Activate") . ')'; } print ''; } @@ -983,33 +987,64 @@ else if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) // TODO Fix the form inside tr instead of td { print '' . $langs->trans("PriceByQuantity"); - if ($object->prices_by_qty [0] == 0) { - print ' ' . $langs->trans("Activate"); + if ($object->prices_by_qty[0] == 0) { + print '  (' . $langs->trans("Activate").')'; + } + else + { + print '  (' . $langs->trans("DisablePriceByQty").')'; } print ''; - if ($object->prices_by_qty [0] == 1) { + if ($object->prices_by_qty[0] == 1) + { print ''; print ''; - print ''; - print ''; + //print ''; + print ''; + print ''; + print ''; print ''; print ''; print ''; print ''; - foreach ($object->prices_by_qty_list [0] as $ii => $prices) + if ($action != 'edit_price_by_qty') + { + print ''; // FIXME a form into a table is not allowed + print ''; + print ''; // id in product_price + print ''; // id in product_price_by_qty + + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + + print ''; + } + foreach ($object->prices_by_qty_list[0] as $ii => $prices) { if ($action == 'edit_price_by_qty' && $rowid == $prices['rowid'] && ($user->rights->produit->creer || $user->rights->service->creer)) { print ''; print ''; - print ''; - print ''; + print ''; // id in product_price + print ''; // id in product_price_by_qty print ''; print ''; - print ''; - // print ''; - print ''; + print ''; + print ''; + print ''; + print ''; print ''; print ''; print ''; @@ -1017,10 +1052,15 @@ else print ''; print ''; print ''; + print ''; print ''; print ''; print ''; } } - if ($action != 'edit_price_by_qty') { - print ''; // FIXME a form into a table is not allowed - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - // print ''; - print ''; - print ''; - print ''; - print ''; - } - print '
' . $langs->trans("PriceByQuantityRange") . '' . $langs->trans("HT") . '' . $langs->trans("PriceByQuantityRange") . '' . $langs->trans("Quantity") . '' . $langs->trans("Price") . '' . $langs->trans("UnitPrice") . '' . $langs->trans("Discount") . ' 
'; + //print $object->price_base_type; + print '  %
 ' . $object->price_base_type . '  %'; + //print $object->price_base_type; + print $prices['price_base_type']; + print '  %
' . $prices['quantity'] . '' . price($prices['price']) . ''; + //print $object->price_base_type; + print $prices['price_base_type']; + print '' . price($prices['unitprice']) . '' . price($prices['remise_percent']) . ' %'; - if (($user->rights->produit->creer || $user->rights->service->creer)) { + if (($user->rights->produit->creer || $user->rights->service->creer)) + { print ''; print img_edit() . ''; print ''; @@ -1032,21 +1072,6 @@ else print '
 ' . $object->price_base_type . '  %
'; } else { print $langs->trans("No"); @@ -1071,7 +1096,8 @@ dol_fiche_end(); /* */ /* ************************************************************************** */ -if (! $action || $action == 'delete' || $action == 'showlog_customer_price' || $action == 'showlog_default_price' || $action == 'add_customer_price') +if (! $action || $action == 'delete' || $action == 'showlog_customer_price' || $action == 'showlog_default_price' || $action == 'add_customer_price' + || $action == 'activate_price_by_qty' || $action == 'disable_price_by_qty') { print "\n" . '
' . "\n"; @@ -1474,23 +1500,31 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action=='showlog_default_ print '' . $langs->trans($type) . ""; } - print '' . $langs->trans($objp->price_base_type) . ""; + print ''; + if (empty($objp->price_by_qty)) { + print $langs->trans($objp->price_base_type); + } + print ""; + if (empty($conf->global->PRODUIT_MULTIPRICES)) { print ''; - $positiverates=''; - if (price2num($objp->tva_tx)) $positiverates.=($positiverates?'/':'').price2num($objp->tva_tx); - if (price2num($objp->localtax1_type)) $positiverates.=($positiverates?'/':'').price2num($objp->localtax1_tx); - if (price2num($objp->localtax2_type)) $positiverates.=($positiverates?'/':'').price2num($objp->localtax2_tx); - if (empty($positiverates)) $positiverates='0'; - echo vatrate($positiverates.($objp->default_vat_code?' ('.$objp->default_vat_code.')':''), '%', $objp->tva_npr); - /* - if ($objp->default_vat_code) - { - print vatrate($objp->tva_tx, true) . ' ('.$objp->default_vat_code.')'; + if (empty($objp->price_by_qty)) { + $positiverates=''; + if (price2num($objp->tva_tx)) $positiverates.=($positiverates?'/':'').price2num($objp->tva_tx); + if (price2num($objp->localtax1_type)) $positiverates.=($positiverates?'/':'').price2num($objp->localtax1_tx); + if (price2num($objp->localtax2_type)) $positiverates.=($positiverates?'/':'').price2num($objp->localtax2_tx); + if (empty($positiverates)) $positiverates='0'; + echo vatrate($positiverates.($objp->default_vat_code?' ('.$objp->default_vat_code.')':''), '%', $objp->tva_npr); + /* + if ($objp->default_vat_code) + { + print vatrate($objp->tva_tx, true) . ' ('.$objp->default_vat_code.')'; + } + else print vatrate($objp->tva_tx, true, $objp->recuperableonly);*/ } - else print vatrate($objp->tva_tx, true, $objp->recuperableonly);*/ + print ""; } @@ -1506,16 +1540,32 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action=='showlog_default_ } else { - print '' . ($objp->price_base_type != 'TTC' ? price($objp->price) : ''). ""; - print '' . ($objp->price_base_type == 'TTC' ? price($objp->price_ttc) : '') . ""; + print ''; + if (empty($objp->price_by_qty)) { + print ($objp->price_base_type != 'TTC' ? price($objp->price) : ''); + } + print ""; + print ''; + if (empty($objp->price_by_qty)) { + print ($objp->price_base_type == 'TTC' ? price($objp->price_ttc) : ''); + } + print ""; if (! empty($conf->dynamicprices->enabled)) { //Only if module is enabled print ''; } } - print '' . ($objp->price_base_type != 'TTC' ? price($objp->price_min) : '') . ''; + print ''; + if (empty($objp->price_by_qty)) { + print ($objp->price_base_type != 'TTC' ? price($objp->price_min) : ''); + } + print ''; - print '' . ($objp->price_base_type == 'TTC' ? price($objp->price_min_ttc) : '') . ''; + print ''; + if (empty($objp->price_by_qty)) { + print ($objp->price_base_type == 'TTC' ? price($objp->price_min_ttc) : ''); + } + print ''; // User print '' . img_object($langs->trans("ShowUser"), 'user') . ' ' . $objp->login . ''; From fb8326a9bbec1834ac7ea53ef42c42b6e1408e03 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 22 Dec 2017 12:56:29 +0100 Subject: [PATCH 0025/1074] Css use roboto but files does not exists --- htdocs/includes/fonts/LICENSE-Roboto.txt | 202 ++++++++++++++++++ htdocs/includes/fonts/Roboto-Black.ttf | Bin 0 -> 171480 bytes htdocs/includes/fonts/Roboto-BlackItalic.ttf | Bin 0 -> 177552 bytes htdocs/includes/fonts/Roboto-Bold.ttf | Bin 0 -> 170760 bytes htdocs/includes/fonts/Roboto-BoldItalic.ttf | Bin 0 -> 174952 bytes htdocs/includes/fonts/Roboto-Italic.ttf | Bin 0 -> 173932 bytes htdocs/includes/fonts/Roboto-Light.ttf | Bin 0 -> 170420 bytes htdocs/includes/fonts/Roboto-LightItalic.ttf | Bin 0 -> 176616 bytes htdocs/includes/fonts/Roboto-Medium.ttf | Bin 0 -> 172064 bytes htdocs/includes/fonts/Roboto-MediumItalic.ttf | Bin 0 -> 176864 bytes htdocs/includes/fonts/Roboto-Regular.ttf | Bin 0 -> 171676 bytes htdocs/includes/fonts/Roboto-Thin.ttf | Bin 0 -> 171904 bytes htdocs/includes/fonts/Roboto-ThinItalic.ttf | Bin 0 -> 176300 bytes 13 files changed, 202 insertions(+) create mode 100644 htdocs/includes/fonts/LICENSE-Roboto.txt create mode 100644 htdocs/includes/fonts/Roboto-Black.ttf create mode 100644 htdocs/includes/fonts/Roboto-BlackItalic.ttf create mode 100644 htdocs/includes/fonts/Roboto-Bold.ttf create mode 100644 htdocs/includes/fonts/Roboto-BoldItalic.ttf create mode 100644 htdocs/includes/fonts/Roboto-Italic.ttf create mode 100644 htdocs/includes/fonts/Roboto-Light.ttf create mode 100644 htdocs/includes/fonts/Roboto-LightItalic.ttf create mode 100644 htdocs/includes/fonts/Roboto-Medium.ttf create mode 100644 htdocs/includes/fonts/Roboto-MediumItalic.ttf create mode 100644 htdocs/includes/fonts/Roboto-Regular.ttf create mode 100644 htdocs/includes/fonts/Roboto-Thin.ttf create mode 100644 htdocs/includes/fonts/Roboto-ThinItalic.ttf diff --git a/htdocs/includes/fonts/LICENSE-Roboto.txt b/htdocs/includes/fonts/LICENSE-Roboto.txt new file mode 100644 index 00000000000..d6456956733 --- /dev/null +++ b/htdocs/includes/fonts/LICENSE-Roboto.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/htdocs/includes/fonts/Roboto-Black.ttf b/htdocs/includes/fonts/Roboto-Black.ttf new file mode 100644 index 0000000000000000000000000000000000000000..689fe5cb3c715f2944fec30e43ccb8a2b10625d3 GIT binary patch literal 171480 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

~M8)?dE#I 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 Xk2aT?%S{K<(OhA!BxPw6dg^}wc$YKS literal 0 HcmV?d00001 diff --git a/htdocs/includes/fonts/Roboto-BlackItalic.ttf b/htdocs/includes/fonts/Roboto-BlackItalic.ttf new file mode 100644 index 0000000000000000000000000000000000000000..0b4e0ee108899ddfef739f48d2aa9475b8b41a03 GIT binary patch literal 177552 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�_SD^G{wdrrHYdIGDG`C$ZMlG79#yZF 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 literal 0 HcmV?d00001 diff --git a/htdocs/includes/fonts/Roboto-Bold.ttf b/htdocs/includes/fonts/Roboto-Bold.ttf new file mode 100644 index 0000000000000000000000000000000000000000..d3f01ad245b628f386ac95786f53167038720eb2 GIT binary patch literal 170760 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�!3r53e9=KAt@g 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

'; print ''; + + dol_set_focus('input[name="ref"]'); } // Part to edit record diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php index acc36c5b043..8e0fde69687 100644 --- a/htdocs/product/inventory/class/inventory.class.php +++ b/htdocs/product/inventory/class/inventory.class.php @@ -3,7 +3,6 @@ * Copyright (C) 2014-2016 Juanjo Menent * Copyright (C) 2015 Florian Henry * Copyright (C) 2015 Raphaël Doursenaud - * Copyright (C) ---Put here your own copyright and developer email--- * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -77,7 +76,7 @@ class Inventory extends CommonObject */ public $fields=array( 'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>-1, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>'Id',), - 'ref' => array('type'=>'varchar(64)', 'label'=>'Ref', 'visible'=>1, 'enabled'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>'Reference of object',), + 'ref' => array('type'=>'varchar(64)', 'label'=>'Ref', 'visible'=>1, 'enabled'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>'Reference of object', 'css'=>'maxwidth200'), 'entity' => array('type'=>'integer', 'label'=>'Entity', 'visible'=>0, 'enabled'=>1, 'position'=>20, 'notnull'=>1, 'index'=>1,), 'title' => array('type'=>'varchar(255)', 'label'=>'Label', 'visible'=>1, 'enabled'=>1, 'position'=>25, 'css'=>'minwidth300'), 'fk_warehouse' => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Warehouse', 'visible'=>1, 'enabled'=>1, 'index'=>1, 'help'=>'LinkToThirparty'), @@ -94,7 +93,7 @@ class Inventory extends CommonObject //'fk_user_valid' =>array('type'=>'integer', 'label'=>'UserValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>512), 'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>0, 'position'=>1000), - 'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'arrayofkeyval'=>array(0=>'Todo', 1=>'Done', -1=>'Cancel')), + 'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'default'=>0, 'arrayofkeyval'=>array(0=>'Todo', 1=>'Done', -1=>'Cancel')), ); public $rowid; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 0a16564ab40..0f0372867a0 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -12,7 +12,7 @@ * * 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 + * MERCHANTABILITY or FI8TNESS 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 @@ -1329,8 +1329,8 @@ div.statusref img { } img.photoref, div.photoref { border: 1px solid #CCC; - -webkit-box-shadow: 3px 3px 4px #DDD; - box-shadow: 3px 3px 4px #DDD; + -webkit-box-shadow: 2px 2px 4px #ccc; + box-shadow: 2px 2px 4px #ccc; padding: 4px; height: 80px; width: 80px; @@ -2539,7 +2539,7 @@ div.refidpadding { } div.refid { font-weight: bold; - color: #868; + color: #625; font-size: 160%; } div.refidno { From df884e40807198433f3fda7c8309d8ebf70a2c08 Mon Sep 17 00:00:00 2001 From: BENKE Charlene Date: Sat, 23 Dec 2017 18:37:08 +0100 Subject: [PATCH 0031/1074] Add project column on proposal list if project are not enabled we don't display it --- htdocs/comm/propal/list.php | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index b35cd3ea7c5..4dd3808f7e9 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -10,7 +10,8 @@ * Copyright (C) 2012 Christophe Battarel * Copyright (C) 2013 Cédric Salvador * Copyright (C) 2015 Jean-François Ferry - * Copyright (C) 2016 Ferran Marcet + * Copyright (C) 2016 Ferran Marcet + * Copyright (C) 2017 Charlene 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 @@ -62,6 +63,9 @@ $search_user=GETPOST('search_user','int'); $search_sale=GETPOST('search_sale','int'); $search_ref=GETPOST('sf_ref')?GETPOST('sf_ref','alpha'):GETPOST('search_ref','alpha'); $search_refcustomer=GETPOST('search_refcustomer','alpha'); + +$search_refproject=GETPOST('search_refproject','alpha'); + $search_societe=GETPOST('search_societe','alpha'); $search_montant_ht=GETPOST('search_montant_ht','alpha'); $search_montant_vat=GETPOST('search_montant_vat','alpha'); @@ -137,6 +141,7 @@ $checkedtypetiers=0; $arrayfields=array( 'p.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1), 'p.ref_client'=>array('label'=>$langs->trans("RefCustomer"), 'checked'=>1), + 'pr.ref'=>array('label'=>$langs->trans("Project"), 'checked'=>1), 's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1), 's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>1), 's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>1), @@ -162,6 +167,10 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab } } +// no project enabled we suppress from array +if (empty($conf->projet->enabled)) + unset($arrayfields['pr.ref']); + $object = new Propal($db); // To be passed as parameter of executeHooks that need @@ -186,6 +195,7 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x', $search_sale=''; $search_ref=''; $search_refcustomer=''; + $search_refproject=''; $search_societe=''; $search_montant_ht=''; $search_montant_vat=''; @@ -282,6 +292,8 @@ if ($search_country) $sql .= " AND s.fk_pays IN (".$db->escape($search_country). if ($search_type_thirdparty) $sql .= " AND s.fk_typent IN (".$db->escape($search_type_thirdparty).')'; if ($search_ref) $sql .= natural_search('p.ref', $search_ref); if ($search_refcustomer) $sql .= natural_search('p.ref_client', $search_refcustomer); +if ($search_refproject) $sql .= natural_search('pr.ref', $search_refprojet); + if ($search_societe) $sql .= natural_search('s.nom', $search_societe); if ($search_login) $sql .= natural_search("u.login", $search_login); if ($search_montant_ht != '') $sql.= natural_search("p.total_ht", $search_montant_ht, 1); @@ -366,6 +378,7 @@ if ($resql) if ($search_year) $param.='&search_year='.urlencode($search_year); if ($search_ref) $param.='&search_ref='.urlencode($search_ref); if ($search_refcustomer) $param.='&search_refcustomer='.urlencode($search_refcustomer); + if ($search_refprojet) $param.='&search_refprojet='.urlencode($search_refprojet); if ($search_societe) $param.='&search_societe='.urlencode($search_societe); if ($search_user > 0) $param.='&search_user='.urlencode($search_user); if ($search_sale > 0) $param.='&search_sale='.urlencode($search_sale); @@ -476,6 +489,12 @@ if ($resql) print ''; print ''; } + if (! empty($arrayfields['pr.ref']['checked'])) + { + print ''; + print ''; + print ''; + } if (! empty($arrayfields['s.nom']['checked'])) { print ''; @@ -588,6 +607,7 @@ if ($resql) print ''; if (! empty($arrayfields['p.ref']['checked'])) print_liste_field_titre($arrayfields['p.ref']['label'],$_SERVER["PHP_SELF"],'p.ref','',$param,'',$sortfield,$sortorder); if (! empty($arrayfields['p.ref_client']['checked'])) print_liste_field_titre($arrayfields['p.ref_client']['label'],$_SERVER["PHP_SELF"],'p.ref_client','',$param,'',$sortfield,$sortorder); + if (! empty($arrayfields['pr.ref']['checked'])) print_liste_field_titre($arrayfields['pr.ref']['label'],$_SERVER["PHP_SELF"],'pr.ref','',$param,'',$sortfield,$sortorder); if (! empty($arrayfields['s.nom']['checked'])) print_liste_field_titre($arrayfields['s.nom']['label'],$_SERVER["PHP_SELF"],'s.nom','',$param,'',$sortfield,$sortorder); if (! empty($arrayfields['s.town']['checked'])) print_liste_field_titre($arrayfields['s.town']['label'],$_SERVER["PHP_SELF"],'s.town','',$param,'',$sortfield,$sortorder); if (! empty($arrayfields['s.zip']['checked'])) print_liste_field_titre($arrayfields['s.zip']['label'],$_SERVER["PHP_SELF"],'s.zip','',$param,'',$sortfield,$sortorder); @@ -670,6 +690,18 @@ if ($resql) if (! $i) $totalarray['nbfield']++; } + if (! empty($arrayfields['pr.ref']['checked'])) + { + // Project ref + print ''; + if ($obj->project_id) { + $projectstatic->fetch($obj->project_id); + print $projectstatic->getNomUrl(1); + } + print ''; + if (! $i) $totalarray['nbfield']++; + } + $companystatic->id=$obj->socid; $companystatic->name=$obj->name; $companystatic->client=$obj->client; From b70dd36ffa485888c08cc6c7b8eb32a9f8379001 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 24 Dec 2017 12:16:48 +0100 Subject: [PATCH 0032/1074] Better js comment --- htdocs/core/tpl/login.tpl.php | 2 +- htdocs/core/tpl/passwordforgotten.tpl.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php index d2c18e6f92f..14bdd8e4d9d 100644 --- a/htdocs/core/tpl/login.tpl.php +++ b/htdocs/core/tpl/login.tpl.php @@ -62,7 +62,7 @@ print top_htmlhead('', $titleofloginpage, 0, 0, $arrayofjs, array(), 0, $disable dol_use_jmobile)) { ?> diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php index bdcca51b4e7..30bc70b72cc 100644 --- a/htdocs/core/tpl/passwordforgotten.tpl.php +++ b/htdocs/core/tpl/passwordforgotten.tpl.php @@ -48,7 +48,7 @@ print top_htmlhead('',$langs->trans('SendNewPassword')); dol_use_jmobile)) { ?> From fdac3078e27fefe387fa0788462debdce475819f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 24 Dec 2017 14:42:51 +0100 Subject: [PATCH 0033/1074] Fix permissions --- htdocs/api/class/api_login.class.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/htdocs/api/class/api_login.class.php b/htdocs/api/class/api_login.class.php index 1273b843dd3..a1bcedc8fbe 100644 --- a/htdocs/api/class/api_login.class.php +++ b/htdocs/api/class/api_login.class.php @@ -36,7 +36,7 @@ class Login * * Request the API token for a couple username / password. * Using method POST is recommanded for security reasons (method GET is often logged by default by web servers with parameters so with login and pass into server log file). - * Both methods are provided for developer conveniance. Best is to not use at all the login API method and enter directly the "DOLAPIKEY" into field at the top right of page. Note: Tha API key (DOLAPIKEY) can be found/set on the user page. + * Both methods are provided for developer conveniance. Best is to not use at all the login API method and enter directly the "DOLAPIKEY" into field at the top right of page. Note: The API key (DOLAPIKEY) can be found/set on the user page. * * @param string $login User login * @param string $password User password @@ -86,10 +86,20 @@ class Login $tmpuser=new User($this->db); $tmpuser->fetch(0, $login, 0, 0, $entity); + if (empty($tmpuser->id)) + { + throw new RestException(500, 'Failed to load user'); + } // Renew the hash if (empty($tmpuser->api_key) || $reset) { + $tmpuser->getrights(); + if (empty($tmpuser->rights->user->self->creer)) + { + throw new RestException(403, 'User need write permission on itself to reset its API token'); + } + // Generate token for user $token = dol_hash($login.uniqid().$conf->global->MAIN_API_KEY,1); From 644e8b5a058149742826dcc98dcaacf04d7a187a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 24 Dec 2017 15:02:15 +0100 Subject: [PATCH 0034/1074] Fix navigation on stock --- htdocs/product/stock/card.php | 15 +++++++++------ htdocs/product/stock/info.php | 11 +++++++---- htdocs/product/stock/mouvement.php | 9 +++++---- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php index 97924d330ae..8ab36de3428 100644 --- a/htdocs/product/stock/card.php +++ b/htdocs/product/stock/card.php @@ -42,9 +42,11 @@ $action=GETPOST('action','aZ09'); $cancel=GETPOST('cancel','alpha'); $confirm=GETPOST('confirm'); +$id = GETPOST('id','int'); +$ref = GETPOST('ref','alpha'); + $sortfield = GETPOST("sortfield",'alpha'); $sortorder = GETPOST("sortorder",'alpha'); -$id = GETPOST("id",'int'); if (! $sortfield) $sortfield="p.ref"; if (! $sortorder) $sortorder="DESC"; @@ -259,13 +261,14 @@ if ($action == 'create') else { $id=GETPOST("id",'int'); - if ($id) + if ($id > 0 || $ref) { $object = new Entrepot($db); - $result = $object->fetch($id); - if ($result < 0) + $result = $object->fetch($id, $ref); + if ($result <= 0) { - dol_print_error($db); + print 'No record found'; + exit; } /* @@ -305,7 +308,7 @@ else $shownav = 1; if ($user->societe_id && ! in_array('stock', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0; - dol_banner_tab($object, 'id', $linkback, $shownav, 'rowid', 'libelle', $morehtmlref); + dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref', 'ref', $morehtmlref); print '
'; print '
'; diff --git a/htdocs/product/stock/info.php b/htdocs/product/stock/info.php index a088ac289b8..4d49a0c8514 100644 --- a/htdocs/product/stock/info.php +++ b/htdocs/product/stock/info.php @@ -28,6 +28,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/stock.lib.php'; $langs->load("stocks"); +$id = GETPOST('id','int'); +$ref = GETPOST('ref','alpha'); + // Security check $result=restrictedArea($user,'stock'); @@ -40,12 +43,12 @@ $help_url='EN:Module_Stocks_En|FR:Module_Stock|ES:Módulo_Stocks'; llxHeader("",$langs->trans("Stocks"),$help_url); $object = new Entrepot($db); -$object->fetch($_GET["id"]); -$object->info($_GET["id"]); +$object->fetch($id, $ref); +$object->info($object->id); $head = stock_prepare_head($object); -dol_fiche_head($head, 'info', $langs->trans("Warehouse"), 0, 'stock'); +dol_fiche_head($head, 'info', $langs->trans("Warehouse"), -1, 'stock'); $linkback = ''.$langs->trans("BackToList").''; @@ -57,7 +60,7 @@ $morehtmlref.='
'; $shownav = 1; if ($user->societe_id && ! in_array('stock', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0; -dol_banner_tab($object, 'id', $linkback, $shownav, 'rowid', 'libelle', $morehtmlref); +dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref', 'ref', $morehtmlref); print '
'; diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php index e1daefd3e19..e7329f1d44a 100644 --- a/htdocs/product/stock/mouvement.php +++ b/htdocs/product/stock/mouvement.php @@ -48,6 +48,7 @@ if (! empty($conf->productbatch->enabled)) $langs->load("productbatch"); $result=restrictedArea($user,'stock'); $id=GETPOST('id','int'); +$ref = GETPOST('ref','alpha'); $msid=GETPOST('msid','int'); $product_id=GETPOST("product_id"); $action=GETPOST('action','aZ09'); @@ -487,9 +488,9 @@ if ($resql) { $product->fetch($idproduct); } - if ($id > 0) + if ($id > 0 || $ref) { - $result = $object->fetch($id); + $result = $object->fetch($id, $ref); if ($result < 0) { dol_print_error($db); @@ -514,7 +515,7 @@ if ($resql) /* * Show tab only if we ask a particular warehouse */ - if ($id) + if ($object->id > 0) { $head = stock_prepare_head($object); @@ -530,7 +531,7 @@ if ($resql) $shownav = 1; if ($user->societe_id && ! in_array('stock', explode(',',$conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav=0; - dol_banner_tab($object, 'id', $linkback, $shownav, 'rowid', 'libelle', $morehtmlref); + dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref', 'ref', $morehtmlref); print '
'; From 768cc19bbc10954eac1b8738324c778597d75f17 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 24 Dec 2017 15:07:06 +0100 Subject: [PATCH 0035/1074] Fix protection on tpl to avoid direct url call --- htdocs/core/tpl/bloc_comment.tpl.php | 8 ++++++++ htdocs/core/tpl/card_presend.tpl.php | 9 ++++++++- htdocs/core/tpl/commonfields_add.tpl.php | 8 ++++++++ htdocs/core/tpl/commonfields_edit.tpl.php | 8 ++++++++ htdocs/core/tpl/commonfields_view.tpl.php | 8 ++++++++ htdocs/core/tpl/extrafields_add.tpl.php | 8 ++++++++ htdocs/core/tpl/extrafields_edit.tpl.php | 8 ++++++++ htdocs/core/tpl/extrafields_list_print_fields.tpl.php | 8 ++++++++ htdocs/core/tpl/extrafields_list_search_input.tpl.php | 8 ++++++++ htdocs/core/tpl/extrafields_list_search_param.tpl.php | 8 ++++++++ htdocs/core/tpl/extrafields_list_search_sql.tpl.php | 8 ++++++++ htdocs/core/tpl/extrafields_list_search_title.tpl.php | 8 ++++++++ htdocs/core/tpl/filemanager.tpl.php | 8 ++++++++ htdocs/core/tpl/onlinepaymentlinks.tpl.php | 7 +++++++ 14 files changed, 111 insertions(+), 1 deletion(-) diff --git a/htdocs/core/tpl/bloc_comment.tpl.php b/htdocs/core/tpl/bloc_comment.tpl.php index 48b0e0c990f..473c42eb42f 100644 --- a/htdocs/core/tpl/bloc_comment.tpl.php +++ b/htdocs/core/tpl/bloc_comment.tpl.php @@ -1,4 +1,12 @@ load("mails"); diff --git a/htdocs/core/tpl/commonfields_add.tpl.php b/htdocs/core/tpl/commonfields_add.tpl.php index 7179719e7db..5e1f02489f9 100644 --- a/htdocs/core/tpl/commonfields_add.tpl.php +++ b/htdocs/core/tpl/commonfields_add.tpl.php @@ -20,6 +20,14 @@ * $conf * $langs */ + +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + ?> attribute_label) && count($extrafields->attribute_label)) { diff --git a/htdocs/core/tpl/extrafields_list_search_input.tpl.php b/htdocs/core/tpl/extrafields_list_search_input.tpl.php index 8a65021b240..c3e3effc05d 100644 --- a/htdocs/core/tpl/extrafields_list_search_input.tpl.php +++ b/htdocs/core/tpl/extrafields_list_search_input.tpl.php @@ -1,4 +1,12 @@ attribute_label) && count($extrafields->attribute_label)) { diff --git a/htdocs/core/tpl/extrafields_list_search_param.tpl.php b/htdocs/core/tpl/extrafields_list_search_param.tpl.php index 9bb6fefe8b0..6cda8721dcd 100644 --- a/htdocs/core/tpl/extrafields_list_search_param.tpl.php +++ b/htdocs/core/tpl/extrafields_list_search_param.tpl.php @@ -1,4 +1,12 @@ $val) { diff --git a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php index ed4fae40213..7006a54351b 100644 --- a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php +++ b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php @@ -1,4 +1,12 @@ $val) { diff --git a/htdocs/core/tpl/extrafields_list_search_title.tpl.php b/htdocs/core/tpl/extrafields_list_search_title.tpl.php index bfda64d8464..8b986b1e4e6 100644 --- a/htdocs/core/tpl/extrafields_list_search_title.tpl.php +++ b/htdocs/core/tpl/extrafields_list_search_title.tpl.php @@ -1,4 +1,12 @@ attribute_label) && count($extrafields->attribute_label)) { diff --git a/htdocs/core/tpl/filemanager.tpl.php b/htdocs/core/tpl/filemanager.tpl.php index d47853cbe5a..4399b62851a 100644 --- a/htdocs/core/tpl/filemanager.tpl.php +++ b/htdocs/core/tpl/filemanager.tpl.php @@ -17,6 +17,14 @@ * Output code for the filemanager * $module must be defined ('ecm', 'medias', ...) */ + +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + ?> diff --git a/htdocs/core/tpl/onlinepaymentlinks.tpl.php b/htdocs/core/tpl/onlinepaymentlinks.tpl.php index 8650ab4110d..27ba8b994b4 100644 --- a/htdocs/core/tpl/onlinepaymentlinks.tpl.php +++ b/htdocs/core/tpl/onlinepaymentlinks.tpl.php @@ -15,6 +15,13 @@ * along with this program. If not, see . */ +// Protection to avoid direct call of template +if (empty($conf) || ! is_object($conf)) +{ + print "Error, template page can't be called as URL"; + exit; +} + require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php'; print ''; From a9c7dc48abfaa23a0411535576472daf4cbb1a23 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Sun, 24 Dec 2017 17:31:31 +0100 Subject: [PATCH 0036/1074] New option to force e-mail recipient, helpful for test purposes --- htdocs/admin/mails.php | 11 +++++++++++ htdocs/core/class/CMailFile.class.php | 8 +++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index d482322a054..677e6099a8d 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -70,6 +70,7 @@ complete_substitutions_array($substitutionarrayfortest, $langs); if ($action == 'update' && empty($_POST["cancel"])) { dolibarr_set_const($db, "MAIN_DISABLE_ALL_MAILS", GETPOST("MAIN_DISABLE_ALL_MAILS"),'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_MAIL_FORCE_SENDTO", GETPOST("MAIN_MAIL_FORCE_SENDTO"),'chaine',0,'',$conf->entity); // Send mode parameters dolibarr_set_const($db, "MAIN_MAIL_SENDMODE", GETPOST("MAIN_MAIL_SENDMODE"),'chaine',0,'',$conf->entity); dolibarr_set_const($db, "MAIN_MAIL_SMTP_PORT", GETPOST("MAIN_MAIL_SMTP_PORT"),'chaine',0,'',$conf->entity); @@ -238,6 +239,11 @@ if ($action == 'edit') print ''.$langs->trans("MAIN_DISABLE_ALL_MAILS").''; print $form->selectyesno('MAIN_DISABLE_ALL_MAILS',$conf->global->MAIN_DISABLE_ALL_MAILS,1); print ''; + + // Force e-mail recipient + print ''.$langs->trans("MAIN_MAIL_FORCE_SENDTO").''; + print ''; + print ''; // Separator @@ -477,6 +483,11 @@ else // Disable print ''.$langs->trans("MAIN_DISABLE_ALL_MAILS").''.yn($conf->global->MAIN_DISABLE_ALL_MAILS).''; + + // Force e-mail recipient + print ''.$langs->trans("MAIN_MAIL_FORCE_SENDTO").''.$conf->global->MAIN_MAIL_FORCE_SENDTO; + if (! empty($conf->global->MAIN_MAIL_FORCE_SENDTO) && ! isValidEmail($conf->global->MAIN_MAIL_FORCE_SENDTO)) print img_warning($langs->trans("ErrorBadEMail")); + print ''; // Separator diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php index 86a6cb008d3..c79b7ac0cea 100644 --- a/htdocs/core/class/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -495,7 +495,7 @@ class CMailFile $res=false; - if (empty($conf->global->MAIN_DISABLE_ALL_MAILS)) + if (empty($conf->global->MAIN_DISABLE_ALL_MAILS) || !empty($conf->global->MAIN_MAIL_FORCE_SENDTO)) { require_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php'; $hookmanager = new HookManager($db); @@ -557,6 +557,12 @@ class CMailFile $keyfortls ='MAIN_MAIL_EMAIL_TLS_EMAILING'; $keyforstarttls ='MAIN_MAIL_EMAIL_STARTTLS_EMAILING'; } + + if(!empty($conf->global->MAIN_MAIL_FORCE_SENDTO)) { + $this->addr_to = $conf->global->MAIN_MAIL_FORCE_SENDTO; + $this->addr_cc = ''; + $this->addr_bcc = ''; + } // Action according to choosed sending method if ($this->sendmode == 'mail') From 1c7b99d3dcd08e0a545ae4feeb0d7922047d52a7 Mon Sep 17 00:00:00 2001 From: Ferran Marcet Date: Tue, 26 Dec 2017 12:13:35 +0100 Subject: [PATCH 0037/1074] Fix: Missing include for Project class --- htdocs/comm/propal/document.php | 4 ++++ htdocs/comm/propal/info.php | 4 ++++ htdocs/comm/propal/note.php | 4 ++++ htdocs/commande/document.php | 4 ++++ htdocs/commande/info.php | 4 ++++ htdocs/commande/note.php | 4 ++++ htdocs/compta/facture/contact.php | 4 ++++ htdocs/compta/facture/document.php | 4 ++++ htdocs/compta/facture/info.php | 4 ++++ htdocs/compta/facture/note.php | 4 ++++ htdocs/compta/facture/prelevement.php | 4 ++++ htdocs/contrat/contact.php | 4 ++++ htdocs/contrat/document.php | 4 ++++ htdocs/contrat/info.php | 4 ++++ htdocs/contrat/note.php | 4 ++++ htdocs/fichinter/document.php | 4 ++++ htdocs/fichinter/info.php | 4 ++++ htdocs/fichinter/note.php | 4 ++++ htdocs/fourn/commande/contact.php | 4 ++++ htdocs/fourn/commande/document.php | 4 ++++ htdocs/fourn/commande/info.php | 4 ++++ htdocs/fourn/commande/note.php | 4 ++++ htdocs/fourn/facture/contact.php | 4 ++++ htdocs/fourn/facture/document.php | 4 ++++ htdocs/fourn/facture/info.php | 4 ++++ htdocs/fourn/facture/note.php | 4 ++++ htdocs/loan/document.php | 4 ++++ htdocs/loan/info.php | 4 ++++ htdocs/loan/note.php | 4 ++++ htdocs/supplier_proposal/document.php | 4 ++++ htdocs/supplier_proposal/info.php | 4 ++++ htdocs/supplier_proposal/note.php | 4 ++++ 32 files changed, 128 insertions(+) diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php index 3a9f3a98e26..ba373c78f44 100644 --- a/htdocs/comm/propal/document.php +++ b/htdocs/comm/propal/document.php @@ -4,6 +4,7 @@ * Copyright (C) 2005 Marc Barilley / Ocebo * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2013 Cédric Salvador + * Copyright (C) 2017 Ferran Marcet * * 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 @@ -31,6 +32,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +if (! empty($conf->projet->enabled)) { + require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; +} $langs->load('compta'); $langs->load('other'); diff --git a/htdocs/comm/propal/info.php b/htdocs/comm/propal/info.php index a94eeaa092c..67cc8210402 100644 --- a/htdocs/comm/propal/info.php +++ b/htdocs/comm/propal/info.php @@ -2,6 +2,7 @@ /* Copyright (C) 2004 Rodolphe Quiedeville * Copyright (C) 2004-2006 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2017 Ferran Marcet * * 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,9 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php'; +if (! empty($conf->projet->enabled)) { + require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; +} $langs->load('propal'); $langs->load('compta'); diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php index 29fc43b0899..17e53b89948 100644 --- a/htdocs/comm/propal/note.php +++ b/htdocs/comm/propal/note.php @@ -4,6 +4,7 @@ * Copyright (C) 2004 Eric Seigne * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2013 Florian Henry + * Copyright (C) 2017 Ferran Marcet * * 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,6 +29,9 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php'; +if (! empty($conf->projet->enabled)) { + require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; +} $langs->load('propal'); $langs->load('compta'); diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php index d69ec07360a..ee688bed307 100644 --- a/htdocs/commande/document.php +++ b/htdocs/commande/document.php @@ -4,6 +4,7 @@ * Copyright (C) 2005 Marc Barilley / Ocebo * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2013 Cédric Salvador + * Copyright (C) 2017 Ferran Marcet * * 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 @@ -31,6 +32,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; require_once DOL_DOCUMENT_ROOT .'/commande/class/commande.class.php'; +if (! empty($conf->projet->enabled)) { + require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; +} $langs->load('companies'); diff --git a/htdocs/commande/info.php b/htdocs/commande/info.php index 05adc9def54..518ab856474 100644 --- a/htdocs/commande/info.php +++ b/htdocs/commande/info.php @@ -1,6 +1,7 @@ * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2017 Ferran Marcet * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,6 +27,9 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php'; +if (! empty($conf->projet->enabled)) { + require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; +} if (!$user->rights->commande->lire) accessforbidden(); diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php index 0d42cc69611..6598805490d 100644 --- a/htdocs/commande/note.php +++ b/htdocs/commande/note.php @@ -3,6 +3,7 @@ * Copyright (C) 2004-2016 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2013 Florian Henry + * Copyright (C) 2017 Ferran Marcet * * 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,9 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php'; require_once DOL_DOCUMENT_ROOT .'/commande/class/commande.class.php'; +if (! empty($conf->projet->enabled)) { + require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; +} $langs->load("companies"); diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php index 93b23834e9f..f4b9ef5f5c7 100644 --- a/htdocs/compta/facture/contact.php +++ b/htdocs/compta/facture/contact.php @@ -3,6 +3,7 @@ * Copyright (C) 2005-2009 Destailleur Laurent * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2011-2015 Philippe Grand + * Copyright (C) 2017 Ferran Marcet * * 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 @@ -30,6 +31,9 @@ require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; +if (! empty($conf->projet->enabled)) { + require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; +} $langs->load("bills"); $langs->load("companies"); diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php index 1ab0d7ceb93..b559003007b 100644 --- a/htdocs/compta/facture/document.php +++ b/htdocs/compta/facture/document.php @@ -4,6 +4,7 @@ * Copyright (C) 2005 Marc Barilley / Ocebo * Copyright (C) 2005-2011 Regis Houssin * Copyright (C) 2013 Cédric Salvador + * Copyright (C) 2017 Ferran Marcet * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -32,6 +33,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +if (! empty($conf->projet->enabled)) { + require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; +} $langs->load('propal'); $langs->load('compta'); diff --git a/htdocs/compta/facture/info.php b/htdocs/compta/facture/info.php index fd43cc42982..5d8750fef60 100644 --- a/htdocs/compta/facture/info.php +++ b/htdocs/compta/facture/info.php @@ -1,6 +1,7 @@ * Copyright (C) 2004-2005 Laurent Destailleur + * Copyright (C) 2017 Ferran Marcet * * 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,9 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php'; +if (! empty($conf->projet->enabled)) { + require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; +} $langs->load("companies"); $langs->load("bills"); diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php index 223480e4ba8..f179a9bd3d3 100644 --- a/htdocs/compta/facture/note.php +++ b/htdocs/compta/facture/note.php @@ -3,6 +3,7 @@ * Copyright (C) 2004-2016 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2013 Florian Henry + * Copyright (C) 2017 Ferran Marcet * * 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,6 +29,9 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php'; +if (! empty($conf->projet->enabled)) { + require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; +} $langs->load("companies"); $langs->load("bills"); diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index e9b1694808b..0b5791ea351 100644 --- a/htdocs/compta/facture/prelevement.php +++ b/htdocs/compta/facture/prelevement.php @@ -4,6 +4,7 @@ * Copyright (C) 2004-2016 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2010-2014 Juanjo Menent + * Copyright (C) 2017 Ferran Marcet * * 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 @@ -30,6 +31,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php'; require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; +if (! empty($conf->projet->enabled)) { + require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; +} if (!$user->rights->facture->lire) accessforbidden(); diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php index 8510888cf35..f975e979767 100644 --- a/htdocs/contrat/contact.php +++ b/htdocs/contrat/contact.php @@ -2,6 +2,7 @@ /* Copyright (C) 2005 Patrick Rouillon * Copyright (C) 2005-2009 Destailleur Laurent * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2017 Ferran Marcet * * 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,6 +29,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php'; require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; +if (! empty($conf->projet->enabled)) { + require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; +} $langs->load("contracts"); diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php index 132ab187777..8d5d99603e8 100644 --- a/htdocs/contrat/document.php +++ b/htdocs/contrat/document.php @@ -5,6 +5,7 @@ * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2005 Simon TOSSER * Copyright (C) 2013 Cédric Salvador + * Copyright (C) 2017 Ferran Marcet * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -32,6 +33,9 @@ require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +if (! empty($conf->projet->enabled)) { + require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; +} $langs->load("other"); $langs->load("products"); diff --git a/htdocs/contrat/info.php b/htdocs/contrat/info.php index 95ab0b9ca25..a986a633201 100644 --- a/htdocs/contrat/info.php +++ b/htdocs/contrat/info.php @@ -1,5 +1,6 @@ + * Copyright (C) 2017 Ferran Marcet * * 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,6 +26,9 @@ require ("../main.inc.php"); require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php'; require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; +if (! empty($conf->projet->enabled)) { + require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; +} $langs->load("contracts"); diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php index 7d4927d19b8..0b301600978 100644 --- a/htdocs/contrat/note.php +++ b/htdocs/contrat/note.php @@ -2,6 +2,7 @@ /* Copyright (C) 2004 Rodolphe Quiedeville * Copyright (C) 2004-2016 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2017 Ferran Marcet * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,6 +27,9 @@ require ("../main.inc.php"); require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php'; require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; +if (! empty($conf->projet->enabled)) { + require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; +} $langs->load("companies"); $langs->load("contracts"); diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php index 3d5a3c544e8..b257afd3d3b 100644 --- a/htdocs/fichinter/document.php +++ b/htdocs/fichinter/document.php @@ -6,6 +6,7 @@ * Copyright (C) 2005 Simon TOSSER * Copyright (C) 2011-2012 Juanjo Menent * Copyright (C) 2013 Cédric Salvador + * Copyright (C) 2017 Ferran Marcet * * 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,6 +34,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +if (! empty($conf->projet->enabled)) { + require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; +} $langs->load("other"); $langs->load("fichinter"); diff --git a/htdocs/fichinter/info.php b/htdocs/fichinter/info.php index a32cda9bb57..4e59d44b98c 100644 --- a/htdocs/fichinter/info.php +++ b/htdocs/fichinter/info.php @@ -2,6 +2,7 @@ /* Copyright (C) 2005-2009 Regis Houssin * Copyright (C) 2009-2016 Laurent Destailleur * Copyright (C) 2011 Juanjo Menent + * Copyright (C) 2017 Ferran Marcet * * 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,9 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php'; +if (! empty($conf->projet->enabled)) { + require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; +} $langs->load('companies'); $langs->load("interventions"); diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php index 43a2654d1fd..d5a58b1578e 100644 --- a/htdocs/fichinter/note.php +++ b/htdocs/fichinter/note.php @@ -2,6 +2,7 @@ /* Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2011-2012 Juanjo Menent * Copyright (C) 2013 Florian Henry + * Copyright (C) 2017 Ferran Marcet * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,6 +27,9 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php'; +if (! empty($conf->projet->enabled)) { + require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; +} $langs->load('companies'); $langs->load("interventions"); diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php index 564057d991a..ce9ce39ac4a 100644 --- a/htdocs/fourn/commande/contact.php +++ b/htdocs/fourn/commande/contact.php @@ -2,6 +2,7 @@ /* Copyright (C) 2005 Patrick Rouillon * Copyright (C) 2005-2009 Destailleur Laurent * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2017 Ferran Marcet * * 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,6 +29,9 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; +if (! empty($conf->projet->enabled)) { + require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; +} $langs->load("facture"); $langs->load("orders"); diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php index 700ce7a770a..df04b06939c 100644 --- a/htdocs/fourn/commande/document.php +++ b/htdocs/fourn/commande/document.php @@ -5,6 +5,7 @@ * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2012 Marcos García * Copyright (C) 2013 Cédric Salvador + * Copyright (C) 2017 Ferran Marcet * * 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,6 +34,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; +if (! empty($conf->projet->enabled)) { + require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; +} $langs->load('orders'); $langs->load('other'); diff --git a/htdocs/fourn/commande/info.php b/htdocs/fourn/commande/info.php index 25dc8932049..67d57b658fd 100644 --- a/htdocs/fourn/commande/info.php +++ b/htdocs/fourn/commande/info.php @@ -2,6 +2,7 @@ /* Copyright (C) 2003-2005 Rodolphe Quiedeville * Copyright (C) 2004-2016 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2017 Ferran Marcet * * 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,6 +29,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +if (! empty($conf->projet->enabled)) { + require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; +} $langs->load("orders"); $langs->load("suppliers"); diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php index 45e4bd80e3a..85c7094265b 100644 --- a/htdocs/fourn/commande/note.php +++ b/htdocs/fourn/commande/note.php @@ -3,6 +3,7 @@ * Copyright (C) 2004-2016 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * Copyright (C) 2012 Marcos García + * Copyright (C) 2017 Ferran Marcet * * 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,9 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; +if (! empty($conf->projet->enabled)) { + require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; +} $langs->load("orders"); $langs->load("suppliers"); diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php index 0f56c5f7bae..6a9d4662e4b 100644 --- a/htdocs/fourn/facture/contact.php +++ b/htdocs/fourn/facture/contact.php @@ -2,6 +2,7 @@ /* Copyright (C) 2005 Patrick Rouillon * Copyright (C) 2005-2015 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2017 Ferran Marcet * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,6 +30,9 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; +if (! empty($conf->projet->enabled)) { + require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; +} $langs->load("bills"); $langs->load('other'); diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php index 180e72e8262..6ed13c68ff7 100644 --- a/htdocs/fourn/facture/document.php +++ b/htdocs/fourn/facture/document.php @@ -5,6 +5,7 @@ * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2013 Cédric Salvador * Copyright (C) 2016 Alexandre Spangaro + * Copyright (C) 2017 Ferran Marcet * * 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,6 +34,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +if (! empty($conf->projet->enabled)) { + require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; +} $langs->load('bills'); $langs->load('other'); diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php index 73d6b94a0d6..6a0410a7334 100644 --- a/htdocs/fourn/facture/info.php +++ b/htdocs/fourn/facture/info.php @@ -3,6 +3,7 @@ * Copyright (C) 2004-2006 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * Copyright (C) 2016 Alexandre Spangaro + * Copyright (C) 2017 Ferran Marcet * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,6 +30,9 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +if (! empty($conf->projet->enabled)) { + require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; +} $langs->load('bills'); diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php index 9df425040e1..a722a72cb72 100644 --- a/htdocs/fourn/facture/note.php +++ b/htdocs/fourn/facture/note.php @@ -3,6 +3,7 @@ * Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2013 Florian Henry + * Copyright (C) 2017 Ferran Marcet * * 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,6 +29,9 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; +if (! empty($conf->projet->enabled)) { + require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; +} $langs->load('bills'); $langs->load("companies"); diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php index b43261d2b9d..30f1efc69f7 100644 --- a/htdocs/loan/document.php +++ b/htdocs/loan/document.php @@ -1,5 +1,6 @@ + * Copyright (C) 2017 Ferran Marcet * * 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,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +if (! empty($conf->projet->enabled)) { + require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; +} $langs->load("other"); $langs->load("companies"); diff --git a/htdocs/loan/info.php b/htdocs/loan/info.php index 64987afa8b5..ea7237cdd34 100644 --- a/htdocs/loan/info.php +++ b/htdocs/loan/info.php @@ -1,5 +1,6 @@ + * Copyright (C) 2017 Ferran Marcet * * 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,6 +26,9 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +if (! empty($conf->projet->enabled)) { + require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; +} $langs->load("compta"); $langs->load("bills"); diff --git a/htdocs/loan/note.php b/htdocs/loan/note.php index 5f435444f32..8f64036f819 100644 --- a/htdocs/loan/note.php +++ b/htdocs/loan/note.php @@ -5,6 +5,7 @@ * Copyright (C) 2013 Florian Henry * Copyright (C) 2015 Frederic France * Copyright (C) 2016 Alexandre Spangaro + * Copyright (C) 2017 Ferran Marcet * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,6 +30,9 @@ require '../main.inc.php'; require_once(DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php'); require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php'; +if (! empty($conf->projet->enabled)) { + require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; +} $action = GETPOST('action','aZ09'); diff --git a/htdocs/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php index 4985fd34629..b3f28d13007 100644 --- a/htdocs/supplier_proposal/document.php +++ b/htdocs/supplier_proposal/document.php @@ -4,6 +4,7 @@ * Copyright (C) 2005 Marc Barilley / Ocebo * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2013 Cédric Salvador + * Copyright (C) 2017 Ferran Marcet * * 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 @@ -31,6 +32,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/supplier_proposal.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +if (! empty($conf->projet->enabled)) { + require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; +} $langs->load('compta'); $langs->load('other'); diff --git a/htdocs/supplier_proposal/info.php b/htdocs/supplier_proposal/info.php index 8cee304e3bb..e5b038ad85e 100644 --- a/htdocs/supplier_proposal/info.php +++ b/htdocs/supplier_proposal/info.php @@ -2,6 +2,7 @@ /* Copyright (C) 2004 Rodolphe Quiedeville * Copyright (C) 2004-2006 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2017 Ferran Marcet * * 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,9 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/supplier_proposal.lib.php'; +if (! empty($conf->projet->enabled)) { + require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; +} $langs->load('supplier_proposal'); $langs->load('compta'); diff --git a/htdocs/supplier_proposal/note.php b/htdocs/supplier_proposal/note.php index 10a9668382c..f17b7d6b6f9 100644 --- a/htdocs/supplier_proposal/note.php +++ b/htdocs/supplier_proposal/note.php @@ -4,6 +4,7 @@ * Copyright (C) 2004 Eric Seigne * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2013 Florian Henry + * Copyright (C) 2017 Ferran Marcet * * 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,6 +29,9 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/supplier_proposal.lib.php'; +if (! empty($conf->projet->enabled)) { + require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php'; +} $langs->load('supplier_proposal'); $langs->load('compta'); From 80618d56ac763c0309590209ef64bd5188cee431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 26 Dec 2017 16:12:28 +0100 Subject: [PATCH 0038/1074] Update propal.class.php --- htdocs/comm/propal/class/propal.class.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 1386baa6b45..afc0fa76191 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -1573,6 +1573,7 @@ class Propal extends CommonObject $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.= ' p.weight, p.weight_units, p.volume, p.volume_units,'; $sql.= ' d.date_start, d.date_end'; $sql.= ' ,d.fk_multicurrency, d.multicurrency_code, d.multicurrency_subprice, d.multicurrency_total_ht, d.multicurrency_total_tva, d.multicurrency_total_ttc'; $sql.= ' FROM '.MAIN_DB_PREFIX.'propaldet as d'; @@ -1638,6 +1639,10 @@ class Propal extends CommonObject $line->product_desc = $objp->product_desc; // Description produit $line->fk_product_type = $objp->fk_product_type; $line->fk_unit = $objp->fk_unit; + $line->weight = $objp->weight; + $line->weight_units = $objp->weight_units; + $line->volume = $objp->volume; + $line->volume_units = $objp->volume_units; $line->date_start = $this->db->jdate($objp->date_start); $line->date_end = $this->db->jdate($objp->date_end); From d770f732193e97811ec9f94fd3d1e8b6a07ed009 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Tue, 26 Dec 2017 16:21:15 +0100 Subject: [PATCH 0039/1074] Add option translation --- htdocs/langs/en_US/admin.lang | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index a4ece445581..e2c39c45a3d 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -272,6 +272,7 @@ MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: < MAIN_MAIL_ERRORS_TO=Sender email used for error returns emails sent MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos) +MAIN_MAIL_FORCE_SENDTO=Send all emails to (instead of real recipients, for test purposes) MAIN_MAIL_SENDMODE=Method to use to send EMails MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required From 59a89b250da4b2b6ac8465b07161355af3c5bb08 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 27 Dec 2017 11:56:58 +0100 Subject: [PATCH 0040/1074] Fix: avoid warning (https://github.com/Dolibarr/dolibarr/issues/7993) --- htdocs/core/lib/ajax.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php index dc86a2ef9f3..1fc5e23ebb4 100644 --- a/htdocs/core/lib/ajax.lib.php +++ b/htdocs/core/lib/ajax.lib.php @@ -414,7 +414,7 @@ function ajax_combobox($htmlname, $events=array(), $minLengthToAutocomplete=0, $ if ($forcefocus) $msg.= '.select2(\'focus\')'; $msg.= ';'."\n"; - if (count($events)) // If an array of js events to do were provided. + if (is_array($events) && count($events)) // If an array of js events to do were provided. { $msg.= ' jQuery("#'.$htmlname.'").change(function () { From 6f107e3fee71fbb381794446e0bfabe9e11d01ea Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 27 Dec 2017 15:48:20 +0100 Subject: [PATCH 0041/1074] Fix API to download/build doc --- htdocs/api/class/api_documents.class.php | 206 ++++++++++++++++------- htdocs/api/class/api_login.class.php | 4 +- htdocs/core/lib/files.lib.php | 15 +- 3 files changed, 161 insertions(+), 64 deletions(-) diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php index fcc221d5e9e..df2ca288f35 100644 --- a/htdocs/api/class/api_documents.class.php +++ b/htdocs/api/class/api_documents.class.php @@ -58,19 +58,16 @@ class Documents extends DolibarrApi * * @param string $module_part Name of module or area concerned by file download ('facture', ...) * @param string $original_file Relative path with filename, relative to modulepart (for example: IN201701-999/IN201701-999.pdf) - * @param int $regeneratedoc If requested document is the main document of an object, setting this to 1 ask API to regenerate document before returning it (supported for some module_part only). It is no effect in other cases. - * Also, note that setting this to 1 nead write access on object. * @return array List of documents * - * @throws 500 - * @throws 501 * @throws 400 * @throws 401 + * @throws 404 * @throws 200 * * @url GET /download */ - public function index($module_part, $original_file='', $regeneratedoc=0) + public function index($module_part, $original_file='') { global $conf, $langs; @@ -78,13 +75,13 @@ class Documents extends DolibarrApi throw new RestException(400, 'bad value for parameter modulepart'); } if (empty($original_file)) { - throw new RestException(400, 'bad value for parameter ref or subdir'); + throw new RestException(400, 'bad value for parameter original_file'); } //--- Finds and returns the document $entity=$conf->entity; - $check_access = dol_check_secure_access_document($module_part, $original_file, $entity, DolibarrApiAccess::$user, '', ($regeneratedoc ? 'write' : 'read')); + $check_access = dol_check_secure_access_document($module_part, $original_file, $entity, DolibarrApiAccess::$user, '', 'read'); $accessallowed = $check_access['accessallowed']; $sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals']; $original_file = $check_access['original_file']; @@ -97,42 +94,6 @@ class Documents extends DolibarrApi throw new RestException(401); } - // --- Generates the document - if ($regeneratedoc) - { - $hidedetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 0 : 1; - $hidedesc = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 0 : 1; - $hideref = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 0 : 1; - - if ($module_part == 'facture' || $module_part == 'invoice') - { - require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; - $this->invoice = new Facture($this->db); - $result = $this->invoice->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file))); - if( ! $result ) { - throw new RestException(404, 'Invoice not found'); - } - $result = $this->invoice->generateDocument($this->invoice->modelpdf, $langs, $hidedetails, $hidedesc, $hideref); - if( $result <= 0 ) { - throw new RestException(500, 'Error generating document'); - } - } - if ($module_part == 'commande' || $module_part == 'order') - { - require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; - $this->order = new Commande($this->db); - $result = $this->order->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file))); - if( ! $result ) { - throw new RestException(404, 'Order not found'); - } - $result = $this->order->generateDocument($this->order->modelpdf, $langs, $hidedetails, $hidedesc, $hideref); - if( $result <= 0 ) { - throw new RestException(500, 'Error generating document'); - } - } - - } - $filename = basename($original_file); $original_file_osencoded=dol_osencode($original_file); // New file name encoded in OS encoding charset @@ -145,6 +106,114 @@ class Documents extends DolibarrApi return array('filename'=>$filename, 'content'=>base64_encode($file_content), 'encoding'=>'MIME base64 (base64_encode php function, http://php.net/manual/en/function.base64-encode.php)' ); } + + /** + * Build a document. + * + * Test sample 1: { "module_part": "invoice", "original_file": "FA1701-001/FA1701-001.pdf", "doctemplate": "crabe", "langcode": "fr_FR" }. + * + * @param string $module_part Name of module or area concerned by file download ('invoice', 'order', ...). + * @param string $original_file Relative path with filename, relative to modulepart (for example: IN201701-999/IN201701-999.pdf). + * @param string $doctemplate Set here the doc template to use for document generation (If not set, use the default template). + * @param string $langcode Language code like 'en_US', 'fr_FR', 'es_ES', ... (If not set, use the default language). + * @return array List of documents + * + * @throws 500 + * @throws 501 + * @throws 400 + * @throws 401 + * @throws 404 + * @throws 200 + * + * @url PUT /builddoc + */ + public function builddoc($module_part, $original_file='', $doctemplate='', $langcode='') + { + global $conf, $langs; + + if (empty($module_part)) { + throw new RestException(400, 'bad value for parameter modulepart'); + } + if (empty($original_file)) { + throw new RestException(400, 'bad value for parameter original_file'); + } + + $outputlangs = $langs; + if ($langcode && $langs->defaultlang != $langcode) + { + $outputlangs=new Translate('', $conf); + $outputlangs->setDefaultLang($langcode); + } + + //--- Finds and returns the document + $entity=$conf->entity; + + $check_access = dol_check_secure_access_document($module_part, $original_file, $entity, DolibarrApiAccess::$user, '', 'write'); + $accessallowed = $check_access['accessallowed']; + $sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals']; + $original_file = $check_access['original_file']; + + if (preg_match('/\.\./',$original_file) || preg_match('/[<>|]/',$original_file)) { + throw new RestException(401); + } + if (!$accessallowed) { + throw new RestException(401); + } + + // --- Generates the document + $hidedetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 0 : 1; + $hidedesc = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 0 : 1; + $hideref = empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 0 : 1; + + $templateused=''; + + if ($module_part == 'facture' || $module_part == 'invoice') + { + require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; + $this->invoice = new Facture($this->db); + $result = $this->invoice->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file))); + if( ! $result ) { + throw new RestException(404, 'Invoice not found'); + } + + $templateused = $doctemplate?$doctemplate:$this->invoice->modelpdf; + $result = $this->invoice->generateDocument($templateused, $outputlangs, $hidedetails, $hidedesc, $hideref); + if( $result <= 0 ) { + throw new RestException(500, 'Error generating document'); + } + } + elseif ($module_part == 'commande' || $module_part == 'order') + { + require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; + $this->order = new Commande($this->db); + $result = $this->order->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file))); + if( ! $result ) { + throw new RestException(404, 'Order not found'); + } + $templateused = $doctemplate?$doctemplate:$this->order->modelpdf; + $result = $this->order->generateDocument($templateused, $outputlangs, $hidedetails, $hidedesc, $hideref); + if( $result <= 0 ) { + throw new RestException(500, 'Error generating document'); + } + } + else + { + throw new RestException(403, 'Generation not available for this modulepart'); + } + + $filename = basename($original_file); + $original_file_osencoded=dol_osencode($original_file); // New file name encoded in OS encoding charset + + if (! file_exists($original_file_osencoded)) + { + throw new RestException(404, 'File not found'); + } + + $file_content=file_get_contents($original_file_osencoded); + return array('filename'=>$filename, 'content'=>base64_encode($file_content), 'langcode'=>$outputlangs->defaultlang, 'template'=>$templateused, 'encoding'=>'MIME base64 (base64_encode php function, http://php.net/manual/en/function.base64-encode.php)' ); + } + + /** * Return the list of documents of a dedicated element (from its ID or Ref) * @@ -155,7 +224,11 @@ class Documents extends DolibarrApi * @param string $sortorder Sort order ('asc' or 'desc') * @return array Array of documents with path * - * @throws RestException + * @throws 200 + * @throws 400 + * @throws 401 + * @throws 404 + * @throws 500 * * @url GET / */ @@ -301,19 +374,23 @@ class Documents extends DolibarrApi * Upload a file. * * Test sample 1: { "filename": "mynewfile.txt", "modulepart": "facture", "ref": "FA1701-001", "subdir": "", "filecontent": "content text", "fileencoding": "", "overwriteifexists": "0" }. - * Test sample 2: { "filename": "mynewfile.txt", "modulepart": "medias", "ref": "", "subdir": "mysubdir1/mysubdir2", "filecontent": "content text", "fileencoding": "", "overwriteifexists": "0" }. + * Test sample 2: { "filename": "mynewfile.txt", "modulepart": "medias", "ref": "", "subdir": "image/mywebsite", "filecontent": "content text", "fileencoding": "", "overwriteifexists": "0" }. * * @param string $filename Name of file to create ('FA1705-0123.txt') * @param string $modulepart Name of module or area concerned by file upload ('facture', 'project', 'project_task', ...) * @param string $ref Reference of object (This will define subdir automatically and store submited file into it) - * @param string $subdir Subdirectory (Only if ref not provided) + * @param string $subdir Subdirectory (Only if ref not provided) * @param string $filecontent File content (string with file content. An empty file will be created if this parameter is not provided) * @param string $fileencoding File encoding (''=no encoding, 'base64'=Base 64) * @param int $overwriteifexists Overwrite file if exists (1 by default) - * @return bool State of copy - * @throws RestException * - * @url GET /upload + * @throws 200 + * @throws 400 + * @throws 401 + * @throws 404 + * @throws 500 + * + * @url POST /upload */ public function post($filename, $modulepart, $ref='', $subdir='', $filecontent='', $fileencoding='', $overwriteifexists=0) { @@ -367,7 +444,7 @@ class Documents extends DolibarrApi $task_result = $object->fetch('', $ref); - // Fetching the tasks project is required because its out_dir might be a subdirectory of the project + // Fetching the tasks project is required because its out_dir might be a sub-directory of the project if($task_result > 0) { $project_result = $object->fetch_projet(); @@ -394,7 +471,7 @@ class Documents extends DolibarrApi if($result == 0) { - throw new RestException(500, "Object with ref '".$ref.'" was not found.'); + throw new RestException(404, "Object with ref '".$ref."' was not found."); } elseif ($result < 0) { @@ -404,11 +481,13 @@ class Documents extends DolibarrApi if (! ($object->id > 0)) { - throw new RestException(500, 'The object '.$modulepart." with ref '".$ref."' was not found."); + throw new RestException(404, 'The object '.$modulepart." with ref '".$ref."' was not found."); } - $tmp = dol_check_secure_access_document($modulepart, $tmpreldir.dol_sanitizeFileName($object->ref), $entity, DolibarrApiAccess::$user, $ref, 'write'); - $upload_dir = $tmp['original_file']; + $relativefile = $tmpreldir.dol_sanitizeFileName($object->ref); + + $tmp = dol_check_secure_access_document($modulepart, $relativefile, $entity, DolibarrApiAccess::$user, $ref, 'write'); + $upload_dir = $tmp['original_file']; // No dirname here, tmp['original_file'] is already the dir because dol_check_secure_access_document was called with param original_file that is only the dir if (empty($upload_dir) || $upload_dir == '/') { @@ -419,24 +498,27 @@ class Documents extends DolibarrApi { if ($modulepart == 'invoice') $modulepart ='facture'; - $tmp = dol_check_secure_access_document($modulepart, $subdir, $entity, DolibarrApiAccess::$user, '', 'write'); - $upload_dir = $tmp['original_file']; + $relativefile = $subdir; + + $tmp = dol_check_secure_access_document($modulepart, $relativefile, $entity, DolibarrApiAccess::$user, '', 'write'); + $upload_dir = $tmp['original_file']; // No dirname here, tmp['original_file'] is already the dir because dol_check_secure_access_document was called with param original_file that is only the dir if (empty($upload_dir) || $upload_dir == '/') { throw new RestException(500, 'This value of modulepart does not support yet usage of ref. Check modulepart parameter or try to use subdir parameter instead of ref.'); } } - + // $original_file here is still value of filename without any dir. $upload_dir = dol_sanitizePathName($upload_dir); $destfile = $upload_dir . '/' . $original_file; $destfiletmp = DOL_DATA_ROOT.'/admin/temp/' . $original_file; dol_delete_file($destfiletmp); + //var_dump($original_file);exit; - if (!dol_is_dir($upload_dir)) { - throw new RestException(401,'Directory not exists : '.$upload_dir); + if (!dol_is_dir(dirname($destfile))) { + throw new RestException(401, 'Directory not exists : '.dirname($destfile)); } if (! $overwriteifexists && dol_is_file($destfile)) @@ -457,8 +539,12 @@ class Documents extends DolibarrApi } $result = dol_move($destfiletmp, $destfile, 0, $overwriteifexists, 1); + if (! $result) + { + throw new RestException(500, "Failed to move file into '".$destfile."'"); + } - return $result; + return dol_basename($destfile); } /** diff --git a/htdocs/api/class/api_login.class.php b/htdocs/api/class/api_login.class.php index a1bcedc8fbe..56808819b3f 100644 --- a/htdocs/api/class/api_login.class.php +++ b/htdocs/api/class/api_login.class.php @@ -44,7 +44,9 @@ class Login * @param int $reset Reset token (0=get current token, 1=ask a new token and canceled old token. This means access using current existing API token of user will fails: new token will be required for new access) * @return array Response status and user token * - * @throws RestException + * @throws 200 + * @throws 403 + * @throws 500 * * @url GET / * @url POST / diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index daf4621ebcb..d357141fa4d 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -1947,14 +1947,18 @@ function dol_most_recent_file($dir,$regexfilter='',$excludefilter=array('(\.meta */ function dol_check_secure_access_document($modulepart, $original_file, $entity, $fuser='', $refname='', $mode='read') { - global $user, $conf, $db; + global $conf, $db, $user; global $dolibarr_main_data_root, $dolibarr_main_document_root_alt; if (! is_object($fuser)) $fuser=$user; if (empty($modulepart)) return 'ErrorBadParameter'; - if (empty($entity)) $entity=0; - dol_syslog('modulepart='.$modulepart.' original_file='.$original_file); + if (empty($entity)) + { + if (empty($conf->multicompany->enabled)) $entity=1; + else $entity=0; + } + dol_syslog('modulepart='.$modulepart.' original_file='.$original_file.' entity='.$entity); // We define $accessallowed and $sqlprotectagainstexternals $accessallowed=0; $sqlprotectagainstexternals=''; @@ -1975,6 +1979,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity, // Wrapping for miscellaneous medias files if ($modulepart == 'medias' && !empty($dolibarr_main_data_root)) { + if (empty($entity) || empty($conf->medias->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided'); $accessallowed=1; $original_file=$conf->medias->multidir_output[$entity].'/'.$original_file; } @@ -2133,6 +2138,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity, // Wrapping for categories elseif ($modulepart == 'category' && !empty($conf->categorie->dir_output)) { + if (empty($entity) || empty($conf->categorie->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided'); if ($fuser->rights->categorie->{$lire}) $accessallowed=1; $original_file=$conf->categorie->multidir_output[$entity].'/'.$original_file; } @@ -2202,6 +2208,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity, // Wrapping for third parties else if (($modulepart == 'company' || $modulepart == 'societe') && !empty($conf->societe->dir_output)) { + if (empty($entity) || empty($conf->societe->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided'); if ($fuser->rights->societe->{$lire} || preg_match('/^specimen/i',$original_file)) { $accessallowed=1; @@ -2213,6 +2220,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity, // Wrapping for contact else if ($modulepart == 'contact' && !empty($conf->societe->dir_output)) { + if (empty($entity) || empty($conf->societe->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided'); if ($fuser->rights->societe->{$lire}) { $accessallowed=1; @@ -2463,6 +2471,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity, // Wrapping pour les produits et services else if ($modulepart == 'product' || $modulepart == 'produit' || $modulepart == 'service' || $modulepart == 'produit|service') { + if (empty($entity) || (empty($conf->product->multidir_output[$entity]) && empty($conf->service->multidir_output[$entity]))) return array('accessallowed'=>0, 'error'=>'Value entity must be provided'); if (($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) || preg_match('/^specimen/i',$original_file)) { $accessallowed=1; From 83888587159d88644b54b121773970204f47d7fa Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 27 Dec 2017 20:17:08 +0100 Subject: [PATCH 0042/1074] Fix filemanager --- htdocs/core/class/html.formfile.class.php | 2 +- htdocs/core/tpl/filemanager.tpl.php | 4 ++-- htdocs/ecm/dir_add_card.php | 1 + htdocs/ecm/dir_card.php | 18 +++++++++++++++--- htdocs/ecm/tpl/enablefiletreeajax.tpl.php | 2 +- htdocs/website/index.php | 1 + 6 files changed, 21 insertions(+), 7 deletions(-) diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 6e8b1cd6340..677efccfdee 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -1236,7 +1236,7 @@ class FormFile print ""; print '
'; - if (! $editline && $nboflines > 1) { + if (! $editline && $nboflines > 1 && is_object($object)) { if (! empty($conf->use_javascript_ajax) && $permtoeditline) { $table_element_line = 'ecm_files'; include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php'; diff --git a/htdocs/core/tpl/filemanager.tpl.php b/htdocs/core/tpl/filemanager.tpl.php index 4399b62851a..826c32a57d6 100644 --- a/htdocs/core/tpl/filemanager.tpl.php +++ b/htdocs/core/tpl/filemanager.tpl.php @@ -21,7 +21,7 @@ // Protection to avoid direct call of template if (empty($conf) || ! is_object($conf)) { - print "Error, template page can't be called as URL"; + print "Error, template page filemanager.tpl.php can't be called as URL"; exit; } @@ -204,7 +204,7 @@ if (empty($action) || $action == 'editfile' || $action == 'file_manager' || preg $mode='noajax'; if (empty($url)) $url=DOL_URL_ROOT.'/ecm/index.php'; -include_once DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirpreview.php'; +include DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirpreview.php'; // End right panel diff --git a/htdocs/ecm/dir_add_card.php b/htdocs/ecm/dir_add_card.php index ba935676e1e..f17c061f36a 100644 --- a/htdocs/ecm/dir_add_card.php +++ b/htdocs/ecm/dir_add_card.php @@ -111,6 +111,7 @@ if ($action == 'add' && $user->rights->ecm->setup) $label = trim(GETPOST("label", 'alpha')); $desc = trim(GETPOST("desc", 'alpha')); $catParent = GETPOST("catParent", 'alpha'); // Can be an int (with ECM) or a string (with generic filemanager) + if ($catParent == '-1') $catParent=0; $error=0; diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php index ce403469107..27d1c8b7683 100644 --- a/htdocs/ecm/dir_card.php +++ b/htdocs/ecm/dir_card.php @@ -139,11 +139,23 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes') // Remove dir if ($action == 'confirm_deletedir' && $confirm == 'yes') { - // Fetch was already done - $result=$ecmdir->delete($user); + $backtourl = DOL_URL_ROOT."/ecm/index.php"; + if ($module == 'medias') $backtourl = DOL_URL_ROOT."/website/index.php?file_manager=1"; + + if ($module == 'ecm') + { + // Fetch was already done + $result=$ecmdir->delete($user); + } + else + { + $resbool = dol_delete_dir($upload_dir); + if ($resbool) $result = 1; + else $result = 0; + } if ($result > 0) { - header("Location: ".DOL_URL_ROOT."/ecm/index.php"); + header("Location: ".$backtourl); exit; } else diff --git a/htdocs/ecm/tpl/enablefiletreeajax.tpl.php b/htdocs/ecm/tpl/enablefiletreeajax.tpl.php index 278cc8afe3e..0a51e8cc73d 100644 --- a/htdocs/ecm/tpl/enablefiletreeajax.tpl.php +++ b/htdocs/ecm/tpl/enablefiletreeajax.tpl.php @@ -20,7 +20,7 @@ // Protection to avoid direct call of template if (empty($conf) || ! is_object($conf)) { - print "Error, template page can't be called as URL"; + print "Error, template enablefiletreeajax.tpl.php can't be called as URL"; exit; } diff --git a/htdocs/website/index.php b/htdocs/website/index.php index 505bfdc9a6a..61455836ef1 100644 --- a/htdocs/website/index.php +++ b/htdocs/website/index.php @@ -2020,6 +2020,7 @@ if ($action == 'editfile' || $action == 'file_manager') include DOL_DOCUMENT_ROOT.'/core/tpl/filemanager.tpl.php'; print '
'; + } if ($action == 'editmenu') From 5264aec8530db9ee965feac5180758d225a3a93c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 27 Dec 2017 20:21:19 +0100 Subject: [PATCH 0043/1074] Add js into export of website --- htdocs/website/class/website.class.php | 6 ++++++ htdocs/website/index.php | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php index 1291e54840c..d72ffbb4731 100644 --- a/htdocs/website/class/website.class.php +++ b/htdocs/website/class/website.class.php @@ -803,6 +803,12 @@ class Website extends CommonObject dol_syslog("Copy content from ".$srcdir." into ".$destdir); dolCopyDir($srcdir, $destdir, 0, 1, $arrayreplacement); + $srcdir = DOL_DATA_ROOT.'/medias/js/'.$website->ref; + $destdir = $conf->website->dir_temp.'/'.$website->ref.'/medias/js/'.$website->ref; + + dol_syslog("Copy content from ".$srcdir." into ".$destdir); + dolCopyDir($srcdir, $destdir, 0, 1, $arrayreplacement); + // Build sql file dol_syslog("Create containers dir"); dol_mkdir($conf->website->dir_temp.'/'.$website->ref.'/containers'); diff --git a/htdocs/website/index.php b/htdocs/website/index.php index 61455836ef1..70b92dabc71 100644 --- a/htdocs/website/index.php +++ b/htdocs/website/index.php @@ -1183,7 +1183,7 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf } // Export site -if (GETPOST('exportsite')) +if (GETPOST('exportsite','alpha')) { $fileofzip = $object->exportWebSite(); From fcf42802a3122def268e547d0cd6efea5458ad3e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 27 Dec 2017 21:13:42 +0100 Subject: [PATCH 0044/1074] More example for website --- htdocs/website/index.php | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/htdocs/website/index.php b/htdocs/website/index.php index 70b92dabc71..f823c5158a9 100644 --- a/htdocs/website/index.php +++ b/htdocs/website/index.php @@ -610,6 +610,12 @@ if ($action == 'addcontainer') $htmlheadercontent ="\n"; $htmlheadercontent.=''."\n"; $htmlheadercontent.=''."\n"; + + $htmlheadercontent.=''."\n"; + $htmlheadercontent.=''."\n"; + + $htmlheadercontent.=''."\n"; + $htmlheadercontent.=''."\n"; $htmlheadercontent.=""; $result=dolSaveHtmlHeader($filehtmlheader, $htmlheadercontent); @@ -1749,9 +1755,17 @@ if ($action == 'editcss') // Common HTML header print ''; $htmlhelp=$langs->trans("Example").' :
'; + $htmlhelp.='
'; $htmlhelp.='<script src="https://code.jquery.com/jquery-3.2.1.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous" ></script>
'; $htmlhelp.='<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js" integrity="sha256-T0Vest3yCU7pafRw9r+settMBX6JkKN06dqBnpQ8d30=" crossorigin="anonymous" ></script>
'; + $htmlhelp.='
'; $htmlhelp.='<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" />
'; + $htmlhelp.='
'; + $htmlhelp.='<script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" ></script>
'; + $htmlhelp.='<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.13.0/umd/popper.min.js" ></script>
'; + $htmlhelp.='
'; + $htmlhelp.='<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-beta/js/bootstrap.min.js" ></script>
'; + print $form->textwithpicto($langs->trans('WEBSITE_HTML_HEADER'), $htmlhelp, 1, 'help', '', 0, 2, 'htmlheadertooltip'); print ''; @@ -1977,10 +1991,19 @@ if ($action == 'editmeta' || $action == 'createcontainer') print ''; $htmlhelp=$langs->trans("EditTheWebSiteForACommonHeader").'

'; - $htmlhelp.=$langs->trans("Example").' :
'; + + $htmlhelp=$langs->trans("Example").' :
'; + $htmlhelp.='
'; $htmlhelp.='<script src="https://code.jquery.com/jquery-3.2.1.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous" ></script>
'; $htmlhelp.='<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js" integrity="sha256-T0Vest3yCU7pafRw9r+settMBX6JkKN06dqBnpQ8d30=" crossorigin="anonymous" ></script>
'; + $htmlhelp.='
'; $htmlhelp.='<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" />
'; + $htmlhelp.='
'; + $htmlhelp.='<script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" ></script>
'; + $htmlhelp.='<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.13.0/umd/popper.min.js" ></script>
'; + $htmlhelp.='
'; + $htmlhelp.='<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-beta/js/bootstrap.min.js" ></script>
'; + print $form->textwithpicto($langs->trans('HtmlHeaderPage'), $htmlhelp, 1, 'help', '', 0, 2, 'htmlheadertooltip'); print ''; $doleditor=new DolEditor('htmlheader', $pagehtmlheader, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', ''); From bbcf70cf4ea200830bda74f2294875a49cbd0bba Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 28 Dec 2017 09:48:41 +0100 Subject: [PATCH 0045/1074] Remove spaces --- htdocs/compta/facture/document.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php index 412935b9971..654f5361ccb 100644 --- a/htdocs/compta/facture/document.php +++ b/htdocs/compta/facture/document.php @@ -4,11 +4,8 @@ * Copyright (C) 2005 Marc Barilley / Ocebo * Copyright (C) 2005-2011 Regis Houssin * Copyright (C) 2013 Cédric Salvador - * Copyright (C) 2017 Ferran Marcet - * Copyright (C) 2017 Frédéric France - * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by From ce680af3578322403b34347637cf559a41be5e5c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 28 Dec 2017 11:16:27 +0100 Subject: [PATCH 0046/1074] Fix field name and length (database portabilit) --- .../install/mysql/migration/6.0.0-7.0.0.sql | 4 +++ .../mysql/tables/llx_advtargetemailing.sql | 2 +- .../install/mysql/tables/llx_budget_lines.sql | 2 +- .../mysql/tables/llx_c_email_templates.sql | 2 +- htdocs/install/mysql/tables/llx_c_ziptown.sql | 2 +- htdocs/install/mysql/tables/llx_categorie.sql | 3 +- htdocs/install/mysql/tables/llx_commande.sql | 1 + .../mysql/tables/llx_commande_fournisseur.sql | 4 +-- htdocs/install/mysql/tables/llx_const.sql | 2 +- .../mysql/tables/llx_element_tag.key.sql | 20 ------------- .../install/mysql/tables/llx_element_tag.sql | 29 ------------------- .../mysql/tables/llx_facture_fourn.key.sql | 2 +- .../mysql/tables/llx_facture_fourn.sql | 6 ++-- htdocs/install/mysql/tables/llx_product.sql | 4 +-- .../llx_product_attribute_value.key.sql | 2 +- .../tables/llx_product_attribute_value.sql | 3 +- htdocs/install/mysql/tables/llx_societe.sql | 4 +-- .../install/mysql/tables/llx_user_param.sql | 4 +-- htdocs/install/mysql/tables/llx_usergroup.sql | 4 +-- 19 files changed, 29 insertions(+), 71 deletions(-) delete mode 100644 htdocs/install/mysql/tables/llx_element_tag.key.sql delete mode 100644 htdocs/install/mysql/tables/llx_element_tag.sql diff --git a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql index 73b29cf55cd..ccd396d9465 100644 --- a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql +++ b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql @@ -71,6 +71,10 @@ ALTER TABLE llx_website_page ADD COLUMN type_container varchar(16) NOT NULL DEFA -- For 7.0 +ALTER TABLE llx_product_attribute_value DROP INDEX unique_ref; +ALTER TABLE llx_product_attribute_value ADD UNIQUE INDEX uk_product_attribute_value (fk_product_attribute, ref); + + ALTER TABLE llx_product_price_by_qty ADD COLUMN quantity double DEFAULT NULL; ALTER TABLE llx_product_price_by_qty ADD COLUMN unitprice double(24,8) DEFAULT 0; diff --git a/htdocs/install/mysql/tables/llx_advtargetemailing.sql b/htdocs/install/mysql/tables/llx_advtargetemailing.sql index d2114821f2e..395558c700f 100644 --- a/htdocs/install/mysql/tables/llx_advtargetemailing.sql +++ b/htdocs/install/mysql/tables/llx_advtargetemailing.sql @@ -20,7 +20,7 @@ CREATE TABLE llx_advtargetemailing ( rowid integer NOT NULL auto_increment PRIMARY KEY, - name varchar(200) NOT NULL, + name varchar(180) NOT NULL, entity integer NOT NULL DEFAULT 1, fk_mailing integer NOT NULL, filtervalue text, diff --git a/htdocs/install/mysql/tables/llx_budget_lines.sql b/htdocs/install/mysql/tables/llx_budget_lines.sql index c93a6e736e7..63d015fc8f7 100644 --- a/htdocs/install/mysql/tables/llx_budget_lines.sql +++ b/htdocs/install/mysql/tables/llx_budget_lines.sql @@ -20,7 +20,7 @@ create table llx_budget_lines ( rowid integer AUTO_INCREMENT PRIMARY KEY, fk_budget integer NOT NULL, - fk_project_ids varchar(255) NOT NULL, -- 'IDS:x,y' = List of project ids related to this budget. If budget is dedicated to projects not yet started, we recommand to create a project 'Projects to come'. 'FILTER:ref=*ABC' = Can also be a dynamic rule to select projects. + fk_project_ids varchar(180) NOT NULL, -- 'IDS:x,y' = List of project ids related to this budget. If budget is dedicated to projects not yet started, we recommand to create a project 'Projects to come'. 'FILTER:ref=*ABC' or 'FILTER:categid=123' = Can also be a dynamic rule to select projects. amount double(24,8) NOT NULL, datec datetime, tms timestamp, diff --git a/htdocs/install/mysql/tables/llx_c_email_templates.sql b/htdocs/install/mysql/tables/llx_c_email_templates.sql index adcda4c69f8..a4f5a0c25c5 100644 --- a/htdocs/install/mysql/tables/llx_c_email_templates.sql +++ b/htdocs/install/mysql/tables/llx_c_email_templates.sql @@ -28,7 +28,7 @@ create table llx_c_email_templates fk_user integer, -- Id user owner if template is private, or null datec datetime, tms timestamp, - label varchar(255), -- Label of predefined email + label varchar(180), -- Label of predefined email position smallint, -- Position enabled varchar(255) DEFAULT '1', -- Condition to have this module visible active tinyint DEFAULT 1 NOT NULL, diff --git a/htdocs/install/mysql/tables/llx_c_ziptown.sql b/htdocs/install/mysql/tables/llx_c_ziptown.sql index 0eaab74af20..4b73d308a99 100644 --- a/htdocs/install/mysql/tables/llx_c_ziptown.sql +++ b/htdocs/install/mysql/tables/llx_c_ziptown.sql @@ -23,6 +23,6 @@ create table llx_c_ziptown fk_county integer, -- State id in llx_c_departements fk_pays integer NOT NULL DEFAULT 0, -- Country id in llx_c_country zip varchar(10) NOT NULL, -- Zip code - town varchar(255) NOT NULL, -- Town name + town varchar(180) NOT NULL, -- Town name active tinyint NOT NULL DEFAULT 1 )ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_categorie.sql b/htdocs/install/mysql/tables/llx_categorie.sql index 708049b01bf..fe2b03b2429 100644 --- a/htdocs/install/mysql/tables/llx_categorie.sql +++ b/htdocs/install/mysql/tables/llx_categorie.sql @@ -2,6 +2,7 @@ -- Copyright (C) 2005 Brice Davoleau -- Copyright (C) 2005 Matthieu Valleton -- Copyright (C) 2005-2012 Regis Houssin +-- Copyright (C) 2017 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 @@ -23,7 +24,7 @@ create table llx_categorie rowid integer AUTO_INCREMENT PRIMARY KEY, entity integer DEFAULT 1 NOT NULL, -- multi company id fk_parent integer DEFAULT 0 NOT NULL, - label varchar(255) NOT NULL, -- category name + label varchar(180) NOT NULL, -- category name type tinyint DEFAULT 1 NOT NULL, -- category type (product, supplier, customer, member) description text, -- description of the category color varchar(8), -- color diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql index 0e430c0c483..0b18f46bb51 100644 --- a/htdocs/install/mysql/tables/llx_commande.sql +++ b/htdocs/install/mysql/tables/llx_commande.sql @@ -1,6 +1,7 @@ -- =================================================================== -- Copyright (C) 2003 Rodolphe Quiedeville -- Copyright (C) 2005-2012 Regis Houssin +-- Copyright (C) 2017 Laurent Destailleur -- Copyright (C) 2010 Juanjo Menent -- -- This program is free software; you can redistribute it and/or modify diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql index 930a675c5e1..54ad7a33afd 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql @@ -1,7 +1,7 @@ -- =================================================================== -- Copyright (C) 2004 Rodolphe Quiedeville -- Copyright (C) 2005-2012 Regis Houssin --- Copyright (C) 2007 Laurent Destailleur +-- Copyright (C) 2007-2017 Laurent Destailleur -- Copyright (C) 2010 Juanjo Menent -- -- This program is free software; you can redistribute it and/or modify @@ -23,7 +23,7 @@ create table llx_commande_fournisseur ( rowid integer AUTO_INCREMENT PRIMARY KEY, - ref varchar(255) NOT NULL, -- order number + ref varchar(180) NOT NULL, -- order number entity integer DEFAULT 1 NOT NULL, -- multi company id ref_ext varchar(255), -- reference into an external system (not used by dolibarr) diff --git a/htdocs/install/mysql/tables/llx_const.sql b/htdocs/install/mysql/tables/llx_const.sql index b34801d7e24..22e552213aa 100644 --- a/htdocs/install/mysql/tables/llx_const.sql +++ b/htdocs/install/mysql/tables/llx_const.sql @@ -26,7 +26,7 @@ create table llx_const ( rowid integer AUTO_INCREMENT PRIMARY KEY, - name varchar(255) NOT NULL, + name varchar(180) NOT NULL, entity integer DEFAULT 1 NOT NULL, -- multi company id value text NOT NULL, -- max 65535 caracteres type varchar(6), diff --git a/htdocs/install/mysql/tables/llx_element_tag.key.sql b/htdocs/install/mysql/tables/llx_element_tag.key.sql deleted file mode 100644 index cdf68b85484..00000000000 --- a/htdocs/install/mysql/tables/llx_element_tag.key.sql +++ /dev/null @@ -1,20 +0,0 @@ --- ============================================================================ --- Copyright (C) 2012 Regis Houssin --- --- 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_element_tag ADD UNIQUE INDEX uk_element_tag (entity, lang, tag, fk_element, element); diff --git a/htdocs/install/mysql/tables/llx_element_tag.sql b/htdocs/install/mysql/tables/llx_element_tag.sql deleted file mode 100644 index e561cde85e9..00000000000 --- a/htdocs/install/mysql/tables/llx_element_tag.sql +++ /dev/null @@ -1,29 +0,0 @@ --- ============================================================================ --- Copyright (C) 2012 Regis Houssin --- --- This program is free software; you can redistribute it and/or modify --- it under the terms of the GNU General Public License as published by --- the Free Software Foundation; either version 3 of the License, or --- (at your option) any later version. --- --- This program is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. --- --- You should have received a copy of the GNU General Public License --- along with this program. If not, see . --- --- =========================================================================== - -create table llx_element_tag -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - entity integer DEFAULT 1 NOT NULL, -- multi company id - lang varchar(5) NOT NULL, - tag varchar(255) NOT NULL, - fk_element integer NOT NULL, - element varchar(64) NOT NULL - -)ENGINE=innodb; - diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql index 7130640a9f0..cbea87a398f 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.key.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.key.sql @@ -1,5 +1,5 @@ -- ============================================================================ --- Copyright (C) 2005 Laurent Destailleur +-- Copyright (C) 2005-2017 Laurent Destailleur -- Copyright (C) 2005-2009 Regis Houssin -- -- This program is free software; you can redistribute it and/or modify diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.sql b/htdocs/install/mysql/tables/llx_facture_fourn.sql index 89d0ddc9478..b1329de08ac 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.sql @@ -1,6 +1,6 @@ -- =========================================================================== -- Copyright (C) 2001-2003 Rodolphe Quiedeville --- Copyright (C) 2007 Laurent Destailleur +-- Copyright (C) 2007-2017 Laurent Destailleur -- Copyright (C) 2007-2012 Regis Houssin -- Copyright (C) 2010 Juanjo Menent -- @@ -22,8 +22,8 @@ create table llx_facture_fourn ( rowid integer AUTO_INCREMENT PRIMARY KEY, - ref varchar(255) NOT NULL, - ref_supplier varchar(255) NOT NULL, + ref varchar(180) NOT NULL, + ref_supplier varchar(180) NOT NULL, entity integer DEFAULT 1 NOT NULL, -- multi company id ref_ext varchar(255), -- reference into an external system (not used by dolibarr) diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql index 64dcebe4616..21da795cd4e 100755 --- a/htdocs/install/mysql/tables/llx_product.sql +++ b/htdocs/install/mysql/tables/llx_product.sql @@ -1,6 +1,6 @@ -- ============================================================================ -- Copyright (C) 2002-2006 Rodolphe Quiedeville --- Copyright (C) 2008-2010 Laurent Destailleur +-- Copyright (C) 2008-2017 Laurent Destailleur -- Copyright (C) 2005-2010 Regis Houssin -- Copyright (C) 2010 Juanjo Menent -- Copyright (C) 2012-2013 Cédric Salvador @@ -62,7 +62,7 @@ create table llx_product duration varchar(6), seuil_stock_alerte integer DEFAULT NULL, url varchar(255), - barcode varchar(255) DEFAULT NULL, -- barcode + barcode varchar(180) DEFAULT NULL, -- barcode fk_barcode_type integer DEFAULT NULL, -- barcode type accountancy_code_sell varchar(32), -- Selling accountancy code accountancy_code_sell_intra varchar(32), -- Selling accountancy code for vat intracommunity diff --git a/htdocs/install/mysql/tables/llx_product_attribute_value.key.sql b/htdocs/install/mysql/tables/llx_product_attribute_value.key.sql index 889bba4615e..42763665d71 100644 --- a/htdocs/install/mysql/tables/llx_product_attribute_value.key.sql +++ b/htdocs/install/mysql/tables/llx_product_attribute_value.key.sql @@ -16,4 +16,4 @@ -- -- ============================================================================ -ALTER TABLE llx_product_attribute_value ADD CONSTRAINT unique_ref UNIQUE (fk_product_attribute,ref); \ No newline at end of file +ALTER TABLE llx_product_attribute_value ADD UNIQUE INDEX uk_product_attribute_value (fk_product_attribute, ref); diff --git a/htdocs/install/mysql/tables/llx_product_attribute_value.sql b/htdocs/install/mysql/tables/llx_product_attribute_value.sql index 8ca6888d91b..626f137789a 100644 --- a/htdocs/install/mysql/tables/llx_product_attribute_value.sql +++ b/htdocs/install/mysql/tables/llx_product_attribute_value.sql @@ -1,5 +1,6 @@ -- ============================================================================ -- Copyright (C) 2016 Marcos García +-- Copyright (C) 2017 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 @@ -20,7 +21,7 @@ CREATE TABLE llx_product_attribute_value ( rowid INT PRIMARY KEY NOT NULL AUTO_INCREMENT, fk_product_attribute INT NOT NULL, - ref VARCHAR(255) DEFAULT NULL, + ref VARCHAR(180) DEFAULT NULL, value VARCHAR(255) DEFAULT NULL, entity INT DEFAULT 1 NOT NULL )ENGINE=innodb; \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql index 4d74e411260..c23ca3a183c 100644 --- a/htdocs/install/mysql/tables/llx_societe.sql +++ b/htdocs/install/mysql/tables/llx_societe.sql @@ -1,6 +1,6 @@ -- ======================================================================== -- Copyright (C) 2000-2004 Rodolphe Quiedeville --- Copyright (C) 2004-2014 Laurent Destailleur +-- Copyright (C) 2004-2017 Laurent Destailleur -- Copyright (C) 2005-2010 Regis Houssin -- Copyright (C) 2010 Juanjo Menent -- Copyright (C) 2014 Teddy Andreotti <125155@supinfo.com> @@ -92,7 +92,7 @@ create table llx_societe localtax1_value double(6,3), localtax2_assuj tinyint DEFAULT 0, -- assujeti ou non a local tax 2 localtax2_value double(6,3), - barcode varchar(255), -- barcode + barcode varchar(180), -- barcode fk_barcode_type integer NULL DEFAULT 0, -- barcode type price_level integer NULL, -- level of price for multiprices outstanding_limit double(24,8) DEFAULT NULL, -- allowed outstanding limit diff --git a/htdocs/install/mysql/tables/llx_user_param.sql b/htdocs/install/mysql/tables/llx_user_param.sql index 67bce42645a..365f49b060d 100644 --- a/htdocs/install/mysql/tables/llx_user_param.sql +++ b/htdocs/install/mysql/tables/llx_user_param.sql @@ -1,6 +1,6 @@ -- ============================================================================ -- Copyright (C) 2004 Rodolphe Quiedeville --- Copyright (C) 2004-2009 Laurent Destailleur +-- Copyright (C) 2004-2017 Laurent Destailleur -- Copyright (C) 2005-2009 Regis Houssin -- -- This program is free software; you can redistribute it and/or modify @@ -22,7 +22,7 @@ create table llx_user_param ( fk_user integer NOT NULL, entity integer DEFAULT 1 NOT NULL, -- multi company id - param varchar(255) NOT NULL, + param varchar(180) NOT NULL, value text NOT NULL )ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_usergroup.sql b/htdocs/install/mysql/tables/llx_usergroup.sql index cc8501a5fcd..f82c21eae87 100644 --- a/htdocs/install/mysql/tables/llx_usergroup.sql +++ b/htdocs/install/mysql/tables/llx_usergroup.sql @@ -1,6 +1,6 @@ -- ============================================================================ -- Copyright (C) 2005 Rodolphe Quiedeville --- Copyright (C) 2005-2009 Laurent Destailleur +-- Copyright (C) 2005-2017 Laurent Destailleur -- Copyright (C) 2005-2009 Regis Houssin -- -- This program is free software; you can redistribute it and/or modify @@ -21,7 +21,7 @@ create table llx_usergroup ( rowid integer AUTO_INCREMENT PRIMARY KEY, - nom varchar(255) NOT NULL, + nom varchar(180) NOT NULL, entity integer DEFAULT 1 NOT NULL, -- multi company id datec datetime, tms timestamp, From b0fefffcf8b4beedad35b8e436e39e866c03e85a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 28 Dec 2017 12:43:26 +0100 Subject: [PATCH 0047/1074] Fix standardize api code --- .../comm/propal/class/api_proposals.class.php | 90 +++++++++++++----- htdocs/commande/class/api_orders.class.php | 76 +++++++-------- .../facture/class/api_invoices.class.php | 92 ++++++++++++++----- 3 files changed, 177 insertions(+), 81 deletions(-) diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php index 96e3e6d2509..48311faa263 100644 --- a/htdocs/comm/propal/class/api_proposals.class.php +++ b/htdocs/comm/propal/class/api_proposals.class.php @@ -38,7 +38,7 @@ class Proposals extends DolibarrApi ); /** - * @var propal $propal {@type propal} + * @var Propal $propal {@type Propal} */ public $propal; @@ -143,6 +143,7 @@ class Proposals extends DolibarrApi $sql.= $db->plimit($limit + 1, $offset); } + dol_syslog("API Rest request"); $result = $db->query($sql); if ($result) @@ -173,7 +174,7 @@ class Proposals extends DolibarrApi * Create commercial proposal object * * @param array $request_data Request data - * @return int ID of propal + * @return int ID of proposal */ function post($request_data = NULL) { @@ -525,6 +526,7 @@ class Proposals extends DolibarrApi } $this->propal->fetchObjectLinked(); + return $this->_cleanObjectDatas($this->propal); } @@ -532,21 +534,27 @@ class Proposals extends DolibarrApi /** * Validate a commercial proposal * - * @param int $id Commercial proposal ID - * @param int $notrigger Use {} - * - * @url POST {id}/validate - * - * @return array - * FIXME An error 403 is returned if the request has an empty body. - * Error message: "Forbidden: Content type `text/plain` is not supported." - * Workaround: send this in the body + * If you get a bad value for param notrigger check that ou provide this in body * { * "notrigger": 0 * } + * + * @param int $id Commercial proposal ID + * @param int $notrigger 1=Does not execute triggers, 0= execute triggers + * + * @url POST {id}/validate + * + * @throws 304 + * @throws 401 + * @throws 404 + * @throws 500 + * + * @return array */ function validate($id, $notrigger=0) { + var_dump($notrigger);exit; + if(! DolibarrApiAccess::$user->rights->propal->creer) { throw new RestException(401); } @@ -567,12 +575,16 @@ class Proposals extends DolibarrApi throw new RestException(500, 'Error when validating Commercial Proposal: '.$this->propal->error); } - return array( - 'success' => array( - 'code' => 200, - 'message' => 'Commercial Proposal validated (Ref='.$this->propal->ref.')' - ) - ); + $result = $this->propal->fetch($id); + if( ! $result ) { + throw new RestException(404, 'Commercial Proposal not found'); + } + + if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) { + throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); + } + + return $this->_cleanObjectDatas($this->propal); } /** @@ -610,14 +622,50 @@ class Proposals extends DolibarrApi } return array( - 'success' => array( - 'code' => 200, - 'message' => 'Commercial Proposal closed (Ref='.$this->propal->ref.')' - ) + 'success' => array( + 'code' => 200, + 'message' => 'Commercial Proposal closed (Ref='.$this->propal->ref.')' + ) ); } + /** + * Set a commercial proposal billed + * + * @param int $id Commercial proposal ID + * + * @url POST {id}/setinvoiced + * + * @return array + */ + function setinvoiced($id) + { + if(! DolibarrApiAccess::$user->rights->propal->creer) { + throw new RestException(401); + } + $result = $this->propal->fetch($id); + if( ! $result ) { + throw new RestException(404, 'Commercial Proposal not found'); + } + if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) { + throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); + } + + $result = $this->propal->classifyBilled(DolibarrApiAccess::$user ); + if ($result < 0) { + throw new RestException(500, 'Error : '.$this->propal->error); + } + + return array( + 'success' => array( + 'code' => 200, + 'message' => 'Commercial Proposal set billed (Ref='.$this->propal->ref.')' + ) + ); + } + + /** * Validate fields before create or update object * diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php index 5d0f9722e37..0c5e7531305 100644 --- a/htdocs/commande/class/api_orders.class.php +++ b/htdocs/commande/class/api_orders.class.php @@ -291,7 +291,9 @@ class Orders extends DolibarrApi return $updateRes; } - return false; + else { + throw new RestException(400, $this->commande->error); + } } /** @@ -422,7 +424,7 @@ class Orders extends DolibarrApi if ($this->commande->availability($this->commande->availability_id) < 0) throw new RestException(400, 'Error while updating availability'); } - // update bank account + // update bank account if(!empty($this->commande->fk_account)) { if($this->commande->setBankAccount($this->commande->fk_account) == 0) @@ -431,7 +433,6 @@ class Orders extends DolibarrApi } } - if ($this->commande->update(DolibarrApiAccess::$user) > 0) { return $this->get($id); @@ -446,7 +447,6 @@ class Orders extends DolibarrApi * Delete order * * @param int $id Order ID - * * @return array */ function delete($id) @@ -478,21 +478,25 @@ class Orders extends DolibarrApi /** * Validate an order + * + * If you get a bad value for param notrigger check that ou provide this in body + * { + * "idwarehouse": 0, + * "notrigger": 0 + * } * * @param int $id Order ID * @param int $idwarehouse Warehouse ID * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * * @url POST {id}/validate + * + * @throws 304 + * @throws 401 + * @throws 404 + * @throws 500 * * @return array - * FIXME An error 403 is returned if the request has an empty body. - * Error message: "Forbidden: Content type `text/plain` is not supported." - * Workaround: send this in the body - * { - * "idwarehouse": 0, - * "notrigger": 0 - * } */ function validate($id, $idwarehouse=0, $notrigger=0) { @@ -515,20 +519,21 @@ class Orders extends DolibarrApi if ($result < 0) { throw new RestException(500, 'Error when validating Order: '.$this->commande->error); } - $result = $this->commande->fetch($id); + $result = $this->commande->fetch($id); if( ! $result ) { throw new RestException(404, 'Order not found'); } - if( ! DolibarrApi::_checkAccessToResource('commande',$this->commande->id)) { + if( ! DolibarrApi::_checkAccessToResource('commande',$this->commande->id)) { throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); - } + } $this->commande->fetchObjectLinked(); + return $this->_cleanObjectDatas($this->commande); } - /** + /** * Tag the order as validated (opened) * * Function used when order is reopend after being closed. @@ -564,6 +569,7 @@ class Orders extends DolibarrApi }else if( $result == 0) { throw new RestException(304); } + return $result; } @@ -599,6 +605,7 @@ class Orders extends DolibarrApi if( $result < 0) { throw new RestException(400, $this->commande->error); } + return $result; } @@ -610,7 +617,7 @@ class Orders extends DolibarrApi * * @url POST {id}/close * - * @return array + * @return int */ function close($id, $notrigger=0) { @@ -634,12 +641,7 @@ class Orders extends DolibarrApi throw new RestException(500, 'Error when closing Order: '.$this->commande->error); } - return array( - 'success' => array( - 'code' => 200, - 'message' => 'Order closed (Ref='.$this->commande->ref.')' - ) - ); + return $result; } /** @@ -684,25 +686,26 @@ class Orders extends DolibarrApi } $this->commande->fetchObjectLinked(); + return $this->_cleanObjectDatas($this->commande); } /** - * Create an order using an existing proposal. - * - * - * @param int $proposalid Id of the proposal - * - * @url POST /createfromproposal/{proposalid} - * - * @return int - * @throws 400 - * @throws 401 - * @throws 404 - * @throws 405 - */ - function createOrderFromProposal($proposalid) { + * Create an order using an existing proposal. + * + * + * @param int $proposalid Id of the proposal + * + * @url POST /createfromproposal/{proposalid} + * + * @return int + * @throws 400 + * @throws 401 + * @throws 404 + * @throws 405 + */ + function createOrderFromProposal($proposalid) { require_once DOL_DOCUMENT_ROOT . '/comm/propal/class/propal.class.php'; @@ -727,6 +730,7 @@ class Orders extends DolibarrApi throw new RestException(405, $this->commande->error); } $this->commande->fetchObjectLinked(); + return $this->_cleanObjectDatas($this->commande); } diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php index 2f1eee2c9b2..57e832fcf21 100644 --- a/htdocs/compta/facture/class/api_invoices.class.php +++ b/htdocs/compta/facture/class/api_invoices.class.php @@ -71,8 +71,8 @@ class Invoices extends DolibarrApi throw new RestException(404, 'Invoice not found'); } - // Get payment details - $this->invoice->totalpaye = $this->invoice->getSommePaiement(); + // Get payment details + $this->invoice->totalpaye = $this->invoice->getSommePaiement(); $this->invoice->totalcreditnotes = $this->invoice->getSumCreditNotesUsed(); $this->invoice->totaldeposits = $this->invoice->getSumDepositsUsed(); $this->invoice->resteapayer = price2num($this->invoice->total_ttc - $this->invoice->totalpaye - $this->invoice->totalcreditnotes - $this->invoice->totaldeposits, 'MT'); @@ -419,14 +419,14 @@ class Invoices extends DolibarrApi $this->invoice->$field = $value; } - // update bank account - if(!empty($this->invoice->fk_account)) - { - if($this->invoice->setBankAccount($this->invoice->fk_account) == 0) - { - throw new RestException(400,$this->invoice->error); - } - } + // update bank account + if (!empty($this->invoice->fk_account)) + { + if($this->invoice->setBankAccount($this->invoice->fk_account) == 0) + { + throw new RestException(400,$this->invoice->error); + } + } if($this->invoice->update($id, DolibarrApiAccess::$user)) return $this->get ($id); @@ -438,7 +438,7 @@ class Invoices extends DolibarrApi * Delete invoice * * @param int $id Invoice ID - * @return type + * @return array */ function delete($id) { @@ -541,7 +541,7 @@ class Invoices extends DolibarrApi ); if ($updateRes < 0) { - throw new RestException(400, 'Unable to insert the new line. Check your inputs. '.$this->invoice->error); + throw new RestException(400, 'Unable to insert the new line. Check your inputs. '.$this->invoice->error); } return $updateRes; @@ -601,6 +601,12 @@ class Invoices extends DolibarrApi /** * Validate an invoice + * + * If you get a bad value for param notrigger check that ou provide this in body + * { + * "idwarehouse": 0, + * "notrigger": 0 + * } * * @param int $id Invoice ID * @param int $idwarehouse Warehouse ID @@ -609,13 +615,6 @@ class Invoices extends DolibarrApi * @url POST {id}/validate * * @return array - * FIXME An error 403 is returned if the request has an empty body. - * Error message: "Forbidden: Content type `text/plain` is not supported." - * Workaround: send this in the body - * { - * "idwarehouse": 0, - * "notrigger": 0 - * } */ function validate($id, $idwarehouse=0, $notrigger=0) { @@ -639,7 +638,6 @@ class Invoices extends DolibarrApi throw new RestException(500, 'Error when validating Invoice: '.$this->invoice->error); } - $result = $this->invoice->fetch($id); if( ! $result ) { throw new RestException(404, 'Invoice not found'); @@ -650,8 +648,6 @@ class Invoices extends DolibarrApi } return $this->_cleanObjectDatas($this->invoice); - - } /** @@ -704,11 +700,59 @@ class Invoices extends DolibarrApi } return $this->_cleanObjectDatas($this->invoice); - - } + /** + * Sets an invoice as unpaid + * + * @param int $id Order ID + * + * @url POST {id}/settounpaid + * + * @return array An invoice object + * + * @throws 200 + * @throws 304 + * @throws 401 + * @throws 404 + * @throws 500 + */ + function settounpaid($id) + { + if(! DolibarrApiAccess::$user->rights->facture->creer) { + throw new RestException(401); + } + $result = $this->invoice->fetch($id); + if( ! $result ) { + throw new RestException(404, 'Invoice not found'); + } + + if( ! DolibarrApi::_checkAccessToResource('facture',$this->invoice->id)) { + throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); + } + + $result = $this->invoice->set_unpaid(DolibarrApiAccess::$user); + if ($result == 0) { + throw new RestException(304, 'Nothing done'); + } + if ($result < 0) { + throw new RestException(500, 'Error : '.$this->invoice->error); + } + + + $result = $this->invoice->fetch($id); + if( ! $result ) { + throw new RestException(404, 'Invoice not found'); + } + + if( ! DolibarrApi::_checkAccessToResource('facture',$this->invoice->id)) { + throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); + } + + return $this->_cleanObjectDatas($this->invoice); + } + /** * Add a discount line into an invoice (as an invoice line) using an existing absolute discount * From af8ebc616b101b5595a9306f29d3e402df1ef0cb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 28 Dec 2017 13:02:26 +0100 Subject: [PATCH 0048/1074] Update list.php --- htdocs/comm/propal/list.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 4dd3808f7e9..15f6c0b3513 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -141,7 +141,7 @@ $checkedtypetiers=0; $arrayfields=array( 'p.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1), 'p.ref_client'=>array('label'=>$langs->trans("RefCustomer"), 'checked'=>1), - 'pr.ref'=>array('label'=>$langs->trans("Project"), 'checked'=>1), + 'pr.ref'=>array('label'=>$langs->trans("Project"), 'checked'=>1, 'enabled'=>$conf->projet->enabled), 's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1), 's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>1), 's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>1), @@ -167,10 +167,6 @@ if (is_array($extrafields->attribute_label) && count($extrafields->attribute_lab } } -// no project enabled we suppress from array -if (empty($conf->projet->enabled)) - unset($arrayfields['pr.ref']); - $object = new Propal($db); // To be passed as parameter of executeHooks that need From 33f6ba19da673faf0bec863cfebcdee5d4a608f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 28 Dec 2017 16:20:08 +0100 Subject: [PATCH 0049/1074] display weight volume in propal --- htdocs/comm/propal/card.php | 16 ++++++++++++++++ htdocs/commande/card.php | 5 ++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index edd2607a11c..78c38c1cc32 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -2100,6 +2100,22 @@ if ($action == 'create') print ''; } + $tmparray=$object->getTotalWeightVolume(); + $totalWeight=$tmparray['weight']; + $totalVolume=$tmparray['volume']; + if ($totalWeight) { + print '' . $langs->trans("CalculatedWeight") . ''; + print ''; + print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND)?$conf->global->MAIN_WEIGHT_DEFAULT_ROUND:-1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT)?$conf->global->MAIN_WEIGHT_DEFAULT_UNIT:'no'); + print ''; + } + if ($totalVolume) { + print '' . $langs->trans("CalculatedVolume") . ''; + print ''; + print showDimensionInBestUnit($totalVolume, 0, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND)?$conf->global->MAIN_VOLUME_DEFAULT_ROUND:-1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT)?$conf->global->MAIN_VOLUME_DEFAULT_UNIT:'no'); + print ''; + } + // Incoterms if (!empty($conf->incoterm->enabled)) { diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index bb6d2d78571..32bbdb9d0d8 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -2268,12 +2268,15 @@ if ($action == 'create' && $user->rights->commande->creer) $tmparray=$object->getTotalWeightVolume(); $totalWeight=$tmparray['weight']; $totalVolume=$tmparray['volume']; - if ($totalWeight || $totalVolume) + if ($totalWeight) { print ''.$langs->trans("CalculatedWeight").''; print ''; print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND)?$conf->global->MAIN_WEIGHT_DEFAULT_ROUND:-1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT)?$conf->global->MAIN_WEIGHT_DEFAULT_UNIT:'no'); print ''; + } + if ($totalVolume) + { print ''.$langs->trans("CalculatedVolume").''; print ''; print showDimensionInBestUnit($totalVolume, 0, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND)?$conf->global->MAIN_VOLUME_DEFAULT_ROUND:-1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT)?$conf->global->MAIN_VOLUME_DEFAULT_UNIT:'no'); From 0fae2ba8ca98897bc7d4d24e60b963d47709994e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Fri, 29 Dec 2017 20:41:39 +0100 Subject: [PATCH 0050/1074] correct merge --- htdocs/contact/list.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index 4ef343c3c02..6e62cef1eb0 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -498,15 +498,6 @@ if (! empty($arrayfields['p.firstname']['checked'])) print ''; print ''; } -<<<<<<< HEAD -if (! empty($arrayfields['p.poste']['checked'])) -{ - print ''; - print ''; - print ''; -} -======= ->>>>>>> branch '6.0' of git@github.com:Dolibarr/dolibarr.git if (! empty($arrayfields['p.zip']['checked'])) { print ''; From b6e3d312adadfaeed05e17676369bb45acef155d Mon Sep 17 00:00:00 2001 From: fappels Date: Sat, 30 Dec 2017 12:12:13 +0100 Subject: [PATCH 0051/1074] Fix on #7981 Trigger interface does not set error eventmessage. Improvement: Show both trigger error and mail send succesful, so you know mail was send succesful bot some trigger action after sending mail failed. --- htdocs/core/actions_sendmails.inc.php | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php index 1544bd36fce..ba930158d90 100644 --- a/htdocs/core/actions_sendmails.inc.php +++ b/htdocs/core/actions_sendmails.inc.php @@ -392,8 +392,6 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO $result=$mailfile->sendfile(); if ($result) { - $error=0; - // FIXME This must be moved into the trigger for action $trigger_name if (! empty($conf->dolimail->enabled)) { @@ -438,29 +436,22 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO $interface=new Interfaces($db); $result=$interface->run_triggers($trigger_name,$object,$user,$langs,$conf); if ($result < 0) { - $error++; $errors=$interface->errors; + setEventMessages($interface->error, $interface->errors, 'errors'); } } } - if ($error) + // Redirect here + // This avoid sending mail twice if going out and then back to page + $mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2)); + setEventMessages($mesg, null, 'mesgs'); + if ($conf->dolimail->enabled) { - // error message event set by trigger interface - } - else - { - // Redirect here - // This avoid sending mail twice if going out and then back to page - $mesg=$langs->trans('MailSuccessfulySent',$mailfile->getValidAddress($from,2),$mailfile->getValidAddress($sendto,2)); - setEventMessages($mesg, null, 'mesgs'); - if ($conf->dolimail->enabled) - { - header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname?$paramname:'id').'='.(is_object($object)?$object->id:'').'&'.($paramname2?$paramname2:'mid').'='.$parm2val); - exit; - } - header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname?$paramname:'id').'='.(is_object($object)?$object->id:'')); + header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname?$paramname:'id').'='.(is_object($object)?$object->id:'').'&'.($paramname2?$paramname2:'mid').'='.$parm2val); exit; } + header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname?$paramname:'id').'='.(is_object($object)?$object->id:'')); + exit; } else { From abe53cad05dfb01e1a89808f4a0d231b30bc69b9 Mon Sep 17 00:00:00 2001 From: florian HENRY Date: Tue, 2 Jan 2018 09:36:37 +0100 Subject: [PATCH 0052/1074] fix #8004 --- htdocs/blockedlog/class/blockedlog.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php index 47a02074dc3..46b212c30d8 100644 --- a/htdocs/blockedlog/class/blockedlog.class.php +++ b/htdocs/blockedlog/class/blockedlog.class.php @@ -795,6 +795,7 @@ class BlockedLog if (empty($conf->global->BLOCKEDLOG_ENTITY_FINGERPRINT)) { // creation of a unique fingerprint require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; + require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php'; $fingerprint = dol_hash(print_r($mysoc,true).getRandomPassword(1), '5'); From 320465aeb9938c5aec5bfb0457d22df688fd047e Mon Sep 17 00:00:00 2001 From: florian HENRY Date: Tue, 2 Jan 2018 09:46:45 +0100 Subject: [PATCH 0053/1074] fix : #8003 --- htdocs/install/mysql/tables/llx_inventory.key.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/install/mysql/tables/llx_inventory.key.sql b/htdocs/install/mysql/tables/llx_inventory.key.sql index b6c41f8aef1..a20fe45fe56 100644 --- a/htdocs/install/mysql/tables/llx_inventory.key.sql +++ b/htdocs/install/mysql/tables/llx_inventory.key.sql @@ -20,4 +20,4 @@ ALTER TABLE llx_inventory ADD UNIQUE INDEX uk_inventory_ref (ref, entity); ALTER TABLE llx_inventory ADD INDEX idx_inventory_tms (tms); -ALTER TABLE llx_inventory ADD INDEX idx_inventory_datec (datec); +ALTER TABLE llx_inventory ADD INDEX idx_inventory_date_creation (date_creation); From 12e414509ca3bf9c1a956bc11a558a2adee9c035 Mon Sep 17 00:00:00 2001 From: dolibarr95 <24292300+dolibarr95@users.noreply.github.com> Date: Tue, 2 Jan 2018 11:24:28 +0100 Subject: [PATCH 0054/1074] Add a hook in dol_print_phone To allow more controls in this print function as in dol_print_address (there is a hook so we can create links to maps...). Eg : create a other click to dial functions (different from dolibarr ones with more parameters, because each provider give differents api ) etc Hope this one will be accepted and usefull for the community. And happy new year :) --- htdocs/core/lib/functions.lib.php | 44 +++++++++++++++++++------------ 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 9e7bb7f7ce8..77882d590d6 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -2172,7 +2172,7 @@ function dol_print_skype($skype,$cid=0,$socid=0,$addlink=0,$max=64) */ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$separ=" ",$withpicto='',$titlealt='',$adddivfloat=0) { - global $conf,$user,$langs,$mysoc; + global $conf, $user, $langs, $mysoc, $hookmanager; // Clean phone parameter $phone = preg_replace("/[\s.-]/","",trim($phone)); @@ -2262,23 +2262,33 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep $titlealt=($withpicto=='fax'?$langs->trans("Fax"):$langs->trans("Phone")); } $rep=''; - $picto = ''; - if($withpicto){ - if($withpicto=='fax'){ - $picto = 'phoning_fax'; - }elseif($withpicto=='phone'){ - $picto = 'phoning'; - }elseif($withpicto=='mobile'){ - $picto = 'phoning_mobile'; - }else{ - $picto = ''; + + if ($hookmanager) { + $parameters = array('countrycode' => $countrycode, 'cid' => $cid, 'socid' => $socid); + $reshook = $hookmanager->executeHooks('printPhone', $parameters, $phone); + $rep.=$hookmanager->resPrint; + } + if (empty($reshook)) + { + $picto = ''; + if($withpicto){ + if($withpicto=='fax'){ + $picto = 'phoning_fax'; + }elseif($withpicto=='phone'){ + $picto = 'phoning'; + }elseif($withpicto=='mobile'){ + $picto = 'phoning_mobile'; + }else{ + $picto = ''; + } } - } - if ($adddivfloat) $rep.='
'; - else $rep.=''; - $rep.=($withpicto?img_picto($titlealt, 'object_'.$picto.'.png').' ':'').$newphone; - if ($adddivfloat) $rep.='
'; - else $rep.=''; + if ($adddivfloat) $rep.='
'; + else $rep.=''; + $rep.=($withpicto?img_picto($titlealt, 'object_'.$picto.'.png').' ':'').$newphone; + if ($adddivfloat) $rep.='
'; + else $rep.=''; + } + return $rep; } From ab896dc49d50448c6bcd68d0ac76023340fd493e Mon Sep 17 00:00:00 2001 From: dolibarr95 <24292300+dolibarr95@users.noreply.github.com> Date: Tue, 2 Jan 2018 11:39:00 +0100 Subject: [PATCH 0055/1074] Update functions.lib.php --- htdocs/core/lib/functions.lib.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 77882d590d6..06574be96a5 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -2268,8 +2268,7 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep $reshook = $hookmanager->executeHooks('printPhone', $parameters, $phone); $rep.=$hookmanager->resPrint; } - if (empty($reshook)) - { + $picto = ''; if($withpicto){ if($withpicto=='fax'){ @@ -2287,7 +2286,7 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep $rep.=($withpicto?img_picto($titlealt, 'object_'.$picto.'.png').' ':'').$newphone; if ($adddivfloat) $rep.='
'; else $rep.=''; - } + return $rep; } From e794a3b321d764fa007ea56532a3412730707dfb Mon Sep 17 00:00:00 2001 From: dolibarr95 <24292300+dolibarr95@users.noreply.github.com> Date: Tue, 2 Jan 2018 11:44:54 +0100 Subject: [PATCH 0056/1074] Update functions.lib.php add more parameters and add if empty --- htdocs/core/lib/functions.lib.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 06574be96a5..0fa71c97c49 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -2264,11 +2264,12 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep $rep=''; if ($hookmanager) { - $parameters = array('countrycode' => $countrycode, 'cid' => $cid, 'socid' => $socid); + $parameters = array('countrycode' => $countrycode, 'cid' => $cid, 'socid' => $socid,'titlealt' => $titlealt, 'picto' => $picto); $reshook = $hookmanager->executeHooks('printPhone', $parameters, $phone); $rep.=$hookmanager->resPrint; } - + if (empty($reshook)) + { $picto = ''; if($withpicto){ if($withpicto=='fax'){ @@ -2286,7 +2287,7 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep $rep.=($withpicto?img_picto($titlealt, 'object_'.$picto.'.png').' ':'').$newphone; if ($adddivfloat) $rep.='
'; else $rep.=''; - + } return $rep; } From 3438cfb1e7a63231e2d9a025f82ead63d0d619fe Mon Sep 17 00:00:00 2001 From: dolibarr95 <24292300+dolibarr95@users.noreply.github.com> Date: Tue, 2 Jan 2018 11:48:41 +0100 Subject: [PATCH 0057/1074] Update functions.lib.php syntax error $withpicto --- htdocs/core/lib/functions.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 0fa71c97c49..f69bf3979cd 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -2264,7 +2264,7 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep $rep=''; if ($hookmanager) { - $parameters = array('countrycode' => $countrycode, 'cid' => $cid, 'socid' => $socid,'titlealt' => $titlealt, 'picto' => $picto); + $parameters = array('countrycode' => $countrycode, 'cid' => $cid, 'socid' => $socid,'titlealt' => $titlealt, 'picto' => $withpicto); $reshook = $hookmanager->executeHooks('printPhone', $parameters, $phone); $rep.=$hookmanager->resPrint; } From 9180121999cf8247d759b5616a33944ef3898cf8 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 2 Jan 2018 12:06:11 +0100 Subject: [PATCH 0058/1074] Fix extrafields transmition from supplier order lines to supplier invoice lines --- htdocs/fourn/facture/card.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index 32379a18d60..bebcb86f3a7 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -679,6 +679,11 @@ if (empty($reshook)) $desc=($lines[$i]->desc?$lines[$i]->desc:$lines[$i]->libelle); $product_type=($lines[$i]->product_type?$lines[$i]->product_type:0); + // Extrafields + if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) { + $lines[$i]->fetch_optionals($lines[$i]->rowid); + } + // Dates // TODO mutualiser $date_start=$lines[$i]->date_debut_prevue; From aaff13a98452795509f9f1df5529c666602be862 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 2 Jan 2018 14:28:52 +0100 Subject: [PATCH 0059/1074] Update card.php --- htdocs/comm/propal/card.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index edd2607a11c..65bc1831f20 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -1417,10 +1417,7 @@ if ($action == 'create') print "" . $langs->trans("DefaultContact") . ''; $form->select_contacts($soc->id, $contactid, 'contactid', 1, $srccontactslist); print ''; - } - if ($socid > 0) - { // Ligne info remises tiers print '' . $langs->trans('Discounts') . ''; if ($soc->remise_percent) From 1331e8add737ae66638fef468fbd31d879db78c9 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 2 Jan 2018 17:19:42 +0100 Subject: [PATCH 0060/1074] fix filter for TYPE_SITUATION invoice --- htdocs/compta/facture/list.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index 4b734a5e7d9..d7f9384399f 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -785,7 +785,8 @@ if ($resql) Facture::TYPE_STANDARD=>$langs->trans("InvoiceStandard"), Facture::TYPE_REPLACEMENT=>$langs->trans("InvoiceReplacement"), Facture::TYPE_CREDIT_NOTE=>$langs->trans("InvoiceAvoir"), - Facture::TYPE_DEPOSIT=>$langs->trans("InvoiceDeposit"), + Facture::TYPE_DEPOSIT=>$langs->trans("InvoiceDeposit"), + Facture::TYPE_SITUATION=>$langs->trans("InvoiceSituation"), ); //$listtype[Facture::TYPE_PROFORMA]=$langs->trans("InvoiceProForma"); // A proformat invoice is not an invoice but must be an order. print $form->selectarray('search_type', $listtype, $search_type, 1, 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth100'); From 61efda4cbd148b2656df9ddc8023c05fe6badfc3 Mon Sep 17 00:00:00 2001 From: ATM-Nicolas Date: Tue, 2 Jan 2018 17:21:04 +0100 Subject: [PATCH 0061/1074] FIX : product best price on product list --- htdocs/product/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/product/list.php b/htdocs/product/list.php index 8322fec244e..84cf070b39d 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -821,7 +821,7 @@ else if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire) { $htmltext=$product_fourn->display_price_product_fournisseur(1, 1, 0, 1); - print $form->textwithpicto(price($product_fourn->fourn_unitprice).' '.$langs->trans("HT"),$htmltext); + print $form->textwithpicto(price($product_fourn->fourn_unitprice * (1 - $product_fourn->fourn_remise_percent/100) + $product_fourn->fourn_unitcharges - $product_fourn->fourn_remise).' '.$langs->trans("HT"),$htmltext); } else print price($product_fourn->fourn_unitprice).' '.$langs->trans("HT"); } From c98b5c7ec71d6c8601ba96c0a70cd6051a27cee8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 2 Jan 2018 17:27:05 +0100 Subject: [PATCH 0062/1074] Fix css background --- htdocs/core/class/html.formfile.class.php | 2 +- htdocs/core/lib/functions.lib.php | 4 +- htdocs/theme/eldy/style.css.php | 8 ++-- htdocs/website/index.php | 45 ++++++----------------- 4 files changed, 20 insertions(+), 39 deletions(-) diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 677efccfdee..10a31b215f7 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -113,7 +113,7 @@ class FormFile if (! empty($options)) $out .= ''.$options.''; - $out .= ''; + $out .= ''; $max=$conf->global->MAIN_UPLOAD_DOC; // En Kb $maxphp=@ini_get('upload_max_filesize'); // En inconnu diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 9e7bb7f7ce8..26d9f50b3b6 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -4886,7 +4886,7 @@ function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart) global $conf; $path = ''; - + $arrayforoldpath=array('cheque','user','category','holiday','supplier_invoice','invoice_supplier','mailing','supplier_payment'); if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) $arrayforoldpath[]='product'; if (! empty($level) && in_array($modulepart, $arrayforoldpath)) @@ -5133,7 +5133,7 @@ function dol_nl2br($stringtoencode,$nl2brmode=0,$forxml=false) * @param int $removelasteolbr 1=Remove last br or lasts \n (default), 0=Do nothing * @return string String encoded */ -function dol_htmlentitiesbr($stringtoencode,$nl2brmode=0,$pagecodefrom='UTF-8',$removelasteolbr=1) +function dol_htmlentitiesbr($stringtoencode, $nl2brmode=0, $pagecodefrom='UTF-8', $removelasteolbr=1) { $newstring=$stringtoencode; if (dol_textishtml($stringtoencode)) // Check if text is already HTML or not diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 0f0372867a0..467f685dfe5 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -5002,12 +5002,12 @@ div.tabsElem a.tab { { .side-nav { z-index: 200; - background: #FFF; + background: rgb(); padding-top: 70px; } #id-left { z-index: 201; - background: #FFF; + background: rgb(); } .login_vertical_align { @@ -5050,7 +5050,9 @@ div.tabsElem a.tab { left: 0 !important; text-align: center; vertical-align: middle; - background: #FFF; + + background: rgb(); + height: 50px; z-index: 202; diff --git a/htdocs/website/index.php b/htdocs/website/index.php index f823c5158a9..509acd837f5 100644 --- a/htdocs/website/index.php +++ b/htdocs/website/index.php @@ -144,6 +144,14 @@ $diroutput = $conf->medias->multidir_output[$conf->entity]; $relativepath=$section_dir; $upload_dir = $diroutput.'/'.$relativepath; +$htmlheadercontentdefault =''."\n"; +$htmlheadercontentdefault.=''."\n"; +$htmlheadercontentdefault.=''."\n"; +$htmlheadercontentdefault.=''."\n"; +$htmlheadercontentdefault.=''."\n"; +$htmlheadercontentdefault.=''."\n"; + + /* * Actions @@ -608,15 +616,7 @@ if ($action == 'addcontainer') if (! dol_is_file($filehtmlheader)) { $htmlheadercontent ="\n"; - $htmlheadercontent.=''."\n"; - $htmlheadercontent.=''."\n"; - - $htmlheadercontent.=''."\n"; - $htmlheadercontent.=''."\n"; - - $htmlheadercontent.=''."\n"; - - $htmlheadercontent.=''."\n"; + $htmlheadercontent.=$htmlheadercontentdefault; $htmlheadercontent.=""; $result=dolSaveHtmlHeader($filehtmlheader, $htmlheadercontent); } @@ -1673,9 +1673,7 @@ if ($action == 'editcss') if (! trim($htmlheadercontent)) { $htmlheadercontent ="\n"; - $htmlheadercontent.=''."\n"; - $htmlheadercontent.=''."\n"; - $htmlheadercontent.=''."\n"; + $htmlheadercontent.=$htmlheadercontentdefault; $htmlheadercontent.=""; } else @@ -1755,17 +1753,7 @@ if ($action == 'editcss') // Common HTML header print ''; $htmlhelp=$langs->trans("Example").' :
'; - $htmlhelp.='
'; - $htmlhelp.='<script src="https://code.jquery.com/jquery-3.2.1.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous" ></script>
'; - $htmlhelp.='<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js" integrity="sha256-T0Vest3yCU7pafRw9r+settMBX6JkKN06dqBnpQ8d30=" crossorigin="anonymous" ></script>
'; - $htmlhelp.='
'; - $htmlhelp.='<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" />
'; - $htmlhelp.='
'; - $htmlhelp.='<script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" ></script>
'; - $htmlhelp.='<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.13.0/umd/popper.min.js" ></script>
'; - $htmlhelp.='
'; - $htmlhelp.='<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-beta/js/bootstrap.min.js" ></script>
'; - + $htmlhelp.=dol_htmlentitiesbr($htmlheadercontentdefault); print $form->textwithpicto($langs->trans('WEBSITE_HTML_HEADER'), $htmlhelp, 1, 'help', '', 0, 2, 'htmlheadertooltip'); print ''; @@ -1993,16 +1981,7 @@ if ($action == 'editmeta' || $action == 'createcontainer') $htmlhelp=$langs->trans("EditTheWebSiteForACommonHeader").'

'; $htmlhelp=$langs->trans("Example").' :
'; - $htmlhelp.='
'; - $htmlhelp.='<script src="https://code.jquery.com/jquery-3.2.1.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous" ></script>
'; - $htmlhelp.='<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js" integrity="sha256-T0Vest3yCU7pafRw9r+settMBX6JkKN06dqBnpQ8d30=" crossorigin="anonymous" ></script>
'; - $htmlhelp.='
'; - $htmlhelp.='<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" />
'; - $htmlhelp.='
'; - $htmlhelp.='<script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" ></script>
'; - $htmlhelp.='<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.13.0/umd/popper.min.js" ></script>
'; - $htmlhelp.='
'; - $htmlhelp.='<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-beta/js/bootstrap.min.js" ></script>
'; + $htmlhelp.=dol_htmlentitiesbr($htmlheadercontentdefault); print $form->textwithpicto($langs->trans('HtmlHeaderPage'), $htmlhelp, 1, 'help', '', 0, 2, 'htmlheadertooltip'); print ''; From ca14dd790b8e5e1cb0b41be27537c8875b8bb153 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 2 Jan 2018 22:58:37 +0100 Subject: [PATCH 0063/1074] Fix module website --- htdocs/core/lib/website.lib.php | 3 +++ htdocs/document.php | 17 ++++++++++++++++- htdocs/public/website/index.php | 3 +-- htdocs/website/index.php | 2 +- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php index 197e050f48a..bbe9a0fecad 100644 --- a/htdocs/core/lib/website.lib.php +++ b/htdocs/core/lib/website.lib.php @@ -93,6 +93,8 @@ function dolWebsiteOutput($content) // Fix relative link /document.php with correct URL after the DOL_URL_ROOT: ...href="/document.php?modulepart=" $content=preg_replace('/(href=")(\/?document\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3"', $content, -1, $nbrep); + $content=preg_replace('/(src=")(\/?document\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3"', $content, -1, $nbrep); + // Fix relative link /viewimage.php with correct URL after the DOL_URL_ROOT: ...href="/viewimage.php?modulepart=" $content=preg_replace('/(href=")(\/?viewimage\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3"', $content, -1, $nbrep); @@ -118,6 +120,7 @@ function dolWebsiteOutput($content) } else { + $content=preg_replace('/(]*src=")[^\"]*document\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^\/]*\/?>)/', '\1medias/\4\5', $content, -1, $nbrep); $content=preg_replace('/(]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^\/]*\/?>)/', '\1medias/\4\5', $content, -1, $nbrep); $content=preg_replace('/(url\(["\']?)[^\)]*viewimage\.php([^\)]*)modulepart=medias([^\)]*)file=([^\)]*)(["\']?\))/', '\1medias/\4\5', $content, -1, $nbrep); } diff --git a/htdocs/document.php b/htdocs/document.php index db9f4bdb41e..1c722e4cb55 100644 --- a/htdocs/document.php +++ b/htdocs/document.php @@ -30,7 +30,16 @@ * document.php?modulepart=logs&hashp=sharekey */ -define('NOTOKENRENEWAL',1); // Disables token renewal +//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language +//if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1'); // Not disabled cause need to load personalized language +//if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); +//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); +//if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK','1'); +if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); +//if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1'); +//if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1'); +//if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); +//if (! defined('NOREQUIREHOOK')) define('NOREQUIREHOOK','1'); // Disable "main.inc.php" hooks // For bittorent link, we don't need to load/check we are into a login session if (isset($_GET["modulepart"]) && $_GET["modulepart"] == 'bittorrent' && ! defined("NOLOGIN")) { @@ -43,6 +52,12 @@ if (isset($_GET["hashp"]) && ! defined("NOLOGIN")) define("NOLOGIN",1); define("NOCSRFCHECK",1); // We accept to go on this page from external web site. } +// Some value of modulepart can be used to get resources that are public so no login are required. +if ((isset($_GET["modulepart"]) && $_GET["modulepart"] == 'medias') && ! defined("NOLOGIN")) +{ + define("NOLOGIN",1); + define("NOCSRFCHECK",1); // We accept to go on this page from external web site. +} if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1'); if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1'); if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); diff --git a/htdocs/public/website/index.php b/htdocs/public/website/index.php index 0772965c5e6..0558268913d 100644 --- a/htdocs/public/website/index.php +++ b/htdocs/public/website/index.php @@ -191,8 +191,7 @@ if (! file_exists($original_file_osencoded)) // Output page content define('USEDOLIBARRSERVER', 1); print ''."\n"; -include_once $original_file_osencoded; - +include_once $original_file_osencoded; // Note: The pageXXX.tpl.php showed here contains a formatage with dolWebsiteOutput() at end of page. if (is_object($db)) $db->close(); diff --git a/htdocs/website/index.php b/htdocs/website/index.php index 509acd837f5..7d27badbc83 100644 --- a/htdocs/website/index.php +++ b/htdocs/website/index.php @@ -150,7 +150,7 @@ $htmlheadercontentdefault.=''."\n"; $htmlheadercontentdefault.=''."\n"; $htmlheadercontentdefault.=''."\n"; - +$htmlheadercontentdefault.=''."\n"; /* From c3f8012dfb61cb692b51f3f47a23e8f389143fbb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 2 Jan 2018 23:05:40 +0100 Subject: [PATCH 0064/1074] Update vat rates --- htdocs/install/mysql/data/llx_c_tva.sql | 89 +++++++++++++------------ 1 file changed, 45 insertions(+), 44 deletions(-) diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql index b805b9f8014..18ecfc82ba0 100644 --- a/htdocs/install/mysql/data/llx_c_tva.sql +++ b/htdocs/install/mysql/data/llx_c_tva.sql @@ -147,11 +147,11 @@ insert into llx_c_tva(rowid,fk_pays,code,taux,localtax1,localtax1_type,localtax2 insert into llx_c_tva(rowid,fk_pays,code,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active) values (1183, 117, 'I-28' , 28, 0, '0', 0, '0', 0, 'IGST', 1); -- IRELAND (id country=8) -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (81, 8, '0','0','VAT Rate 0',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (82, 8, '23','0','VAT standard rate',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (83, 8, '13.5','0','VAT reduced rate',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (84, 8, '9','0','VAT reduced rate',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (85, 8, '4.8','0','VAT reduced rate',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 81, 8, '0','0','VAT Rate 0',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 82, 8, '23','0','VAT standard rate',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 83, 8, '13.5','0','VAT reduced rate',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 84, 8, '9','0','VAT reduced rate',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 85, 8, '4.8','0','VAT reduced rate',1); -- 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); @@ -178,23 +178,23 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 2 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 277, 27, '7','0','VAT reduced rate',1); -- MAROCO (id country=12) -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (121, 12, '20','0','VAT standard rate',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (122, 12, '14','0','VAT reduced rate',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (123, 12, '10','0','VAT reduced rate',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (124, 12, '7','0','VAT super-reduced rate', 1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (125, 12, '0','0','VAT Rate 0', 1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 121, 12, '20','0','VAT standard rate',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 122, 12, '14','0','VAT reduced rate',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 123, 12, '10','0','VAT reduced rate',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 124, 12, '7','0','VAT super-reduced rate', 1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 125, 12, '0','0','VAT Rate 0', 1); -- MALTA (id country=148) insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1481, 148, '18','0','VAT standard rate',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1482, 148, '7','0','VAT reduced rate',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1483, 148, '5','0','VAT super-reduced rate', 1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1484, 148, '0','0','VAT Rate 0', 1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1482, 148, '7','0','VAT reduced rate',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1483, 148, '5','0','VAT super-reduced rate', 1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1484, 148, '0','0','VAT Rate 0', 1); -- NEDERLAND (id country=17) -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (171, 17, '19','0','Algemeen BTW tarief',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (172, 17, '6','0','Verlaagd BTW tarief', 1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (173, 17, '0','0','0 BTW tarief', 1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (174, 17, '21','0','Algemeen BTW tarief (vanaf 1 oktober 2012)',0); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 171, 17, '19','0','Algemeen BTW tarief',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 172, 17, '6','0','Verlaagd BTW tarief', 1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 173, 17, '0','0','0 BTW tarief', 1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 174, 17, '21','0','Algemeen BTW tarief (vanaf 1 oktober 2012)',0); -- NEW ZEALAND (id country=166) insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1662, 166, '15','0','VAT standard rate', 1); @@ -206,12 +206,12 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (16 -- NORWAY (id country=173) insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1731, 173, '25','0','VAT standard rate', 1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1732, 173, '14','0','VAT reduced rate', 1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1733, 173, '8','0','VAT reduced rate', 1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1734, 173, '0','0','VAT Rate 0', 1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1732, 173, '14','0','VAT reduced rate', 1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1733, 173, '8','0','VAT reduced rate', 1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1734, 173, '0','0','VAT Rate 0', 1); -- PANAMA (id country=178) -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1781, 178, '7','0','ITBMS standard rate',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1781, 178, '7','0','ITBMS standard rate',1); insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1782, 178, '0','0','ITBMS Rate 0',1); -- PERU (id country=181) @@ -225,28 +225,29 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (18 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1844, 184, '0','0','VAT Rate 0', 1); -- PORTUGAL (id country=25) -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (251, 25, '23','0','VAT standard rate',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (252, 25, '13','0','VAT reduced rate',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (253, 25, '0','0','VAT Rate 0', 1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (254, 25, '6','0','VAT reduced rate',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 251, 25, '23','0','VAT standard rate',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 252, 25, '13','0','VAT reduced rate',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 253, 25, '0','0','VAT Rate 0', 1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 254, 25, '6','0','VAT reduced rate',1); -- ROMANIA (id country=188) -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1881,188, '20','0','VAT standard rate',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1882,188, '9','0','VAT reduced rate',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1884,188, '5','0','VAT reduced rate',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1883,188, '0','0','VAT Rate 0', 1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1881, 188, '20','0','VAT standard rate',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1882, 188, '9','0','VAT reduced rate',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1884, 188, '5','0','VAT reduced rate',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1883, 188, '0','0','VAT Rate 0', 1); -- SAUDI ARABIA (id country=26) -INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES ( 261, 26, '0', '0', 'VAT Rate 0', 1); +INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES ( 261, 26, '0', '0', 'VAT Rate 0', 1); +INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES ( 262, 26, '5', '0', 'VAT Rate 5', 1); -- SAN SALVADOR (id country=86) -INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (861, 86, '13', '0', 'IVA 13', 1); -INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (862, 86, '0', '0', 'SIN IVA', 1); +INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES ( 861, 86, '13', '0', 'IVA 13', 1); +INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES ( 862, 86, '0', '0', 'SIN IVA', 1); -- SENEGAL (id country=22) -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (221, 22, '18', '0', 'VAT standard rate',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (222, 22, '10', '0', 'VAT reduced rate',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (223, 22, '0', '0', 'VAT Rate 0', 1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 221, 22, '18', '0', 'VAT standard rate',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 222, 22, '10', '0', 'VAT reduced rate',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 223, 22, '0', '0', 'VAT Rate 0', 1); -- SLOVAKIA (id country=201) INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (2011, 201, '19', '0', 'VAT standard rate', 1); @@ -265,19 +266,19 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_typ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,localtax2,localtax2_type,note,active) values ( 44, 4, '0','0', '0','3','-19:-15:-9','5','VAT Rate 0',1); -- SWEDEN (id country=20) -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (201,20, '25','0','VAT standard rate',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (202,20, '12','0','VAT reduced rate',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (203,20, '6','0','VAT super-reduced rate',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (204,20, '0','0','VAT Rate 0', 1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 201, 20, '25','0','VAT standard rate',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 202, 20, '12','0','VAT reduced rate',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 203, 20, '6','0','VAT super-reduced rate',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 204, 20, '0','0','VAT Rate 0', 1); -- SWITZERLAND (id country=6) -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 61, 6, '8','0','VAT standard rate',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 62, 6, '3.8','0','VAT reduced rate',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 63, 6, '2.5','0','VAT super-reduced rate',1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 64, 6, '0','0','VAT Rate 0', 1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 61, 6, '7.7','0','VAT standard rate',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 62, 6, '3.7','0','VAT reduced rate',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 63, 6, '2.5','0','VAT super-reduced rate',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 64, 6, '0','0','VAT Rate 0', 1); -- TAIWAN (id country=213) -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 2131, 213, '5','0','VAT 5%',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2131, 213, '5','0','VAT 5%',1); -- TUNISIA (id country=10) insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active,localtax1,localtax1_type,localtax2,localtax2_type) values (101,10, '6','0','VAT 6%', 1, 1, '4', 0, 0); From bc1f741600a45129a4196e23ba7f0ccefd7d0592 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 3 Jan 2018 14:46:18 +0100 Subject: [PATCH 0065/1074] Fix duplicate instructions --- htdocs/exports/export.php | 2 +- htdocs/exports/index.php | 16 +++++++++------- htdocs/imports/import.php | 2 +- htdocs/imports/index.php | 12 +++++++----- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index fe19d3073ae..a21dcdce7a6 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -447,7 +447,7 @@ if ($step == 1 || ! $datatoexport) print ''; - print $langs->trans("SelectExportDataSet").'
'; + print '
'.$langs->trans("SelectExportDataSet").'

'; // Affiche les modules d'exports print '
'; diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php index 58810ee84c0..0fea98fcec7 100644 --- a/htdocs/exports/index.php +++ b/htdocs/exports/index.php @@ -47,15 +47,16 @@ llxHeader('',$langs->trans("ExportsArea"),'EN:Module_Exports_En|FR:Module_Export print load_fiche_titre($langs->trans("ExportsArea")); print $langs->trans("FormatedExportDesc1").'
'; -print $langs->trans("FormatedExportDesc2").' '; -print $langs->trans("FormatedExportDesc3").'
'; +//print $langs->trans("FormatedExportDesc2").' '; +//print $langs->trans("FormatedExportDesc3").'
'; print '
'; -print '
'; +//print '
'; // List export set +/* print '
'; print ''; print ''; @@ -67,7 +68,7 @@ if (count($export->array_export_code)) { foreach ($export->array_export_code as $key => $value) { - + print '
'.$langs->trans("Module").'
'; //print img_object($export->array_export_module[$key]->getName(),$export->array_export_module[$key]->picto).' '; print $export->array_export_module[$key]->getName(); @@ -89,6 +90,7 @@ else } print '
'; print '
'; +*/ print '
'; if (count($export->array_export_code)) @@ -110,7 +112,7 @@ if (count($export->array_export_code)) print '
'; print '
'; -print '
'; +//print '
'; // List of available export format @@ -134,7 +136,7 @@ foreach($liste as $key => $val) $liste[$key]=preg_replace('/__\(Disabled\)__/','('.$langs->transnoentitiesnoconv("Disabled").')',$liste[$key]); } - + print ''; print ''.img_picto_common($model->getDriverLabelForKey($key),$model->getPictoForKey($key)).''; $text=$model->getDriverDescForKey($key); @@ -148,7 +150,7 @@ foreach($liste as $key => $val) print ''; -print '
'; +//print ''; llxFooter(); diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 6223bf92aad..93cb22ea469 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -343,7 +343,7 @@ if ($step == 1 || ! $datatoimport) dol_fiche_head($head, 'step1', $langs->trans("NewImport"), -1); - print $langs->trans("SelectImportDataSet").'
'; + print '
'.$langs->trans("SelectImportDataSet").'

'; // Affiche les modules d'imports print ''; diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php index 32f08d5bda5..36811acc587 100644 --- a/htdocs/imports/index.php +++ b/htdocs/imports/index.php @@ -44,14 +44,15 @@ llxHeader('',$langs->trans("ImportArea"),'EN:Module_Imports_En|FR:Module_Imports print load_fiche_titre($langs->trans("ImportArea")); print $langs->trans("FormatedImportDesc1").'
'; -print $langs->trans("FormatedImportDesc2").'
'; +//print $langs->trans("FormatedImportDesc2").'
'; print '
'; -print '
'; +//print '
'; // List of import set +/* print '
'; print ''; print ''; @@ -84,6 +85,7 @@ else } print '
'.$langs->trans("Module").'
'; print '
'; +*/ print '
'; if (count($import->array_import_code)) @@ -101,7 +103,7 @@ print '
'; print '
'; -print '
'; +//print '
'; // List of available import format @@ -119,7 +121,7 @@ $liste=$model->liste_modeles($db); foreach($liste as $key) { - + print ''; print ''.img_picto_common($model->getDriverLabelForKey($key),$model->getPictoForKey($key)).''; $text=$model->getDriverDescForKey($key); @@ -132,7 +134,7 @@ foreach($liste as $key) print ''; -print '
'; +//print ''; llxFooter(); From 25390e5f73f5497ced8d451ea1e903255e619f96 Mon Sep 17 00:00:00 2001 From: florian HENRY Date: Wed, 3 Jan 2018 17:03:00 +0100 Subject: [PATCH 0066/1074] fix : linked object (new format of linked_object atribut on 6.0) --- htdocs/fourn/commande/orderstoinvoice.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php index b1a8c0c08c1..20f9a3674cf 100644 --- a/htdocs/fourn/commande/orderstoinvoice.php +++ b/htdocs/fourn/commande/orderstoinvoice.php @@ -171,16 +171,15 @@ if (($action == 'create' || $action == 'add') && ! $error) { if ($ret < 0) $error++; if ($_POST['origin'] && $_POST['originid']) { - $object->linked_objects = $orders_id; + $linked_orders_ids=array(); + foreach ( $orders_id as $origin => $origin_id ) { + $origin_id = (! empty($origin_id) ? $origin_id : $orders_id[$ii]); + $linked_orders_ids[]=$origin_id; + } + $object->linked_objects = array(GETPOST('origin')=>$linked_orders_ids); $id = $object->create($user); if ($id > 0) { - foreach ( $orders_id as $origin => $origin_id ) { - $origin_id = (! empty($origin_id) ? $origin_id : $orders_id[$ii]); - - $object->add_object_linked(GETPOST('origin'), $origin_id); - } - while ( $ii < $nn ) { $objectsrc = new CommandeFournisseur($db); dol_syslog("Try to find source object origin=" . $object->origin . " originid=" . $object->origin_id . " to add lines"); From 534cbcb941d9f6a97631539f10b5ced131904863 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 3 Jan 2018 20:59:35 +0100 Subject: [PATCH 0067/1074] Debug translation --- htdocs/accountancy/admin/categories_list.php | 11 ++--------- htdocs/compta/resultat/result.php | 2 +- htdocs/langs/en_US/accountancy.lang | 2 +- htdocs/langs/en_US/admin.lang | 2 +- htdocs/langs/fr_FR/admin.lang | 2 +- 5 files changed, 6 insertions(+), 13 deletions(-) diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php index ad8b563e477..9833a1c01b1 100644 --- a/htdocs/accountancy/admin/categories_list.php +++ b/htdocs/accountancy/admin/categories_list.php @@ -31,14 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php'; -$langs->load("errors"); -$langs->load("admin"); -$langs->load("main"); -$langs->load("companies"); -$langs->load("resource"); -$langs->load("holiday"); -$langs->load("accountancy"); -$langs->load("hrm"); +$langs->loadLangs(array("errors","admin","companies","resource","holiday","accountancy","hrm")); $action=GETPOST('action','alpha')?GETPOST('action','alpha'):'view'; $confirm=GETPOST('confirm','alpha'); @@ -418,7 +411,7 @@ if ($action == 'disable_favorite') $form = new Form($db); $formadmin=new FormAdmin($db); -llxHeader('', $langs->trans('AccountingCategory')); +llxHeader('', $langs->trans('DictionaryAccountancyCategory')); $titre=$langs->trans($tablib[$id]); $linkback=''; diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php index 261121b9d7c..a75c70cc80a 100644 --- a/htdocs/compta/resultat/result.php +++ b/htdocs/compta/resultat/result.php @@ -199,7 +199,7 @@ else if ($modecompta=="BOOKKEEPING") $period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1); $arraylist=array('no'=>$langs->trans("No"), 'yes'=>$langs->trans("AccountWithNonZeroValues"), 'all'=>$langs->trans("All")); $period.='     '.$langs->trans("DetailByAccount").' '. $form->selectarray('showaccountdetail', $arraylist, $showaccountdetail, 0); - $periodlink = $textprevyear . " " . $langs->trans("Year") . " " . $start_year . " " . $textnextyear ; + $periodlink = $textprevyear . $textnextyear ; $exportlink = ''; $description=$langs->trans("RulesResultBookkeepingPersonalized"). $description.=' ('.$langs->trans("SeePageForSetup", DOL_URL_ROOT.'/accountancy/admin/categories_list.php?search_country_id='.$mysoc->country_id.'&mainmenu=accountancy&leftmenu=accountancy_admin', $langs->transnoentitiesnoconv("Accountancy").' / '.$langs->transnoentitiesnoconv("Setup").' / '.$langs->transnoentitiesnoconv("AccountingCategory")).')'; diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang index b7e6c30d87c..85c6b6a0e16 100644 --- a/htdocs/langs/en_US/accountancy.lang +++ b/htdocs/langs/en_US/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Piece number TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index a4ece445581..657b1e477e4 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -890,7 +890,7 @@ DictionaryStaff=Staff DictionaryAvailability=Delivery delay DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Models for chart of accounts DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=Emails templates diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 021dff351de..a8a82d77d7d 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -890,7 +890,7 @@ DictionaryStaff=Effectifs DictionaryAvailability=Délai de livraison DictionaryOrderMethods=Méthodes de commandes DictionarySource=Origines des propales/commandes -DictionaryAccountancyCategory=Groupes personnalisés +DictionaryAccountancyCategory=Groupes personnalisés pour les rapports DictionaryAccountancysystem=Modèles de plan comptable DictionaryAccountancyJournal=Journaux comptables DictionaryEMailTemplates=Modèles des courriels From f6007045f581f92f17cb6bbf9d111a663cfd333e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 4 Jan 2018 00:23:08 +0100 Subject: [PATCH 0068/1074] Fix search filters --- htdocs/comm/propal/list.php | 2 +- htdocs/projet/tasks/time.php | 36 ++++++++++++++++++++++++++++++------ 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 15f6c0b3513..8796da505cd 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -374,7 +374,7 @@ if ($resql) if ($search_year) $param.='&search_year='.urlencode($search_year); if ($search_ref) $param.='&search_ref='.urlencode($search_ref); if ($search_refcustomer) $param.='&search_refcustomer='.urlencode($search_refcustomer); - if ($search_refprojet) $param.='&search_refprojet='.urlencode($search_refprojet); + if ($search_refprojet) $param.='&search_refprojet='.urlencode($search_refprojet); if ($search_societe) $param.='&search_societe='.urlencode($search_societe); if ($search_user > 0) $param.='&search_user='.urlencode($search_user); if ($search_sale > 0) $param.='&search_sale='.urlencode($search_sale); diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index 44fb15869ff..8a4ac65c763 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -41,9 +41,9 @@ $confirm=GETPOST('confirm','alpha'); $withproject=GETPOST('withproject','int'); $project_ref=GETPOST('project_ref','alpha'); -$search_dateday=GETPOST('search_dateday'); -$search_datemonth=GETPOST('search_datemonth'); -$search_dateyear=GETPOST('search_dateyear'); +$search_day=GETPOST('search_day','int'); +$search_month=GETPOST('search_month','int'); +$search_year=GETPOST('search_year','int'); $search_datehour=''; $search_datewithhour=''; $search_note=GETPOST('search_note','alpha'); @@ -98,7 +98,10 @@ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php'; // Purge search criteria if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') ||GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers { - $search_date=''; + $search_day=''; + $search_month=''; + $search_year=''; + $search_date=''; $search_datehour=''; $search_datewithhour=''; $search_note=''; @@ -643,6 +646,20 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0) if ($search_task_ref) $sql .= natural_search('pt.ref', $search_task_ref); if ($search_task_label) $sql .= natural_search('pt.label', $search_task_label); if ($search_user > 0) $sql .= natural_search('t.fk_user', $search_user); + if ($search_month > 0) + { + if ($search_year > 0 && empty($search_day)) + $sql.= " AND t.task_datehour BETWEEN '".$db->idate(dol_get_first_day($search_year,$search_month,false))."' AND '".$db->idate(dol_get_last_day($search_year,$search_month,false))."'"; + else if ($search_year > 0 && ! empty($search_day)) + $sql.= " AND t.task_datehour BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $search_month, $search_day, $search_year))."' AND '".$db->idate(dol_mktime(23, 59, 59, $search_month, $search_day, $search_year))."'"; + else + $sql.= " AND date_format(t.task_datehour, '%m') = '".$db->escape($search_month)."'"; + } + else if ($search_year > 0) + { + $sql.= " AND t.task_datehour BETWEEN '".$db->idate(dol_get_first_day($search_year,1,false))."' AND '".$db->idate(dol_get_last_day($search_year,12,false))."'"; + } + $sql .= $db->order($sortfield, $sortorder); $var=true; @@ -738,14 +755,21 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0) // Fields title search print ''; // Date - if (! empty($arrayfields['t.task_date']['checked'])) print ''; + if (! empty($arrayfields['t.task_date']['checked'])) + { + print ''; + if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print ''; + print ''; + $formother->select_year($search_year,'search_year',1, 20, 5); + print ''; + } if ((empty($id) && empty($ref)) || ! empty($projectidforalltimes)) // Not a dedicated task { if (! empty($arrayfields['t.task_ref']['checked'])) print ''; if (! empty($arrayfields['t.task_label']['checked'])) print ''; } // Author - if (! empty($arrayfields['author']['checked'])) print ''.$form->select_dolusers($search_user > 0 ? $search_user : -1, 'search_user', 1).''; + if (! empty($arrayfields['author']['checked'])) print ''.$form->select_dolusers(($search_user > 0 ? $search_user : -1), 'search_user', 1, null, 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200').''; // Note if (! empty($arrayfields['t.note']['checked'])) print ''; // Duration From b3465d441a413c7129eb5322167c49d8f9b50aef Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 4 Jan 2018 10:45:48 +0100 Subject: [PATCH 0069/1074] Missing ajaxcombobox --- htdocs/core/class/html.formother.class.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php index dfd70a075f0..ae1ec52a788 100644 --- a/htdocs/core/class/html.formother.class.php +++ b/htdocs/core/class/html.formother.class.php @@ -481,12 +481,14 @@ class FormOther $tasksarray=$task->getTasksArray($modetask?$user:0, $modeproject?$user:0, $projectid, 0, $mode); if ($tasksarray) { - print ''; if ($useempty) print ''; $j=0; $level=0; $this->_pLineSelect($j, 0, $tasksarray, $level, $selectedtask, $projectid, $disablechildoftaskid); print ''; + + print ajax_combobox($htmlname); } else { From 58470e0913ad38f4462185295f58379b21005b5a Mon Sep 17 00:00:00 2001 From: gauthier Date: Thu, 4 Jan 2018 12:01:21 +0100 Subject: [PATCH 0070/1074] FIX : $oldvatrateclean & $newvatrateclean must be set if preg_match === false --- htdocs/product/admin/product_tools.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/product/admin/product_tools.php b/htdocs/product/admin/product_tools.php index f19f672a25e..c9323f75823 100644 --- a/htdocs/product/admin/product_tools.php +++ b/htdocs/product/admin/product_tools.php @@ -73,7 +73,7 @@ if ($action == 'convert') { $vat_src_code_old = $reg[1]; $oldvatrateclean = preg_replace('/\s*\(.*\)/', '', $oldvatrate); // Remove code into vatrate. - } + } else $oldvatrateclean=$oldvatrate; // Clean vat code new $vat_src_code_new=''; @@ -81,7 +81,7 @@ if ($action == 'convert') { $vat_src_code_new = $reg[1]; $newvatrateclean = preg_replace('/\s*\(.*\)/', '', $newvatrate); // Remove code into vatrate. - } + } else $newvatrateclean=$newvatrate; // If country to edit is my country, so we change customer prices if ($country_id == $mysoc->country_id) From 04dd0663ff22acb911a7a3316c37650b7d60307b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 4 Jan 2018 12:17:32 +0100 Subject: [PATCH 0071/1074] Fix translation --- htdocs/langs/en_US/languages.lang | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/langs/en_US/languages.lang b/htdocs/langs/en_US/languages.lang index 05288a888eb..a062883d667 100644 --- a/htdocs/langs/en_US/languages.lang +++ b/htdocs/langs/en_US/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Spanish (Paraguay) Language_es_PE=Spanish (Peru) Language_es_PR=Spanish (Puerto Rico) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Spanish (Venezuela) Language_et_EE=Estonian Language_eu_ES=Basque From c4eba665d0e99ff428dfdd6c644e922b440e6f67 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 4 Jan 2018 13:52:37 +0100 Subject: [PATCH 0072/1074] Fix order of task in gantt diagram --- htdocs/projet/class/task.class.php | 27 ++++++++++++++++++++------- htdocs/projet/ganttchart.inc.php | 26 +++++++++++++++++--------- htdocs/projet/ganttview.php | 27 +++++++++++++++++++++++---- 3 files changed, 60 insertions(+), 20 deletions(-) diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index 2a77de4f552..e694b3c7bfd 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -187,11 +187,12 @@ class Task extends CommonObject /** * Load object in memory from database * - * @param int $id Id object - * @param int $ref ref object - * @return int <0 if KO, 0 if not found, >0 if OK + * @param int $id Id object + * @param int $ref ref object + * @param int $loadparentdata Also load parent data + * @return int <0 if KO, 0 if not found, >0 if OK */ - function fetch($id,$ref='') + function fetch($id, $ref='', $loadparentdata=0) { global $langs; @@ -215,7 +216,13 @@ class Task extends CommonObject $sql.= " t.note_private,"; $sql.= " t.note_public,"; $sql.= " t.rang"; + if (! empty($loadparentdata)) + { + $sql.=", t2.ref as task_parent_ref"; + $sql.=", t2.rang as task_parent_position"; + } $sql.= " FROM ".MAIN_DB_PREFIX."projet_task as t"; + if (! empty($loadparentdata)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task as t2 ON t.fk_task_parent = t2.rowid"; $sql.= " WHERE "; if (!empty($ref)) { $sql.="t.ref = '".$this->db->escape($ref)."'"; @@ -253,14 +260,20 @@ class Task extends CommonObject $this->note_public = $obj->note_public; $this->rang = $obj->rang; - // Retreive all extrafield for thirdparty + if (! empty($loadparentdata)) + { + $this->task_parent_ref = $obj->task_parent_ref; + $this->task_parent_position = $obj->task_parent_position; + } + + // Retreive all extrafield data $this->fetch_optionals(); } $this->db->free($resql); - if ($num_rows) { - $this->fetchComments(); + if ($num_rows) + { return 1; }else { return 0; diff --git a/htdocs/projet/ganttchart.inc.php b/htdocs/projet/ganttchart.inc.php index 58d212db7bd..fc8ab9d7882 100644 --- a/htdocs/projet/ganttchart.inc.php +++ b/htdocs/projet/ganttchart.inc.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2010-2017 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 @@ -109,6 +109,10 @@ if (g.getDivId() != null) g.setLang('getDefaultLang(1);?>'); fetch($t['task_project_id']); $tmpt = array( - 'task_id'=> '-'.$t['task_project_id'], 'task_name'=>$projecttmp->ref.' '.$projecttmp->title, 'task_resources'=>'', 'task_start_date'=>'', 'task_end_date'=>'', - 'task_is_group'=>1, 'task_css'=>'ggroupblack', 'task_milestone'=> 0, 'task_parent'=>0, 'task_notes'=>''); + 'task_id'=> '-'.$t['task_project_id'], 'task_alternate_id'=> '-'.$t['task_project_id'], 'task_name'=>$projecttmp->ref.' '.$projecttmp->title, 'task_resources'=>'', 'task_start_date'=>'', 'task_end_date'=>'', + 'task_is_group'=>1, 'task_position'=>0, 'task_css'=>'ggroupblack', 'task_milestone'=> 0, 'task_parent'=>0, 'task_parent_alternate_id'=>0, 'task_notes'=>'' + ); constructGanttLine($tasks, $tmpt, array(), 0, $t['task_project_id']); $old_project_id = $t['task_project_id']; } @@ -134,6 +139,8 @@ if (g.getDivId() != null) findChildGanttLine($tasks, $t["task_id"], $task_dependencies, $level+1); } } + + echo "\n"; ?> g.Draw(jQuery("#tabs").width()-40); @@ -188,7 +195,8 @@ function constructGanttLine($tarr, $task, $task_dependencies, $level=0, $project } else { - $parent = $task["task_parent"]; + $parent = $task["task_parent_alternate_id"]; + //$parent = $task["task_parent"]; } // Define percent $percent = $task['task_percent_complete']?$task['task_percent_complete']:0; @@ -238,7 +246,7 @@ function constructGanttLine($tarr, $task, $task_dependencies, $level=0, $project //$note=""; - $s = "\n// Add taks id=".$task["task_id"]." level = ".$level."\n"; + $s = "\n// Add task level = ".$level." id=".$task["task_id"]." parent_id=".$task["task_parent"]." aternate_id=".$task["task_alternate_id"]." parent_aternate_id=".$task["task_parent_alternate_id"]."\n"; //$task["task_is_group"]=1; // When task_is_group is 1, content will be autocalculated from sum of all low tasks @@ -251,7 +259,10 @@ function constructGanttLine($tarr, $task, $task_dependencies, $level=0, $project $dependency = ''; //$name = str_repeat("..", $level).$name; - $s.= "g.AddTaskItem(new JSGantt.TaskItem('".$task['task_id']."', '".dol_escape_js(trim($name))."', '".$start_date."', '".$end_date."', '".$css."', '".$link."', ".$task['task_milestone'].", '".dol_escape_js($resources)."', ".($percent >= 0 ? $percent : 0).", ".$line_is_auto_group.", '".$parent."', 1, '".$dependency."', '".(empty($task["task_is_group"]) ? (($percent >= 0 && $percent != '') ? $percent.'%' : '') : '')."', '".dol_escape_js($task['note'])."', g));"; + $taskid = $task["task_alternate_id"]; + //$taskid = $task['task_id']; + + $s.= "g.AddTaskItem(new JSGantt.TaskItem('".$taskid."', '".dol_escape_js(trim($name))."', '".$start_date."', '".$end_date."', '".$css."', '".$link."', ".$task['task_milestone'].", '".dol_escape_js($resources)."', ".($percent >= 0 ? $percent : 0).", ".$line_is_auto_group.", '".$parent."', 1, '".$dependency."', '".(empty($task["task_is_group"]) ? (($percent >= 0 && $percent != '') ? $percent.'%' : '') : '')."', '".dol_escape_js($task['note'])."', g));"; echo $s; @@ -270,9 +281,6 @@ function findChildGanttLine($tarr, $parent, $task_dependencies, $level) { $n=count($tarr); - echo "\n"; - echo "/* g.AddTaskItem(new JSGantt.TaskItem(task_id, 'label', 'start_date', 'end_date', 'css', 'link', milestone, 'Resources', Compl%, Group, Parent, 1, 'Dependency', 'label','note', g)); */\n"; - $old_parent_id = 0; for ($x=0; $x < $n; $x++) { diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php index c3552d714f2..119684bf6e6 100644 --- a/htdocs/projet/ganttview.php +++ b/htdocs/projet/ganttview.php @@ -246,15 +246,20 @@ if (count($tasksarray)>0) $tasks=array(); $task_dependencies=array(); $taskcursor=0; - foreach($tasksarray as $key => $val) + foreach($tasksarray as $key => $val) // Task array are sorted by "project, position, dateo" { - $task->fetch($val->id); + $task->fetch($val->id, ''); + + $idparent = ($val->fk_parent ? $val->fk_parent : '-'.$val->fk_project); // If start with -, id is a project id $tasks[$taskcursor]['task_id']=$val->id; + $tasks[$taskcursor]['task_alternate_id']=($taskcursor+1); // An id that has same order than position (requird by ganttchart) $tasks[$taskcursor]['task_project_id']=$val->fk_project; - $tasks[$taskcursor]['task_parent']=($val->fk_parent ? $val->fk_parent : '-'.$val->fk_project); - $tasks[$taskcursor]['task_is_group'] = 0; + $tasks[$taskcursor]['task_parent']=$idparent; + + $tasks[$taskcursor]['task_is_group'] = 0; $tasks[$taskcursor]['task_css'] = 'gtaskblue'; + $tasks[$taskcursor]['task_position'] = $val->rang; if ($val->fk_parent != 0 && $task->hasChildren()> 0){ $tasks[$taskcursor]['task_is_group']=1; @@ -321,6 +326,20 @@ if (count($tasksarray)>0) $taskcursor++; } + // Search parent to set task_parent_alternate_id (requird by ganttchart) + foreach($tasks as $tmpkey => $tmptask) + { + foreach($tasks as $tmptask2) + { + if ($tmptask2['task_id'] == $tmptask['task_parent']) + { + $tasks[$tmpkey]['task_parent_alternate_id']=$tmptask2['task_alternate_id']; + break; + } + } + if (empty($tasks[$tmpkey]['task_parent_alternate_id'])) $tasks[$tmpkey]['task_parent_alternate_id'] = $tasks[$tmpkey]['task_parent']; + } + print "\n"; if (! empty($conf->use_javascript_ajax)) From 300d4e1603447f5c1f6aaa271255f849c3fe4135 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 4 Jan 2018 14:35:02 +0100 Subject: [PATCH 0073/1074] Fix disable direct debit request for replaced invoices --- htdocs/compta/facture/card.php | 10 +++++++--- htdocs/projet/ganttchart.inc.php | 2 +- htdocs/theme/eldy/style.css.php | 2 ++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index 98c06179368..c769b538d43 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -64,7 +64,7 @@ if (! empty($conf->accounting->enabled)) { require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php'; } -$langs->loadLangs(array('bills','companies','compta','products','banks','main')); +$langs->loadLangs(array('bills','companies','compta','products','banks','main','withdrawals')); if (! empty($conf->incoterm->enabled)) $langs->load('incoterm'); if (! empty($conf->margin->enabled)) $langs->load('margins'); @@ -4293,8 +4293,12 @@ else if ($id > 0 || ! empty($ref)) { if ($user->rights->prelevement->bons->creer) { - $langs->load("withdrawals"); - print ''.$langs->trans("MakeWithdrawRequest").''; + if (! $objectidnext && $object->close_code != 'replaced') // Not replaced by another invoice + { + print ''.$langs->trans("MakeWithdrawRequest").''; + } else { + print '
' . $langs->trans('MakeWithdrawRequest') . '
'; + } } else { diff --git a/htdocs/projet/ganttchart.inc.php b/htdocs/projet/ganttchart.inc.php index fc8ab9d7882..2777b59f032 100644 --- a/htdocs/projet/ganttchart.inc.php +++ b/htdocs/projet/ganttchart.inc.php @@ -111,7 +111,7 @@ if (g.getDivId() != null) Date: Thu, 4 Jan 2018 14:54:04 +0100 Subject: [PATCH 0074/1074] Fix ui --- htdocs/theme/eldy/style.css.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index a64bc369fae..dafa39c9ce1 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -3799,7 +3799,8 @@ A.none, A.none:active, A.none:visited, A.none:hover { font-family:; font-size:px; } -.ui-button { margin-left: -2px; browser->name)?'padding-top: 1px;':''); ?> } +/* .ui-button { margin-left: -2px; browser->name)?'padding-top: 1px;':''); ?> } */ +.ui-button { margin-left: -2px; } .ui-button-icon-only .ui-button-text { height: 8px; } .ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: 2px 0px 6px 0px; } .ui-button-text From 7d824b3ef238124f11758b4744a891d92ba15b11 Mon Sep 17 00:00:00 2001 From: KHELIFA Date: Thu, 4 Jan 2018 15:05:11 +0100 Subject: [PATCH 0075/1074] Fix: Access rights for resource in multi-entities --- htdocs/core/lib/security.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php index fa624a118f8..71fcdf33bb3 100644 --- a/htdocs/core/lib/security.lib.php +++ b/htdocs/core/lib/security.lib.php @@ -383,7 +383,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid=0, $tableandsh if ($feature == 'project') $feature='projet'; if ($feature == 'task') $feature='projet_task'; - $check = array('adherent','banque','user','usergroup','produit','service','produit|service','categorie'); // Test on entity only (Objects with no link to company) + $check = array('adherent','banque','user','usergroup','produit','service','produit|service','categorie','resource'); // Test on entity only (Objects with no link to company) $checksoc = array('societe'); // Test for societe object $checkother = array('contact','agenda'); // Test on entity and link to third party. Allowed if link is empty (Ex: contacts...). $checkproject = array('projet','project'); // Test for project object From 59ed23069c87da64ff194826295f067165c87563 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 4 Jan 2018 15:52:07 +0100 Subject: [PATCH 0076/1074] Fix debug accounting module --- htdocs/accountancy/journal/bankjournal.php | 38 +++++++++---- .../journal/expensereportsjournal.php | 4 +- .../accountancy/journal/purchasesjournal.php | 54 ++++++++++--------- htdocs/accountancy/journal/sellsjournal.php | 6 ++- htdocs/langs/en_US/accountancy.lang | 1 + 5 files changed, 62 insertions(+), 41 deletions(-) diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php index 925628c8fa7..32396a9333c 100644 --- a/htdocs/accountancy/journal/bankjournal.php +++ b/htdocs/accountancy/journal/bankjournal.php @@ -94,7 +94,7 @@ if ($pastmonth == 0) { $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear); $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear); -if (empty($date_start) || empty($date_end)) // We define date_start and date_end +if (! GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))) // We define date_start and date_end, only if we did not submit the form { $date_start = dol_get_first_day($pastmonthyear, $pastmonth, false); $date_end = dol_get_last_day($pastmonthyear, $pastmonth, false); @@ -786,7 +786,7 @@ if (empty($action) || $action == 'view') { $description.= $langs->trans("DescJournalOnlyBindedVisible").'
'; $listofchoices=array('already'=>$langs->trans("AlreadyInGeneralLedger"), 'notyet'=>$langs->trans("NotYetInGeneralLedger")); - $period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1). ' - ' .$langs->trans("JournalizationInLedgerStatus").' '. $form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1); + $period = $form->select_date($date_start?$date_start:-1, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end?$date_end:-1, 'date_end', 0, 0, 0, '', 1, 0, 1). ' - ' .$langs->trans("JournalizationInLedgerStatus").' '. $form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1); $varlink = 'id_journal=' . $id_journal; @@ -932,7 +932,14 @@ if (empty($action) || $action == 'view') { if ($tabtype[$key] == 'unknown') { // We will accept writing, but into a waiting account - print ''.$langs->trans('UnknownAccountForThirdparty', length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE)).''; // We will a waiting account + if (empty($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE) || $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE == '-1') + { + print ''.$langs->trans('UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking').''; + } + else + { + print ''.$langs->trans('UnknownAccountForThirdparty', length_accountg($conf->global->ACCOUNTING_ACCOUNT_SUSPENSE)).''; // We will a waiting account + } } else { @@ -1103,15 +1110,24 @@ function getSourceDocRef($val, $typerecord) $sqlmid .= " WHERE v.rowid=" . $val["paymentvariousid"]; $ref = $langs->trans("VariousPayment"); } - dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG); - $resultmid = $db->query($sqlmid); - if ($resultmid) { - while ($objmid = $db->fetch_object($resultmid)) - { - $ref.=' '.$objmid->ref; - } + // Add warning + if (empty($sqlmid)) + { + dol_syslog("Found a typerecord=".$typerecord." not supported", LOG_WARNING); + } + + if ($sqlmid) + { + dol_syslog("accountancy/journal/bankjournal.php::sqlmid=" . $sqlmid, LOG_DEBUG); + $resultmid = $db->query($sqlmid); + if ($resultmid) { + while ($objmid = $db->fetch_object($resultmid)) + { + $ref.=' '.$objmid->ref; + } + } + else dol_print_error($db); } - else dol_print_error($db); return $ref; } diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php index 10755fe2c9c..4a4dafbe2b4 100644 --- a/htdocs/accountancy/journal/expensereportsjournal.php +++ b/htdocs/accountancy/journal/expensereportsjournal.php @@ -77,7 +77,7 @@ if ($pastmonth == 0) { $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear); $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear); -if (empty($date_start) || empty($date_end)) // We define date_start and date_end +if (! GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))) // We define date_start and date_end, only if we did not submit the form { $date_start = dol_get_first_day($pastmonthyear, $pastmonth, false); $date_end = dol_get_last_day($pastmonthyear, $pastmonth, false); @@ -528,7 +528,7 @@ if (empty($action) || $action == 'view') { $description.= $langs->trans("DescJournalOnlyBindedVisible").'
'; $listofchoices=array('already'=>$langs->trans("AlreadyInGeneralLedger"), 'notyet'=>$langs->trans("NotYetInGeneralLedger")); - $period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1). ' - ' .$langs->trans("JournalizationInLedgerStatus").' '. $form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1); + $period = $form->select_date($date_start?$date_start:-1, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end?$date_end:-1, 'date_end', 0, 0, 0, '', 1, 0, 1). ' - ' .$langs->trans("JournalizationInLedgerStatus").' '. $form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1); $varlink = 'id_journal=' . $id_journal; diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php index 0e82566b22a..f5429dce86e 100644 --- a/htdocs/accountancy/journal/purchasesjournal.php +++ b/htdocs/accountancy/journal/purchasesjournal.php @@ -86,7 +86,7 @@ if ($pastmonth == 0) { $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear); $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear); -if (empty($date_start) || empty($date_end)) // We define date_start and date_end +if (! GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))) // We define date_start and date_end, only if we did not submit the form { $date_start = dol_get_first_day($pastmonthyear, $pastmonth, false); $date_end = dol_get_last_day($pastmonthyear, $pastmonth, false); @@ -638,7 +638,7 @@ if (empty($action) || $action == 'view') { } $listofchoices=array('already'=>$langs->trans("AlreadyInGeneralLedger"), 'notyet'=>$langs->trans("NotYetInGeneralLedger")); - $period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1). ' - ' .$langs->trans("JournalizationInLedgerStatus").' '. $form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1); + $period = $form->select_date($date_start?$date_start:-1, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end?$date_end:-1, 'date_end', 0, 0, 0, '', 1, 0, 1). ' - ' .$langs->trans("JournalizationInLedgerStatus").' '. $form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1); $varlink = 'id_journal=' . $id_journal; @@ -811,32 +811,34 @@ if (empty($action) || $action == 'view') { } // VAT counterpart for NPR - foreach ( $tabother[$key] as $k => $mt ) { - print ''; - print ""; - print "" . $date . ""; - print "" . $invoicestatic->getNomUrl(1) . ""; - $companystatic->id = $tabcompany[$key]['id']; - $companystatic->name = $tabcompany[$key]['name']; - $companystatic->supplier_code = $tabcompany[$key]['code_supplier']; - // Account - print ""; - $accountoshow = length_accountg($k); - if (empty($accountoshow) || $accountoshow == 'NotDefined') - { - print ''.$langs->trans("VATAccountNotDefined").' ('.$langs->trans("NPR counterpart").'). Set ACCOUNTING_COUNTERPART_VAT_NPR to the subvention account'.''; + if (is_array($tabother[$key])) + { + foreach ( $tabother[$key] as $k => $mt ) { + print ''; + print ""; + print "" . $date . ""; + print "" . $invoicestatic->getNomUrl(1) . ""; + $companystatic->id = $tabcompany[$key]['id']; + $companystatic->name = $tabcompany[$key]['name']; + $companystatic->supplier_code = $tabcompany[$key]['code_supplier']; + // Account + print ""; + $accountoshow = length_accountg($k); + if (empty($accountoshow) || $accountoshow == 'NotDefined') + { + print ''.$langs->trans("VATAccountNotDefined").' ('.$langs->trans("NPR counterpart").'). Set ACCOUNTING_COUNTERPART_VAT_NPR to the subvention account'.''; + } + else print $accountoshow; + print ''; + // Subledger account + print ""; + print ''; + print "" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT") . " NPR (counterpart)"; + print '' . ($mt < 0 ? - price(- $mt) : '') . ""; + print '' . ($mt >= 0 ? price($mt) : '') . ""; + print ""; } - else print $accountoshow; - print ''; - // Subledger account - print ""; - print ''; - print "" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT") . " NPR (counterpart)"; - print '' . ($mt < 0 ? - price(- $mt) : '') . ""; - print '' . ($mt >= 0 ? price($mt) : '') . ""; - print ""; } - } print ""; diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php index 4018b570f3d..81dab1a1f06 100644 --- a/htdocs/accountancy/journal/sellsjournal.php +++ b/htdocs/accountancy/journal/sellsjournal.php @@ -81,7 +81,7 @@ if ($pastmonth == 0) { $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear); $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear); -if (empty($date_start) || empty($date_end)) // We define date_start and date_end +if (! GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))) // We define date_start and date_end, only if we did not submit the form { $date_start = dol_get_first_day($pastmonthyear, $pastmonth, false); $date_end = dol_get_last_day($pastmonthyear, $pastmonth, false); @@ -115,10 +115,12 @@ if ($date_start && $date_end) if ($in_bookkeeping == 'already') { $sql .= " AND f.rowid IN (SELECT fk_doc FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab WHERE ab.doc_type='customer_invoice')"; + // $sql .= " AND fd.rowid IN (SELECT fk_docdet FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab WHERE ab.doc_type='customer_invoice')"; // Useless, we save one line for all products with same account } if ($in_bookkeeping == 'notyet') { $sql .= " AND f.rowid NOT IN (SELECT fk_doc FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab WHERE ab.doc_type='customer_invoice')"; +// $sql .= " AND fd.rowid NOT IN (SELECT fk_docdet FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab WHERE ab.doc_type='customer_invoice')"; // Useless, we save one line for all products with same account } $sql .= " ORDER BY f.datef"; @@ -569,7 +571,7 @@ if (empty($action) || $action == 'view') { $description .= $langs->trans("DepositsAreIncluded"); $listofchoices=array('already'=>$langs->trans("AlreadyInGeneralLedger"), 'notyet'=>$langs->trans("NotYetInGeneralLedger")); - $period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1). ' - ' .$langs->trans("JournalizationInLedgerStatus").' '. $form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1); + $period = $form->select_date($date_start?$date_start:-1, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end?$date_end:-1, 'date_end', 0, 0, 0, '', 1, 0, 1). ' - ' .$langs->trans("JournalizationInLedgerStatus").' '. $form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1); $varlink = 'id_journal=' . $id_journal; diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang index 85c6b6a0e16..949b16109f0 100644 --- a/htdocs/langs/en_US/accountancy.lang +++ b/htdocs/langs/en_US/accountancy.lang @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=List of the accounting accounts UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account From 41fec45daf7b3821f9039b281ae4ec7507f1c079 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric?= <35066297+c3do@users.noreply.github.com> Date: Thu, 4 Jan 2018 16:23:25 +0100 Subject: [PATCH 0077/1074] Fix PHP notices adding empty($page) --- htdocs/accountancy/customer/list.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php index 18a440f0e25..904c8668b94 100644 --- a/htdocs/accountancy/customer/list.php +++ b/htdocs/accountancy/customer/list.php @@ -73,7 +73,7 @@ $limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->AC $sortfield = GETPOST('sortfield', 'alpha'); $sortorder = GETPOST('sortorder', 'alpha'); $page = GETPOST('page','int'); -if ($page < 0) { $page = 0; } +if (empty($page) || $page < 0) { $page = 0; } $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; @@ -505,4 +505,4 @@ jQuery(document).ready(function() { '; llxFooter(); -$db->close(); \ No newline at end of file +$db->close(); From 777ed43e757fa981fac38a4f1838c1971764db96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric?= <35066297+c3do@users.noreply.github.com> Date: Thu, 4 Jan 2018 17:31:59 +0100 Subject: [PATCH 0078/1074] Remove PHP notices adding empty($page) --- htdocs/accountancy/customer/lines.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php index ed44277d7bf..673e927fbeb 100644 --- a/htdocs/accountancy/customer/lines.php +++ b/htdocs/accountancy/customer/lines.php @@ -64,7 +64,7 @@ $limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->AC $sortfield = GETPOST('sortfield', 'alpha'); $sortorder = GETPOST('sortorder', 'alpha'); $page = GETPOST('page', 'int'); -if ($page < 0) $page = 0; +if (empty($page) || $page < 0) $page = 0; $pageprev = $page - 1; $pagenext = $page + 1; $offset = $limit * $page; From 4ed86c830ad2ac1e41fd69de39f52f003aec2905 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric?= <35066297+c3do@users.noreply.github.com> Date: Thu, 4 Jan 2018 17:42:23 +0100 Subject: [PATCH 0079/1074] Fix PHP Warning Warning: A non-numeric value encountered in dolibarr/htdocs/accountancy/bookkeeping/list.php on line 89 --- htdocs/accountancy/bookkeeping/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php index 9b294e76d38..2f7502455d3 100644 --- a/htdocs/accountancy/bookkeeping/list.php +++ b/htdocs/accountancy/bookkeeping/list.php @@ -85,7 +85,7 @@ $limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->AC $sortfield = GETPOST('sortfield', 'alpha'); $sortorder = GETPOST('sortorder', 'alpha'); $page = GETPOST('page','int'); -if ($page < 0) { $page = 0; } +if (empty($page) || $page < 0) { $page = 0; } $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; From 762ab74940603d5491bea80320704dac62bee271 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Thu, 4 Jan 2018 18:09:25 +0100 Subject: [PATCH 0080/1074] FIX: Cashdesk should not sell to inactive third parties --- htdocs/cashdesk/admin/cashdesk.php | 4 ++-- htdocs/cashdesk/index.php | 4 ++-- htdocs/cashdesk/tpl/menu.tpl.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/cashdesk/admin/cashdesk.php b/htdocs/cashdesk/admin/cashdesk.php index 0d1dbf2de53..79e8c8f83e8 100644 --- a/htdocs/cashdesk/admin/cashdesk.php +++ b/htdocs/cashdesk/admin/cashdesk.php @@ -1,6 +1,6 @@ - * Copyright (C) 2011-2012 Juanjo Menent + * Copyright (C) 2011-2017 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 @@ -103,7 +103,7 @@ print "\n"; print ''.$langs->trans("CashDeskThirdPartyForSell").''; print ''; -print $form->select_company($conf->global->CASHDESK_ID_THIRDPARTY,'socid','s.client in (1,3)',1,0,1,array(),0); +print $form->select_company($conf->global->CASHDESK_ID_THIRDPARTY,'socid','s.client in (1,3) AND s.status = 1',1,0,1,array(),0); print ''; if (! empty($conf->banque->enabled)) { diff --git a/htdocs/cashdesk/index.php b/htdocs/cashdesk/index.php index 8f6af8b6d4d..91720885095 100644 --- a/htdocs/cashdesk/index.php +++ b/htdocs/cashdesk/index.php @@ -1,6 +1,6 @@ - * Copyright (C) 2011 Juanjo Menent + * Copyright (C) 2011-2017 Juanjo Menent * Copyright (C) 2011 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify @@ -105,7 +105,7 @@ print ''; $disabled=0; $langs->load("companies"); if (! empty($conf->global->CASHDESK_ID_THIRDPARTY)) $disabled=1; // If a particular third party is defined, we disable choice -print $form->select_company(GETPOST('socid','int')?GETPOST('socid','int'):$conf->global->CASHDESK_ID_THIRDPARTY,'socid','s.client in (1,3)',!$disabled,$disabled,1); +print $form->select_company(GETPOST('socid','int')?GETPOST('socid','int'):$conf->global->CASHDESK_ID_THIRDPARTY,'socid','s.client in (1,3) AND s.status = 1',!$disabled,$disabled,1); //print ''; print ''; print "\n"; diff --git a/htdocs/cashdesk/tpl/menu.tpl.php b/htdocs/cashdesk/tpl/menu.tpl.php index 4197db6b1b0..250aaa18cc2 100644 --- a/htdocs/cashdesk/tpl/menu.tpl.php +++ b/htdocs/cashdesk/tpl/menu.tpl.php @@ -2,7 +2,7 @@ /* Copyright (C) 2007-2008 Jeremie Ollivier * Copyright (C) 2008-2010 Laurent Destailleur * Copyright (C) 2009 Regis Houssin - * Copyright (C) 2011 Juanjo Menent + * Copyright (C) 2017 Juanjo Menent * Copyright (C) 2012 Marcos García * * This program is free software; you can redistribute it and/or modify @@ -79,7 +79,7 @@ print '
  • '.$langs->trans("User").': '.$_SESSION['firstname print ' '.img_picto($langs->trans('Logout'), 'logout.png').'
    '; print '
    '; print $langs->trans("CashDeskThirdParty").': '; -print $form->select_company($_SESSION["CASHDESK_ID_THIRDPARTY"], 'CASHDESK_ID_THIRDPARTY', 's.client IN (1,3)', '', 0, 0, null, 0, 'valignmiddle inline-block'); +print $form->select_company($_SESSION["CASHDESK_ID_THIRDPARTY"], 'CASHDESK_ID_THIRDPARTY', 's.client IN (1,3) AND s.status = 1', '', 0, 0, null, 0, 'valignmiddle inline-block'); print ''; //print $companyLink; print '
    '; From ebc76b5f2747215d6a4579b04297e627c92029f2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 4 Jan 2018 18:29:12 +0100 Subject: [PATCH 0081/1074] Fix tooltips on thirdparty and invoice --- .../accountancy/journal/purchasesjournal.php | 35 +++++++++---------- htdocs/accountancy/journal/sellsjournal.php | 20 +++++++---- htdocs/societe/class/societe.class.php | 4 +-- 3 files changed, 33 insertions(+), 26 deletions(-) diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php index f5429dce86e..4705e21e6d3 100644 --- a/htdocs/accountancy/journal/purchasesjournal.php +++ b/htdocs/accountancy/journal/purchasesjournal.php @@ -526,13 +526,13 @@ if ($action == 'exportcsv') { $companystatic->id = $tabcompany[$key]['id']; $companystatic->name = $tabcompany[$key]['name']; $companystatic->client = $tabcompany[$key]['code_client']; + $companystatic->fournisseur = 1; $invoicestatic->id = $key; - $invoicestatic->ref = $val["ref"]; $invoicestatic->ref = $val["refsologest"]; - $invoicestatic->refsupplier = $val["refsuppliersologest"]; + $invoicestatic->ref_supplier = $val["refsuppliersologest"]; $invoicestatic->type = $val["type"]; - $invoicestatic->description = dol_trunc($val["description"], 32); + $invoicestatic->description = dol_trunc(html_entity_decode($val["description"]), 32); $date = dol_print_date($val["date"], 'day'); @@ -699,15 +699,19 @@ if (empty($action) || $action == 'view') { $invoicestatic = new FactureFournisseur($db); $companystatic = new Fournisseur($db); - foreach ( $tabfac as $key => $val ) { + foreach ( $tabfac as $key => $val ) + { $invoicestatic->id = $key; - $invoicestatic->ref = $val["ref"]; $invoicestatic->type = $val["type"]; - $invoicestatic->ref = $val["refsologest"]; - $invoicestatic->refsupplier = $val["refsuppliersologest"]; + $invoicestatic->ref_supplier = $val["refsuppliersologest"]; + $invoicestatic->description = dol_trunc(html_entity_decode($val["description"]), 32); - $invoicestatic->description = html_entity_decode(dol_trunc($val["description"], 32)); + $companystatic->id = $tabcompany[$key]['id']; + $companystatic->name = $tabcompany[$key]['name']; + $companystatic->code_fournisseur = $tabcompany[$key]['code_fournisseur']; + $companystatic->code_compta_fournisseur = $tabcompany[$key]['code_compta_fournisseur']; + $companystatic->fournisseur = 1; $date = dol_print_date($val["date"], 'day'); @@ -717,9 +721,6 @@ if (empty($action) || $action == 'view') { print ""; print "" . $date . ""; print "" . $invoicestatic->getNomUrl(1) . ""; - $companystatic->id = $tabcompany[$key]['id']; - $companystatic->name = $tabcompany[$key]['name']; - $companystatic->supplier_code = $tabcompany[$key]['code_supplier']; // Account print ""; $accountoshow = length_accounta($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER); @@ -738,7 +739,7 @@ if (empty($action) || $action == 'view') { } else print $accountoshow; print ''; - print "" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("SubledgerAccount") . ""; + print "" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->ref_supplier . ' - ' . $langs->trans("SubledgerAccount") . ""; print '' . ($mt < 0 ? - price(- $mt) : '') . ""; print '' . ($mt >= 0 ? price($mt) : '') . ""; print ""; @@ -768,7 +769,7 @@ if (empty($action) || $action == 'view') { print ''; $companystatic->id = $tabcompany[$key]['id']; $companystatic->name = $tabcompany[$key]['name']; - print "" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $accountingaccount->label . ""; + print "" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->ref_supplier . ' - ' . $accountingaccount->label . ""; print '' . ($mt >= 0 ? price($mt) : '') . ""; print '' . ($mt < 0 ? price(- $mt) : '') . ""; print ""; @@ -801,7 +802,7 @@ if (empty($action) || $action == 'view') { print ""; print ''; print ""; - print $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT"). ' '.join(', ',$def_tva[$key][$k]).' %'.($numtax?' - Localtax '.$numtax:''); + print $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->ref_supplier . ' - ' . $langs->trans("VAT"). ' '.join(', ',$def_tva[$key][$k]).' %'.($numtax?' - Localtax '.$numtax:''); print ""; print '' . ($mt >= 0 ? price($mt) : '') . ""; print '' . ($mt < 0 ? price(- $mt) : '') . ""; @@ -814,13 +815,11 @@ if (empty($action) || $action == 'view') { if (is_array($tabother[$key])) { foreach ( $tabother[$key] as $k => $mt ) { + print ''; print ""; print "" . $date . ""; print "" . $invoicestatic->getNomUrl(1) . ""; - $companystatic->id = $tabcompany[$key]['id']; - $companystatic->name = $tabcompany[$key]['name']; - $companystatic->supplier_code = $tabcompany[$key]['code_supplier']; // Account print ""; $accountoshow = length_accountg($k); @@ -833,7 +832,7 @@ if (empty($action) || $action == 'view') { // Subledger account print ""; print ''; - print "" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT") . " NPR (counterpart)"; + print "" . $companystatic->getNomUrl(0, 'supplier', 16) . ' - ' . $invoicestatic->ref_supplier . ' - ' . $langs->trans("VAT") . " NPR (counterpart)"; print '' . ($mt < 0 ? - price(- $mt) : '') . ""; print '' . ($mt >= 0 ? price($mt) : '') . ""; print ""; diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php index 81dab1a1f06..f10777c0918 100644 --- a/htdocs/accountancy/journal/sellsjournal.php +++ b/htdocs/accountancy/journal/sellsjournal.php @@ -240,7 +240,6 @@ if ($action == 'writebookkeeping') { $companystatic->code_compta_fournisseur = $tabcompany[$key]['code_compta_fournisseur']; $companystatic->code_client = $tabcompany[$key]['code_client']; $companystatic->code_fournisseur = $tabcompany[$key]['code_fournisseur']; - $companystatic->client = $tabcompany[$key]['code_client']; $invoicestatic->id = $key; $invoicestatic->ref = (string) $val["ref"]; @@ -480,7 +479,10 @@ if ($action == 'exportcsv') { { $companystatic->id = $tabcompany[$key]['id']; $companystatic->name = $tabcompany[$key]['name']; - $companystatic->client = $tabcompany[$key]['code_client']; + $companystatic->code_compta = $tabcompany[$key]['code_compta']; + $companystatic->code_compta_fournisseur = $tabcompany[$key]['code_compta_fournisseur']; + $companystatic->code_client = $tabcompany[$key]['code_client']; + $companystatic->code_fournisseur = $tabcompany[$key]['code_supplier']; $invoicestatic->id = $key; $invoicestatic->ref = $val["ref"]; @@ -632,11 +634,20 @@ if (empty($action) || $action == 'view') { $invoicestatic = new Facture($db); $companystatic = new Client($db); - foreach ( $tabfac as $key => $val ) { + foreach ( $tabfac as $key => $val ) + { $invoicestatic->id = $key; $invoicestatic->ref = $val["ref"]; $invoicestatic->type = $val["type"]; + $companystatic->id = $tabcompany[$key]['id']; + $companystatic->name = $tabcompany[$key]['name']; + $companystatic->code_compta = $tabcompany[$key]['code_compta']; + $companystatic->code_compta_fournisseur = $tabcompany[$key]['code_compta_fournisseur']; + $companystatic->code_client = $tabcompany[$key]['code_client']; + $companystatic->code_fournisseur = $tabcompany[$key]['code_fournisseur']; + $companystatic->client = 3; + $date = dol_print_date($val["date"], 'day'); // Third party @@ -645,9 +656,6 @@ if (empty($action) || $action == 'view') { print ""; print "" . $date . ""; print "" . $invoicestatic->getNomUrl(1) . ""; - $companystatic->id = $tabcompany[$key]['id']; - $companystatic->name = $tabcompany[$key]['name']; - $companystatic->customer_code = $tabcompany[$key]['code_client']; // Account print ""; $accountoshow = length_accounta($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER); diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 775d8852b90..9f8c57d145f 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -1965,12 +1965,12 @@ class Societe extends CommonObject $label.= '
    ' . $langs->trans('Country') . ': '. $this->country_code; if (! empty($this->tva_intra)) $label.= '
    ' . $langs->trans('VATIntra') . ': '. $this->tva_intra; - if (! empty($this->code_client) && $this->client) + if (! empty($this->code_client) && $this->client) $label.= '
    ' . $langs->trans('CustomerCode') . ': '. $this->code_client; if (! empty($this->code_fournisseur) && $this->fournisseur) $label.= '
    ' . $langs->trans('SupplierCode') . ': '. $this->code_fournisseur; if (! empty($conf->accounting->enabled) && $this->client) - $label.= '
    ' . $langs->trans('CustomerAccountancyCode') . ': '. $this->code_compta_client; + $label.= '
    ' . $langs->trans('CustomerAccountancyCode') . ': '. ($this->code_compta ? $this->code_compta : $this->code_compta_client); if (! empty($conf->accounting->enabled) && $this->fournisseur) $label.= '
    ' . $langs->trans('SupplierAccountancyCode') . ': '. $this->code_compta_fournisseur; From 56b27a3a11d9c51db36da8e6b20065aaed39d902 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 4 Jan 2018 19:03:01 +0100 Subject: [PATCH 0082/1074] Fix: do no lose filter when deleting a bookeeping transaction --- htdocs/accountancy/bookkeeping/list.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php index 9b294e76d38..fd319932ca0 100644 --- a/htdocs/accountancy/bookkeeping/list.php +++ b/htdocs/accountancy/bookkeeping/list.php @@ -99,8 +99,7 @@ $formaccounting = new FormAccounting($db); $formother = new FormOther($db); $form = new Form($db); - -if ($action != 'export_file' && ! isset($_POST['begin']) && ! isset($_GET['begin']) && ! isset($_POST['formfilteraction']) && empty($page)) +if (! in_array($action, array('export_file', 'delmouv', 'delmouvconfirm')) && ! isset($_POST['begin']) && ! isset($_GET['begin']) && ! isset($_POST['formfilteraction']) && empty($page) && ! GETPOST('noreset','int')) { $month_start= ($conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START):1); $year_start = dol_print_date(dol_now(), '%Y'); @@ -115,6 +114,7 @@ if ($action != 'export_file' && ! isset($_POST['begin']) && ! isset($_GET['begin $search_date_end = dol_get_last_day($year_end, $month_end); } + $arrayfields=array( 't.piece_num'=>array('label'=>$langs->trans("TransactionNumShort"), 'checked'=>1), 't.doc_date'=>array('label'=>$langs->trans("Docdate"), 'checked'=>1), @@ -316,7 +316,8 @@ if ($action == 'delmouvconfirm') { { setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs'); } - Header("Location: list.php"); + + Header("Location: list.php?noreset=1".($param?'&'.$param:'')); exit; } } @@ -368,7 +369,7 @@ if ($result < 0) { $num=count($object->lines); if ($action == 'delmouv') { - $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?mvt_num=' . GETPOST('mvt_num'), $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvtPartial'), 'delmouvconfirm', '', 0, 1); + $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?mvt_num='.GETPOST('mvt_num').$param, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvtPartial'), 'delmouvconfirm', '', 0, 1); print $formconfirm; } if ($action == 'delbookkeepingyear') { @@ -448,11 +449,11 @@ if (! empty($arrayfields['t.doc_date']['checked'])) print ''; print '
    '; print $langs->trans('From') . ' '; - print $form->select_date($search_date_start, 'date_start', 0, 0, 1); + print $form->select_date($search_date_start?$search_date_start:-1, 'date_start', 0, 0, 1); print '
    '; print '
    '; print $langs->trans('to') . ' '; - print $form->select_date($search_date_end, 'date_end', 0, 0, 1); + print $form->select_date($search_date_end?$search_date_end:-1, 'date_end', 0, 0, 1); print '
    '; print ''; } From 01cde59608028f93766f253d537778d203c59c1c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 4 Jan 2018 19:16:53 +0100 Subject: [PATCH 0083/1074] Fix filter on bookkeeping group view --- htdocs/accountancy/bookkeeping/balance.php | 24 ++++++++++++++----- .../accountancy/class/bookkeeping.class.php | 6 +++-- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php index 1b8934edbcd..1cdef9af6a9 100644 --- a/htdocs/accountancy/bookkeeping/balance.php +++ b/htdocs/accountancy/bookkeeping/balance.php @@ -66,7 +66,7 @@ $formaccounting = new FormAccounting($db); $formother = new FormOther($db); $form = new Form($db); -if (empty($search_date_start)) +if (empty($search_date_start) && ! GETPOSTISSET('formfilteraction')) { $month_start= ($conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START):1); $year_start = dol_print_date(dol_now(), '%Y'); @@ -115,6 +115,7 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x', $search_accountancy_code_end = ''; $search_date_start = ''; $search_date_end = ''; + $filter = array(); } @@ -135,7 +136,8 @@ if ($action == 'export_csv') { setEventMessages($object->error, $object->errors, 'errors'); } - foreach ($object->lines as $line) { + foreach ($object->lines as $line) + { print length_accountg($line->numero_compte) . $sep; print $object->get_compte_desc($line->numero_compte) . $sep; print price($line->debit) . $sep; @@ -153,7 +155,8 @@ else { // List $nbtotalofrecords = ''; - if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) { + if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) + { $nbtotalofrecords = $object->fetchAllBalance($sortorder, $sortfield, 0, 0, $filter); if ($nbtotalofrecords < 0) { setEventMessages($object->error, $object->errors, 'errors'); @@ -166,6 +169,13 @@ else { } print ''; + if ($optioncss != '') print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; $button = 'global->ACCOUNTING_EXPORT_FORMAT.')" />'; print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $options, $sortfield, $sortorder, '', $result, $result, 'title_accountancy', 0, $button); @@ -174,9 +184,9 @@ else { $moreforfilter .= '
    '; $moreforfilter .= $langs->trans('DateStart') . ': '; - $moreforfilter .= $form->select_date($search_date_start, 'date_start', 0, 0, 1, '', 1, 0, 1); + $moreforfilter .= $form->select_date($search_date_start?$search_date_start:-1, 'date_start', 0, 0, 1, '', 1, 0, 1); $moreforfilter .= $langs->trans('DateEnd') . ': '; - $moreforfilter .= $form->select_date($search_date_end, 'date_end', 0, 0, 1, '', 1, 0, 1); + $moreforfilter .= $form->select_date($search_date_end?$search_date_end:-1, 'date_end', 0, 0, 1, '', 1, 0, 1); $moreforfilter .= '
    '; if (! empty($moreforfilter)) { @@ -220,7 +230,8 @@ else { $sous_total_credit = 0; $displayed_account = ""; - foreach ($object->lines as $line) { + foreach ($object->lines as $line) + { $link = ''; $total_debit += $line->debit; $total_credit += $line->credit; @@ -280,4 +291,5 @@ else { llxFooter(); } + $db->close(); diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php index 47d28991846..e426b8a21a1 100644 --- a/htdocs/accountancy/class/bookkeeping.class.php +++ b/htdocs/accountancy/class/bookkeeping.class.php @@ -875,9 +875,12 @@ class BookKeeping extends CommonObject * * @return int <0 if KO, >0 if OK */ - public function fetchAllBalance($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND') { + public function fetchAllBalance($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND') + { global $conf; + $this->lines = array(); + dol_syslog(__METHOD__, LOG_DEBUG); $sql = 'SELECT'; @@ -920,7 +923,6 @@ class BookKeeping extends CommonObject if (! empty($limit)) { $sql .= ' ' . $this->db->plimit($limit + 1, $offset); } - $this->lines = array (); $resql = $this->db->query($sql); if ($resql) { From b2feac9d90f2ecfd5916c4d49176ff1a138744c8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 4 Jan 2018 19:25:52 +0100 Subject: [PATCH 0084/1074] CVE-2017-17971 --- htdocs/main.inc.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 2b4ad4de3c5..501b7d8a97f 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -102,6 +102,8 @@ function test_sql_and_script_inject($val, $type) $inj += preg_match('/onerror\s*=/i', $val); // onerror can be set on img or any html tag like $inj += preg_match('/onfocus\s*=/i', $val); // onfocus can be set on input text html tag like $inj += preg_match('/onload\s*=/i', $val); // onload can be set on input text html tag like + $inj += preg_match('/onclick\s*=/i', $val); // onclick can be set on img text html tag like + $inj += preg_match('/onscroll\s*=/i', $val); // onscroll can be textarea if ($type == 1) { $inj += preg_match('/javascript:/i', $val); From e10a9912dc28dd27862ca054ea295b9ea41e5370 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 4 Jan 2018 19:54:30 +0100 Subject: [PATCH 0085/1074] Fix missing worload --- htdocs/core/lib/date.lib.php | 19 +++++++++++-------- htdocs/projet/ganttchart.inc.php | 13 ++++++++++--- htdocs/projet/ganttview.php | 2 ++ 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php index 44c9c7285cc..264bb748762 100644 --- a/htdocs/core/lib/date.lib.php +++ b/htdocs/core/lib/date.lib.php @@ -148,6 +148,7 @@ function dol_time_plus_duree($time, $duration_value, $duration_unit) * @param int $iMinutes Minutes * @param int $iSeconds Seconds * @return int Time into seconds + * @see convertSecondToTime */ function convertTime2Seconds($iHours=0,$iMinutes=0,$iSeconds=0) { @@ -156,7 +157,8 @@ function convertTime2Seconds($iHours=0,$iMinutes=0,$iSeconds=0) } -/** Return, in clear text, value of a number of seconds in days, hours and minutes +/** Return, in clear text, value of a number of seconds in days, hours and minutes. + * Can be used to show a duration. * * @param int $iSecond Number of seconds * @param string $format Output format ('all': total delay days hour:min like "2 days 12:30", 'allwithouthour': total delay days without hour part like "2 days", 'allhourmin': total delay with format hours:min like "60:30", 'allhour': total delay hours without min/sec like "60:30", 'fullhour': total delay hour decimal like "60.5" for 60:30, 'hour': only hours part "12", 'min': only minutes part "30", 'sec': only seconds part, 'month': only month part, 'year': only year part); @@ -164,6 +166,7 @@ function convertTime2Seconds($iHours=0,$iMinutes=0,$iSeconds=0) * @param int $lengthOfWeek Length of week (default 7) * @return string Formated text of duration * Example: 0 return 00:00, 3600 return 1:00, 86400 return 1d, 90000 return 1 Day 01:00 + * @see convertTime2Seconds */ function convertSecondToTime($iSecond, $format='all', $lengthOfDay=86400, $lengthOfWeek=7) { @@ -706,11 +709,11 @@ function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR', $ if($jour_semaine == 0 || $jour_semaine == 6) $ferie=true; //Samedi (6) et dimanche (0) } - + if ($countrycode == 'AT') { $countryfound=1; - + // Definition des dates feriees fixes if($jour == 1 && $mois == 1) $ferie=true; // Neujahr if($jour == 6 && $mois == 1) $ferie=true; // Hl. 3 Koenige @@ -723,14 +726,14 @@ function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR', $ if($jour == 25 && $mois == 12) $ferie=true; // Christtag if($jour == 26 && $mois == 12) $ferie=true; // Stefanietag if($jour == 31 && $mois == 12) $ferie=true; // Silvester - + // Easter calculation $date_paques = easter_date($annee); $jour_paques = date("d", $date_paques); $mois_paques = date("m", $date_paques); if($jour_paques == $jour && $mois_paques == $mois) $ferie=true; // Easter sunday - + // Monday after easter $date_eastermonday = mktime( date("H", $date_paques), @@ -744,7 +747,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR', $ $mois_eastermonday = date("m", $date_eastermonday); if($jour_eastermonday == $jour && $mois_eastermonday == $mois) $ferie=true; // Easter monday - + // Christi Himmelfahrt (39 days after easter sunday) $date_ch = mktime( date("H", $date_paques), @@ -758,7 +761,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR', $ $mois_ch = date("m", $date_ch); if($jour_ch == $jour && $mois_ch == $mois) $ferie=true; // Christi Himmelfahrt - + // Pfingsten (50 days after easter sunday) $date_pentecote = mktime( date("H", $date_paques), @@ -772,7 +775,7 @@ function num_public_holiday($timestampStart, $timestampEnd, $countrycode='FR', $ $mois_pentecote = date("m", $date_pentecote); if($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie=true; // Pfingsten - + // Fronleichnam (60 days after easter sunday) $date_fronleichnam = mktime( date("H", $date_paques), diff --git a/htdocs/projet/ganttchart.inc.php b/htdocs/projet/ganttchart.inc.php index 2777b59f032..cb4a7d878e7 100644 --- a/htdocs/projet/ganttchart.inc.php +++ b/htdocs/projet/ganttchart.inc.php @@ -126,8 +126,10 @@ if (g.getDivId() != null) $projecttmp=new Project($db); $projecttmp->fetch($t['task_project_id']); $tmpt = array( - 'task_id'=> '-'.$t['task_project_id'], 'task_alternate_id'=> '-'.$t['task_project_id'], 'task_name'=>$projecttmp->ref.' '.$projecttmp->title, 'task_resources'=>'', 'task_start_date'=>'', 'task_end_date'=>'', - 'task_is_group'=>1, 'task_position'=>0, 'task_css'=>'ggroupblack', 'task_milestone'=> 0, 'task_parent'=>0, 'task_parent_alternate_id'=>0, 'task_notes'=>'' + 'task_id'=> '-'.$t['task_project_id'], 'task_alternate_id'=> '-'.$t['task_project_id'], 'task_name'=>$projecttmp->ref.' '.$projecttmp->title, 'task_resources'=>'', + 'task_start_date'=>'', 'task_end_date'=>'', + 'task_is_group'=>1, 'task_position'=>0, 'task_css'=>'ggroupblack', 'task_milestone'=> 0, 'task_parent'=>0, 'task_parent_alternate_id'=>0, 'task_notes'=>'', + 'task_planned_workload'=>0 ); constructGanttLine($tasks, $tmpt, array(), 0, $t['task_project_id']); $old_project_id = $t['task_project_id']; @@ -168,6 +170,7 @@ else */ function constructGanttLine($tarr, $task, $task_dependencies, $level=0, $project_id=null) { + global $langs; global $dateformatinput2; $start_date = $task["task_start_date"]; @@ -262,7 +265,11 @@ function constructGanttLine($tarr, $task, $task_dependencies, $level=0, $project $taskid = $task["task_alternate_id"]; //$taskid = $task['task_id']; - $s.= "g.AddTaskItem(new JSGantt.TaskItem('".$taskid."', '".dol_escape_js(trim($name))."', '".$start_date."', '".$end_date."', '".$css."', '".$link."', ".$task['task_milestone'].", '".dol_escape_js($resources)."', ".($percent >= 0 ? $percent : 0).", ".$line_is_auto_group.", '".$parent."', 1, '".$dependency."', '".(empty($task["task_is_group"]) ? (($percent >= 0 && $percent != '') ? $percent.'%' : '') : '')."', '".dol_escape_js($task['note'])."', g));"; + $note = $task['note']; + + $note = dol_concatdesc($note, $langs->trans("Workload").' : '.($task['task_planned_workload'] ? convertSecondToTime($task['task_planned_workload'], 'allhourmin') : '')); + + $s.= "g.AddTaskItem(new JSGantt.TaskItem('".$taskid."', '".dol_escape_js(trim($name))."', '".$start_date."', '".$end_date."', '".$css."', '".$link."', ".$task['task_milestone'].", '".dol_escape_js($resources)."', ".($percent >= 0 ? $percent : 0).", ".$line_is_auto_group.", '".$parent."', 1, '".$dependency."', '".(empty($task["task_is_group"]) ? (($percent >= 0 && $percent != '') ? $percent.'%' : '') : '')."', '".dol_escape_js($note)."', g));"; echo $s; diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php index 119684bf6e6..dd9d03b25b1 100644 --- a/htdocs/projet/ganttview.php +++ b/htdocs/projet/ganttview.php @@ -260,6 +260,7 @@ if (count($tasksarray)>0) $tasks[$taskcursor]['task_is_group'] = 0; $tasks[$taskcursor]['task_css'] = 'gtaskblue'; $tasks[$taskcursor]['task_position'] = $val->rang; + $tasks[$taskcursor]['task_planned_workload'] = $val->planned_workload; if ($val->fk_parent != 0 && $task->hasChildren()> 0){ $tasks[$taskcursor]['task_is_group']=1; @@ -280,6 +281,7 @@ if (count($tasksarray)>0) $tasks[$taskcursor]['task_start_date']=$val->date_start; $tasks[$taskcursor]['task_end_date']=$val->date_end; $tasks[$taskcursor]['task_color']='b4d1ea'; + $idofusers=$task->getListContactId('internal'); $idofcontacts=$task->getListContactId('external'); $s=''; From 90e9b3db6841a1c7f6d323a2fb76c65e8adba511 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 4 Jan 2018 20:42:57 +0100 Subject: [PATCH 0086/1074] Fix look and feel v7 --- htdocs/projet/tasks.php | 42 ++++++++++++++++++++++++++---------- htdocs/projet/tasks/time.php | 3 +-- 2 files changed, 32 insertions(+), 13 deletions(-) diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index b96421d04fb..445f6f426b0 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -34,10 +34,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; $langs->load("users"); $langs->load("projects"); -$action = GETPOST('action', 'alpha'); $id = GETPOST('id', 'int'); $ref = GETPOST('ref', 'alpha'); $taskref = GETPOST('taskref', 'alpha'); +$action = GETPOST('action', 'alpha'); $backtopage=GETPOST('backtopage','alpha'); $cancel=GETPOST('cancel','alpha'); @@ -437,9 +437,25 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third else if ($id > 0 || ! empty($ref)) { /* - * Fiche projet en mode visu + * Projet card in view mode */ + // Definition of fields for list + $arrayfields=array(); + $arrayfields['t.task_ref']=array('label'=>$langs->trans("RefTask"), 'checked'=>1); + $arrayfields['t.task_label']=array('label'=>$langs->trans("LabelTask"), 'checked'=>1); + $arrayfields['t.task_date_start']=array('label'=>$langs->trans("DateStart"), 'checked'=>1); + $arrayfields['t.task_date_end']=array('label'=>$langs->trans("DateEnd"), 'checked'=>1); + // Extra fields + if (is_array($extrafields_task->attribute_label) && count($extrafields_task->attribute_label)) + { + foreach($extrafields_task->attribute_label as $key => $val) + { + if (! empty($extrafields_task->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields_task->attribute_label[$key], 'checked'=>(($extrafields_task->attribute_list[$key]<0)?0:1), 'position'=>$extrafields_task->attribute_pos[$key], 'enabled'=>(abs($extrafields_task->attribute_list[$key])!=3 && $extrafields_task->attribute_perms[$key])); + } + } + + /* * Actions */ @@ -496,6 +512,9 @@ else if ($id > 0 || ! empty($ref)) include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php'; } + $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage; + $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields + print '
    '; print ''; @@ -516,15 +535,16 @@ else if ($id > 0 || ! empty($ref)) print ''; // print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; + print_liste_field_titre($langs->trans("RefTask"), $_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,''); + print_liste_field_titre($langs->trans("LabelTask"), $_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,''); + print_liste_field_titre($langs->trans("DateStart"), $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,''); + print_liste_field_titre($langs->trans("DateEnd"), $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,''); + print_liste_field_titre($langs->trans("PlannedWorkload"), $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,''); + print_liste_field_titre($langs->trans("TimeSpent"), $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,''); + print_liste_field_titre($langs->trans("ProgressCalculated"), $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,''); + print_liste_field_titre($langs->trans("ProgressDeclared"), $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,''); + //print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center" width="80"',$sortfield,$sortorder,'maxwidthsearch '); + print_liste_field_titre('', $_SERVER["PHP_SELF"],"",'','','align="center" width="80"',$sortfield,$sortorder,'maxwidthsearch '); print "\n"; if (count($tasksarray) > 0) diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index 8a4ac65c763..278f09a1b9e 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -662,7 +662,6 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0) $sql .= $db->order($sortfield, $sortorder); - $var=true; $resql = $db->query($sql); if ($resql) { @@ -755,7 +754,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0) // Fields title search print ''; // Date - if (! empty($arrayfields['t.task_date']['checked'])) + if (! empty($arrayfields['t.task_date']['checked'])) { print '' . "\n"; - // Contacts (ask contact only if thirdparty already defined). TODO do this also into order and invoice. if ($socid > 0) { + // Contacts (ask contact only if thirdparty already defined). TODO do this also into order and invoice. print "'; From 6e9e4e13c1ff6ad4ee1ecf5fd6a4b5d7ab199068 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 5 Jan 2018 01:26:57 +0100 Subject: [PATCH 0093/1074] Code comment --- htdocs/core/lib/price.lib.php | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/htdocs/core/lib/price.lib.php b/htdocs/core/lib/price.lib.php index ba84876c93c..eb332b44611 100644 --- a/htdocs/core/lib/price.lib.php +++ b/htdocs/core/lib/price.lib.php @@ -63,16 +63,24 @@ * 8=total_ttc_without_discount, (total_ht + main vat + local taxes) * 9=total_tax1 for total_ht, * 10=total_tax2 for total_ht, - * 11=pu_tax1 for pu_ht, !! should not be used - * 12=pu_tax2 for pu_ht, !! should not be used - * 13=?? !! should not be used - * 14=total_tax1 for total_ht_without_discount, - * 15=total_tax2 for total_ht_without_discount, + * + * 11=pu_tax1 for pu_ht, !! should not be used + * 12=pu_tax2 for pu_ht, !! should not be used + * 13=?? !! should not be used + * 14=total_tax1 for total_ht_without_discount, !! should not be used + * 15=total_tax2 for total_ht_without_discount, !! should not be used * * 16=multicurrency_total_ht * 17=multicurrency_total_tva * 18=multicurrency_total_ttc * 19=multicurrency_pu_ht + * 20=multicurrency_pu_vat + * 21=multicurrency_pu_ttc + * 22=multicurrency_total_ht_without_discount + * 23=multicurrency_total_vat_without_discount + * 24=multicurrency_total_ttc_without_discount + * 25=multicurrency_total_tax1 for total_ht + * 26=multicurrency_total_tax2 for total_ht */ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocaltax1_rate, $uselocaltax2_rate, $remise_percent_global, $price_base_type, $info_bits, $type, $seller = '', $localtaxes_array='', $progress=100, $multicurrency_tx=1, $pu_devise=0) { @@ -109,6 +117,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt if ($uselocaltax1_rate < 0) $uselocaltax1_rate=$seller->localtax1_assuj; if ($uselocaltax2_rate < 0) $uselocaltax2_rate=$seller->localtax2_assuj; + //var_dump($uselocaltax1_rate.' - '.$uselocaltax2_rate); dol_syslog('Price.lib::calcul_price_total qty='.$qty.' pu='.$pu.' remise_percent_ligne='.$remise_percent_ligne.' txtva='.$txtva.' uselocaltax1_rate='.$uselocaltax1_rate.' uselocaltax2_rate='.$uselocaltax2_rate.' remise_percent_global='.$remise_percent_global.' price_base_type='.$price_base_type.' type='.$type.' progress='.$progress); // Now we search localtaxes information ourself (rates and types). From 07d991cc8d6476ed42dd7ba9f60eee1d061f0909 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 5 Jan 2018 01:27:48 +0100 Subject: [PATCH 0094/1074] Code comment --- htdocs/core/lib/functions.lib.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 26d9f50b3b6..2d206960f8c 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -4216,7 +4216,7 @@ function get_localtax($vatrate, $local, $thirdparty_buyer="", $thirdparty_seller }*/ // Some test to guess with no need to make database access - if ($mysoc->country_code == 'ES') // For spain localtaxes 1 and 2, tax is qualified if buyer use local taxe + if ($mysoc->country_code == 'ES') // For spain localtaxes 1 and 2, tax is qualified if buyer use local tax { if ($local == 1) { @@ -4421,17 +4421,18 @@ function getTaxesFromId($vatrate, $buyer=null, $seller=null, $firstparamisid=1) } /** - * Get type and rate of localtaxes for a particular vat rate/country fo thirdparty + * Get type and rate of localtaxes for a particular vat rate/country of a thirdparty. + * This does not take into account the seller setup if subject to vat or not, only country. * TODO * This function is ALSO called to retrieve type for building PDF. Such call of function must be removed. * Instead this function must be called when adding a line to get the array of localtax and type, and then * provide it to the function calcul_price_total. * - * @param int|string $vatrate VAT ID or Rate. Value can be value or the string with code into parenthesis or rowid if $firstparamisid is 1. Example: '8.5' or '8.5 (8.5NPR)' or 123. + * @param int|string $vatrate VAT ID or Rate+Code. Value can be value or the string with code into parenthesis or rowid if $firstparamisid is 1. Example: '8.5' or '8.5 (8.5NPR)' or 123. * @param int $local Number of localtax (1 or 2, or 0 to return 1 & 2) * @param Societe $buyer Company object * @param Societe $seller Company object - * @param int $firstparamisid 1 if first param is id into table (use this if you can) + * @param int $firstparamisid 1 if first param is ID into table instead of Rate+code (use this if you can) * @return array array(localtax_type1(1-6/0 if not found), rate localtax1, localtax_type2, rate localtax2, accountancycodecust, accountancycodesupp) * @see getTaxesFromId */ From 0fb95fa15f4afdc86f9afbf87d97ede6780c7092 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 5 Jan 2018 01:30:12 +0100 Subject: [PATCH 0095/1074] Try a fix for #7778 --- htdocs/commande/class/commande.class.php | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 4d094712c57..7998a25bd13 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -1338,6 +1338,14 @@ class Commande extends CommonOrder $tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $product_type, $mysoc, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise); + /*var_dump($txlocaltax1); + var_dump($txlocaltax2); + var_dump($localtaxes_type); + var_dump($tabprice); + var_dump($tabprice[9]); + var_dump($tabprice[10]); + exit;*/ + $total_ht = $tabprice[0]; $total_tva = $tabprice[1]; $total_ttc = $tabprice[2]; @@ -1379,12 +1387,12 @@ class Commande extends CommonOrder $this->line->desc=$desc; $this->line->qty=$qty; - $this->line->vat_src_code=$vat_src_code; + $this->line->vat_src_code=$vat_src_code; $this->line->tva_tx=$txtva; - $this->line->localtax1_tx=$localtaxes_type[1]; - $this->line->localtax2_tx=$localtaxes_type[3]; - $this->line->localtax1_type=$localtaxes_type[0]; - $this->line->localtax2_type=$localtaxes_type[2]; + $this->line->localtax1_tx=($total_localtax1?$localtaxes_type[1]:0); + $this->line->localtax2_tx=($total_localtax2?$localtaxes_type[3]:0); + $this->line->localtax1_type=$localtaxes_type[0]; + $this->line->localtax2_type=$localtaxes_type[2]; $this->line->fk_product=$fk_product; $this->line->product_type=$product_type; $this->line->fk_remise_except=$fk_remise_except; From d7837f8800afdaafda6d747cedfd88d4054379c4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 5 Jan 2018 01:43:51 +0100 Subject: [PATCH 0096/1074] Try fix for #7778 --- htdocs/comm/propal/class/propal.class.php | 4 ++-- htdocs/compta/facture/class/facture.class.php | 4 ++-- htdocs/fourn/class/fournisseur.commande.class.php | 4 ++-- htdocs/fourn/class/fournisseur.facture.class.php | 8 ++++---- .../supplier_proposal/class/supplier_proposal.class.php | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index afc0fa76191..5efc1cf9db4 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -524,8 +524,8 @@ class Propal extends CommonObject $this->line->vat_src_code=$vat_src_code; $this->line->tva_tx=$txtva; - $this->line->localtax1_tx=$txlocaltax1; - $this->line->localtax2_tx=$txlocaltax2; + $this->line->localtax1_tx=($total_localtax1?$localtaxes_type[1]:0); + $this->line->localtax2_tx=($total_localtax2?$localtaxes_type[3]:0); $this->line->localtax1_type = $localtaxes_type[0]; $this->line->localtax2_type = $localtaxes_type[2]; $this->line->fk_product=$fk_product; diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index a35e7f7ae40..915200ab2d2 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -2650,8 +2650,8 @@ class Facture extends CommonInvoice $this->line->vat_src_code=$vat_src_code; $this->line->tva_tx=$txtva; - $this->line->localtax1_tx=$txlocaltax1; - $this->line->localtax2_tx=$txlocaltax2; + $this->line->localtax1_tx=($total_localtax1?$localtaxes_type[1]:0); + $this->line->localtax2_tx=($total_localtax2?$localtaxes_type[3]:0); $this->line->localtax1_type = $localtaxes_type[0]; $this->line->localtax2_type = $localtaxes_type[2]; diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index e6e309c2239..38d0e42d36a 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -1575,8 +1575,8 @@ class CommandeFournisseur extends CommonOrder $this->line->desc=$desc; $this->line->qty=$qty; $this->line->tva_tx=$txtva; - $this->line->localtax1_tx=$txlocaltax1; - $this->line->localtax2_tx=$txlocaltax2; + $this->line->localtax1_tx=($total_localtax1?$localtaxes_type[1]:0); + $this->line->localtax2_tx=($total_localtax2?$localtaxes_type[3]:0); $this->line->localtax1_type = $localtaxes_type[0]; $this->line->localtax2_type = $localtaxes_type[2]; $this->line->fk_product=$fk_product; diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index 995745b4faa..444eb5d200a 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -1449,8 +1449,10 @@ class FactureFournisseur extends CommonInvoice $this->line->vat_src_code=$vat_src_code; $this->line->tva_tx=$txtva; - $this->line->localtax1_tx=$txlocaltax1; - $this->line->localtax2_tx=$txlocaltax2; + $this->line->localtax1_tx=($total_localtax1?$localtaxes_type[1]:0); + $this->line->localtax2_tx=($total_localtax2?$localtaxes_type[3]:0); + $this->line->localtax1_type = $localtaxes_type[0]; + $this->line->localtax2_type = $localtaxes_type[2]; $this->line->fk_product=$fk_product; $this->line->product_type=$type; $this->line->remise_percent=$remise_percent; @@ -1464,8 +1466,6 @@ class FactureFournisseur extends CommonInvoice $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); $this->line->special_code=$this->special_code; $this->line->fk_parent_line=$this->fk_parent_line; diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php index 4fa0c8fad6e..ae2c73d8752 100644 --- a/htdocs/supplier_proposal/class/supplier_proposal.class.php +++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php @@ -455,9 +455,9 @@ class SupplierProposal extends CommonObject $this->line->desc=$desc; $this->line->qty=$qty; $this->line->tva_tx=$txtva; - $this->line->localtax1_tx=$txlocaltax1; - $this->line->localtax2_tx=$txlocaltax2; - $this->line->localtax1_type = $localtaxes_type[0]; + $this->line->localtax1_tx=($total_localtax1?$localtaxes_type[1]:0); + $this->line->localtax2_tx=($total_localtax2?$localtaxes_type[3]:0); + $this->line->localtax1_type = $localtaxes_type[0]; $this->line->localtax2_type = $localtaxes_type[2]; $this->line->fk_product=$fk_product; $this->line->remise_percent=$remise_percent; From 940e9cb1a5c3c79e737e388fa82caa494a4b19e1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 5 Jan 2018 01:46:07 +0100 Subject: [PATCH 0097/1074] Fix travis error --- htdocs/projet/tasks.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index 445f6f426b0..4d43b6e4bc2 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -535,14 +535,14 @@ else if ($id > 0 || ! empty($ref)) print ''; // print ''; - print_liste_field_titre($langs->trans("RefTask"), $_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,''); - print_liste_field_titre($langs->trans("LabelTask"), $_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,''); - print_liste_field_titre($langs->trans("DateStart"), $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,''); - print_liste_field_titre($langs->trans("DateEnd"), $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,''); - print_liste_field_titre($langs->trans("PlannedWorkload"), $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,''); - print_liste_field_titre($langs->trans("TimeSpent"), $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,''); - print_liste_field_titre($langs->trans("ProgressCalculated"), $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,''); - print_liste_field_titre($langs->trans("ProgressDeclared"), $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,''); + print_liste_field_titre("RefTask", $_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,''); + print_liste_field_titre("LabelTask", $_SERVER["PHP_SELF"],"",'','','',$sortfield,$sortorder,''); + print_liste_field_titre("DateStart", $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,''); + print_liste_field_titre("DateEnd", $_SERVER["PHP_SELF"],"",'','','align="center"',$sortfield,$sortorder,''); + print_liste_field_titre("PlannedWorkload", $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,''); + print_liste_field_titre("TimeSpent", $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,''); + print_liste_field_titre("ProgressCalculated", $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,''); + print_liste_field_titre("ProgressDeclared", $_SERVER["PHP_SELF"],"",'','','align="right"',$sortfield,$sortorder,''); //print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"],"",'','','align="center" width="80"',$sortfield,$sortorder,'maxwidthsearch '); print_liste_field_titre('', $_SERVER["PHP_SELF"],"",'','','align="center" width="80"',$sortfield,$sortorder,'maxwidthsearch '); print "\n"; From 1e438b7ebd04b9800508b6dd77dd30c314dab387 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 5 Jan 2018 02:01:57 +0100 Subject: [PATCH 0098/1074] Fix travis and return of api that change status --- .../comm/propal/class/api_proposals.class.php | 75 +++++++------------ htdocs/commande/class/api_orders.class.php | 26 ++++++- 2 files changed, 52 insertions(+), 49 deletions(-) diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php index 844c204f441..63b26373f60 100644 --- a/htdocs/comm/propal/class/api_proposals.class.php +++ b/htdocs/comm/propal/class/api_proposals.class.php @@ -516,7 +516,7 @@ class Proposals extends DolibarrApi throw new RestException(500, 'Error : '.$this->propal->error); } - $result = $this->propal->fetch($id); + $result = $this->propal->fetch($id); if( ! $result ) { throw new RestException(404, 'Proposal not found'); } @@ -531,37 +531,6 @@ class Proposals extends DolibarrApi } - /** - * Set a commercial proposal billed. Could be also called setbilled - * - * @param int $id Commercial proposal ID - * - * @url POST {id}/setbilled - * - * @return array - */ - function setinvoiced($id) - { - if(! DolibarrApiAccess::$user->rights->propal->creer) { - throw new RestException(401); - } - $result = $this->propal->fetch($id); - if( ! $result ) { - throw new RestException(404, 'Commercial Proposal not found'); - } - - if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) { - throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); - } - - $result = $this->propal->classifyBilled(DolibarrApiAccess::$user); - if( $result < 0) { - throw new RestException(400, $this->propal->error); - } - - return $result; - } - /** * Validate a commercial proposal * @@ -584,8 +553,6 @@ class Proposals extends DolibarrApi */ function validate($id, $notrigger=0) { - var_dump($notrigger);exit; - if(! DolibarrApiAccess::$user->rights->propal->creer) { throw new RestException(401); } @@ -615,6 +582,8 @@ class Proposals extends DolibarrApi throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); } + $this->propal->fetchObjectLinked(); + return $this->_cleanObjectDatas($this->propal); } @@ -652,16 +621,22 @@ class Proposals extends DolibarrApi throw new RestException(500, 'Error when closing Commercial Proposal: '.$this->propal->error); } - return array( - 'success' => array( - 'code' => 200, - 'message' => 'Commercial Proposal closed (Ref='.$this->propal->ref.')' - ) - ); + $result = $this->propal->fetch($id); + if( ! $result ) { + throw new RestException(404, 'Proposal not found'); + } + + if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) { + throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); + } + + $this->propal->fetchObjectLinked(); + + return $this->_cleanObjectDatas($this->propal); } /** - * Set a commercial proposal billed + * Set a commercial proposal billed. Could be also called setbilled * * @param int $id Commercial proposal ID * @@ -688,12 +663,18 @@ class Proposals extends DolibarrApi throw new RestException(500, 'Error : '.$this->propal->error); } - return array( - 'success' => array( - 'code' => 200, - 'message' => 'Commercial Proposal set billed (Ref='.$this->propal->ref.')' - ) - ); + $result = $this->propal->fetch($id); + if( ! $result ) { + throw new RestException(404, 'Proposal not found'); + } + + if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) { + throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); + } + + $this->propal->fetchObjectLinked(); + + return $this->_cleanObjectDatas($this->propal); } diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php index 1d30e08205b..e1edde93922 100644 --- a/htdocs/commande/class/api_orders.class.php +++ b/htdocs/commande/class/api_orders.class.php @@ -605,7 +605,18 @@ class Orders extends DolibarrApi throw new RestException(400, $this->commande->error); } - return $result; + $result = $this->commande->fetch($id); + if( ! $result ) { + throw new RestException(404, 'Order not found'); + } + + if( ! DolibarrApi::_checkAccessToResource('commande',$this->commande->id)) { + throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); + } + + $this->commande->fetchObjectLinked(); + + return $this->_cleanObjectDatas($this->commande); } /** @@ -640,7 +651,18 @@ class Orders extends DolibarrApi throw new RestException(500, 'Error when closing Order: '.$this->commande->error); } - return $result; + $result = $this->commande->fetch($id); + if( ! $result ) { + throw new RestException(404, 'Order not found'); + } + + if( ! DolibarrApi::_checkAccessToResource('commande',$this->commande->id)) { + throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); + } + + $this->commande->fetchObjectLinked(); + + return $this->_cleanObjectDatas($this->commande); } /** From dbf7603118b671346f1a23198350f3becc8aa747 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 5 Jan 2018 04:31:48 +0100 Subject: [PATCH 0099/1074] Debug blockedlog for loi finance 2016 --- htdocs/adherents/class/adherent.class.php | 5 - htdocs/adherents/class/subscription.class.php | 139 ++++++++++----- htdocs/blockedlog/admin/blockedlog.php | 8 +- htdocs/blockedlog/admin/blockedlog_list.php | 67 +++++--- htdocs/blockedlog/class/blockedlog.class.php | 160 +++++++++++------- htdocs/core/lib/functions.lib.php | 21 ++- ..._modBlockedlog_ActionsBlockedLog.class.php | 14 +- htdocs/don/card.php | 2 +- htdocs/don/class/paymentdonation.class.php | 52 +++--- htdocs/don/payment/card.php | 17 +- htdocs/langs/en_US/blockedlog.lang | 26 ++- 11 files changed, 330 insertions(+), 181 deletions(-) diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index d42f67f075a..351debdd3d4 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -1303,11 +1303,6 @@ class Adherent extends CommonObject $this->last_subscription_amount=$montant; $this->last_subscription_date_start=$date; $this->last_subscription_date_end=$datefin; - - // Call trigger - $result=$this->call_trigger('MEMBER_SUBSCRIPTION',$user); - if ($result < 0) { $error++; } - // End call triggers } if (! $error) diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php index bb5780db15a..ae8470e3eee 100644 --- a/htdocs/adherents/class/subscription.class.php +++ b/htdocs/adherents/class/subscription.class.php @@ -59,13 +59,16 @@ class Subscription extends CommonObject /** * Function who permitted cretaion of the subscription * - * @param int $userid userid de celui qui insere - * @return int <0 if KO, Id subscription created if OK + * @param User $user User that create + * @param bool $notrigger false=launch triggers after, true=disable triggers + * @return int <0 if KO, Id subscription created if OK */ - function create($userid) + function create($user, $notrigger = false) { global $langs; + $error = 0; + $now=dol_now(); // Check parameters @@ -75,6 +78,8 @@ class Subscription extends CommonObject return -1; } + $this->db->begin(); + $sql = "INSERT INTO ".MAIN_DB_PREFIX."subscription (fk_adherent, datec, dateadh, datef, subscription, note)"; $sql.= " VALUES (".$this->fk_adherent.", '".$this->db->idate($now)."',"; $sql.= " '".$this->db->idate($this->dateh)."',"; @@ -82,17 +87,32 @@ class Subscription extends CommonObject $sql.= " ".$this->amount.","; $sql.= " '".$this->db->escape($this->note)."')"; - dol_syslog(get_class($this)."::create", LOG_DEBUG); $resql = $this->db->query($sql); - if ($resql) - { - $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."subscription"); - return $this->id; + if ($res===false) { + $error++; + $this->errors[] = $this->db->lasterror(); } - else + + if (! $error) { - $this->error=$this->db->lasterror(); + $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element); + } + + if (! $error && ! $notrigger) + { + // Call triggers + $result=$this->call_trigger('MEMBER_SUBSCRIPTION_CREATE',$user); + if ($result < 0) { $error++; } + // End call triggers + } + + // Commit or rollback + if ($error) { + $this->db->rollback(); return -1; + } else { + $this->db->commit(); + return $this->id; } } @@ -154,8 +174,10 @@ class Subscription extends CommonObject * @param int $notrigger 0=Disable triggers * @return int <0 if KO, >0 if OK */ - function update($user,$notrigger=0) + function update($user, $notrigger=0) { + $error = 0; + $this->db->begin(); $sql = "UPDATE ".MAIN_DB_PREFIX."subscription SET "; @@ -177,14 +199,26 @@ class Subscription extends CommonObject $result=$member->fetch($this->fk_adherent); $result=$member->update_end_date($user); - $this->db->commit(); - return 1; + if (! $error && ! $notrigger) { + // Call triggers + $result=$this->call_trigger('MEMBER_SUBSCRIPTION_MODIFY',$user); + if ($result < 0) { $error++; } //Do also here what you must do to rollback action if trigger fail + // End call triggers + } } else { - $this->db->rollback(); + $error++; $this->error=$this->db->lasterror(); + } + + // Commit or rollback + if ($error) { + $this->db->rollback(); return -1; + } else { + $this->db->commit(); + return $this->id; } } @@ -192,10 +226,13 @@ class Subscription extends CommonObject * Delete a subscription * * @param User $user User that delete + * @param bool $notrigger false=launch triggers after, true=disable triggers * @return int <0 if KO, 0 if not found, >0 if OK */ - function delete($user) + function delete($user, $notrigger=false) { + $error = 0; + // It subscription is linked to a bank transaction, we get it if ($this->fk_bank > 0) { @@ -206,51 +243,71 @@ class Subscription extends CommonObject $this->db->begin(); - $sql = "DELETE FROM ".MAIN_DB_PREFIX."subscription WHERE rowid = ".$this->id; - dol_syslog(get_class($this)."::delete", LOG_DEBUG); - $resql=$this->db->query($sql); - if ($resql) - { - $num=$this->db->affected_rows($resql); - if ($num) - { - require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; - $member=new Adherent($this->db); - $result=$member->fetch($this->fk_adherent); - $result=$member->update_end_date($user); + if (! $error) { + if (! $notrigger) { + // Call triggers + $result=$this->call_trigger('MEMBER_SUBSCRIPTION_DELETE', $user); + if ($result < 0) { $error++; } // Do also here what you must do to rollback action if trigger fail + // End call triggers + } + } - if ($this->fk_bank > 0 && is_object($accountline) && $accountline->id > 0) // If we found bank account line (this means this->fk_bank defined) + if (! $error) + { + $sql = "DELETE FROM ".MAIN_DB_PREFIX."subscription WHERE rowid = ".$this->id; + dol_syslog(get_class($this)."::delete", LOG_DEBUG); + $resql=$this->db->query($sql); + if ($resql) + { + $num=$this->db->affected_rows($resql); + if ($num) { - $result=$accountline->delete($user); // Return false if refused because line is conciliated - if ($result > 0) + require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; + $member=new Adherent($this->db); + $result=$member->fetch($this->fk_adherent); + $result=$member->update_end_date($user); + + if ($this->fk_bank > 0 && is_object($accountline) && $accountline->id > 0) // If we found bank account line (this means this->fk_bank defined) { - $this->db->commit(); - return 1; + $result=$accountline->delete($user); // Return false if refused because line is conciliated + if ($result > 0) + { + $this->db->commit(); + return 1; + } + else + { + $this->error=$accountline->error; + $this->db->rollback(); + return -1; + } } else { - $this->error=$accountline->error; - $this->db->rollback(); - return -1; + $this->db->commit(); + return 1; } } else { $this->db->commit(); - return 1; + return 0; } } else { - $this->db->commit(); - return 0; + $error++; + $this->error=$this->db->lasterror(); } } - else - { - $this->error=$this->db->lasterror(); + + // Commit or rollback + if ($error) { $this->db->rollback(); return -1; + } else { + $this->db->commit(); + return 1; } } diff --git a/htdocs/blockedlog/admin/blockedlog.php b/htdocs/blockedlog/admin/blockedlog.php index 5e34cb968ae..2da83de5da2 100644 --- a/htdocs/blockedlog/admin/blockedlog.php +++ b/htdocs/blockedlog/admin/blockedlog.php @@ -26,9 +26,7 @@ require_once DOL_DOCUMENT_ROOT.'/blockedlog/lib/blockedlog.lib.php'; require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; -$langs->load("admin"); -$langs->load("other"); -$langs->load("blockedlog"); +$langs->loadLangs(array("admin","other","blockedlog")); if (! $user->admin || empty($conf->blockedlog->enabled)) accessforbidden(); @@ -143,7 +141,7 @@ if ($resql) { while ($obj = $db->fetch_object($resql)) { - $countryArray[$obj->code_iso] = ($obj->code_iso && $langs->transnoentitiesnoconv("Country".$obj->code_iso)!="Country".$obj->code_iso?$langs->transnoentitiesnoconv("Country".$obj->code_iso):($obj->label!='-'?$obj->label:'')); + $countryArray[$obj->code_iso] = ($obj->code_iso && $langs->transnoentitiesnoconv("Country".$obj->code_iso)!="Country".$obj->code_iso?$langs->transnoentitiesnoconv("Country".$obj->code_iso):($obj->label!='-'?$obj->label:'')); } } @@ -162,7 +160,7 @@ print $langs->trans("ListOfTrackedEvents").''; diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php index 25973f4df62..3f824ac1238 100644 --- a/htdocs/blockedlog/admin/blockedlog_list.php +++ b/htdocs/blockedlog/admin/blockedlog_list.php @@ -32,7 +32,7 @@ $langs->loadLangs(array("admin", "other", "blockedlog", "bills")); if (! $user->admin) accessforbidden(); $action = GETPOST('action','alpha'); -$contextpage= GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'myobjectlist'; // To manage different context of search +$contextpage= GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'blockedloglist'; // To manage different context of search $backtopage = GETPOST('backtopage','alpha'); // Go back to a dedicated page $optioncss = GETPOST('optioncss','aZ'); // Option for the css output (always '' except when 'print') @@ -43,6 +43,7 @@ $search_start = -1; if(GETPOST('search_startyear')!='') $search_start = dol_mktime(0, 0, 0, GETPOST('search_startmonth'), GETPOST('search_startday'), GETPOST('search_startyear')); $search_end = -1; if(GETPOST('search_endyear')!='') $search_end= dol_mktime(23, 59, 59, GETPOST('search_endmonth'), GETPOST('search_endday'), GETPOST('search_endyear')); +$search_code = GETPOST('search_code', 'alpha'); $search_ref = GETPOST('search_ref', 'alpha'); $search_amount = GETPOST('search_amount', 'alpha'); @@ -76,6 +77,7 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x', $search_fk_user = ''; $search_start = -1; $search_end = -1; + $search_code = ''; $search_ref = ''; $search_amount = ''; $toselect=''; @@ -167,7 +169,7 @@ else llxHeader('',$langs->trans("BrowseBlockedLog")); -$blocks = $block_static->getLog('all', 0, GETPOST('all','alpha') ? 0 : 50, $sortfield, $sortorder, $search_fk_user, $search_start, $search_end, $search_ref, $search_amount); +$blocks = $block_static->getLog('all', 0, GETPOST('all','alpha') ? 0 : 50, $sortfield, $sortorder, $search_fk_user, $search_start, $search_end, $search_ref, $search_amount, $search_code); if (! is_array($blocks)) { dol_print_error($block_static->db); @@ -216,24 +218,41 @@ print ' '; print '
    '; // You can use div-table-responsive-no-min if you dont need reserved height for your table print ''; +if ($optioncss != '') print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; print ''; print '
    '.$langs->trans("Project").''.$langs->trans("RefTask").''.$langs->trans("LabelTask").''.$langs->trans("DateStart").''.$langs->trans("DateEnd").''.$langs->trans("PlannedWorkload").''.$langs->trans("TimeSpent").''.$langs->trans("ProgressCalculated").''.$langs->trans("ProgressDeclared").' 
    '; if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print ''; From 5400bee3ed1ac4a6d289f198567cd0f2685a1bd1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 4 Jan 2018 21:06:39 +0100 Subject: [PATCH 0087/1074] Fix title --- htdocs/blockedlog/admin/blockedlog_list.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php index 078501d5bd8..25973f4df62 100644 --- a/htdocs/blockedlog/admin/blockedlog_list.php +++ b/htdocs/blockedlog/admin/blockedlog_list.php @@ -156,7 +156,16 @@ else if($action === 'downloadcsv') { $form=new Form($db); -llxHeader('',$langs->trans("BlockedLogSetup")); +if (GETPOST('withtab','alpha')) +{ + $title=$langs->trans("ModuleSetup").' '.$langs->trans('BlockedLog'); +} +else +{ + $title=$langs->trans("BrowseBlockedLog"); +} + +llxHeader('',$langs->trans("BrowseBlockedLog")); $blocks = $block_static->getLog('all', 0, GETPOST('all','alpha') ? 0 : 50, $sortfield, $sortorder, $search_fk_user, $search_start, $search_end, $search_ref, $search_amount); if (! is_array($blocks)) @@ -171,7 +180,7 @@ if (GETPOST('withtab','alpha')) $linkback=''.$langs->trans("BackToModuleList").''; } -print load_fiche_titre($langs->trans("ModuleSetup").' '.$langs->trans('BlockedLog'),$linkback); +print load_fiche_titre($title, $linkback); if (GETPOST('withtab','alpha')) { From 24dc144cc454cdf23ef0be559b564d2b9cc59d7a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 4 Jan 2018 21:14:45 +0100 Subject: [PATCH 0088/1074] Merge #8008 manually --- htdocs/api/class/api_documents.class.php | 14 ++++++ .../comm/propal/class/api_proposals.class.php | 43 ++++++++++++++++--- htdocs/commande/class/api_orders.class.php | 5 +-- 3 files changed, 53 insertions(+), 9 deletions(-) diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php index df2ca288f35..cd63037c668 100644 --- a/htdocs/api/class/api_documents.class.php +++ b/htdocs/api/class/api_documents.class.php @@ -196,6 +196,20 @@ class Documents extends DolibarrApi throw new RestException(500, 'Error generating document'); } } + elseif ($module_part == 'propal' || $module_part == 'proposal') + { + require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; + $this->propal = new Propal($this->db); + $result = $this->propal->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file))); + if( ! $result ) { + throw new RestException(404, 'Proposal not found'); + } + $templateused = $doctemplate?$doctemplate:$this->propal->modelpdf; + $result = $this->propal->generateDocument($templateused, $outputlangs, $hidedetails, $hidedesc, $hideref); + if( $result <= 0 ) { + throw new RestException(500, 'Error generating document'); + } + } else { throw new RestException(403, 'Generation not available for this modulepart'); diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php index 48311faa263..844c204f441 100644 --- a/htdocs/comm/propal/class/api_proposals.class.php +++ b/htdocs/comm/propal/class/api_proposals.class.php @@ -531,6 +531,37 @@ class Proposals extends DolibarrApi } + /** + * Set a commercial proposal billed. Could be also called setbilled + * + * @param int $id Commercial proposal ID + * + * @url POST {id}/setbilled + * + * @return array + */ + function setinvoiced($id) + { + if(! DolibarrApiAccess::$user->rights->propal->creer) { + throw new RestException(401); + } + $result = $this->propal->fetch($id); + if( ! $result ) { + throw new RestException(404, 'Commercial Proposal not found'); + } + + if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) { + throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); + } + + $result = $this->propal->classifyBilled(DolibarrApiAccess::$user); + if( $result < 0) { + throw new RestException(400, $this->propal->error); + } + + return $result; + } + /** * Validate a commercial proposal * @@ -538,7 +569,7 @@ class Proposals extends DolibarrApi * { * "notrigger": 0 * } - * + * * @param int $id Commercial proposal ID * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @@ -548,13 +579,13 @@ class Proposals extends DolibarrApi * @throws 401 * @throws 404 * @throws 500 - * + * * @return array */ function validate($id, $notrigger=0) { var_dump($notrigger);exit; - + if(! DolibarrApiAccess::$user->rights->propal->creer) { throw new RestException(401); } @@ -656,7 +687,7 @@ class Proposals extends DolibarrApi if ($result < 0) { throw new RestException(500, 'Error : '.$this->propal->error); } - + return array( 'success' => array( 'code' => 200, @@ -664,8 +695,8 @@ class Proposals extends DolibarrApi ) ); } - - + + /** * Validate fields before create or update object * diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php index 0c5e7531305..1d30e08205b 100644 --- a/htdocs/commande/class/api_orders.class.php +++ b/htdocs/commande/class/api_orders.class.php @@ -573,9 +573,8 @@ class Orders extends DolibarrApi return $result; } - /** - * Classify the order as invoiced + * Classify the order as invoiced. Could be also called setbilled * * @param int $id Id of the order * @@ -605,7 +604,7 @@ class Orders extends DolibarrApi if( $result < 0) { throw new RestException(400, $this->commande->error); } - + return $result; } From f19fb90ab0e9ef315b2c7f9e29a2dd7b20942834 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 4 Jan 2018 21:14:45 +0100 Subject: [PATCH 0089/1074] Merge #8008 manually --- htdocs/api/class/api_documents.class.php | 14 ++++++ .../comm/propal/class/api_proposals.class.php | 43 ++++++++++++++++--- htdocs/commande/class/api_orders.class.php | 5 +-- .../facture/class/api_invoices.class.php | 16 +++++-- 4 files changed, 65 insertions(+), 13 deletions(-) diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php index df2ca288f35..cd63037c668 100644 --- a/htdocs/api/class/api_documents.class.php +++ b/htdocs/api/class/api_documents.class.php @@ -196,6 +196,20 @@ class Documents extends DolibarrApi throw new RestException(500, 'Error generating document'); } } + elseif ($module_part == 'propal' || $module_part == 'proposal') + { + require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; + $this->propal = new Propal($this->db); + $result = $this->propal->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file))); + if( ! $result ) { + throw new RestException(404, 'Proposal not found'); + } + $templateused = $doctemplate?$doctemplate:$this->propal->modelpdf; + $result = $this->propal->generateDocument($templateused, $outputlangs, $hidedetails, $hidedesc, $hideref); + if( $result <= 0 ) { + throw new RestException(500, 'Error generating document'); + } + } else { throw new RestException(403, 'Generation not available for this modulepart'); diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php index 48311faa263..844c204f441 100644 --- a/htdocs/comm/propal/class/api_proposals.class.php +++ b/htdocs/comm/propal/class/api_proposals.class.php @@ -531,6 +531,37 @@ class Proposals extends DolibarrApi } + /** + * Set a commercial proposal billed. Could be also called setbilled + * + * @param int $id Commercial proposal ID + * + * @url POST {id}/setbilled + * + * @return array + */ + function setinvoiced($id) + { + if(! DolibarrApiAccess::$user->rights->propal->creer) { + throw new RestException(401); + } + $result = $this->propal->fetch($id); + if( ! $result ) { + throw new RestException(404, 'Commercial Proposal not found'); + } + + if( ! DolibarrApi::_checkAccessToResource('propal',$this->propal->id)) { + throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); + } + + $result = $this->propal->classifyBilled(DolibarrApiAccess::$user); + if( $result < 0) { + throw new RestException(400, $this->propal->error); + } + + return $result; + } + /** * Validate a commercial proposal * @@ -538,7 +569,7 @@ class Proposals extends DolibarrApi * { * "notrigger": 0 * } - * + * * @param int $id Commercial proposal ID * @param int $notrigger 1=Does not execute triggers, 0= execute triggers * @@ -548,13 +579,13 @@ class Proposals extends DolibarrApi * @throws 401 * @throws 404 * @throws 500 - * + * * @return array */ function validate($id, $notrigger=0) { var_dump($notrigger);exit; - + if(! DolibarrApiAccess::$user->rights->propal->creer) { throw new RestException(401); } @@ -656,7 +687,7 @@ class Proposals extends DolibarrApi if ($result < 0) { throw new RestException(500, 'Error : '.$this->propal->error); } - + return array( 'success' => array( 'code' => 200, @@ -664,8 +695,8 @@ class Proposals extends DolibarrApi ) ); } - - + + /** * Validate fields before create or update object * diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php index 0c5e7531305..1d30e08205b 100644 --- a/htdocs/commande/class/api_orders.class.php +++ b/htdocs/commande/class/api_orders.class.php @@ -573,9 +573,8 @@ class Orders extends DolibarrApi return $result; } - /** - * Classify the order as invoiced + * Classify the order as invoiced. Could be also called setbilled * * @param int $id Id of the order * @@ -605,7 +604,7 @@ class Orders extends DolibarrApi if( $result < 0) { throw new RestException(400, $this->commande->error); } - + return $result; } diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php index 57e832fcf21..5e8f33d419f 100644 --- a/htdocs/compta/facture/class/api_invoices.class.php +++ b/htdocs/compta/facture/class/api_invoices.class.php @@ -147,7 +147,8 @@ class Invoices extends DolibarrApi } $sql.= $db->order($sortfield, $sortorder); - if ($limit) { + if ($limit) + { if ($page < 0) { $page = 0; @@ -167,8 +168,15 @@ class Invoices extends DolibarrApi { $obj = $db->fetch_object($result); $invoice_static = new Facture($db); - if($invoice_static->fetch($obj->rowid)) { - $obj_ret[] = $this->_cleanObjectDatas($invoice_static); + if ($invoice_static->fetch($obj->rowid)) + { + // Get payment details + $invoice_static->totalpaid = $invoice_static->getSommePaiement(); + $invoice_static->totalcreditnotes = $invoice_static->getSumCreditNotesUsed(); + $invoice_static->totaldeposits = $invoice_static->getSumDepositsUsed(); + $invoice_static->remaintopay = price2num($invoice_static->total_ttc - $invoice_static->totalpaid - $invoice_static->totalcreditnotes - $invoice_static->totaldeposits, 'MT'); + + $obj_ret[] = $this->_cleanObjectDatas($invoice_static); } $i++; } @@ -752,7 +760,7 @@ class Invoices extends DolibarrApi return $this->_cleanObjectDatas($this->invoice); } - + /** * Add a discount line into an invoice (as an invoice line) using an existing absolute discount * From 1464937c6697f92c6221f767ad9633e839b3f391 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 4 Jan 2018 23:44:21 +0100 Subject: [PATCH 0090/1074] Merge #8008 manually --- htdocs/compta/facture/class/api_invoices.class.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php index 5e8f33d419f..b7da1a78b56 100644 --- a/htdocs/compta/facture/class/api_invoices.class.php +++ b/htdocs/compta/facture/class/api_invoices.class.php @@ -307,6 +307,11 @@ class Invoices extends DolibarrApi * @url PUT {id}/lines/{lineid} * * @return object + * + * @throws 200 + * @throws 304 + * @throws 401 + * @throws 404 */ function putLine($id, $lineid, $request_data = NULL) { if(! DolibarrApiAccess::$user->rights->facture->creer) { @@ -352,8 +357,9 @@ class Invoices extends DolibarrApi $result = $this->get($id); unset($result->line); return $this->_cleanObjectDatas($result); + } else { + throw new RestException(304, $this->invoice->error); } - return false; } /** @@ -365,6 +371,7 @@ class Invoices extends DolibarrApi * @url DELETE {id}/lines/{lineid} * * @return array + * * @throws 400 * @throws 401 * @throws 404 From a3c6746b6fa3fd3bddd93d232d19ebbe8f7dc3fb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 4 Jan 2018 23:50:15 +0100 Subject: [PATCH 0091/1074] Merge #8008 manually --- htdocs/compta/facture/class/api_invoices.class.php | 6 +++--- htdocs/compta/facture/class/facture.class.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php index b7da1a78b56..9e24b68fde4 100644 --- a/htdocs/compta/facture/class/api_invoices.class.php +++ b/htdocs/compta/facture/class/api_invoices.class.php @@ -543,10 +543,10 @@ class Invoices extends DolibarrApi $request_data->product_type, $request_data->rang, $request_data->special_code, - 'facture', - $id, + $request_data->origin, + $request_data->origin_id, $request_data->fk_parent_line, - $request_data->fk_fournprice, + empty($request_data->fk_fournprice)?null:$request_data->fk_fournprice, $pa_ht, $request_data->label, $request_data->array_options, diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index c5f9ae7fc92..a35e7f7ae40 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -2542,7 +2542,7 @@ class Facture extends CommonInvoice 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, fk_unit=$fk_unit", LOG_DEBUG); + dol_syslog(get_class($this)."::addline id=$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 From dd8e7d657f32b82f0d1a231558ab46b98253f7fe Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 4 Jan 2018 23:57:45 +0100 Subject: [PATCH 0092/1074] Update card.php --- htdocs/comm/propal/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index 65bc1831f20..63a691af0ee 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -1411,9 +1411,9 @@ if ($action == 'create') } print '
    " . $langs->trans("DefaultContact") . ''; $form->select_contacts($soc->id, $contactid, 'contactid', 1, $srccontactslist); print '
    '.$langs->trans("Project").'
    '; $arrayoftrackedevents=$block_static->trackedevents; foreach($arrayoftrackedevents as $key => $val) { - print $key.'-'.$val.'
    '; + print $key.' - '.$langs->trans($val).'
    '; } print '
    '; + +// Line of filters print ''; print ''; print ''; // User print ''; -print ''; +// Actions code +$langs->load("blockedlog"); +print ''; // Ref print ''; @@ -292,7 +311,9 @@ foreach($blocks as &$block) { //print $block->getUser() print $block->user_fullname; print ''; + // Action print ''; + // Ref print ''; print ''; print ''; @@ -329,6 +350,8 @@ print ''; print ''; + + print ''."\n"; -if(!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY) && !empty($conf->global->BLOCKEDLOG_AUTHORITY_URL)) { - +if(!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY) && !empty($conf->global->BLOCKEDLOG_AUTHORITY_URL)) +{ ?> - + }); + trackedevents = array(); - if ($conf->facture->enabled) $this->trackedevents['BILL_VALIDATE']='BillValidate'; - if ($conf->facture->enabled) $this->trackedevents['BILL_DELETE']='BillDelete'; - if ($conf->facture->enabled) $this->trackedevents['BILL_SENTBYMAIL']='BillSentByEmail'; - if ($conf->facture->enabled) $this->trackedevents['DOC_DOWNLOAD']='BillDownload'; - if ($conf->facture->enabled) $this->trackedevents['DOC_PREVIEW']='BillPreview'; + if ($conf->facture->enabled) $this->trackedevents['BILL_VALIDATE']='logBILL_VALIDATE'; + if ($conf->facture->enabled) $this->trackedevents['BILL_DELETE']='logBILL_DELETE'; + if ($conf->facture->enabled) $this->trackedevents['BILL_SENTBYMAIL']='logBILL_SENTBYMAIL'; + if ($conf->facture->enabled) $this->trackedevents['DOC_DOWNLOAD']='BlockedLogBillDownload'; + if ($conf->facture->enabled) $this->trackedevents['DOC_PREVIEW']='BlockedLogBillPreview'; - if ($conf->facture->enabled) $this->trackedevents['PAYMENT_CUSTOMER_CREATE']='BillPaymentCreate'; - if ($conf->facture->enabled) $this->trackedevents['PAYMENT_CUSTOMER_DELETE']='BillPaymentDelete'; + if ($conf->facture->enabled) $this->trackedevents['PAYMENT_CUSTOMER_CREATE']='logPAYMENT_CUSTOMER_CREATE'; + if ($conf->facture->enabled) $this->trackedevents['PAYMENT_CUSTOMER_DELETE']='logPAYMENT_CUSTOMER_DELETE'; /* Supplier - if ($conf->fournisseur->enabled) $this->trackedevents['BILL_SUPPLIER_VALIDATE']='SupplierBillValidate'; - if ($conf->fournisseur->enabled) $this->trackedevents['BILL_SUPPLIER_DELETE']='SupplierBillDelete'; - if ($conf->fournisseur->enabled) $this->trackedevents['BILL_SUPPLIER_SENTBYMAIL']='SupplierBillSentByEmail'; // Trigger key does not exists, we want just into array to list it as done - if ($conf->fournisseur->enabled) $this->trackedevents['SUPPLIER_DOC_DOWNLOAD']='SupplierBillDownload'; // Trigger key does not exists, we want just into array to list it as done - if ($conf->fournisseur->enabled) $this->trackedevents['SUPPLIER_DOC_PREVIEW']='SupplierBillPreview'; // Trigger key does not exists, we want just into array to list it as done + if ($conf->fournisseur->enabled) $this->trackedevents['BILL_SUPPLIER_VALIDATE']='BlockedLogSupplierBillValidate'; + if ($conf->fournisseur->enabled) $this->trackedevents['BILL_SUPPLIER_DELETE']='BlockedLogSupplierBillDelete'; + if ($conf->fournisseur->enabled) $this->trackedevents['BILL_SUPPLIER_SENTBYMAIL']='BlockedLogSupplierBillSentByEmail'; // Trigger key does not exists, we want just into array to list it as done + if ($conf->fournisseur->enabled) $this->trackedevents['SUPPLIER_DOC_DOWNLOAD']='BlockedLogSupplierBillDownload'; // Trigger key does not exists, we want just into array to list it as done + if ($conf->fournisseur->enabled) $this->trackedevents['SUPPLIER_DOC_PREVIEW']='BlockedLogSupplierBillPreview'; // Trigger key does not exists, we want just into array to list it as done - if ($conf->fournisseur->enabled) $this->trackedevents['PAYMENT_SUPPLIER_CREATE']='SupplierBillPaymentCreate'; - if ($conf->fournisseur->enabled) $this->trackedevents['PAYMENT_SUPPLIER_DELETE']='supplierBillPaymentCreate'; + if ($conf->fournisseur->enabled) $this->trackedevents['PAYMENT_SUPPLIER_CREATE']='BlockedLogSupplierBillPaymentCreate'; + if ($conf->fournisseur->enabled) $this->trackedevents['PAYMENT_SUPPLIER_DELETE']='BlockedLogsupplierBillPaymentCreate'; */ - if ($conf->don->enabled) $this->trackedevents['DON_CREATE']='DonationCreate'; - if ($conf->don->enabled) $this->trackedevents['DON_MODIFY']='DonationModify'; - if ($conf->don->enabled) $this->trackedevents['DON_DELETE']='DonationDelete'; + if ($conf->don->enabled) $this->trackedevents['DON_VALIDATE']='logDON_VALIDATE'; + if ($conf->don->enabled) $this->trackedevents['DON_DELETE']='logDON_DELETE'; + //if ($conf->don->enabled) $this->trackedevents['DON_SENTBYMAIL']='logDON_SENTBYMAIL'; + + if ($conf->don->enabled) $this->trackedevents['DONATION_PAYMENT_CREATE']='logDONATION_PAYMENT_CREATE'; + if ($conf->don->enabled) $this->trackedevents['DONATION_PAYMENT_DELETE']='logDONATION_PAYMENT_DELETE'; /* - if ($conf->salary->enabled) $this->trackedevents['PAYMENT_SALARY_CREATE']='SalaryPaymentCreate'; - if ($conf->salary->enabled) $this->trackedevents['PAYMENT_SALARY_MODIFY']='SalaryPaymentCreate'; - if ($conf->salary->enabled) $this->trackedevents['PAYMENT_SALARY_DELETE']='SalaryPaymentCreate'; + if ($conf->salary->enabled) $this->trackedevents['PAYMENT_SALARY_CREATE']='BlockedLogSalaryPaymentCreate'; + if ($conf->salary->enabled) $this->trackedevents['PAYMENT_SALARY_MODIFY']='BlockedLogSalaryPaymentCreate'; + if ($conf->salary->enabled) $this->trackedevents['PAYMENT_SALARY_DELETE']='BlockedLogSalaryPaymentCreate'; */ - if ($conf->adherent->enabled) $this->trackedevents['MEMBER_SUBSCRIPTION']='MemberSubscription'; + if ($conf->adherent->enabled) $this->trackedevents['MEMBER_SUBSCRIPTION_CREATE']='logMEMBER_SUBSCRIPTION_CREATE'; + if ($conf->adherent->enabled) $this->trackedevents['MEMBER_SUBSCRIPTION_MODIFY']='logMEMBER_SUBSCRIPTION_MODIFY'; + if ($conf->adherent->enabled) $this->trackedevents['MEMBER_SUBSCRIPTION_DELETE']='logMEMBER_SUBSCRIPTION_DELETE'; /* - $trackedevents['PAYMENT_VARIOUS_CREATE']='VariousPaymentCreate'; - $trackedevents['PAYMENT_VARIOUS_MODIFY']='VariousPaymentModify'; - $trackedevents['PAYMENT_VARIOUS_DELETE']='VariousPaymentDelete'; + $trackedevents['PAYMENT_VARIOUS_CREATE']='BlockedLogVariousPaymentCreate'; + $trackedevents['PAYMENT_VARIOUS_MODIFY']='BlockedLogVariousPaymentModify'; + $trackedevents['PAYMENT_VARIOUS_DELETE']='BlockedLogVariousPaymentDelete'; */ } @@ -199,6 +204,17 @@ class BlockedLog $this->error++; } } + else if($this->element === 'payment_donation') { + require_once DOL_DOCUMENT_ROOT.'/don/class/paymentdonation.class.php'; + + $object = new PaymentDonation($this->db); + if($object->fetch($this->fk_object)>0) { + return $object->getNomUrl(1); + } + else{ + $this->error++; + } + } else if ($this->action == 'MODULE_SET') { return 'System to track events into unalterable logs were enabled'; @@ -269,6 +285,10 @@ class BlockedLog { $this->date_object = $object->datev; } + elseif ($object->element == 'payment_donation') + { + $this->date_object = $object->datepaid?$object->datepaid:$object->datep; + } else { $this->date_object = $object->date; } @@ -322,6 +342,7 @@ class BlockedLog if ($this->element == 'facture') { + var_dump($object);exit; foreach($object as $key=>$value) { if (in_array($key, array('fields'))) continue; // Discard some properties @@ -342,12 +363,14 @@ class BlockedLog if (!is_object($value)) $this->object_data->{$key} = $value; } } - elseif ($this->element == 'payment'|| $object->element == 'payment_supplier') + elseif ($this->element == 'payment' || $this->element == 'payment_supplier' || $this->element == 'payment_donation') { - //var_dump($object); + $datepayment = $object->datepaye?$object->datepaye:($object->datepaid?$object->datepaid:$object->datep); + $paymenttypeid = $object->paiementid?$object->paiementid:$object->paymenttype; + $this->object_data->ref = $object->ref; - $this->object_data->date = $object->datepaye; - $this->object_data->type_code = dol_getIdFromCode($this->db, $object->paiementid, 'c_paiement', 'id', 'code'); + $this->object_data->date = $datepayment; + $this->object_data->type_code = dol_getIdFromCode($this->db, $paymenttypeid, 'c_paiement', 'id', 'code'); $this->object_data->payment_num = $object->num_paiement; //$this->object_data->fk_account = $object->fk_account; $this->object_data->note = $object->note; @@ -356,7 +379,7 @@ class BlockedLog $totalamount=0; $paymentpartnumber=0; - foreach($object->amounts as $invoiceid => $amount) + foreach($object->amounts as $objid => $amount) { if (empty($amount)) continue; @@ -364,49 +387,68 @@ class BlockedLog if ($this->element == 'payment_supplier') { - $tmpinvoice = new FactureFournisseur($this->db); + include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; + $tmpobject = new FactureFournisseur($this->db); } - else + elseif ($this->element == 'payment') { - $tmpinvoice = new Facture($this->db); + include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; + $tmpobject = new Facture($this->db); } - $result = $tmpinvoice->fetch($invoiceid); + elseif ($this->element == 'payment_donation') + { + include_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php'; + $tmpobject = new Don($this->db); + } + + $result = $tmpobject->fetch($objid); if ($result <= 0) { - $this->error = $tmpinvoice->error; - $this->errors = $tmpinvoice->errors; - return -1; - } - $result = $tmpinvoice->fetch_thirdparty(); - if ($result <= 0) - { - $this->error = $tmpinvoice->error; - $this->errors = $tmpinvoice->errors; + $this->error = $tmpobject->error; + $this->errors = $tmpobject->errors; return -1; } $paymentpart = new stdClass(); $paymentpart->amount = $amount; - $paymentpart->thirdparty = new stdClass(); - foreach($tmpinvoice->thirdparty as $key=>$value) + if ($this->element != 'payment_donation') { - if (in_array($key, array('fields'))) continue; // Discard some properties - if (! in_array($key, array( - 'name','name_alias','ref_ext','address','zip','town','state_code','country_code','idprof1','idprof2','idprof3','idprof4','idprof5','idprof6','phone','fax','email','barcode', - 'tva_intra', 'localtax1_assuj', 'localtax1_value', 'localtax2_assuj', 'localtax2_value', 'managers', 'capital', 'typent_code', 'forme_juridique_code', 'code_client', 'code_fournisseur' - ))) continue; // Discard if not into a dedicated list - if (!is_object($value)) $paymentpart->thirdparty->{$key} = $value; + $result = $tmpobject->fetch_thirdparty(); + if ($result <= 0) + { + $this->error = $tmpobject->error; + $this->errors = $tmpobject->errors; + return -1; + } + + $paymentpart->thirdparty = new stdClass(); + foreach($tmpobject->thirdparty as $key=>$value) + { + if (in_array($key, array('fields'))) continue; // Discard some properties + if (! in_array($key, array( + 'name','name_alias','ref_ext','address','zip','town','state_code','country_code','idprof1','idprof2','idprof3','idprof4','idprof5','idprof6','phone','fax','email','barcode', + 'tva_intra', 'localtax1_assuj', 'localtax1_value', 'localtax2_assuj', 'localtax2_value', 'managers', 'capital', 'typent_code', 'forme_juridique_code', 'code_client', 'code_fournisseur' + ))) continue; // Discard if not into a dedicated list + if (!is_object($value)) $paymentpart->thirdparty->{$key} = $value; + } } - $paymentpart->invoice = new stdClass(); - foreach($tmpinvoice as $key=>$value) + // Init object to avoid warnings + if ($this->element == 'payment_donation') $paymentpart->donation = new stdClass(); + else $paymentpart->invoice = new stdClass(); + + foreach($tmpobject as $key=>$value) { if (in_array($key, array('fields'))) continue; // Discard some properties if (! in_array($key, array( 'ref','facnumber','ref_client','ref_supplier','datef','type','total_ht','total_tva','total_ttc','localtax1','localtax2','revenuestamp','datepointoftax','note_public' ))) continue; // Discard if not into a dedicated list - if (!is_object($value)) $paymentpart->invoice->{$key} = $value; + if (!is_object($value)) + { + if ($this->element == 'payment_donation') $paymentpart->donation->{$key} = $value; + else $paymentpart->invoice->{$key} = $value; + } } $paymentpartnumber++; @@ -718,9 +760,10 @@ class BlockedLog * @param int $search_end end time limit * @param string $search_ref search ref * @param string $search_amount search amount + * @param string $search_code search code * @return array array of object log */ - public function getLog($element, $fk_object, $limit = 0, $sortfield = '', $sortorder = '', $search_fk_user = -1, $search_start = -1, $search_end = -1, $search_ref='', $search_amount='') + public function getLog($element, $fk_object, $limit = 0, $sortfield = '', $sortorder = '', $search_fk_user = -1, $search_start = -1, $search_end = -1, $search_ref='', $search_amount='', $search_code='') { global $conf, $cachedlogs; @@ -748,11 +791,12 @@ class BlockedLog WHERE entity=".$conf->entity." AND element='".$element."' AND fk_object=".(int) $fk_object; } - if ($search_fk_user > 0) $sql.=" AND fk_user IN (".$this->db->escape($search_fk_user).")"; - if ($search_start > 0) $sql.=" AND date_creation >= '".$this->db->idate($search_start)."'"; - if ($search_end > 0) $sql.=" AND date_creation <= '".$this->db->idate($search_end)."'"; - if ($search_ref != '') $sql.=natural_search("ref_object", $search_ref); + if ($search_fk_user > 0) $sql.=natural_search("fk_user", $search_fk_user, 2); + if ($search_start > 0) $sql.=" AND date_creation >= '".$this->db->idate($search_start)."'"; + if ($search_end > 0) $sql.=" AND date_creation <= '".$this->db->idate($search_end)."'"; + if ($search_ref != '') $sql.=natural_search("ref_object", $search_ref); if ($search_amount != '') $sql.=natural_search("amounts", $search_amount, 1); + if ($search_code != '') $sql.=natural_search("action", $search_code, 3); $sql.=$this->db->order($sortfield, $sortorder); diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 2d206960f8c..c8627f2cb41 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -6589,6 +6589,7 @@ function dol_getmypid() * or like "keyword1|keyword2" = We want record field like keyword1 OR field like keyword2 * If param $mode is 1, can contains an operator <, > or = like "<10" or ">=100.5 < 1000" * If param $mode is 2, can contains a list of int id separated by comma like "1,3,4" + * If param $mode is 3, can contains a list of string separated by comma like "a,b,c" * @param integer $mode 0=value is list of keyword strings, 1=value is a numeric test (Example ">5.5 <10"), 2=value is a list of id separated with comma (Example '1,3,4') * @param integer $nofirstand 1=Do not output the first 'AND' * @return string $res The statement to append to the SQL query @@ -6652,6 +6653,24 @@ function natural_search($fields, $value, $mode=0, $nofirstand=0) $newres .= ($i2 > 0 ? ' OR ' : '') . $field . " IN (" . $db->escape(trim($crit)) . ")"; $i2++; // a criteria was added to string } + else if ($mode == 3) + { + $tmparray=explode(',',trim($crit)); + if (count($tmparray)) + { + $listofcodes=''; + foreach($tmparray as $val) + { + if ($val) + { + $listofcodes.=($listofcodes?',':''); + $listofcodes.="'".$db->escape(trim($val))."'"; + } + } + $newres .= ($i2 > 0 ? ' OR ' : '') . $field . " IN (" . $listofcodes . ")"; + $i2++; // a criteria was added to string + } + } else // $mode=0 { $textcrit = ''; @@ -6661,7 +6680,7 @@ function natural_search($fields, $value, $mode=0, $nofirstand=0) { $newres .= (($i2 > 0 || $i3 > 0) ? ' OR ' : ''); - if (preg_match('/\.(id|rowid)$/', $field)) // Special cas for rowid that is sometimes a ref so used as a search field + if (preg_match('/\.(id|rowid)$/', $field)) // Special case for rowid that is sometimes a ref so used as a search field { $newres .= $field . " = " . (is_numeric(trim($tmpcrit))?trim($tmpcrit):'0'); } diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php index 64796c79654..52b804283cc 100644 --- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php +++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php @@ -50,7 +50,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers if (empty($conf->blockedlog->enabled)) return 0; // Module not active, we do nothing // Test if event/record is qualified - $listofqualifiedelement = array('payment', 'facture'); + $listofqualifiedelement = array('facture', 'don', 'payment', 'payment_donation', 'subscription'); if (! in_array($object->element, $listofqualifiedelement)) return 1; dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id); @@ -68,6 +68,8 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers $amounts = 0; if ($action==='BILL_VALIDATE' || $action==='BILL_DELETE' || $action === 'BILL_SENTBYMAIL' || $action==='BILL_SUPPLIER_VALIDATE' || $action==='BILL_SUPPLIER_DELETE' || $action === 'BILL_SUPPLIER_SENTBYMAIL' + || $action==='MEMBER_SUBCRIPTION_CREATE' || $action==='MEMBER_SUBCRIPTION_MODIFY' || $action==='MEMBER_SUBCRIPTION_DELETE' + || $action==='DON_VALIDATE' || $action==='DON_MODIFY' || $action==='DON_DELETE' || (in_array($object->element, array('facture','suplier_invoice')) && $action === 'DOC_DOWNLOAD') || (in_array($object->element, array('facture','suplier_invoice')) && $action === 'DOC_PREVIEW') ) { @@ -80,8 +82,8 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers $qualified++; $amounts= (double) $object->total_ttc; }*/ - if ($action === 'PAYMENT_CUSTOMER_CREATE' || $action === 'PAYMENT_SUPPLIER_CREATE' - || $action === 'PAYMENT_CUSTOMER_DELETE' || $action === 'PAYMENT_SUPPLIER_DELETE') // 'PAYMENT_ADD_TO_BANK' + if ($action === 'PAYMENT_CUSTOMER_CREATE' || $action === 'PAYMENT_SUPPLIER_CREATE' || $action === 'DONATION_PAYMENT_CREATE' + || $action === 'PAYMENT_CUSTOMER_DELETE' || $action === 'PAYMENT_SUPPLIER_DELETE' || $action === 'DONATION_PAYMENT_DELETE') { $qualified++; $amounts = 0; @@ -91,10 +93,10 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers } } } - if (strpos($action,'PAYMENT')!==false && ! in_array($action, array('PAYMENT_ADD_TO_BANK'))) + elseif (strpos($action,'PAYMENT')!==false && ! in_array($action, array('PAYMENT_ADD_TO_BANK'))) { $qualified++; - $amounts= (double) $object->amount; + $amounts = (double) $object->amount; } // Another protection. @@ -109,7 +111,7 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers if ($result < 0) { $this->error = $b->error; - $this->errors = $b->erros; + $this->errors = $b->errors; return -1; } diff --git a/htdocs/don/card.php b/htdocs/don/card.php index 5081e32dd0e..bd1752be99e 100644 --- a/htdocs/don/card.php +++ b/htdocs/don/card.php @@ -740,7 +740,7 @@ if (! empty($id) && $action != 'edit') } else { - print '
    '.$langs->trans("Delete")."
    "; + print '
    '.$langs->trans("Delete")."
    "; } } else diff --git a/htdocs/don/class/paymentdonation.class.php b/htdocs/don/class/paymentdonation.class.php index 1785cf2e57d..619f2532a04 100644 --- a/htdocs/don/class/paymentdonation.class.php +++ b/htdocs/don/class/paymentdonation.class.php @@ -67,10 +67,11 @@ class PaymentDonation extends CommonObject * Create payment of donation into database. * Use this->amounts to have list of lines for the payment * - * @param User $user User making payment - * @return int <0 if KO, id of payment if OK + * @param User $user User making payment + * @param bool $notrigger false=launch triggers after, true=disable triggers + * @return int <0 if KO, id of payment if OK */ - function create($user) + function create($user, $notrigger=false) { global $conf, $langs; @@ -125,12 +126,20 @@ class PaymentDonation extends CommonObject if ($resql) { $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_donation"); + $this->ref = $this->id; } else { $error++; } + } + if (! $error && ! $notrigger) + { + // Call triggers + $result=$this->call_trigger('DONATION_PAYMENT_CREATE',$user); + if ($result < 0) { $error++; } + // End call triggers } if ($totalamount != 0 && ! $error) @@ -241,14 +250,11 @@ class PaymentDonation extends CommonObject if (isset($this->fk_user_creat)) $this->fk_user_creat=trim($this->fk_user_creat); if (isset($this->fk_user_modif)) $this->fk_user_modif=trim($this->fk_user_modif); - - // Check parameters // Put here code to add control on parameters values // Update request $sql = "UPDATE ".MAIN_DB_PREFIX."payment_donation SET"; - $sql.= " fk_donation=".(isset($this->fk_donation)?$this->fk_donation:"null").","; $sql.= " datec=".(dol_strlen($this->datec)!=0 ? "'".$this->db->idate($this->datec)."'" : 'null').","; $sql.= " tms=".(dol_strlen($this->tms)!=0 ? "'".$this->db->idate($this->tms)."'" : 'null').","; @@ -260,8 +266,6 @@ class PaymentDonation extends CommonObject $sql.= " fk_bank=".(isset($this->fk_bank)?$this->fk_bank:"null").","; $sql.= " fk_user_creat=".(isset($this->fk_user_creat)?$this->fk_user_creat:"null").","; $sql.= " fk_user_modif=".(isset($this->fk_user_modif)?$this->fk_user_modif:"null").""; - - $sql.= " WHERE rowid=".$this->id; $this->db->begin(); @@ -274,15 +278,13 @@ class PaymentDonation extends CommonObject { if (! $notrigger) { - // Uncomment this and change MYOBJECT to your own tag if you - // want this action call a trigger. - - //// Call triggers - //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; - //$interface=new Interfaces($this->db); - //$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf); - //if ($result < 0) { $error++; $this->errors=$interface->errors; } - //// End call triggers + if (! $error && ! $notrigger) + { + // Call triggers + $result=$this->call_trigger('DONATION_PAYMENT_MODIFY',$user); + if ($result < 0) { $error++; } + // End call triggers + } } } @@ -343,15 +345,13 @@ class PaymentDonation extends CommonObject { if (! $notrigger) { - // Uncomment this and change MYOBJECT to your own tag if you - // want this action call a trigger. - - //// Call triggers - //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; - //$interface=new Interfaces($this->db); - //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf); - //if ($result < 0) { $error++; $this->errors=$interface->errors; } - //// End call triggers + if (! $error && ! $notrigger) + { + // Call triggers + $result=$this->call_trigger('DONATION_PAYMENT_DELETE',$user); + if ($result < 0) { $error++; } + // End call triggers + } } } diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php index 436b449b446..68d29fe3dc1 100644 --- a/htdocs/don/payment/card.php +++ b/htdocs/don/payment/card.php @@ -41,7 +41,7 @@ if ($user->societe_id) $socid=$user->societe_id; //$result = restrictedArea($user, 'facture', $id,''); $object = new PaymentDonation($db); -if ($id > 0) +if ($id > 0) { $result=$object->fetch($id); if (! $result) dol_print_error($db,'Failed to get payment id '.$id); @@ -77,7 +77,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->don->cree $db->begin(); $result=$object->valide(); - + if ($result > 0) { $db->commit(); @@ -126,7 +126,7 @@ $head[$h][1] = $langs->trans("Card"); $hselected = $h; $h++; -dol_fiche_head($head, $hselected, $langs->trans("DonationPayment"), 0, 'payment'); +dol_fiche_head($head, $hselected, $langs->trans("DonationPayment"), -1, 'payment'); /* * Confirm deleting of the payment @@ -134,7 +134,7 @@ dol_fiche_head($head, $hselected, $langs->trans("DonationPayment"), 0, 'payment' if ($action == 'delete') { print $form->formconfirm('card.php?id='.$object->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete','',0,2); - + } /* @@ -144,12 +144,13 @@ if ($action == 'valide') { $facid = GETPOST('facid','int'); print $form->formconfirm('card.php?id='.$object->id.'&facid='.$facid, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide','',0,2); - + } dol_banner_tab($object,'id','',1,'rowid','id'); +print '
    '; print '
    '; print '
     '; -print $form->select_date($search_start,'search_start'); -print $form->select_date($search_end,'search_end'); +//print $langs->trans("from").': '; +$form->select_date($search_start,'search_start'); +//print '
    '; +//print $langs->trans("to").': '; +$form->select_date($search_end,'search_end'); print '    		'; -print $form->select_users($search_fk_user, 'search_fk_user', 1); +print $form->select_dolusers($search_fk_user, 'search_fk_user', 1); print ''; +print $form->selectarray('search_code', $block_static->trackedevents, $search_code, 1, 0, 0, '', 1, 0, 0, 'ASC', 'maxwidth200', 1); +print ''.$langs->trans('log'.$block->action).''.$block->ref_object.''.$object_link.''.price($block->amounts).'
    '; @@ -231,7 +232,7 @@ if ($resql) { $objp = $db->fetch_object($resql); - + print ''; // Ref print '
    '; @@ -253,7 +254,7 @@ if ($resql) $i++; } } - + print "
    \n"; $db->free($resql); @@ -265,6 +266,8 @@ else print '
    '; +dol_fiche_end(); + /* * Actions buttons diff --git a/htdocs/langs/en_US/blockedlog.lang b/htdocs/langs/en_US/blockedlog.lang index a047b9ff0f0..7d64f7086bf 100644 --- a/htdocs/langs/en_US/blockedlog.lang +++ b/htdocs/langs/en_US/blockedlog.lang @@ -15,15 +15,25 @@ AddedByAuthority=Stored into remote authority NotAddedByAuthorityYet=Not yet stored into remote authority ShowDetails=Show stored details logPAYMENT_ADD_TO_BANK=Payment added to bank -logPAYMENT_CUSTOMER_CREATE=Payment of customer created -logPAYMENT_CUSTOMER_DELETE=Payment of customer deleted -logBILL_PAYED=Customer bill payed -logBILL_UNPAYED=Customer bill set unpayed -logBILL_VALIDATE=Customer bill validated -logBILL_SENTBYMAIL=Customer bill send by mail -logBILL_DELETE=Customer bill deleted +logPAYMENT_CUSTOMER_CREATE=Customer payment created +logPAYMENT_CUSTOMER_DELETE=Customer payment logical deletion +logDONATION_PAYMENT_CREATE=Donation payment created +logDONATION_PAYMENT_DELETE=Donation payment logical deletion +logBILL_PAYED=Customer invoice payed +logBILL_UNPAYED=Customer invoice set unpayed +logBILL_VALIDATE=Customer invoice validated +logBILL_SENTBYMAIL=Customer invoice send by mail +logBILL_DELETE=Customer invoice logically deleted logMODULE_RESET=Module BlockedLog was disabled logMODULE_SET=Module BlockedLog was enabled +logDON_VALIDATE=Donation validated +logDON_MODIFY=Donation modified +logDON_DELETE=Donation logical deletion +logMEMBER_SUBSCRIPTION_CREATE=Member subcription created +logMEMBER_SUBSCRIPTION_MODIFY=Member subcription modified +logMEMBER_SUBSCRIPTION_DELETE=Member subcription logical deletion +BlockedLogBillDownload=Customer invoice download +BlockedLogBillPreview=Customer invoice preview BlockedlogInfoDialog=Log Details ListOfTrackedEvents=List of tracked events Fingerprint=Fingerprint @@ -34,4 +44,4 @@ DataOfArchivedEvent=Full datas of archived event ImpossibleToReloadObject=Object (type %s, id %s) removed (see 'Full data' link for unerasable saved data) BlockedLogAreRequiredByYourCountryLegislation=Unalterable Logs module may be required by the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they can not be validated by a tax audit. BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Unalterable Logs module was activated because of the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they can not be validated by a tax audit. -BlockedLogDisableNotAllowedForCountry=List of countries where usage of this module is mandatory (just to prevent to disable the module by error, if your country is in this list, disable of module is not possible without editing this list first) \ No newline at end of file +BlockedLogDisableNotAllowedForCountry=List of countries where usage of this module is mandatory (just to prevent to disable the module by error, if your country is in this list, disable of module is not possible without editing this list first) From 6ba5ca36c4b7a7a666a997effd2cd6001ac66a8e Mon Sep 17 00:00:00 2001 From: dolibarr95 <24292300+dolibarr95@users.noreply.github.com> Date: Fri, 5 Jan 2018 08:59:31 +0100 Subject: [PATCH 0100/1074] Update llx_societe.sql Goes with https://github.com/Dolibarr/dolibarr/pull/7975 --- htdocs/install/mysql/tables/llx_societe.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql index c23ca3a183c..fe20f426094 100644 --- a/htdocs/install/mysql/tables/llx_societe.sql +++ b/htdocs/install/mysql/tables/llx_societe.sql @@ -104,5 +104,6 @@ create table llx_societe webservices_key varchar(128), -- supplier webservice key fk_multicurrency integer, - multicurrency_code varchar(255) + multicurrency_code varchar(255), + fk_entrepot int DEFAULT 0 -- Id de l'entrepôt par défaut (Warehouse ID by default) )ENGINE=innodb; From 7e8fda2d71ef31181c104c9eec81f1001cdb7511 Mon Sep 17 00:00:00 2001 From: sschwebel Date: Fri, 5 Jan 2018 12:09:45 +0100 Subject: [PATCH 0101/1074] FIX #8029 Unable to make leave request in holyday module wrong variable name in card.php --- htdocs/holiday/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php index 8e8ab6f287c..0a4d0cb37ca 100644 --- a/htdocs/holiday/card.php +++ b/htdocs/holiday/card.php @@ -149,7 +149,7 @@ if ($action == 'create') if (! $error) { - $object->fk_user = $userid; + $object->fk_user = $fuserid; $object->description = $description; $object->date_debut = $date_debut; $object->date_fin = $date_fin; From 332ee53c22439dde47b4dee4984d4f36402f3083 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 5 Jan 2018 12:43:53 +0100 Subject: [PATCH 0102/1074] Fix module blockedlog for donation --- htdocs/blockedlog/admin/blockedlog_list.php | 4 ++ htdocs/blockedlog/class/blockedlog.class.php | 29 ++++++++----- ..._modBlockedlog_ActionsBlockedLog.class.php | 6 ++- htdocs/don/card.php | 7 +++- htdocs/don/class/don.class.php | 42 +++++++++++++------ htdocs/langs/en_US/donations.lang | 1 + 6 files changed, 64 insertions(+), 25 deletions(-) diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php index 3f824ac1238..54b8a05a19d 100644 --- a/htdocs/blockedlog/admin/blockedlog_list.php +++ b/htdocs/blockedlog/admin/blockedlog_list.php @@ -305,8 +305,11 @@ foreach($blocks as &$block) { if (empty($showonlyerrors) || ! $checkresult[$block->id] || ($loweridinerror && $block->id >= $loweridinerror)) { print ''; + // ID print ''.$block->id.''; + // Date print ''.dol_print_date($block->tms,'dayhour').''; + // User print ''; //print $block->getUser() print $block->user_fullname; @@ -315,6 +318,7 @@ foreach($blocks as &$block) { print ''.$langs->trans('log'.$block->action).''; // Ref print ''.$block->ref_object.''; + // Link to source object print ''.$object_link.''; print ''.price($block->amounts).''; print ''.img_info($langs->trans('ShowDetails')).''; diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php index be731dc4a70..ad2e6bb110a 100644 --- a/htdocs/blockedlog/class/blockedlog.class.php +++ b/htdocs/blockedlog/class/blockedlog.class.php @@ -154,7 +154,7 @@ class BlockedLog } /** - * try to retrieve logged object link + * Try to retrieve source object (it it still exists) */ public function getObjectLink() { @@ -164,7 +164,7 @@ class BlockedLog require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; $object = new Facture($this->db); - if($object->fetch($this->fk_object)>0) { + if ($object->fetch($this->fk_object)>0) { return $object->getNomUrl(1); } else{ @@ -175,7 +175,7 @@ class BlockedLog require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; $object = new FactureFournisseur($this->db); - if($object->fetch($this->fk_object)>0) { + if ($object->fetch($this->fk_object)>0) { return $object->getNomUrl(1); } else{ @@ -186,7 +186,7 @@ class BlockedLog require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; $object = new Paiement($this->db); - if($object->fetch($this->fk_object)>0) { + if ($object->fetch($this->fk_object)>0) { return $object->getNomUrl(1); } else{ @@ -197,7 +197,7 @@ class BlockedLog require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php'; $object = new PaiementFourn($this->db); - if($object->fetch($this->fk_object)>0) { + if ($object->fetch($this->fk_object)>0) { return $object->getNomUrl(1); } else{ @@ -208,7 +208,18 @@ class BlockedLog require_once DOL_DOCUMENT_ROOT.'/don/class/paymentdonation.class.php'; $object = new PaymentDonation($this->db); - if($object->fetch($this->fk_object)>0) { + if ($object->fetch($this->fk_object)>0) { + return $object->getNomUrl(1); + } + else{ + $this->error++; + } + } + else if($this->element === 'don' || $this->element === 'donation') { + require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php'; + + $object = new Don($this->db); + if ($object->fetch($this->fk_object)>0) { return $object->getNomUrl(1); } else{ @@ -796,14 +807,12 @@ class BlockedLog if ($search_end > 0) $sql.=" AND date_creation <= '".$this->db->idate($search_end)."'"; if ($search_ref != '') $sql.=natural_search("ref_object", $search_ref); if ($search_amount != '') $sql.=natural_search("amounts", $search_amount, 1); - if ($search_code != '') $sql.=natural_search("action", $search_code, 3); + if ($search_code != '' && $search_code != '-1') $sql.=natural_search("action", $search_code, 3); $sql.=$this->db->order($sortfield, $sortorder); - - if($limit > 0 )$sql.=' LIMIT '.$limit; + $sql.=$this->db->plimit($limit); $res = $this->db->query($sql); - if($res) { $results=array(); diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php index 52b804283cc..03fb170650d 100644 --- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php +++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php @@ -74,7 +74,9 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers ) { $qualified++; - $amounts= (double) $object->total_ttc; + + if ($action==='DON_VALIDATE') $amounts = (double) $object->amount; + else $amounts = (double) $object->total_ttc; } /*if ($action === 'BILL_PAYED' || $action==='BILL_UNPAYED' || $action === 'BILL_SUPPLIER_PAYED' || $action === 'BILL_SUPPLIER_UNPAYED') @@ -106,8 +108,8 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers return 0; // not implemented action log } - $result = $b->setObjectData($object, $action, $amounts); // Set field date_object, ref_object, fk_object, element, object_data + if ($result < 0) { $this->error = $b->error; diff --git a/htdocs/don/card.php b/htdocs/don/card.php index bd1752be99e..01164c47508 100644 --- a/htdocs/don/card.php +++ b/htdocs/don/card.php @@ -199,8 +199,11 @@ if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $user->rights- } if ($action == 'valid_promesse') { + $object->fetch($id); if ($object->valid_promesse($id, $user->id) >= 0) { + setEventMessages($langs->trans("DonationValidated", $object->ref), null); + header("Location: ".$_SERVER['PHP_SELF']."?id=".$id); exit; } @@ -210,7 +213,8 @@ if ($action == 'valid_promesse') } if ($action == 'set_cancel') { - if ($object->set_cancel($id) >= 0) + $object->fetch($id); + if ($object->set_cancel($id) >= 0) { header("Location: ".$_SERVER['PHP_SELF']."?id=".$id); exit; @@ -221,6 +225,7 @@ if ($action == 'set_cancel') } if ($action == 'set_paid') { + $object->fetch($id); if ($object->set_paid($id, $modepayment) >= 0) { header("Location: ".$_SERVER['PHP_SELF']."?id=".$id); diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php index 7224df1aa22..c0c00f7971d 100644 --- a/htdocs/don/class/don.class.php +++ b/htdocs/don/class/don.class.php @@ -689,27 +689,45 @@ class Don extends CommonObject * @param int $userid User who validate the donation/promise * @return int <0 if KO, >0 if OK */ - function valid_promesse($id, $userid) + function valid_promesse($id, $userid, $notrigger=0) { + global $langs, $user; + + $error=0; + + $this->db->begin(); $sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 1, fk_user_valid = ".$userid." WHERE rowid = ".$id." AND fk_statut = 0"; $resql=$this->db->query($sql); if ($resql) { - if ( $this->db->affected_rows($resql) ) + if ($this->db->affected_rows($resql)) { - return 1; - } - else - { - return 0; + if (!$notrigger) + { + // Call trigger + $result=$this->call_trigger('DON_VALIDATE',$user); + if ($result < 0) { $error++; } + // End call triggers + } } } else { - dol_print_error($this->db); - return -1; + $error++; + $this->error = $this->db->lasterror(); + } + + if (!$error) + { + $this->db->commit(); + return 1; + } + else + { + $this->db->rollback(); + return -1; } } @@ -720,14 +738,14 @@ class Don extends CommonObject * @param int $modepayment mode of payment * @return int <0 if KO, >0 if OK */ - function set_paid($id, $modepayment='') + function set_paid($id, $modepayment=0) { $sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 2"; if ($modepayment) { - $sql .= ", fk_payment=$modepayment"; + $sql .= ", fk_payment=".$modepayment; } - $sql .= " WHERE rowid = $id AND fk_statut = 1"; + $sql .= " WHERE rowid = ".$id." AND fk_statut = 1"; $resql=$this->db->query($sql); if ($resql) diff --git a/htdocs/langs/en_US/donations.lang b/htdocs/langs/en_US/donations.lang index 606b6b5d789..748057cc9cc 100644 --- a/htdocs/langs/en_US/donations.lang +++ b/htdocs/langs/en_US/donations.lang @@ -31,3 +31,4 @@ 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 +DonationValidated=Donation %s validated From f826696aa1739a20075e7f7a5d5cb04056b34c2a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 5 Jan 2018 13:40:56 +0100 Subject: [PATCH 0103/1074] Add the status of record into blockedlog export --- htdocs/blockedlog/admin/blockedlog.php | 3 +- htdocs/blockedlog/admin/blockedlog_list.php | 81 ++++++++++++++++---- htdocs/blockedlog/class/blockedlog.class.php | 30 ++++---- 3 files changed, 84 insertions(+), 30 deletions(-) diff --git a/htdocs/blockedlog/admin/blockedlog.php b/htdocs/blockedlog/admin/blockedlog.php index 2da83de5da2..e4b38a9568f 100644 --- a/htdocs/blockedlog/admin/blockedlog.php +++ b/htdocs/blockedlog/admin/blockedlog.php @@ -1,5 +1,6 @@ +/* Copyright (C) 2017 ATM Consulting + * Copyright (C) 2017-2018 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 diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php index 54b8a05a19d..8c9e9bbd287 100644 --- a/htdocs/blockedlog/admin/blockedlog_list.php +++ b/htdocs/blockedlog/admin/blockedlog_list.php @@ -1,5 +1,6 @@ +/* Copyright (C) 2017 ATM Consulting + * Copyright (C) 2017-2018 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 @@ -103,9 +104,9 @@ else if($action === 'downloadcsv') { $sql = "SELECT rowid,date_creation,tms,user_fullname,action,amounts,element,fk_object,date_object,ref_object,signature,fk_user,object_data"; $sql.= " FROM ".MAIN_DB_PREFIX."blockedlog"; $sql.= " WHERE entity = ".$conf->entity; - $sql.= " ORDER BY rowid ASC"; - $res = $db->query($sql); + $sql.= " ORDER BY rowid ASC"; // Required so later we can use the parameter $previoushash of checkSignature() + $res = $db->query($sql); if($res) { $signature = $block_static->getSignature(); @@ -124,10 +125,43 @@ else if($action === 'downloadcsv') { .';'.$langs->transnoentities('Date') .';'.$langs->transnoentities('Ref') .';'.$langs->transnoentities('Fingerprint') + .';'.$langs->transnoentities('Status') .';'.$langs->transnoentities('FullData') ."\n"; - while($obj = $db->fetch_object($res)) { + $previoushash = ''; + $loweridinerror = 0; + + while ($obj = $db->fetch_object($res)) + { + // We set here all data used into signature calculation (see checkSignature method) and more + // IMPORTANT: We must have here, the same rule for transformation of data than into the fetch method (db->jdate for date, ...) + $block_static->id = $obj->rowid; + $block_static->date_creation = $db->jdate($obj->date_creation); + $block_static->date_modification = $db->jdate($obj->tms); + $block_static->action = $obj->action; + $block_static->fk_object = $obj->fk_object; + $block_static->element = $obj->element; + $block_static->amounts = (double) $obj->amounts; + $block_static->ref_object = $obj->ref_object; + $block_static->date_object = $db->jdate($obj->date_object); + $block_static->user_fullname = $obj->user_fullname; + $block_static->fk_user = $obj->fk_user; + $block_static->signature = $obj->signature; + $block_static->object_data = unserialize($obj->object_data); + + $checksignature = $block_static->checkSignature($previoushash); // If $previoushash is not defined, checkSignature will search it + + if ($checksignature) + { + if ($loweridinerror > 0) $statusofrecord = 'ValidButFoundAPreviousKO'; + else $statusofrecord = 'Valid'; + } + else + { + $statusofrecord = 'KO'; + $loweridinerror = $obj->rowid; + } print $obj->rowid .';'.$obj->date_creation @@ -139,16 +173,20 @@ else if($action === 'downloadcsv') { .';'.$obj->date_object .';"'.$obj->ref_object.'"' .';'.$obj->signature + .';'.$statusofrecord .';"'.str_replace('"','""',$obj->object_data).'"' ."\n"; + + // Set new previous hash for next fetch + $previoushash = $obj->signature; } exit; } - else{ + else + { setEventMessage($db->lasterror, 'errors'); } - } @@ -286,17 +324,28 @@ print getTitleFieldOfList($langs->trans('Fingerprint'), 0, $_SERVER["PHP_SELF"], print getTitleFieldOfList('', 0, $_SERVER["PHP_SELF"],'','',$param,'align="center"',$sortfield,$sortorder,'')."\n"; print ''; -$loweridinerror=0; -$checkresult=array(); -foreach($blocks as &$block) { - $checksignature = $block->checkSignature(); - $checkresult[$block->id]=$checksignature; // false if error - if (! $checksignature) - { - if (empty($loweridinerror)) $loweridinerror=$block->id; - else $loweridinerror = min($loweridinerror, $block->id); - } +if (! empty($conf->global->BLOCKEDLOG_SCAN_ALL_FOR_LOWERIDINERROR)) +{ + // This is version that is faster memory but require more memory and report errors that are outside the filter range + // TODO Make a full scan of table in reverse order of id of $block, so we can use the parameter $previoushash into checkSignature to save requests + // to find the $loweridinerror. + +} +else +{ + // This is version that optimize memory (but will not report error that are outside the filter range) + $loweridinerror=0; + $checkresult=array(); + foreach($blocks as &$block) { + $checksignature = $block->checkSignature(); // Note: this make a sql request at each call, we can't avoid this as the sorting order is various + $checkresult[$block->id]=$checksignature; // false if error + if (! $checksignature) + { + if (empty($loweridinerror)) $loweridinerror=$block->id; + else $loweridinerror = min($loweridinerror, $block->id); + } + } } foreach($blocks as &$block) { diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php index ad2e6bb110a..ed3749acdda 100644 --- a/htdocs/blockedlog/class/blockedlog.class.php +++ b/htdocs/blockedlog/class/blockedlog.class.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2017 ATM Consulting * Copyright (C) 2017 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify @@ -82,6 +82,9 @@ class BlockedLog */ public $fk_user = 0; + public $date_creation; + public $date_modification; + public $date_object = 0; public $ref_object = ''; @@ -607,7 +610,7 @@ class BlockedLog $this->db->begin(); - $previoushash = $this->getPreviousHash(1); // This get last record and lock database until insert is done + $previoushash = $this->getPreviousHash(1, 0); // This get last record and lock database until insert is done $keyforsignature = $this->buildKeyForSignature(); @@ -678,19 +681,20 @@ class BlockedLog } /** - * Check if current signature still correct compare to the chain + * Check if current signature still correct compared to the value in chain * - * @return boolean True if OK, False if KO + * @param string $previoushash If previous signature hash is known, we can provide it to avoid to make a search of it in database. + * @return boolean True if OK, False if KO */ - public function checkSignature() + public function checkSignature($previoushash='') { - - //$oldblockedlog = new BlockedLog($this->db); - //$previousrecord = $oldblockedlog->fetch($this->id - 1); - $previoushash = $this->getPreviousHash(0, $this->id); - + if (empty($previoushash)) + { + $previoushash = $this->getPreviousHash(0, $this->id); + } // Recalculate hash $keyforsignature = $this->buildKeyForSignature(); + $signature_line = dol_hash($keyforsignature, '5'); // Not really usefull $signature = dol_hash($previoushash . $keyforsignature, '5'); //var_dump($previoushash); var_dump($keyforsignature); var_dump($signature_line); var_dump($signature); @@ -720,10 +724,10 @@ class BlockedLog * Get previous signature/hash in chain * * @param int $withlock 1=With a lock - * @param int $beforeid Before id - * @return string Hash of last record + * @param int $beforeid ID of a record + * @return string Hash of previous record (if beforeid is defined) or hash of last record (if beforeid is 0) */ - private function getPreviousHash($withlock=0, $beforeid=0) + public function getPreviousHash($withlock=0, $beforeid=0) { global $conf; From 5580cedfdc00073ecdcb0e99abf5b5ceca146df2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 5 Jan 2018 17:35:28 +0100 Subject: [PATCH 0104/1074] Fix add of free entry into bank account --- htdocs/compta/bank/bankentries_list.php | 114 ++++++++++++++---------- 1 file changed, 69 insertions(+), 45 deletions(-) diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php index 6b9256102d9..6a530bbd2eb 100644 --- a/htdocs/compta/bank/bankentries_list.php +++ b/htdocs/compta/bank/bankentries_list.php @@ -69,14 +69,15 @@ else $result=restrictedArea($user,'banque'); } -$search_ref=GETPOST('search_ref','alpha'); $description=GETPOST("description",'alpha'); +$dateop = dol_mktime(12,0,0,GETPOST("opmonth",'int'),GETPOST("opday",'int'),GETPOST("opyear",'int')); $debit=GETPOST("debit",'alpha'); $credit=GETPOST("credit",'alpha'); $type=GETPOST("type",'alpha'); $account=GETPOST("account",'int'); $accountancy_code=GETPOST('accountancy_code', 'alpha'); $bid=GETPOST("bid","int"); +$search_ref=GETPOST('search_ref','alpha'); $search_dt_start = dol_mktime(0, 0, 0, GETPOST('search_start_dtmonth', 'int'), GETPOST('search_start_dtday', 'int'), GETPOST('search_start_dtyear', 'int')); $search_dt_end = dol_mktime(0, 0, 0, GETPOST('search_end_dtmonth', 'int'), GETPOST('search_end_dtday', 'int'), GETPOST('search_end_dtyear', 'int')); $search_dv_start = dol_mktime(0, 0, 0, GETPOST('search_start_dvmonth', 'int'), GETPOST('search_start_dvday', 'int'), GETPOST('search_start_dvyear', 'int')); @@ -85,9 +86,9 @@ $search_thirdparty=GETPOST("thirdparty",'alpha'); $search_req_nb=GETPOST("req_nb",'alpha'); $search_num_releve=GETPOST("search_num_releve",'alpha'); $search_conciliated=GETPOST("search_conciliated",'int'); -$num_releve=GETPOST("num_releve"); +$num_releve=GETPOST("num_releve","alpha"); $cat=GETPOST("cat"); - +if (empty($dateop)) $dateop=-1; $limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit; $sortfield = GETPOST("sortfield",'alpha'); @@ -253,9 +254,7 @@ if (GETPOST('confirm_reconcile') && $user->rights->banque->consolidate) } -$dateop=-1; - -if (GETPOST('save') && $id && ! $cancel && $user->rights->banque->modifier) +if (GETPOST('save') && ! $cancel && $user->rights->banque->modifier) { $error = 0; @@ -268,27 +267,34 @@ if (GETPOST('save') && $id && ! $cancel && $user->rights->banque->modifier) $amount = - price2num($_POST["adddebit"]); } - $dateop = dol_mktime(12,0,0,$_POST["opmonth"],$_POST["opday"],$_POST["opyear"]); $operation = GETPOST("operation",'alpha'); $num_chq = GETPOST("num_chq",'alpha'); $label = GETPOST("label",'alpha'); $cat1 = GETPOST("cat1",'alpha'); + $bankaccountid = $id; + if (GETPOST('add_account','int') > 0) $bankaccountid = GETPOST('add_account','int'); + if (! $dateop) { $error++; - setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Date")), null, 'errors'); + setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors'); } if (! $operation) { $error++; - setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Type")), null, 'errors'); + setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors'); } if (! $label) { $error++; - setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Label")), null, 'errors'); + setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors'); } if (! $amount) { $error++; - setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Amount")), null, 'errors'); + setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors'); + } + if (! $bankaccountid > 0) + { + $error++; + setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankAccount")), null, 'errors'); } /*if (! empty($conf->accounting->enabled) && (empty($accountancy_code) || $accountancy_code == '-1')) { @@ -298,12 +304,13 @@ if (GETPOST('save') && $id && ! $cancel && $user->rights->banque->modifier) if (! $error) { - $object->fetch($id); - $insertid = $object->addline($dateop, $operation, $label, $amount, $num_chq, ($cat1 > 0 ? $cat1 : 0), $user, '', '', $accountancy_code); + $objecttmp = new Account($db); + $objecttmp->fetch($bankaccountid); + $insertid = $objecttmp->addline($dateop, $operation, $label, $amount, $num_chq, ($cat1 > 0 ? $cat1 : 0), $user, '', '', $accountancy_code); if ($insertid > 0) { setEventMessages($langs->trans("RecordSaved"), null, 'mesgs'); - header("Location: ".$_SERVER['PHP_SELF']."?id=".$id); + header("Location: ".$_SERVER['PHP_SELF'].($id ? "?id=".$id : '')); exit; } else @@ -630,12 +637,17 @@ if ($resql) print load_fiche_titre($langs->trans("AddBankRecordLong"),'',''); print ''; + print ''; + print ''; print ''; print ''; print ''; print ''; - print ''; + //if (! $account > 0) + //{ + print ''; + //} print ''; print ''; /*if (! empty($conf->accounting->enabled)) @@ -644,33 +656,42 @@ if ($resql) print $langs->trans("AccountAccounting"); print ''; }*/ - print ''; + print ''; print ''; - print ''; - print ''; - print ''; - print ''; + print ''; - print ''; - print ''; + print ''; + print ''; + print ''; + print ''; + //if (! $account > 0) + //{ + print ''; + //} + print ''; + print ''; /*if (! empty($conf->accounting->enabled)) { print ''; }*/ - print ''; @@ -710,29 +731,32 @@ if ($resql) $morehtml.=''; $addbutton = ''; - if (empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) + if ($action != 'addline') { - if (! empty($conf->global->BANK_USE_VARIOUS_PAYMENT)) // If direct entries is done using miscellaneous payments + if (empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) { - if ($user->rights->banque->modifier) { - $addbutton = ''.$langs->trans("AddBankRecord").''; - } else { - $addbutton = ''.$langs->trans("AddBankRecord").''; + if (! empty($conf->global->BANK_USE_VARIOUS_PAYMENT)) // If direct entries is done using miscellaneous payments + { + if ($user->rights->banque->modifier) { + $addbutton = ''.$langs->trans("AddBankRecord").''; + } else { + $addbutton = ''.$langs->trans("AddBankRecord").''; + } + } + else // If direct entries is not done using miscellaneous payments + { + if ($user->rights->banque->modifier) { + $addbutton = ''.$langs->trans("AddBankRecord").''; + } else { + $addbutton = ''.$langs->trans("AddBankRecord").''; + } } } - else // If direct entries is not done using miscellaneous payments + else { - if ($user->rights->banque->modifier) { - $addbutton = ''.$langs->trans("AddBankRecord").''; - } else { - $addbutton = ''.$langs->trans("AddBankRecord").''; - } + $addbutton = ''.$langs->trans("AddBankRecord").''; } } - else - { - $addbutton = ''.$langs->trans("AddBankRecord").''; - } $morehtml.=$addbutton; $picto='title_bank'; From 70cfec37b107b618bbb56b1c412e64c1ee9cf8ad Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 5 Jan 2018 17:38:21 +0100 Subject: [PATCH 0105/1074] Fix add of free entry into bank account --- htdocs/compta/bank/bankentries_list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php index 6a530bbd2eb..2cdf92a7863 100644 --- a/htdocs/compta/bank/bankentries_list.php +++ b/htdocs/compta/bank/bankentries_list.php @@ -731,7 +731,7 @@ if ($resql) $morehtml.=''; $addbutton = ''; - if ($action != 'addline') + if ($action != 'addline' && $action != 'reconcile') { if (empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) { From 35a710a8ed658d7b0a30fa7adaa30b4676d419a4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 5 Jan 2018 17:50:05 +0100 Subject: [PATCH 0106/1074] Missing translation --- htdocs/langs/en_US/banks.lang | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang index d45c0c15c1c..78ac859e706 100644 --- a/htdocs/langs/en_US/banks.lang +++ b/htdocs/langs/en_US/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Number LineRecord=Transaction AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Reconciled ConciliatedBy=Reconciled by DateConciliating=Reconcile date BankLineConciliated=Entry reconciled From 4f409b802ed182a53bc4e8c2376a634700cee492 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 5 Jan 2018 18:16:40 +0100 Subject: [PATCH 0107/1074] Fix switch extrafield password/text --- htdocs/core/tpl/admin_extrafields_edit.tpl.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php index 89289fac150..e0b4927bf19 100644 --- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php +++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php @@ -181,8 +181,9 @@ elseif (($type== 'sellist') || ($type == 'chkbxlst') || ($type == 'link') ) array('varchar', 'phone', 'mail', 'url', 'select'), - 'mail'=>array('varchar', 'phone', 'mail', 'url', 'select'), + 'varchar'=>array('varchar', 'phone', 'mail', 'url', 'select', 'password'), + 'password'=>array('password', 'varchar'), + 'mail'=>array('varchar', 'phone', 'mail', 'url', 'select'), 'url'=>array('varchar', 'phone', 'mail', 'url', 'select'), 'phone'=>array('varchar', 'phone', 'mail', 'url', 'select'), 'select'=>array('varchar', 'phone', 'mail', 'url', 'select') From b9015de7e2e4208d9398a14e6fe8718f74278ca5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 5 Jan 2018 19:52:23 +0100 Subject: [PATCH 0108/1074] Fix can't edit payment mode / default bank account --- htdocs/compta/facture/card.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index c769b538d43..2261dafb818 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -3443,7 +3443,7 @@ else if ($id > 0 || ! empty($ref)) print '
    '.$langs->trans("Description").''.$langs->trans("Date").' '.$langs->trans("Type").''.$langs->trans("Numero").''.$langs->trans("Description").''.$langs->trans("BankAccount").''.$langs->trans("Debit").''.$langs->trans("Credit").'  
    '; - $form->select_date(empty($dateop)?-1:$dateop,'op',0,0,0,'transaction'); - print ''; - $form->select_types_paiements((GETPOST('operation')?GETPOST('operation'):($object->courant == Account::TYPE_CASH ? 'LIQ' : '')),'operation','1,2',2,1); - print ''; - print ''; - print ''; + print '
    '; + print ''; if ($options) { print '
    '.$langs->trans("Rubrique").': '; print Form::selectarray('cat1', $options, GETPOST('cat1'), 1); } print '    		'; + $form->select_date(empty($dateop)?-1:$dateop,'op',0,0,0,'transaction'); + print ' '; + $form->select_types_paiements((GETPOST('operation')?GETPOST('operation'):($object->courant == Account::TYPE_CASH ? 'LIQ' : '')),'operation','1,2',2,1); + print ''; + print ''; + print ''; + $form->select_comptes(GETPOST('add_account','int')?GETPOST('add_account','int'):$account,'add_account',0,'',1, ($id > 0 || ! empty($ref)?' disabled="disabled"':'')); + print ''; print $formaccounting->select_account($accountancy_code, 'accountancy_code', 1, null, 1, 1, ''); print ''; + print ''; print '
    '; print ''; print '
    '; - if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && ! empty($object->brouillon) && $user->rights->facture->creer) + if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && $user->rights->facture->creer) print ''; print '
    '; print $langs->trans('PaymentConditionsShort'); print 'id . '">' . img_edit($langs->trans('SetConditions'), 1) . '
    '; print ''; @@ -3464,7 +3464,7 @@ else if ($id > 0 || ! empty($ref)) print ''; - if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editpaymentterm' && ! empty($object->brouillon) && $user->rights->facture->creer) + if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editpaymentterm' && $user->rights->facture->creer) print ''; print '
    '; print $langs->trans('DateMaxPayment'); print 'id . '">' . img_edit($langs->trans('SetDate'), 1) . '
    '; print ''; @@ -3488,7 +3488,7 @@ else if ($id > 0 || ! empty($ref)) print ''; - if ($action != 'editmode' && ! empty($object->brouillon) && $user->rights->facture->creer) + if ($action != 'editmode' && $user->rights->facture->creer) print ''; print '
    '; print $langs->trans('PaymentMode'); print 'id . '">' . img_edit($langs->trans('SetMode'), 1) . '
    '; print ''; @@ -3552,7 +3552,7 @@ else if ($id > 0 || ! empty($ref)) print ''; print '
    '; print $langs->trans('BankAccount'); print ''; - if (($action != 'editbankaccount') && $user->rights->facture->creer && ! empty($object->brouillon)) + if (($action != 'editbankaccount') && $user->rights->facture->creer) print 'id.'">'.img_edit($langs->trans('SetBankAccount'),1).'
    '; print ''; From a37019a25bcce443cd8c44854c1dbcbbc022b484 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 5 Jan 2018 22:04:43 +0100 Subject: [PATCH 0109/1074] NEW Add chart of account for england --- .../install/mysql/data/llx_accounting_abc.sql | 3 +++ .../install/mysql/migration/6.0.0-7.0.0.sql | 22 +++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/htdocs/install/mysql/data/llx_accounting_abc.sql b/htdocs/install/mysql/data/llx_accounting_abc.sql index b61aaaa576f..04edf9b5de9 100644 --- a/htdocs/install/mysql/data/llx_accounting_abc.sql +++ b/htdocs/install/mysql/data/llx_accounting_abc.sql @@ -54,6 +54,9 @@ INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUE -- Description of chart of account CH PCG_SUISSE INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 6, 'PCG_SUISSE', 'Switzerland plan', 1); +-- Description of chart of account GB ENG-BASE +INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 7, 'ENG-BASE', 'England plan', 1); + -- Description of chart of account TN PCT INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 10, 'PCT', 'The Tunisia plan', 1); diff --git a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql index ccd396d9465..d3ff5bd6e17 100644 --- a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql +++ b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql @@ -538,9 +538,27 @@ create table llx_c_email_senderprofile ALTER TABLE llx_c_email_senderprofile ADD UNIQUE INDEX uk_c_email_senderprofile(entity, label, email); --- Description of chart of account CL CL-PYME -INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (67, 'PC-MIPYME', 'The PYME accountancy Chile plan', 1); +-- Add new chart of account entries +INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 67,'PC-MIPYME', 'The PYME accountancy Chile plan', 1); +INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 7,'ENG-BASE', 'England plan', 1); +INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 49,'SYSCOHADA', 'Plan comptable Ouest-Africain', 1); +INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 60,'SYSCOHADA', 'Plan comptable Ouest-Africain', 1); +INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 24,'SYSCOHADA', 'Plan comptable Ouest-Africain', 1); +INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 65,'SYSCOHADA', 'Plan comptable Ouest-Africain', 1); +INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 71,'SYSCOHADA', 'Plan comptable Ouest-Africain', 1); +INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 72,'SYSCOHADA', 'Plan comptable Ouest-Africain', 1); +INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 21,'SYSCOHADA', 'Plan comptable Ouest-Africain', 1); +INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 16,'SYSCOHADA', 'Plan comptable Ouest-Africain', 1); +INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 87,'SYSCOHADA', 'Plan comptable Ouest-Africain', 1); +INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (147,'SYSCOHADA', 'Plan comptable Ouest-Africain', 1); +INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (168,'SYSCOHADA', 'Plan comptable Ouest-Africain', 1); +INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 73,'SYSCOHADA', 'Plan comptable Ouest-Africain', 1); +INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 22,'SYSCOHADA', 'Plan comptable Ouest-Africain', 1); +INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 66,'SYSCOHADA', 'Plan comptable Ouest-Africain', 1); +INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 15,'SYSCOHADA', 'Plan comptable Ouest-Africain', 1); + +-- Update old chart of account entries UPDATE llx_accounting_system SET fk_country = 1 WHERE pcg_version = 'PCG99-ABREGE'; UPDATE llx_accounting_system SET fk_country = 1 WHERE pcg_version = 'PCG99-BASE'; UPDATE llx_accounting_system SET fk_country = 1 WHERE pcg_version = 'PCG14-DEV'; From 140ee422a49bb4eca2b6262d3735cd14d64344a0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 5 Jan 2018 22:06:40 +0100 Subject: [PATCH 0110/1074] NEW Add chart of account for england --- .../mysql/data/llx_accounting_account_gb.sql | 370 ++++++++++++++++++ 1 file changed, 370 insertions(+) create mode 100644 htdocs/install/mysql/data/llx_accounting_account_gb.sql diff --git a/htdocs/install/mysql/data/llx_accounting_account_gb.sql b/htdocs/install/mysql/data/llx_accounting_account_gb.sql new file mode 100644 index 00000000000..5e462781b4c --- /dev/null +++ b/htdocs/install/mysql/data/llx_accounting_account_gb.sql @@ -0,0 +1,370 @@ +-- Copyright (C) 2017 Laurent Destailleur +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . +-- +-- + +-- +-- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors +-- de l'install et tous les sigles '--' sont supprimés. +-- + +-- +-- Descriptif des plans comptables UK ENG-BASE id 7xxxx +-- + +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (71501, 'ENG-BASE', 'CAPIT', 'XXXXXX', '1', '0', 'Equity, provisions for liabilities and charges and liabilities at more than one year', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (71502, 'ENG-BASE', 'IMMO', 'XXXXXX', '2', '0', 'Administration fees.Fixed assets and receivables over one year', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (71503, 'ENG-BASE', 'STOCK', 'XXXXXX', '3', '0', 'Stock and orders running', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (71504, 'ENG-BASE', 'TIERS', 'XXXXXX', '4', '0', 'Amounts receivable and payable within one year', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (71505, 'ENG-BASE', 'FINAN', 'XXXXXX', '5', '0', 'Placing of cash and cash equivalents', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (71506, 'ENG-BASE', 'CHARGE', 'XXXXXX', '6', '0', 'Charges', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (71507, 'ENG-BASE', 'PROD', 'XXXXXX', '7', '0', 'Products', 1); + +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70103, 'ENG-BASE', 'CAPIT', 'XXXXXX', '10', '71501', 'Capital and reserves', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70104, 'ENG-BASE', 'CAPIT', 'CAPITAL', '101', '70103', 'Capital', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70105, 'ENG-BASE', 'CAPIT', 'XXXXXX', '104', '70103', 'Share capital premiums', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70106, 'ENG-BASE', 'CAPIT', 'XXXXXX', '105', '70103', 'Revaluation differences', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70107, 'ENG-BASE', 'CAPIT', 'XXXXXX', '106', '70103', 'Stocks', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70108, 'ENG-BASE', 'CAPIT', 'XXXXXX', '107', '70103', 'Equivalence difference', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70109, 'ENG-BASE', 'CAPIT', 'XXXXXX', '108', '70103', 'Exploiting account', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70110, 'ENG-BASE', 'CAPIT', 'XXXXXX', '109', '70103', 'Shareholders: subscribed capital - not called', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70111, 'ENG-BASE', 'CAPIT', 'XXXXXX', '11', '71501', 'Retained balance (credit balance or debit)', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70112, 'ENG-BASE', 'CAPIT', 'XXXXXX', '110', '70111', 'Retained earnings (credit balance)', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70113, 'ENG-BASE', 'CAPIT', 'XXXXXX', '119', '70111', 'Retained earnings (debit balance)', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70114, 'ENG-BASE', 'CAPIT', 'XXXXXX', '12', '71501', 'YEAR PROFIT (profit or loss)', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70115, 'ENG-BASE', 'CAPIT', 'XXXXXX', '120', '70114', 'Profit for the year (profit)', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70116, 'ENG-BASE', 'CAPIT', 'XXXXXX', '129', '70114', 'Profit for the year (loss)', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70117, 'ENG-BASE', 'CAPIT', 'XXXXXX', '13', '71501', 'Investment grants', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70118, 'ENG-BASE', 'CAPIT', 'XXXXXX', '131', '70117', 'Equipment Grants', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70119, 'ENG-BASE', 'CAPIT', 'XXXXXX', '138', '70117', 'Other investment grants', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70120, 'ENG-BASE', 'CAPIT', 'XXXXXX', '139', '70117', 'Investment subsidies entered in the income statement', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70121, 'ENG-BASE', 'CAPIT', 'XXXXXX', '14', '71501', 'Regulated provisions', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70122, 'ENG-BASE', 'CAPIT', 'XXXXXX', '142', '70121', 'Regulated Provisions for Capital Assets', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70123, 'ENG-BASE', 'CAPIT', 'XXXXXX', '143', '70121', 'Regulated inventory provisions', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70124, 'ENG-BASE', 'CAPIT', 'XXXXXX', '144', '70121', 'Regulated provisions for other assets', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70125, 'ENG-BASE', 'CAPIT', 'XXXXXX', '145', '70121', 'Accelerated depreciation', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70126, 'ENG-BASE', 'CAPIT', 'XXXXXX', '146', '70121', 'Special Revaluation Provision', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70127, 'ENG-BASE', 'CAPIT', 'XXXXXX', '147', '70121', 'Reinvested capital gains', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70128, 'ENG-BASE', 'CAPIT', 'XXXXXX', '148', '70121', 'Other regulated provisions', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70129, 'ENG-BASE', 'CAPIT', 'XXXXXX', '15', '71501', 'Provisions for risks and charges', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70130, 'ENG-BASE', 'CAPIT', 'XXXXXX', '151', '70129', 'Risk provisions', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70131, 'ENG-BASE', 'CAPIT', 'XXXXXX', '153', '70129', 'Provisions for pensions and similar obligations', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70132, 'ENG-BASE', 'CAPIT', 'XXXXXX', '154', '70129', 'Provisions for restructuring', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70133, 'ENG-BASE', 'CAPIT', 'XXXXXX', '155', '70129', 'Provisions for taxes', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70134, 'ENG-BASE', 'CAPIT', 'XXXXXX', '156', '70129', 'Provisions for renewal of fixed assets (concessionary companies)', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70135, 'ENG-BASE', 'CAPIT', 'XXXXXX', '157', '70129', 'Provisions for expenses to be allocated over several financial years', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70136, 'ENG-BASE', 'CAPIT', 'XXXXXX', '158', '70129', 'Other provisions for charges', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70137, 'ENG-BASE', 'CAPIT', 'XXXXXX', '16', '71501', 'Borrowings and similar liabilities', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70138, 'ENG-BASE', 'CAPIT', 'XXXXXX', '161', '70137', 'Convertible bonds', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70139, 'ENG-BASE', 'CAPIT', 'XXXXXX', '163', '70137', 'Other bonds', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70140, 'ENG-BASE', 'CAPIT', 'XXXXXX', '164', '70137', 'Borrowings from credit institutions', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70141, 'ENG-BASE', 'CAPIT', 'XXXXXX', '165', '70137', 'Deposits and surety bonds received', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70142, 'ENG-BASE', 'CAPIT', 'XXXXXX', '166', '70137', 'Employee participation in results', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70143, 'ENG-BASE', 'CAPIT', 'XXXXXX', '167', '70137', 'Borrowings and debts with special conditions', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70144, 'ENG-BASE', 'CAPIT', 'XXXXXX', '168', '70137', 'Other borrowings and similar liabilities', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70145, 'ENG-BASE', 'CAPIT', 'XXXXXX', '169', '70137', 'Bond redemption premiums', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70146, 'ENG-BASE', 'CAPIT', 'XXXXXX', '17', '71501', 'Debts related to participations', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70147, 'ENG-BASE', 'CAPIT', 'XXXXXX', '171', '70146', 'Debts related to investments (group)', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70148, 'ENG-BASE', 'CAPIT', 'XXXXXX', '174', '70146', 'Debt related to participations (excluding group)', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70149, 'ENG-BASE', 'CAPIT', 'XXXXXX', '178', '70146', 'Debts related to joint ventures', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70150, 'ENG-BASE', 'CAPIT', 'XXXXXX', '18', '71501', 'Liaison accounts of establishments and joint ventures', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70151, 'ENG-BASE', 'CAPIT', 'XXXXXX', '181', '70150', 'Liaison Accounts of Establishments', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70152, 'ENG-BASE', 'CAPIT', 'XXXXXX', '186', '70150', 'Goods and services exchanged between establishments (charges)', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70153, 'ENG-BASE', 'CAPIT', 'XXXXXX', '187', '70150', 'Goods and services exchanged between establishments (products)', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70154, 'ENG-BASE', 'CAPIT', 'XXXXXX', '188', '70150', 'Joint-venture Liabilities', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70155, 'ENG-BASE', 'IMMO', 'XXXXXX', '20', '71502', 'Intangible assets', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70156, 'ENG-BASE', 'IMMO', 'XXXXXX', '201', '70155', 'Administration fees', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70157, 'ENG-BASE', 'IMMO', 'XXXXXX', '203', '70155', 'Research and development costs', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70158, 'ENG-BASE', 'IMMO', 'XXXXXX', '205', '70155', 'Concessions and similar rights, patents, licenses, trademarks, processes, software, rights and similar values', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70159, 'ENG-BASE', 'IMMO', 'XXXXXX', '206', '70155', 'Right to lease', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70160, 'ENG-BASE', 'IMMO', 'XXXXXX', '207', '70155', 'Commercial funds', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70161, 'ENG-BASE', 'IMMO', 'XXXXXX', '208', '70155', 'Other intangible assets', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70162, 'ENG-BASE', 'IMMO', 'XXXXXX', '21', '71502', 'Property, plant and equipment', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70163, 'ENG-BASE', 'IMMO', 'XXXXXX', '211', '70162', 'Grounds', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70164, 'ENG-BASE', 'IMMO', 'XXXXXX', '212', '70162', 'Fittings and landscaping', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70165, 'ENG-BASE', 'IMMO', 'XXXXXX', '213', '70162', 'Constructions', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70166, 'ENG-BASE', 'IMMO', 'XXXXXX', '214', '70162', 'Constructions on the ground of others', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70167, 'ENG-BASE', 'IMMO', 'XXXXXX', '215', '70162', 'Industrial installations, equipment and tools', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70168, 'ENG-BASE', 'IMMO', 'XXXXXX', '218', '70162', 'Other tangible fixed assets', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70169, 'ENG-BASE', 'IMMO', 'XXXXXX', '22', '71502', 'Assets under concession', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70170, 'ENG-BASE', 'IMMO', 'XXXXXX', '23', '71502', 'Assets in progress', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70171, 'ENG-BASE', 'IMMO', 'XXXXXX', '231', '70170', 'investments in progress', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70172, 'ENG-BASE', 'IMMO', 'XXXXXX', '232', '70170', 'Intangible assets in progress', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70173, 'ENG-BASE', 'IMMO', 'XXXXXX', '237', '70170', 'Advances and advances paid on intangible assets', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70174, 'ENG-BASE', 'IMMO', 'XXXXXX', '238', '70170', 'Advances and payments on orders for property, plant and equipment', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70175, 'ENG-BASE', 'IMMO', 'XXXXXX', '25', '71502', 'Shares in affiliated undertakings and claims on affiliated undertakings', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70176, 'ENG-BASE', 'IMMO', 'XXXXXX', '26', '71502', 'Investments and receivables from investments', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70177, 'ENG-BASE', 'IMMO', 'XXXXXX', '261', '70176', 'Equity securities', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70178, 'ENG-BASE', 'IMMO', 'XXXXXX', '266', '70176', 'Other forms of participation', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70179, 'ENG-BASE', 'IMMO', 'XXXXXX', '267', '70176', 'Receivables related to equity investments', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70180, 'ENG-BASE', 'IMMO', 'XXXXXX', '268', '70176', 'Receivables from joint ventures', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70181, 'ENG-BASE', 'IMMO', 'XXXXXX', '269', '70176', 'Payments still to be made on non-paid equity securities', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70182, 'ENG-BASE', 'IMMO', 'XXXXXX', '27', '71502', 'Other financial assets', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70183, 'ENG-BASE', 'IMMO', 'XXXXXX', '271', '70183', 'Fixed assets other than fixed assets of the portfolio business (ownership)', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70184, 'ENG-BASE', 'IMMO', 'XXXXXX', '272', '70183', 'Locked-in securities (debt)', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70185, 'ENG-BASE', 'IMMO', 'XXXXXX', '273', '70183', 'Fixed assets from portfolio activity', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70186, 'ENG-BASE', 'IMMO', 'XXXXXX', '274', '70183', 'Loans', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70187, 'ENG-BASE', 'IMMO', 'XXXXXX', '275', '70183', 'Deposits paid', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70188, 'ENG-BASE', 'IMMO', 'XXXXXX', '276', '70183', 'Other receivables', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70189, 'ENG-BASE', 'IMMO', 'XXXXXX', '277', '70183', 'Treasury shares or own shares', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70190, 'ENG-BASE', 'IMMO', 'XXXXXX', '279', '70183', 'Payments still to be made on non-paid-up capital securities', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70191, 'ENG-BASE', 'IMMO', 'XXXXXX', '28', '71502', 'Amortization of fixed assets', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70192, 'ENG-BASE', 'IMMO', 'XXXXXX', '280', '70191', 'Amortization of intangible assets', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70193, 'ENG-BASE', 'IMMO', 'XXXXXX', '281', '70191', 'Amortization of property, plant and equipment', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70194, 'ENG-BASE', 'IMMO', 'XXXXXX', '282', '70191', 'Amortization of concession assets', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70195, 'ENG-BASE', 'IMMO', 'XXXXXX', '29', '71502', 'Impairment of fixed assets', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70196, 'ENG-BASE', 'IMMO', 'XXXXXX', '290', '70195', 'Impairment of intangible assets', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70197, 'ENG-BASE', 'IMMO', 'XXXXXX', '291', '70195', 'Impairment of property, plant and equipment', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70198, 'ENG-BASE', 'IMMO', 'XXXXXX', '292', '70195', 'Impairment of fixed assets under concession', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70199, 'ENG-BASE', 'IMMO', 'XXXXXX', '293', '70195', 'Impairment of fixed assets', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70200, 'ENG-BASE', 'IMMO', 'XXXXXX', '296', '70195', 'Provisions for impairment of investments and receivables from investments', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70201, 'ENG-BASE', 'IMMO', 'XXXXXX', '297', '70195', 'Provisions for impairment of other long-term investments', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70202, 'ENG-BASE', 'STOCK', 'XXXXXX', '31', '71503', 'Raw materials (and supplies)', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70203, 'ENG-BASE', 'STOCK', 'XXXXXX', '311', '70202', 'Subjects (or group) A', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70204, 'ENG-BASE', 'STOCK', 'XXXXXX', '312', '70202', 'Subjects (or group) B', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70205, 'ENG-BASE', 'STOCK', 'XXXXXX', '317', '70202', 'Supplies A, B, C,', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70206, 'ENG-BASE', 'STOCK', 'XXXXXX', '32', '71503', 'Other supplies', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70207, 'ENG-BASE', 'STOCK', 'XXXXXX', '321', '70206', 'Consumable Materials', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70208, 'ENG-BASE', 'STOCK', 'XXXXXX', '322', '70206', 'Supplies', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70209, 'ENG-BASE', 'STOCK', 'XXXXXX', '326', '70206', 'Packaging', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70210, 'ENG-BASE', 'STOCK', 'XXXXXX', '33', '71503', 'Ongoing production of goods', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70211, 'ENG-BASE', 'STOCK', 'XXXXXX', '331', '70210', 'Products in Progress', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70212, 'ENG-BASE', 'STOCK', 'XXXXXX', '335', '70210', 'Work in progress', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70213, 'ENG-BASE', 'STOCK', 'XXXXXX', '34', '71503', 'On-going production of services', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70214, 'ENG-BASE', 'STOCK', 'XXXXXX', '341', '70213', 'Ongoing studies', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70215, 'ENG-BASE', 'STOCK', 'XXXXXX', '345', '70213', 'Ongoing services', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70216, 'ENG-BASE', 'STOCK', 'XXXXXX', '35', '71503', 'Stocks of products', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70217, 'ENG-BASE', 'STOCK', 'XXXXXX', '351', '70216', 'Intermediate products', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70218, 'ENG-BASE', 'STOCK', 'XXXXXX', '355', '70216', 'Finished products', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70219, 'ENG-BASE', 'STOCK', 'XXXXXX', '358', '70216', 'Residual products (or recovered materials)', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70220, 'ENG-BASE', 'STOCK', 'XXXXXX', '37', '71503', 'Stocks of goods', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70221, 'ENG-BASE', 'STOCK', 'XXXXXX', '371', '70220', 'Goods (or group) A', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70222, 'ENG-BASE', 'STOCK', 'XXXXXX', '372', '70220', 'Goods (or group) B', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70223, 'ENG-BASE', 'STOCK', 'XXXXXX', '39', '1503', 'Provisions for depreciation of inventories and work in progress', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70224, 'ENG-BASE', 'STOCK', 'XXXXXX', '391', '70223', 'Provisions for depreciation of raw materials', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70225, 'ENG-BASE', 'STOCK', 'XXXXXX', '392', '70223', 'Provisions for depreciation of other supplies', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70226, 'ENG-BASE', 'STOCK', 'XXXXXX', '393', '70223', 'Provisions for depreciation of work in progress', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70227, 'ENG-BASE', 'STOCK', 'XXXXXX', '394', '70223', 'Provisions for depreciation of work in process', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70228, 'ENG-BASE', 'STOCK', 'XXXXXX', '395', '70223', 'Provisions for depreciation of inventories of products', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70229, 'ENG-BASE', 'STOCK', 'XXXXXX', '397', '70223', 'Provisions for depreciation of inventories of goods', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70230, 'ENG-BASE', 'TIERS', 'XXXXXX', '40', '71504', 'Accounts payable', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70231, 'ENG-BASE', 'TIERS', 'XXXXXX', '400', '70230', 'Accounts payable', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70232, 'ENG-BASE', 'TIERS', 'SUPPLIER', '401', '70230', 'Suppliers', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70233, 'ENG-BASE', 'TIERS', 'XXXXXX', '403', '70230', 'Suppliers - Payables', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70234, 'ENG-BASE', 'TIERS', 'XXXXXX', '404', '70230', 'Suppliers of fixed assets', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70235, 'ENG-BASE', 'TIERS', 'XXXXXX', '405', '70230', 'Capital Suppliers - Payables', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70236, 'ENG-BASE', 'TIERS', 'XXXXXX', '408', '70230', 'Supplier invoices not yet received', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70237, 'ENG-BASE', 'TIERS', 'XXXXXX', '409', '70230', 'Debtors suppliers', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70238, 'ENG-BASE', 'TIERS', 'XXXXXX', '41', '71504', 'Accounts receivable', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70239, 'ENG-BASE', 'TIERS', 'XXXXXX', '410', '70238', 'Customers and Related Accounts', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70240, 'ENG-BASE', 'TIERS', 'CUSTOMER', '411', '70238', 'Customers', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70241, 'ENG-BASE', 'TIERS', 'XXXXXX', '413', '70238', 'Accounts Receivable', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70242, 'ENG-BASE', 'TIERS', 'XXXXXX', '416', '70238', 'Doubtful or contentious customers', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70243, 'ENG-BASE', 'TIERS', 'XXXXXX', '418', '70238', 'Customers - Products not yet billed', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70244, 'ENG-BASE', 'TIERS', 'XXXXXX', '419', '70238', 'Accounts payable', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70245, 'ENG-BASE', 'TIERS', 'XXXXXX', '42', '71504', 'Personnel and related accounts', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70246, 'ENG-BASE', 'TIERS', 'XXXXXX', '421', '70245', 'Staff - Remuneration due', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70247, 'ENG-BASE', 'TIERS', 'XXXXXX', '422', '70245', 'Works councils, establishment, ...', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70248, 'ENG-BASE', 'TIERS', 'XXXXXX', '424', '70245', 'Employee participation in results', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70249, 'ENG-BASE', 'TIERS', 'XXXXXX', '425', '70245', 'Staff - Advances and Advances', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70250, 'ENG-BASE', 'TIERS', 'XXXXXX', '426', '70245', 'Staff - Deposits', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70251, 'ENG-BASE', 'TIERS', 'XXXXXX', '427', '70245', 'Staff - Oppositions', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70252, 'ENG-BASE', 'TIERS', 'XXXXXX', '428', '70245', 'Personnel - Accrued expenses and accrued income', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70253, 'ENG-BASE', 'TIERS', 'XXXXXX', '43', '71504', 'Social security and other social organizations', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70254, 'ENG-BASE', 'TIERS', 'XXXXXX', '431', '70253', 'Social Security', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70255, 'ENG-BASE', 'TIERS', 'XXXXXX', '437', '70253', 'Other social organizations', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70256, 'ENG-BASE', 'TIERS', 'XXXXXX', '438', '70253', 'Social organizations - Accrued expenses and accrued income', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70257, 'ENG-BASE', 'TIERS', 'XXXXXX', '44', '71504', 'State and other public authorities', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70258, 'ENG-BASE', 'TIERS', 'XXXXXX', '441', '70257', 'Status - Grants Receivable', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70259, 'ENG-BASE', 'TIERS', 'XXXXXX', '442', '70257', 'Statement - Taxes and taxes recoverable on third parties', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70260, 'ENG-BASE', 'TIERS', 'XXXXXX', '443', '70257', 'Special operations with the State, public authorities, international organizations', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70261, 'ENG-BASE', 'TIERS', 'XXXXXX', '444', '70257', 'State - Income taxes', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70262, 'ENG-BASE', 'TIERS', 'XXXXXX', '445', '70257', 'State - Taxes on turnover', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70263, 'ENG-BASE', 'TIERS', 'XXXXXX', '446', '70257', 'Bonded Bonds', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70264, 'ENG-BASE', 'TIERS', 'XXXXXX', '447', '70257', 'Other taxes, duties and similar payments', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70265, 'ENG-BASE', 'TIERS', 'XXXXXX', '448', '70257', 'Statement of Accounts Payable and Accrued Income', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70266, 'ENG-BASE', 'TIERS', 'XXXXXX', '449', '70257', 'Emission quotas to be returned to the State', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70267, 'ENG-BASE', 'TIERS', 'XXXXXX', '45', '71504', 'Group and Associates', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70268, 'ENG-BASE', 'TIERS', 'XXXXXX', '451', '70267', 'Group', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70269, 'ENG-BASE', 'TIERS', 'XXXXXX', '455', '70267', 'Associates - Current Accounts', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70270, 'ENG-BASE', 'TIERS', 'XXXXXX', '456', '70267', 'Associates - Capital transactions', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70271, 'ENG-BASE', 'TIERS', 'XXXXXX', '457', '70267', 'Associates - Dividends payable', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70272, 'ENG-BASE', 'TIERS', 'XXXXXX', '458', '70267', 'Associates- Joint and EIG Operations', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70273, 'ENG-BASE', 'TIERS', 'XXXXXX', '46', '71504', 'Miscellaneous receivables and creditors', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70274, 'ENG-BASE', 'TIERS', 'XXXXXX', '462', '70273', 'Receivables on disposals of fixed assets', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70275, 'ENG-BASE', 'TIERS', 'XXXXXX', '464', '70273', 'Debts on acquisitions of marketable securities', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70276, 'ENG-BASE', 'TIERS', 'XXXXXX', '465', '70273', 'Receivables on disposals of marketable securities', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70277, 'ENG-BASE', 'TIERS', 'XXXXXX', '467', '70273', 'Other accounts receivable or payable', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70278, 'ENG-BASE', 'TIERS', 'XXXXXX', '468', '70273', 'Miscellaneous - Accrued expenses and accrued income', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70279, 'ENG-BASE', 'TIERS', 'XXXXXX', '47', '71504', 'Transition or suspense accounts', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70280, 'ENG-BASE', 'TIERS', 'XXXXXX', '471', '70279', 'Waiting Accounts', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70281, 'ENG-BASE', 'TIERS', 'XXXXXX', '476', '70279', 'Conversion Difference - Assets', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70282, 'ENG-BASE', 'TIERS', 'XXXXXX', '477', '70279', 'Translation differences - Liabilities', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70283, 'ENG-BASE', 'TIERS', 'XXXXXX', '478', '70279', 'Other transitional accounts', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70284, 'ENG-BASE', 'TIERS', 'XXXXXX', '48', '71504', 'regularisation account', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70285, 'ENG-BASE', 'TIERS', 'XXXXXX', '481', '70284', 'Expenses to be spread over several financial years', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70286, 'ENG-BASE', 'TIERS', 'XXXXXX', '486', '70284', 'Prepaid expenses', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70287, 'ENG-BASE', 'TIERS', 'XXXXXX', '487', '70284', 'Deferred income', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70288, 'ENG-BASE', 'TIERS', 'XXXXXX', '488', '70284', 'Accounts for the periodic distribution of expenses and revenues', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70289, 'ENG-BASE', 'TIERS', 'XXXXXX', '489', '70284', 'Emission allowances allocated by the State', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70290, 'ENG-BASE', 'TIERS', 'XXXXXX', '49', '71504', 'Provisions for depreciation of third party accounts', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70291, 'ENG-BASE', 'TIERS', 'XXXXXX', '491', '70290', 'Provisions for depreciation of customer accounts', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70292, 'ENG-BASE', 'TIERS', 'XXXXXX', '495', '70290', 'Provisions for impairment of group and associate accounts', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70293, 'ENG-BASE', 'TIERS', 'XXXXXX', '496', '70290', 'Provisions for depreciation of accounts receivable', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70294, 'ENG-BASE', 'FINAN', 'XXXXXX', '50', '71505', 'Marketable securities', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70295, 'ENG-BASE', 'FINAN', 'XXXXXX', '501', '70294', 'Shares in related companies', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70296, 'ENG-BASE', 'FINAN', 'XXXXXX', '502', '70294', 'Treasury shares', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70297, 'ENG-BASE', 'FINAN', 'XXXXXX', '503', '70294', 'Stock', 0, NULL, 1, 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70298, 'ENG-BASE', 'FINAN', 'XXXXXX', '504', '70294', 'Other titles conferring a right of ownership', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70299, 'ENG-BASE', 'FINAN', 'XXXXXX', '505', '70294', 'Bonds and bonds issued by the company and repurchased by it', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70300, 'ENG-BASE', 'FINAN', 'XXXXXX', '506', '70294', 'Obligations', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70301, 'ENG-BASE', 'FINAN', 'XXXXXX', '507', '70294', 'Treasury bills and short-term bills', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70302, 'ENG-BASE', 'FINAN', 'XXXXXX', '508', '70294', 'Other marketable securities and other assimilated claims', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70303, 'ENG-BASE', 'FINAN', 'XXXXXX', '509', '70294', 'Payments still to be made on undistributed investment securities', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70304, 'ENG-BASE', 'FINAN', 'XXXXXX', '51', '71505', 'Banks, financial institutions and the like', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70305, 'ENG-BASE', 'FINAN', 'XXXXXX', '511', '70304', 'Cash values', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70306, 'ENG-BASE', 'FINAN', 'BANK', '512', '70304', 'Banks', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70307, 'ENG-BASE', 'FINAN', 'XXXXXX', '514', '70304', 'Postal checks', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70308, 'ENG-BASE', 'FINAN', 'XXXXXX', '515', '70304', '\"Caisses\" of the Treasury and public institutions', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70309, 'ENG-BASE', 'FINAN', 'XXXXXX', '516', '70304', 'Exchange companies', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70310, 'ENG-BASE', 'FINAN', 'XXXXXX', '517', '70304', 'Other financial institutions', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70311, 'ENG-BASE', 'FINAN', 'XXXXXX', '518', '70304', 'Accrued interest', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70312, 'ENG-BASE', 'FINAN', 'XXXXXX', '519', '70304', 'Bank overdrafts', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70313, 'ENG-BASE', 'FINAN', 'XXXXXX', '52', '71505', 'Treasury instruments', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70314, 'ENG-BASE', 'FINAN', 'CASH', '53', '71505', 'Checkout', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70315, 'ENG-BASE', 'FINAN', 'XXXXXX', '531', '70314', 'Head Office', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70316, 'ENG-BASE', 'FINAN', 'XXXXXX', '532', '70314', 'Cash box (or factory) A', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70317, 'ENG-BASE', 'FINAN', 'XXXXXX', '533', '70314', 'Cash box (or factory) B', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70318, 'ENG-BASE', 'FINAN', 'XXXXXX', '54', '71505', 'Advance and Flow-Through', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70319, 'ENG-BASE', 'FINAN', 'XXXXXX', '58', '71505', 'Internal transfers', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70320, 'ENG-BASE', 'FINAN', 'XXXXXX', '59', '71505', 'Provisions for impairment of financial accounts', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70321, 'ENG-BASE', 'FINAN', 'XXXXXX', '590', '70320', 'Provisions for depreciation of marketable securities', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70322, 'ENG-BASE', 'CHARGE', 'PRODUCT', '60', '71506', 'Shopping', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70323, 'ENG-BASE', 'CHARGE', 'XXXXXX', '601', '70322', 'Stored Procurement - Raw Materials (and Supplies)', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70324, 'ENG-BASE', 'CHARGE', 'XXXXXX', '602', '70322', 'Stored Procurement - Other Supplies', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70325, 'ENG-BASE', 'CHARGE', 'XXXXXX', '603', '70322', 'Inventory Changes (Supplies and Commodities)', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70326, 'ENG-BASE', 'CHARGE', 'XXXXXX', '604', '70322', 'Stored Procurement - Raw Materials (and Supplies)', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70327, 'ENG-BASE', 'CHARGE', 'XXXXXX', '605', '70322', 'Purchase of equipment, works and equipment', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70328, 'ENG-BASE', 'CHARGE', 'XXXXXX', '606', '70322', 'Non-stock purchases of materials and supplies', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70329, 'ENG-BASE', 'CHARGE', 'XXXXXX', '607', '70322', 'Purchases of goods', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70330, 'ENG-BASE', 'CHARGE', 'XXXXXX', '608', '70322', 'Reserved account, where applicable, to the recapitulation of incidental expenses included in purchases', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70331, 'ENG-BASE', 'CHARGE', 'XXXXXX', '609', '70322', 'Discounts, rebates and rebates obtained on purchases', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70332, 'ENG-BASE', 'CHARGE', 'SERVICE', '61', '71506', 'Outside services', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70333, 'ENG-BASE', 'CHARGE', 'XXXXXX', '611', '70332', 'General subcontracting', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70334, 'ENG-BASE', 'CHARGE', 'XXXXXX', '612', '70332', 'Lease payments', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70335, 'ENG-BASE', 'CHARGE', 'XXXXXX', '613', '70332', 'Rentals', 0, NULL, 1, 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70336, 'ENG-BASE', 'CHARGE', 'XXXXXX', '614', '70332', 'Rental and condominium expenses', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70337, 'ENG-BASE', 'CHARGE', 'XXXXXX', '615', '70332', 'Maintenance and repairs', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70338, 'ENG-BASE', 'CHARGE', 'XXXXXX', '616', '70332', 'Insurance premiums', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70339, 'ENG-BASE', 'CHARGE', 'XXXXXX', '617', '70332', 'Studies and research', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70340, 'ENG-BASE', 'CHARGE', 'XXXXXX', '618', '70332', 'Various', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70341, 'ENG-BASE', 'CHARGE', 'XXXXXX', '619', '70332', 'Discounts, rebates and rebates obtained on external services', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70342, 'ENG-BASE', 'CHARGE', 'XXXXXX', '62', '71506', 'Other services', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70343, 'ENG-BASE', 'CHARGE', 'XXXXXX', '621', '70342', 'Staff outside the company', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70344, 'ENG-BASE', 'CHARGE', 'XXXXXX', '622', '70342', 'Remuneration of intermediaries and fees', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70345, 'ENG-BASE', 'CHARGE', 'XXXXXX', '623', '70342', 'Advertising, publications, public relations', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70346, 'ENG-BASE', 'CHARGE', 'XXXXXX', '624', '70342', 'Transport of goods and public transport of personnel', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70347, 'ENG-BASE', 'CHARGE', 'XXXXXX', '625', '70342', 'Travel, missions and receptions', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70348, 'ENG-BASE', 'CHARGE', 'XXXXXX', '626', '70342', 'Postal and telecommunications costs', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70349, 'ENG-BASE', 'CHARGE', 'XXXXXX', '627', '70342', 'Banking and related services', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70350, 'ENG-BASE', 'CHARGE', 'XXXXXX', '628', '70342', 'Various', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70351, 'ENG-BASE', 'CHARGE', 'XXXXXX', '629', '70342', 'Discounts, rebates and rebates obtained on other external services', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70352, 'ENG-BASE', 'CHARGE', 'XXXXXX', '63', '71506', 'Taxes other and payments', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70353, 'ENG-BASE', 'CHARGE', 'XXXXXX', '631', '70352', 'Taxes and similar payments on remuneration (tax administrations)', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70354, 'ENG-BASE', 'CHARGE', 'XXXXXX', '633', '70352', 'Taxes and similar payments on remuneration (other bodies)', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70355, 'ENG-BASE', 'CHARGE', 'XXXXXX', '635', '70352', 'Other taxes, duties and similar payments (tax administrations)', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70356, 'ENG-BASE', 'CHARGE', 'XXXXXX', '637', '70352', 'Other taxes, duties and similar payments (other bodies)', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70357, 'ENG-BASE', 'CHARGE', 'XXXXXX', '64', '71506', 'Staff costs', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70358, 'ENG-BASE', 'CHARGE', 'XXXXXX', '641', '70357', 'Remuneration of staff', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70359, 'ENG-BASE', 'CHARGE', 'XXXXXX', '644', '70357', 'Remuneration of the operator''s work', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70360, 'ENG-BASE', 'CHARGE', 'SOCIAL', '645', '70357', 'Social Security and Welfare Expenses', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70361, 'ENG-BASE', 'CHARGE', 'XXXXXX', '646', '70357', 'Personal social contributions of the operator', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70362, 'ENG-BASE', 'CHARGE', 'XXXXXX', '647', '70357', 'Other payroll taxes', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70363, 'ENG-BASE', 'CHARGE', 'XXXXXX', '648', '70357', 'Other staff costs', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70364, 'ENG-BASE', 'CHARGE', 'XXXXXX', '65', '71506', 'Other current operating expenses', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70365, 'ENG-BASE', 'CHARGE', 'XXXXXX', '651', '70364', 'Royalties for concessions, patents, licenses, trademarks, processes, software, rights and similar values', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70366, 'ENG-BASE', 'CHARGE', 'XXXXXX', '653', '70364', 'Attendance fees', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70367, 'ENG-BASE', 'CHARGE', 'XXXXXX', '654', '70364', 'Loss on bad debts', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70368, 'ENG-BASE', 'CHARGE', 'XXXXXX', '655', '70364', 'Share of profit or loss on transactions made jointly', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70369, 'ENG-BASE', 'CHARGE', 'XXXXXX', '658', '70364', 'Miscellaneous operating expenses', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70370, 'ENG-BASE', 'CHARGE', 'XXXXXX', '66', '71506', 'Financial expenses', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70371, 'ENG-BASE', 'CHARGE', 'XXXXXX', '661', '70370', 'Interest charges', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70372, 'ENG-BASE', 'CHARGE', 'XXXXXX', '664', '70370', 'Loss on receivables related to investments', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70373, 'ENG-BASE', 'CHARGE', 'XXXXXX', '665', '70370', 'Discounts granted', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70374, 'ENG-BASE', 'CHARGE', 'XXXXXX', '666', '70370', 'Exchange losses', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70375, 'ENG-BASE', 'CHARGE', 'XXXXXX', '667', '70370', 'Net expense on disposals of marketable securities', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70376, 'ENG-BASE', 'CHARGE', 'XXXXXX', '668', '70370', 'Other financial expenses', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70377, 'ENG-BASE', 'CHARGE', 'XXXXXX', '67', '71506', 'Extraordinary charges', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70378, 'ENG-BASE', 'CHARGE', 'XXXXXX', '671', '70377', 'Exceptional charges on management operations', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70379, 'ENG-BASE', 'CHARGE', 'XXXXXX', '672', '70377', 'Account available to entities to record, in the course of the financial year, expenses over previous financial years', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70380, 'ENG-BASE', 'CHARGE', 'XXXXXX', '675', '70377', 'Book value of assets sold', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70381, 'ENG-BASE', 'CHARGE', 'XXXXXX', '678', '70377', 'Other extraordinary expenses', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70382, 'ENG-BASE', 'CHARGE', 'XXXXXX', '68', '71506', 'Depreciation, amortization and provisions', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70383, 'ENG-BASE', 'CHARGE', 'XXXXXX', '681', '70382', 'Depreciation, amortization and provisions - Operating expenses', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70384, 'ENG-BASE', 'CHARGE', 'XXXXXX', '686', '70382', 'Depreciation, amortization and provisions - Financial expense', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70385, 'ENG-BASE', 'CHARGE', 'XXXXXX', '687', '70382', 'Depreciation, amortization and provisions - Extraordinary expenses', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70386, 'ENG-BASE', 'CHARGE', 'XXXXXX', '69', '71506', 'Employee participation - income tax and assimilated', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70387, 'ENG-BASE', 'CHARGE', 'XXXXXX', '691', '70386', 'Employee participation in results', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70388, 'ENG-BASE', 'CHARGE', 'XXXXXX', '695', '70386', 'Income taxes', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70389, 'ENG-BASE', 'CHARGE', 'XXXXXX', '696', '70386', 'Corporate income tax related to distributions', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70390, 'ENG-BASE', 'CHARGE', 'XXXXXX', '697', '70386', 'Annual corporation tax', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70391, 'ENG-BASE', 'CHARGE', 'XXXXXX', '698', '70386', 'Tax integration', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70392, 'ENG-BASE', 'CHARGE', 'XXXXXX', '699', '70386', 'Products - Reports back deficits', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70393, 'ENG-BASE', 'PROD', 'XXXXXX', '70', '71507', 'Sales of manufactured goods, services, goods', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70394, 'ENG-BASE', 'PROD', 'PRODUCT', '701', '70393', 'Sales of finished products', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70395, 'ENG-BASE', 'PROD', 'XXXXXX', '702', '70393', 'Sales of intermediate products', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70396, 'ENG-BASE', 'PROD', 'XXXXXX', '703', '70393', 'Sales of residual products', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70397, 'ENG-BASE', 'PROD', 'XXXXXX', '704', '70393', 'Works', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70398, 'ENG-BASE', 'PROD', 'XXXXXX', '705', '70393', 'Studies', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70399, 'ENG-BASE', 'PROD', 'SERVICE', '706', '70393', 'Services', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70400, 'ENG-BASE', 'PROD', 'PRODUCT', '707', '70393', 'Sale of goods', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70401, 'ENG-BASE', 'PROD', 'PRODUCT', '708', '70393', 'Income from ancillary activities', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70402, 'ENG-BASE', 'PROD', 'XXXXXX', '709', '70393', 'Discounts, rebates and rebates granted by the company', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70403, 'ENG-BASE', 'PROD', 'XXXXXX', '71', '71507', 'Stored production (or destocking)', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70404, 'ENG-BASE', 'PROD', 'XXXXXX', '713', '70403', 'Change in stocks (in-process production, products)', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70405, 'ENG-BASE', 'PROD', 'XXXXXX', '72', '71507', 'Immobilised production', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70406, 'ENG-BASE', 'PROD', 'XXXXXX', '721', '70405', 'Intangible assets', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70407, 'ENG-BASE', 'PROD', 'XXXXXX', '722', '70405', 'Property, plant and equipment', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70408, 'ENG-BASE', 'PROD', 'XXXXXX', '74', '71507', 'Operating grants', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70409, 'ENG-BASE', 'PROD', 'XXXXXX', '75', '71507', 'Other management products', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70410, 'ENG-BASE', 'PROD', 'XXXXXX', '751', '70409', 'Royalties for concessions, patents, licenses, trademarks, processes, software, rights and similar values', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70411, 'ENG-BASE', 'PROD', 'XXXXXX', '752', '70409', 'Income from buildings not used for professional purposes', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70412, 'ENG-BASE', 'PROD', 'XXXXXX', '753', '70409', 'Directors'' fees and remuneration of directors, managers, ...', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70413, 'ENG-BASE', 'PROD', 'XXXXXX', '754', '70409', 'Perceived refunds of cooperatives (from surplus)', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70414, 'ENG-BASE', 'PROD', 'XXXXXX', '755', '70409', 'Share of profits on transactions made jointly', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70415, 'ENG-BASE', 'PROD', 'XXXXXX', '758', '70409', 'Miscellaneous current management products', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70416, 'ENG-BASE', 'PROD', 'XXXXXX', '76', '71507', 'Financial products', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70417, 'ENG-BASE', 'PROD', 'XXXXXX', '761', '70416', 'Income from participations', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70418, 'ENG-BASE', 'PROD', 'XXXXXX', '762', '70416', 'Income from other financial assets', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70419, 'ENG-BASE', 'PROD', 'XXXXXX', '763', '70416', 'Revenue from other receivables', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70420, 'ENG-BASE', 'PROD', 'XXXXXX', '764', '70416', 'Income from marketable securities', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70421, 'ENG-BASE', 'PROD', 'XXXXXX', '765', '70416', 'Discounts obtained', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70422, 'ENG-BASE', 'PROD', 'XXXXXX', '766', '70416', 'Exchange gains', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70423, 'ENG-BASE', 'PROD', 'XXXXXX', '767', '70416', 'Net proceeds on disposals of marketable securities', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70424, 'ENG-BASE', 'PROD', 'XXXXXX', '768', '70416', 'Other financial income', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70425, 'ENG-BASE', 'PROD', 'XXXXXX', '77', '71507', 'Exceptional products', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70426, 'ENG-BASE', 'PROD', 'XXXXXX', '771', '70425', 'Extraordinary income from management operations', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70427, 'ENG-BASE', 'PROD', 'XXXXXX', '772', '70425', 'Account available to entities to record, during the financial year, the revenues over previous financial years', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70428, 'ENG-BASE', 'PROD', 'XXXXXX', '775', '70425', 'Proceeds from disposals of assets', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70429, 'ENG-BASE', 'PROD', 'XXXXXX', '777', '70425', 'Share of investment grants transferred to profit or loss for the year', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70430, 'ENG-BASE', 'PROD', 'XXXXXX', '778', '70425', 'Other extraordinary income', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70431, 'ENG-BASE', 'PROD', 'XXXXXX', '78', '71507', 'Reversals of depreciation and provisions', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70432, 'ENG-BASE', 'PROD', 'XXXXXX', '781', '70431', 'Reversals of depreciation and provisions (to be included in revenue)', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70433, 'ENG-BASE', 'PROD', 'XXXXXX', '786', '70431', 'Reversals of provisions for risks (to be recorded in financial income)', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70434, 'ENG-BASE', 'PROD', 'XXXXXX', '787', '70431', 'Reversals of provisions (to be recorded in exceptional income)', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70435, 'ENG-BASE', 'PROD', 'XXXXXX', '79', '71507', 'Transfers of charges', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70436, 'ENG-BASE', 'PROD', 'XXXXXX', '791', '70435', 'Transfers of operating expenses', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70437, 'ENG-BASE', 'PROD', 'XXXXXX', '796', '70435', 'Transfers of financial expenses', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70438, 'ENG-BASE', 'PROD', 'XXXXXX', '797', '70435', 'Transfers of Exceptional Charges', 1); From e6ffaa0f8bfe00fab69b585083617cc4ebbb3795 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Jan 2018 16:41:45 +0100 Subject: [PATCH 0111/1074] Fix option MAIN_SHOW_TECHNICAL_ID --- htdocs/adherents/list.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php index 6b41a217f80..a01cc379b3c 100644 --- a/htdocs/adherents/list.php +++ b/htdocs/adherents/list.php @@ -401,7 +401,7 @@ print ''; // Line numbering -if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) +if (! empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) { print ''; } @@ -552,10 +552,7 @@ print ''; print "\n"; print ''; -if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) -{ - print ''; -} +if (! empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) print_liste_field_titre("ID",$_SERVER["PHP_SELF"],'','',$param,'align="center"',$sortfield,$sortorder); if (! empty($arrayfields['d.ref']['checked'])) print_liste_field_titre($arrayfields['d.ref']['label'],$_SERVER["PHP_SELF"],'d.rowid','',$param,'',$sortfield,$sortorder); if (! empty($arrayfields['d.firstname']['checked'])) print_liste_field_titre($arrayfields['d.firstname']['label'],$_SERVER["PHP_SELF"],'d.firstname','',$param,'',$sortfield,$sortorder); if (! empty($arrayfields['d.lastname']['checked'])) print_liste_field_titre($arrayfields['d.lastname']['label'],$_SERVER["PHP_SELF"],'d.lastname','',$param,'',$sortfield,$sortorder); @@ -611,9 +608,9 @@ while ($i < min($num, $limit)) print ''; - if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) + if (! empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) { - print ''; + print ''; } // Ref From 82fcf3cbdba6bce3cca0b6a6c148ebf8d95cc0be Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Jan 2018 16:53:59 +0100 Subject: [PATCH 0112/1074] CSS --- htdocs/theme/eldy/style.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index dafa39c9ce1..ebbadc259f7 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1163,7 +1163,7 @@ div.fiche { div.fiche { margin-: dol_optimize_smallscreen)?'25':'6')); ?>px; - margin-: dol_optimize_smallscreen)?'25':'6')); ?>px; + margin-: dol_optimize_smallscreen)?'24':'6')); ?>px; dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'."\n"; ?> dol_hide_leftmenu)) print 'margin-bottom: 12px;'."\n"; ?> } From 2812dae3b336d7672bc8a6933b53725d7bcecd1a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Jan 2018 18:28:47 +0100 Subject: [PATCH 0113/1074] Fix website in multicompany mode --- htdocs/website/class/website.class.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php index d72ffbb4731..432851b4bd4 100644 --- a/htdocs/website/class/website.class.php +++ b/htdocs/website/class/website.class.php @@ -215,10 +215,11 @@ class Website extends CommonObject $sql .= " t.date_creation,"; $sql .= " t.tms as date_modification"; $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t'; + $sql .= ' WHERE t.entity IN ('.getEntity('website').')'; if (null !== $ref) { - $sql .= " WHERE t.ref = '" . $this->db->escape($ref) . "'"; + $sql .= " AND t.ref = '" . $this->db->escape($ref) . "'"; } else { - $sql .= ' WHERE t.rowid = ' . $id; + $sql .= ' AND t.rowid = ' . $id; } $resql = $this->db->query($sql); @@ -304,7 +305,7 @@ class Website extends CommonObject $sql .= " t.date_creation,"; $sql .= " t.tms as date_modification"; $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t'; - + $sql .= ' WHERE t.entity IN ('.getEntity('website').')'; // Manage filter $sqlwhere = array(); if (count($filter) > 0) { @@ -313,7 +314,7 @@ class Website extends CommonObject } } if (count($sqlwhere) > 0) { - $sql .= ' WHERE ' . implode(' '.$filtermode.' ', $sqlwhere); + $sql .= ' AND ' . implode(' '.$filtermode.' ', $sqlwhere); } if (!empty($sortfield)) { From da4417dfc8e6ba02e4bc492352eb4df344bc0042 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Jan 2018 18:33:20 +0100 Subject: [PATCH 0114/1074] Fix website in multicompany mode --- htdocs/admin/website.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php index 1ddac653748..9811052509a 100644 --- a/htdocs/admin/website.php +++ b/htdocs/admin/website.php @@ -76,7 +76,7 @@ $tablib[1] = "Websites"; // Requests to extract data $tabsql=array(); -$tabsql[1] = "SELECT f.rowid as rowid, f.entity, f.ref, f.description, f.virtualhost, f.status FROM ".MAIN_DB_PREFIX."website as f"; +$tabsql[1] = "SELECT f.rowid as rowid, f.entity, f.ref, f.description, f.virtualhost, f.status FROM ".MAIN_DB_PREFIX.'website as f WHERE f.entity IN ('.getEntity('website').')'; // Criteria to sort dictionaries $tabsqlsort=array(); @@ -522,7 +522,6 @@ if ($id) print ''; - // List of websites in database $resql=$db->query($sql); if ($resql) From a92f60416a4868fc54f84b642c8b50425847a671 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Jan 2018 18:52:35 +0100 Subject: [PATCH 0115/1074] Fix permissions --- htdocs/core/tpl/filemanager.tpl.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/tpl/filemanager.tpl.php b/htdocs/core/tpl/filemanager.tpl.php index 826c32a57d6..b60941f4eeb 100644 --- a/htdocs/core/tpl/filemanager.tpl.php +++ b/htdocs/core/tpl/filemanager.tpl.php @@ -45,8 +45,8 @@ if ($module == 'ecm') } if ($module == 'medias') { - $permtoadd = ($user->rights->mailing->creer || $user->rights->website->setup); - $permtoupload = ($user->rights->mailing->creer || $user->rights->website->setup); + $permtoadd = ($user->rights->mailing->creer || $user->rights->website->write); + $permtoupload = ($user->rights->mailing->creer || $user->rights->website->write); } From 280059a3d7a8ee8f0df33a4e001c368b9af3e356 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Jan 2018 18:56:57 +0100 Subject: [PATCH 0116/1074] Fix perm --- htdocs/ecm/dir_add_card.php | 22 ++++++++++++++++++---- htdocs/ecm/search.php | 2 +- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/htdocs/ecm/dir_add_card.php b/htdocs/ecm/dir_add_card.php index f17c061f36a..b6af9a0ae7a 100644 --- a/htdocs/ecm/dir_add_card.php +++ b/htdocs/ecm/dir_add_card.php @@ -18,7 +18,7 @@ */ /** - * \file htdocs/ecm/docdir.php + * \file htdocs/ecm/dir_add_card.php * \ingroup ecm * \brief Main page for ECM section area */ @@ -31,8 +31,6 @@ require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php'; // Load traductions files $langs->loadLangs(array("ecm","companies","other","users","orders","propal","bills","contracts","categories")); -if (! $user->rights->ecm->setup) accessforbidden(); - // Get parameters $socid = GETPOST('socid','int'); $action = GETPOST('action','alpha'); @@ -85,13 +83,29 @@ if (! empty($section)) } } +$permtoadd = 0; +$permtoupload = 0; +if ($module == 'ecm') +{ + $permtoadd = $user->rights->ecm->setup; + $permtoupload = $user->rights->ecm->upload; +} +if ($module == 'medias') +{ + $permtoadd = ($user->rights->mailing->creer || $user->rights->website->write); + $permtoupload = ($user->rights->mailing->creer || $user->rights->website->write); +} + +if (! $permtoadd) accessforbidden(); + + /* * Actions */ // Action ajout d'un produit ou service -if ($action == 'add' && $user->rights->ecm->setup) +if ($action == 'add' && $permtoadd) { if ($cancel) { diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php index 4dbebac97c3..8736de8a544 100644 --- a/htdocs/ecm/search.php +++ b/htdocs/ecm/search.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/ecm/index.php + * \file htdocs/ecm/search.php * \ingroup ecm * \brief Page to make advanced search into ECM */ From 9fd257d2f704988d1306046605f41d14e51d61cf Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Jan 2018 19:38:20 +0100 Subject: [PATCH 0117/1074] Fix rename of dir from filemanager --- htdocs/ecm/dir_add_card.php | 1 + htdocs/ecm/dir_card.php | 155 +++++++++++++++++++++++++++--------- 2 files changed, 117 insertions(+), 39 deletions(-) diff --git a/htdocs/ecm/dir_add_card.php b/htdocs/ecm/dir_add_card.php index b6af9a0ae7a..4389543faa8 100644 --- a/htdocs/ecm/dir_add_card.php +++ b/htdocs/ecm/dir_add_card.php @@ -83,6 +83,7 @@ if (! empty($section)) } } +// Permissions $permtoadd = 0; $permtoupload = 0; if ($module == 'ecm') diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php index 27d1c8b7683..e313787b01f 100644 --- a/htdocs/ecm/dir_card.php +++ b/htdocs/ecm/dir_card.php @@ -73,8 +73,8 @@ if ($module == 'ecm') dol_print_error($db, $ecmdir->error); exit; } - $relativepath=$ecmdir->getRelativePath(); + $relativepath=$ecmdir->getRelativePath(); $upload_dir = $conf->ecm->dir_output.'/'.$relativepath; } else // For example $module == 'medias' @@ -83,6 +83,20 @@ else // For example $module == 'medias' $upload_dir = $conf->medias->multidir_output[$conf->entity].'/'.$relativepath; } +// Permissions +$permtoadd = 0; +$permtoupload = 0; +if ($module == 'ecm') +{ + $permtoadd = $user->rights->ecm->setup; + $permtoupload = $user->rights->ecm->upload; +} +if ($module == 'medias') +{ + $permtoadd = ($user->rights->mailing->creer || $user->rights->website->write); + $permtoupload = ($user->rights->mailing->creer || $user->rights->website->write); +} + /* @@ -165,55 +179,88 @@ if ($action == 'confirm_deletedir' && $confirm == 'yes') } } -// Update description +// Update dirname or description if ($action == 'update' && ! GETPOST('cancel','alpha')) { $error=0; - $db->begin(); + if ($module == 'ecm') + { + $oldlabel=$ecmdir->label; + $olddir=$ecmdir->getRelativePath(0); + $olddir=$conf->ecm->dir_output.'/'.$olddir; + } + else + { + $olddir=GETPOST('section','alpha'); + $olddir=$conf->medias->multidir_output[$conf->entity].'/'.$relativepath; + } - $oldlabel=$ecmdir->label; - $olddir=$ecmdir->getRelativePath(0); - $olddir=$conf->ecm->dir_output.'/'.$olddir; + if ($module == 'ecm') + { + $db->begin(); - // Fetch was already done - $ecmdir->label = dol_sanitizeFileName(GETPOST("label")); - $ecmdir->description = GETPOST("description"); - $result=$ecmdir->update($user); - if ($result > 0) - { - // Try to rename file if changed - if ($oldlabel != $ecmdir->label && file_exists($olddir)) + // Fetch was already done + $ecmdir->label = dol_sanitizeFileName(GETPOST("label")); + $ecmdir->description = GETPOST("description"); + $result=$ecmdir->update($user); + if ($result > 0) { - $newdir=$ecmdir->getRelativePath(1); // return "xxx/zzz/" from ecm directory - $newdir=$conf->ecm->dir_output.'/'.$newdir; - //print $olddir.'-'.$newdir; - $result=@rename($olddir,$newdir); - if (! $result) + // Try to rename file if changed + if ($oldlabel != $ecmdir->label && file_exists($olddir)) { - $langs->load('errors'); - setEventMessages($langs->trans('ErrorFailToRenameDir',$olddir,$newdir), null, 'errors'); - $error++; + $newdir=$ecmdir->getRelativePath(1); // return "xxx/zzz/" from ecm directory + $newdir=$conf->ecm->dir_output.'/'.$newdir; + //print $olddir.'-'.$newdir; + $result=@rename($olddir,$newdir); + if (! $result) + { + $langs->load('errors'); + setEventMessages($langs->trans('ErrorFailToRenameDir',$olddir,$newdir), null, 'errors'); + $error++; + } } - } - if (! $error) - { - $db->commit(); + if (! $error) + { + $db->commit(); - $relativepath=$ecmdir->getRelativePath(); - $upload_dir = $conf->ecm->dir_output.'/'.$relativepath; + // Set new value after renaming + $relativepath=$ecmdir->getRelativePath(); + $upload_dir = $conf->ecm->dir_output.'/'.$relativepath; + } + else + { + $db->rollback(); + } } else { $db->rollback(); + setEventMessages($ecmdir->error, $ecmdir->errors, 'errors'); } - } - else - { - $db->rollback(); - setEventMessages($ecmdir->error, $ecmdir->errors, 'errors'); - } + } + else + { + $newdir = $conf->medias->multidir_output[$conf->entity].'/'.GETPOST('oldrelparentdir','alpha').'/'.GETPOST('label','alpha'); + + $result=@rename($olddir,$newdir); + if (! $result) + { + $langs->load('errors'); + setEventMessages($langs->trans('ErrorFailToRenameDir',$olddir,$newdir), null, 'errors'); + $error++; + } + + if (! $error) + { + // Set new value after renaming + $relativepath=GETPOST('oldrelparentdir','alpha').'/'.GETPOST('label','alpha'); + $upload_dir = $conf->medias->multidir_output[$conf->entity].'/'.$relativepath; + $section = $relativepath; + } + + } } @@ -224,8 +271,12 @@ if ($action == 'update' && ! GETPOST('cancel','alpha')) $form=new Form($db); -$object=new EcmDirectory($db); // Need to create a new one -$object->fetch($ecmdir->id); +$object=new EcmDirectory($db); // Need to create a new one instance + +if ($module == 'ecm') +{ + $object->fetch($ecmdir->id); +} llxHeader(); @@ -285,7 +336,33 @@ if ($module == 'ecm') $morehtmlref = ''.$langs->trans("ECMRoot").' -> '.$s; } +if ($module == 'medias') +{ + $s='medias -> '; + $result = 1; + $subdirs=explode('/', $section); + $i=0; + foreach($subdirs as $subdir) + { + if ($i == (count($subdirs) - 1)) + { + if ($action == 'edit') + { + $s.=''; + $s.=''; + $s.=''; + } + else $s.=$subdir; + } + if ($i < (count($subdirs) - 1)) + { + $s.=$subdir.' -> '; + } + $i++; + } + $morehtmlref = $s; +} dol_banner_tab($object, '', $morehtml, 0, '', '', $morehtmlref); @@ -378,12 +455,12 @@ if ($action != 'edit' && $action != 'delete') { print '
    '; - if ($user->rights->ecm->setup) + if ($permtoadd) { print ''.$langs->trans('Edit').''; } - if ($user->rights->ecm->setup) + if ($permtoadd) { print ''.$langs->trans('ECMAddSection').''; } @@ -394,7 +471,7 @@ if ($action != 'edit' && $action != 'delete') if (count($filearray) == 0) { - if ($user->rights->ecm->setup) + if ($permtoadd) { print ''.$langs->trans('Delete').''; } From a1ac285a25c9dda1c5caffe4b4ba45bc84e43eb4 Mon Sep 17 00:00:00 2001 From: Paul Dermody Date: Mon, 1 Jan 2018 15:03:08 -0600 Subject: [PATCH 0118/1074] Fixed automated computation of surface and volume to use correct units. It was failing for inches and feet. --- htdocs/core/lib/product.lib.php | 39 ++++++++++++++++++++++++++ htdocs/product/class/product.class.php | 4 +-- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php index b01637d7b08..dd756830f41 100644 --- a/htdocs/core/lib/product.lib.php +++ b/htdocs/core/lib/product.lib.php @@ -477,3 +477,42 @@ function measuring_units_string($unit,$measuring_style='') return $measuring_units[$unit]; } + +/** + * Transform a given unit into the square of that unit, if known + * + * @param int $unit Unit key (-3,-2,-1,0,98,99...) + * @return int Squared unit key (-6,-4,-2,0,98,99...) + * @see formproduct->load_measuring_units + */ +function measuring_units_squared($unit) +{ + $measuring_units=array(); + $measuring_units[0] = 0; // m -> m3 + $measuring_units[-1] = -2; // dm-> dm2 + $measuring_units[-2] = -4; // cm -> cm2 + $measuring_units[-3] = -6; // mm -> mm2 + $measuring_units[98] = 98; // foot -> foot2 + $measuring_units[99] = 99; // inch -> inch2 + return $measuring_units[$unit]; +} + + +/** + * Transform a given unit into the cube of that unit, if known + * + * @param int $unit Unit key (-3,-2,-1,0,98,99...) + * @return int Cubed unit key (-9,-6,-3,0,88,89...) + * @see formproduct->load_measuring_units + */ +function measuring_units_cubed($unit) +{ + $measuring_units=array(); + $measuring_units[0] = 0; // m -> m2 + $measuring_units[-1] = -3; // dm-> dm3 + $measuring_units[-2] = -6; // cm -> cm3 + $measuring_units[-3] = -9; // mm -> mm3 + $measuring_units[98] = 88; // foot -> foot3 + $measuring_units[99] = 89; // inch -> inch3 + return $measuring_units[$unit]; +} diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index ed5813c2998..0b40f815816 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -745,12 +745,12 @@ class Product extends CommonObject if (empty($this->surface) && !empty($this->length) && !empty($this->width) && $this->length_units == $this->width_units) { $this->surface = $this->length * $this->width; - $this->surface_units = $this->length_units + $this->width_units; + $this->surface_units = measuring_units_squared($this->length_units); } if (empty($this->volume) && !empty($this->surface_units) && !empty($this->height) && $this->length_units == $this->height_units) { $this->volume = $this->surface * $this->height; - $this->volume_units = $this->surface_units + $this->height_units; + $this->volume_units = measuring_units_cubed($this->height_units); } $this->surface = price2num($this->surface); From de94c77a989c86122942bd0787a4f6e12a9c8ac4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Jan 2018 20:32:59 +0100 Subject: [PATCH 0119/1074] Fix url to alias when dolibarr is server for website module --- htdocs/core/lib/website.lib.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php index bbe9a0fecad..560861d9fce 100644 --- a/htdocs/core/lib/website.lib.php +++ b/htdocs/core/lib/website.lib.php @@ -25,7 +25,7 @@ /** * Convert a page content to have correct links (based on DOL_URL_ROOT) into an html content. - * Used to ouput the page on the Preview. + * Used to ouput the page on the Preview from backoffice. * * @param Website $website Web site object * @param string $content Content to replace @@ -87,9 +87,11 @@ function dolWebsiteOutput($content) global $website; // Replace relative link / with dolibarr URL: ...href="/"... - $content=preg_replace('/(href=")\/\"/', '\1'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageid='.$website->fk_default_home.'"', $content, -1, $nbrep); + $content=preg_replace('/(href=")\/\"/', '\1'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'"', $content, -1, $nbrep); // Replace relative link /xxx.php with dolibarr URL: ...href="....php" $content=preg_replace('/(href=")\/?([^:\"]*)(\.php\")/', '\1'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageref=\2"', $content, -1, $nbrep); + // Replace relative link /xxx with dolibarr URL: ...href="....php" + $content=preg_replace('/(href=")\/?([a-zA-Z0-9\-]+)(["\?]+)/', '\1'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageref=\2"', $content, -1, $nbrep); // Fix relative link /document.php with correct URL after the DOL_URL_ROOT: ...href="/document.php?modulepart=" $content=preg_replace('/(href=")(\/?document\.php\?[^\"]*modulepart=[^\"]*)(\")/', '\1'.DOL_URL_ROOT.'\2\3"', $content, -1, $nbrep); From 9254782ad71d294bff1786d141fda5e650760884 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 7 Jan 2018 22:04:31 +0100 Subject: [PATCH 0120/1074] Fix init template of non page --- htdocs/website/index.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/website/index.php b/htdocs/website/index.php index 7d27badbc83..d11f2503add 100644 --- a/htdocs/website/index.php +++ b/htdocs/website/index.php @@ -524,7 +524,9 @@ if ($action == 'addcontainer') $substitutionarray=array(); $substitutionarray['__WEBSITE_CREATE_BY__']=$user->getFullName($langs); - $objectpage->content = make_substitutions(file_get_contents(DOL_DOCUMENT_ROOT.'/website/pagetemplate.html'), $substitutionarray); + + // Init content with content into pagetemplate.html, blogposttempltate.html, ... + $objectpage->content = make_substitutions(@file_get_contents(DOL_DOCUMENT_ROOT.'/website/'.$objectpage->type_container.'template.html'), $substitutionarray); } if (! $error) From e256a1d57e84b03ed8bffb524d40897cc46d525a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Jan 2018 00:05:26 +0100 Subject: [PATCH 0121/1074] Code comment --- htdocs/core/js/lib_foot.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/js/lib_foot.js.php b/htdocs/core/js/lib_foot.js.php index 68d183e1573..0d8301c3b3b 100644 --- a/htdocs/core/js/lib_foot.js.php +++ b/htdocs/core/js/lib_foot.js.php @@ -119,7 +119,7 @@ if (! defined('JS_JQUERY_DISABLE_DROPDOWN')) // Wrapper to manage document_preview if ($conf->browser->layout != 'phone') { - print "\n/* JS CODE TO ENABLE document_preview */\n"; + print "\n/* JS CODE TO ENABLE document_preview */\n"; // Function document_preview is into header print ' jQuery(document).ready(function () { jQuery(".documentpreview").click(function () { From c13a7709f56c386444088ef1689370979a75997a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Jan 2018 00:20:38 +0100 Subject: [PATCH 0122/1074] Fix link on image for website module --- htdocs/core/lib/website.lib.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php index 560861d9fce..289a601188f 100644 --- a/htdocs/core/lib/website.lib.php +++ b/htdocs/core/lib/website.lib.php @@ -117,12 +117,14 @@ function dolWebsiteOutput($content) $nbrep=0; if (! $symlinktomediaexists) { + $content=preg_replace('/(]*href=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^\/]*\/?>)/', '\1'.$urlwithroot.'/viewimage.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep); $content=preg_replace('/(]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^\/]*\/?>)/', '\1'.$urlwithroot.'/viewimage.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep); $content=preg_replace('/(url\(["\']?)[^\)]*viewimage\.php([^\)]*)modulepart=medias([^\)]*)file=([^\)]*)(["\']?\))/', '\1'.$urlwithroot.'/viewimage.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep); } else { $content=preg_replace('/(]*src=")[^\"]*document\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^\/]*\/?>)/', '\1medias/\4\5', $content, -1, $nbrep); + $content=preg_replace('/(]*href=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^\/]*\/?>)/', '\1medias/\4\5', $content, -1, $nbrep); $content=preg_replace('/(]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^\/]*\/?>)/', '\1medias/\4\5', $content, -1, $nbrep); $content=preg_replace('/(url\(["\']?)[^\)]*viewimage\.php([^\)]*)modulepart=medias([^\)]*)file=([^\)]*)(["\']?\))/', '\1medias/\4\5', $content, -1, $nbrep); } From 86227d77d658d8f5a98c53e5e7bf43da154c2b9b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Jan 2018 01:37:10 +0100 Subject: [PATCH 0123/1074] Fix link of images --- htdocs/core/lib/website.lib.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php index 289a601188f..b2e723e0c0c 100644 --- a/htdocs/core/lib/website.lib.php +++ b/htdocs/core/lib/website.lib.php @@ -117,15 +117,16 @@ function dolWebsiteOutput($content) $nbrep=0; if (! $symlinktomediaexists) { - $content=preg_replace('/(]*href=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^\/]*\/?>)/', '\1'.$urlwithroot.'/viewimage.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep); - $content=preg_replace('/(]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^\/]*\/?>)/', '\1'.$urlwithroot.'/viewimage.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep); + $content=preg_replace('/(]*href=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\1'.$urlwithroot.'/viewimage.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep); + $content=preg_replace('/(]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\1'.$urlwithroot.'/viewimage.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep); $content=preg_replace('/(url\(["\']?)[^\)]*viewimage\.php([^\)]*)modulepart=medias([^\)]*)file=([^\)]*)(["\']?\))/', '\1'.$urlwithroot.'/viewimage.php\2modulepart=medias\3file=\4\5', $content, -1, $nbrep); } else { - $content=preg_replace('/(]*src=")[^\"]*document\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^\/]*\/?>)/', '\1medias/\4\5', $content, -1, $nbrep); - $content=preg_replace('/(]*href=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^\/]*\/?>)/', '\1medias/\4\5', $content, -1, $nbrep); - $content=preg_replace('/(]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^\/]*\/?>)/', '\1medias/\4\5', $content, -1, $nbrep); + $content=preg_replace('/(]*src=")[^\"]*document\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\1medias/\4\5', $content, -1, $nbrep); + + $content=preg_replace('/(]*href=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\1medias/\4\5', $content, -1, $nbrep); + $content=preg_replace('/(]*src=")[^\"]*viewimage\.php([^\"]*)modulepart=medias([^\"]*)file=([^\"]*)("[^>]*>)/', '\1medias/\4\5', $content, -1, $nbrep); $content=preg_replace('/(url\(["\']?)[^\)]*viewimage\.php([^\)]*)modulepart=medias([^\)]*)file=([^\)]*)(["\']?\))/', '\1medias/\4\5', $content, -1, $nbrep); } } From f653adeb71680b013f56675ddaa069aa7e6286c9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Jan 2018 02:00:06 +0100 Subject: [PATCH 0124/1074] Fix phpcs --- htdocs/don/class/don.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php index c0c00f7971d..df298831c22 100644 --- a/htdocs/don/class/don.class.php +++ b/htdocs/don/class/don.class.php @@ -687,6 +687,7 @@ class Don extends CommonObject * * @param int $id id of donation * @param int $userid User who validate the donation/promise + * @param int $notrigger Disable triggers * @return int <0 if KO, >0 if OK */ function valid_promesse($id, $userid, $notrigger=0) From 968bb8a10025c6d5be48f76f0eab3a2f6ab338dc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Jan 2018 02:15:20 +0100 Subject: [PATCH 0125/1074] Fix travis --- htdocs/install/mysql/data/llx_accounting_account_gb.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/install/mysql/data/llx_accounting_account_gb.sql b/htdocs/install/mysql/data/llx_accounting_account_gb.sql index 5e462781b4c..7c5f01d37aa 100644 --- a/htdocs/install/mysql/data/llx_accounting_account_gb.sql +++ b/htdocs/install/mysql/data/llx_accounting_account_gb.sql @@ -237,7 +237,7 @@ INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70305, 'ENG-BASE', 'FINAN', 'XXXXXX', '511', '70304', 'Cash values', 1); INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70306, 'ENG-BASE', 'FINAN', 'BANK', '512', '70304', 'Banks', 1); INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70307, 'ENG-BASE', 'FINAN', 'XXXXXX', '514', '70304', 'Postal checks', 1); -INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70308, 'ENG-BASE', 'FINAN', 'XXXXXX', '515', '70304', '\"Caisses\" of the Treasury and public institutions', 1); +INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70308, 'ENG-BASE', 'FINAN', 'XXXXXX', '515', '70304', 'Caisses of the Treasury and public institutions', 1); INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70309, 'ENG-BASE', 'FINAN', 'XXXXXX', '516', '70304', 'Exchange companies', 1); INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70310, 'ENG-BASE', 'FINAN', 'XXXXXX', '517', '70304', 'Other financial institutions', 1); INSERT INTO llx_accounting_account (rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (70311, 'ENG-BASE', 'FINAN', 'XXXXXX', '518', '70304', 'Accrued interest', 1); From 40f2644520bb46b8523218ec6648b6b0ecad0029 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Jan 2018 12:31:11 +0100 Subject: [PATCH 0126/1074] Fix example --- htdocs/website/index.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/htdocs/website/index.php b/htdocs/website/index.php index d11f2503add..dd7acd90a8e 100644 --- a/htdocs/website/index.php +++ b/htdocs/website/index.php @@ -144,12 +144,14 @@ $diroutput = $conf->medias->multidir_output[$conf->entity]; $relativepath=$section_dir; $upload_dir = $diroutput.'/'.$relativepath; -$htmlheadercontentdefault =''."\n"; -$htmlheadercontentdefault.=''."\n"; -$htmlheadercontentdefault.=''."\n"; -$htmlheadercontentdefault.=''."\n"; -$htmlheadercontentdefault.=''."\n"; -$htmlheadercontentdefault.=''."\n"; +$htmlheadercontentdefault = ''; +$htmlheadercontentdefault.=''."\n"; +$htmlheadercontentdefault.=''."\n"; +$htmlheadercontentdefault.=''."\n"; +$htmlheadercontentdefault.=''."\n"; +$htmlheadercontentdefault.=''."\n"; +$htmlheadercontentdefault.=''."\n"; +$htmlheadercontentdefault.=''."\n"; $htmlheadercontentdefault.=''."\n"; From 5ebba6feadf9a5af480e3c1ee117550794c400e4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Jan 2018 12:41:22 +0100 Subject: [PATCH 0127/1074] Fix example --- htdocs/website/index.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/website/index.php b/htdocs/website/index.php index dd7acd90a8e..6f515568bc2 100644 --- a/htdocs/website/index.php +++ b/htdocs/website/index.php @@ -145,10 +145,10 @@ $relativepath=$section_dir; $upload_dir = $diroutput.'/'.$relativepath; $htmlheadercontentdefault = ''; -$htmlheadercontentdefault.=''."\n"; $htmlheadercontentdefault.=''."\n"; -$htmlheadercontentdefault.=''."\n"; -$htmlheadercontentdefault.=''."\n"; +$htmlheadercontentdefault.=''."\n"; +$htmlheadercontentdefault.=''."\n"; +$htmlheadercontentdefault.=''."\n"; $htmlheadercontentdefault.=''."\n"; $htmlheadercontentdefault.=''."\n"; $htmlheadercontentdefault.=''."\n"; From 5847ea7319829f3a336b3d14620b03f913450826 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Jan 2018 12:44:55 +0100 Subject: [PATCH 0128/1074] Fix var_dump --- htdocs/blockedlog/class/blockedlog.class.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php index ed3749acdda..6ee02c111c4 100644 --- a/htdocs/blockedlog/class/blockedlog.class.php +++ b/htdocs/blockedlog/class/blockedlog.class.php @@ -356,7 +356,6 @@ class BlockedLog if ($this->element == 'facture') { - var_dump($object);exit; foreach($object as $key=>$value) { if (in_array($key, array('fields'))) continue; // Discard some properties From 42e659e26c6b013d08ccdf0a6fbce10a814befb9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Jan 2018 13:21:04 +0100 Subject: [PATCH 0129/1074] Fix link for online payment --- htdocs/comm/propal/card.php | 5 +---- htdocs/commande/card.php | 7 ++++--- htdocs/compta/facture/card.php | 3 +-- htdocs/theme/eldy/style.css.php | 9 +++++++-- htdocs/theme/md/style.css.php | 9 +++++++-- 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index 63a691af0ee..b725f05ccc2 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -2237,8 +2237,6 @@ if ($action == 'create') { if ($action != 'editline') { - $var = true; - // Add products/services form $object->formAddObjectLine(1, $mysoc, $soc); @@ -2379,8 +2377,6 @@ if ($action == 'create') $genallowed = $user->rights->propal->lire; $delallowed = $user->rights->propal->creer; - $var = true; - print $formfile->showdocuments('propal', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang, '', $object); // Show links to link elements @@ -2397,6 +2393,7 @@ if ($action == 'create') print showOnlineSignatureUrl('proposal', $object->ref).'
    '; } + // Show direct download link if ($object->statut != Propal::STATUS_DRAFT && ! empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) { print '
    '."\n"; diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index bb6d2d78571..b93def7d263 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -2438,8 +2438,6 @@ if ($action == 'create' && $user->rights->commande->creer) { if ($action != 'editline') { - $var = true; - // Add free products/services $object->formAddObjectLine(1, $mysoc, $soc); @@ -2607,8 +2605,10 @@ if ($action == 'create' && $user->rights->commande->creer) $linktoelem = $form->showLinkToObjectBlock($object, null, array('order')); $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); - // Show online signature link + // Show online payment link + //$useonlinepayment = (! empty($conf->paypal->enabled) || ! empty($conf->stripe->enabled) || ! empty($conf->paybox->enabled)); $useonlinepayment = $conf->global->ORDER_SHOW_ONLINE_PAYMENT_ON_ORDER; + if ($object->statut != Commande::STATUS_DRAFT && $useonlinepayment) { print '
    '; @@ -2616,6 +2616,7 @@ if ($action == 'create' && $user->rights->commande->creer) print showOnlinePaymentUrl('order', $object->ref).'
    '; } + // Show direct download link if ($object->statut != Commande::STATUS_DRAFT && ! empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD)) { print '
    '."\n"; diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index 2261dafb818..6cddffd3b7a 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -4188,8 +4188,6 @@ else if ($id > 0 || ! empty($ref)) { if ($action != 'editline') { - $var = true; - // Add free products/services $object->formAddObjectLine(1, $mysoc, $soc); @@ -4493,6 +4491,7 @@ else if ($id > 0 || ! empty($ref)) print showOnlinePaymentUrl('invoice', $object->ref).'
    '; } + // Show direct download link if ($object->statut != Facture::STATUS_DRAFT && ! empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD)) { print '
    '."\n"; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index ebbadc259f7..897149def5b 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -349,7 +349,7 @@ input.buttongen { vertical-align: middle; } input.buttonpayment { - min-width: 300px; + min-width: 320px; margin-bottom: 15px; background-image: none; line-height: 24px; @@ -359,6 +359,7 @@ input.buttonpayment { text-align: ; border: 2px solid #ccc; background-color: #eee; + white-space: normal; } input.buttonpaymentcb { background-image: url(); @@ -1024,6 +1025,10 @@ select.selectarrowonleft option { div.statusref img { padding-right: 3px !important; } + + input.buttonpayment { + min-width: 300px; + } } .linkobject { cursor: pointer; } @@ -3231,7 +3236,7 @@ div.titre { padding-bottom: 5px; } -#dolpaymenttable { min-width: 310px; font-size: 16px; } /* Width must have min to make stripe input area visible */ +#dolpaymenttable { min-width: 300px; font-size: 16px; } /* Width must have min to make stripe input area visible */ #tablepublicpayment { border: 1px solid #CCCCCC !important; width: 100%; padding: 20px; } #tablepublicpayment .CTableRow1 { background-color: #F0F0F0 !important; } #tablepublicpayment tr.liste_total { border-bottom: 1px solid #CCCCCC !important; } diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 2c0004a397e..183efa2c828 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -344,7 +344,7 @@ input.buttongen { vertical-align: middle; } input.buttonpayment { - min-width: 300px; + min-width: 320px; margin-bottom: 15px; background-image: none; line-height: 24px; @@ -354,6 +354,7 @@ input.buttonpayment { text-align: ; border: 2px solid #ccc; background-color: #eee; + white-space: normal; } input.buttonpaymentcb { background-image: url(); @@ -1014,6 +1015,10 @@ select.selectarrowonleft option { div.statusref img { padding-right: 3px !important; } + + input.buttonpayment { + min-width: 300px; + } } .linkobject { cursor: pointer; } @@ -3297,7 +3302,7 @@ div.titre { dol_optimize_smallscreen)?'':'margin-top: 4px;'); ?> } -#dolpaymenttable { min-width: 320px; font-size: 16px; } /* Width must have min to make stripe input area visible */ +#dolpaymenttable { min-width: 300px; font-size: 16px; } /* Width must have min to make stripe input area visible */ #tablepublicpayment { border: 1px solid #CCCCCC !important; width: 100%; padding: 20px; } #tablepublicpayment .CTableRow1 { background-color: #F0F0F0 !important; } #tablepublicpayment tr.liste_total { border-bottom: 1px solid #CCCCCC !important; } From 98443521932cb306c7d59e91dd0ea9af47e48edb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 8 Jan 2018 15:04:17 +0100 Subject: [PATCH 0130/1074] More complete repair --- htdocs/install/mysql/migration/repair.sql | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql index f2845490f67..cdd5bb2b653 100755 --- a/htdocs/install/mysql/migration/repair.sql +++ b/htdocs/install/mysql/migration/repair.sql @@ -414,6 +414,11 @@ drop table tmp_bank_url_expense_user; -- VMYSQL4.1 SET sql_mode = 'NO_ZERO_DATE'; -- VMYSQL4.1 update llx_opensurvey_sondage set tms = date_fin where DATE(STR_TO_DATE(tms, '%Y-%m-%d')) IS NULL; +-- VMYSQL4.1 SET sql_mode = 'ALLOW_INVALID_DATES'; +-- VMYSQL4.1 update llx_facture_fourn set date_lim_reglement = null where DATE(STR_TO_DATE(date_lim_reglement, '%Y-%m-%d')) IS NULL; +-- VMYSQL4.1 SET sql_mode = 'NO_ZERO_DATE'; +-- VMYSQL4.1 update llx_facture_fourn set date_lim_reglement = null where DATE(STR_TO_DATE(date_lim_reglement, '%Y-%m-%d')) IS NULL; + -- Backport a change of value into the hourly rate. -- update llx_projet_task_time as ptt set ptt.thm = (SELECT thm from llx_user as u where ptt.fk_user = u.rowid) where (ptt.thm is null) From 22d92c05408bb42b0b85f2ebe3c36837b69f9fc2 Mon Sep 17 00:00:00 2001 From: atm-ph Date: Mon, 8 Jan 2018 15:25:18 +0100 Subject: [PATCH 0131/1074] Fix wrong address used into PDF model of supplier payment --- .../compta/paiement/class/paiement.class.php | 26 +++++++++++++++++++ .../doc/pdf_standard.modules.php | 4 +-- htdocs/fourn/class/paiementfourn.class.php | 26 +++++++++++++++++++ 3 files changed, 54 insertions(+), 2 deletions(-) diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php index 7c5b99e2945..729700093e6 100644 --- a/htdocs/compta/paiement/class/paiement.class.php +++ b/htdocs/compta/paiement/class/paiement.class.php @@ -1114,5 +1114,31 @@ class Paiement extends CommonObject }*/ return ''; } + + /** + * Load the third party of object, from id into this->thirdparty + * + * @param int $force_thirdparty_id Force thirdparty id + * @return int <0 if KO, >0 if OK + */ + function fetch_thirdparty($force_thirdparty_id=0) + { + require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php'; + + if (empty($force_thirdparty_id)) + { + $billsarray = $this->getBillsArray(); // From payment, the fk_soc isn't available, we should load the first invoice to get him + if (!empty($billsarray)) + { + $supplier_invoice = new FactureFournisseur($this->db); + if ($supplier_invoice->fetch($billsarray[0]) > 0) + { + $force_thirdparty_id = $supplier_invoice->fk_soc; + } + } + } + + return parent::fetch_thirdparty($force_thirdparty_id); + } } diff --git a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php index 6fbfb4b1bf4..7d0772f272c 100644 --- a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php +++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php @@ -723,12 +723,12 @@ class pdf_standard extends ModelePDFSuppliersPayments if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) { $thirdparty = $object->contact; } else { - $thirdparty = $mysoc; + $thirdparty = $object->thirdparty; } $carac_client_name= pdfBuildThirdpartyName($thirdparty, $outputlangs); - $carac_client=pdf_build_address($outputlangs,$this->emetteur,$mysoc,((!empty($object->contact))?$object->contact:null),$usecontact,'target',$object); + $carac_client=pdf_build_address($outputlangs,$this->emetteur,$thirdparty,((!empty($object->contact))?$object->contact:null),$usecontact,'target',$object); // Show recipient $widthrecbox=90; diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php index 7a709bbce94..c2c98b9f00d 100644 --- a/htdocs/fourn/class/paiementfourn.class.php +++ b/htdocs/fourn/class/paiementfourn.class.php @@ -734,4 +734,30 @@ class PaiementFourn extends Paiement return $way; } + + /** + * Load the third party of object, from id into this->thirdparty + * + * @param int $force_thirdparty_id Force thirdparty id + * @return int <0 if KO, >0 if OK + */ + function fetch_thirdparty($force_thirdparty_id=0) + { + require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php'; + + if (empty($force_thirdparty_id)) + { + $billsarray = $this->getBillsArray(); // From payment, the fk_soc isn't available, we should load the first supplier invoice to get him + if (!empty($billsarray)) + { + $supplier_invoice = new FactureFournisseur($this->db); + if ($supplier_invoice->fetch($billsarray[0]) > 0) + { + $force_thirdparty_id = $supplier_invoice->fk_soc; + } + } + } + + return parent::fetch_thirdparty($force_thirdparty_id); + } } From fdedd6f75b424e9e2ba251386a58f0aadfc75797 Mon Sep 17 00:00:00 2001 From: florian HENRY Date: Mon, 8 Jan 2018 20:54:40 +0100 Subject: [PATCH 0132/1074] fix 7963 --- htdocs/accountancy/expensereport/lines.php | 2 +- htdocs/accountancy/supplier/lines.php | 2 +- htdocs/admin/external_rss.php | 10 +++--- htdocs/compta/bank/ligne.php | 15 ++++++--- htdocs/fourn/facture/impayees.php | 2 +- htdocs/product/price.php | 36 +++++++++++++--------- 6 files changed, 39 insertions(+), 28 deletions(-) diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php index 406e6bcb7c7..df039bf4093 100644 --- a/htdocs/accountancy/expensereport/lines.php +++ b/htdocs/accountancy/expensereport/lines.php @@ -106,7 +106,7 @@ if (is_array($changeaccount) && count($changeaccount) > 0) { $db->begin(); $sql1 = "UPDATE " . MAIN_DB_PREFIX . "expensereport_det as erd"; - $sql1 .= " SET erd.fk_code_ventilation=" . GETPOST('account_parent'); + $sql1 .= " SET erd.fk_code_ventilation=" . GETPOST('account_parent','int'); $sql1 .= ' WHERE erd.rowid IN (' . implode(',', $changeaccount) . ')'; dol_syslog('accountancy/expensereport/lines.php::changeaccount sql= ' . $sql1); diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php index 1d1d451f9ae..b8b1ed9206d 100644 --- a/htdocs/accountancy/supplier/lines.php +++ b/htdocs/accountancy/supplier/lines.php @@ -114,7 +114,7 @@ if (is_array($changeaccount) && count($changeaccount) > 0) { $db->begin(); $sql1 = "UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det as l"; - $sql1 .= " SET l.fk_code_ventilation=" . GETPOST('account_parent'); + $sql1 .= " SET l.fk_code_ventilation=" . GETPOST('account_parent','int'); $sql1 .= ' WHERE l.rowid IN (' . implode(',', $changeaccount) . ')'; dol_syslog('accountancy/supplier/lines.php::changeaccount sql= ' . $sql1); diff --git a/htdocs/admin/external_rss.php b/htdocs/admin/external_rss.php index 1d9621ad378..2e23f9419a4 100644 --- a/htdocs/admin/external_rss.php +++ b/htdocs/admin/external_rss.php @@ -127,7 +127,7 @@ if ($_POST["delete"]) // Supprime boite box_external_rss de definition des boites $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."boxes_def"; - $sql.= " WHERE file = 'box_external_rss.php' AND note LIKE '".GETPOST("norss")." %'"; + $sql.= " WHERE file = 'box_external_rss.php' AND note LIKE '".$db->escape(GETPOST("norss"))." %'"; $resql=$db->query($sql); if ($resql) @@ -268,19 +268,19 @@ if ($resql) print ''; print "
    "; - + print ''; print ""; print ""; print ""; - + print ''; print ""; print ""; print ""; - + print ''; print ""; print "'; print ""; print '"; + print ""; // Photo - Name print '"; + print ''; // Photo - Name print ''; + print ""; + print ""; + print ""; + // Account + print "'; + // Subledger account + print "'; + print ""; + print ''; + print ''; + print ""; + continue; + } + // Third party foreach ( $tabttc[$key] as $k => $mt ) { print ''; diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php index f10777c0918..2a235cbe5d3 100644 --- a/htdocs/accountancy/journal/sellsjournal.php +++ b/htdocs/accountancy/journal/sellsjournal.php @@ -89,7 +89,7 @@ if (! GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end) $idpays = $mysoc->country_id; -$sql = "SELECT f.rowid, f.facnumber, f.type, f.datef as df, f.ref_client, f.date_lim_reglement as dlr,"; +$sql = "SELECT f.rowid, f.facnumber, f.type, f.datef as df, f.ref_client, f.date_lim_reglement as dlr, f.close_code,"; $sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.total_tva, fd.total_localtax1, fd.total_localtax2, fd.tva_tx, fd.total_ttc, fd.situation_percent, fd.vat_src_code,"; $sql .= " s.rowid as socid, s.nom as name, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,"; $sql .= " p.rowid as pid, p.ref as pref, p.accountancy_code_sell, aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte"; @@ -190,6 +190,7 @@ if ($result) { $tabfac[$obj->rowid]["ref"] = $obj->facnumber; $tabfac[$obj->rowid]["type"] = $obj->type; $tabfac[$obj->rowid]["description"] = $obj->label_compte; + $tabfac[$obj->rowid]["close_code"] = $obj->close_code; // close_code = 'replaced' for replacement invoices (not used in most european countries) //$tabfac[$obj->rowid]["fk_facturedet"] = $obj->fdid; // Avoid warnings @@ -222,6 +223,9 @@ if ($action == 'writebookkeeping') { $now = dol_now(); $error = 0; + $companystatic = new Societe($db); + $invoicestatic = new Facture($db); + foreach ($tabfac as $key => $val) { // Loop on each invoice $errorforline = 0; @@ -231,18 +235,35 @@ if ($action == 'writebookkeeping') { $db->begin(); - $companystatic = new Societe($db); - $invoicestatic = new Facture($db); - $companystatic->id = $tabcompany[$key]['id']; $companystatic->name = $tabcompany[$key]['name']; $companystatic->code_compta = $tabcompany[$key]['code_compta']; $companystatic->code_compta_fournisseur = $tabcompany[$key]['code_compta_fournisseur']; $companystatic->code_client = $tabcompany[$key]['code_client']; $companystatic->code_fournisseur = $tabcompany[$key]['code_fournisseur']; + $companystatic->client = 3; $invoicestatic->id = $key; $invoicestatic->ref = (string) $val["ref"]; + $invoicestatic->type = $val["type"]; + $invoicestatic->close_code = $val["close_code"]; + + $date = dol_print_date($val["date"], 'day'); + + // Is it a replaced invoice ? 0=not a replaced invoice, 1=replaced invoice not yet dispatched, 2=replaced invoice dispatched + $replacedinvoice = 0; + if ($invoicestatic->close_code == 'replaced') + { + $replacedinvoice = 1; + $alreadydispatched = $invoicestatic->getVentilExportCompta(); // Test if replaced invoice already into bookkeeping. + if ($alreadydispatched) $replacedinvoice = 2; + } + + // If not already into bookkeeping, we won't add it, if yes, we will also add the counterpart. + if ($replacedinvoice == 1) + { + continue; + } // Thirdparty if (! $errorforline) @@ -482,13 +503,31 @@ if ($action == 'exportcsv') { $companystatic->code_compta = $tabcompany[$key]['code_compta']; $companystatic->code_compta_fournisseur = $tabcompany[$key]['code_compta_fournisseur']; $companystatic->code_client = $tabcompany[$key]['code_client']; - $companystatic->code_fournisseur = $tabcompany[$key]['code_supplier']; + $companystatic->code_fournisseur = $tabcompany[$key]['code_fournisseur']; + $companystatic->client = 3; $invoicestatic->id = $key; - $invoicestatic->ref = $val["ref"]; + $invoicestatic->ref = (string) $val["ref"]; + $invoicestatic->type = $val["type"]; + $invoicestatic->close_code = $val["close_code"]; $date = dol_print_date($val["date"], 'day'); + // Is it a replaced invoice ? 0=not a replaced invoice, 1=replaced invoice not yet dispatched, 2=replaced invoice dispatched + $replacedinvoice = 0; + if ($invoicestatic->close_code == 'replaced') + { + $replacedinvoice = 1; + $alreadydispatched = $invoicestatic->getVentilExportCompta(); // Test if replaced invoice already into bookkeeping. + if ($alreadydispatched) $replacedinvoice = 2; + } + + // If not already into bookkeeping, we won't add it, if yes, we will also add the counterpart. + if ($replacedinvoice == 1) + { + continue; + } + // Third party foreach ($tabttc[$key] as $k => $mt) { print '"' . $key . '"' . $sep; @@ -631,15 +670,11 @@ if (empty($action) || $action == 'view') { $r = ''; - $invoicestatic = new Facture($db); $companystatic = new Client($db); + $invoicestatic = new Facture($db); foreach ( $tabfac as $key => $val ) { - $invoicestatic->id = $key; - $invoicestatic->ref = $val["ref"]; - $invoicestatic->type = $val["type"]; - $companystatic->id = $tabcompany[$key]['id']; $companystatic->name = $tabcompany[$key]['name']; $companystatic->code_compta = $tabcompany[$key]['code_compta']; @@ -648,10 +683,47 @@ if (empty($action) || $action == 'view') { $companystatic->code_fournisseur = $tabcompany[$key]['code_fournisseur']; $companystatic->client = 3; + $invoicestatic->id = $key; + $invoicestatic->ref = (string) $val["ref"]; + $invoicestatic->type = $val["type"]; + $invoicestatic->close_code = $val["close_code"]; + $date = dol_print_date($val["date"], 'day'); + // Is it a replaced invoice ? 0=not a replaced invoice, 1=replaced invoice not yet dispatched, 2=replaced invoice dispatched + $replacedinvoice = 0; + if ($invoicestatic->close_code == 'replaced') + { + $replacedinvoice = 1; + $alreadydispatched = $invoicestatic->getVentilExportCompta(); // Test if replaced invoice already into bookkeeping. + if ($alreadydispatched) $replacedinvoice = 2; + } + + // If not already into bookkeeping, we won't add it, if yes, we will also add the counterpart. + if ($replacedinvoice == 1) + { + print ''; + print ""; + print ""; + print ""; + // Account + print "'; + // Subledger account + print "'; + print ""; + print ''; + print ''; + print ""; + continue; + } + // Third party - foreach ( $tabttc[$key] as $k => $mt ) { + foreach ($tabttc[$key] as $k => $mt) + { print ''; print ""; print ""; @@ -681,7 +753,8 @@ if (empty($action) || $action == 'view') { } // Product / Service - foreach ( $tabht[$key] as $k => $mt ) { + foreach ($tabht[$key] as $k => $mt) + { $accountingaccount = new AccountingAccount($db); $accountingaccount->fetch(null, $k, true); @@ -713,7 +786,8 @@ if (empty($action) || $action == 'view') { // VAT $listoftax = array(0, 1, 2); - foreach ($listoftax as $numtax) { + foreach ($listoftax as $numtax) + { $arrayofvat = $tabtva; if ($numtax == 1) $arrayofvat = $tablocaltax1; if ($numtax == 2) $arrayofvat = $tablocaltax2; diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php index b9ff5dd8670..b69f55ba1a8 100644 --- a/htdocs/core/class/commoninvoice.class.php +++ b/htdocs/core/class/commoninvoice.class.php @@ -319,7 +319,7 @@ abstract class CommonInvoice extends CommonObject // TODO If there is payment in bookkeeping, check payment is not dispatched in accounting // ... - if ($this->situation_cycle_ref && method_exists($this, 'is_last_in_cycle')) + if ($this->situation_cycle_ref && method_exists($this, 'is_last_in_cycle')) { $last = $this->is_last_in_cycle(); if (! $last) return -3; @@ -334,7 +334,7 @@ abstract class CommonInvoice extends CommonObject } /** - * Return if an invoice was dispatched in bookkeeping + * Return if an invoice was dispatched into bookkeeping * * @return int <0 if KO, 0=no, 1=yes */ From 167ab17927133ad1cde0014f9de9fc9931674259 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 10 Jan 2018 10:31:27 +0100 Subject: [PATCH 0137/1074] Fix substitution of user_signature --- htdocs/core/lib/functions.lib.php | 21 ++++++++++++++------- htdocs/core/tpl/card_presend.tpl.php | 1 - 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index c8627f2cb41..f180dcad405 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -5576,21 +5576,28 @@ function getCommonSubstitutionArray($outputlangs, $onlykey=0, $exclude=null, $ob if (empty($exclude) || ! in_array('user', $exclude)) { + // Add SIGNATURE into substitutionarray first, so, when we will make the substitution, + // this will also replace var found into content of signature + $signature = $user->signature; + $substitutionarray=array_merge($substitutionarray, array( + '__USER_SIGNATURE__' => (string) (($signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? ($onlykey == 2 ? dol_trunc(dol_string_nohtmltag($signature), 30) : $signature) : '') + ) + ); + // For backward compatibility + if ($onlykey != 2) + { + $substitutionarray['__SIGNATURE__'] = (string) (($signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? ($onlykey == 2 ? dol_trunc(dol_string_nohtmltag($signature), 30) : $signature) : ''); + } + $substitutionarray=array_merge($substitutionarray, array( '__USER_ID__' => (string) $user->id, '__USER_LOGIN__' => (string) $user->login, '__USER_LASTNAME__' => (string) $user->lastname, '__USER_FIRSTNAME__' => (string) $user->firstname, '__USER_FULLNAME__' => (string) $user->getFullName($outputlangs), - '__USER_SUPERVISOR_ID__' => (string) $user->fk_user, - '__USER_SIGNATURE__' => (string) (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? ($onlykey == 2 ? dol_trunc(dol_string_nohtmltag($user->signature), 30) : $user->signature) : '') + '__USER_SUPERVISOR_ID__' => (string) $user->fk_user ) ); - // For backward compatibility - if ($onlykey != 2) - { - $substitutionarray['__SIGNATURE__'] = (string) (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? ($onlykey == 2 ? dol_trunc(dol_string_nohtmltag($user->signature), 30) : $user->signature) : ''); - } } if (! empty($conf->multicompany->enabled)) { diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php index 25c1c3d8c58..8c51d9dcba2 100644 --- a/htdocs/core/tpl/card_presend.tpl.php +++ b/htdocs/core/tpl/card_presend.tpl.php @@ -162,7 +162,6 @@ if ($action == 'presend') $substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty)) ? '' : ''; $substitutionarray['__PERSONALIZED__'] = ''; // deprecated $substitutionarray['__CONTACTCIVNAME__'] = ''; - $parameters = array( 'mode' => 'formemail' ); From bc9fc2828ad183351080ca152a762c506b7566bf Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 10 Jan 2018 10:42:36 +0100 Subject: [PATCH 0138/1074] Fix missing class --- htdocs/admin/translation.php | 4 ++-- htdocs/compta/bank/various_payment/card.php | 6 +++--- htdocs/compta/bank/various_payment/index.php | 11 ++++++----- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php index a51c3212c26..7de9ed3d92c 100644 --- a/htdocs/admin/translation.php +++ b/htdocs/admin/translation.php @@ -447,8 +447,8 @@ if ($mode == 'searchkey') // Now search into translation array foreach($newlang->tab_translate as $key => $val) { - if ($transkey && ! preg_match('/'.preg_quote($transkey).'/i', $key)) continue; - if ($transvalue && ! preg_match('/'.preg_quote($transvalue).'/i', $val)) continue; + if ($transkey && ! preg_match('/'.preg_quote($transkey,'/').'/i', $key)) continue; + if ($transvalue && ! preg_match('/'.preg_quote($transvalue,'/').'/i', $val)) continue; $recordtoshow[$key]=$val; } } diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php index ea8bac6715a..90aa3e5e432 100644 --- a/htdocs/compta/bank/various_payment/card.php +++ b/htdocs/compta/bank/various_payment/card.php @@ -26,9 +26,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; -if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php'; -if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php'; -if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php'; +require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php'; +require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php'; if (! empty($conf->projet->enabled)) { require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; diff --git a/htdocs/compta/bank/various_payment/index.php b/htdocs/compta/bank/various_payment/index.php index 11811d1c6aa..e32dc8818e2 100644 --- a/htdocs/compta/bank/various_payment/index.php +++ b/htdocs/compta/bank/various_payment/index.php @@ -25,9 +25,9 @@ require '../../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; -if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php'; -if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php'; -if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php'; +require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php'; +require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php'; $langs->loadLangs(array("compta","banks","bills","accountancy")); @@ -205,7 +205,7 @@ if ($result) } // Accounting account - if (! empty($conf->accounting->enabled)) + if (! empty($conf->accounting->enabled)) { print ''; print ''; From 0f51aa15d867b5c4a1235966b5e6f767d36f5f35 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 10 Jan 2018 10:52:30 +0100 Subject: [PATCH 0139/1074] Fix: avoid Warning: A non-numeric value encountered --- htdocs/contact/document.php | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php index da8ef616a4f..eb66ae21a4f 100644 --- a/htdocs/contact/document.php +++ b/htdocs/contact/document.php @@ -58,9 +58,7 @@ $result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'ro $sortfield = GETPOST("sortfield",'alpha'); $sortorder = GETPOST("sortorder",'alpha'); $page = GETPOST("page",'int'); -if ($page == -1) { - $page = 0; -} +if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1 $offset = $conf->liste_limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; @@ -108,7 +106,7 @@ if ($object->id) } $linkback = ''.$langs->trans("BackToList").''; - + $morehtmlref='
    '; if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) { @@ -120,11 +118,11 @@ if ($object->id) else $morehtmlref.=$langs->trans("ContactNotLinkedToCompany"); } $morehtmlref.='
    '; - + dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref); - + print '
    '; - + print '
    '; print '
     
    '.$langs->trans("NumberingShort").'
    '.($i+1).''.$obj->rowid.'
    ".$langs->trans("Title")."global->$keyrsstitle . "\">
    ".$langs->trans("URL")."global->$keyrssurl . "\">
    ".$langs->trans("Status").""; @@ -301,7 +301,7 @@ if ($resql) // Logo if ($result > 0 && empty($rss->error)) { - + print '
    ".$langs->trans("Logo")."'; diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php index 9266e65a872..579ca2ce886 100644 --- a/htdocs/compta/bank/ligne.php +++ b/htdocs/compta/bank/ligne.php @@ -92,11 +92,16 @@ if ($user->rights->banque->consolidate && $action == 'donext') if ($action == 'confirm_delete_categ' && $confirm == "yes" && $user->rights->banque->modifier) { - $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_class WHERE lineid = ".$rowid." AND fk_categ = ".GETPOST("cat1"); - if (! $db->query($sql)) - { - dol_print_error($db); - } + $cat1=GETPOST("cat1",'int'); + if (!empty($rowid) && !empty($cat1)) { + $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_class WHERE lineid = ".$rowid." AND fk_categ = ".$cat1; + if (! $db->query($sql)) + { + dol_print_error($db); + } + } else { + setEventMessage('Missing ids','errors'); + } } if ($user->rights->banque->modifier && $action == "update") diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php index 7ad76d4426b..fd081d5616d 100644 --- a/htdocs/fourn/facture/impayees.php +++ b/htdocs/fourn/facture/impayees.php @@ -141,7 +141,7 @@ if ($user->rights->fournisseur->facture->lire) if (dol_strlen(GETPOST('sf_re')) > 0) { - $sql .= " AND f.ref_supplier LIKE '%".GETPOST('sf_re')."%'"; + $sql .= " AND f.ref_supplier LIKE '%".$db->escape(GETPOST('sf_re'))."%'"; } $sql.= " GROUP BY s.rowid, s.nom, f.rowid, f.ref, f.ref_supplier, f.total_ht, f.total_ttc, f.datef, f.date_lim_reglement, f.paye, f.fk_statut"; diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 7daaa351a3e..4feb4f8abec 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -409,12 +409,12 @@ if (empty($reshook)) if ($action == 'update_price_by_qty') { // Récupération des variables - $rowid = GETPOST('rowid'); - $priceid = GETPOST('priceid'); - $newprice = price2num(GETPOST("price"), 'MU'); + $rowid = GETPOST('rowid','int'); + $priceid = GETPOST('priceid','int'); + $newprice = price2num(GETPOST("price",'int'), 'MU'); // $newminprice=price2num(GETPOST("price_min"),'MU'); // TODO : Add min price management - $quantity = GETPOST('quantity'); - $remise_percent = price2num(GETPOST('remise_percent')); + $quantity = GETPOST('quantity','int'); + $remise_percent = price2num(GETPOST('remise_percent','int')); $remise = 0; // TODO : allow discount by amount when available on documents if (empty($quantity)) { @@ -442,7 +442,7 @@ if (empty($reshook)) $sql .= " quantity=" . $quantity . ","; $sql .= " remise_percent=" . $remise_percent . ","; $sql .= " remise=" . $remise; - $sql .= " WHERE rowid = " . GETPOST('rowid'); + $sql .= " WHERE rowid = " . $rowid; $result = $db->query($sql); if (! $result) dol_print_error($db); @@ -458,22 +458,28 @@ if (empty($reshook)) if ($action == 'delete_price_by_qty') { - $rowid = GETPOST('rowid'); + $rowid = GETPOST('rowid','int'); + if (!empty($rowid)) { + $sql = "DELETE FROM " . MAIN_DB_PREFIX . "product_price_by_qty"; + $sql .= " WHERE rowid = " . $rowid; - $sql = "DELETE FROM " . MAIN_DB_PREFIX . "product_price_by_qty"; - $sql .= " WHERE rowid = " . GETPOST('rowid'); - - $result = $db->query($sql); + $result = $db->query($sql) + } else { + setEventMessage('delete_price_by_qty Missing Ids','errors'); + } } if ($action == 'delete_all_price_by_qty') { - $priceid = GETPOST('priceid'); - + $priceid = GETPOST('priceid','int'); + if (!empty($rowid)) { $sql = "DELETE FROM " . MAIN_DB_PREFIX . "product_price_by_qty"; $sql .= " WHERE fk_product_price = " . $priceid; $result = $db->query($sql); + } else { + setEventMessage('delete_all_price_by_qty Missing Ids','errors'); + } } /** @@ -485,7 +491,7 @@ if (empty($reshook)) $maxpricesupplier = $object->min_recommended_price(); - $update_child_soc = GETPOST('updatechildprice'); + $update_child_soc = GETPOST('updatechildprice','int'); // add price by customer $prodcustprice->fk_soc = GETPOST('socid', 'int'); @@ -585,7 +591,7 @@ if (empty($reshook)) { $maxpricesupplier = $object->min_recommended_price(); - $update_child_soc = GETPOST('updatechildprice'); + $update_child_soc = GETPOST('updatechildprice','int'); $prodcustprice->fetch(GETPOST('lineid', 'int')); From b9b42e3e9d614844da66f1a402945dc1be06a5a6 Mon Sep 17 00:00:00 2001 From: dolibarr95 <24292300+dolibarr95@users.noreply.github.com> Date: Tue, 9 Jan 2018 14:04:18 +0100 Subject: [PATCH 0133/1074] Add class Add oddeven class to show_contacts() list. --- htdocs/core/lib/company.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index 4b78bb53bb7..31f25f29ff4 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -924,7 +924,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='') $contactstatic->setGenderFromCivility(); - print "
    '; From 9f79ad800b4cbf06a3ee398d28cde27c15b77153 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 9 Jan 2018 14:20:47 +0100 Subject: [PATCH 0134/1074] Fix price per quantity --- htdocs/comm/propal/card.php | 35 +++++++++++++++++++++++++++++++++- htdocs/commande/card.php | 34 ++++++++++++++++++++++++++++++++- htdocs/compta/facture/card.php | 34 ++++++++++++++++++++++++++++++++- 3 files changed, 100 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index b725f05ccc2..c7e4f538103 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -774,12 +774,13 @@ if (empty($reshook)) $tva_npr = get_default_npr($mysoc, $object->thirdparty, $prod->id); if (empty($tva_tx)) $tva_npr=0; + // Price unique per product $pu_ht = $prod->price; $pu_ttc = $prod->price_ttc; $price_min = $prod->price_min; $price_base_type = $prod->price_base_type; - // On defini prix unitaire + // If price per segment if (! empty($conf->global->PRODUIT_MULTIPRICES) && $object->thirdparty->price_level) { $pu_ht = $prod->multiprices[$object->thirdparty->price_level]; @@ -792,6 +793,7 @@ if (empty($reshook)) if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) $tva_npr=$prod->multiprices_recuperableonly[$object->thirdparty->price_level]; } } + // If price per customer elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php'; @@ -814,6 +816,37 @@ if (empty($reshook)) } } } + // If price per quantity + elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) + { + if ($prod->prices_by_qty[0]) // yes, this product has some prices per quantity + { + // Search the correct price into loaded array product_price_by_qty using id of array retrieved into POST['pqp']. + $pqp = GETPOST('pbq','int'); + + // Search price into product_price_by_qty from $prod->id + foreach($prod->prices_by_qty_list[0] as $priceforthequantityarray) + { + if ($priceforthequantityarray['rowid'] != $pqp) continue; + // We found the price + if ($priceforthequantityarray['price_base_type'] == 'HT') + { + $pu_ht = $priceforthequantityarray['unitprice']; + } + else + { + $pu_ttc = $priceforthequantityarray['unitprice']; + } + // Note: the remise_percent or price by qty is used to set data on form, so we will use value from POST. + break; + } + } + } + // If price per quantity and customer + elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY&PRODUIT_MULTIPRICES)) + { + // TODO Same than PRODUIT_CUSTOMER_PRICES_BY_QTY but using $object->thirdparty->price_level + } $tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx)); $tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx)); diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index b93def7d263..29134010dd6 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -735,7 +735,7 @@ if (empty($reshook)) $price_min = $prod->price_min; $price_base_type = $prod->price_base_type; - // multiprix + // If price per segment if (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($object->thirdparty->price_level)) { $pu_ht = $prod->multiprices[$object->thirdparty->price_level]; @@ -748,6 +748,7 @@ if (empty($reshook)) if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) $tva_npr=$prod->multiprices_recuperableonly[$object->thirdparty->price_level]; } } + // If price per customer elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php'; @@ -775,6 +776,37 @@ if (empty($reshook)) setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors'); } } + // If price per quantity + elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) + { + if ($prod->prices_by_qty[0]) // yes, this product has some prices per quantity + { + // Search the correct price into loaded array product_price_by_qty using id of array retrieved into POST['pqp']. + $pqp = GETPOST('pbq','int'); + + // Search price into product_price_by_qty from $prod->id + foreach($prod->prices_by_qty_list[0] as $priceforthequantityarray) + { + if ($priceforthequantityarray['rowid'] != $pqp) continue; + // We found the price + if ($priceforthequantityarray['price_base_type'] == 'HT') + { + $pu_ht = $priceforthequantityarray['unitprice']; + } + else + { + $pu_ttc = $priceforthequantityarray['unitprice']; + } + // Note: the remise_percent or price by qty is used to set data on form, so we will use value from POST. + break; + } + } + } + // If price per quantity and customer + elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY&PRODUIT_MULTIPRICES)) + { + // TODO Same than PRODUIT_CUSTOMER_PRICES_BY_QTY but using $object->thirdparty->price_level + } $tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx)); $tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx)); diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index 6cddffd3b7a..5207ca83b91 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -1643,7 +1643,7 @@ if (empty($reshook)) $price_min = $prod->price_min; $price_base_type = $prod->price_base_type; - // We define price for product + // If price per segment if (! empty($conf->global->PRODUIT_MULTIPRICES) && ! empty($object->thirdparty->price_level)) { $pu_ht = $prod->multiprices[$object->thirdparty->price_level]; @@ -1657,6 +1657,7 @@ if (empty($reshook)) if (empty($tva_tx)) $tva_npr=0; } } + // If price per customer elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) { require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php'; @@ -1678,6 +1679,37 @@ if (empty($reshook)) } } } + // If price per quantity + elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) + { + if ($prod->prices_by_qty[0]) // yes, this product has some prices per quantity + { + // Search the correct price into loaded array product_price_by_qty using id of array retrieved into POST['pqp']. + $pqp = GETPOST('pbq','int'); + + // Search price into product_price_by_qty from $prod->id + foreach($prod->prices_by_qty_list[0] as $priceforthequantityarray) + { + if ($priceforthequantityarray['rowid'] != $pqp) continue; + // We found the price + if ($priceforthequantityarray['price_base_type'] == 'HT') + { + $pu_ht = $priceforthequantityarray['unitprice']; + } + else + { + $pu_ttc = $priceforthequantityarray['unitprice']; + } + // Note: the remise_percent or price by qty is used to set data on form, so we will use value from POST. + break; + } + } + } + // If price per quantity and customer + elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY&PRODUIT_MULTIPRICES)) + { + // TODO Same than PRODUIT_CUSTOMER_PRICES_BY_QTY but using $object->thirdparty->price_level + } $tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx)); $tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx)); From 6fdbd4cc17fc1e6e1c6c75f6f2388a8890bea34d Mon Sep 17 00:00:00 2001 From: dolibarr95 <24292300+dolibarr95@users.noreply.github.com> Date: Tue, 9 Jan 2018 14:29:01 +0100 Subject: [PATCH 0135/1074] Update company.lib.php --- htdocs/core/lib/company.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index 31f25f29ff4..354bbdeddef 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -924,7 +924,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='') $contactstatic->setGenderFromCivility(); - print "
    '; From 9b448459c93bc980123fedb2cbe84d8d1346d488 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 9 Jan 2018 19:12:08 +0100 Subject: [PATCH 0136/1074] Fix dispatching replacement invoice into bookkeeping (not used by most countries in europe) --- .../accountancy/journal/purchasesjournal.php | 236 ++++++++++++------ htdocs/accountancy/journal/sellsjournal.php | 102 ++++++-- htdocs/core/class/commoninvoice.class.php | 4 +- 3 files changed, 245 insertions(+), 97 deletions(-) diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php index 4705e21e6d3..0c782c024a1 100644 --- a/htdocs/accountancy/journal/purchasesjournal.php +++ b/htdocs/accountancy/journal/purchasesjournal.php @@ -94,7 +94,7 @@ if (! GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end) $idpays = $mysoc->country_id; -$sql = "SELECT f.rowid, f.ref, f.type, f.datef as df, f.libelle,f.ref_supplier, f.date_lim_reglement as dlf, "; +$sql = "SELECT f.rowid, f.ref, f.type, f.datef as df, f.libelle,f.ref_supplier, f.date_lim_reglement as dlf, f.close_code,"; $sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.tva as total_tva, fd.total_localtax1, fd.total_localtax2, fd.tva_tx, fd.total_ttc, fd.vat_src_code,"; $sql .= " s.rowid as socid, s.nom as name, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,"; $sql .= " p.accountancy_code_buy , aa.rowid as fk_compte, aa.account_number as compte, aa.label as label_compte"; @@ -180,9 +180,9 @@ if ($result) { $tabfac[$obj->rowid]["ref"] = $obj->ref_supplier . ' (' . $obj->ref . ')'; $tabfac[$obj->rowid]["refsologest"] = $obj->ref; $tabfac[$obj->rowid]["refsuppliersologest"] = $obj->ref_supplier; - $tabfac[$obj->rowid]["type"] = $obj->type; $tabfac[$obj->rowid]["description"] = $obj->description; + $tabfac[$obj->rowid]["close_code"] = $obj->close_code; // close_code = 'replaced' for replacement invoices (not used in most european countries) //$tabfac[$obj->rowid]["fk_facturefourndet"] = $obj->fdid; // Avoid warnings @@ -219,6 +219,9 @@ if ($action == 'writebookkeeping') { $now = dol_now(); $error = 0; + $companystatic = new Societe($db); + $invoicestatic = new FactureFournisseur($db); + foreach ($tabfac as $key => $val) { // Loop on each invoice $errorforline = 0; @@ -228,22 +231,37 @@ if ($action == 'writebookkeeping') { $db->begin(); - $companystatic = new Societe($db); - $invoicestatic = new FactureFournisseur($db); - $companystatic->id = $tabcompany[$key]['id']; $companystatic->name = $tabcompany[$key]['name']; $companystatic->code_compta = $tabcompany[$key]['code_compta']; $companystatic->code_compta_fournisseur = $tabcompany[$key]['code_compta_fournisseur']; $companystatic->code_client = $tabcompany[$key]['code_client']; $companystatic->code_fournisseur = $tabcompany[$key]['code_fournisseur']; - $companystatic->client = $tabcompany[$key]['code_client']; + $companystatic->fournisseur = 1; $invoicestatic->id = $key; $invoicestatic->ref = (string) $val["refsologest"]; - $invoicestatic->refsupplier = $val["refsuppliersologest"]; + $invoicestatic->ref_supplier = $val["refsuppliersologest"]; $invoicestatic->type = $val["type"]; $invoicestatic->description = html_entity_decode(dol_trunc($val["description"], 32)); + $invoicestatic->close_code = $val["close_code"]; + + $date = dol_print_date($val["date"], 'day'); + + // Is it a replaced invoice ? 0=not a replaced invoice, 1=replaced invoice not yet dispatched, 2=replaced invoice dispatched + $replacedinvoice = 0; + if ($invoicestatic->close_code == 'replaced') + { + $replacedinvoice = 1; + $alreadydispatched = $invoicestatic->getVentilExportCompta(); // Test if replaced invoice already into bookkeeping. + if ($alreadydispatched) $replacedinvoice = 2; + } + + // If not already into bookkeeping, we won't add it, if yes, we will also add the counterpart. + if ($replacedinvoice == 1) + { + continue; + } // Thirdparty if (! $errorforline) @@ -262,7 +280,7 @@ if ($action == 'writebookkeeping') { $bookkeeping->subledger_account = $tabcompany[$key]['code_compta_fournisseur']; $bookkeeping->subledger_label = ''; // TODO To complete $bookkeeping->numero_compte = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER; - $bookkeeping->label_operation = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("SubledgerAccount"); + $bookkeeping->label_operation = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref_supplier . ' - ' . $langs->trans("SubledgerAccount"); $bookkeeping->montant = $mt; $bookkeeping->sens = ($mt >= 0) ? 'C' : 'D'; $bookkeeping->debit = ($mt <= 0) ? -$mt : 0; @@ -313,7 +331,7 @@ if ($action == 'writebookkeeping') { $bookkeeping->subledger_account = ''; $bookkeeping->subledger_label = ''; $bookkeeping->numero_compte = $k; - $bookkeeping->label_operation = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $accountingaccount->label; + $bookkeeping->label_operation = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref_supplier . ' - ' . $accountingaccount->label; $bookkeeping->montant = $mt; $bookkeeping->sens = ($mt < 0) ? 'C' : 'D'; $bookkeeping->debit = ($mt > 0) ? $mt : 0; @@ -370,7 +388,7 @@ if ($action == 'writebookkeeping') { $bookkeeping->subledger_account = ''; $bookkeeping->subledger_label = ''; $bookkeeping->numero_compte = $k; - $bookkeeping->label_operation = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT").' '.join(', ',$def_tva[$key][$k]) .' %' . ($numtax?' - Localtax '.$numtax:''); + $bookkeeping->label_operation = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref_supplier . ' - ' . $langs->trans("VAT").' '.join(', ',$def_tva[$key][$k]) .' %' . ($numtax?' - Localtax '.$numtax:''); $bookkeeping->montant = $mt; $bookkeeping->sens = ($mt < 0) ? 'C' : 'D'; $bookkeeping->debit = ($mt > 0) ? $mt : 0; @@ -420,7 +438,7 @@ if ($action == 'writebookkeeping') { $bookkeeping->subledger_account = ''; $bookkeeping->subledger_label = ''; $bookkeeping->numero_compte = $k; - $bookkeeping->label_operation = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->refsupplier . ' - ' . $langs->trans("VAT").' NPR'; + $bookkeeping->label_operation = dol_trunc($companystatic->name, 16) . ' - ' . $invoicestatic->ref_supplier . ' - ' . $langs->trans("VAT").' NPR'; $bookkeeping->montant = $mt; $bookkeeping->sens = ($mt < 0) ? 'C' : 'D'; $bookkeeping->debit = ($mt > 0) ? $mt : 0; @@ -523,65 +541,84 @@ if ($action == 'exportcsv') { foreach ( $tabfac as $key => $val ) { - $companystatic->id = $tabcompany[$key]['id']; - $companystatic->name = $tabcompany[$key]['name']; - $companystatic->client = $tabcompany[$key]['code_client']; - $companystatic->fournisseur = 1; + $companystatic->id = $tabcompany[$key]['id']; + $companystatic->name = $tabcompany[$key]['name']; + $companystatic->code_compta = $tabcompany[$key]['code_compta']; + $companystatic->code_compta_fournisseur = $tabcompany[$key]['code_compta_fournisseur']; + $companystatic->code_client = $tabcompany[$key]['code_client']; + $companystatic->code_fournisseur = $tabcompany[$key]['code_fournisseur']; + $companystatic->fournisseur = 1; - $invoicestatic->id = $key; - $invoicestatic->ref = $val["refsologest"]; - $invoicestatic->ref_supplier = $val["refsuppliersologest"]; - $invoicestatic->type = $val["type"]; - $invoicestatic->description = dol_trunc(html_entity_decode($val["description"]), 32); + $invoicestatic->id = $key; + $invoicestatic->ref = $val["refsologest"]; + $invoicestatic->ref_supplier = $val["refsuppliersologest"]; + $invoicestatic->type = $val["type"]; + $invoicestatic->description = dol_trunc(html_entity_decode($val["description"]), 32); + $invoicestatic->close_code = $val["close_code"]; - $date = dol_print_date($val["date"], 'day'); + $date = dol_print_date($val["date"], 'day'); - // Third party - foreach ( $tabttc[$key] as $k => $mt ) { + // Is it a replaced invoice ? 0=not a replaced invoice, 1=replaced invoice not yet dispatched, 2=replaced invoice dispatched + $replacedinvoice = 0; + if ($invoicestatic->close_code == 'replaced') + { + $replacedinvoice = 1; + $alreadydispatched = $invoicestatic->getVentilExportCompta(); // Test if replaced invoice already into bookkeeping. + if ($alreadydispatched) $replacedinvoice = 2; + } + + // If not already into bookkeeping, we won't add it, if yes, we will also add the counterpart. + if ($replacedinvoice == 1) + { + continue; + } + + // Third party + foreach ( $tabttc[$key] as $k => $mt ) { + print '"' . $key . '"' . $sep; + print '"' . $date . '"' . $sep; + print '"' . $val["refsologest"] . '"' . $sep; + print '"' . utf8_decode ( dol_trunc($companystatic->name, 32) ). '"' . $sep; + print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep; + print '"' . $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER . '"' . $sep; + print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep; + print '"' . $langs->trans("Code_tiers") . '"' . $sep; + print '"' . utf8_decode ( dol_trunc($companystatic->name, 16) ) . ' - ' . $val["refsuppliersologest"] . ' - ' . $langs->trans("Code_tiers") . '"' . $sep; + print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep; + print '"' . ($mt >= 0 ? price($mt) : '') . '"'. $sep; + print '"' . $journal . '"' ; + print "\n"; + } + + // Product / Service + foreach ( $tabht[$key] as $k => $mt ) { + $accountingaccount = new AccountingAccount($db); + $accountingaccount->fetch(null, $k, true); + if ($mt) { print '"' . $key . '"' . $sep; print '"' . $date . '"' . $sep; print '"' . $val["refsologest"] . '"' . $sep; - print '"' . utf8_decode ( dol_trunc($companystatic->name, 32) ). '"' . $sep; - print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep; - print '"' . $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER . '"' . $sep; - print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep; - print '"' . $langs->trans("Code_tiers") . '"' . $sep; - print '"' . utf8_decode ( dol_trunc($companystatic->name, 16) ) . ' - ' . $val["refsuppliersologest"] . ' - ' . $langs->trans("Code_tiers") . '"' . $sep; - print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep; - print '"' . ($mt >= 0 ? price($mt) : '') . '"'. $sep; + print '"' . utf8_decode ( dol_trunc($companystatic->name, 32) ) . '"' . $sep; + print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep; + print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep; + print '""' . $sep; + print '"' . utf8_decode ( dol_trunc($accountingaccount->label, 32) ) . '"' . $sep; + print '"' . utf8_decode ( dol_trunc($companystatic->name, 16) ) . ' - ' . $val["refsuppliersologest"] . ' - ' . dol_trunc($accountingaccount->label, 32) . '"' . $sep; + print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep; + print '"' . ($mt < 0 ? price(- $mt) : '') . '"'. $sep; print '"' . $journal . '"' ; print "\n"; } + } - // Product / Service - foreach ( $tabht[$key] as $k => $mt ) { - $accountingaccount = new AccountingAccount($db); - $accountingaccount->fetch(null, $k, true); - if ($mt) { - print '"' . $key . '"' . $sep; - print '"' . $date . '"' . $sep; - print '"' . $val["refsologest"] . '"' . $sep; - print '"' . utf8_decode ( dol_trunc($companystatic->name, 32) ) . '"' . $sep; - print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep; - print '"' . length_accountg(html_entity_decode($k)) . '"' . $sep; - print '""' . $sep; - print '"' . utf8_decode ( dol_trunc($accountingaccount->label, 32) ) . '"' . $sep; - print '"' . utf8_decode ( dol_trunc($companystatic->name, 16) ) . ' - ' . $val["refsuppliersologest"] . ' - ' . dol_trunc($accountingaccount->label, 32) . '"' . $sep; - print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep; - print '"' . ($mt < 0 ? price(- $mt) : '') . '"'. $sep; - print '"' . $journal . '"' ; - print "\n"; - } - } + // VAT + $listoftax = array(0, 1, 2); + foreach ($listoftax as $numtax) { + $arrayofvat = $tabtva; + if ($numtax == 1) $arrayofvat = $tablocaltax1; + if ($numtax == 2) $arrayofvat = $tablocaltax2; - // VAT - $listoftax = array(0, 1, 2); - foreach ($listoftax as $numtax) { - $arrayofvat = $tabtva; - if ($numtax == 1) $arrayofvat = $tablocaltax1; - if ($numtax == 2) $arrayofvat = $tablocaltax2; - - foreach ($arrayofvat[$key] as $k => $mt) { + foreach ($arrayofvat[$key] as $k => $mt) { if ($mt) { print '"' . $key . '"' . $sep; print '"' . $date . '"' . $sep; @@ -600,21 +637,24 @@ if ($action == 'exportcsv') { } // VAT counterpart for NPR - foreach ( $tabother[$key] as $k => $mt ) { - if ($mt) { - print '"' . $key . '"' . $sep; - print '"' . $date . '"' . $sep; - print '"' . $val["refsologest"] . '"' . $sep; - print '"' . utf8_decode ( dol_trunc($companystatic->name, 32) ). '"' . $sep; - print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep; - print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep; - print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep; - print '"' . $langs->trans("Code_tiers") . '"' . $sep; - print '"' . utf8_decode ( dol_trunc($companystatic->name, 16) ) . ' - ' . $val["refsuppliersologest"] . ' - ' . $langs->trans("VAT") . ' NPR"' . $sep; - print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep; - print '"' . ($mt >= 0 ? price($mt) : '') . '"'. $sep; - print '"' . $journal . '"' ; - print "\n"; + if (is_array($tabother[$key])) + { + foreach ( $tabother[$key] as $k => $mt ) { + if ($mt) { + print '"' . $key . '"' . $sep; + print '"' . $date . '"' . $sep; + print '"' . $val["refsologest"] . '"' . $sep; + print '"' . utf8_decode ( dol_trunc($companystatic->name, 32) ). '"' . $sep; + print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep; + print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep; + print '"' . length_accounta(html_entity_decode($k)) . '"' . $sep; + print '"' . $langs->trans("Code_tiers") . '"' . $sep; + print '"' . utf8_decode ( dol_trunc($companystatic->name, 16) ) . ' - ' . $val["refsuppliersologest"] . ' - ' . $langs->trans("VAT") . ' NPR"' . $sep; + print '"' . ($mt < 0 ? price(- $mt) : '') . '"' . $sep; + print '"' . ($mt >= 0 ? price($mt) : '') . '"'. $sep; + print '"' . $journal . '"' ; + print "\n"; + } } } } @@ -701,20 +741,54 @@ if (empty($action) || $action == 'view') { foreach ( $tabfac as $key => $val ) { - $invoicestatic->id = $key; - $invoicestatic->type = $val["type"]; - $invoicestatic->ref = $val["refsologest"]; - $invoicestatic->ref_supplier = $val["refsuppliersologest"]; - $invoicestatic->description = dol_trunc(html_entity_decode($val["description"]), 32); - $companystatic->id = $tabcompany[$key]['id']; $companystatic->name = $tabcompany[$key]['name']; - $companystatic->code_fournisseur = $tabcompany[$key]['code_fournisseur']; + $companystatic->code_compta = $tabcompany[$key]['code_compta']; $companystatic->code_compta_fournisseur = $tabcompany[$key]['code_compta_fournisseur']; + $companystatic->code_client = $tabcompany[$key]['code_client']; + $companystatic->code_fournisseur = $tabcompany[$key]['code_fournisseur']; $companystatic->fournisseur = 1; + $invoicestatic->id = $key; + $invoicestatic->ref = $val["refsologest"]; + $invoicestatic->ref_supplier = $val["refsuppliersologest"]; + $invoicestatic->type = $val["type"]; + $invoicestatic->description = dol_trunc(html_entity_decode($val["description"]), 32); + $invoicestatic->close_code = $val["close_code"]; + $date = dol_print_date($val["date"], 'day'); + // Is it a replaced invoice ? 0=not a replaced invoice, 1=replaced invoice not yet dispatched, 2=replaced invoice dispatched + $replacedinvoice = 0; + if ($invoicestatic->close_code == 'replaced') + { + $replacedinvoice = 1; + $alreadydispatched = $invoicestatic->getVentilExportCompta(); // Test if replaced invoice already into bookkeeping. + if ($alreadydispatched) $replacedinvoice = 2; + } + + // If no, we won't add it, if yes, we will also add the counterpart. + if ($replacedinvoice == 1) + { + print '
    " . $date . "" . $invoicestatic->getNomUrl(1) . ""; + print $langs->trans("Replaced"); + print '"; + print '"; + print "
    " . $date . "" . $invoicestatic->getNomUrl(1) . ""; + print $langs->trans("Replaced"); + print '"; + print '"; + print "
    " . $date . "'; print '
    '; @@ -305,8 +305,9 @@ if ($result) $i++; } - $colspan=5; + $colspan=4; if (! empty($conf->banque->enabled)) $colspan++; + if (! empty($conf->accounting->enabled)) $colspan++; print '
    '.$langs->trans("Total").'
    '; @@ -147,7 +145,7 @@ if ($object->id) print ''; } }*/ - + // Civility print ''; +print ''; +print ''; +print ''; + // Start date print ''; print ''; @@ -177,12 +188,18 @@ $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= ", ".MAIN_DB_PREFIX."facture as f"; $sql.= ", ".MAIN_DB_PREFIX."facturedet as d"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = d.fk_product"; +if (! empty($TSelectedCats)) { + $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=p.rowid'; +} $sql.= " WHERE f.fk_soc = s.rowid"; $sql.= ' AND f.entity IN ('.getEntity('facture').')'; $sql.= " AND f.fk_statut > 0"; $sql.= " AND d.fk_facture = f.rowid"; if ($id > 0) $sql.= " AND d.fk_product =".$id; +if (! empty($TSelectedCats)) { + $sql .= ' AND cp.fk_categorie IN ('.implode(',', $TSelectedCats) . ')'; +} if (!empty($startdate)) $sql.= " AND f.datef >= '".$db->idate($startdate)."'"; if (!empty($enddate)) From 2c473d35cc7468b15be0082796dc135c04e2df3d Mon Sep 17 00:00:00 2001 From: ATM-Nicolas Date: Wed, 10 Jan 2018 12:11:02 +0100 Subject: [PATCH 0143/1074] NEW : Add product and product categories filters on customer margins --- htdocs/margin/customerMargins.php | 36 +++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php index c83ca406347..b216db9d430 100644 --- a/htdocs/margin/customerMargins.php +++ b/htdocs/margin/customerMargins.php @@ -35,6 +35,9 @@ $langs->load("margins"); // Security check $socid = GETPOST('socid','int'); +$TSelectedProducts = GETPOST('products', 'array'); +$TSelectedCats = GETPOST('categories', 'array'); + if (! empty($user->societe_id)) $socid=$user->societe_id; $result = restrictedArea($user, 'societe','',''); $result = restrictedArea($user,'margins'); @@ -132,6 +135,29 @@ if (! $sortfield) } } +// Products +$TRes = $form->select_produits_list('','','',20,0,'',1,2,1,0,'', 1); + +$TProducts = array(); +foreach($TRes as $prod) { + $TProducts[$prod['key']] = $prod['label']; +} + +print ''; +print ''; + +// Categories +$TCats = $form->select_all_categories(0, array(), '', 64, 0, 1); + +print ''; +print ''; +print ''; +print ''; + // Start date print ''; print ''; } } From 0b893c11fdc7bfcb03cd28f21a949b514508c3b6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 11 Jan 2018 18:09:05 +0100 Subject: [PATCH 0173/1074] Revert "Fix wrong address used into PDF model of supplier payment" This reverts commit 22d92c05408bb42b0b85f2ebe3c36837b69f9fc2. --- .../compta/paiement/class/paiement.class.php | 26 ------------------- .../doc/pdf_standard.modules.php | 4 +-- htdocs/fourn/class/paiementfourn.class.php | 26 ------------------- 3 files changed, 2 insertions(+), 54 deletions(-) diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php index 74adb468190..367b156f196 100644 --- a/htdocs/compta/paiement/class/paiement.class.php +++ b/htdocs/compta/paiement/class/paiement.class.php @@ -1133,31 +1133,5 @@ class Paiement extends CommonObject }*/ return ''; } - - /** - * Load the third party of object, from id into this->thirdparty - * - * @param int $force_thirdparty_id Force thirdparty id - * @return int <0 if KO, >0 if OK - */ - function fetch_thirdparty($force_thirdparty_id=0) - { - require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php'; - - if (empty($force_thirdparty_id)) - { - $billsarray = $this->getBillsArray(); // From payment, the fk_soc isn't available, we should load the first invoice to get him - if (!empty($billsarray)) - { - $supplier_invoice = new FactureFournisseur($this->db); - if ($supplier_invoice->fetch($billsarray[0]) > 0) - { - $force_thirdparty_id = $supplier_invoice->fk_soc; - } - } - } - - return parent::fetch_thirdparty($force_thirdparty_id); - } } diff --git a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php index 52374cface8..2b657dbd962 100644 --- a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php +++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php @@ -725,12 +725,12 @@ class pdf_standard extends ModelePDFSuppliersPayments if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) { $thirdparty = $object->contact; } else { - $thirdparty = $object->thirdparty; + $thirdparty = $mysoc; } $carac_client_name= pdfBuildThirdpartyName($thirdparty, $outputlangs); - $carac_client=pdf_build_address($outputlangs,$this->emetteur,$thirdparty,((!empty($object->contact))?$object->contact:null),$usecontact,'target',$object); + $carac_client=pdf_build_address($outputlangs,$this->emetteur,$mysoc,((!empty($object->contact))?$object->contact:null),$usecontact,'target',$object); // Show recipient $widthrecbox=90; diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php index 7a8fbc253c6..8f99c24f7a7 100644 --- a/htdocs/fourn/class/paiementfourn.class.php +++ b/htdocs/fourn/class/paiementfourn.class.php @@ -738,30 +738,4 @@ class PaiementFourn extends Paiement return $way; } - - /** - * Load the third party of object, from id into this->thirdparty - * - * @param int $force_thirdparty_id Force thirdparty id - * @return int <0 if KO, >0 if OK - */ - function fetch_thirdparty($force_thirdparty_id=0) - { - require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php'; - - if (empty($force_thirdparty_id)) - { - $billsarray = $this->getBillsArray(); // From payment, the fk_soc isn't available, we should load the first supplier invoice to get him - if (!empty($billsarray)) - { - $supplier_invoice = new FactureFournisseur($this->db); - if ($supplier_invoice->fetch($billsarray[0]) > 0) - { - $force_thirdparty_id = $supplier_invoice->fk_soc; - } - } - } - - return parent::fetch_thirdparty($force_thirdparty_id); - } } From e152e81d18d3a597d883c656dc4763761d8a42ae Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 11 Jan 2018 18:24:40 +0100 Subject: [PATCH 0174/1074] Fix close code --- htdocs/accountancy/journal/purchasesjournal.php | 12 ++++++------ htdocs/accountancy/journal/sellsjournal.php | 12 ++++++------ htdocs/compta/facture/class/facture.class.php | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php index 0c782c024a1..e8af356a245 100644 --- a/htdocs/accountancy/journal/purchasesjournal.php +++ b/htdocs/accountancy/journal/purchasesjournal.php @@ -250,14 +250,14 @@ if ($action == 'writebookkeeping') { // Is it a replaced invoice ? 0=not a replaced invoice, 1=replaced invoice not yet dispatched, 2=replaced invoice dispatched $replacedinvoice = 0; - if ($invoicestatic->close_code == 'replaced') + if ($invoicestatic->close_code == FactureFournisseur::CLOSECODE_REPLACED) { $replacedinvoice = 1; $alreadydispatched = $invoicestatic->getVentilExportCompta(); // Test if replaced invoice already into bookkeeping. if ($alreadydispatched) $replacedinvoice = 2; } - // If not already into bookkeeping, we won't add it, if yes, we will also add the counterpart. + // If not already into bookkeeping, we won't add it, if yes, add the counterpart ???. if ($replacedinvoice == 1) { continue; @@ -560,14 +560,14 @@ if ($action == 'exportcsv') { // Is it a replaced invoice ? 0=not a replaced invoice, 1=replaced invoice not yet dispatched, 2=replaced invoice dispatched $replacedinvoice = 0; - if ($invoicestatic->close_code == 'replaced') + if ($invoicestatic->close_code == FactureFournisseur::CLOSECODE_REPLACED) { $replacedinvoice = 1; $alreadydispatched = $invoicestatic->getVentilExportCompta(); // Test if replaced invoice already into bookkeeping. if ($alreadydispatched) $replacedinvoice = 2; } - // If not already into bookkeeping, we won't add it, if yes, we will also add the counterpart. + // If not already into bookkeeping, we won't add it, if yes, add the counterpart ???. if ($replacedinvoice == 1) { continue; @@ -760,14 +760,14 @@ if (empty($action) || $action == 'view') { // Is it a replaced invoice ? 0=not a replaced invoice, 1=replaced invoice not yet dispatched, 2=replaced invoice dispatched $replacedinvoice = 0; - if ($invoicestatic->close_code == 'replaced') + if ($invoicestatic->close_code == FactureFournisseur::CLOSECODE_REPLACED) { $replacedinvoice = 1; $alreadydispatched = $invoicestatic->getVentilExportCompta(); // Test if replaced invoice already into bookkeeping. if ($alreadydispatched) $replacedinvoice = 2; } - // If no, we won't add it, if yes, we will also add the counterpart. + // If not already into bookkeeping, we won't add it, if yes, add the counterpart ???. if ($replacedinvoice == 1) { print ''; diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php index 2a235cbe5d3..128c6be1471 100644 --- a/htdocs/accountancy/journal/sellsjournal.php +++ b/htdocs/accountancy/journal/sellsjournal.php @@ -252,14 +252,14 @@ if ($action == 'writebookkeeping') { // Is it a replaced invoice ? 0=not a replaced invoice, 1=replaced invoice not yet dispatched, 2=replaced invoice dispatched $replacedinvoice = 0; - if ($invoicestatic->close_code == 'replaced') + if ($invoicestatic->close_code == Facture::CLOSECODE_REPLACED) { $replacedinvoice = 1; $alreadydispatched = $invoicestatic->getVentilExportCompta(); // Test if replaced invoice already into bookkeeping. if ($alreadydispatched) $replacedinvoice = 2; } - // If not already into bookkeeping, we won't add it, if yes, we will also add the counterpart. + // If not already into bookkeeping, we won't add it, if yes, add the counterpart ???. if ($replacedinvoice == 1) { continue; @@ -515,14 +515,14 @@ if ($action == 'exportcsv') { // Is it a replaced invoice ? 0=not a replaced invoice, 1=replaced invoice not yet dispatched, 2=replaced invoice dispatched $replacedinvoice = 0; - if ($invoicestatic->close_code == 'replaced') + if ($invoicestatic->close_code == Facture::CLOSECODE_REPLACED) { $replacedinvoice = 1; $alreadydispatched = $invoicestatic->getVentilExportCompta(); // Test if replaced invoice already into bookkeeping. if ($alreadydispatched) $replacedinvoice = 2; } - // If not already into bookkeeping, we won't add it, if yes, we will also add the counterpart. + // If not already into bookkeeping, we won't add it, if yes, add the counterpart ???. if ($replacedinvoice == 1) { continue; @@ -692,14 +692,14 @@ if (empty($action) || $action == 'view') { // Is it a replaced invoice ? 0=not a replaced invoice, 1=replaced invoice not yet dispatched, 2=replaced invoice dispatched $replacedinvoice = 0; - if ($invoicestatic->close_code == 'replaced') + if ($invoicestatic->close_code == Facture::CLOSECODE_REPLACED) { $replacedinvoice = 1; $alreadydispatched = $invoicestatic->getVentilExportCompta(); // Test if replaced invoice already into bookkeeping. if ($alreadydispatched) $replacedinvoice = 2; } - // If not already into bookkeeping, we won't add it, if yes, we will also add the counterpart. + // If not already into bookkeeping, we won't add it, if yes, add the counterpart ???. if ($replacedinvoice == 1) { print ''; diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index f1d8c5d1a46..1891989a44a 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -2053,11 +2053,11 @@ class Facture extends CommonInvoice * of no payment even if merchandises were sent). * * @param User $user Object user making change - * @param string $close_code Code de fermeture + * @param string $close_code Code of closing invoice (CLOSECODE_REPLACED, CLOSECODE_...) * @param string $close_note Comment * @return int <0 if KO, >0 if OK */ - function set_canceled($user,$close_code='',$close_note='') + function set_canceled($user, $close_code='', $close_note='') { dol_syslog(get_class($this)."::set_canceled rowid=".$this->id, LOG_DEBUG); @@ -2187,7 +2187,7 @@ class Facture extends CommonInvoice return -12; } - $result=$facreplaced->set_canceled($user,'replaced',''); + $result=$facreplaced->set_canceled($user, self::CLOSECODE_REPLACED, ''); if ($result < 0) { $this->error=$facreplaced->error; From e56d74f5c4ae00f0c914ca0995177a8c5e48d380 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 11 Jan 2018 19:01:47 +0100 Subject: [PATCH 0175/1074] Fix generation of doc for supplier payment --- .../compta/paiement/class/paiement.class.php | 25 ++++++ .../doc/pdf_standard.modules.php | 88 ++++++++----------- htdocs/fourn/class/paiementfourn.class.php | 28 ++++++ htdocs/fourn/paiement/card.php | 30 ++++--- htdocs/langs/en_US/main.lang | 2 + 5 files changed, 107 insertions(+), 66 deletions(-) diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php index 367b156f196..7cbe0b439a1 100644 --- a/htdocs/compta/paiement/class/paiement.class.php +++ b/htdocs/compta/paiement/class/paiement.class.php @@ -1134,4 +1134,29 @@ class Paiement extends CommonObject return ''; } + /** + * Load the third party of object, from id into this->thirdparty + * + * @param int $force_thirdparty_id Force thirdparty id + * @return int <0 if KO, >0 if OK + */ + function fetch_thirdparty($force_thirdparty_id=0) + { + require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php'; + + if (empty($force_thirdparty_id)) + { + $billsarray = $this->getBillsArray(); // From payment, the fk_soc isn't available, we should load the first supplier invoice to get him + if (!empty($billsarray)) + { + $supplier_invoice = new FactureFournisseur($this->db); + if ($supplier_invoice->fetch($billsarray[0]) > 0) + { + $force_thirdparty_id = $supplier_invoice->fk_soc; + } + } + } + + return parent::fetch_thirdparty($force_thirdparty_id); + } } diff --git a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php index 2b657dbd962..ffecb1dbdd7 100644 --- a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php +++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php @@ -19,9 +19,9 @@ */ /** - * \file htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php + * \file htdocs/core/modules/supplier_invoice/doc/pdf_standard.modules.php * \ingroup fournisseur - * \brief Class file to generate the supplier invoices with the canelle model + * \brief Class file to generate the supplier invoice payment file with the standard model */ require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_payment/modules_supplier_payment.php'; @@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functionsnumtoword.lib.php'; /** - * Class to generate the supplier invoices with the canelle model + * Class to generate the supplier invoices payment file with the standard model */ class pdf_standard extends ModelePDFSuppliersPayments { @@ -97,7 +97,7 @@ class pdf_standard extends ModelePDFSuppliersPayments $this->posxtotalht=80; $this->posxtva=90; $this->posxtotalttc=180; - + //if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) $this->posxtva=$this->posxup; if ($this->page_largeur < 210) // To work with US executive format { @@ -114,6 +114,10 @@ class pdf_standard extends ModelePDFSuppliersPayments $this->localtax2=array(); $this->atleastoneratenotnull=0; $this->atleastonediscount=0; + + // Recupere emetteur + $this->emetteur=$mysoc; + if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2); // By default if not defined } @@ -132,12 +136,6 @@ class pdf_standard extends ModelePDFSuppliersPayments { global $user,$langs,$conf,$mysoc,$hookmanager; - // Get source company - if (! is_object($object->thirdparty)) $object->fetch_thirdparty(); - if (! is_object($object->thirdparty)) $object->thirdparty=$mysoc; // If fetch_thirdparty fails, object has no socid (specimen) - $this->emetteur=$object->thirdparty; - if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2); // By default, if was not defined - if (! is_object($outputlangs)) $outputlangs=$langs; // For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1'; @@ -172,7 +170,7 @@ class pdf_standard extends ModelePDFSuppliersPayments } } } - + $total = $object->montant; // Definition of $dir and $file @@ -264,7 +262,7 @@ class pdf_standard extends ModelePDFSuppliersPayments // Incoterm $height_incoterms = 0; - + $height_note=0; $iniY = $tab_top + 7; @@ -332,15 +330,15 @@ class pdf_standard extends ModelePDFSuppliersPayments } $pdf->SetFont('','', $default_font_size - 1); // On repositionne la police par defaut - + // ref fourn $pdf->SetXY($this->posxreffacturefourn, $curY); $pdf->MultiCell($this->posxreffacturefourn-$this->posxup-0.8, 3, $object->lines[$i]->ref_supplier, 0, 'L', 0); - + // ref facture fourn $pdf->SetXY($this->posxreffacture, $curY); $pdf->MultiCell($this->posxreffacture-$this->posxup-0.8, 3, $object->lines[$i]->ref, 0, 'L', 0); - + // type $pdf->SetXY($this->posxtype, $curY); $pdf->MultiCell($this->posxtype-$this->posxup-0.8, 3, $object->lines[$i]->type, 0, 'L', 0); @@ -348,15 +346,15 @@ class pdf_standard extends ModelePDFSuppliersPayments // Total ht $pdf->SetXY($this->posxtotalht, $curY); $pdf->MultiCell($this->posxtotalht-$this->posxup-0.8, 3, price($object->lines[$i]->total_ht), 0, 'R', 0); - + // Total tva $pdf->SetXY($this->posxtva, $curY); $pdf->MultiCell($this->posxtva-$this->posxup-0.8, 3, price($object->lines[$i]->total_tva), 0, 'R', 0); - + // Total TTC line $pdf->SetXY($this->posxtotalttc, $curY); $pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->posxtotalttc, 3, price($object->lines[$i]->total_ttc), 0, 'R', 0); - + // Add line if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1)) @@ -421,7 +419,7 @@ class pdf_standard extends ModelePDFSuppliersPayments // Affiche zone cheèque $posy=$this->_tableau_cheque($pdf, $object, $bottomlasttab, $outputlangs); - + // Affiche zone totaux //$posy=$this->_tableau_tot($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs); @@ -443,7 +441,7 @@ class pdf_standard extends ModelePDFSuppliersPayments @chmod($file, octdec($conf->global->MAIN_UMASK)); $this->result = array('fullpath'=>$file); - + return 1; // Pas d'erreur } else @@ -476,45 +474,45 @@ class pdf_standard extends ModelePDFSuppliersPayments $pdf->SetFont('','', $default_font_size - 1); $pdf->SetFillColor(255,255,255); - + // N° payment $pdf->SetXY($this->marge_gauche, $posy); $pdf->MultiCell(30, 4, 'N° '.$outputlangs->transnoentities("Payment"), 0, 'L', 1); - + // Ref payment $pdf->SetXY($this->marge_gauche + 30, $posy); $pdf->MultiCell(50, 4, $object->ref, 0, 'L', 1); - + // Total payments $pdf->SetXY($this->page_largeur - $this->marge_droite - 50, $posy); $pdf->MultiCell(50, 4, price($object->montant), 0, 'R', 1); $posy += 20; - + // translate amount $currency = $conf->currency; $translateinletter = strtoupper(dol_convertToWord($object->montant,$outputlangs,$currency)); $pdf->SetXY($this->marge_gauche + 50, $posy); $pdf->MultiCell(90, 8, $translateinletter, 0, 'L', 1); $posy += 8; - + // To $pdf->SetXY($this->marge_gauche + 50, $posy); $pdf->MultiCell(150, 4, $object->thirdparty->nom, 0, 'L', 1); - + $pdf->SetXY($this->page_largeur - $this->marge_droite - 30, $posy); $pdf->MultiCell(35, 4, str_pad(price($object->montant). ' '.$currency,18,'*',STR_PAD_LEFT), 0, 'R', 1); $posy += 10; - - + + // City $pdf->SetXY($this->page_largeur - $this->marge_droite - 30, $posy); $pdf->MultiCell(150, 4, $mysoc->town, 0, 'L', 1); $posy += 4; - + // Date $pdf->SetXY($this->page_largeur - $this->marge_droite - 30, $posy); $pdf->MultiCell(150, 4, date("d").' '.$outputlangs->transnoentitiesnoconv(date("F")).' '.date("Y"), 0, 'L', 1); - + } @@ -549,7 +547,7 @@ class pdf_standard extends ModelePDFSuppliersPayments $titre = strtoupper($mysoc->town).', le '.date("d").' '.$outputlangs->transnoentitiesnoconv(date("F")).' '.date("Y"); $pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3) - 60, $tab_top-6); $pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre); - + $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$currency)); $pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top); $pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre); @@ -682,17 +680,17 @@ class pdf_standard extends ModelePDFSuppliersPayments // Sender properties $carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty); - // Show sender + // Show payer $posy=42; $posx=$this->marge_gauche; if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80; $hautcadre=40; -/* + // Show sender frame $pdf->SetTextColor(0,0,0); $pdf->SetFont('','', $default_font_size - 2); $pdf->SetXY($posx,$posy-5); - $pdf->MultiCell(66,5, $outputlangs->transnoentities("BillFrom").":", 0, 'L'); + $pdf->MultiCell(66,5, $outputlangs->transnoentities("PayedBy").":", 0, 'L'); $pdf->SetXY($posx,$posy); $pdf->SetFillColor(230,230,230); $pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1); @@ -709,24 +707,8 @@ class pdf_standard extends ModelePDFSuppliersPayments $pdf->SetFont('','', $default_font_size - 1); $pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L'); -*/ - - // If BILLING contact defined on invoice, we use it - $usecontact=false; - $arrayidcontact=$object->getIdContact('internal','BILLING'); - if (count($arrayidcontact) > 0) - { - $usecontact=true; - $result=$object->fetch_contact($arrayidcontact[0]); - } - - //Recipient name - // On peut utiliser le nom de la societe du contact - if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) { - $thirdparty = $object->contact; - } else { - $thirdparty = $mysoc; - } + // Payed + $thirdparty = $object->thirdparty; $carac_client_name= pdfBuildThirdpartyName($thirdparty, $outputlangs); @@ -743,7 +725,7 @@ class pdf_standard extends ModelePDFSuppliersPayments $pdf->SetTextColor(0,0,0); $pdf->SetFont('','', $default_font_size - 2); $pdf->SetXY($posx+2,$posy-5); - $pdf->MultiCell($widthrecbox, 5, "",0,'L'); + $pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("PayedTo").":",0,'L'); $pdf->Rect($posx, $posy, $widthrecbox, $hautcadre); // Show recipient name diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php index 8f99c24f7a7..6d402598284 100644 --- a/htdocs/fourn/class/paiementfourn.class.php +++ b/htdocs/fourn/class/paiementfourn.class.php @@ -738,4 +738,32 @@ class PaiementFourn extends Paiement return $way; } + + + /** + * Load the third party of object, from id into this->thirdparty + * + * @param int $force_thirdparty_id Force thirdparty id + * @return int <0 if KO, >0 if OK + */ + function fetch_thirdparty($force_thirdparty_id=0) + { + require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php'; + + if (empty($force_thirdparty_id)) + { + $billsarray = $this->getBillsArray(); // From payment, the fk_soc isn't available, we should load the first supplier invoice to get him + if (!empty($billsarray)) + { + $supplier_invoice = new FactureFournisseur($this->db); + if ($supplier_invoice->fetch($billsarray[0]) > 0) + { + $force_thirdparty_id = $supplier_invoice->fk_soc; + } + } + } + + return parent::fetch_thirdparty($force_thirdparty_id); + } + } diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php index 6023e7c050a..529feb86897 100644 --- a/htdocs/fourn/paiement/card.php +++ b/htdocs/fourn/paiement/card.php @@ -370,32 +370,36 @@ if ($result > 0) } print ''; - /* + print '
    '; // Documents generes - $ref=dol_sanitizeFileName($object->ref); - $filedir = $conf->fournisseur->payment->dir_output.'/'.dol_sanitizeFileName($object->ref); - $urlsource=$_SERVER['PHP_SELF'].'?id='.$object->id; - $genallowed=$user->rights->fournisseur->facture->lire; - $delallowed=$user->rights->fournisseur->facture->creer; - $modelpdf=(! empty($object->modelpdf)?$object->modelpdf:(empty($conf->global->SUPPLIER_PAYMENT_ADDON_PDF)?'':$conf->global->SUPPLIER_PAYMENT_ADDON_PDF)); - print $formfile->showdocuments('supplier_payment',$ref,$filedir,$urlsource,$genallowed,$delallowed,$modelpdf,1,0,0,40,0,'','','',$societe->default_lang); - $somethingshown=$formfile->numoffiles; + include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_payment/modules_supplier_payment.php'; + $modellist=ModelePDFSuppliersPayments::liste_modeles($db); + if (is_array($modellist)) + { + $ref=dol_sanitizeFileName($object->ref); + $filedir = $conf->fournisseur->payment->dir_output.'/'.dol_sanitizeFileName($object->ref); + $urlsource=$_SERVER['PHP_SELF'].'?id='.$object->id; + $genallowed=$user->rights->fournisseur->facture->lire; + $delallowed=$user->rights->fournisseur->facture->creer; + $modelpdf=(! empty($object->modelpdf)?$object->modelpdf:(empty($conf->global->SUPPLIER_PAYMENT_ADDON_PDF)?'':$conf->global->SUPPLIER_PAYMENT_ADDON_PDF)); + + print $formfile->showdocuments('supplier_payment',$ref,$filedir,$urlsource,$genallowed,$delallowed,$modelpdf,1,0,0,40,0,'','','',$societe->default_lang); + $somethingshown=$formfile->numoffiles; + } print '
    '; - //print '
    '.$langs->trans("UserTitle").''; print $object->getCivilityLabel(); @@ -160,7 +158,7 @@ if ($object->id) print ''; dol_fiche_end(); - + $modulepart = 'contact'; $permission = $user->rights->societe->contact->creer; $permtoedit = $user->rights->societe->contact->creer; From 49f59e0d06509a903ce503113037e959b0c16847 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 10 Jan 2018 11:02:11 +0100 Subject: [PATCH 0140/1074] Fix menu visible in experimental mode --- htdocs/core/menus/init_menu_auguria.sql | 2 +- htdocs/core/menus/standard/eldy.lib.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql index 1ad0a76a203..3991e4ecb69 100644 --- a/htdocs/core/menus/init_menu_auguria.sql +++ b/htdocs/core/menus/init_menu_auguria.sql @@ -209,7 +209,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2302__+MAX_llx_menu__, 'billing', '', 2300__+MAX_llx_menu__, '/compta/tva/reglement.php?leftmenu=tax_vat', 'List', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2303__+MAX_llx_menu__, 'billing', '', 2300__+MAX_llx_menu__, '/compta/tva/clients.php?leftmenu=tax_vat', 'ReportByCustomers', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 2, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2304__+MAX_llx_menu__, 'billing', '', 2300__+MAX_llx_menu__, '/compta/tva/quadri_detail.php?leftmenu=tax_vat', 'ReportByQuarter', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 3, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled', __HANDLER__, 'left', 2350__+MAX_llx_menu__, 'billing', 'tax_various', 2200__+MAX_llx_menu__, '/compta/bank/various_payment/index.php?leftmenu=tax_various&mainmenu=billing', 'MenuVariousPayment', 1, 'banks', '$user->rights->banque->lire', '', 0, 1, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 1', __HANDLER__, 'left', 2350__+MAX_llx_menu__, 'billing', 'tax_various', 2200__+MAX_llx_menu__, '/compta/bank/various_payment/index.php?leftmenu=tax_various&mainmenu=billing', 'MenuVariousPayment', 1, 'banks', '$user->rights->banque->lire', '', 0, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled && $leftmenu=="tax_various"', __HANDLER__, 'left', 2351__+MAX_llx_menu__, 'billing', '', 2350__+MAX_llx_menu__, '/compta/bank/various_payment/card.php?leftmenu=tax_various&action=create', 'MenuNewVariousPayment', 2, 'various_payment', '$user->rights->banque->modifier', '', 0, 2, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled && $leftmenu=="tax_various"', __HANDLER__, 'left', 2352__+MAX_llx_menu__, 'billing', '', 2350__+MAX_llx_menu__, '/compta/bank/various_payment/index.php?leftmenu=tax_various', 'List', 2, 'various_payment', '$user->rights->banque->lire', '', 0, 3, __ENTITY__); -- Accounting Expert diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index a6dd8031ffb..9e9c6b5c63a 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -941,7 +941,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu } // Various payment - if (! empty($conf->banque->enabled)) + if (! empty($conf->banque->enabled) && $conf->global->MAIN_FEATURES_LEVEL >= 1) { $langs->load("banks"); $newmenu->add("/compta/bank/various_payment/index.php?leftmenu=tax_various&mainmenu=billing",$langs->trans("MenuVariousPayment"),1,$user->rights->banque->lire, '', $mainmenu, 'tax_various'); From e5c26f89e793b79b151089fed61f08c19c134cac Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 10 Jan 2018 11:08:52 +0100 Subject: [PATCH 0141/1074] Fix search link --- htdocs/core/ajax/selectsearchbox.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php index 55a197861a0..4256d14f203 100644 --- a/htdocs/core/ajax/selectsearchbox.php +++ b/htdocs/core/ajax/selectsearchbox.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2015-2018 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 @@ -66,7 +66,7 @@ if (! empty($conf->societe->enabled) && empty($conf->global->MAIN_SEARCHFORM_CON if (! empty($conf->adherent->enabled) && empty($conf->global->MAIN_SEARCHFORM_ADHERENT_DISABLED) && $user->rights->adherent->lire) { - $arrayresult['searchintomember']=array('position'=>20, 'shortcut'=>'M', 'img'=>'object_user', 'label'=>$langs->trans("SearchIntoMembers", $search_boxvalue), 'text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoMembers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/adherents/list.php'.($search_boxvalue?',sall='.urlencode($search_boxvalue):'')); + $arrayresult['searchintomember']=array('position'=>20, 'shortcut'=>'M', 'img'=>'object_user', 'label'=>$langs->trans("SearchIntoMembers", $search_boxvalue), 'text'=>img_picto('','object_user').' '.$langs->trans("SearchIntoMembers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/adherents/list.php'.($search_boxvalue?'?sall='.urlencode($search_boxvalue):'')); } if (((! empty($conf->product->enabled) && $user->rights->produit->lire) || (! empty($conf->service->enabled) && $user->rights->service->lire)) From 30c6891b957bd33579ced61d98033508c2bd8970 Mon Sep 17 00:00:00 2001 From: ATM-Nicolas Date: Wed, 10 Jan 2018 10:24:42 +0100 Subject: [PATCH 0142/1074] NEW : Add product categories filter on product margin --- htdocs/langs/fr_FR/categories.lang | 1 + htdocs/margin/productMargins.php | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang index 10ab0fd65e4..99d1375b28c 100644 --- a/htdocs/langs/fr_FR/categories.lang +++ b/htdocs/langs/fr_FR/categories.lang @@ -85,3 +85,4 @@ CategorieRecursivHelp=Si activé : quand un élément est ajouté dans une cat AddProductServiceIntoCategory=Ajouter le produit/service suivant ShowCategory=Afficher tag/catégorie ByDefaultInList=Par défaut dans la liste +ChooseCategory=Choisissez les catégories diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php index 9d52b25de36..ef99e593b82 100644 --- a/htdocs/margin/productMargins.php +++ b/htdocs/margin/productMargins.php @@ -37,6 +37,7 @@ $id = GETPOST('id', 'int'); $ref = GETPOST('ref', 'alpha'); $action=GETPOST('action','alpha'); $confirm=GETPOST('confirm','alpha'); +$TSelectedCats=GETPOST('categories', 'array'); // Security check $fieldvalue = (! empty($id) ? $id : (! empty($ref) ? $ref : '')); @@ -121,6 +122,16 @@ else { } +// Categories +$TCats = $form->select_all_categories(0, array(), '', 64, 0, 1); + +print '
    '.$langs->trans('ChooseCategory').''; +print $form->multiselectarray('categories', $TCats, $TSelectedCats, 0, 0, 'minwidth500'); +print '
    '.$langs->trans('DateStart').' ('.$langs->trans("DateValidation").')
    '.$langs->trans('ChooseProduct/Service').''; +print $form->multiselectarray('products', $TProducts, $TSelectedProducts, 0, 0, 'minwidth500'); +print '
    '.$langs->trans('ChooseCategory').''; +print $form->multiselectarray('categories', $TCats, $TSelectedCats, 0, 0, 'minwidth500'); +print '
    '.$langs->trans('DateStart').' ('.$langs->trans("DateValidation").')'; @@ -186,6 +212,10 @@ $sql.= " sum(".$db->ifsql('d.total_ht < 0','-1 * (abs(d.total_ht) - (d.buy_price $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= ", ".MAIN_DB_PREFIX."facture as f"; $sql.= ", ".MAIN_DB_PREFIX."facturedet as d"; +if(! empty($TSelectedCats)) { + $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=d.fk_product'; +} + if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE f.fk_soc = s.rowid"; if ($socid > 0) $sql.= ' AND s.rowid = '.$socid; @@ -194,6 +224,12 @@ $sql.= " AND f.fk_statut > 0"; $sql.= ' AND s.entity IN ('.getEntity('societe').')'; $sql.= " AND d.fk_facture = f.rowid"; $sql.= " AND (d.product_type = 0 OR d.product_type = 1)"; +if(! empty($TSelectedProducts)) { + $sql .= ' AND d.fk_product IN ('.implode(',', $TSelectedProducts) . ')'; +} +if(! empty($TSelectedCats)) { + $sql .= ' AND cp.fk_categorie IN ('.implode(',', $TSelectedCats) . ')'; +} if (!empty($startdate)) $sql.= " AND f.datef >= '".$db->idate($startdate)."'"; if (!empty($enddate)) From cda078ce266c21666e930ef6c68929f3e5d14645 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 10 Jan 2018 12:27:11 +0100 Subject: [PATCH 0144/1074] Fix test on email unique --- htdocs/societe/class/societe.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 9f8c57d145f..34724c844d5 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -698,11 +698,12 @@ class Societe extends CommonObject } else { + //var_dump($conf->global->SOCIETE_EMAIL_UNIQUE); //var_dump($conf->global->SOCIETE_EMAIL_MANDATORY); if ($key == 'EMAIL') { // Check for unicity - if ($vallabel) + if ($vallabel && ! empty($conf->global->SOCIETE_EMAIL_UNIQUE)) { if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0))) { From bd1acca2cd029563418f4d056c6dcc60c31f0690 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 10 Jan 2018 12:38:12 +0100 Subject: [PATCH 0145/1074] Fix: wrong entity with multicompany thirdparty sharing --- htdocs/contact/card.php | 105 +++++++++++++------------ htdocs/contact/class/contact.class.php | 29 +++---- 2 files changed, 69 insertions(+), 65 deletions(-) diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php index dc6d19614f9..12dc4ac3e9d 100644 --- a/htdocs/contact/card.php +++ b/htdocs/contact/card.php @@ -2,7 +2,7 @@ /* Copyright (C) 2004-2005 Rodolphe Quiedeville * Copyright (C) 2004-2015 Laurent Destailleur * Copyright (C) 2004 Benoit Mortier - * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2005-2017 Regis Houssin * Copyright (C) 2007 Franky Van Liedekerke * Copyright (C) 2013 Florian Henry * Copyright (C) 2013-2016 Alexandre Spangaro @@ -50,8 +50,8 @@ $langs->load("commercial"); $mesg=''; $error=0; $errors=array(); $action = (GETPOST('action','alpha') ? GETPOST('action','alpha') : 'view'); -$confirm = GETPOST('confirm','alpha'); -$backtopage = GETPOST('backtopage','alpha'); +$confirm = GETPOST('confirm','alpha'); +$backtopage = GETPOST('backtopage','alpha'); $id = GETPOST('id','int'); $socid = GETPOST('socid','int'); @@ -137,63 +137,64 @@ if (empty($reshook)) } - // Confirmation desactivation - if ($action == 'disable') - { - $object->fetch($id); - if ($object->setstatus(0)<0) - { - setEventMessages($object->error, $object->errors, 'errors'); - } - else - { - header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id); - exit; - } - } + // Confirmation desactivation + if ($action == 'disable') + { + $object->fetch($id); + if ($object->setstatus(0)<0) + { + setEventMessages($object->error, $object->errors, 'errors'); + } + else + { + header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id); + exit; + } + } - // Confirmation activation - if ($action == 'enable') - { - $object->fetch($id); - if ($object->setstatus(1)<0) - { - setEventMessages($object->error, $object->errors, 'errors'); - } - else - { - header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id); - exit; - } - } + // Confirmation activation + if ($action == 'enable') + { + $object->fetch($id); + if ($object->setstatus(1)<0) + { + setEventMessages($object->error, $object->errors, 'errors'); + } + else + { + header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id); + exit; + } + } - // Add contact - if ($action == 'add' && $user->rights->societe->contact->creer) - { - $db->begin(); + // Add contact + if ($action == 'add' && $user->rights->societe->contact->creer) + { + $db->begin(); if ($canvas) $object->canvas=$canvas; + $object->entity = (GETPOSTISSET('entity')?GETPOST('entity', 'int'):$conf->entity); $object->socid = GETPOST("socid",'int'); $object->lastname = GETPOST("lastname"); $object->firstname = GETPOST("firstname"); - $object->civility_id = GETPOST("civility_id",'alpha'); + $object->civility_id = GETPOST("civility_id",'alpha'); $object->poste = GETPOST("poste"); - $object->address = GETPOST("address"); - $object->zip = GETPOST("zipcode"); + $object->address = GETPOST("address"); + $object->zip = GETPOST("zipcode"); $object->town = GETPOST("town"); $object->country_id = GETPOST("country_id",'int'); - $object->state_id = GETPOST("state_id",'int'); + $object->state_id = GETPOST("state_id",'int'); $object->skype = GETPOST("skype"); $object->email = GETPOST("email",'alpha'); $object->phone_pro = GETPOST("phone_pro"); - $object->phone_perso = GETPOST("phone_perso"); + $object->phone_perso = GETPOST("phone_perso"); $object->phone_mobile = GETPOST("phone_mobile"); - $object->fax = GETPOST("fax"); + $object->fax = GETPOST("fax"); $object->jabberid = GETPOST("jabberid",'alpha'); $object->no_email = GETPOST("no_email",'int'); $object->priv = GETPOST("priv",'int'); - $object->note_public = GETPOST("note_public"); + $object->note_public = GETPOST("note_public"); $object->note_private = GETPOST("note_private"); $object->statut = 1; //Defult status to Actif @@ -347,26 +348,26 @@ if (empty($reshook)) $object->socid = GETPOST("socid",'int'); $object->lastname = GETPOST("lastname"); $object->firstname = GETPOST("firstname"); - $object->civility_id = GETPOST("civility_id",'alpha'); + $object->civility_id = GETPOST("civility_id",'alpha'); $object->poste = GETPOST("poste"); - $object->address = GETPOST("address"); - $object->zip = GETPOST("zipcode"); + $object->address = GETPOST("address"); + $object->zip = GETPOST("zipcode"); $object->town = GETPOST("town"); - $object->state_id = GETPOST("state_id",'int'); + $object->state_id = GETPOST("state_id",'int'); $object->fk_departement = GETPOST("state_id",'int'); // For backward compatibility $object->country_id = GETPOST("country_id",'int'); $object->email = GETPOST("email",'alpha'); $object->skype = GETPOST("skype",'alpha'); $object->phone_pro = GETPOST("phone_pro"); - $object->phone_perso = GETPOST("phone_perso"); + $object->phone_perso = GETPOST("phone_perso"); $object->phone_mobile = GETPOST("phone_mobile"); - $object->fax = GETPOST("fax"); + $object->fax = GETPOST("fax"); $object->jabberid = GETPOST("jabberid",'alpha'); $object->no_email = GETPOST("no_email",'int'); $object->priv = GETPOST("priv",'int'); - $object->note_public = GETPOST("note_public"); + $object->note_public = GETPOST("note_public"); $object->note_private = GETPOST("note_private"); // Fill array 'array_options' with data from add form @@ -531,12 +532,14 @@ else print ''; print ''; print ''; + if (! empty($objsoc)) { + print ''; + } dol_fiche_head($head, 'card', '', 0, ''); print ''; - // Name print ''; print ''; @@ -673,7 +676,7 @@ else } // Other attributes - $parameters=array('colspan' => ' colspan="3"','cols'=>3); + $parameters=array('socid' => $socid, 'objsoc' => $objsoc, 'colspan' => ' colspan="3"', 'cols' => 3); $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook print $hookmanager->resPrint; if (empty($reshook) && ! empty($extrafields->attribute_label)) diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index 08fe253dffd..ca4880d68b8 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -187,7 +187,7 @@ class Contact extends CommonObject $sql.= ", statut"; $sql.= ", canvas"; $sql.= ", entity"; - $sql.= ",ref_ext"; + $sql.= ", ref_ext"; $sql.= ", import_key"; $sql.= ") VALUES ("; $sql.= "'".$this->db->idate($now)."',"; @@ -199,7 +199,7 @@ class Contact extends CommonObject $sql.= " ".$this->priv.","; $sql.= " ".$this->statut.","; $sql.= " ".(! empty($this->canvas)?"'".$this->db->escape($this->canvas)."'":"null").","; - $sql.= " ".$conf->entity.","; + $sql.= " ".$this->entity.","; $sql.= "'".$this->db->escape($this->ref_ext)."',"; $sql.= " ".(! empty($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null"); $sql.= ")"; @@ -642,7 +642,7 @@ class Contact extends CommonObject $langs->load("companies"); - $sql = "SELECT c.rowid, c.fk_soc, c.ref_ext, c.civility as civility_id, c.lastname, c.firstname,"; + $sql = "SELECT c.rowid, c.entity, c.fk_soc, c.ref_ext, c.civility as civility_id, c.lastname, c.firstname,"; $sql.= " c.address, c.statut, c.zip, c.town,"; $sql.= " c.fk_pays as country_id,"; $sql.= " c.fk_departement,"; @@ -671,41 +671,42 @@ class Contact extends CommonObject $obj = $this->db->fetch_object($resql); $this->id = $obj->rowid; + $this->entity = $obj->entity; $this->ref = $obj->rowid; $this->ref_ext = $obj->ref_ext; $this->civility_id = $obj->civility_id; - $this->civility_code = $obj->civility_id; + $this->civility_code = $obj->civility_id; $this->lastname = $obj->lastname; - $this->firstname = $obj->firstname; + $this->firstname = $obj->firstname; $this->address = $obj->address; $this->zip = $obj->zip; $this->town = $obj->town; $this->fk_departement = $obj->fk_departement; // deprecated $this->state_id = $obj->fk_departement; - $this->departement_code = $obj->state_code; // deprecated - $this->state_code = $obj->state_code; + $this->departement_code = $obj->state_code; // deprecated + $this->state_code = $obj->state_code; $this->departement = $obj->state; // deprecated - $this->state = $obj->state; + $this->state = $obj->state; $this->country_id = $obj->country_id; $this->country_code = $obj->country_id?$obj->country_code:''; $this->country = $obj->country_id?($langs->trans('Country'.$obj->country_code)!='Country'.$obj->country_code?$langs->transnoentities('Country'.$obj->country_code):$obj->country):''; - $this->socid = $obj->fk_soc; + $this->socid = $obj->fk_soc; $this->socname = $obj->socname; - $this->poste = $obj->poste; + $this->poste = $obj->poste; $this->statut = $obj->statut; - $this->phone_pro = trim($obj->phone); + $this->phone_pro = trim($obj->phone); $this->fax = trim($obj->fax); $this->phone_perso = trim($obj->phone_perso); $this->phone_mobile = trim($obj->phone_mobile); - $this->email = $obj->email; + $this->email = $obj->email; $this->jabberid = $obj->jabberid; - $this->skype = $obj->skype; - $this->photo = $obj->photo; + $this->skype = $obj->skype; + $this->photo = $obj->photo; $this->priv = $obj->priv; $this->mail = $obj->email; From 4cc0e889c1bee83b43826741b9f221285d24ef68 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 10 Jan 2018 12:38:27 +0100 Subject: [PATCH 0146/1074] Fix: restore broken feature --- htdocs/societe/card.php | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php index e5c548d40a7..2f3e42f62ac 100644 --- a/htdocs/societe/card.php +++ b/htdocs/societe/card.php @@ -2477,11 +2477,11 @@ else print $formfile->showdocuments('company', $object->id, $filedir, $urlsource, $genallowed, $delallowed, $object->modelpdf, 0, 0, 0, 28, 0, 'entity='.$object->entity, 0, '', $object->default_lang); } - // Subsidiaries list - if (empty($conf->global->SOCIETE_DISABLE_SUBSIDIARIES)) - { - $result=show_subsidiaries($conf,$langs,$db,$object); - } + // Subsidiaries list + if (empty($conf->global->SOCIETE_DISABLE_SUBSIDIARIES)) + { + $result=show_subsidiaries($conf,$langs,$db,$object); + } print '
    '; @@ -2497,6 +2497,21 @@ else $somethingshown = $formactions->showactions($object, '', $socid, 1, '', $MAXEVENT, '', $morehtmlright); // Show all action for thirdparty print '
    '; + + if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) + { + // Contacts list + if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) + { + $result=show_contacts($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id); + } + + // Addresses list + if (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT)) + { + $result=show_addresses($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id); + } + } } // Presend form From 4683a35532b63219ea6268f308bd7fe4efdecfc1 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 10 Jan 2018 12:52:30 +0100 Subject: [PATCH 0147/1074] Fix: wrong image path with multicompany sharing --- htdocs/contact/card.php | 14 ++++++-------- htdocs/contact/document.php | 7 ++++--- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php index 12dc4ac3e9d..bc0031b5992 100644 --- a/htdocs/contact/card.php +++ b/htdocs/contact/card.php @@ -279,15 +279,13 @@ if (empty($reshook)) $action = 'edit'; } + if (! $error) + { + $contactid=GETPOST("contactid",'int'); + $object->fetch($contactid); - if (! $error) - { - $contactid=GETPOST("contactid",'int'); - - $object->fetch($contactid); - - // Photo save - $dir = $conf->societe->dir_output."/contact/".$object->id."/photos"; + // Photo save + $dir = $conf->societe->multidir_output[$object->entity]."/contact/".$object->id."/photos"; $file_OK = is_uploaded_file($_FILES['photo']['tmp_name']); if (GETPOST('deletephoto') && $object->photo) { diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php index a016fa87b31..37b2436c226 100644 --- a/htdocs/contact/document.php +++ b/htdocs/contact/document.php @@ -1,6 +1,7 @@ - * Copyright (C) 2015 Frederic France +/* Copyright (C) 2014 Alexandre Spangaro + * Copyright (C) 2015 Frederic France + * Copyright (C) 2017 Regis Houssin * * 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 @@ -69,7 +70,7 @@ if (! $sortfield) $sortfield="name"; if ($id > 0) $object->fetch($id); -$upload_dir = $conf->societe->dir_output.'/contact/'.dol_sanitizeFileName($object->ref); +$upload_dir = $conf->societe->multidir_output[$object->entity].'/contact/'.dol_sanitizeFileName($object->ref); $modulepart='contact'; From ae59ca43cc9f26005cde087af811f4e9577c0b40 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 10 Jan 2018 13:02:05 +0100 Subject: [PATCH 0148/1074] Fix sort of subscriptions --- htdocs/adherents/subscription.php | 47 +++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 12 deletions(-) diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php index 6f6bd073f05..8d4b7829925 100644 --- a/htdocs/adherents/subscription.php +++ b/htdocs/adherents/subscription.php @@ -1,7 +1,7 @@ +/* Copyright (C) 2001-2004 Rodolphe Quiedeville * Copyright (C) 2002-2003 Jean-Louis Bergamo - * Copyright (C) 2004-2014 Laurent Destailleur + * Copyright (C) 2004-2018 Laurent Destailleur * Copyright (C) 2012-2017 Regis Houssin * Copyright (C) 2015-2016 Alexandre Spangaro * @@ -36,18 +36,28 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php'; -$langs->load("companies"); -$langs->load("bills"); -$langs->load("members"); -$langs->load("users"); -$langs->load("mails"); -$langs->load('other'); +$langs->loadLangs(array("companies","bills","members","users","mails",'other')); $action=GETPOST('action','alpha'); $confirm=GETPOST('confirm','alpha'); -$rowid=GETPOST('rowid','int'); +$rowid=GETPOST('rowid','int')?GETPOST('rowid','int'):GETPOST('id','int'); $typeid=GETPOST('typeid','int'); +// Load variable for pagination +$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit; +$sortfield = GETPOST('sortfield','alpha'); +$sortorder = GETPOST('sortorder','alpha'); +$page = GETPOST('page','int'); +if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1 +$offset = $limit * $page; +$pageprev = $page - 1; +$pagenext = $page + 1; + +// Default sort order (if not yet defined by previous GETPOST) +if (! $sortfield) $sortfield="c.rowid"; +if (! $sortorder) $sortorder="DESC"; + + // Security check $result=restrictedArea($user,'adherent',$rowid,'','cotisation'); @@ -98,6 +108,7 @@ $hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : $hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0)); $hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0)); + /* * Actions */ @@ -582,6 +593,16 @@ $title=$langs->trans("Member") . " - " . $langs->trans("Subscriptions"); $helpurl="EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros"; llxHeader("",$title,$helpurl); + +$param=''; +if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage); +if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit); +$param.= '&id='.$rowid; +if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss); +// Add $param from extra fields +//include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; + + if ($rowid > 0) { $res=$object->fetch($rowid); @@ -776,7 +797,7 @@ if ($rowid > 0) /* - * Hotbar + * Action buttons */ // Button to create a new subscription if member no draft neither resiliated @@ -810,6 +831,7 @@ if ($rowid > 0) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON c.fk_bank = b.rowid"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid"; $sql.= " WHERE d.rowid = c.fk_adherent AND d.rowid=".$rowid; + $sql.= $db->order($sortfield, $sortorder); $result = $db->query($sql); if ($result) @@ -822,7 +844,7 @@ if ($rowid > 0) print '
    lastname).'" autofocus="autofocus">
    '."\n"; print ''; - print ''; + print_liste_field_titre('Ref',$_SERVER["PHP_SELF"],'c.rowid','',$param,'',$sortfield,$sortorder); print ''; print ''; print ''; @@ -1016,8 +1038,9 @@ if ($rowid > 0) $paymentdate=dol_mktime(0, 0, 0, GETPOST('paymentmonth'), GETPOST('paymentday'), GETPOST('paymentyear')); } + print ''; // Date start subscription - print ''; + print ''; print ''; diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php index 023ccd611dd..3efadd56a48 100644 --- a/htdocs/projet/activity/perweek.php +++ b/htdocs/projet/activity/perweek.php @@ -41,7 +41,6 @@ $mode=GETPOST("mode",'alpha'); $id=GETPOST('id','int'); $taskid=GETPOST('taskid','int'); - $mine=0; if ($mode == 'mine') $mine=1; @@ -328,12 +327,14 @@ if ($id) $onlyopenedproject=1; // or -1 $morewherefilter=''; -if ($search_task_ref) $morewherefilter.=natural_search("t.ref", $search_task_ref); -if ($search_task_label) $morewherefilter.=natural_search(array("t.ref", "t.label"), $search_task_label); -if ($search_thirdparty) $morewherefilter.=natural_search("s.nom", $search_thirdparty); + +if ($search_project_ref) $morewherefilter.=natural_search("p.ref", $search_project_ref); +if ($search_task_ref) $morewherefilter.=natural_search("t.ref", $search_task_ref); +if ($search_task_label) $morewherefilter.=natural_search(array("t.ref", "t.label"), $search_task_label); +if ($search_thirdparty) $morewherefilter.=natural_search("s.nom", $search_thirdparty); $tasksarray=$taskstatic->getTasksArray(0, 0, ($project->id?$project->id:0), $socid, 0, $search_project_ref, $onlyopenedproject, $morewherefilter, ($search_usertoprocessid?$search_usertoprocessid:0)); // We want to see all tasks of open project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later. -if ($morewherefilter) // Get all task with no filter so we can show total of time spent for not visible tasks +if ($morewherefilter) // Get all task without any filter, so we can show total of time spent for not visible tasks { $tasksarraywithoutfilter=$taskstatic->getTasksArray(0, 0, ($project->id?$project->id:0), $socid, 0, '', $onlyopenedproject, '', ($search_usertoprocessid?$search_usertoprocessid:0)); // We want to see all tasks of open project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later. } @@ -514,7 +515,8 @@ $restrictviewformytask=(empty($conf->global->PROJECT_TIME_SHOW_TASK_NOT_ASSIGNED if (count($tasksarray) > 0) { - //var_dump($tasksarray); + //var_dump($tasksarray); // contains only selected tasks + //var_dump($tasksarraywithoutfilter); // contains all tasks (if there is a filter, not defined if no filter) //var_dump($tasksrole); $j=0; @@ -537,7 +539,6 @@ if (count($tasksarray) > 0) $totalforeachday=array(); foreach($listofdistinctprojectid as $tmpprojectid) { - $lineother=''; $projectstatic->id=$tmpprojectid; $projectstatic->loadTimeSpent($firstdaytoshow, 0, $usertoprocess->id); // Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week for ($idw = 0; $idw < 7; $idw++) @@ -546,15 +547,32 @@ if (count($tasksarray) > 0) $totalforeachday[$tmpday]+=$projectstatic->weekWorkLoad[$tmpday]; } } - $lineother=''; + //var_dump($totalforeachday); + //var_dump($totalforvisibletasks); + + // Is there a diff between selected/filtered tasks and all tasks ? + $isdiff = 0; + if (count($totalforeachday)) + { + for ($idw = 0; $idw < 7; $idw++) + { + $tmpday=dol_time_plus_duree($firstdaytoshow, $idw, 'd'); + $timeonothertasks=($totalforeachday[$tmpday] - $totalforvisibletasks[$tmpday]); + if ($timeonothertasks) + { + $isdiff=1; + break; + } + } + } $colspan=7; // There is a diff between total shown on screen and total spent by user, so we add a line with all other cumulated time of user - if (count($totalforeachday)) + if ($isdiff) { - print ''; + print ''; print ''; From 415d7574ebf5c39fc4a434e07face6ebede58781 Mon Sep 17 00:00:00 2001 From: dev2a Date: Thu, 11 Jan 2018 15:35:34 +0100 Subject: [PATCH 0170/1074] Fix PHP notices adding empty($page) --- htdocs/accountancy/bookkeeping/balance.php | 1 + htdocs/accountancy/bookkeeping/listbyaccount.php | 2 +- htdocs/accountancy/bookkeeping/listbyyear.php | 1 + htdocs/accountancy/expensereport/list.php | 2 +- htdocs/accountancy/supplier/list.php | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php index 1cdef9af6a9..cdc7d779418 100644 --- a/htdocs/accountancy/bookkeeping/balance.php +++ b/htdocs/accountancy/bookkeeping/balance.php @@ -57,6 +57,7 @@ if (GETPOST("exportcsv")) $action = 'export_csv'; $limit = GETPOST('limit','int')?GETPOST('limit', 'int'):$conf->liste_limit; +if (empty($page) || $page < 0) { $page = 0; } $offset = $limit * $page; diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php index f73b57b42f3..e1fa349bccc 100644 --- a/htdocs/accountancy/bookkeeping/listbyaccount.php +++ b/htdocs/accountancy/bookkeeping/listbyaccount.php @@ -77,7 +77,7 @@ $limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->AC $sortfield = GETPOST('sortfield', 'alpha'); $sortorder = GETPOST('sortorder', 'alpha'); $page = GETPOST('page','int'); -if ($page < 0) { $page = 0; } +if (empty($page) || $page < 0) { $page = 0; } $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; diff --git a/htdocs/accountancy/bookkeeping/listbyyear.php b/htdocs/accountancy/bookkeeping/listbyyear.php index bf7578bb752..6891e1d8947 100644 --- a/htdocs/accountancy/bookkeeping/listbyyear.php +++ b/htdocs/accountancy/bookkeeping/listbyyear.php @@ -79,6 +79,7 @@ if ($sortorder == "") if ($sortfield == "") $sortfield = "t.rowid"; + if (empty($page) || $page < 0) { $page = 0; } $offset = $limit * $page; diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php index 0e4b9b05ac9..eed1479ab0a 100644 --- a/htdocs/accountancy/expensereport/list.php +++ b/htdocs/accountancy/expensereport/list.php @@ -71,7 +71,7 @@ $limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->AC $sortfield = GETPOST('sortfield', 'alpha'); $sortorder = GETPOST('sortorder', 'alpha'); $page = GETPOST('page','int'); -if ($page < 0) { $page = 0; } +if (empty($page) || $page < 0) { $page = 0; } $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php index 5d9871eecfb..49d81d5d11d 100644 --- a/htdocs/accountancy/supplier/list.php +++ b/htdocs/accountancy/supplier/list.php @@ -73,7 +73,7 @@ $limit = GETPOST('limit','int')?GETPOST('limit', 'int'):(empty($conf->global->AC $sortfield = GETPOST('sortfield', 'alpha'); $sortorder = GETPOST('sortorder', 'alpha'); $page = GETPOST('page','int'); -if ($page < 0) { $page = 0; } +if (empty($page) || $page < 0) { $page = 0; } $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; From 60c508b1c439900d022804f96bb69616da9dda33 Mon Sep 17 00:00:00 2001 From: dev2a Date: Thu, 11 Jan 2018 15:52:45 +0100 Subject: [PATCH 0171/1074] Get start date from fiscal year if start date is empty, get date from current accounting fiscal year, else from company fiscal month setting --- htdocs/accountancy/bookkeeping/balance.php | 29 +++++++----- htdocs/accountancy/bookkeeping/list.php | 29 +++++++----- .../accountancy/bookkeeping/listbyaccount.php | 44 +++++++++++-------- htdocs/accountancy/bookkeeping/listbyyear.php | 22 +++++++++- 4 files changed, 84 insertions(+), 40 deletions(-) diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php index cdc7d779418..e6697557775 100644 --- a/htdocs/accountancy/bookkeeping/balance.php +++ b/htdocs/accountancy/bookkeeping/balance.php @@ -69,17 +69,26 @@ $form = new Form($db); if (empty($search_date_start) && ! GETPOSTISSET('formfilteraction')) { - $month_start= ($conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START):1); - $year_start = dol_print_date(dol_now(), '%Y'); - $year_end = $year_start + 1; - $month_end = $month_start - 1; - if ($month_end < 1) - { - $month_end = 12; - $year_end--; + $sql = "SELECT date_start, date_end from ".MAIN_DB_PREFIX."accounting_fiscalyear "; + $sql .= " where date_start < now() and date_end > now() limit 1"; + $res = $db->query($sql); + if ($res->num_rows > 0) { + $fiscalYear = $db->fetch_object($res); + $search_date_start = strtotime($fiscalYear->date_start); + $search_date_end = strtotime($fiscalYear->date_end); + } else { + $month_start= ($conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START):1); + $year_start = dol_print_date(dol_now(), '%Y'); + $year_end = $year_start + 1; + $month_end = $month_start - 1; + if ($month_end < 1) + { + $month_end = 12; + $year_end--; + } + $search_date_start = dol_mktime(0, 0, 0, $month_start, 1, $year_start); + $search_date_end = dol_get_last_day($year_end, $month_end); } - $search_date_start = dol_mktime(0, 0, 0, $month_start, 1, $year_start); - $search_date_end = dol_get_last_day($year_end, $month_end); } if ($sortorder == "") $sortorder = "ASC"; diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php index 0310906ab6b..29dfbeeec59 100644 --- a/htdocs/accountancy/bookkeeping/list.php +++ b/htdocs/accountancy/bookkeeping/list.php @@ -101,17 +101,26 @@ $form = new Form($db); if (! in_array($action, array('export_file', 'delmouv', 'delmouvconfirm')) && ! isset($_POST['begin']) && ! isset($_GET['begin']) && ! isset($_POST['formfilteraction']) && empty($page) && ! GETPOST('noreset','int')) { - $month_start= ($conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START):1); - $year_start = dol_print_date(dol_now(), '%Y'); - $year_end = $year_start + 1; - $month_end = $month_start - 1; - if ($month_end < 1) - { - $month_end = 12; - $year_end--; + $query = "SELECT date_start, date_end from ".MAIN_DB_PREFIX."accounting_fiscalyear "; + $query .= " where date_start < now() and date_end > now() limit 1"; + $res = $db->query($query); + if ($res->num_rows > 0) { + $fiscalYear = $db->fetch_object($res); + $search_date_start = strtotime($fiscalYear->date_start); + $search_date_end = strtotime($fiscalYear->date_end); + } else { + $month_start= ($conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START):1); + $year_start = dol_print_date(dol_now(), '%Y'); + $year_end = $year_start + 1; + $month_end = $month_start - 1; + if ($month_end < 1) + { + $month_end = 12; + $year_end--; + } + $search_date_start = dol_mktime(0, 0, 0, $month_start, 1, $year_start); + $search_date_end = dol_get_last_day($year_end, $month_end); } - $search_date_start = dol_mktime(0, 0, 0, $month_start, 1, $year_start); - $search_date_end = dol_get_last_day($year_end, $month_end); } diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php index e1fa349bccc..c4be9d99181 100644 --- a/htdocs/accountancy/bookkeeping/listbyaccount.php +++ b/htdocs/accountancy/bookkeeping/listbyaccount.php @@ -40,22 +40,8 @@ $page = GETPOST("page"); $sortorder = GETPOST("sortorder"); $sortfield = GETPOST("sortfield"); $action = GETPOST('action', 'alpha'); - -if (empty($search_date_start)) -{ - $month_start= ($conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START):1); - $year_start = dol_print_date(dol_now(), '%Y'); - $year_end = $year_start + 1; - $month_end = $month_start - 1; - if ($month_end < 1) - { - $month_end = 12; - $year_end--; - } - $search_date_start = dol_mktime(0, 0, 0, $month_start, 1, $year_start); - $search_date_end = dol_get_last_day($year_end, $month_end); -} - +$search_date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int')); +$search_date_end = dol_mktime(0, 0, 0, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int')); $search_doc_date = dol_mktime(0, 0, 0, GETPOST('doc_datemonth', 'int'), GETPOST('doc_dateday', 'int'), GETPOST('doc_dateyear', 'int')); @@ -84,8 +70,30 @@ $pagenext = $page + 1; if ($sortorder == "") $sortorder = "ASC"; if ($sortfield == "") $sortfield = "t.rowid"; -if (empty($search_date_start)) $search_date_start = dol_mktime(0, 0, 0, 1, 1, dol_print_date(dol_now(), '%Y')); -if (empty($search_date_end)) $search_date_end = dol_mktime(0, 0, 0, 12, 31, dol_print_date(dol_now(), '%Y')); +if (empty($search_date_start)) { + $sql = "SELECT date_start, date_end from ".MAIN_DB_PREFIX."accounting_fiscalyear "; + $sql .= " where date_start < now() and date_end > now() limit 1"; + $res = $db->query($sql); + if ($res->num_rows > 0) { + $fiscalYear = $db->fetch_object($res); + $search_date_start = strtotime($fiscalYear->date_start); + $search_date_end = strtotime($fiscalYear->date_end); + } else { + $month_start= ($conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START):1); + $year_start = dol_print_date(dol_now(), '%Y'); + $year_end = $year_start + 1; + $month_end = $month_start - 1; + if ($month_end < 1) + { + $month_end = 12; + $year_end--; + } + $search_date_start = dol_mktime(0, 0, 0, $month_start, 1, $year_start); + $search_date_end = dol_get_last_day($year_end, $month_end); + $search_date_start = dol_mktime(0, 0, 0, 1, 1, dol_print_date(dol_now(), '%Y')); + $search_date_end = dol_mktime(0, 0, 0, 12, 31, dol_print_date(dol_now(), '%Y')); + } +} $object = new BookKeeping($db); diff --git a/htdocs/accountancy/bookkeeping/listbyyear.php b/htdocs/accountancy/bookkeeping/listbyyear.php index 6891e1d8947..dc46b28677a 100644 --- a/htdocs/accountancy/bookkeeping/listbyyear.php +++ b/htdocs/accountancy/bookkeeping/listbyyear.php @@ -71,8 +71,26 @@ $formaccounting = new FormAccounting($db); // Filter if (empty($search_date_start)) { - $search_date_start = dol_mktime(0, 0, 0, 1, 1, dol_print_date(dol_now(), '%Y')); - $search_date_end = dol_mktime(0, 0, 0, 12, 31, dol_print_date(dol_now(), '%Y')); + $sql = "SELECT date_start, date_end from ".MAIN_DB_PREFIX."accounting_fiscalyear "; + $sql .= " where date_start < now() and date_end > now() limit 1"; + $res = $db->query($sql); + if ($res->num_rows > 0) { + $fiscalYear = $db->fetch_object($res); + $search_date_start = strtotime($fiscalYear->date_start); + $search_date_end = strtotime($fiscalYear->date_end); + } else { + $month_start= ($conf->global->SOCIETE_FISCAL_MONTH_START?($conf->global->SOCIETE_FISCAL_MONTH_START):1); + $year_start = dol_print_date(dol_now(), '%Y'); + $year_end = $year_start + 1; + $month_end = $month_start - 1; + if ($month_end < 1) + { + $month_end = 12; + $year_end--; + } + $search_date_start = dol_mktime(0, 0, 0, $month_start, 1, $year_start); + $search_date_end = dol_get_last_day($year_end, $month_end); + } } if ($sortorder == "") $sortorder = "ASC"; From 15ed7584b80f2e283780e190434d7b8d31925ec0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 11 Jan 2018 17:06:06 +0100 Subject: [PATCH 0172/1074] Fix navigation in accounting account card --- htdocs/accountancy/admin/card.php | 38 ++++++++----------- .../class/accountingaccount.class.php | 20 ++++++++++ htdocs/core/class/html.form.class.php | 1 - .../install/mysql/migration/6.0.0-7.0.0.sql | 4 ++ htdocs/install/repair.php | 5 ++- 5 files changed, 44 insertions(+), 24 deletions(-) diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php index 79a8a531ec9..82ba00a882c 100644 --- a/htdocs/accountancy/admin/card.php +++ b/htdocs/accountancy/admin/card.php @@ -39,6 +39,7 @@ $mesg = ''; $action = GETPOST('action','aZ09'); $backtopage = GETPOST('backtopage','alpha'); $id = GETPOST('id', 'int'); +$ref = GETPOST('ref', 'alpha'); $rowid = GETPOST('rowid', 'int'); $cancel = GETPOST('cancel','alpha'); @@ -261,8 +262,10 @@ if ($action == 'create') { print ''; print ''; -} else if ($id) { - $result = $object->fetch($id); +} +else if ($id > 0 || $ref) { + + $result = $object->fetch($id, $ref, 1); if ($result > 0) { dol_htmloutput_mesg($mesg); @@ -329,17 +332,18 @@ if ($action == 'create') { // View mode $linkback = '' . $langs->trans("BackToList") . ''; - dol_fiche_head($head, 'card', $langs->trans('AccountAccounting'), 0, 'billr'); + dol_fiche_head($head, 'card', $langs->trans('AccountAccounting'), -1, 'billr'); + + dol_banner_tab($object, 'ref', $linkback, 1, 'account_number', 'ref'); + + + print '
    '; + print '
    '; print '
    '.$langs->trans("Ref").''.$langs->trans("DateCreation").''.$langs->trans("DateStart").''.$langs->trans("DateEnd").'
    '.$langs->trans("DateSubscription").''; + print ''.$langs->trans("DateSubscription").''; if (GETPOST('reday')) { $datefrom=dol_mktime(0,0,0,GETPOST('remonth'),GETPOST('reday'),GETPOST('reyear')); From e141d439997a3a15d89c96a2092422d6b090c5cd Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 10 Jan 2018 13:14:30 +0100 Subject: [PATCH 0149/1074] Fix bad links with mobile --- htdocs/core/class/html.formother.class.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php index ae1ec52a788..3c27a8f05fd 100644 --- a/htdocs/core/class/html.formother.class.php +++ b/htdocs/core/class/html.formother.class.php @@ -1004,7 +1004,10 @@ class FormOther if (! empty($boxidactivatedforuser[$box->id])) continue; // Already visible for user $label=$langs->transnoentitiesnoconv($box->boxlabel); //if (preg_match('/graph/',$box->class)) $label.=' ('.$langs->trans("Graph").')'; - if (preg_match('/graph/',$box->class)) $label=$label.' '; + if (preg_match('/graph/',$box->class) && empty($conf->browser->phone)) + { + $label=$label.' '; + } $arrayboxtoactivatelabel[$box->id]=$label; // We keep only boxes not shown for user, to show into combo list } foreach($boxidactivatedforuser as $boxid) From 43d560830c2ed3439d3467eaadfc8059239cdbc3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 10 Jan 2018 13:20:43 +0100 Subject: [PATCH 0150/1074] Fix on old php --- htdocs/comm/propal/card.php | 2 +- htdocs/commande/card.php | 2 +- htdocs/compta/facture/card.php | 2 +- htdocs/product/admin/product.php | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index c7e4f538103..bf0c691084f 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -843,7 +843,7 @@ if (empty($reshook)) } } // If price per quantity and customer - elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY&PRODUIT_MULTIPRICES)) + elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) { // TODO Same than PRODUIT_CUSTOMER_PRICES_BY_QTY but using $object->thirdparty->price_level } diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 29134010dd6..2d4d138f61a 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -803,7 +803,7 @@ if (empty($reshook)) } } // If price per quantity and customer - elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY&PRODUIT_MULTIPRICES)) + elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) { // TODO Same than PRODUIT_CUSTOMER_PRICES_BY_QTY but using $object->thirdparty->price_level } diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index 5207ca83b91..234ccf281f0 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -1706,7 +1706,7 @@ if (empty($reshook)) } } // If price per quantity and customer - elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY&PRODUIT_MULTIPRICES)) + elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) { // TODO Same than PRODUIT_CUSTOMER_PRICES_BY_QTY but using $object->thirdparty->price_level } diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php index abfe82d0dff..e4b904b33b0 100644 --- a/htdocs/product/admin/product.php +++ b/htdocs/product/admin/product.php @@ -56,8 +56,8 @@ $select_pricing_rules=array( ); $keyforparam='PRODUIT_CUSTOMER_PRICES_BY_QTY'; if ($conf->global->MAIN_FEATURES_LEVEL >= 2 || ! empty($conf->global->$keyforparam)) $select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY'] = $langs->trans('PriceByQuantity').' ('.$langs->trans("VersionExperimental").')'; // TODO If this is enabled, price must be hidden when price by qty is enabled, also price for quantity must be used when adding product into order/propal/invoice -$keyforparam='PRODUIT_CUSTOMER_PRICES_BY_QTY&PRODUIT_MULTIPRICES'; -if ($conf->global->MAIN_FEATURES_LEVEL >= 2 || ! empty($conf->global->$keyforparam)) $select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY&PRODUIT_MULTIPRICES'] = $langs->trans('MultiPricesAbility') . '+' . $langs->trans('PriceByQuantity').' ('.$langs->trans("VersionExperimental").')'; +$keyforparam='PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES'; +if ($conf->global->MAIN_FEATURES_LEVEL >= 2 || ! empty($conf->global->$keyforparam)) $select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES'] = $langs->trans('MultiPricesAbility') . '+' . $langs->trans('PriceByQuantity').' ('.$langs->trans("VersionExperimental").')'; // Clean param if (! empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_MULTIPRICES_LIMIT)) { @@ -553,7 +553,7 @@ $current_rule = 'PRODUCT_PRICE_UNIQ'; if (!empty($conf->global->PRODUIT_MULTIPRICES)) $current_rule='PRODUIT_MULTIPRICES'; if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) $current_rule='PRODUIT_CUSTOMER_PRICES_BY_QTY'; if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) $current_rule='PRODUIT_CUSTOMER_PRICES'; -if ((!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) && (!empty($conf->global->PRODUIT_MULTIPRICES))) $current_rule='PRODUIT_CUSTOMER_PRICES_BY_QTY&PRODUIT_MULTIPRICES'; +if ((!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) && (!empty($conf->global->PRODUIT_MULTIPRICES))) $current_rule='PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES'; print $form->selectarray("princingrule",$select_pricing_rules,$current_rule); if ( empty($conf->multicompany->enabled)) { From 8c3b4f62db33508f3d1938cef30f1ef312e110f1 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 10 Jan 2018 13:30:57 +0100 Subject: [PATCH 0151/1074] Fix: wrong entity with thirdparty sharing --- htdocs/societe/card.php | 129 +++++++++++++------------ htdocs/societe/class/societe.class.php | 2 +- 2 files changed, 66 insertions(+), 65 deletions(-) diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php index 2f3e42f62ac..fa5f20b094e 100644 --- a/htdocs/societe/card.php +++ b/htdocs/societe/card.php @@ -3,7 +3,7 @@ * Copyright (C) 2003 Brian Fraval * Copyright (C) 2004-2015 Laurent Destailleur * Copyright (C) 2005 Eric Seigne - * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2005-2017 Regis Houssin * Copyright (C) 2008 Patrick Raguin * Copyright (C) 2010-2016 Juanjo Menent * Copyright (C) 2011-2013 Alexandre Spangaro @@ -56,9 +56,9 @@ if (! empty($conf->notification->enabled)) $langs->load("mails"); $mesg=''; $error=0; $errors=array(); $action = (GETPOST('action','aZ09') ? GETPOST('action','aZ09') : 'view'); -$cancel = GETPOST('cancel','alpha'); -$backtopage = GETPOST('backtopage','alpha'); -$confirm = GETPOST('confirm'); +$cancel = GETPOST('cancel','alpha'); +$backtopage = GETPOST('backtopage','alpha'); +$confirm = GETPOST('confirm'); $socid = GETPOST('socid','int')?GETPOST('socid','int'):GETPOST('id','int'); if ($user->societe_id) $socid=$user->societe_id; @@ -351,82 +351,83 @@ if (empty($reshook)) if (! $error) { - if ($action == 'update') + if ($action == 'update') { - $ret=$object->fetch($socid); + $ret=$object->fetch($socid); $object->oldcopy = clone $object; } else $object->canvas=$canvas; if (GETPOST("private") == 1) // Ask to create a contact { - $object->particulier = GETPOST("private"); + $object->particulier = GETPOST("private"); - $object->name = dolGetFirstLastname(GETPOST('firstname','alpha'),GETPOST('name','alpha')); - $object->civility_id = GETPOST('civility_id'); // Note: civility id is a code, not an int + $object->name = dolGetFirstLastname(GETPOST('firstname','alpha'),GETPOST('name','alpha')); + $object->civility_id = GETPOST('civility_id'); // Note: civility id is a code, not an int // Add non official properties - $object->name_bis = GETPOST('name','alpha'); - $object->firstname = GETPOST('firstname','alpha'); + $object->name_bis = GETPOST('name','alpha'); + $object->firstname = GETPOST('firstname','alpha'); } else { - $object->name = GETPOST('name', 'alpha'); + $object->name = GETPOST('name', 'alpha'); } - $object->name_alias = GETPOST('name_alias'); - $object->address = GETPOST('address'); - $object->zip = GETPOST('zipcode', 'alpha'); - $object->town = GETPOST('town', 'alpha'); - $object->country_id = GETPOST('country_id', 'int'); - $object->state_id = GETPOST('state_id', 'int'); - $object->skype = GETPOST('skype', 'alpha'); - $object->phone = GETPOST('phone', 'alpha'); - $object->fax = GETPOST('fax','alpha'); - $object->email = trim(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL)); - $object->url = trim(GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL)); - $object->idprof1 = trim(GETPOST('idprof1', 'alpha')); - $object->idprof2 = trim(GETPOST('idprof2', 'alpha')); - $object->idprof3 = trim(GETPOST('idprof3', 'alpha')); - $object->idprof4 = trim(GETPOST('idprof4', 'alpha')); - $object->idprof5 = trim(GETPOST('idprof5', 'alpha')); - $object->idprof6 = trim(GETPOST('idprof6', 'alpha')); - $object->prefix_comm = GETPOST('prefix_comm', 'alpha'); - $object->code_client = GETPOST('code_client', 'alpha'); - $object->code_fournisseur = GETPOST('code_fournisseur', 'alpha'); - $object->capital = GETPOST('capital', 'alpha'); - $object->barcode = GETPOST('barcode', 'alpha'); + $object->entity = (GETPOSTISSET('entity')?GETPOST('entity', 'int'):$conf->entity); + $object->name_alias = GETPOST('name_alias'); + $object->address = GETPOST('address'); + $object->zip = GETPOST('zipcode', 'alpha'); + $object->town = GETPOST('town', 'alpha'); + $object->country_id = GETPOST('country_id', 'int'); + $object->state_id = GETPOST('state_id', 'int'); + $object->skype = GETPOST('skype', 'alpha'); + $object->phone = GETPOST('phone', 'alpha'); + $object->fax = GETPOST('fax','alpha'); + $object->email = trim(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL)); + $object->url = trim(GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL)); + $object->idprof1 = trim(GETPOST('idprof1', 'alpha')); + $object->idprof2 = trim(GETPOST('idprof2', 'alpha')); + $object->idprof3 = trim(GETPOST('idprof3', 'alpha')); + $object->idprof4 = trim(GETPOST('idprof4', 'alpha')); + $object->idprof5 = trim(GETPOST('idprof5', 'alpha')); + $object->idprof6 = trim(GETPOST('idprof6', 'alpha')); + $object->prefix_comm = GETPOST('prefix_comm', 'alpha'); + $object->code_client = GETPOST('code_client', 'alpha'); + $object->code_fournisseur = GETPOST('code_fournisseur', 'alpha'); + $object->capital = GETPOST('capital', 'alpha'); + $object->barcode = GETPOST('barcode', 'alpha'); - $object->tva_intra = GETPOST('tva_intra', 'alpha'); - $object->tva_assuj = GETPOST('assujtva_value', 'alpha'); - $object->status = GETPOST('status', 'alpha'); + $object->tva_intra = GETPOST('tva_intra', 'alpha'); + $object->tva_assuj = GETPOST('assujtva_value', 'alpha'); + $object->status = GETPOST('status', 'alpha'); // Local Taxes - $object->localtax1_assuj = GETPOST('localtax1assuj_value', 'alpha'); - $object->localtax2_assuj = GETPOST('localtax2assuj_value', 'alpha'); + $object->localtax1_assuj = GETPOST('localtax1assuj_value', 'alpha'); + $object->localtax2_assuj = GETPOST('localtax2assuj_value', 'alpha'); - $object->localtax1_value = GETPOST('lt1', 'alpha'); - $object->localtax2_value = GETPOST('lt2', 'alpha'); + $object->localtax1_value = GETPOST('lt1', 'alpha'); + $object->localtax2_value = GETPOST('lt2', 'alpha'); - $object->forme_juridique_code = GETPOST('forme_juridique_code', 'int'); - $object->effectif_id = GETPOST('effectif_id', 'int'); - $object->typent_id = GETPOST('typent_id','int'); + $object->forme_juridique_code = GETPOST('forme_juridique_code', 'int'); + $object->effectif_id = GETPOST('effectif_id', 'int'); + $object->typent_id = GETPOST('typent_id','int'); - $object->typent_code = dol_getIdFromCode($db, $object->typent_id, 'c_typent', 'id', 'code'); // Force typent_code too so check in verify() will be done on new type + $object->typent_code = dol_getIdFromCode($db, $object->typent_id, 'c_typent', 'id', 'code'); // Force typent_code too so check in verify() will be done on new type - $object->client = GETPOST('client', 'int'); - $object->fournisseur = GETPOST('fournisseur', 'int'); + $object->client = GETPOST('client', 'int'); + $object->fournisseur = GETPOST('fournisseur', 'int'); - $object->commercial_id = GETPOST('commercial_id', 'int'); - $object->default_lang = GETPOST('default_lang'); + $object->commercial_id = GETPOST('commercial_id', 'int'); + $object->default_lang = GETPOST('default_lang'); // Webservices url/key - $object->webservices_url = GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL); - $object->webservices_key = GETPOST('webservices_key', 'san_alpha'); + $object->webservices_url = GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL); + $object->webservices_key = GETPOST('webservices_key', 'san_alpha'); // Incoterms if (!empty($conf->incoterm->enabled)) { - $object->fk_incoterms = GETPOST('incoterm_id', 'int'); - $object->location_incoterms = GETPOST('location_incoterms', 'alpha'); + $object->fk_incoterms = GETPOST('incoterm_id', 'int'); + $object->location_incoterms = GETPOST('location_incoterms', 'alpha'); } // Multicurrency @@ -499,17 +500,17 @@ if (empty($reshook)) $result = $object->create($user); if ($result >= 0) - { - if ($object->particulier) - { - dol_syslog("We ask to create a contact/address too", LOG_DEBUG); - $result=$object->create_individual($user); - if ($result < 0) - { - setEventMessages($object->error, $object->errors, 'errors'); - $error++; - } - } + { + if ($object->particulier) + { + dol_syslog("We ask to create a contact/address too", LOG_DEBUG); + $result=$object->create_individual($user); + if ($result < 0) + { + setEventMessages($object->error, $object->errors, 'errors'); + $error++; + } + } // Customer categories association $custcats = GETPOST('custcats', 'array'); diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 9f8c57d145f..d17f9a266e4 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -472,7 +472,7 @@ class Societe extends CommonObject if ($result >= 0) { $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe (nom, name_alias, entity, datec, fk_user_creat, canvas, status, ref_int, ref_ext, fk_stcomm, fk_incoterms, location_incoterms ,import_key, fk_multicurrency, multicurrency_code)"; - $sql.= " VALUES ('".$this->db->escape($this->name)."', '".$this->db->escape($this->name_alias)."', ".$conf->entity.", '".$this->db->idate($now)."'"; + $sql.= " VALUES ('".$this->db->escape($this->name)."', '".$this->db->escape($this->name_alias)."', ".$this->entity.", '".$this->db->idate($now)."'"; $sql.= ", ".(! empty($user->id) ? "'".$user->id."'":"null"); $sql.= ", ".(! empty($this->canvas) ? "'".$this->db->escape($this->canvas)."'":"null"); $sql.= ", ".$this->status; From d99535d9da8af239e41ecdcb1299295fe52fd40a Mon Sep 17 00:00:00 2001 From: Ferran Marcet Date: Wed, 10 Jan 2018 16:40:43 +0100 Subject: [PATCH 0152/1074] Fix: Still using property ->client instead of ->thirdparty. --- .../contract/doc/doc_generic_contract_odt.modules.php | 5 +++-- .../modules/product/doc/doc_generic_product_odt.modules.php | 4 ++-- .../core/modules/user/doc/doc_generic_user_odt.modules.php | 4 ++-- .../usergroup/doc/doc_generic_usergroup_odt.modules.php | 4 ++-- htdocs/fichinter/card.php | 6 +++--- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php index f9dac51389f..72ea8925177 100644 --- a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php +++ b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php @@ -1,6 +1,7 @@ * Copyright (C) 2012 Juanjo Menent + * Copyright (C) 2018 Ferran Marcet * * 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 @@ -280,14 +281,14 @@ class doc_generic_contract_odt extends ModelePDFContract // On peut utiliser le nom de la societe du contact if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact; else { - $socobject = $object->client; + $socobject = $object->thirdparty; // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use $contactobject = $object->contact; } } else { - $socobject=$object->client; + $socobject=$object->thirdparty; } // Make substitution $substitutionarray=array( diff --git a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php index 811a99d5b2a..a05e1d6327f 100644 --- a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php +++ b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php @@ -307,14 +307,14 @@ class doc_generic_product_odt extends ModelePDFProduct // On peut utiliser le nom de la societe du contact if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact; else { - $socobject = $object->client; + $socobject = $object->thirdparty; // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use $contactobject = $object->contact; } } else { - $socobject=$object->client; + $socobject=$object->thirdparty; } // Make substitution $substitutionarray=array( diff --git a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php index 11ae5729b3b..ee329b0bd7a 100644 --- a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php +++ b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php @@ -304,14 +304,14 @@ class doc_generic_user_odt extends ModelePDFUser // On peut utiliser le nom de la societe du contact if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact; else { - $socobject = $object->client; + $socobject = $object->thirdparty; // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use $contactobject = $object->contact; } } else { - $socobject=$object->client; + $socobject=$object->thirdparty; } // Open and load template diff --git a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php index 35367052796..fe54e587e46 100644 --- a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php +++ b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php @@ -306,14 +306,14 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup // On peut utiliser le nom de la societe du contact if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact; else { - $socobject = $object->client; + $socobject = $object->thirdparty; // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use $contactobject = $object->contact; } } else { - $socobject=$object->client; + $socobject=$object->thirdparty; } // Make substitution $substitutionarray=array( diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index 2cce9534873..c8951a3f035 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -4,7 +4,7 @@ * Copyright (C) 2005-2015 Regis Houssin * Copyright (C) 2011-2017 Juanjo Menent * Copyright (C) 2013 Florian Henry - * Copyright (C) 2014-2015 Ferran Marcet + * Copyright (C) 2014-2018 Ferran Marcet * Copyright (C) 2014-2015 Charlie Benke * Copyright (C) 2015-2016 Abbes Bahfir * @@ -297,7 +297,7 @@ if (empty($reshook)) $outputlangs = $langs; $newlang=''; if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09'); - if (empty($newlang)) $newlang=$srcobject->client->default_lang; + if (empty($newlang)) $newlang=$srcobject->thirdparty->default_lang; if (! empty($newlang)) { $outputlangs = new Translate("",$conf); $outputlangs->setDefaultLang($newlang); @@ -878,7 +878,7 @@ if ($action == 'create') $projectid = (!empty($objectsrc->fk_project)?$objectsrc->fk_project:''); - $soc = $objectsrc->client; + $soc = $objectsrc->thirdparty; $note_private = (! empty($objectsrc->note) ? $objectsrc->note : (! empty($objectsrc->note_private) ? $objectsrc->note_private : GETPOST('note_private'))); $note_public = (! empty($objectsrc->note_public) ? $objectsrc->note_public : GETPOST('note_public')); From f2b8c3c97d270eee244d40113c662857bac5d82f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 10 Jan 2018 18:19:54 +0100 Subject: [PATCH 0153/1074] Fix check of customer/supplier code --- .../modules/societe/mod_codeclient_elephant.php | 8 +++++--- .../core/modules/societe/mod_codeclient_monkey.php | 13 +++++++------ htdocs/societe/class/societe.class.php | 8 ++++---- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php index d6a6da23a94..993bb2ed2b3 100644 --- a/htdocs/core/modules/societe/mod_codeclient_elephant.php +++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php @@ -297,12 +297,14 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode * @param DoliDB $db Handler acces base * @param string $code Code a verifier * @param Societe $soc Objet societe + * @param int $type 0 = customer/prospect , 1 = supplier * @return int 0 if available, <0 if KO */ - function verif_dispo($db, $code, $soc) + function verif_dispo($db, $code, $soc, $type=0) { - $sql = "SELECT code_client FROM ".MAIN_DB_PREFIX."societe"; - $sql.= " WHERE code_client = '".$code."'"; + $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe"; + if ($type == 1) $sql.= " WHERE code_fournisseur = '".$code."'"; + else $sql.= " WHERE code_client = '".$code."'"; if ($soc->id > 0) $sql.= " AND rowid <> ".$soc->id; $resql=$db->query($sql); diff --git a/htdocs/core/modules/societe/mod_codeclient_monkey.php b/htdocs/core/modules/societe/mod_codeclient_monkey.php index e942e747794..f4d9e5b4b33 100644 --- a/htdocs/core/modules/societe/mod_codeclient_monkey.php +++ b/htdocs/core/modules/societe/mod_codeclient_monkey.php @@ -182,7 +182,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode { if ($this->verif_syntax($code) >= 0) { - $is_dispo = $this->verif_dispo($db, $code, $soc); + $is_dispo = $this->verif_dispo($db, $code, $soc, $type); if ($is_dispo <> 0) { $result=-3; @@ -205,7 +205,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode } } - dol_syslog(get_class($this)."::verif type=".$type." result=".$result); + dol_syslog(get_class($this)."::verif code=".$code." type=".$type." result=".$result); return $result; } @@ -216,14 +216,16 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode * @param DoliDB $db Handler acces base * @param string $code Code a verifier * @param Societe $soc Objet societe + * @param int $type 0 = customer/prospect , 1 = supplier * @return int 0 if available, <0 if KO */ - function verif_dispo($db, $code, $soc) + function verif_dispo($db, $code, $soc, $type=0) { global $conf, $mc; - $sql = "SELECT code_client FROM ".MAIN_DB_PREFIX."societe"; - $sql.= " WHERE code_client = '".$code."'"; + $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe"; + if ($type == 1) $sql.= " WHERE code_fournisseur = '".$code."'"; + else $sql.= " WHERE code_client = '".$code."'"; $sql.= " AND entity IN (".getEntity('societe').")"; if ($soc->id > 0) $sql.= " AND rowid <> ".$soc->id; @@ -244,7 +246,6 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode { return -2; } - } diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 34724c844d5..cfa07c4f7c4 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -462,8 +462,8 @@ class Societe extends CommonObject $this->db->begin(); // For automatic creation during create action (not used by Dolibarr GUI, can be used by scripts) - if ($this->code_client == -1) $this->get_codeclient($this,0); - if ($this->code_fournisseur == -1) $this->get_codefournisseur($this,1); + if ($this->code_client == -1 || $this->code_client === 'auto') $this->get_codeclient($this,0); + if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') $this->get_codefournisseur($this,1); // Check more parameters (including mandatory setup // If error, this->errors[] is filled @@ -812,8 +812,8 @@ class Societe extends CommonObject $this->barcode=trim($this->barcode); // For automatic creation - if ($this->code_client == -1) $this->get_codeclient($this,0); - if ($this->code_fournisseur == -1) $this->get_codefournisseur($this,1); + if ($this->code_client == -1 || $this->code_client === 'auto') $this->get_codeclient($this,0); + if ($this->code_fournisseur == -1 || $this->code_fournisseur === 'auto') $this->get_codefournisseur($this,1); $this->code_compta=trim($this->code_compta); $this->code_compta_fournisseur=trim($this->code_compta_fournisseur); From 0bd45dc64bf93312a4ca19e468442393fd0d07ae Mon Sep 17 00:00:00 2001 From: florian HENRY Date: Wed, 10 Jan 2018 20:34:32 +0100 Subject: [PATCH 0154/1074] fix: search translation into external module files also --- htdocs/admin/translation.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php index 651335d0a6d..0c4df916943 100644 --- a/htdocs/admin/translation.php +++ b/htdocs/admin/translation.php @@ -367,6 +367,14 @@ if ($mode == 'searchkey') foreach($filearray as $file) { $tmpfile=preg_replace('/.lang/i', '', basename($file['name'])); + //Detect if trans coming from extranl module + foreach ($conf->file->dol_document_root as $keyconf=>$dirconfalt) { + if (($keyconf!='main') && (preg_match('$'.preg_quote($dirconfalt).'$i', $file['fullname']))) { + //In this case load modulename@nmodulename + $tmpfile=$tmpfile.'@'.$tmpfile; + break; + } + } $newlang->load($tmpfile, 0, 0, '', 0); // Load translation files + database overwrite $newlangfileonly->load($tmpfile, 0, 0, '', 1); // Load translation files only //print 'After loading lang '.$tmpfile.', newlang has '.count($newlang->tab_translate).' records
    '."\n"; From 5af39e80e05ded505d237756bab9457bccb8b300 Mon Sep 17 00:00:00 2001 From: HENRY Florian Date: Wed, 10 Jan 2018 20:38:06 +0100 Subject: [PATCH 0155/1074] Update price.php --- htdocs/product/price.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 4feb4f8abec..cfe4c474d5c 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -463,7 +463,7 @@ if (empty($reshook)) $sql = "DELETE FROM " . MAIN_DB_PREFIX . "product_price_by_qty"; $sql .= " WHERE rowid = " . $rowid; - $result = $db->query($sql) + $result = $db->query($sql); } else { setEventMessage('delete_price_by_qty Missing Ids','errors'); } From 8000777864bf54eb4a7b8023ec8949d8175d4543 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 10 Jan 2018 20:43:56 +0100 Subject: [PATCH 0156/1074] Code comment --- htdocs/compta/paiement/class/paiement.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php index 4fa9c5b9575..a7bc5249f46 100644 --- a/htdocs/compta/paiement/class/paiement.class.php +++ b/htdocs/compta/paiement/class/paiement.class.php @@ -143,7 +143,7 @@ class Paiement extends CommonObject * @param int $closepaidinvoices 1=Also close payed invoices to paid, 0=Do nothing more * @return int id of created payment, < 0 if error */ - function create($user,$closepaidinvoices=0) + function create($user, $closepaidinvoices=0) { global $conf, $langs; @@ -154,7 +154,7 @@ class Paiement extends CommonObject // Clean parameters $totalamount = 0; $atleastonepaymentnotnull = 0; - foreach ($this->amounts as $key => $value) // How payment is dispatch + foreach ($this->amounts as $key => $value) // How payment is dispatched (invoice id => amount) { $newvalue = price2num($value,'MT'); $this->amounts[$key] = $newvalue; @@ -696,7 +696,7 @@ class Paiement extends CommonObject /** * Information sur l'objet - * + * * @param int $id id du paiement dont il faut afficher les infos * @return void */ From 436b653fa09521ebdd5473b9d49ecc28224ca22e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 11 Jan 2018 00:16:45 +0100 Subject: [PATCH 0157/1074] Error report --- htdocs/compta/facture/class/facture.class.php | 2 +- htdocs/compta/paiement/class/paiement.class.php | 3 ++- htdocs/core/lib/functions.lib.php | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 915200ab2d2..f1d8c5d1a46 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -1342,7 +1342,7 @@ class Facture extends CommonInvoice } else { - $this->error='Bill with id '.$rowid.' or ref '.$ref.' not found'; + $this->error='Bill with id='.$rowid.' or ref='.$ref.' or ref_ext='.$ref_ext.' not found'; dol_syslog(get_class($this)."::fetch Error ".$this->error, LOG_ERR); return 0; } diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php index f8dd19ae7e5..367b156f196 100644 --- a/htdocs/compta/paiement/class/paiement.class.php +++ b/htdocs/compta/paiement/class/paiement.class.php @@ -147,7 +147,7 @@ class Paiement extends CommonObject * @param int $closepaidinvoices 1=Also close payed invoices to paid, 0=Do nothing more * @return int id of created payment, < 0 if error */ - function create($user,$closepaidinvoices=0) + function create($user, $closepaidinvoices=0) { global $conf, $langs; @@ -190,6 +190,7 @@ class Paiement extends CommonObject // Check parameters if (empty($totalamount) && empty($atleastonepaymentnotnull)) // We accept negative amounts for withdraw reject but not empty arrays { + $this->errors[]='TotalAmountEmpty'; $this->error='TotalAmountEmpty'; return -1; } diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index f180dcad405..cfac17ac326 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -6174,6 +6174,7 @@ function dol_getIdFromCode($db, $key, $tablename, $fieldkey='code', $fieldid='id $sql.= " WHERE ".$fieldkey." = '".$db->escape($key)."'"; if (! empty($entityfilter)) $sql.= " AND entity IN (" . getEntity($tablename) . ")"; + dol_syslog('dol_getIdFromCode', LOG_DEBUG); $resql = $db->query($sql); if ($resql) From 9253fed75414e75562f56d85c3cde2efb7e3263c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 11 Jan 2018 00:17:32 +0100 Subject: [PATCH 0158/1074] Revert "Code comment" This reverts commit 8000777864bf54eb4a7b8023ec8949d8175d4543. --- htdocs/compta/paiement/class/paiement.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php index a7bc5249f46..4fa9c5b9575 100644 --- a/htdocs/compta/paiement/class/paiement.class.php +++ b/htdocs/compta/paiement/class/paiement.class.php @@ -143,7 +143,7 @@ class Paiement extends CommonObject * @param int $closepaidinvoices 1=Also close payed invoices to paid, 0=Do nothing more * @return int id of created payment, < 0 if error */ - function create($user, $closepaidinvoices=0) + function create($user,$closepaidinvoices=0) { global $conf, $langs; @@ -154,7 +154,7 @@ class Paiement extends CommonObject // Clean parameters $totalamount = 0; $atleastonepaymentnotnull = 0; - foreach ($this->amounts as $key => $value) // How payment is dispatched (invoice id => amount) + foreach ($this->amounts as $key => $value) // How payment is dispatch { $newvalue = price2num($value,'MT'); $this->amounts[$key] = $newvalue; @@ -696,7 +696,7 @@ class Paiement extends CommonObject /** * Information sur l'objet - * + * * @param int $id id du paiement dont il faut afficher les infos * @return void */ From 4747e84b742310050efc7583c7ae6532ee2082f9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 11 Jan 2018 00:40:33 +0100 Subject: [PATCH 0159/1074] Update price.php --- htdocs/product/price.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/product/price.php b/htdocs/product/price.php index cfe4c474d5c..a2afb5f9bb8 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -411,10 +411,10 @@ if (empty($reshook)) // Récupération des variables $rowid = GETPOST('rowid','int'); $priceid = GETPOST('priceid','int'); - $newprice = price2num(GETPOST("price",'int'), 'MU'); + $newprice = price2num(GETPOST("price",'alpha'), 'MU'); // $newminprice=price2num(GETPOST("price_min"),'MU'); // TODO : Add min price management $quantity = GETPOST('quantity','int'); - $remise_percent = price2num(GETPOST('remise_percent','int')); + $remise_percent = price2num(GETPOST('remise_percent','alpha')); $remise = 0; // TODO : allow discount by amount when available on documents if (empty($quantity)) { From e41f761157191466469ef012f561b83fe1450d1a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 11 Jan 2018 00:47:29 +0100 Subject: [PATCH 0160/1074] Fix ident --- htdocs/societe/contact.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/htdocs/societe/contact.php b/htdocs/societe/contact.php index 4a875ef5e52..4077c1e1b28 100644 --- a/htdocs/societe/contact.php +++ b/htdocs/societe/contact.php @@ -171,17 +171,17 @@ else { print '
    '; - // Contacts list - if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) - { - $result=show_contacts($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id); - } + // Contacts list + if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) + { + $result=show_contacts($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id); + } - // Addresses list - if (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT)) - { - $result=show_addresses($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id); - } + // Addresses list + if (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT)) + { + $result=show_addresses($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id); + } print '
    '; From a11cb8dcbf1a3fdf5a6d0414cbed47581e25f722 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 11 Jan 2018 01:06:50 +0100 Subject: [PATCH 0161/1074] Update card.php --- htdocs/societe/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php index fa5f20b094e..2dc70b74c7d 100644 --- a/htdocs/societe/card.php +++ b/htdocs/societe/card.php @@ -2499,7 +2499,7 @@ else print ''; - if (! empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) + if (! empty($conf->global->MAIN_DUPLICATE_CONTACTS_TAB_ON_MAIN_CARD)) { // Contacts list if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) From a4ab37e990e24fee528f68eeb7bdbca7f1b864ab Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 11 Jan 2018 01:16:14 +0100 Subject: [PATCH 0162/1074] Remove deprecated field --- htdocs/societe/class/api_thirdparties.class.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php index 9fd95a13a65..9ada3510a4a 100644 --- a/htdocs/societe/class/api_thirdparties.class.php +++ b/htdocs/societe/class/api_thirdparties.class.php @@ -494,6 +494,8 @@ class Thirdparties extends DolibarrApi $object = parent::_cleanObjectDatas($object); + unset($object->nom); // ->name already defined and nom deprecated + unset($object->total_ht); unset($object->total_tva); unset($object->total_localtax1); From dbb9caa196f61f7bc97c0bc7b3fdf44319199dff Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 11 Jan 2018 09:53:47 +0100 Subject: [PATCH 0163/1074] Prepare 6.0.5 --- ChangeLog | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ChangeLog b/ChangeLog index 3c56559f8d0..a5fe90d2bbd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,21 @@ English Dolibarr ChangeLog -------------------------------------------------------------- +***** ChangeLog for 6.0.5 compared to 6.0.4 ***** +FIX: security vulnerability reported by ADLab of Venustech + CVE-2017-17897, CVE-2017-17898, CVE-2017-17899, CVE-2017-17900 +FIX: #7379: Compatibility with PRODUCT_USE_OLD_PATH_FOR_PHOTO variable +FIX: #7903 +FIX: #7933 +FIX: #8029 Unable to make leave request in holyday module +FIX: Edit accountancy account and warning message on loan +FIX: $accounts[$bid] is a label ! +FIX: $oldvatrateclean & $newvatrateclean must be set if preg_match === false +FIX: product best price on product list +FIX: search on contact list +FIX: stats trad for customerinvoice +FIX: translate unactivate on contractline + ***** ChangeLog for 6.0.4 compared to 6.0.3 ***** FIX: #7737 FIX: #7751 From 95312d19448fc765bd4db373c10da95db6eba308 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 11 Jan 2018 10:20:49 +0100 Subject: [PATCH 0164/1074] Fix regression --- htdocs/societe/class/societe.class.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 8b31fd43b10..af15ce7c700 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -471,8 +471,10 @@ class Societe extends CommonObject if ($result >= 0) { + $entity = isset($this->entity)?$this->entity:$conf->entity; + $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe (nom, name_alias, entity, datec, fk_user_creat, canvas, status, ref_int, ref_ext, fk_stcomm, fk_incoterms, location_incoterms ,import_key, fk_multicurrency, multicurrency_code)"; - $sql.= " VALUES ('".$this->db->escape($this->name)."', '".$this->db->escape($this->name_alias)."', ".$this->entity.", '".$this->db->idate($now)."'"; + $sql.= " VALUES ('".$this->db->escape($this->name)."', '".$this->db->escape($this->name_alias)."', ".$entity.", '".$this->db->idate($now)."'"; $sql.= ", ".(! empty($user->id) ? "'".$user->id."'":"null"); $sql.= ", ".(! empty($this->canvas) ? "'".$this->db->escape($this->canvas)."'":"null"); $sql.= ", ".$this->status; From 157e118cbaf99f32c4044214dd8e72a6164d2cfe Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 11 Jan 2018 10:47:40 +0100 Subject: [PATCH 0165/1074] Fix: broken feature --- htdocs/contact/class/contact.class.php | 3 ++- htdocs/societe/class/societe.class.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index ca4880d68b8..31a95f8cd78 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -176,6 +176,7 @@ class Contact extends CommonObject if (empty($this->socid)) $this->socid = 0; if (empty($this->priv)) $this->priv = 0; if (empty($this->statut)) $this->statut = 0; // This is to convert '' into '0' to avoid bad sql request + $entity = (isset($this->entity) && is_numeric($this->entity)?$this->entity:$conf->entity); $sql = "INSERT INTO ".MAIN_DB_PREFIX."socpeople ("; $sql.= " datec"; @@ -199,7 +200,7 @@ class Contact extends CommonObject $sql.= " ".$this->priv.","; $sql.= " ".$this->statut.","; $sql.= " ".(! empty($this->canvas)?"'".$this->db->escape($this->canvas)."'":"null").","; - $sql.= " ".$this->entity.","; + $sql.= " ".$entity.","; $sql.= "'".$this->db->escape($this->ref_ext)."',"; $sql.= " ".(! empty($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null"); $sql.= ")"; diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index af15ce7c700..865924c7274 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -471,7 +471,7 @@ class Societe extends CommonObject if ($result >= 0) { - $entity = isset($this->entity)?$this->entity:$conf->entity; + $entity = (isset($this->entity) && is_numeric($this->entity)?$this->entity:$conf->entity); $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe (nom, name_alias, entity, datec, fk_user_creat, canvas, status, ref_int, ref_ext, fk_stcomm, fk_incoterms, location_incoterms ,import_key, fk_multicurrency, multicurrency_code)"; $sql.= " VALUES ('".$this->db->escape($this->name)."', '".$this->db->escape($this->name_alias)."', ".$entity.", '".$this->db->idate($now)."'"; From 3f4d7dbce6060c77241342f0877295a757471dd2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 11 Jan 2018 12:24:47 +0100 Subject: [PATCH 0166/1074] Fix substitution of thirdparty --- htdocs/core/lib/functions.lib.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index cfac17ac326..faadbc0da0f 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -5479,6 +5479,11 @@ function getCommonSubstitutionArray($outputlangs, $onlykey=0, $exclude=null, $ob $substitutionarray['__MEMBER_PHONEPRO__']=$msgishtml?dol_htmlentitiesbr($object->phone_perso):$object->phone_perso; $substitutionarray['__MEMBER_PHONEMOBILE__']=$msgishtml?dol_htmlentitiesbr($object->phone_mobile):$object->phone_mobile; + if ($object->element == 'societe') + { + $substitutionarray['__THIRDPARTY_ID__'] = (is_object($object)?$object->id:''); + $substitutionarray['__THIRDPARTY_NAME__'] = (is_object($object)?$object->name:''); + } if (is_object($object->thirdparty) && $object->thirdparty->id > 0) { $substitutionarray['__THIRDPARTY_ID__'] = (is_object($object->thirdparty)?$object->thirdparty->id:''); From 46d28deee7a5e46918810be3f9b8959898b7f089 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 11 Jan 2018 12:25:40 +0100 Subject: [PATCH 0167/1074] Fix substitution of thirdparty --- htdocs/core/lib/functions.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index faadbc0da0f..dbcb5c78d5b 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -5479,12 +5479,12 @@ function getCommonSubstitutionArray($outputlangs, $onlykey=0, $exclude=null, $ob $substitutionarray['__MEMBER_PHONEPRO__']=$msgishtml?dol_htmlentitiesbr($object->phone_perso):$object->phone_perso; $substitutionarray['__MEMBER_PHONEMOBILE__']=$msgishtml?dol_htmlentitiesbr($object->phone_mobile):$object->phone_mobile; - if ($object->element == 'societe') + if (is_object($object) && $object->element == 'societe') { $substitutionarray['__THIRDPARTY_ID__'] = (is_object($object)?$object->id:''); $substitutionarray['__THIRDPARTY_NAME__'] = (is_object($object)?$object->name:''); } - if (is_object($object->thirdparty) && $object->thirdparty->id > 0) + elseif (is_object($object->thirdparty) && $object->thirdparty->id > 0) { $substitutionarray['__THIRDPARTY_ID__'] = (is_object($object->thirdparty)?$object->thirdparty->id:''); $substitutionarray['__THIRDPARTY_NAME__'] = (is_object($object->thirdparty)?$object->thirdparty->name:''); From 8d710020e9d9cf3470daa1a18fb414e3fe1eb3df Mon Sep 17 00:00:00 2001 From: Neil Orley Date: Thu, 11 Jan 2018 12:58:41 +0100 Subject: [PATCH 0168/1074] FIX use DB PREFIX instead of llx_ --- htdocs/societe/class/api_thirdparties.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php index 9ada3510a4a..658dc6a50e2 100644 --- a/htdocs/societe/class/api_thirdparties.class.php +++ b/htdocs/societe/class/api_thirdparties.class.php @@ -379,7 +379,7 @@ class Thirdparties extends DolibarrApi $sql = "SELECT f.facnumber, f.type as factype, re.fk_facture_source, re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc, re.description, re.fk_facture, re.fk_facture_line"; - $sql .= " FROM llx_societe_remise_except as re, llx_facture as f"; + $sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as re, ".MAIN_DB_PREFIX."facture as f"; $sql .= " WHERE f.rowid = re.fk_facture_source AND re.fk_soc = ".$id; if ($filter == "available") $sql .= " AND re.fk_facture IS NULL AND re.fk_facture_line IS NULL"; if ($filter == "used") $sql .= " AND (re.fk_facture IS NOT NULL OR re.fk_facture_line IS NOT NULL)"; From 6d9a9dd3fe16a262624661d50ce90b04bc7c112c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 11 Jan 2018 13:08:13 +0100 Subject: [PATCH 0169/1074] Fix Time spent for "other task" was not visible when filtering project --- htdocs/projet/activity/perday.php | 32 ++++++++++++++++++------- htdocs/projet/activity/perweek.php | 38 ++++++++++++++++++++++-------- 2 files changed, 52 insertions(+), 18 deletions(-) diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php index e3e5a2a4efb..cb22f00e4d4 100644 --- a/htdocs/projet/activity/perday.php +++ b/htdocs/projet/activity/perday.php @@ -326,12 +326,14 @@ if ($id) $onlyopenedproject=1; // or -1 $morewherefilter=''; -if ($search_task_ref) $morewherefilter.=natural_search("t.ref", $search_task_ref); -if ($search_task_label) $morewherefilter.=natural_search(array("t.ref", "t.label"), $search_task_label); -if ($search_thirdparty) $morewherefilter.=natural_search("s.nom", $search_thirdparty); + +if ($search_project_ref) $morewherefilter.=natural_search("p.ref", $search_project_ref); +if ($search_task_ref) $morewherefilter.=natural_search("t.ref", $search_task_ref); +if ($search_task_label) $morewherefilter.=natural_search(array("t.ref", "t.label"), $search_task_label); +if ($search_thirdparty) $morewherefilter.=natural_search("s.nom", $search_thirdparty); $tasksarray=$taskstatic->getTasksArray(0, 0, ($project->id?$project->id:0), $socid, 0, $search_project_ref, $onlyopenedproject, $morewherefilter, ($search_usertoprocessid?$search_usertoprocessid:0)); // We want to see all task of opened project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later. -if ($morewherefilter) // Get all task with no filter so we can show total of time spent for not visible tasks +if ($morewherefilter) // Get all task without any filter, so we can show total of time spent for not visible tasks { $tasksarraywithoutfilter=$taskstatic->getTasksArray(0, 0, ($project->id?$project->id:0), $socid, 0, '', $onlyopenedproject, '', ($search_usertoprocessid?$search_usertoprocessid:0)); // We want to see all task of opened project i am allowed to see and that match filter, not only my tasks. Later only mine will be editable later. } @@ -499,7 +501,12 @@ $isavailable[$daytoparse]=$isavailablefordayanduser; // in projectLinesPerWeek if (count($tasksarray) > 0) { + //var_dump($tasksarray); // contains only selected tasks + //var_dump($tasksarraywithoutfilter); // contains all tasks (if there is a filter, not defined if no filter) + //var_dump($tasksrole); + $j=0; + $level=0; $totalforvisibletasks = projectLinesPerDay($j, 0, $usertoprocess, $tasksarray, $level, $projectsrole, $tasksrole, $mine, $restrictviewformytask, $daytoparse, $isavailable, 0); //var_dump($totalforvisibletasks); @@ -518,7 +525,6 @@ if (count($tasksarray) > 0) $totalforeachday=array(); foreach($listofdistinctprojectid as $tmpprojectid) { - $lineother=''; $projectstatic->id=$tmpprojectid; $projectstatic->loadTimeSpent($daytoparse, 0, $usertoprocess->id); // Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week for ($idw = 0; $idw < 7; $idw++) @@ -527,15 +533,25 @@ if (count($tasksarray) > 0) $totalforeachday[$tmpday]+=$projectstatic->weekWorkLoad[$tmpday]; } } - $lineother=''; //var_dump($totalforeachday); + // Is there a diff between selected/filtered tasks and all tasks ? + $isdiff = 0; + if (count($totalforeachday)) + { + $timeonothertasks=($totalforeachday[$daytoparse] - $totalforvisibletasks[$daytoparse]); + if ($timeonothertasks) + { + $isdiff=1; + } + } + $colspan = 8; // There is a diff between total shown on screen and total spent by user, so we add a line with all other cumulated time of user - if (count($totalforeachday)) + if ($isdiff) { - print '
    '; print $langs->trans("OtherFilteredTasks"); print '
    '; print $langs->trans("OtherFilteredTasks"); print '
    '; - // Account number - print ''; - print ''; - print ''; - // Label - print ''; + print ''; print ''; // Account parent @@ -361,20 +365,10 @@ if ($action == 'create') { print ''; print ''; - // Active - print ''; - print ''; - print '
    ' . $langs->trans("AccountNumber") . '' . $object->account_number . '' . $linkback . '
    ' . $langs->trans("Label") . '
    ' . $langs->trans("Label") . '' . $object->label . '
    ' . $langs->trans("Pcgsubtype") . '' . $object->pcg_subtype . '
    ' . $langs->trans("Status") . ''; - print $object->getLibStatut(4); - /*if (empty($object->active)) { - print img_picto($langs->trans("Disabled"), 'switch_off'); - } else { - print img_picto($langs->trans("Activated"), 'switch_on'); - }*/ - - print '
    '; + print ''; + dol_fiche_end(); /* @@ -397,7 +391,7 @@ if ($action == 'create') { print ''; } } else { - dol_print_error($db); + dol_print_error($db, $object->error, $object->errors); } } diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php index 74d86d567bf..f5dd7159528 100644 --- a/htdocs/accountancy/class/accountingaccount.class.php +++ b/htdocs/accountancy/class/accountingaccount.class.php @@ -30,6 +30,21 @@ */ class AccountingAccount extends CommonObject { + public $element='accounting_account'; + public $table_element='accounting_account'; + public $picto = 'billr'; + + /** + * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe + * @var int + */ + public $ismultientitymanaged = 1; + /** + * 0=Default, 1=View may be restricted to sales representative only if no permission to see all or to company of external user if external user + * @var integer + */ + public $restrictiononfksoc = 1; + var $db; var $error; var $errors; @@ -48,13 +63,17 @@ class AccountingAccount extends CommonObject var $active; // duplicate with status var $status; + /** * Constructor * * @param DoliDB $db Database handle */ function __construct($db) { + global $conf; + $this->db = $db; + $this->next_prev_filter='fk_pcg_version IN (SELECT pcg_version FROM ' . MAIN_DB_PREFIX . 'accounting_system WHERE rowid=' . $conf->global->CHARTOFACCOUNTS . ')'; // Used to add a filter in Form::showrefnav method } /** @@ -91,6 +110,7 @@ class AccountingAccount extends CommonObject if ($obj) { $this->id = $obj->rowid; $this->rowid = $obj->rowid; + $this->ref = $obj->account_number; $this->datec = $obj->datec; $this->tms = $obj->tms; $this->fk_pcg_version = $obj->fk_pcg_version; diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 4f347fb9f0e..8d513fae9bf 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -6234,7 +6234,6 @@ class Form $reshook=$hookmanager->executeHooks('printFieldListWhere',$parameters, $object); // Note that $action and $object may have been modified by hook $object->next_prev_filter.=$hookmanager->resPrint; } - $previous_ref = $next_ref = ''; if ($shownav) { diff --git a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql index d3ff5bd6e17..ae74a1161fb 100644 --- a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql +++ b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql @@ -25,6 +25,10 @@ -- -- VMYSQL4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup); +-- VMYSQLUTF8UNICODECI ALTER TABLE llx_accounting_account MODIFY fk_pcg_version VARCHAR(20) CHARACTER SET utf8; +-- VMYSQLUTF8UNICODECI ALTER TABLE llx_accounting_account MODIFY fk_pcg_version VARCHAR(20) COLLATE utf8_unicode_ci; +-- VMYSQLUTF8UNICODECI ALTER TABLE llx_accounting_system MODIFY pcg_version VARCHAR(20) CHARACTER SET utf8; +-- VMYSQLUTF8UNICODECI ALTER TABLE llx_accounting_system MODIFY pcg_version VARCHAR(20) COLLATE utf8_unicode_ci; -- VMYSQLUTF8UNICODECI ALTER TABLE llx_accounting_account MODIFY account_number VARCHAR(20) CHARACTER SET utf8; -- VMYSQLUTF8UNICODECI ALTER TABLE llx_accounting_account MODIFY account_number VARCHAR(20) COLLATE utf8_unicode_ci; -- VMYSQLUTF8UNICODECI ALTER TABLE llx_accounting_bookkeeping MODIFY numero_compte VARCHAR(20) CHARACTER SET utf8; diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php index 1396fbfb4cf..3f4fa2d2910 100644 --- a/htdocs/install/repair.php +++ b/htdocs/install/repair.php @@ -1036,10 +1036,13 @@ if ($ok && GETPOST('force_utf8_on_tables','alpha')) print '
    '; print $table; $sql='ALTER TABLE '.$table.' CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci'; + print $sql; if (GETPOST('force_utf8_on_tables','alpha') == 'confirmed') { - $db->query($sql); + $resql = $db->query($sql); + print ' - Done ('.$resql.')'; } + else print ' - Disabled'; print '
    '; //print '
    '; // List of actions on element - include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; + /*include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; $formactions=new FormActions($db); $somethingshown = $formactions->showactions($object,'supplier_payment',$socid,1,'listaction'.($genallowed?'largetitle':'')); + */ print ''; - //print '
    '; - */ } else { diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index fd9f637cd0d..f554bdf11a9 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -912,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=Everybody +PayedBy=Payed by +PayedTo=Payed to From b225a6f79c1ee253b3a6eaef2cef6b235dcc886a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 11 Jan 2018 20:19:53 +0100 Subject: [PATCH 0176/1074] Better translation --- htdocs/compta/facture/card.php | 2 +- htdocs/compta/facture/class/facture.class.php | 8 ++++---- htdocs/langs/en_US/bills.lang | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index 234ccf281f0..b547f12a76e 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -3167,7 +3167,7 @@ else if ($id > 0 || ! empty($ref)) $i ++; // Texte $i = 0; - $close [$i] ['reason'] = $form->textwithpicto($langs->transnoentities("ConfirmClassifyPaidPartiallyReasonDiscountVat", $resteapayer, $langs->trans("Currency" . $conf->currency)), $close [$i] ['label'], 1); + $close [$i] ['reason'] = $form->textwithpicto($langs->transnoentities("ConfirmClassifyPaidPartiallyReasonDiscount", $resteapayer, $langs->trans("Currency" . $conf->currency)), $close [$i] ['label'], 1); $i ++; $close [$i] ['reason'] = $form->textwithpicto($langs->transnoentities("ConfirmClassifyPaidPartiallyReasonBadCustomer", $resteapayer, $langs->trans("Currency" . $conf->currency)), $close [$i] ['label'], 1); $i ++; diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 1891989a44a..15143f14cff 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -214,10 +214,10 @@ class Facture extends CommonInvoice */ const STATUS_ABANDONED = 3; - const CLOSECODE_DISCOUNTVAT = 'discount_vat'; - const CLOSECODE_BADDEBT = 'badcustomer'; - const CLOSECODE_ABANDONED = 'abandon'; - const CLOSECODE_REPLACED = 'replaced'; + const CLOSECODE_DISCOUNTVAT = 'discount_vat'; // Abandonned remain - escompte + const CLOSECODE_BADDEBT = 'badcustomer'; // Abandonned - bad + const CLOSECODE_ABANDONED = 'abandon'; // Abandonned - other + const CLOSECODE_REPLACED = 'replaced'; // Closed after doing a replacement invoice /** * Constructor diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index a54ecbc0023..5027e56b858 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -178,6 +178,7 @@ ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer From eaecb9da5e31e84cd5f8a522f33c205fc33d2664 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 11 Jan 2018 20:33:09 +0100 Subject: [PATCH 0177/1074] CSS --- htdocs/theme/eldy/style.css.php | 19 +++++++++---------- htdocs/theme/md/style.css.php | 19 +++++++++---------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 897149def5b..86f92e58066 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -3323,20 +3323,19 @@ div#card-errors { /* ============================================================================== */ table.valid { - border-top: solid 1px #E6E6E6; - border-: solid 1px #E6E6E6; - border-: solid 1px #444444; - border-bottom: solid 1px #555555; - padding-top: 0px; - padding-left: 0px; - padding-right: 0px; - padding-bottom: 0px; + /* border-top: solid 1px #E6E6E6; */ + border-: solid 5px #f2cf87; + /* border-: solid 1px #444444; + border-bottom: solid 1px #555555; */ + padding-top: 8px; + padding-left: 10px; + padding-right: 4px; + padding-bottom: 4px; margin: 0px 0px; - background: #D5BAA8; + background: #fcf8e3; } .validtitre { - background: #D5BAA8; font-weight: bold; } diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 183efa2c828..c4fab72464b 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -3378,20 +3378,19 @@ div#card-errors { /* ============================================================================== */ table.valid { - border-top: solid 1px #E6E6E6; - border-: solid 1px #E6E6E6; - border-: solid 1px #444444; - border-bottom: solid 1px #555555; - padding-top: 0px; - padding-left: 0px; - padding-right: 0px; - padding-bottom: 0px; + /* border-top: solid 1px #E6E6E6; */ + border-: solid 5px #f2cf87; + /* border-: solid 1px #444444; + border-bottom: solid 1px #555555; */ + padding-top: 8px; + padding-left: 10px; + padding-right: 4px; + padding-bottom: 4px; margin: 0px 0px; - background: #D5BAA8; + background: #fcf8e3; } .validtitre { - background: #D5BAA8; font-weight: bold; } From f93f9e1a73d90df85cb9c3a0e9794dd858e6cb0e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 11 Jan 2018 20:39:23 +0100 Subject: [PATCH 0178/1074] Fix regression --- htdocs/contact/class/contact.class.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index ca4880d68b8..6e7c963a11c 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -76,17 +76,17 @@ class Contact extends CommonObject public $email; public $skype; public $photo; - public $jabberid; + public $jabberid; public $phone_pro; public $phone_perso; public $phone_mobile; - public $fax; + public $fax; - public $priv; + public $priv; public $birthday; public $default_lang; - public $no_email; // 1=Don't send e-mail to this contact, 0=do + public $no_email; // 1=Don't send e-mail to this contact, 0=do public $ref_facturation; // Reference number of invoice for which it is contact public $ref_contrat; // Nb de reference contrat pour lequel il est contact @@ -177,6 +177,8 @@ class Contact extends CommonObject if (empty($this->priv)) $this->priv = 0; if (empty($this->statut)) $this->statut = 0; // This is to convert '' into '0' to avoid bad sql request + $entity = isset($this->entity)?$this->entity:$conf->entity; + $sql = "INSERT INTO ".MAIN_DB_PREFIX."socpeople ("; $sql.= " datec"; $sql.= ", fk_soc"; @@ -199,7 +201,7 @@ class Contact extends CommonObject $sql.= " ".$this->priv.","; $sql.= " ".$this->statut.","; $sql.= " ".(! empty($this->canvas)?"'".$this->db->escape($this->canvas)."'":"null").","; - $sql.= " ".$this->entity.","; + $sql.= " ".$entity.","; $sql.= "'".$this->db->escape($this->ref_ext)."',"; $sql.= " ".(! empty($this->import_key)?"'".$this->db->escape($this->import_key)."'":"null"); $sql.= ")"; From 5e7b8149668569635cd72447271def91817ee031 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 12 Jan 2018 00:16:55 +0100 Subject: [PATCH 0179/1074] Fix responsive --- htdocs/fourn/facture/card.php | 8 ++++---- htdocs/theme/eldy/style.css.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index ee587b07924..761d5d591e3 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -686,7 +686,7 @@ if (empty($reshook)) if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) { $lines[$i]->fetch_optionals($lines[$i]->rowid); } - + // Dates // TODO mutualiser $date_start=$lines[$i]->date_debut_prevue; @@ -2439,6 +2439,8 @@ else { $num = $db->num_rows($result); $i = 0; + + print '
    '; print ''; print ''; print ''; @@ -2449,7 +2451,6 @@ else print ''; print ''; - $var=false; if ($num > 0) { while ($i < $num) @@ -2658,6 +2659,7 @@ else } print '
    ' . ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE ? $langs->trans("PaymentsBack") : $langs->trans('Payments')) . ' 
    '; + print '
    '; print ''; print ''; @@ -2712,8 +2714,6 @@ else { if ($action != 'editline') { - $var = true; - // Add free products/services $object->formAddObjectLine(1, $societe, $mysoc); diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 86f92e58066..7e3ba9a95d9 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1489,7 +1489,7 @@ div.tmenuleft margin-top: 0px; dol_optimize_smallscreen)) { ?> width: 5px; - background: url() 0 -6px no-repeat; + /* background: url() 0 -6px no-repeat; */ height: 26px; From 95d2a9f88d14f8c2bacc00fa3fef0775a63f5cee Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 12 Jan 2018 01:10:03 +0100 Subject: [PATCH 0180/1074] Responsive and css --- htdocs/admin/index.php | 8 ++-- .../compta/paiement/class/paiement.class.php | 6 +-- htdocs/compta/stats/cabyuser.php | 2 + htdocs/core/lib/functions.lib.php | 2 +- htdocs/theme/eldy/style.css.php | 43 ++++++++++--------- htdocs/theme/md/style.css.php | 43 +++++++++---------- 6 files changed, 53 insertions(+), 51 deletions(-) diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php index 65b38970a6e..0aa8b14199d 100644 --- a/htdocs/admin/index.php +++ b/htdocs/admin/index.php @@ -80,8 +80,8 @@ print img_picto('','puce').' '.$langs->trans("SetupDescription3", DOL_URL_ROOT.' if (! empty($setupcompanynotcomplete)) { $langs->load("errors"); - $warnpicto=img_warning($langs->trans("WarningMandatorySetupNotComplete")); - print '
    '.$warnpicto.' '.$langs->trans("WarningMandatorySetupNotComplete").'
    '; + $warnpicto=img_warning($langs->trans("WarningMandatorySetupNotComplete"), 'style="padding-right: 6px;"'); + print '
    '.$warnpicto.$langs->trans("WarningMandatorySetupNotComplete").'
    '; } print '
    '; print '
    '; @@ -92,8 +92,8 @@ print img_picto('','puce').' '.$langs->trans("SetupDescription4", DOL_URL_ROOT.' if (count($conf->modules) <= (empty($conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING)?1:$conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING)) // If only user module enabled { $langs->load("errors"); - $warnpicto=img_warning($langs->trans("WarningMandatorySetupNotComplete")); - print '
    '.$warnpicto.' '.$langs->trans("WarningMandatorySetupNotComplete").'
    '; + $warnpicto=img_warning($langs->trans("WarningMandatorySetupNotComplete"), 'style="padding-right: 6px;"'); + print '
    '.$warnpicto.$langs->trans("WarningMandatorySetupNotComplete").'
    '; } print '
    '; print '
    '; diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php index 7cbe0b439a1..bbdc6f94dfb 100644 --- a/htdocs/compta/paiement/class/paiement.class.php +++ b/htdocs/compta/paiement/class/paiement.class.php @@ -1149,10 +1149,10 @@ class Paiement extends CommonObject $billsarray = $this->getBillsArray(); // From payment, the fk_soc isn't available, we should load the first supplier invoice to get him if (!empty($billsarray)) { - $supplier_invoice = new FactureFournisseur($this->db); - if ($supplier_invoice->fetch($billsarray[0]) > 0) + $invoice = new Facture($this->db); + if ($invoice->fetch($billsarray[0]) > 0) { - $force_thirdparty_id = $supplier_invoice->fk_soc; + $force_thirdparty_id = $invoice->fk_soc; } } } diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php index 4904f1ee5ca..1fa48738e66 100644 --- a/htdocs/compta/stats/cabyuser.php +++ b/htdocs/compta/stats/cabyuser.php @@ -28,6 +28,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +$langs->load("accountancy"); + $socid = GETPOST('socid','int'); // Security check diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index dbcb5c78d5b..2b6820c353b 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3096,7 +3096,7 @@ function img_info($titlealt = 'default') * Show warning logo * * @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. - * @param string $moreatt Add more attribute on img tag (For example 'style="float: right"'). If 1 + * @param string $moreatt Add more attribute on img tag (For example 'style="float: right"'). If 1, add float: right. Can't be "class" attribute. * @return string Return img tag */ function img_warning($titlealt = 'default', $moreatt = '') diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 7e3ba9a95d9..def3e357ac1 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -3125,15 +3125,29 @@ div.ok { color: #114466; } +/* Info admin */ +div.info { + border-: solid 5px #87cfd2; + padding-top: 8px; + padding-left: 10px; + padding-right: 4px; + padding-bottom: 8px; + margin: 0.5em 0em 0.5em 0em; + background: #eff8fc; +} + /* Warning message */ div.warning { - color: #302020; - padding: 0.3em 0.3em 0.3em 0.3em; - margin: 0.5em 0em 0.5em 0em; - border: 2px solid #805000; - -webkit-border-radius: 4px; - border-radius: 4px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); + border-: solid 5px #f2cf87; + padding-top: 8px; + padding-left: 10px; + padding-right: 4px; + padding-bottom: 8px; + margin: 0.5em 0em 0.5em 0em; + background: #fcf8e3; +} +div.warning a, div.info a, div.error a { + color: rgb(); } /* Error message */ @@ -3141,19 +3155,6 @@ div.error { background: #EFCFCF; } -/* Info admin */ -div.info { - color: #fff; - padding: 0.4em 0.4em 0.4em 0.4em; - margin: 0.5em 0em 0.5em 0em; - -webkit-border-radius: 4px; - border-radius: 4px; - background: #798080; -} - -div.warning a, div.info a, div.error a { - color: rgb(); -} /* * Liens Payes/Non payes @@ -4947,7 +4948,7 @@ div.tabsElem a.tab { /* nboftopmenuentries = , fontsize= */ /* rule to reduce top menu - 1st reduction */ -@media only screen and (max-width: px) /* reduction 1 */ +@media only screen and (max-width: px) /* reduction 1 */ { div.tmenucenter { width: px; /* size of viewport */ diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index c4fab72464b..0d3359364e3 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -3181,17 +3181,29 @@ div.ok { color: #114466; } +/* Info admin */ +div.info { + border-: solid 5px #87cfd2; + padding-top: 8px; + padding-left: 10px; + padding-right: 4px; + padding-bottom: 8px; + margin: 0.5em 0em 0.5em 0em; + background: #eff8fc; +} + /* Warning message */ div.warning { - color: #302020; - padding: 0.3em 0.3em 0.3em 0.3em; - margin: 0.5em 0em 0.5em 0em; - /* border: 1px solid #e0d0b0; */ - border: 2px solid #805000 - -webkit-border-radius: 3px; - border-radius: 3px; - /* background: #EFDF9A; */ - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); + border-: solid 5px #f2cf87; + padding-top: 8px; + padding-left: 10px; + padding-right: 4px; + padding-bottom: 8px; + margin: 0.5em 0em 0.5em 0em; + background: #fcf8e3; +} +div.warning a, div.info a, div.error a { + color: rgb(); } /* Error message */ @@ -3205,19 +3217,6 @@ div.error { background: #EFCFCF; } -/* Info admin */ -div.info { - color: #fff; - padding: 0.4em 0.4em 0.4em 0.4em; - margin: 0.5em 0em 0.5em 0em; - -webkit-border-radius: 4px; - border-radius: 4px; - background: #989; -} - -div.warning a, div.info a, div.error a { - color: rgb(); -} /* * Liens Payes/Non payes From f0a10cdcc1f9e0d3e2709c02537352e0d007b228 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 12 Jan 2018 10:32:48 +0100 Subject: [PATCH 0181/1074] Missing backlink --- htdocs/product/admin/dynamic_prices.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/htdocs/product/admin/dynamic_prices.php b/htdocs/product/admin/dynamic_prices.php index b044471e3e1..747d423f402 100644 --- a/htdocs/product/admin/dynamic_prices.php +++ b/htdocs/product/admin/dynamic_prices.php @@ -140,14 +140,17 @@ if (!empty($action) && empty($cancel)) { $action = ''; } + /* * View */ +$form = new Form($db); + llxHeader("","",$langs->trans("CardProduct".$product->type)); -print load_fiche_titre($langs->trans("DynamicPriceConfiguration")); -$form = new Form($db); +$linkback=''.$langs->trans("BackToModuleList").''; +print load_fiche_titre($langs->trans("DynamicPriceConfiguration"), $linkback, 'title_setup'); print $langs->trans("DynamicPriceDesc").'
    '; print '
    '; From 20ad3b0e80c785ec5e894308ab4a2c079736ca8a Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 12 Jan 2018 10:39:15 +0100 Subject: [PATCH 0182/1074] Fix: if $entity is empty '' the isset return true !! --- htdocs/contact/class/contact.class.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index db2152a00ae..1bfc9ee8c19 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -176,9 +176,8 @@ class Contact extends CommonObject if (empty($this->socid)) $this->socid = 0; if (empty($this->priv)) $this->priv = 0; if (empty($this->statut)) $this->statut = 0; // This is to convert '' into '0' to avoid bad sql request - $entity = (isset($this->entity) && is_numeric($this->entity)?$this->entity:$conf->entity); - $entity = isset($this->entity)?$this->entity:$conf->entity; + $entity = (isset($this->entity) && is_numeric($this->entity)?$this->entity:$conf->entity); $sql = "INSERT INTO ".MAIN_DB_PREFIX."socpeople ("; $sql.= " datec"; From 3423d4e6d3b94772b80fce9cccb13f84fa8e187a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 12 Jan 2018 13:35:53 +0100 Subject: [PATCH 0183/1074] Fix balance is amount after, so i fix by adding amount before --- htdocs/compta/bank/bankentries_list.php | 80 +++++++++++++++++-------- htdocs/langs/en_US/compta.lang | 1 + 2 files changed, 56 insertions(+), 25 deletions(-) diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php index 2cdf92a7863..baa3d9e3716 100644 --- a/htdocs/compta/bank/bankentries_list.php +++ b/htdocs/compta/bank/bankentries_list.php @@ -143,8 +143,9 @@ $arrayfields=array( 'ba.ref'=>array('label'=>$langs->trans("BankAccount"), 'checked'=>(($id > 0 || ! empty($ref))?0:1), 'position'=>1000), 'b.debit'=>array('label'=>$langs->trans("Debit"), 'checked'=>1, 'position'=>600), 'b.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1, 'position'=>605), - 'balance'=>array('label'=>$langs->trans("Balance"), 'checked'=>1, 'position'=>1000), - 'b.num_releve'=>array('label'=>$langs->trans("AccountStatement"), 'checked'=>1, 'position'=>1010), + 'balancebefore'=>array('label'=>$langs->trans("BalanceBefore"), 'checked'=>0, 'position'=>1000), + 'balance'=>array('label'=>$langs->trans("Balance"), 'checked'=>1, 'position'=>1001), + 'b.num_releve'=>array('label'=>$langs->trans("AccountStatement"), 'checked'=>1, 'position'=>1010), 'b.conciliated'=>array('label'=>$langs->trans("Conciliated"), 'enabled'=> $object->rappro, 'checked'=>($action == 'reconcile'?1:0), 'position'=>1020), ); // Extra fields @@ -865,14 +866,21 @@ if ($resql) print ''; print ''; } + if (! empty($arrayfields['balancebefore']['checked'])) + { + print ''; + $htmltext=$langs->trans("BalanceVisibilityDependsOnSortAndFilters", $langs->transnoentitiesnoconv("DateValue")); + print $form->textwithpicto('', $htmltext, 1); + print ''; + } if (! empty($arrayfields['balance']['checked'])) { - print ''; - $htmltext=$langs->trans("BalanceVisibilityDependsOnSortAndFilters", $langs->transnoentitiesnoconv("DateValue")); - print $form->textwithpicto('', $htmltext, 1); - print ''; + print ''; + $htmltext=$langs->trans("BalanceVisibilityDependsOnSortAndFilters", $langs->transnoentitiesnoconv("DateValue")); + print $form->textwithpicto('', $htmltext, 1); + print ''; } - // Numero statement + // Numero statement if (! empty($arrayfields['b.num_releve']['checked'])) { print ''; @@ -904,6 +912,7 @@ if ($resql) if (! empty($arrayfields['ba.ref']['checked'])) print_liste_field_titre($arrayfields['ba.ref']['label'],$_SERVER['PHP_SELF'],'ba.ref','',$param,'align="right"',$sortfield,$sortorder); if (! empty($arrayfields['b.debit']['checked'])) print_liste_field_titre($arrayfields['b.debit']['label'],$_SERVER['PHP_SELF'],'b.amount','',$param,'align="right"',$sortfield,$sortorder); if (! empty($arrayfields['b.credit']['checked'])) print_liste_field_titre($arrayfields['b.credit']['label'],$_SERVER['PHP_SELF'],'b.amount','',$param,'align="right"',$sortfield,$sortorder); + if (! empty($arrayfields['balancebefore']['checked'])) print_liste_field_titre($arrayfields['balancebefore']['label'],$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder); if (! empty($arrayfields['balance']['checked'])) print_liste_field_titre($arrayfields['balance']['label'],$_SERVER['PHP_SELF'],'','',$param,'align="right"',$sortfield,$sortorder); if (! empty($arrayfields['b.num_releve']['checked'])) print_liste_field_titre($arrayfields['b.num_releve']['label'],$_SERVER['PHP_SELF'],'b.num_releve','',$param,'align="center"',$sortfield,$sortorder); if (! empty($arrayfields['b.conciliated']['checked'])) print_liste_field_titre($arrayfields['b.conciliated']['label'],$_SERVER['PHP_SELF'],'b.rappro','',$param,'align="center"',$sortfield,$sortorder); @@ -929,7 +938,7 @@ if ($resql) $objp = $db->fetch_object($resql); // If we are in a situation where we need/can show balance, we calculate the start of balance - if (! $balancecalculated && ! empty($arrayfields['balance']['checked']) && $mode_balance_ok) + if (! $balancecalculated && (! empty($arrayfields['balancebefore']['checked']) || ! empty($arrayfields['balance']['checked'])) && $mode_balance_ok) { if (! $account) { @@ -970,7 +979,7 @@ if ($resql) $balancefieldfound=false; foreach($arrayfields as $key => $val) { - if ($key == 'balance') + if ($key == 'balancebefore' || $key == 'balance') { $balancefieldfound=true; continue; @@ -1284,25 +1293,46 @@ if ($resql) if (! $i) $totalarray['totalcredfield']=$totalarray['nbfield']; } + // Balance before + if (! empty($arrayfields['balancebefore']['checked'])) + { + if ($mode_balance_ok) + { + $balancebefore = price2num($balance - ($sign * $objp->amount),'MT'); + if ($balancebefore >= 0) + { + print ' '.price($balancebefore).''; + } + else + { + print ' '.price($balancebefore).''; + } + } + else + { + print '-'; + } + if (! $i) $totalarray['nbfield']++; + } // Balance if (! empty($arrayfields['balance']['checked'])) { - if ($mode_balance_ok) - { - if ($balance >= 0) - { - print ' '.price($balance).''; - } - else - { - print ' '.price($balance).''; - } - } - else - { - print '-'; - } - if (! $i) $totalarray['nbfield']++; + if ($mode_balance_ok) + { + if ($balance >= 0) + { + print ' '.price($balance).''; + } + else + { + print ' '.price($balance).''; + } + } + else + { + print '-'; + } + if (! $i) $totalarray['nbfield']++; } if (! empty($arrayfields['b.num_releve']['checked'])) diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang index 8c402d53705..e54d613628e 100644 --- a/htdocs/langs/en_US/compta.lang +++ b/htdocs/langs/en_US/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to PaymentsNotLinkedToUser=Payments not linked to any user Profit=Profit AccountingResult=Accounting result +BalanceBefore=Balance (before) Balance=Balance Debit=Debit Credit=Credit From 6c9d5984a227b318b6331aacae6bf48f340498e1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 12 Jan 2018 14:03:03 +0100 Subject: [PATCH 0184/1074] Fix trans key --- htdocs/core/tpl/objectline_create.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php index 0641bdea8f3..e7ca2fc9ebb 100644 --- a/htdocs/core/tpl/objectline_create.tpl.php +++ b/htdocs/core/tpl/objectline_create.tpl.php @@ -76,7 +76,7 @@ if ($nolinesbefore) { if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier') // We must have same test in printObjectLines { ?> - trans('SupplierProposalRefFourn'); ?> + trans('SupplierRef'); ?> trans('VAT'); ?> trans('PriceUHT'); ?> From 50596a5214294e60c5f28351f5607d5986107069 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 12 Jan 2018 14:06:48 +0100 Subject: [PATCH 0185/1074] Fix trans key --- htdocs/core/class/commonobject.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 3a0d9f3c1b0..55abcee5699 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -3524,7 +3524,7 @@ abstract class CommonObject if ($this->element == 'supplier_proposal' || $this->element == 'order_supplier' || $this->element == 'invoice_supplier') { - print ''.$langs->trans("SupplierProposalRefFourn").''; + print ''.$langs->trans("SupplierRef").''; } // VAT From 4f8a447d3041eb5bc6aa5816dd7772bef1bedf58 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 12 Jan 2018 14:09:51 +0100 Subject: [PATCH 0186/1074] Fix alignement --- htdocs/core/tpl/objectline_create.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php index e7ca2fc9ebb..0b59204f488 100644 --- a/htdocs/core/tpl/objectline_create.tpl.php +++ b/htdocs/core/tpl/objectline_create.tpl.php @@ -285,7 +285,7 @@ else { if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier') // We must have same test in printObjectLines { ?> - "> + "> Date: Fri, 12 Jan 2018 14:41:57 +0100 Subject: [PATCH 0187/1074] Fix responsive --- htdocs/comm/mailing/cibles.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index cdfd3e526cd..7729c2737cc 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -443,6 +443,7 @@ if ($object->fetch($id) >= 0) if ($page) $param.= "&page=".$page; + print '
    '; print ''; // Ligne des champs de filtres @@ -590,6 +591,7 @@ if ($object->fetch($id) >= 0) } } print "

    "; + print '
    '; print ''; From 28207ad4cb34ee9c381a1a471d07104e77d1ef35 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 12 Jan 2018 14:57:02 +0100 Subject: [PATCH 0188/1074] Clean var --- htdocs/accountancy/bookkeeping/card.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php index 0767023eacf..593c71188e8 100644 --- a/htdocs/accountancy/bookkeeping/card.php +++ b/htdocs/accountancy/bookkeeping/card.php @@ -648,7 +648,10 @@ if ($action == 'create') print "\n"; } - if (price2num($total_debit) != price2num($total_credit)) + $total_debit = price2num($total_debit); + $total_credit = price2num($total_credit); + + if ($total_debit != $total_credit) { setEventMessages(null, array($langs->trans('MvtNotCorrectlyBalanced', $total_credit, $total_debit)), 'warnings'); } From 7da9911db168967e8227f805c851f33a596a0d02 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 12 Jan 2018 15:06:50 +0100 Subject: [PATCH 0189/1074] Fix message --- htdocs/install/repair.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php index 3f4fa2d2910..5db07cd1412 100644 --- a/htdocs/install/repair.php +++ b/htdocs/install/repair.php @@ -1036,11 +1036,11 @@ if ($ok && GETPOST('force_utf8_on_tables','alpha')) print ''; print $table; $sql='ALTER TABLE '.$table.' CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci'; - print $sql; + print ''; if (GETPOST('force_utf8_on_tables','alpha') == 'confirmed') { $resql = $db->query($sql); - print ' - Done ('.$resql.')'; + print ' - Done ('.($resql?'OK':'KO').')'; } else print ' - Disabled'; print ''; From 63e824144e6790659d1e51bfeb1840b8fe1fa27b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 12 Jan 2018 15:19:02 +0100 Subject: [PATCH 0190/1074] Fix scrutinizer bug --- htdocs/compta/bank/bankentries_list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php index baa3d9e3716..0493ffef3b0 100644 --- a/htdocs/compta/bank/bankentries_list.php +++ b/htdocs/compta/bank/bankentries_list.php @@ -663,7 +663,7 @@ if ($resql) print ''; print ''; print ''; - if ($options) { + if (is_array($options) && count($options)) { print '
    '.$langs->trans("Rubrique").': '; print Form::selectarray('cat1', $options, GETPOST('cat1'), 1); } From 64ae70d106ac8aaac679a1c4af1b919631dbf5d4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 12 Jan 2018 15:19:02 +0100 Subject: [PATCH 0191/1074] Fix scrutinizer bug --- htdocs/adherents/class/subscription.class.php | 2 +- htdocs/compta/bank/bankentries_list.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php index ae8470e3eee..8d4b1884bab 100644 --- a/htdocs/adherents/class/subscription.class.php +++ b/htdocs/adherents/class/subscription.class.php @@ -88,7 +88,7 @@ class Subscription extends CommonObject $sql.= " '".$this->db->escape($this->note)."')"; $resql = $this->db->query($sql); - if ($res===false) { + if (! $resql) { $error++; $this->errors[] = $this->db->lasterror(); } diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php index baa3d9e3716..0493ffef3b0 100644 --- a/htdocs/compta/bank/bankentries_list.php +++ b/htdocs/compta/bank/bankentries_list.php @@ -663,7 +663,7 @@ if ($resql) print ''; print ''; print ''; - if ($options) { + if (is_array($options) && count($options)) { print '
    '.$langs->trans("Rubrique").': '; print Form::selectarray('cat1', $options, GETPOST('cat1'), 1); } From ac8a7f064a017238de3b6201bf206d4c51e50e9d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 12 Jan 2018 15:23:56 +0100 Subject: [PATCH 0192/1074] More robust code --- htdocs/blockedlog/class/blockedlog.class.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php index 6ee02c111c4..5b802fc8e2c 100644 --- a/htdocs/blockedlog/class/blockedlog.class.php +++ b/htdocs/blockedlog/class/blockedlog.class.php @@ -398,6 +398,7 @@ class BlockedLog $totalamount += $amount; + $tmpobject = null; if ($this->element == 'payment_supplier') { include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; @@ -413,6 +414,10 @@ class BlockedLog include_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php'; $tmpobject = new Don($this->db); } + if (! is_object($tmpobject)) + { + continue; + } $result = $tmpobject->fetch($objid); if ($result <= 0) From 92f8fc8b85ea7e4f5314e04fbd67c3bb0daaab13 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 12 Jan 2018 15:26:50 +0100 Subject: [PATCH 0193/1074] Fix scrutinizer --- htdocs/don/class/paymentdonation.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/don/class/paymentdonation.class.php b/htdocs/don/class/paymentdonation.class.php index 619f2532a04..1023bf68b7a 100644 --- a/htdocs/don/class/paymentdonation.class.php +++ b/htdocs/don/class/paymentdonation.class.php @@ -234,7 +234,7 @@ class PaymentDonation extends CommonObject * @param int $notrigger 0=launch triggers after, 1=disable triggers * @return int <0 if KO, >0 if OK */ - function update($user=null, $notrigger=0) + function update($user, $notrigger=0) { global $conf, $langs; $error=0; From ad4b59d2c83e0a02740b048466d034d14cd1f3c8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 12 Jan 2018 15:33:21 +0100 Subject: [PATCH 0194/1074] Fix scrutinizer --- htdocs/core/class/html.formfile.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 10a31b215f7..1a67e374e68 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -1236,7 +1236,7 @@ class FormFile print ""; print ''; - if (! $editline && $nboflines > 1 && is_object($object)) { + if ($nboflines > 1 && is_object($object)) { if (! empty($conf->use_javascript_ajax) && $permtoeditline) { $table_element_line = 'ecm_files'; include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php'; From 8b972313ae6a10665097f2cb91c7962df7389884 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 12 Jan 2018 15:38:53 +0100 Subject: [PATCH 0195/1074] Fix scrutinizer --- .../compta/facture/class/api_invoices.class.php | 2 +- htdocs/product/stock/class/productlot.class.php | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php index 9e24b68fde4..e691d497194 100644 --- a/htdocs/compta/facture/class/api_invoices.class.php +++ b/htdocs/compta/facture/class/api_invoices.class.php @@ -444,7 +444,7 @@ class Invoices extends DolibarrApi } if($this->invoice->update($id, DolibarrApiAccess::$user)) - return $this->get ($id); + return $this->get($id); return false; } diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php index fe6731f10df..d7915512b2c 100644 --- a/htdocs/product/stock/class/productlot.class.php +++ b/htdocs/product/stock/class/productlot.class.php @@ -470,14 +470,15 @@ class Productlot extends CommonObject * Return a link to the a lot card (with optionaly the picto) * Use this->id,this->lastname, this->firstname * - * @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto) - * @param string $option On what the link point to - * @param integer $notooltip 1=Disable tooltip - * @param int $maxlen Max length of visible user name - * @param string $morecss Add more css on link - * @return string String with URL + * @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto) + * @param string $option On what the link point to + * @param integer $notooltip 1=Disable tooltip + * @param int $maxlen Max length of visible user name + * @param string $morecss Add more css on link + * @param int $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking + * @return string String with URL */ - function getNomUrl($withpicto=0, $option='', $notooltip=0, $maxlen=24, $morecss='') + function getNomUrl($withpicto=0, $option='', $notooltip=0, $maxlen=24, $morecss='', $save_lastsearch_value=-1) { global $langs, $conf, $db; global $dolibarr_main_authentication, $dolibarr_main_demo; From 32a998e68dcf316dd934d23331d65ff3c4ac6d4d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 12 Jan 2018 16:28:10 +0100 Subject: [PATCH 0196/1074] Fix preview link --- htdocs/core/class/html.formfile.class.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 1a67e374e68..4bff96700d5 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -944,6 +944,7 @@ class FormFile * @param int $disablemove 1=Disable move button, 0=Position move is possible. * @param int $addfilterfields Add line with filters * @return int <0 if KO, nb of files shown if OK + * @see list_of_autoecmfiles */ function list_of_documents($filearray,$object,$modulepart,$param='',$forcedownload=0,$relativepath='',$permonobject=1,$useinecm=0,$textifempty='',$maxlength=0,$title='',$url='', $showrelpart=0, $permtoeditline=-1,$upload_dir='',$sortfield='',$sortorder='ASC', $disablemove=1, $addfilterfields=0) { @@ -1115,7 +1116,7 @@ class FormFile // Preview link if (! $editline) print $this->showPreview($file, $modulepart, $filepath); // Public share link - if (! $editline && ! empty($filearray[$key]['hashp'])) print 'ee'; + //if (! $editline && ! empty($filearray[$key]['hashp'])) print pictowithlinktodirectdownload; print "\n"; @@ -1269,6 +1270,7 @@ class FormFile * @param string $url Full url to use for click links ('' = autodetect) * @param int $addfilterfields Add line with filters * @return int <0 if KO, nb of files shown if OK + * @see list_of_documents */ function list_of_autoecmfiles($upload_dir, $filearray, $modulepart, $param, $forcedownload=0, $relativepath='', $permtodelete=1, $useinecm=0, $textifempty='', $maxlength=0, $url='', $addfilterfields=0) { @@ -1475,7 +1477,8 @@ class FormFile print dol_trunc($file['name'],$maxlength,'middle'); print ''; - print $this->getDocumentsLink($modulepart, $modulesubdir, $filedir, '^'.preg_quote($file['name'],'/').'$'); + //print $this->getDocumentsLink($modulepart, $modulesubdir, $filedir, '^'.preg_quote($file['name'],'/').'$'); + print $this->showPreview($file, $modulepart, $file['relativename']); print "\n"; print ''.dol_print_size($file['size'],1,1).''; @@ -1677,7 +1680,7 @@ class FormFile /** * Show detail icon with link for preview * - * @param array $file File + * @param array $file Array with data of file. Example: array('name'=>...) * @param string $modulepart propal, facture, facture_fourn, ... * @param string $relativepath Relative path of docs * @param string $ruleforpicto Rule for picto: 0=Use the generic preview picto, 1=Use the picto of mime type of file) From 7bfcfd4574bef2c81f0f5b40b7f96d26eb4a8fe7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 12 Jan 2018 17:12:38 +0100 Subject: [PATCH 0197/1074] Fix recursive path when dir is '0' --- htdocs/core/lib/files.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index d357141fa4d..577d6356752 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -159,7 +159,7 @@ function dol_dir_list($path, $types="all", $recursive=0, $filter="", $excludefil // if we're in a directory and we want recursive behavior, call this function again if ($recursive) { - $file_list = array_merge($file_list, dol_dir_list($path."/".$file, $types, $recursive, $filter, $excludefilter, $sortcriteria, $sortorder, $mode, $nohook, ($relativename?$relativename.'/':'').$file)); + $file_list = array_merge($file_list, dol_dir_list($path."/".$file, $types, $recursive, $filter, $excludefilter, $sortcriteria, $sortorder, $mode, $nohook, ($relativename!=''?$relativename.'/':'').$file)); } } else if (! $isdir && (($types == "files") || ($types == "all"))) From d0680b429f9954afd75568ce8d763d5ae016efe6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 12 Jan 2018 17:39:20 +0100 Subject: [PATCH 0198/1074] Fix name of file saved from tax document tab --- htdocs/compta/sociales/document.php | 1 + htdocs/core/tpl/document_actions_post_headers.tpl.php | 4 ++-- htdocs/fourn/facture/document.php | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php index 048d35d73f1..0bf1e7f6f13 100644 --- a/htdocs/compta/sociales/document.php +++ b/htdocs/compta/sociales/document.php @@ -161,6 +161,7 @@ if ($object->id) $modulepart = 'tax'; $permission = $user->rights->tax->charges->creer; + $permtoedit = $user->rights->fournisseur->facture->creer; $param = '&id=' . $object->id; include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php'; } diff --git a/htdocs/core/tpl/document_actions_post_headers.tpl.php b/htdocs/core/tpl/document_actions_post_headers.tpl.php index f50dc62fb9b..8380d5c23f5 100644 --- a/htdocs/core/tpl/document_actions_post_headers.tpl.php +++ b/htdocs/core/tpl/document_actions_post_headers.tpl.php @@ -62,7 +62,7 @@ $savingdocmask=''; if (empty($conf->global->MAIN_DISABLE_SUGGEST_REF_AS_PREFIX)) { //var_dump($modulepart); - if (in_array($modulepart,array('facture_fournisseur','commande_fournisseur','facture','commande','propal','supplier_proposal','ficheinter','contract','project','project_task','expensereport'))) + if (in_array($modulepart,array('facture_fournisseur','commande_fournisseur','facture','commande','propal','supplier_proposal','ficheinter','contract','project','project_task','expensereport','tax'))) { $savingdocmask=dol_sanitizeFileName($object->ref).'-__file__'; } @@ -87,7 +87,7 @@ $formfile->form_attach_new_file( ); $disablemove=1; -if (in_array($modulepart, array('product', 'produit', 'societe', 'user'))) $disablemove=0; // Drag and drop for up and down allowed on product +if (in_array($modulepart, array('product', 'produit', 'societe', 'user'))) $disablemove=0; // Drag and drop for up and down allowed on product, thirdparty, ... // List of document $formfile->list_of_documents( diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php index 113f262e2a9..5f8c5787773 100644 --- a/htdocs/fourn/facture/document.php +++ b/htdocs/fourn/facture/document.php @@ -244,6 +244,8 @@ if ($object->id > 0) print ''; print ''; + print '
    '; + dol_fiche_end(); From 8014f7d822287a915c625dfe66abf2b4feb3c8e0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 12 Jan 2018 19:09:43 +0100 Subject: [PATCH 0199/1074] Fix blockedlog module must store ref of invoice once validated --- htdocs/blockedlog/class/blockedlog.class.php | 8 ++++++++ ...interface_50_modBlockedlog_ActionsBlockedLog.class.php | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php index 5b802fc8e2c..dc089b92747 100644 --- a/htdocs/blockedlog/class/blockedlog.class.php +++ b/htdocs/blockedlog/class/blockedlog.class.php @@ -364,6 +364,8 @@ class BlockedLog ))) continue; // Discard if not into a dedicated list if (!is_object($value)) $this->object_data->{$key} = $value; } + + if (! empty($object->newref)) $this->object_data->ref = $object->newref; } elseif ($this->element == 'invoice_supplier') { @@ -375,6 +377,8 @@ class BlockedLog ))) continue; // Discard if not into a dedicated list if (!is_object($value)) $this->object_data->{$key} = $value; } + + if (! empty($object->newref)) $this->object_data->ref = $object->newref; } elseif ($this->element == 'payment' || $this->element == 'payment_supplier' || $this->element == 'payment_donation') { @@ -474,10 +478,14 @@ class BlockedLog } $this->object_data->amount = $totalamount; + + if (! empty($object->newref)) $this->object_data->ref = $object->newref; } elseif($this->element == 'payment_salary') { $this->object_data->amounts = array($object->amount); + + if (! empty($object->newref)) $this->object_data->ref = $object->newref; } return 1; diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php index 03fb170650d..25dc957df02 100644 --- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php +++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php @@ -1,5 +1,6 @@ +/* Copyright (C) 2017 ATM Consulting + * Copyright (C) 2017-2018 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 From 5fb867222160b90c6fba2fd9bdc6c5345d6616c7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 12 Jan 2018 20:24:09 +0100 Subject: [PATCH 0200/1074] Fix blockedlog. Browser can be used with large amount of events --- htdocs/blockedlog/admin/blockedlog_list.php | 148 ++++++++++++------- htdocs/blockedlog/class/blockedlog.class.php | 22 ++- htdocs/langs/en_US/blockedlog.lang | 2 + 3 files changed, 108 insertions(+), 64 deletions(-) diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php index 8c9e9bbd287..01d2b5146ad 100644 --- a/htdocs/blockedlog/admin/blockedlog_list.php +++ b/htdocs/blockedlog/admin/blockedlog_list.php @@ -27,6 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/blockedlog/lib/blockedlog.lib.php'; require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php'; require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/authority.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; $langs->loadLangs(array("admin", "other", "blockedlog", "bills")); @@ -37,17 +38,19 @@ $contextpage= GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'blockedlo $backtopage = GETPOST('backtopage','alpha'); // Go back to a dedicated page $optioncss = GETPOST('optioncss','aZ'); // Option for the css output (always '' except when 'print') -$showonlyerrors = GETPOST('showonlyerrors','int'); +$search_showonlyerrors = GETPOST('search_showonlyerrors','int'); +if ($search_showonlyerrors < 0) $search_showonlyerrors=0; $search_fk_user=GETPOST('search_fk_user','intcomma'); $search_start = -1; -if(GETPOST('search_startyear')!='') $search_start = dol_mktime(0, 0, 0, GETPOST('search_startmonth'), GETPOST('search_startday'), GETPOST('search_startyear')); +if (GETPOST('search_startyear')!='') $search_start = dol_mktime(0, 0, 0, GETPOST('search_startmonth'), GETPOST('search_startday'), GETPOST('search_startyear')); $search_end = -1; -if(GETPOST('search_endyear')!='') $search_end= dol_mktime(23, 59, 59, GETPOST('search_endmonth'), GETPOST('search_endday'), GETPOST('search_endyear')); +if (GETPOST('search_endyear')!='') $search_end= dol_mktime(23, 59, 59, GETPOST('search_endmonth'), GETPOST('search_endday'), GETPOST('search_endyear')); $search_code = GETPOST('search_code', 'alpha'); $search_ref = GETPOST('search_ref', 'alpha'); $search_amount = GETPOST('search_amount', 'alpha'); +if (($search_start == -1 || empty($search_start)) && ! GETPOSTISSET('search_startmonth')) $search_start = dol_time_plus_duree(dol_now(), '-1', 'w'); // Load variable for pagination $limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit; @@ -81,6 +84,7 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x', $search_code = ''; $search_ref = ''; $search_amount = ''; + $search_showonlyerrors = 0; $toselect=''; $search_array_options=array(); } @@ -207,11 +211,20 @@ else llxHeader('',$langs->trans("BrowseBlockedLog")); -$blocks = $block_static->getLog('all', 0, GETPOST('all','alpha') ? 0 : 50, $sortfield, $sortorder, $search_fk_user, $search_start, $search_end, $search_ref, $search_amount, $search_code); +$MAXLINES = 10000; + +$blocks = $block_static->getLog('all', 0, $MAXLINES, $sortfield, $sortorder, $search_fk_user, $search_start, $search_end, $search_ref, $search_amount, $search_code); if (! is_array($blocks)) { - dol_print_error($block_static->db); - exit; + if ($blocks == -2) + { + setEventMessages($langs->trans("TooManyRecordToScanRestrictFilters", $MAXLINES), null, 'errors'); + } + else + { + dol_print_error($block_static->db, $block_static->error, $block_static->errors); + exit; + } } $linkback=''; @@ -238,6 +251,7 @@ if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($lim if ($search_fk_user > 0) $param.='&search_fk_user='.urlencode($search_fk_user); if ($search_start > 0) $param.='&search_startyear='.urlencode(GETPOST('search_startyear','int')).'&search_startmonth='.urlencode(GETPOST('search_startmonth','int')).'&search_startday='.urlencode(GETPOST('search_startday','int')); if ($search_end > 0) $param.='&search_endyear='.urlencode(GETPOST('search_endyear','int')).'&search_endmonth='.urlencode(GETPOST('search_endmonth','int')).'&search_endday='.urlencode(GETPOST('search_endday','int')); +if ($search_showonlyerrors > 0) $param.='&search_showonlyerrors='.urlencode($search_showonlyerrors); if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss); if (GETPOST('withtab','alpha')) $param.='&withtab='.urlencode(GETPOST('withtab','alpha')); @@ -246,9 +260,9 @@ if (GETPOST('withtab','alpha')) $param.='&withtab='.urlencode(GETPOST('withtab', print ''; @@ -300,9 +314,18 @@ print ''; // Amount print ''; +// Full data print ''; + +// Fingerprint print ''; +// Status +print ''; +$array=array("1"=>$langs->trans("OnlyNonValid")); +print $form->selectarray('search_showonlyerrors', $array, $search_showonlyerrors, 1); +print ''; + // Action column print ''; $searchpicto=$form->showFilterButtons(); @@ -321,12 +344,13 @@ print getTitleFieldOfList('', 0, $_SERVER["PHP_SELF"],'','',$param,'',$sortfield print getTitleFieldOfList($langs->trans('Amount'), 0, $_SERVER["PHP_SELF"],'','',$param,'align="right"',$sortfield,$sortorder,'')."\n"; print getTitleFieldOfList($langs->trans('DataOfArchivedEvent'), 0, $_SERVER["PHP_SELF"],'','',$param,'align="center"',$sortfield,$sortorder,'')."\n"; print getTitleFieldOfList($langs->trans('Fingerprint'), 0, $_SERVER["PHP_SELF"],'','',$param,'',$sortfield,$sortorder,'')."\n"; +print getTitleFieldOfList($langs->trans('Status'), 0, $_SERVER["PHP_SELF"],'','',$param,'align="center"',$sortfield,$sortorder,'')."\n"; print getTitleFieldOfList('', 0, $_SERVER["PHP_SELF"],'','',$param,'align="center"',$sortfield,$sortorder,'')."\n"; print ''; if (! empty($conf->global->BLOCKEDLOG_SCAN_ALL_FOR_LOWERIDINERROR)) { - // This is version that is faster memory but require more memory and report errors that are outside the filter range + // This is version that is faster but require more memory and report errors that are outside the filter range // TODO Make a full scan of table in reverse order of id of $block, so we can use the parameter $previoushash into checkSignature to save requests // to find the $loweridinerror. @@ -334,66 +358,76 @@ if (! empty($conf->global->BLOCKEDLOG_SCAN_ALL_FOR_LOWERIDINERROR)) } else { - // This is version that optimize memory (but will not report error that are outside the filter range) + // This is version that optimize the memory (but will not report errors that are outside the filter range) $loweridinerror=0; $checkresult=array(); - foreach($blocks as &$block) { - $checksignature = $block->checkSignature(); // Note: this make a sql request at each call, we can't avoid this as the sorting order is various - $checkresult[$block->id]=$checksignature; // false if error - if (! $checksignature) + if (is_array($blocks)) + { + foreach($blocks as &$block) { - if (empty($loweridinerror)) $loweridinerror=$block->id; - else $loweridinerror = min($loweridinerror, $block->id); + $checksignature = $block->checkSignature(); // Note: this make a sql request at each call, we can't avoid this as the sorting order is various + $checkresult[$block->id]=$checksignature; // false if error + if (! $checksignature) + { + if (empty($loweridinerror)) $loweridinerror=$block->id; + else $loweridinerror = min($loweridinerror, $block->id); + } } } } -foreach($blocks as &$block) { - $object_link = $block->getObjectLink(); - - if (empty($showonlyerrors) || ! $checkresult[$block->id] || ($loweridinerror && $block->id >= $loweridinerror)) +if (is_array($blocks)) +{ + foreach($blocks as &$block) { - print ''; - // ID - print ''.$block->id.''; - // Date - print ''.dol_print_date($block->tms,'dayhour').''; - // User - print ''; - //print $block->getUser() - print $block->user_fullname; - print ''; - // Action - print ''.$langs->trans('log'.$block->action).''; - // Ref - print ''.$block->ref_object.''; - // Link to source object - print ''.$object_link.''; - print ''.price($block->amounts).''; - print ''.img_info($langs->trans('ShowDetails')).''; + $object_link = $block->getObjectLink(); - print ''; - print $form->textwithpicto(dol_trunc($block->signature, '12'), $block->signature); - print ''; + if (empty($search_showonlyerrors) || ! $checkresult[$block->id] || ($loweridinerror && $block->id >= $loweridinerror)) + { + print ''; + // ID + print ''.$block->id.''; + // Date + print ''.dol_print_date($block->date_creation,'dayhour').''; + // User + print ''; + //print $block->getUser() + print $block->user_fullname; + print ''; + // Action + print ''.$langs->trans('log'.$block->action).''; + // Ref + print ''.$block->ref_object.''; + // Link to source object + print ''.$object_link.''; + print ''.price($block->amounts).''; + print ''.img_info($langs->trans('ShowDetails')).''; - print ''; - if (! $checkresult[$block->id] || ($loweridinerror && $block->id >= $loweridinerror)) // If error - { - if ($checkresult[$block->id]) print img_picto($langs->trans('OkCheckFingerprintValidityButChainIsKo'), 'statut1'); - else print img_picto($langs->trans('KoCheckFingerprintValidity'), 'statut8'); - } - else - { - print img_picto($langs->trans('OkCheckFingerprintValidity'), 'statut4'); - } + print ''; + print $form->textwithpicto(dol_trunc($block->signature, '12'), $block->signature); + print ''; - if(!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY) && !empty($conf->global->BLOCKEDLOG_AUTHORITY_URL)) { - print ' '.($block->certified ? img_picto($langs->trans('AddedByAuthority'), 'info') : img_picto($langs->trans('NotAddedByAuthorityYet'), 'info_black') ); - } - print ''; + print ''; + if (! $checkresult[$block->id] || ($loweridinerror && $block->id >= $loweridinerror)) // If error + { + if ($checkresult[$block->id]) print img_picto($langs->trans('OkCheckFingerprintValidityButChainIsKo'), 'statut1'); + else print img_picto($langs->trans('KoCheckFingerprintValidity'), 'statut8'); + } + else + { + print img_picto($langs->trans('OkCheckFingerprintValidity'), 'statut4'); + } - print ''; + if(!empty($conf->global->BLOCKEDLOG_USE_REMOTE_AUTHORITY) && !empty($conf->global->BLOCKEDLOG_AUTHORITY_URL)) { + print ' '.($block->certified ? img_picto($langs->trans('AddedByAuthority'), 'info') : img_picto($langs->trans('NotAddedByAuthorityYet'), 'info_black') ); + } + print ''; + print ''; + + print ''; + + } } } diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php index dc089b92747..a4dab57305c 100644 --- a/htdocs/blockedlog/class/blockedlog.class.php +++ b/htdocs/blockedlog/class/blockedlog.class.php @@ -788,7 +788,7 @@ class BlockedLog * @param string $search_ref search ref * @param string $search_amount search amount * @param string $search_code search code - * @return array array of object log + * @return array|int Array of object log or <0 if error */ public function getLog($element, $fk_object, $limit = 0, $sortfield = '', $sortorder = '', $search_fk_user = -1, $search_start = -1, $search_end = -1, $search_ref='', $search_amount='', $search_code='') { @@ -826,16 +826,25 @@ class BlockedLog if ($search_code != '' && $search_code != '-1') $sql.=natural_search("action", $search_code, 3); $sql.=$this->db->order($sortfield, $sortorder); - $sql.=$this->db->plimit($limit); + $sql.=$this->db->plimit($limit+1); // We want more, because we will stop into loop later with error if we reach max $res = $this->db->query($sql); if($res) { $results=array(); - while ($obj = $this->db->fetch_object($res)) { + $i = 0; + while ($obj = $this->db->fetch_object($res)) + { + $i++; + if ($i > $limit) + { + // Too many record, we will consume too much memory + return -2; + } - if (!isset($cachedlogs[$obj->rowid])) { + if (!isset($cachedlogs[$obj->rowid])) + { $b=new BlockedLog($this->db); $b->fetch($obj->rowid); @@ -847,9 +856,8 @@ class BlockedLog return $results; } - else{ - return false; - } + + return -1; } /** diff --git a/htdocs/langs/en_US/blockedlog.lang b/htdocs/langs/en_US/blockedlog.lang index 7d64f7086bf..bb6c9c155ee 100644 --- a/htdocs/langs/en_US/blockedlog.lang +++ b/htdocs/langs/en_US/blockedlog.lang @@ -45,3 +45,5 @@ ImpossibleToReloadObject=Object (type %s, id %s) removed (see 'Full data' link f BlockedLogAreRequiredByYourCountryLegislation=Unalterable Logs module may be required by the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they can not be validated by a tax audit. BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Unalterable Logs module was activated because of the legislation of your country. Disabling this module may render any future transactions invalid with respect to the law and the use of legal software as they can not be validated by a tax audit. BlockedLogDisableNotAllowedForCountry=List of countries where usage of this module is mandatory (just to prevent to disable the module by error, if your country is in this list, disable of module is not possible without editing this list first) +OnlyNonValid=Non valid +TooManyRecordToScanRestrictFilters=Too many record to scan/analyze. Please restrict list with more restrictive filters. \ No newline at end of file From 854a71726ce5e16db764668fe1615cbdaf59d597 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 12 Jan 2018 20:32:30 +0100 Subject: [PATCH 0201/1074] Fix lose filters --- htdocs/blockedlog/admin/blockedlog_list.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php index 01d2b5146ad..092a4167b17 100644 --- a/htdocs/blockedlog/admin/blockedlog_list.php +++ b/htdocs/blockedlog/admin/blockedlog_list.php @@ -248,11 +248,15 @@ print '
    '; $param=''; if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage); if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit); -if ($search_fk_user > 0) $param.='&search_fk_user='.urlencode($search_fk_user); -if ($search_start > 0) $param.='&search_startyear='.urlencode(GETPOST('search_startyear','int')).'&search_startmonth='.urlencode(GETPOST('search_startmonth','int')).'&search_startday='.urlencode(GETPOST('search_startday','int')); -if ($search_end > 0) $param.='&search_endyear='.urlencode(GETPOST('search_endyear','int')).'&search_endmonth='.urlencode(GETPOST('search_endmonth','int')).'&search_endday='.urlencode(GETPOST('search_endday','int')); +if ($search_fk_user > 0) $param.='&search_fk_user='.urlencode($search_fk_user); +if ($search_startyear > 0) $param.='&search_startyear='.urlencode(GETPOST('search_startyear','int')); +if ($search_startmonth > 0) $param.='&search_startmonth='.urlencode(GETPOST('search_startmonth','int')); +if ($search_startday > 0) $param.='&search_startday='.urlencode(GETPOST('search_startday','int')); +if ($search_endyear > 0) $param.='&search_endyear='.urlencode(GETPOST('search_endyear','int')); +if ($search_endmonth > 0) $param.='&search_endmonth='.urlencode(GETPOST('search_endmonth','int')); +if ($search_endday > 0) $param.='&search_endday='.urlencode(GETPOST('search_endday','int')); if ($search_showonlyerrors > 0) $param.='&search_showonlyerrors='.urlencode($search_showonlyerrors); -if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss); +if ($optioncss != '') $param.='&optioncss='.urlencode($optioncss); if (GETPOST('withtab','alpha')) $param.='&withtab='.urlencode(GETPOST('withtab','alpha')); // Add $param from extra fields From 53b36435d040ab6ef75b64b3583174d21c22dc29 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 12 Jan 2018 20:50:18 +0100 Subject: [PATCH 0202/1074] Fix on smartphone --- htdocs/comm/mailing/card.php | 2 +- htdocs/core/class/html.form.class.php | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php index efae8bd8e80..cedd04c46c1 100644 --- a/htdocs/comm/mailing/card.php +++ b/htdocs/comm/mailing/card.php @@ -1095,7 +1095,7 @@ else $htmltext.='    '; // Print mail content - print load_fiche_titre($langs->trans("EMail"), $form->textwithpicto($langs->trans("AvailableVariables"), $htmltext, 1, 'help', '', 0, 2, 'emailsubstitionhelp'), 'title_generic'); + print load_fiche_titre($langs->trans("EMail"), $form->textwithpicto(''.$langs->trans("AvailableVariables").'', $htmltext, 1, 'help', '', 0, 2, 'emailsubstitionhelp'), 'title_generic'); dol_fiche_head('', '', '', -1); diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 8d513fae9bf..65b68f613f5 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -523,8 +523,13 @@ class Form } } - // If info or help with smartphone, show only text (tooltip can't works) - if (! empty($conf->dol_no_mouse_hover)) + // If info or help with smartphone, show only text (tooltip hover can't works) + if (! empty($conf->dol_no_mouse_hover) && empty($tooltiptrigger)) + { + if ($type == 'info' || $type == 'help') return $text; + } + // If info or help with smartphone, show only text (tooltip on lick does not works with dialog on smaprtphone) + if (! empty($conf->dol_no_mouse_hover) && ! empty($tooltiptrigger)) { if ($type == 'info' || $type == 'help') return $text; } From 3bcf1d9da6d51d2c4cffc396f96097200c1d821a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 13 Jan 2018 12:08:24 +0100 Subject: [PATCH 0203/1074] Fix css --- htdocs/commande/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index df47e04390e..f164a1249a5 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -664,7 +664,7 @@ if ($resql) -3=>$langs->trans("StatusOrderValidatedShort").'+'.$langs->trans("StatusOrderSentShort").'+'.$langs->trans("StatusOrderDelivered"), Commande::STATUS_CANCELED=>$langs->trans("StatusOrderCanceledShort") ); - print $form->selectarray('viewstatut', $liststatus, $viewstatut, -4); + print $form->selectarray('viewstatut', $liststatus, $viewstatut, -4, 0, 0, '', 0, 0, 0, '', 'maxwidth100'); print ''; } // Status billed From 7a88afe962ef0da0b160dc40d4bf26b73a0afadf Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 13 Jan 2018 13:16:33 +0100 Subject: [PATCH 0204/1074] Fix field enabled and perms must differs --- htdocs/core/class/extrafields.class.php | 69 +++++++++++-------- .../install/mysql/migration/6.0.0-7.0.0.sql | 1 + .../install/mysql/tables/llx_extrafields.sql | 1 + .../core/modules/modMyModule.class.php | 10 +-- 4 files changed, 49 insertions(+), 32 deletions(-) diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index e556def834d..1df6cf5842f 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -143,11 +143,12 @@ class ExtraFields * @param int $list Visibilty * @param int $ishidden Deprecated. Use visibility instead. * @param string $computed Computed value - * @param string $entity Entity of extrafields + * @param string $entity Entity of extrafields (for multicompany modules) * @param string $langfile Language file + * @param string $enabled Condition to have the field enabled or not * @return int <=0 if KO, >0 if OK */ - function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique=0, $required=0, $default_value='', $param='', $alwayseditable=0, $perms='', $list=-1, $ishidden=0, $computed='', $entity='', $langfile='') + function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique=0, $required=0, $default_value='', $param='', $alwayseditable=0, $perms='', $list=-1, $ishidden=0, $computed='', $entity='', $langfile='', $enabled='1') { if (empty($attrname)) return -1; if (empty($label)) return -1; @@ -286,9 +287,10 @@ class ExtraFields * @param string $computed Computed value * @param string $entity Entity of extrafields * @param string $langfile Language file + * @param string $enabled Condition to have the field enabled or not * @return int <=0 if KO, >0 if OK */ - private function create_label($attrname, $label='', $type='', $pos=0, $size=0, $elementtype='member', $unique=0, $required=0, $param='', $alwayseditable=0, $perms='', $list=-1, $ishidden=0, $default='', $computed='',$entity='', $langfile='') + private function create_label($attrname, $label='', $type='', $pos=0, $size=0, $elementtype='member', $unique=0, $required=0, $param='', $alwayseditable=0, $perms='', $list=-1, $ishidden=0, $default='', $computed='',$entity='', $langfile='', $enabled='1') { global $conf,$user; @@ -298,6 +300,9 @@ class ExtraFields // Clean parameters if (empty($pos)) $pos=0; if (empty($list)) $list=0; + if (empty($required)) $required=0; + if (empty($unique)) $unique=0; + if (empty($alwayseditable)) $alwayseditable=0; if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname) && ! is_numeric($attrname)) { @@ -333,19 +338,20 @@ class ExtraFields $sql.= " fieldcomputed,"; $sql.= " fk_user_author,"; $sql.= " fk_user_modif,"; - $sql.= " datec"; + $sql.= " datec,"; + $sql.= " enabled"; $sql.= " )"; $sql.= " VALUES('".$attrname."',"; $sql.= " '".$this->db->escape($label)."',"; - $sql.= " '".$type."',"; - $sql.= " '".$pos."',"; - $sql.= " '".$size."',"; + $sql.= " '".$this->db->escape($type)."',"; + $sql.= " ".$pos.","; + $sql.= " '".$this->db->escape($size)."',"; $sql.= " ".($entity===''?$conf->entity:$entity).","; - $sql.= " '".$elementtype."',"; - $sql.= " '".$unique."',"; - $sql.= " '".$required."',"; - $sql.= " '".$params."',"; - $sql.= " '".$alwayseditable."',"; + $sql.= " '".$this->db->escape($elementtype)."',"; + $sql.= " ".$unique.","; + $sql.= " ".$required.","; + $sql.= " '".$this->db->escape($params)."',"; + $sql.= " ".$alwayseditable.","; $sql.= " ".($perms?"'".$this->db->escape($perms)."'":"null").","; $sql.= " ".($langfile?"'".$this->db->escape($langfile)."'":"null").","; $sql.= " ".$list.","; @@ -353,7 +359,8 @@ class ExtraFields $sql.= " ".($computed?"'".$this->db->escape($computed)."'":"null").","; $sql .= " " . $user->id . ","; $sql .= " " . $user->id . ","; - $sql .= "'" . $this->db->idate(dol_now()) . "'"; + $sql .= "'" . $this->db->idate(dol_now()) . "',"; + $sql.= " ".($enabled?"'".$this->db->escape($enabled)."'":"1"); $sql.=')'; dol_syslog(get_class($this)."::create_label", LOG_DEBUG); @@ -488,9 +495,10 @@ class ExtraFields * @param string $computed Computed value * @param string $entity Entity of extrafields * @param string $langfile Language file + * @param string $enabled Condition to have the field enabled or not * @return int >0 if OK, <=0 if KO */ - function update($attrname, $label, $type, $length, $elementtype, $unique=0, $required=0, $pos=0, $param='', $alwayseditable=0, $perms='', $list='', $ishidden=0, $default='', $computed='', $entity='', $langfile='') + function update($attrname, $label, $type, $length, $elementtype, $unique=0, $required=0, $pos=0, $param='', $alwayseditable=0, $perms='', $list='', $ishidden=0, $default='', $computed='', $entity='', $langfile='', $enabled='1') { if ($elementtype == 'thirdparty') $elementtype='societe'; if ($elementtype == 'contact') $elementtype='socpeople'; @@ -538,7 +546,7 @@ class ExtraFields { if ($label) { - $result=$this->update_label($attrname,$label,$type,$length,$elementtype,$unique,$required,$pos,$param,$alwayseditable,$perms,$list,$ishidden,$default,$computed,$entity,$langfile); + $result=$this->update_label($attrname,$label,$type,$length,$elementtype,$unique,$required,$pos,$param,$alwayseditable,$perms,$list,$ishidden,$default,$computed,$entity,$langfile,$enabled); } if ($result > 0) { @@ -594,18 +602,23 @@ class ExtraFields * @param string $computed Computed value * @param string $entity Entity of extrafields * @param string $langfile Language file + * @param string $enabled Condition to have the field enabled or not * @return int <=0 if KO, >0 if OK */ - private function update_label($attrname,$label,$type,$size,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0,$perms='',$list=0,$ishidden=0,$default='',$computed='',$entity='',$langfile='') + private function update_label($attrname,$label,$type,$size,$elementtype,$unique=0,$required=0,$pos=0,$param='',$alwayseditable=0,$perms='',$list=0,$ishidden=0,$default='',$computed='',$entity='',$langfile='',$enabled='1') { global $conf, $user; - dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required.", ".$pos.", ".$alwayseditable.", ".$perms.", ".$list.", ".$ishidden.", ".$default.", ".$computed.", ".$entity.", ".$langfile); + dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required.", ".$pos.", ".$alwayseditable.", ".$perms.", ".$list.", ".$ishidden.", ".$default.", ".$computed.", ".$entity.", ".$langfile.", ".$enabled); // Clean parameters if ($elementtype == 'thirdparty') $elementtype='societe'; if ($elementtype == 'contact') $elementtype='socpeople'; + if (empty($pos)) $pos=0; if (empty($list)) $list=0; + if (empty($required)) $required=0; + if (empty($unique)) $unique=0; + if (empty($alwayseditable)) $alwayseditable=0; if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname)) { @@ -642,27 +655,29 @@ class ExtraFields $sql.= " fieldcomputed,"; $sql.= " fk_user_author,"; $sql.= " fk_user_modif,"; - $sql.= " datec"; + $sql.= " datec,"; + $sql.= " enabled"; $sql.= ") VALUES ("; $sql.= "'".$attrname."',"; $sql.= " ".($entity===''?$conf->entity:$entity).","; $sql.= " '".$this->db->escape($label)."',"; - $sql.= " '".$type."',"; - $sql.= " '".$size."',"; - $sql.= " '".$elementtype."',"; - $sql.= " '".$unique."',"; - $sql.= " '".$required."',"; + $sql.= " '".$this->db->escape($type)."',"; + $sql.= " '".$this->db->escape($size)."',"; + $sql.= " '".$this->db->escape($elementtype)."',"; + $sql.= " ".$unique.","; + $sql.= " ".$required.","; $sql.= " ".($perms?"'".$this->db->escape($perms)."'":"null").","; $sql.= " ".($langfile?"'".$this->db->escape($langfile)."'":"null").","; - $sql.= " '".$pos."',"; - $sql.= " '".$alwayseditable."',"; - $sql.= " '".$param."',"; + $sql.= " ".$pos.","; + $sql.= " '".$this->db->escape($alwayseditable)."',"; + $sql.= " '".$this->db->escape($param)."',"; $sql.= " ".$list.", "; $sql.= " ".(($default!='')?"'".$this->db->escape($default)."'":"null").","; $sql.= " ".($computed?"'".$this->db->escape($computed)."'":"null").","; $sql .= " " . $user->id . ","; $sql .= " " . $user->id . ","; - $sql .= "'" . $this->db->idate(dol_now()) . "'"; + $sql .= "'" . $this->db->idate(dol_now()) . "',"; + $sql .= "'" . $this->db->escape($enabled). "'"; $sql.= ")"; $resql2=$this->db->query($sql); diff --git a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql index ae74a1161fb..63501e183f7 100644 --- a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql +++ b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql @@ -429,6 +429,7 @@ ALTER TABLE llx_user ADD COLUMN default_c_exp_tax_cat integer; ALTER TABLE llx_extrafields ADD COLUMN fk_user_author integer; ALTER TABLE llx_extrafields ADD COLUMN fk_user_modif integer; ALTER TABLE llx_extrafields ADD COLUMN datec datetime; +ALTER TABLE llx_extrafields ADD COLUMN enabled varchar(255) DEFAULT '1'; ALTER TABLE llx_extrafields ADD COLUMN tms timestamp; -- We fix value of 'list' from 0 to 1 for all extrafields created before this migration diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql index 55136b97bb6..5c3a318b796 100644 --- a/htdocs/install/mysql/tables/llx_extrafields.sql +++ b/htdocs/install/mysql/tables/llx_extrafields.sql @@ -31,6 +31,7 @@ create table llx_extrafields fieldunique integer DEFAULT 0, fieldrequired integer DEFAULT 0, perms varchar(255), -- not used yet + enabled varchar(255), pos integer DEFAULT 0, alwayseditable integer DEFAULT 0, -- 1 if field can be edited whatever is element status param text, -- extra parameters to define possible values of field diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php index 0dba5024136..bedc908415f 100644 --- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php +++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php @@ -314,11 +314,11 @@ class modMyModule extends DolibarrModules include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; $extrafields = new ExtraFields($this->db); - //$result1=$extrafields->addExtraField('myattr1', "New Attr 1 label", 'boolean', 1, 3, 'thirdparty', 0, 0, '', '', 1, '', 0, 0, '', '', 'mymodule@mymodule'); - //$result2=$extrafields->addExtraField('myattr2', "New Attr 2 label", 'varchar', 1, 10, 'project', 0, 0, '', '', 1, '', 0, 0, '', '', 'mymodule@mymodule'); - //$result3=$extrafields->addExtraField('myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'mymodule@mymodule'); - //$result4=$extrafields->addExtraField('myattr4', "New Attr 4 label", 'select', 1, 3, 'thirdparty', 0, 1, '', array('options'=>array('code1'=>'Val1','code2'=>'Val2','code3'=>'Val3')), 1); - //$result5=$extrafields->addExtraField('myattr5', "New Attr 5 label", 'text', 1, 10, 'user', 0, 0, '', '', 1, '', 0, 0, '', '', 'mymodule@mymodule'); + //$result1=$extrafields->addExtraField('myattr1', "New Attr 1 label", 'boolean', 1, 3, 'thirdparty', 0, 0, '', '', 1, '', 0, 0, '', '', 'mymodule@mymodule', '$conf->mymodule->enabled'); + //$result2=$extrafields->addExtraField('myattr2', "New Attr 2 label", 'varchar', 1, 10, 'project', 0, 0, '', '', 1, '', 0, 0, '', '', 'mymodule@mymodule', '$conf->mymodule->enabled'); + //$result3=$extrafields->addExtraField('myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'mymodule@mymodule', '$conf->mymodule->enabled'); + //$result4=$extrafields->addExtraField('myattr4', "New Attr 4 label", 'select', 1, 3, 'thirdparty', 0, 1, '', array('options'=>array('code1'=>'Val1','code2'=>'Val2','code3'=>'Val3')), 1 '', 0, 0, '', '', 'mymodule@mymodule', '$conf->mymodule->enabled'); + //$result5=$extrafields->addExtraField('myattr5', "New Attr 5 label", 'text', 1, 10, 'user', 0, 0, '', '', 1, '', 0, 0, '', '', 'mymodule@mymodule', '$conf->mymodule->enabled'); $sql = array(); From 8d793c680e95d6dfac56d817703544d5ee20bba5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 13 Jan 2018 15:48:30 +0100 Subject: [PATCH 0205/1074] Fix dol_delete_preview --- htdocs/core/lib/files.lib.php | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index 577d6356752..df323c91f6e 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -1273,7 +1273,8 @@ function dol_delete_dir_recursive($dir, $count=0, $nophperrors=0, $onlysub=0, &$ /** - * Delete all preview files linked to object instance + * Delete all preview files linked to object instance. + * Note that preview image of PDF files is generated when required, by dol_banner_tab() for example. * * @param object $object Object to clean * @return int 0 if error, 1 if OK @@ -1297,19 +1298,39 @@ function dol_delete_preview($object) $refsan = dol_sanitizeFileName($object->ref); $dir = $dir . "/" . $refsan ; - $file = $dir . "/" . $refsan . ".pdf.png"; - $multiple = $file . "."; + $filepreviewnew = $dir . "/" . $refsan . ".pdf_preview.png"; + $filepreviewnewbis = $dir . "/" . $refsan . ".pdf_preview-0.png"; + $filepreviewold = $dir . "/" . $refsan . ".pdf.png"; - if (file_exists($file) && is_writable($file)) + // For new preview files + if (file_exists($filepreviewnew) && is_writable($filepreviewnew)) { - if (! dol_delete_file($file,1)) + if (! dol_delete_file($filepreviewnew,1)) { - $object->error=$langs->trans("ErrorFailedToDeleteFile",$file); + $object->error=$langs->trans("ErrorFailedToDeleteFile",$filepreviewnew); + return 0; + } + } + if (file_exists($filepreviewnewbis) && is_writable($filepreviewnewbis)) + { + if (! dol_delete_file($filepreviewnewbis,1)) + { + $object->error=$langs->trans("ErrorFailedToDeleteFile",$filepreviewnewbis); + return 0; + } + } + // For old preview files + if (file_exists($filepreviewold) && is_writable($filepreviewold)) + { + if (! dol_delete_file($filepreviewold,1)) + { + $object->error=$langs->trans("ErrorFailedToDeleteFile",$filepreviewold); return 0; } } else { + $multiple = $filepreviewold . "."; for ($i = 0; $i < 20; $i++) { $preview = $multiple.$i; From aa1692483f06292accc79d98e73575e414cf7709 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 13 Jan 2018 16:06:04 +0100 Subject: [PATCH 0206/1074] Fix colspan --- htdocs/compta/facture/fiche-rec.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index ddaf073e964..bb27f257dd3 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -1299,13 +1299,13 @@ else print ''; - print '"; + print '"; print ''; - print ''; + print ''; print ''; - print ''; + print ''; print ''; // Amount Local Taxes @@ -1332,7 +1332,7 @@ else if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && ! empty($object->brouillon) && $user->rights->facture->creer) print ''; print '
    '.$langs->trans("Author").''.$author->getFullName($langs)."
    '.$langs->trans("Author").''.$author->getFullName($langs)."
    '.$langs->trans("AmountHT").''.price($object->total_ht,'',$langs,1,-1,-1,$conf->currency).''.price($object->total_ht,'',$langs,1,-1,-1,$conf->currency).'
    '.$langs->trans("AmountVAT").''.price($object->total_tva,'',$langs,1,-1,-1,$conf->currency).'
    '.$langs->trans("AmountVAT").''.price($object->total_tva,'',$langs,1,-1,-1,$conf->currency).'
    id . '">' . img_edit($langs->trans('SetConditions'), 1) . '
    '; - print ''; + print ''; if ($object->type != Facture::TYPE_CREDIT_NOTE) { if ($action == 'editconditions') @@ -1356,7 +1356,7 @@ else if ($action != 'editmode' && ! empty($object->brouillon) && $user->rights->facture->creer) print 'id . '">' . img_edit($langs->trans('SetMode'), 1) . ''; print ''; - print ''; + print ''; if ($action == 'editmode') { $form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'CRDT'); @@ -1396,16 +1396,16 @@ else // Note public print ''; print $form->editfieldkey($form->textwithpicto($langs->trans('NotePublic'), $htmltext, 1, 'help', '', 0, 2, 'notepublic'), 'note_public', $object->note_public, $object, $user->rights->facture->creer); - print ''; - print $form->editfieldval($langs->trans("NotePublic"), 'note_public', $object->note_public, $object, $user->rights->facture->creer, 'textarea:'.ROWS_4.':60'); + print ''; + print $form->editfieldval($langs->trans("NotePublic"), 'note_public', $object->note_public, $object, $user->rights->facture->creer, 'textarea:'.ROWS_4.':90%', '', null, null, '', 1); print ''; print ''; // Note private print ''; print $form->editfieldkey($form->textwithpicto($langs->trans("NotePrivate"), $htmltext, 1, 'help', '', 0, 2, 'noteprivate'), 'note_private', $object->note_private, $object, $user->rights->facture->creer); - print ''; - print $form->editfieldval($langs->trans("NotePrivate"), 'note_private', $object->note_private, $object, $user->rights->facture->creer, 'textarea:'.ROWS_4.':60'); + print ''; + print $form->editfieldval($langs->trans("NotePrivate"), 'note_private', $object->note_private, $object, $user->rights->facture->creer, 'textarea:'.ROWS_4.':90%', '', null, null, '', 1); print ''; print ''; @@ -1419,7 +1419,7 @@ else if (($action != 'editbankaccount') && $user->rights->facture->creer && ! empty($object->brouillon)) print 'id.'">'.img_edit($langs->trans('SetBankAccount'),1).''; print ''; - print ''; + print ''; if ($action == 'editbankaccount') { $form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1); @@ -1441,7 +1441,7 @@ else if (($action != 'editmodelpdf') && $user->rights->facture->creer && ! empty($object->brouillon)) print 'id.'">'.img_edit($langs->trans('SetModel'),1).''; print ''; - print ''; + print ''; if ($action == 'editmodelpdf') { include_once DOL_DOCUMENT_ROOT . '/core/modules/facture/modules_facture.php'; From 7c480f76e3b260340edc8b892227dedfefcdfdb4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 13 Jan 2018 16:09:05 +0100 Subject: [PATCH 0207/1074] Fix thumbs of pdf at wrong place Fix param not provided Fix css --- htdocs/core/class/extrafields.class.php | 2 +- htdocs/core/class/html.form.class.php | 2 +- htdocs/core/lib/files.lib.php | 1 + htdocs/core/lib/functions.lib.php | 15 +++++++++------ htdocs/core/tpl/objectline_create.tpl.php | 4 ++-- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 1df6cf5842f..139fcb65162 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -165,7 +165,7 @@ class ExtraFields if ($result > 0 || $err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' || $type == 'separate') { // Add declaration of field into table - $result2=$this->create_label($attrname, $label, $type, $pos, $size, $elementtype, $unique, $required, $param, $alwayseditable, $perms, $list, $ishidden, $default, $computed, $entity, $langfile); + $result2=$this->create_label($attrname, $label, $type, $pos, $size, $elementtype, $unique, $required, $param, $alwayseditable, $perms, $list, $ishidden, $default, $computed, $entity, $langfile, $enabled); $err2=$this->errno; if ($result2 > 0 || ($err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' && $err2 == 'DB_ERROR_RECORD_ALREADY_EXISTS')) { diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 65b68f613f5..a3e1f73d74f 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -135,7 +135,7 @@ class Form * @param string $value Value to show/edit * @param object $object Object * @param boolean $perm Permission to allow button to edit parameter - * @param string $typeofdata Type of data ('string' by default, 'email', 'amount:99', 'numeric:99', 'text' or 'textarea:rows:cols', 'datepicker' ('day' do not work, don't know why), 'dayhour' or 'datepickerhour', 'ckeditor:dolibarr_zzz:width:height:savemethod:toolbarstartexpanded:rows:cols', 'select:xxx'...) + * @param string $typeofdata Type of data ('string' by default, 'email', 'amount:99', 'numeric:99', 'text' or 'textarea:rows:cols%', 'datepicker' ('day' do not work, don't know why), 'dayhour' or 'datepickerhour', 'ckeditor:dolibarr_zzz:width:height:savemethod:toolbarstartexpanded:rows:cols', 'select:xxx'...) * @param string $editvalue When in edit mode, use this value as $value instead of value (for example, you can provide here a formated price instead of value). Use '' to use same than $value * @param object $extObject External object * @param mixed $custommsg String or Array of custom messages : eg array('success' => 'MyMessage', 'error' => 'MyMessage') diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index df323c91f6e..042d1318f77 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -1278,6 +1278,7 @@ function dol_delete_dir_recursive($dir, $count=0, $nophperrors=0, $onlysub=0, &$ * * @param object $object Object to clean * @return int 0 if error, 1 if OK + * @see dol_convert_file */ function dol_delete_preview($object) { diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 2b6820c353b..a9693c118da 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -1357,12 +1357,13 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r $dir_output = $conf->$modulepart->dir_output . "/"; if (in_array($modulepart, array('invoice_supplier', 'supplier_invoice'))) { - $subdir = get_exdir($object->id, 2, 0, 0, $object, $modulepart).$objectref; + $subdir = get_exdir($object->id, 2, 0, 0, $object, $modulepart).$objectref; // the objectref dir is not include into get_exdir when used with level=2, so we add it here } else { - $subdir = get_exdir($object->id, 0, 0, 0, $object, $modulepart).$objectref; + $subdir = get_exdir($object->id, 0, 0, 0, $object, $modulepart); } + $filepath = $dir_output . $subdir . "/"; $file = $filepath . $objectref . ".pdf"; $relativepath = $subdir.'/'.$objectref.'.pdf'; @@ -4869,10 +4870,11 @@ function yn($yesno, $case=1, $color=0) /** - * Return a path to have a directory according to object. + * Return a path to have a the directory according to object where files are stored. * New usage: $conf->module->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, $modulepart) * or: $conf->module->dir_output.'/'.get_exdir(0, 0, 0, 1, $object, $modulepart) if multidir_output not defined. - * Old usage: '015' with level 3->"0/1/5/", '015' with level 1->"5/", 'ABC-1' with level 3 ->"0/0/1/" + * Example our with new usage: $object is invoice -> 'INYYMM-ABCD' + * Example our with old usage: '015' with level 3->"0/1/5/", '015' with level 1->"5/", 'ABC-1' with level 3 ->"0/0/1/" * * @param string $num Id of object (deprecated, $object will be used in future) * @param int $level Level of subdirs to return (1, 2 or 3 levels). (deprecated, global option will be used in future) @@ -4904,14 +4906,15 @@ function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart) { // TODO // We will enhance here a common way of forging path for document storage - // Here, object->id, object->ref and object->modulepart are required. + // Here, object->id, object->ref and modulepart are required. if (in_array($modulepart, array('thirdparty','contact','member','propal','proposal','commande','order','facture','invoice','shipment'))) { - $path=$object->ref?$object->ref:$object->id; + $path=($object->ref?$object->ref:$object->id); } } if (empty($withoutslash) && ! empty($path)) $path.='/'; + return $path; } diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php index 0b59204f488..2d6178ed79b 100644 --- a/htdocs/core/tpl/objectline_create.tpl.php +++ b/htdocs/core/tpl/objectline_create.tpl.php @@ -211,11 +211,11 @@ else { if (! empty($conf->global->ENTREPOT_EXTRA_STATUS)) { // hide products in closed warehouse, but show products for internal transfer - $form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(),$buyer->id, '1', 0, '', 0, 'warehouseopen,warehouseinternal', GETPOST('combinations', 'array')); + $form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth300', 0, 'warehouseopen,warehouseinternal', GETPOST('combinations', 'array')); } else { - $form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(),$buyer->id, '1', 0, '', 0, '', GETPOST('combinations', 'array')); + $form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth300', 0, '', GETPOST('combinations', 'array')); } } else From 1f2d275ef2f8cc72dbca5d4aa0687ee1c22b15e1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 13 Jan 2018 17:21:56 +0100 Subject: [PATCH 0208/1074] Fix conditions of some fields --- htdocs/comm/propal/list.php | 4 +- htdocs/expedition/list.php | 4 +- htdocs/projet/list.php | 2 +- htdocs/projet/tasks/time.php | 2 +- htdocs/public/payment/newpayment.php | 72 +++++++++++++++++----------- 5 files changed, 49 insertions(+), 35 deletions(-) diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 8796da505cd..f12577fbc5f 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -141,7 +141,7 @@ $checkedtypetiers=0; $arrayfields=array( 'p.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1), 'p.ref_client'=>array('label'=>$langs->trans("RefCustomer"), 'checked'=>1), - 'pr.ref'=>array('label'=>$langs->trans("Project"), 'checked'=>1, 'enabled'=>$conf->projet->enabled), + 'pr.ref'=>array('label'=>$langs->trans("Project"), 'checked'=>1, 'enabled'=>(empty($conf->projet->enabled)?0:1)), 's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1), 's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>1), 's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>1), @@ -191,7 +191,7 @@ if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x', $search_sale=''; $search_ref=''; $search_refcustomer=''; - $search_refproject=''; + $search_refproject=''; $search_societe=''; $search_montant_ht=''; $search_montant_vat=''; diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php index ff4e056e928..d8e9925c08f 100644 --- a/htdocs/expedition/list.php +++ b/htdocs/expedition/list.php @@ -99,8 +99,8 @@ $arrayfields=array( 'e.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500), 'e.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500), 'e.fk_statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000), - 'l.ref'=>array('label'=>$langs->trans("DeliveryRef"), 'checked'=>1, 'enabled'=>$conf->livraison_bon->enabled), - 'l.date_delivery'=>array('label'=>$langs->trans("DateReceived"), 'checked'=>1, 'enabled'=>$conf->livraison_bon->enabled), + 'l.ref'=>array('label'=>$langs->trans("DeliveryRef"), 'checked'=>1, 'enabled'=>(empty($conf->livraison_bon->enabled)?0:1)), + 'l.date_delivery'=>array('label'=>$langs->trans("DateReceived"), 'checked'=>1, 'enabled'=>(empty($conf->livraison_bon->enabled)?0:1)), 'e.billed'=>array('label'=>$langs->trans("Billed"), 'checked'=>1, 'position'=>1000, 'enabled'=>(!empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) ); diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php index 254955a4b27..6b3613a7b0a 100644 --- a/htdocs/projet/list.php +++ b/htdocs/projet/list.php @@ -119,7 +119,7 @@ if (empty($user->socid)) $fieldstosearchall["p.note_private"]="NotePrivate"; $arrayfields=array( 'p.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1), 'p.title'=>array('label'=>$langs->trans("Label"), 'checked'=>1), - 's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1, 'enabled'=>$conf->societe->enabled), + 's.nom'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1, 'enabled'=>(empty($conf->societe->enabled)?0:1)), 'commercial'=>array('label'=>$langs->trans("SaleRepresentativesOfThirdParty"), 'checked'=>0), 'p.dateo'=>array('label'=>$langs->trans("DateStart"), 'checked'=>1, 'position'=>100), 'p.datee'=>array('label'=>$langs->trans("DateEnd"), 'checked'=>1, 'position'=>101), diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index 278f09a1b9e..45018d79742 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -619,7 +619,7 @@ if (($id > 0 || ! empty($ref)) || $projectidforalltimes > 0) $arrayfields['author']=array('label'=>$langs->trans("By"), 'checked'=>1); $arrayfields['t.note']=array('label'=>$langs->trans("Note"), 'checked'=>1); $arrayfields['t.task_duration']=array('label'=>$langs->trans("Duration"), 'checked'=>1); - $arrayfields['value']=array('label'=>$langs->trans("Value"), 'checked'=>1, 'enabled'=>$conf->salaries->enabled); + $arrayfields['value'] =array('label'=>$langs->trans("Value"), 'checked'=>1, 'enabled'=>(empty($conf->salaries->enabled)?0:1)); // Extra fields if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) { diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php index 473461bd62c..be303f987ed 100644 --- a/htdocs/public/payment/newpayment.php +++ b/htdocs/public/payment/newpayment.php @@ -847,21 +847,28 @@ if ($source == 'invoice') // Amount print ''.$langs->trans("Amount"); - if (empty($amount)) print ' ('.$langs->trans("ToComplete").')'; + if (empty($amount) && empty($object->paye)) print ' ('.$langs->trans("ToComplete").')'; print ''; - if (empty($amount) || ! is_numeric($amount)) + if (empty($object->paye)) { - print ''; - print ''; + if (empty($amount) || ! is_numeric($amount)) + { + print ''; + print ''; + } + else { + print ''.price($amount).''; + print ''; + print ''; + } + // Currency + print ' '.$langs->trans("Currency".$currency).''; + print ''; } - else { - print ''.price($amount).''; - print ''; - print ''; + else + { + print price($object->total_ttc, 1, $langs); } - // Currency - print ' '.$langs->trans("Currency".$currency).''; - print ''; print ''."\n"; // Tag @@ -1290,31 +1297,38 @@ if ($action != 'dopayment') { if ($found && ! $error) // We are in a management option and no error { - // Buttons for all payments registration methods - - if (! empty($conf->paybox->enabled)) + if ($source == 'invoice' && $object->paye) { - // If STRIPE_PICTO_FOR_PAYMENT is 'cb' we show a picto of a crdit card instead of paybox - print '
    '; + print '

    '.$langs->trans("InvoicePaid"); } - - if (! empty($conf->stripe->enabled)) + else { - // If STRIPE_PICTO_FOR_PAYMENT is 'cb' we show a picto of a crdit card instead of stripe - print '
    '; - } + // Buttons for all payments registration methods - if (! empty($conf->paypal->enabled)) - { - if (empty($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY)) $conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY='integral'; - - if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'integral') + if (! empty($conf->paybox->enabled)) { - print '
    '; + // If STRIPE_PICTO_FOR_PAYMENT is 'cb' we show a picto of a crdit card instead of paybox + print '
    '; } - if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'paypalonly') + + if (! empty($conf->stripe->enabled)) { - print '
    '; + // If STRIPE_PICTO_FOR_PAYMENT is 'cb' we show a picto of a crdit card instead of stripe + print '
    '; + } + + if (! empty($conf->paypal->enabled)) + { + if (empty($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY)) $conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY='integral'; + + if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'integral') + { + print '
    '; + } + if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'paypalonly') + { + print '
    '; + } } } } From c947502efa8d8fbbe1a9800c3bcf2956578c504a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 13 Jan 2018 17:22:59 +0100 Subject: [PATCH 0209/1074] Fix typo --- htdocs/core/lib/functions.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 4c6730500af..f87e53d2d9b 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -1248,7 +1248,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r && (! file_exists($fileimagebis) || (filemtime($fileimagebis) < filemtime($file))) ) { - if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS)) // If you experienc trouble with pdf thumb generation and imagick, you can disable here. + if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS)) // If you experience trouble with pdf thumb generation and imagick, you can disable here. { $ret = dol_convert_file($file, 'png', $fileimage); if ($ret < 0) $error++; From 7a087327e123bd0418a006e0d97d56bd51787961 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 13 Jan 2018 19:33:40 +0100 Subject: [PATCH 0210/1074] Fix deprecated code --- htdocs/core/class/extrafields.class.php | 6 +++--- htdocs/core/lib/functions.lib.php | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 139fcb65162..1cd545c409c 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -624,9 +624,10 @@ class ExtraFields { $this->db->begin(); - if(is_array($param) && count($param) > 0) + if (is_array($param)) { - $param = $this->db->escape(serialize($param)); + if (count($param) > 0) $param = $this->db->escape(serialize($param)); + else $param=''; } $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields"; @@ -698,7 +699,6 @@ class ExtraFields { return 0; } - } diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index a9693c118da..713086013e4 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -4685,14 +4685,16 @@ function get_default_tva(Societe $thirdparty_seller, Societe $thirdparty_buyer, { global $conf; + require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; + // Note: possible values for tva_assuj are 0/1 or franchise/reel $seller_use_vat=((is_numeric($thirdparty_seller->tva_assuj) && ! $thirdparty_seller->tva_assuj) || (! is_numeric($thirdparty_seller->tva_assuj) && $thirdparty_seller->tva_assuj=='franchise'))?0:1; - $seller_country_code=$thirdparty_seller->country_code; - $seller_in_cee=$thirdparty_seller->isInEEC(); + $seller_country_code = $thirdparty_seller->country_code; + $seller_in_cee = isInEEC($thirdparty_seller); - $buyer_country_code=$thirdparty_buyer->country_code; - $buyer_in_cee=$thirdparty_buyer->isInEEC(); + $buyer_country_code = $thirdparty_buyer->country_code; + $buyer_in_cee = isInEEC($thirdparty_buyer); dol_syslog("get_default_tva: seller use vat=".$seller_use_vat.", seller country=".$seller_country_code.", seller in cee=".$seller_in_cee.", buyer country=".$buyer_country_code.", buyer in cee=".$buyer_in_cee.", idprod=".$idprod.", idprodfournprice=".$idprodfournprice.", SERVICE_ARE_ECOMMERCE_200238EC=".(! empty($conf->global->SERVICES_ARE_ECOMMERCE_200238EC)?$conf->global->SERVICES_ARE_ECOMMERCE_200238EC:'')); From debc75813491442c46f30ac9f258d14152247d3e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 14 Jan 2018 01:40:12 +0100 Subject: [PATCH 0211/1074] Fix code comment --- htdocs/core/db/DoliDB.class.php | 2 +- htdocs/core/db/mssql.class.php | 2 +- htdocs/core/db/pgsql.class.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php index 64f84471e40..cf6b9001422 100644 --- a/htdocs/core/db/DoliDB.class.php +++ b/htdocs/core/db/DoliDB.class.php @@ -85,7 +85,7 @@ abstract class DoliDB implements Database * Function to use to build INSERT, UPDATE or WHERE predica * * @param int $param Date TMS to convert - * @return string Date in a string YYYYMMDDHHMMSS + * @return string Date in a string YYYY-MM-DD HH:MM:SS */ function idate($param) { diff --git a/htdocs/core/db/mssql.class.php b/htdocs/core/db/mssql.class.php index 79a0e212dfc..4734c3364b5 100644 --- a/htdocs/core/db/mssql.class.php +++ b/htdocs/core/db/mssql.class.php @@ -563,7 +563,7 @@ class DoliDBMssql extends DoliDB * Function to use to build INSERT, UPDATE or WHERE predica * * @param string $param Date TMS to convert - * @return string Date in a string YYYYMMDDHHMMSS + * @return string Date in a string YYYY-MM-DD HH:MM:SS */ function idate($param) { diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php index 1ba8f183cbb..8e57b29109e 100644 --- a/htdocs/core/db/pgsql.class.php +++ b/htdocs/core/db/pgsql.class.php @@ -658,7 +658,7 @@ class DoliDBPgsql extends DoliDB * Function to use to build INSERT, UPDATE or WHERE predica * * @param string $param Date TMS to convert - * @return string Date in a string YYYYMMDDHHMMSS + * @return string Date in a string YYYY-MM-DD HH:MM:SS */ function idate($param) { From 9f6118ed5271f3763efc3a6fff77c48f3e11a0a5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 14 Jan 2018 03:12:22 +0100 Subject: [PATCH 0212/1074] Code comments --- htdocs/core/class/extrafields.class.php | 13 ++++++++++--- htdocs/core/db/DoliDB.class.php | 8 +++++--- htdocs/core/lib/functions.lib.php | 4 +++- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index f6f0006a6d6..9758bb4466b 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -1651,9 +1651,16 @@ class ExtraFields $error_field_required[] = $value; } - if (in_array($key_type,array('date','datetime'))) + if (in_array($key_type,array('date'))) { // Clean parameters + // TODO GMT date in memory must be GMT so we should add gm=true in parameters + $value_key=dol_mktime(0, 0, 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]); + } + elseif (in_array($key_type,array('datetime'))) + { + // Clean parameters + // TODO GMT date in memory must be GMT so we should add gm=true in parameters $value_key=dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]); } else if (in_array($key_type,array('checkbox','chkbxlst'))) @@ -1692,12 +1699,12 @@ class ExtraFields } /** - * return array_options array for object by extrafields value (using for data send by forms) + * return array_options array of data of extrafields value of object sent by a search form * * @param array $extralabels $array of extrafields * @param string $keyprefix Prefix string to add into name and id of field (can be used to avoid duplicate names) * @param string $keysuffix Suffix string to add into name and id of field (can be used to avoid duplicate names) - * @return int 1 if array_options set / 0 if no value + * @return array|int array_options set or 0 if no value */ function getOptionalsFromPost($extralabels,$keyprefix='',$keysuffix='') { diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php index 9fc1739334c..657010af49c 100644 --- a/htdocs/core/db/DoliDB.class.php +++ b/htdocs/core/db/DoliDB.class.php @@ -89,6 +89,7 @@ abstract class DoliDB implements Database */ function idate($param) { + // TODO GMT $param should be gmt, so we should add tzouptut to 'gmt' return dol_print_date($param,"%Y%m%d%H%M%S"); } @@ -238,16 +239,16 @@ abstract class DoliDB implements Database else $return.=', '; $return.=preg_replace('/[^0-9a-z_\.]/i','',$val); - + $tmpsortorder = trim($orders[$i]); - + // Only ASC and DESC values are valid SQL if (strtoupper($tmpsortorder) === 'ASC') { $return .= ' ASC'; } elseif (strtoupper($tmpsortorder) === 'DESC') { $return .= ' DESC'; } - + $i++; } return $return; @@ -279,6 +280,7 @@ abstract class DoliDB implements Database */ function jdate($string, $gm=false) { + // TODO GMT must set param gm to true by default if ($string==0 || $string=="0000-00-00 00:00:00") return ''; $string=preg_replace('/([^0-9])/i','',$string); $tmp=$string.'000000'; diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index f87e53d2d9b..9e7f554055b 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -1781,11 +1781,13 @@ function dol_mktime($hour,$minute,$second,$month,$day,$year,$gm=false,$check=1) if (empty($localtz)) { $localtz = new DateTimeZone('UTC'); } - + //var_dump($localtz); + //var_dump($year.'-'.$month.'-'.$day.'-'.$hour.'-'.$minute); $dt = new DateTime(null,$localtz); $dt->setDate($year,$month,$day); $dt->setTime((int) $hour, (int) $minute, (int) $second); $date=$dt->getTimestamp(); // should include daylight saving time + //var_dump($date); return $date; } else From 36afa87fb50476a05c142fda9031dd6d0b6b4788 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Sun, 14 Jan 2018 11:56:45 +0100 Subject: [PATCH 0213/1074] Fix blockedlog triggers fatal error in migration script --- htdocs/blockedlog/class/blockedlog.class.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php index a4dab57305c..639d9df909d 100644 --- a/htdocs/blockedlog/class/blockedlog.class.php +++ b/htdocs/blockedlog/class/blockedlog.class.php @@ -349,8 +349,11 @@ class BlockedLog } // Add user info - $this->fk_user = $user->id; - $this->user_fullname = $user->getFullName($langs); + if (! empty($user)) + { + $this->fk_user = $user->id; + $this->user_fullname = $user->getFullName($langs); + } // Field specific to object From 133e87fcc3549bfdb84fed1b5d7e76fe751b859e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 14 Jan 2018 12:45:26 +0100 Subject: [PATCH 0214/1074] Sync transifex --- htdocs/langs/ar_EG/admin.lang | 2 + htdocs/langs/ar_SA/accountancy.lang | 14 +- htdocs/langs/ar_SA/admin.lang | 6 +- htdocs/langs/ar_SA/banks.lang | 1 + htdocs/langs/ar_SA/bills.lang | 3 + htdocs/langs/ar_SA/compta.lang | 1 + htdocs/langs/ar_SA/donations.lang | 1 + htdocs/langs/ar_SA/errors.lang | 1 + htdocs/langs/ar_SA/help.lang | 4 +- htdocs/langs/ar_SA/install.lang | 2 + htdocs/langs/ar_SA/languages.lang | 1 + htdocs/langs/ar_SA/main.lang | 16 +- htdocs/langs/ar_SA/other.lang | 2 + htdocs/langs/ar_SA/products.lang | 1 + htdocs/langs/ar_SA/projects.lang | 3 + htdocs/langs/ar_SA/website.lang | 13 +- htdocs/langs/bg_BG/accountancy.lang | 6 +- htdocs/langs/bg_BG/admin.lang | 6 +- htdocs/langs/bg_BG/banks.lang | 1 + htdocs/langs/bg_BG/bills.lang | 3 + htdocs/langs/bg_BG/compta.lang | 1 + htdocs/langs/bg_BG/donations.lang | 1 + htdocs/langs/bg_BG/errors.lang | 1 + htdocs/langs/bg_BG/install.lang | 2 + htdocs/langs/bg_BG/languages.lang | 1 + htdocs/langs/bg_BG/main.lang | 16 +- htdocs/langs/bg_BG/other.lang | 2 + htdocs/langs/bg_BG/products.lang | 1 + htdocs/langs/bg_BG/projects.lang | 3 + htdocs/langs/bg_BG/website.lang | 13 +- htdocs/langs/bn_BD/accountancy.lang | 6 +- htdocs/langs/bn_BD/admin.lang | 6 +- htdocs/langs/bn_BD/banks.lang | 1 + htdocs/langs/bn_BD/bills.lang | 3 + htdocs/langs/bn_BD/compta.lang | 1 + htdocs/langs/bn_BD/donations.lang | 1 + htdocs/langs/bn_BD/errors.lang | 1 + htdocs/langs/bn_BD/install.lang | 2 + htdocs/langs/bn_BD/languages.lang | 1 + htdocs/langs/bn_BD/main.lang | 16 +- htdocs/langs/bn_BD/other.lang | 2 + htdocs/langs/bn_BD/products.lang | 1 + htdocs/langs/bn_BD/projects.lang | 3 + htdocs/langs/bn_BD/website.lang | 13 +- htdocs/langs/bs_BA/accountancy.lang | 6 +- htdocs/langs/bs_BA/admin.lang | 6 +- htdocs/langs/bs_BA/banks.lang | 1 + htdocs/langs/bs_BA/bills.lang | 3 + htdocs/langs/bs_BA/compta.lang | 1 + htdocs/langs/bs_BA/donations.lang | 1 + htdocs/langs/bs_BA/errors.lang | 1 + htdocs/langs/bs_BA/install.lang | 2 + htdocs/langs/bs_BA/languages.lang | 1 + htdocs/langs/bs_BA/main.lang | 16 +- htdocs/langs/bs_BA/other.lang | 2 + htdocs/langs/bs_BA/products.lang | 1 + htdocs/langs/bs_BA/projects.lang | 3 + htdocs/langs/bs_BA/website.lang | 13 +- htdocs/langs/ca_ES/accountancy.lang | 56 +- htdocs/langs/ca_ES/admin.lang | 196 ++--- htdocs/langs/ca_ES/agenda.lang | 18 +- htdocs/langs/ca_ES/banks.lang | 9 +- htdocs/langs/ca_ES/bills.lang | 33 +- htdocs/langs/ca_ES/commercial.lang | 12 +- htdocs/langs/ca_ES/companies.lang | 6 +- htdocs/langs/ca_ES/compta.lang | 71 +- htdocs/langs/ca_ES/contracts.lang | 10 +- htdocs/langs/ca_ES/cron.lang | 22 +- htdocs/langs/ca_ES/dict.lang | 34 +- htdocs/langs/ca_ES/donations.lang | 1 + htdocs/langs/ca_ES/ecm.lang | 16 +- htdocs/langs/ca_ES/errors.lang | 23 +- htdocs/langs/ca_ES/holiday.lang | 4 +- htdocs/langs/ca_ES/install.lang | 8 +- htdocs/langs/ca_ES/interventions.lang | 6 +- htdocs/langs/ca_ES/languages.lang | 3 +- htdocs/langs/ca_ES/ldap.lang | 4 +- htdocs/langs/ca_ES/mails.lang | 18 +- htdocs/langs/ca_ES/main.lang | 110 +-- htdocs/langs/ca_ES/members.lang | 22 +- htdocs/langs/ca_ES/modulebuilder.lang | 84 +- htdocs/langs/ca_ES/multicurrency.lang | 6 +- htdocs/langs/ca_ES/opensurvey.lang | 2 +- htdocs/langs/ca_ES/orders.lang | 4 +- htdocs/langs/ca_ES/other.lang | 50 +- htdocs/langs/ca_ES/paybox.lang | 2 +- htdocs/langs/ca_ES/paypal.lang | 6 +- htdocs/langs/ca_ES/printing.lang | 4 +- htdocs/langs/ca_ES/productbatch.lang | 2 +- htdocs/langs/ca_ES/products.lang | 23 +- htdocs/langs/ca_ES/projects.lang | 33 +- htdocs/langs/ca_ES/salaries.lang | 4 +- htdocs/langs/ca_ES/sendings.lang | 4 +- htdocs/langs/ca_ES/sms.lang | 2 +- htdocs/langs/ca_ES/stocks.lang | 20 +- htdocs/langs/ca_ES/stripe.lang | 4 +- htdocs/langs/ca_ES/suppliers.lang | 2 +- htdocs/langs/ca_ES/trips.lang | 116 +-- htdocs/langs/ca_ES/users.lang | 6 +- htdocs/langs/ca_ES/website.lang | 61 +- htdocs/langs/ca_ES/withdrawals.lang | 14 +- htdocs/langs/ca_ES/workflow.lang | 6 +- htdocs/langs/cs_CZ/accountancy.lang | 6 +- htdocs/langs/cs_CZ/admin.lang | 12 +- htdocs/langs/cs_CZ/banks.lang | 1 + htdocs/langs/cs_CZ/bills.lang | 3 + htdocs/langs/cs_CZ/compta.lang | 1 + htdocs/langs/cs_CZ/donations.lang | 1 + htdocs/langs/cs_CZ/errors.lang | 1 + htdocs/langs/cs_CZ/help.lang | 2 +- htdocs/langs/cs_CZ/install.lang | 2 + htdocs/langs/cs_CZ/languages.lang | 1 + htdocs/langs/cs_CZ/main.lang | 16 +- htdocs/langs/cs_CZ/other.lang | 2 + htdocs/langs/cs_CZ/products.lang | 1 + htdocs/langs/cs_CZ/projects.lang | 3 + htdocs/langs/cs_CZ/users.lang | 6 +- htdocs/langs/cs_CZ/website.lang | 13 +- htdocs/langs/da_DK/accountancy.lang | 6 +- htdocs/langs/da_DK/admin.lang | 6 +- htdocs/langs/da_DK/banks.lang | 1 + htdocs/langs/da_DK/bills.lang | 3 + htdocs/langs/da_DK/compta.lang | 1 + htdocs/langs/da_DK/donations.lang | 1 + htdocs/langs/da_DK/errors.lang | 1 + htdocs/langs/da_DK/install.lang | 2 + htdocs/langs/da_DK/languages.lang | 1 + htdocs/langs/da_DK/main.lang | 16 +- htdocs/langs/da_DK/other.lang | 2 + htdocs/langs/da_DK/products.lang | 1 + htdocs/langs/da_DK/projects.lang | 3 + htdocs/langs/da_DK/website.lang | 13 +- htdocs/langs/de_CH/admin.lang | 44 +- htdocs/langs/de_CH/main.lang | 1 + htdocs/langs/de_DE/accountancy.lang | 90 +-- htdocs/langs/de_DE/admin.lang | 84 +- htdocs/langs/de_DE/agenda.lang | 18 +- htdocs/langs/de_DE/banks.lang | 3 +- htdocs/langs/de_DE/bills.lang | 19 +- htdocs/langs/de_DE/commercial.lang | 14 +- htdocs/langs/de_DE/compta.lang | 69 +- htdocs/langs/de_DE/contracts.lang | 10 +- htdocs/langs/de_DE/cron.lang | 22 +- htdocs/langs/de_DE/dict.lang | 30 +- htdocs/langs/de_DE/donations.lang | 1 + htdocs/langs/de_DE/ecm.lang | 16 +- htdocs/langs/de_DE/errors.lang | 29 +- htdocs/langs/de_DE/holiday.lang | 4 +- htdocs/langs/de_DE/install.lang | 8 +- htdocs/langs/de_DE/interventions.lang | 6 +- htdocs/langs/de_DE/languages.lang | 1 + htdocs/langs/de_DE/ldap.lang | 4 +- htdocs/langs/de_DE/mails.lang | 12 +- htdocs/langs/de_DE/main.lang | 72 +- htdocs/langs/de_DE/members.lang | 20 +- htdocs/langs/de_DE/multicurrency.lang | 10 +- htdocs/langs/de_DE/opensurvey.lang | 2 +- htdocs/langs/de_DE/orders.lang | 4 +- htdocs/langs/de_DE/other.lang | 48 +- htdocs/langs/de_DE/productbatch.lang | 2 +- htdocs/langs/de_DE/products.lang | 9 +- htdocs/langs/de_DE/projects.lang | 13 +- htdocs/langs/de_DE/salaries.lang | 8 +- htdocs/langs/de_DE/sendings.lang | 4 +- htdocs/langs/de_DE/sms.lang | 2 +- htdocs/langs/de_DE/stocks.lang | 6 +- htdocs/langs/de_DE/stripe.lang | 4 +- htdocs/langs/de_DE/suppliers.lang | 2 +- htdocs/langs/de_DE/trips.lang | 18 +- htdocs/langs/de_DE/website.lang | 91 ++- htdocs/langs/de_DE/withdrawals.lang | 2 +- htdocs/langs/el_GR/accountancy.lang | 6 +- htdocs/langs/el_GR/admin.lang | 6 +- htdocs/langs/el_GR/banks.lang | 1 + htdocs/langs/el_GR/bills.lang | 3 + htdocs/langs/el_GR/compta.lang | 1 + htdocs/langs/el_GR/donations.lang | 1 + htdocs/langs/el_GR/errors.lang | 1 + htdocs/langs/el_GR/install.lang | 2 + htdocs/langs/el_GR/languages.lang | 1 + htdocs/langs/el_GR/main.lang | 16 +- htdocs/langs/el_GR/other.lang | 2 + htdocs/langs/el_GR/products.lang | 1 + htdocs/langs/el_GR/projects.lang | 3 + htdocs/langs/el_GR/website.lang | 13 +- htdocs/langs/en_GB/accountancy.lang | 1 - htdocs/langs/en_GB/admin.lang | 2 + htdocs/langs/en_GB/main.lang | 1 - htdocs/langs/es_CL/accountancy.lang | 26 +- htdocs/langs/es_CL/admin.lang | 229 +++--- htdocs/langs/es_CL/agenda.lang | 2 +- htdocs/langs/es_CL/banks.lang | 12 +- htdocs/langs/es_CL/bills.lang | 55 +- htdocs/langs/es_CL/boxes.lang | 27 +- htdocs/langs/es_CL/commercial.lang | 9 +- htdocs/langs/es_CL/companies.lang | 26 +- htdocs/langs/es_CL/compta.lang | 26 +- htdocs/langs/es_CL/ecm.lang | 3 +- htdocs/langs/es_CL/install.lang | 3 +- htdocs/langs/es_CL/interventions.lang | 2 +- htdocs/langs/es_CL/main.lang | 81 +- htdocs/langs/es_CL/members.lang | 2 +- htdocs/langs/es_CL/orders.lang | 41 +- htdocs/langs/es_CL/other.lang | 9 +- htdocs/langs/es_CL/products.lang | 12 +- htdocs/langs/es_CL/projects.lang | 44 +- htdocs/langs/es_CL/workflow.lang | 2 +- htdocs/langs/es_CO/admin.lang | 71 +- htdocs/langs/es_EC/admin.lang | 8 +- htdocs/langs/es_EC/main.lang | 1 - htdocs/langs/es_ES/accountancy.lang | 16 +- htdocs/langs/es_ES/admin.lang | 30 +- htdocs/langs/es_ES/banks.lang | 1 + htdocs/langs/es_ES/bills.lang | 13 +- htdocs/langs/es_ES/compta.lang | 1 + htdocs/langs/es_ES/donations.lang | 1 + htdocs/langs/es_ES/ecm.lang | 6 +- htdocs/langs/es_ES/errors.lang | 9 +- htdocs/langs/es_ES/install.lang | 8 +- htdocs/langs/es_ES/languages.lang | 3 +- htdocs/langs/es_ES/main.lang | 18 +- htdocs/langs/es_ES/modulebuilder.lang | 18 +- htdocs/langs/es_ES/opensurvey.lang | 2 +- htdocs/langs/es_ES/orders.lang | 4 +- htdocs/langs/es_ES/other.lang | 2 + htdocs/langs/es_ES/printing.lang | 4 +- htdocs/langs/es_ES/productbatch.lang | 2 +- htdocs/langs/es_ES/products.lang | 9 +- htdocs/langs/es_ES/projects.lang | 15 +- htdocs/langs/es_ES/stripe.lang | 2 +- htdocs/langs/es_ES/website.lang | 17 +- htdocs/langs/es_ES/workflow.lang | 6 +- htdocs/langs/es_MX/accountancy.lang | 1 - htdocs/langs/es_PE/accountancy.lang | 1 - htdocs/langs/et_EE/accountancy.lang | 6 +- htdocs/langs/et_EE/admin.lang | 6 +- htdocs/langs/et_EE/banks.lang | 1 + htdocs/langs/et_EE/bills.lang | 3 + htdocs/langs/et_EE/compta.lang | 1 + htdocs/langs/et_EE/donations.lang | 1 + htdocs/langs/et_EE/errors.lang | 1 + htdocs/langs/et_EE/install.lang | 2 + htdocs/langs/et_EE/languages.lang | 1 + htdocs/langs/et_EE/main.lang | 16 +- htdocs/langs/et_EE/other.lang | 2 + htdocs/langs/et_EE/products.lang | 1 + htdocs/langs/et_EE/projects.lang | 3 + htdocs/langs/et_EE/website.lang | 13 +- htdocs/langs/eu_ES/accountancy.lang | 6 +- htdocs/langs/eu_ES/admin.lang | 6 +- htdocs/langs/eu_ES/banks.lang | 1 + htdocs/langs/eu_ES/bills.lang | 3 + htdocs/langs/eu_ES/compta.lang | 1 + htdocs/langs/eu_ES/donations.lang | 1 + htdocs/langs/eu_ES/errors.lang | 1 + htdocs/langs/eu_ES/install.lang | 2 + htdocs/langs/eu_ES/languages.lang | 1 + htdocs/langs/eu_ES/main.lang | 16 +- htdocs/langs/eu_ES/other.lang | 2 + htdocs/langs/eu_ES/products.lang | 1 + htdocs/langs/eu_ES/projects.lang | 3 + htdocs/langs/eu_ES/website.lang | 13 +- htdocs/langs/fa_IR/accountancy.lang | 6 +- htdocs/langs/fa_IR/admin.lang | 6 +- htdocs/langs/fa_IR/banks.lang | 1 + htdocs/langs/fa_IR/bills.lang | 3 + htdocs/langs/fa_IR/compta.lang | 1 + htdocs/langs/fa_IR/donations.lang | 1 + htdocs/langs/fa_IR/errors.lang | 1 + htdocs/langs/fa_IR/install.lang | 2 + htdocs/langs/fa_IR/languages.lang | 1 + htdocs/langs/fa_IR/main.lang | 16 +- htdocs/langs/fa_IR/other.lang | 2 + htdocs/langs/fa_IR/products.lang | 1 + htdocs/langs/fa_IR/projects.lang | 3 + htdocs/langs/fa_IR/website.lang | 13 +- htdocs/langs/fi_FI/accountancy.lang | 6 +- htdocs/langs/fi_FI/admin.lang | 6 +- htdocs/langs/fi_FI/banks.lang | 1 + htdocs/langs/fi_FI/bills.lang | 3 + htdocs/langs/fi_FI/compta.lang | 1 + htdocs/langs/fi_FI/donations.lang | 1 + htdocs/langs/fi_FI/errors.lang | 1 + htdocs/langs/fi_FI/install.lang | 2 + htdocs/langs/fi_FI/languages.lang | 1 + htdocs/langs/fi_FI/main.lang | 16 +- htdocs/langs/fi_FI/other.lang | 2 + htdocs/langs/fi_FI/products.lang | 1 + htdocs/langs/fi_FI/projects.lang | 3 + htdocs/langs/fi_FI/website.lang | 13 +- htdocs/langs/fr_CA/accountancy.lang | 1 - htdocs/langs/fr_CA/admin.lang | 1 + htdocs/langs/fr_CA/main.lang | 5 + htdocs/langs/fr_FR/accountancy.lang | 3 +- htdocs/langs/fr_FR/admin.lang | 20 +- htdocs/langs/fr_FR/banks.lang | 1 + htdocs/langs/fr_FR/bills.lang | 1 + htdocs/langs/fr_FR/compta.lang | 13 +- htdocs/langs/fr_FR/cron.lang | 2 +- htdocs/langs/fr_FR/donations.lang | 1 + htdocs/langs/fr_FR/install.lang | 6 +- htdocs/langs/fr_FR/languages.lang | 1 + htdocs/langs/fr_FR/ldap.lang | 2 +- htdocs/langs/fr_FR/main.lang | 10 +- htdocs/langs/fr_FR/modulebuilder.lang | 10 +- htdocs/langs/fr_FR/paypal.lang | 4 +- htdocs/langs/fr_FR/products.lang | 3 +- htdocs/langs/fr_FR/trips.lang | 4 +- htdocs/langs/fr_FR/website.lang | 18 +- htdocs/langs/he_IL/accountancy.lang | 6 +- htdocs/langs/he_IL/admin.lang | 6 +- htdocs/langs/he_IL/banks.lang | 1 + htdocs/langs/he_IL/bills.lang | 3 + htdocs/langs/he_IL/compta.lang | 1 + htdocs/langs/he_IL/donations.lang | 1 + htdocs/langs/he_IL/errors.lang | 1 + htdocs/langs/he_IL/install.lang | 2 + htdocs/langs/he_IL/languages.lang | 1 + htdocs/langs/he_IL/main.lang | 16 +- htdocs/langs/he_IL/other.lang | 2 + htdocs/langs/he_IL/products.lang | 1 + htdocs/langs/he_IL/projects.lang | 3 + htdocs/langs/he_IL/website.lang | 13 +- htdocs/langs/hr_HR/accountancy.lang | 6 +- htdocs/langs/hr_HR/admin.lang | 6 +- htdocs/langs/hr_HR/banks.lang | 1 + htdocs/langs/hr_HR/bills.lang | 3 + htdocs/langs/hr_HR/compta.lang | 1 + htdocs/langs/hr_HR/donations.lang | 1 + htdocs/langs/hr_HR/errors.lang | 1 + htdocs/langs/hr_HR/install.lang | 2 + htdocs/langs/hr_HR/languages.lang | 1 + htdocs/langs/hr_HR/main.lang | 16 +- htdocs/langs/hr_HR/other.lang | 2 + htdocs/langs/hr_HR/products.lang | 1 + htdocs/langs/hr_HR/projects.lang | 3 + htdocs/langs/hr_HR/website.lang | 13 +- htdocs/langs/hu_HU/accountancy.lang | 6 +- htdocs/langs/hu_HU/admin.lang | 6 +- htdocs/langs/hu_HU/banks.lang | 1 + htdocs/langs/hu_HU/bills.lang | 3 + htdocs/langs/hu_HU/compta.lang | 1 + htdocs/langs/hu_HU/donations.lang | 1 + htdocs/langs/hu_HU/errors.lang | 1 + htdocs/langs/hu_HU/install.lang | 2 + htdocs/langs/hu_HU/languages.lang | 1 + htdocs/langs/hu_HU/main.lang | 16 +- htdocs/langs/hu_HU/other.lang | 2 + htdocs/langs/hu_HU/products.lang | 1 + htdocs/langs/hu_HU/projects.lang | 3 + htdocs/langs/hu_HU/website.lang | 13 +- htdocs/langs/id_ID/accountancy.lang | 6 +- htdocs/langs/id_ID/admin.lang | 6 +- htdocs/langs/id_ID/banks.lang | 1 + htdocs/langs/id_ID/bills.lang | 3 + htdocs/langs/id_ID/compta.lang | 1 + htdocs/langs/id_ID/donations.lang | 1 + htdocs/langs/id_ID/errors.lang | 1 + htdocs/langs/id_ID/install.lang | 2 + htdocs/langs/id_ID/languages.lang | 1 + htdocs/langs/id_ID/main.lang | 16 +- htdocs/langs/id_ID/other.lang | 2 + htdocs/langs/id_ID/products.lang | 1 + htdocs/langs/id_ID/projects.lang | 3 + htdocs/langs/id_ID/website.lang | 13 +- htdocs/langs/is_IS/accountancy.lang | 6 +- htdocs/langs/is_IS/admin.lang | 6 +- htdocs/langs/is_IS/banks.lang | 1 + htdocs/langs/is_IS/bills.lang | 3 + htdocs/langs/is_IS/compta.lang | 1 + htdocs/langs/is_IS/donations.lang | 1 + htdocs/langs/is_IS/errors.lang | 1 + htdocs/langs/is_IS/install.lang | 2 + htdocs/langs/is_IS/languages.lang | 1 + htdocs/langs/is_IS/main.lang | 16 +- htdocs/langs/is_IS/other.lang | 2 + htdocs/langs/is_IS/products.lang | 1 + htdocs/langs/is_IS/projects.lang | 3 + htdocs/langs/is_IS/website.lang | 13 +- htdocs/langs/it_IT/accountancy.lang | 6 +- htdocs/langs/it_IT/admin.lang | 30 +- htdocs/langs/it_IT/banks.lang | 1 + htdocs/langs/it_IT/bills.lang | 3 + htdocs/langs/it_IT/cashdesk.lang | 4 +- htdocs/langs/it_IT/companies.lang | 4 +- htdocs/langs/it_IT/compta.lang | 1 + htdocs/langs/it_IT/donations.lang | 1 + htdocs/langs/it_IT/ecm.lang | 6 +- htdocs/langs/it_IT/errors.lang | 1 + htdocs/langs/it_IT/hrm.lang | 4 +- htdocs/langs/it_IT/install.lang | 2 + htdocs/langs/it_IT/languages.lang | 3 +- htdocs/langs/it_IT/main.lang | 114 +-- htdocs/langs/it_IT/opensurvey.lang | 2 +- htdocs/langs/it_IT/other.lang | 2 + htdocs/langs/it_IT/paybox.lang | 8 +- htdocs/langs/it_IT/paypal.lang | 12 +- htdocs/langs/it_IT/productbatch.lang | 2 +- htdocs/langs/it_IT/products.lang | 1 + htdocs/langs/it_IT/projects.lang | 3 + htdocs/langs/it_IT/resource.lang | 6 +- htdocs/langs/it_IT/users.lang | 4 +- htdocs/langs/it_IT/website.lang | 13 +- htdocs/langs/ja_JP/accountancy.lang | 6 +- htdocs/langs/ja_JP/admin.lang | 6 +- htdocs/langs/ja_JP/banks.lang | 1 + htdocs/langs/ja_JP/bills.lang | 3 + htdocs/langs/ja_JP/compta.lang | 1 + htdocs/langs/ja_JP/donations.lang | 1 + htdocs/langs/ja_JP/errors.lang | 1 + htdocs/langs/ja_JP/install.lang | 2 + htdocs/langs/ja_JP/languages.lang | 1 + htdocs/langs/ja_JP/main.lang | 16 +- htdocs/langs/ja_JP/other.lang | 2 + htdocs/langs/ja_JP/products.lang | 1 + htdocs/langs/ja_JP/projects.lang | 3 + htdocs/langs/ja_JP/website.lang | 13 +- htdocs/langs/ka_GE/accountancy.lang | 6 +- htdocs/langs/ka_GE/admin.lang | 6 +- htdocs/langs/ka_GE/banks.lang | 1 + htdocs/langs/ka_GE/bills.lang | 3 + htdocs/langs/ka_GE/compta.lang | 1 + htdocs/langs/ka_GE/donations.lang | 1 + htdocs/langs/ka_GE/errors.lang | 1 + htdocs/langs/ka_GE/install.lang | 2 + htdocs/langs/ka_GE/languages.lang | 1 + htdocs/langs/ka_GE/main.lang | 16 +- htdocs/langs/ka_GE/other.lang | 2 + htdocs/langs/ka_GE/products.lang | 1 + htdocs/langs/ka_GE/projects.lang | 3 + htdocs/langs/ka_GE/website.lang | 13 +- htdocs/langs/km_KH/main.lang | 891 ++++++++++++++++++++++ htdocs/langs/kn_IN/accountancy.lang | 6 +- htdocs/langs/kn_IN/admin.lang | 6 +- htdocs/langs/kn_IN/banks.lang | 1 + htdocs/langs/kn_IN/bills.lang | 3 + htdocs/langs/kn_IN/compta.lang | 1 + htdocs/langs/kn_IN/donations.lang | 1 + htdocs/langs/kn_IN/errors.lang | 1 + htdocs/langs/kn_IN/install.lang | 2 + htdocs/langs/kn_IN/languages.lang | 1 + htdocs/langs/kn_IN/main.lang | 16 +- htdocs/langs/kn_IN/other.lang | 2 + htdocs/langs/kn_IN/products.lang | 1 + htdocs/langs/kn_IN/projects.lang | 3 + htdocs/langs/kn_IN/website.lang | 13 +- htdocs/langs/ko_KR/accountancy.lang | 36 +- htdocs/langs/ko_KR/admin.lang | 124 +-- htdocs/langs/ko_KR/banks.lang | 3 +- htdocs/langs/ko_KR/bills.lang | 3 + htdocs/langs/ko_KR/categories.lang | 8 +- htdocs/langs/ko_KR/compta.lang | 1 + htdocs/langs/ko_KR/donations.lang | 1 + htdocs/langs/ko_KR/errors.lang | 1 + htdocs/langs/ko_KR/install.lang | 2 + htdocs/langs/ko_KR/languages.lang | 1 + htdocs/langs/ko_KR/main.lang | 16 +- htdocs/langs/ko_KR/orders.lang | 4 +- htdocs/langs/ko_KR/other.lang | 2 + htdocs/langs/ko_KR/productbatch.lang | 42 +- htdocs/langs/ko_KR/products.lang | 3 +- htdocs/langs/ko_KR/projects.lang | 3 + htdocs/langs/ko_KR/suppliers.lang | 74 +- htdocs/langs/ko_KR/website.lang | 13 +- htdocs/langs/lo_LA/accountancy.lang | 6 +- htdocs/langs/lo_LA/admin.lang | 6 +- htdocs/langs/lo_LA/banks.lang | 1 + htdocs/langs/lo_LA/bills.lang | 3 + htdocs/langs/lo_LA/compta.lang | 1 + htdocs/langs/lo_LA/donations.lang | 1 + htdocs/langs/lo_LA/errors.lang | 1 + htdocs/langs/lo_LA/install.lang | 2 + htdocs/langs/lo_LA/languages.lang | 1 + htdocs/langs/lo_LA/main.lang | 16 +- htdocs/langs/lo_LA/other.lang | 2 + htdocs/langs/lo_LA/products.lang | 1 + htdocs/langs/lo_LA/projects.lang | 3 + htdocs/langs/lo_LA/website.lang | 13 +- htdocs/langs/lt_LT/accountancy.lang | 30 +- htdocs/langs/lt_LT/admin.lang | 10 +- htdocs/langs/lt_LT/banks.lang | 1 + htdocs/langs/lt_LT/bills.lang | 3 + htdocs/langs/lt_LT/compta.lang | 1 + htdocs/langs/lt_LT/donations.lang | 1 + htdocs/langs/lt_LT/errors.lang | 1 + htdocs/langs/lt_LT/install.lang | 2 + htdocs/langs/lt_LT/languages.lang | 1 + htdocs/langs/lt_LT/mailmanspip.lang | 8 +- htdocs/langs/lt_LT/main.lang | 16 +- htdocs/langs/lt_LT/opensurvey.lang | 4 +- htdocs/langs/lt_LT/other.lang | 2 + htdocs/langs/lt_LT/products.lang | 1 + htdocs/langs/lt_LT/projects.lang | 3 + htdocs/langs/lt_LT/website.lang | 13 +- htdocs/langs/lv_LV/accountancy.lang | 18 +- htdocs/langs/lv_LV/admin.lang | 74 +- htdocs/langs/lv_LV/agenda.lang | 2 +- htdocs/langs/lv_LV/banks.lang | 3 +- htdocs/langs/lv_LV/bills.lang | 17 +- htdocs/langs/lv_LV/boxes.lang | 8 +- htdocs/langs/lv_LV/categories.lang | 2 +- htdocs/langs/lv_LV/companies.lang | 2 +- htdocs/langs/lv_LV/compta.lang | 13 +- htdocs/langs/lv_LV/dict.lang | 2 +- htdocs/langs/lv_LV/donations.lang | 1 + htdocs/langs/lv_LV/ecm.lang | 2 +- htdocs/langs/lv_LV/errors.lang | 5 +- htdocs/langs/lv_LV/exports.lang | 2 +- htdocs/langs/lv_LV/install.lang | 2 + htdocs/langs/lv_LV/languages.lang | 1 + htdocs/langs/lv_LV/loan.lang | 4 +- htdocs/langs/lv_LV/mails.lang | 6 +- htdocs/langs/lv_LV/main.lang | 60 +- htdocs/langs/lv_LV/modulebuilder.lang | 16 +- htdocs/langs/lv_LV/multicurrency.lang | 2 +- htdocs/langs/lv_LV/oauth.lang | 2 +- htdocs/langs/lv_LV/orders.lang | 2 +- htdocs/langs/lv_LV/other.lang | 4 +- htdocs/langs/lv_LV/products.lang | 29 +- htdocs/langs/lv_LV/projects.lang | 3 + htdocs/langs/lv_LV/sendings.lang | 2 +- htdocs/langs/lv_LV/stocks.lang | 10 +- htdocs/langs/lv_LV/supplier_proposal.lang | 2 +- htdocs/langs/lv_LV/trips.lang | 14 +- htdocs/langs/lv_LV/website.lang | 43 +- htdocs/langs/lv_LV/withdrawals.lang | 4 +- htdocs/langs/lv_LV/workflow.lang | 2 +- htdocs/langs/mk_MK/accountancy.lang | 6 +- htdocs/langs/mk_MK/admin.lang | 6 +- htdocs/langs/mk_MK/banks.lang | 1 + htdocs/langs/mk_MK/bills.lang | 3 + htdocs/langs/mk_MK/compta.lang | 1 + htdocs/langs/mk_MK/donations.lang | 1 + htdocs/langs/mk_MK/errors.lang | 1 + htdocs/langs/mk_MK/install.lang | 2 + htdocs/langs/mk_MK/languages.lang | 1 + htdocs/langs/mk_MK/main.lang | 16 +- htdocs/langs/mk_MK/other.lang | 2 + htdocs/langs/mk_MK/products.lang | 1 + htdocs/langs/mk_MK/projects.lang | 3 + htdocs/langs/mk_MK/website.lang | 13 +- htdocs/langs/mn_MN/accountancy.lang | 6 +- htdocs/langs/mn_MN/admin.lang | 6 +- htdocs/langs/mn_MN/banks.lang | 1 + htdocs/langs/mn_MN/bills.lang | 3 + htdocs/langs/mn_MN/compta.lang | 1 + htdocs/langs/mn_MN/donations.lang | 1 + htdocs/langs/mn_MN/errors.lang | 1 + htdocs/langs/mn_MN/install.lang | 2 + htdocs/langs/mn_MN/languages.lang | 1 + htdocs/langs/mn_MN/main.lang | 16 +- htdocs/langs/mn_MN/other.lang | 2 + htdocs/langs/mn_MN/products.lang | 1 + htdocs/langs/mn_MN/projects.lang | 3 + htdocs/langs/mn_MN/website.lang | 13 +- htdocs/langs/nb_NO/accountancy.lang | 6 +- htdocs/langs/nb_NO/admin.lang | 10 +- htdocs/langs/nb_NO/banks.lang | 1 + htdocs/langs/nb_NO/bills.lang | 3 + htdocs/langs/nb_NO/compta.lang | 1 + htdocs/langs/nb_NO/donations.lang | 1 + htdocs/langs/nb_NO/errors.lang | 3 +- htdocs/langs/nb_NO/install.lang | 2 + htdocs/langs/nb_NO/languages.lang | 1 + htdocs/langs/nb_NO/main.lang | 16 +- htdocs/langs/nb_NO/other.lang | 2 + htdocs/langs/nb_NO/products.lang | 1 + htdocs/langs/nb_NO/projects.lang | 3 + htdocs/langs/nb_NO/website.lang | 13 +- htdocs/langs/nl_BE/accountancy.lang | 1 - htdocs/langs/nl_BE/admin.lang | 16 +- htdocs/langs/nl_BE/install.lang | 20 + htdocs/langs/nl_NL/accountancy.lang | 6 +- htdocs/langs/nl_NL/admin.lang | 124 +-- htdocs/langs/nl_NL/banks.lang | 1 + htdocs/langs/nl_NL/bills.lang | 3 + htdocs/langs/nl_NL/compta.lang | 1 + htdocs/langs/nl_NL/donations.lang | 1 + htdocs/langs/nl_NL/errors.lang | 1 + htdocs/langs/nl_NL/install.lang | 66 +- htdocs/langs/nl_NL/languages.lang | 1 + htdocs/langs/nl_NL/main.lang | 16 +- htdocs/langs/nl_NL/other.lang | 2 + htdocs/langs/nl_NL/products.lang | 1 + htdocs/langs/nl_NL/projects.lang | 3 + htdocs/langs/nl_NL/website.lang | 13 +- htdocs/langs/pl_PL/accountancy.lang | 6 +- htdocs/langs/pl_PL/admin.lang | 6 +- htdocs/langs/pl_PL/banks.lang | 1 + htdocs/langs/pl_PL/bills.lang | 3 + htdocs/langs/pl_PL/boxes.lang | 2 +- htdocs/langs/pl_PL/companies.lang | 6 +- htdocs/langs/pl_PL/compta.lang | 1 + htdocs/langs/pl_PL/donations.lang | 1 + htdocs/langs/pl_PL/errors.lang | 1 + htdocs/langs/pl_PL/holiday.lang | 4 +- htdocs/langs/pl_PL/install.lang | 8 +- htdocs/langs/pl_PL/languages.lang | 3 +- htdocs/langs/pl_PL/main.lang | 16 +- htdocs/langs/pl_PL/opensurvey.lang | 2 +- htdocs/langs/pl_PL/other.lang | 2 + htdocs/langs/pl_PL/products.lang | 1 + htdocs/langs/pl_PL/projects.lang | 3 + htdocs/langs/pl_PL/propal.lang | 2 +- htdocs/langs/pl_PL/sms.lang | 2 +- htdocs/langs/pl_PL/website.lang | 13 +- htdocs/langs/pt_BR/accountancy.lang | 1 - htdocs/langs/pt_BR/admin.lang | 1 - htdocs/langs/pt_BR/banks.lang | 1 + htdocs/langs/pt_PT/accountancy.lang | 6 +- htdocs/langs/pt_PT/admin.lang | 134 ++-- htdocs/langs/pt_PT/banks.lang | 1 + htdocs/langs/pt_PT/bills.lang | 3 + htdocs/langs/pt_PT/compta.lang | 1 + htdocs/langs/pt_PT/donations.lang | 1 + htdocs/langs/pt_PT/errors.lang | 1 + htdocs/langs/pt_PT/install.lang | 2 + htdocs/langs/pt_PT/languages.lang | 1 + htdocs/langs/pt_PT/main.lang | 16 +- htdocs/langs/pt_PT/other.lang | 2 + htdocs/langs/pt_PT/products.lang | 1 + htdocs/langs/pt_PT/projects.lang | 3 + htdocs/langs/pt_PT/website.lang | 13 +- htdocs/langs/ro_RO/accountancy.lang | 6 +- htdocs/langs/ro_RO/admin.lang | 6 +- htdocs/langs/ro_RO/banks.lang | 1 + htdocs/langs/ro_RO/bills.lang | 3 + htdocs/langs/ro_RO/compta.lang | 1 + htdocs/langs/ro_RO/donations.lang | 1 + htdocs/langs/ro_RO/errors.lang | 1 + htdocs/langs/ro_RO/install.lang | 2 + htdocs/langs/ro_RO/languages.lang | 1 + htdocs/langs/ro_RO/main.lang | 16 +- htdocs/langs/ro_RO/other.lang | 2 + htdocs/langs/ro_RO/products.lang | 1 + htdocs/langs/ro_RO/projects.lang | 3 + htdocs/langs/ro_RO/website.lang | 13 +- htdocs/langs/ru_RU/accountancy.lang | 6 +- htdocs/langs/ru_RU/admin.lang | 22 +- htdocs/langs/ru_RU/agenda.lang | 2 +- htdocs/langs/ru_RU/banks.lang | 1 + htdocs/langs/ru_RU/bills.lang | 5 +- htdocs/langs/ru_RU/companies.lang | 4 +- htdocs/langs/ru_RU/compta.lang | 1 + htdocs/langs/ru_RU/donations.lang | 1 + htdocs/langs/ru_RU/errors.lang | 1 + htdocs/langs/ru_RU/install.lang | 2 + htdocs/langs/ru_RU/languages.lang | 1 + htdocs/langs/ru_RU/main.lang | 16 +- htdocs/langs/ru_RU/orders.lang | 2 +- htdocs/langs/ru_RU/other.lang | 2 + htdocs/langs/ru_RU/products.lang | 7 +- htdocs/langs/ru_RU/projects.lang | 3 + htdocs/langs/ru_RU/sendings.lang | 2 +- htdocs/langs/ru_RU/supplier_proposal.lang | 8 +- htdocs/langs/ru_RU/website.lang | 13 +- htdocs/langs/sk_SK/accountancy.lang | 6 +- htdocs/langs/sk_SK/admin.lang | 6 +- htdocs/langs/sk_SK/banks.lang | 1 + htdocs/langs/sk_SK/bills.lang | 3 + htdocs/langs/sk_SK/compta.lang | 1 + htdocs/langs/sk_SK/donations.lang | 1 + htdocs/langs/sk_SK/errors.lang | 1 + htdocs/langs/sk_SK/install.lang | 2 + htdocs/langs/sk_SK/languages.lang | 1 + htdocs/langs/sk_SK/main.lang | 16 +- htdocs/langs/sk_SK/other.lang | 2 + htdocs/langs/sk_SK/products.lang | 1 + htdocs/langs/sk_SK/projects.lang | 3 + htdocs/langs/sk_SK/website.lang | 13 +- htdocs/langs/sl_SI/accountancy.lang | 6 +- htdocs/langs/sl_SI/admin.lang | 6 +- htdocs/langs/sl_SI/banks.lang | 1 + htdocs/langs/sl_SI/bills.lang | 3 + htdocs/langs/sl_SI/compta.lang | 1 + htdocs/langs/sl_SI/donations.lang | 1 + htdocs/langs/sl_SI/errors.lang | 1 + htdocs/langs/sl_SI/install.lang | 2 + htdocs/langs/sl_SI/languages.lang | 1 + htdocs/langs/sl_SI/main.lang | 16 +- htdocs/langs/sl_SI/other.lang | 2 + htdocs/langs/sl_SI/products.lang | 1 + htdocs/langs/sl_SI/projects.lang | 3 + htdocs/langs/sl_SI/website.lang | 13 +- htdocs/langs/sq_AL/accountancy.lang | 6 +- htdocs/langs/sq_AL/admin.lang | 40 +- htdocs/langs/sq_AL/banks.lang | 1 + htdocs/langs/sq_AL/bills.lang | 3 + htdocs/langs/sq_AL/compta.lang | 1 + htdocs/langs/sq_AL/deliveries.lang | 6 +- htdocs/langs/sq_AL/donations.lang | 1 + htdocs/langs/sq_AL/ecm.lang | 2 +- htdocs/langs/sq_AL/errors.lang | 1 + htdocs/langs/sq_AL/install.lang | 2 + htdocs/langs/sq_AL/languages.lang | 1 + htdocs/langs/sq_AL/mails.lang | 2 +- htdocs/langs/sq_AL/main.lang | 16 +- htdocs/langs/sq_AL/oauth.lang | 8 +- htdocs/langs/sq_AL/other.lang | 2 + htdocs/langs/sq_AL/products.lang | 1 + htdocs/langs/sq_AL/projects.lang | 3 + htdocs/langs/sq_AL/salaries.lang | 12 +- htdocs/langs/sq_AL/sms.lang | 2 +- htdocs/langs/sq_AL/website.lang | 13 +- htdocs/langs/sr_RS/accountancy.lang | 6 +- htdocs/langs/sr_RS/admin.lang | 6 +- htdocs/langs/sr_RS/banks.lang | 1 + htdocs/langs/sr_RS/bills.lang | 3 + htdocs/langs/sr_RS/compta.lang | 1 + htdocs/langs/sr_RS/donations.lang | 1 + htdocs/langs/sr_RS/errors.lang | 1 + htdocs/langs/sr_RS/install.lang | 2 + htdocs/langs/sr_RS/languages.lang | 1 + htdocs/langs/sr_RS/main.lang | 16 +- htdocs/langs/sr_RS/other.lang | 2 + htdocs/langs/sr_RS/products.lang | 1 + htdocs/langs/sr_RS/projects.lang | 3 + htdocs/langs/sv_SE/accountancy.lang | 6 +- htdocs/langs/sv_SE/admin.lang | 6 +- htdocs/langs/sv_SE/banks.lang | 1 + htdocs/langs/sv_SE/bills.lang | 3 + htdocs/langs/sv_SE/compta.lang | 1 + htdocs/langs/sv_SE/donations.lang | 1 + htdocs/langs/sv_SE/errors.lang | 1 + htdocs/langs/sv_SE/install.lang | 2 + htdocs/langs/sv_SE/languages.lang | 1 + htdocs/langs/sv_SE/main.lang | 16 +- htdocs/langs/sv_SE/other.lang | 2 + htdocs/langs/sv_SE/products.lang | 1 + htdocs/langs/sv_SE/projects.lang | 3 + htdocs/langs/sv_SE/website.lang | 13 +- htdocs/langs/sw_SW/accountancy.lang | 6 +- htdocs/langs/sw_SW/admin.lang | 6 +- htdocs/langs/sw_SW/banks.lang | 1 + htdocs/langs/sw_SW/bills.lang | 3 + htdocs/langs/sw_SW/compta.lang | 1 + htdocs/langs/sw_SW/donations.lang | 1 + htdocs/langs/sw_SW/errors.lang | 1 + htdocs/langs/sw_SW/install.lang | 2 + htdocs/langs/sw_SW/languages.lang | 1 + htdocs/langs/sw_SW/main.lang | 16 +- htdocs/langs/sw_SW/other.lang | 2 + htdocs/langs/sw_SW/products.lang | 1 + htdocs/langs/sw_SW/projects.lang | 3 + htdocs/langs/th_TH/accountancy.lang | 6 +- htdocs/langs/th_TH/admin.lang | 6 +- htdocs/langs/th_TH/banks.lang | 1 + htdocs/langs/th_TH/bills.lang | 3 + htdocs/langs/th_TH/compta.lang | 1 + htdocs/langs/th_TH/donations.lang | 1 + htdocs/langs/th_TH/errors.lang | 1 + htdocs/langs/th_TH/install.lang | 2 + htdocs/langs/th_TH/languages.lang | 1 + htdocs/langs/th_TH/main.lang | 16 +- htdocs/langs/th_TH/members.lang | 2 +- htdocs/langs/th_TH/other.lang | 2 + htdocs/langs/th_TH/productbatch.lang | 4 +- htdocs/langs/th_TH/products.lang | 1 + htdocs/langs/th_TH/projects.lang | 3 + htdocs/langs/th_TH/website.lang | 13 +- htdocs/langs/tr_TR/accountancy.lang | 6 +- htdocs/langs/tr_TR/admin.lang | 6 +- htdocs/langs/tr_TR/banks.lang | 1 + htdocs/langs/tr_TR/bills.lang | 3 + htdocs/langs/tr_TR/compta.lang | 1 + htdocs/langs/tr_TR/donations.lang | 1 + htdocs/langs/tr_TR/errors.lang | 1 + htdocs/langs/tr_TR/install.lang | 2 + htdocs/langs/tr_TR/languages.lang | 3 +- htdocs/langs/tr_TR/main.lang | 16 +- htdocs/langs/tr_TR/other.lang | 2 + htdocs/langs/tr_TR/products.lang | 1 + htdocs/langs/tr_TR/projects.lang | 3 + htdocs/langs/tr_TR/website.lang | 13 +- htdocs/langs/uk_UA/accountancy.lang | 6 +- htdocs/langs/uk_UA/admin.lang | 6 +- htdocs/langs/uk_UA/banks.lang | 1 + htdocs/langs/uk_UA/bills.lang | 3 + htdocs/langs/uk_UA/compta.lang | 1 + htdocs/langs/uk_UA/donations.lang | 1 + htdocs/langs/uk_UA/errors.lang | 1 + htdocs/langs/uk_UA/install.lang | 2 + htdocs/langs/uk_UA/languages.lang | 1 + htdocs/langs/uk_UA/main.lang | 16 +- htdocs/langs/uk_UA/other.lang | 2 + htdocs/langs/uk_UA/products.lang | 1 + htdocs/langs/uk_UA/projects.lang | 3 + htdocs/langs/uk_UA/website.lang | 13 +- htdocs/langs/uz_UZ/accountancy.lang | 6 +- htdocs/langs/uz_UZ/admin.lang | 6 +- htdocs/langs/uz_UZ/banks.lang | 1 + htdocs/langs/uz_UZ/bills.lang | 3 + htdocs/langs/uz_UZ/compta.lang | 1 + htdocs/langs/uz_UZ/donations.lang | 1 + htdocs/langs/uz_UZ/errors.lang | 1 + htdocs/langs/uz_UZ/install.lang | 2 + htdocs/langs/uz_UZ/languages.lang | 1 + htdocs/langs/uz_UZ/main.lang | 16 +- htdocs/langs/uz_UZ/other.lang | 2 + htdocs/langs/uz_UZ/products.lang | 1 + htdocs/langs/uz_UZ/projects.lang | 3 + htdocs/langs/vi_VN/accountancy.lang | 6 +- htdocs/langs/vi_VN/admin.lang | 6 +- htdocs/langs/vi_VN/banks.lang | 1 + htdocs/langs/vi_VN/bills.lang | 3 + htdocs/langs/vi_VN/compta.lang | 1 + htdocs/langs/vi_VN/donations.lang | 1 + htdocs/langs/vi_VN/errors.lang | 1 + htdocs/langs/vi_VN/install.lang | 2 + htdocs/langs/vi_VN/languages.lang | 1 + htdocs/langs/vi_VN/main.lang | 16 +- htdocs/langs/vi_VN/other.lang | 2 + htdocs/langs/vi_VN/products.lang | 1 + htdocs/langs/vi_VN/projects.lang | 3 + htdocs/langs/vi_VN/website.lang | 13 +- htdocs/langs/zh_CN/accountancy.lang | 6 +- htdocs/langs/zh_CN/admin.lang | 24 +- htdocs/langs/zh_CN/banks.lang | 1 + htdocs/langs/zh_CN/bills.lang | 3 + htdocs/langs/zh_CN/compta.lang | 1 + htdocs/langs/zh_CN/donations.lang | 1 + htdocs/langs/zh_CN/errors.lang | 1 + htdocs/langs/zh_CN/install.lang | 2 + htdocs/langs/zh_CN/languages.lang | 1 + htdocs/langs/zh_CN/main.lang | 16 +- htdocs/langs/zh_CN/other.lang | 2 + htdocs/langs/zh_CN/products.lang | 1 + htdocs/langs/zh_CN/projects.lang | 3 + htdocs/langs/zh_CN/suppliers.lang | 32 +- htdocs/langs/zh_CN/website.lang | 13 +- htdocs/langs/zh_CN/workflow.lang | 28 +- htdocs/langs/zh_TW/accountancy.lang | 6 +- htdocs/langs/zh_TW/admin.lang | 6 +- htdocs/langs/zh_TW/banks.lang | 1 + htdocs/langs/zh_TW/bills.lang | 3 + htdocs/langs/zh_TW/compta.lang | 1 + htdocs/langs/zh_TW/donations.lang | 1 + htdocs/langs/zh_TW/errors.lang | 1 + htdocs/langs/zh_TW/install.lang | 2 + htdocs/langs/zh_TW/languages.lang | 1 + htdocs/langs/zh_TW/main.lang | 16 +- htdocs/langs/zh_TW/other.lang | 2 + htdocs/langs/zh_TW/products.lang | 1 + htdocs/langs/zh_TW/projects.lang | 3 + htdocs/langs/zh_TW/website.lang | 13 +- 845 files changed, 5268 insertions(+), 2480 deletions(-) diff --git a/htdocs/langs/ar_EG/admin.lang b/htdocs/langs/ar_EG/admin.lang index 8bf0f108658..b24eb9216d5 100644 --- a/htdocs/langs/ar_EG/admin.lang +++ b/htdocs/langs/ar_EG/admin.lang @@ -30,4 +30,6 @@ AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ ExampleOfDirectoriesForModelGen=Examples of syntax:
    c:\\mydir
    /home/mydir
    DOL_DATA_ROOT/ecm/ecmdir Module25Name=أمر شراء Module25Desc=إدارة أوامر الشراء +Module700Name=تبرعات +Module1780Name=الأوسمة/التصنيفات Permission81=قراءة أوامر الشراء diff --git a/htdocs/langs/ar_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang index 97442672b52..0acd030c5db 100644 --- a/htdocs/langs/ar_SA/accountancy.lang +++ b/htdocs/langs/ar_SA/accountancy.lang @@ -5,7 +5,7 @@ ACCOUNTING_EXPORT_PIECE=تصدير عدد القطعة ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=تصدير مع الحساب العام ACCOUNTING_EXPORT_LABEL=تصدير التسمية ACCOUNTING_EXPORT_AMOUNT=تصدير الكمية -ACCOUNTING_EXPORT_DEVISE=Export currency +ACCOUNTING_EXPORT_DEVISE=تصدير العملة Selectformat=حدد تنسيق للملف ACCOUNTING_EXPORT_FORMAT=حدد تنسيق للملف ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type @@ -110,7 +110,7 @@ IntoAccount=Bind line with the accounting account Ventilate=Bind LineId=Id line Processing=معالجة -EndProcessing=Process terminated. +EndProcessing=انتهت العملية SelectedLines=الخطوط المحددة Lineofinvoice=خط الفاتورة LineOfExpenseReport=Line of expense report @@ -158,7 +158,7 @@ NumPiece=Piece number TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=قائمة الحسابات المحاسبية UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal Modelcsv=نموذج التصدير -OptionsDeactivatedForThisExportModel=تم الغاء الخيارات لنموذج التصدير هذا Selectmodelcsv=تحديد نموذج للتصدير Modelcsv_normal=تصدير كلاسيكي Modelcsv_CEGID=Export towards CEGID Expert Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution Modelcsv_quadratus=Export towards Quadratus QuadraCompta Modelcsv_ebp=Export towards EBP Modelcsv_cogilog=Export towards Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id @@ -262,7 +262,7 @@ ChartofaccountsId=Chart of accounts Id InitAccountancy=Init accountancy InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases. DefaultBindingDesc=This page can be used to set a default account to use to link transactions record about payment salaries, donation, taxes and vat when no specific accounting account were already set. -Options=Options +Options=الخيارات OptionModeProductSell=Mode sales OptionModeProductBuy=Mode purchases OptionModeProductSellDesc=Show all products with accounting account for sales. @@ -277,7 +277,7 @@ ValueNotIntoChartOfAccount=This value of accounting account does not exist into ## Dictionary Range=Range of accounting account Calculated=Calculated -Formula=Formula +Formula=معادلة ## Error SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang index 3cf9940dcaa..1b7892946ea 100644 --- a/htdocs/langs/ar_SA/admin.lang +++ b/htdocs/langs/ar_SA/admin.lang @@ -539,7 +539,7 @@ Module320Desc=إضافة تغذية RSS داخل الشاشة صفحة Dolibarr Module330Name=العناوين Module330Desc=إدارة العناوين Module400Name=المشاريع / الفرص / يؤدي -Module400Desc=إدارة المشاريع والفرص أو الخيوط. ثم يمكنك تعيين أي عنصر (الفاتورة، النظام، اقتراح، والتدخل، ...) لمشروع والحصول على عرض مستعرضة من وجهة نظر المشروع. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=التكامل Webcalendar Module500Name=المصروفات الخاصة @@ -890,7 +890,7 @@ DictionaryStaff=العاملين DictionaryAvailability=تأخير تسليم DictionaryOrderMethods=طرق ترتيب DictionarySource=أصل مقترحات / أوامر -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=نماذج للتخطيط للحسابات DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=رسائل البريد الإلكتروني قوالب @@ -904,6 +904,7 @@ SetupSaved=الإعداد المحفوظة SetupNotSaved=Setup not saved BackToModuleList=العودة إلى قائمة الوحدات BackToDictionaryList=العودة إلى قائمة القواميس +TypeOfRevenueStamp=Type of revenue stamp VATManagement=إدارة الضريبة على القيمة المضافة VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is VAT=0. End of rule. VATIsNotUsedDesc=افتراضي المقترحة 0 ضريبة القيمة المضافة هو الذي يمكن أن يستخدم في حالات مثل الجمعيات والأفراد والشركات الصغيرة où. @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/ar_SA/banks.lang b/htdocs/langs/ar_SA/banks.lang index 372b3c8758f..16dc3a1fd1c 100644 --- a/htdocs/langs/ar_SA/banks.lang +++ b/htdocs/langs/ar_SA/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=عدد LineRecord=المعاملات AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Reconciled ConciliatedBy=طريق التصالح DateConciliating=التوفيق التاريخ BankLineConciliated=Entry reconciled diff --git a/htdocs/langs/ar_SA/bills.lang b/htdocs/langs/ar_SA/bills.lang index 08fe4dd88ed..d9f68acc177 100644 --- a/htdocs/langs/ar_SA/bills.lang +++ b/htdocs/langs/ar_SA/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s BillsLate=في وقت متأخر المدفوعات BillsStatistics=عملاء الفواتير إحصاءات BillsStatisticsSuppliers=فواتير الموردين إحصاءات +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Disabled because cannot be erased InvoiceStandard=فاتورة موحدة InvoiceStandardAsk=فاتورة موحدة @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? ConfirmClassifyPaidPartiallyReasonAvoir=تبقى بدون أجر (%s%s) هو الخصم الممنوح لأنه تم السداد قبل الأجل. I تسوية الضريبة على القيمة المضافة مع ملاحظة الائتمان. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=تبقى بدون أجر (%s%s) هو الخصم الممنوح لأنه تم السداد قبل الأجل. أنا أقبل أن تفقد ضريبة القيمة المضافة على هذا الخصم. ConfirmClassifyPaidPartiallyReasonDiscountVat=تبقى بدون أجر (%s%s) هو الخصم الممنوح لأنه تم السداد قبل الأجل. I استرداد ضريبة القيمة المضافة على هذا الخصم دون مذكرة الائتمان. ConfirmClassifyPaidPartiallyReasonBadCustomer=العملاء سيئة diff --git a/htdocs/langs/ar_SA/compta.lang b/htdocs/langs/ar_SA/compta.lang index 664b73a0fc7..e117108ac55 100644 --- a/htdocs/langs/ar_SA/compta.lang +++ b/htdocs/langs/ar_SA/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=المدفوعات ليست مرتبطة بأي ال PaymentsNotLinkedToUser=المدفوعات ليست مرتبطة بأي مستخدم Profit=الأرباح AccountingResult=نتيجة المحاسبة +BalanceBefore=Balance (before) Balance=التوازن Debit=الخصم Credit=الائتمان diff --git a/htdocs/langs/ar_SA/donations.lang b/htdocs/langs/ar_SA/donations.lang index 8d6f924ead0..492a364cd4e 100644 --- a/htdocs/langs/ar_SA/donations.lang +++ b/htdocs/langs/ar_SA/donations.lang @@ -31,3 +31,4 @@ DONATION_ART200=تبين المادة 200 من CGI إذا كنت تشعر بال DONATION_ART238=تبين المادة 238 من CGI إذا كنت تشعر بالقلق DONATION_ART885=تبين المادة 885 من CGI إذا كنت تشعر بالقلق DonationPayment=دفع التبرع +DonationValidated=Donation %s validated diff --git a/htdocs/langs/ar_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang index 792ee884d9e..668395b2676 100644 --- a/htdocs/langs/ar_SA/errors.lang +++ b/htdocs/langs/ar_SA/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=التعبير فارغة ErrorPriceExpression21=نتيجة فارغة '٪ ق' ErrorPriceExpression22=نتيجة سلبية '٪ ق' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=خطأ داخلي '٪ ق' ErrorPriceExpressionUnknown=خطأ غير معروف '٪ ق' ErrorSrcAndTargetWarehouseMustDiffers=يجب المصدر والهدف يختلف المستودعات diff --git a/htdocs/langs/ar_SA/help.lang b/htdocs/langs/ar_SA/help.lang index 4d5587531f8..4510c6ed7d6 100644 --- a/htdocs/langs/ar_SA/help.lang +++ b/htdocs/langs/ar_SA/help.lang @@ -13,7 +13,7 @@ TypeSupportCommercial=التجارية TypeOfHelp=نوع NeedHelpCenter=Need help or support? Efficiency=الكفاءة -TypeHelpOnly=يساعد فقط +TypeHelpOnly=فقط مساعدة TypeHelpDev=+ المساعدة على التنمية TypeHelpDevForm=مساعدة التنمية + + تشكيل ToGetHelpGoOnSparkAngels1=ويمكن أن توفر بعض الشركات سريعة (ما الفورية) ، وزيادة كفاءة شبكة الإنترنت عن طريق دعم السيطرة على جهاز الكمبيوتر الخاص بك. مساعدات من هذا القبيل يمكن الاطلاع على الموقع الإلكتروني ل ٪ : @@ -21,6 +21,6 @@ ToGetHelpGoOnSparkAngels3=كما يمكنك الذهاب الى قائمة ال ToGetHelpGoOnSparkAngels2=في بعض الأحيان ، لا يوجد أي شركة المتاحة في الوقت الراهن تقوم بإجراء البحث ، لذلك اعتقد تغيير فلتر للبحث عن "توافر جميع". ستتمكن من ارسال المزيد من الطلبات. BackToHelpCenter=Otherwise, click here to go الى الصفحة الرئيسية لمركز المساعدة. LinkToGoldMember=تستطيع الاتصال به من قبل المدرب مختار مسبقا لغتك Dolibarr (٪) عن طريق النقر فوق القطعة له (والحد الاعلى لسعر يتم تحديثها تلقائيا) : -PossibleLanguages=وأيد لغات +PossibleLanguages=اللغات المدعومة SubscribeToFoundation=مساعدة مشروع Dolibarr، الاشتراك في الجمعية SeeOfficalSupport=للحصول على الدعم Dolibarr الرسمي في لغتك:
    ٪ الصورة diff --git a/htdocs/langs/ar_SA/install.lang b/htdocs/langs/ar_SA/install.lang index a3fac326792..1c63a302a58 100644 --- a/htdocs/langs/ar_SA/install.lang +++ b/htdocs/langs/ar_SA/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=يمكنك استخدام معالج إعداد Dolibar UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=إصلاح البيانات الذي لم تتم تسويته @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Update entity field value of llx_societe_remise MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except MigrationReloadModule=إعادة تحديث الوحدات %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=عرض خيارات غير متوفرة HideNotAvailableOptions=إخفاء خيارات غير متوفرة ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. diff --git a/htdocs/langs/ar_SA/languages.lang b/htdocs/langs/ar_SA/languages.lang index f91a6ca2b0d..7b27cc35010 100644 --- a/htdocs/langs/ar_SA/languages.lang +++ b/htdocs/langs/ar_SA/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=الإسبانية (بنما) Language_es_PY=الأسبانية (باراغواي) Language_es_PE=الإسبانية (بيرو) Language_es_PR=الأسبانية (بورتو ريكو) +Language_es_UY=Spanish (Uruguay) Language_es_VE=الإسبانية (فنزويلا) Language_et_EE=الإستونية Language_eu_ES=الباسكي diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang index 252e4dd74e2..243be2d77f3 100644 --- a/htdocs/langs/ar_SA/main.lang +++ b/htdocs/langs/ar_SA/main.lang @@ -548,6 +548,18 @@ MonthShort09=سبتمبر MonthShort10=أكتوبر MonthShort11=نوفمبر MonthShort12=ديسمبر +MonthVeryShort01=J +MonthVeryShort02=واو +MonthVeryShort03=م +MonthVeryShort04=A +MonthVeryShort05=م +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=دإ +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=الملفات والمستندات المرفقة JoinMainDoc=Join main document DateFormatYYYYMM=YYYY-MM @@ -762,7 +774,7 @@ SetBankAccount=تحديد الحساب المصرفي AccountCurrency=Account currency ViewPrivateNote=عرض الملاحظات XMoreLines=٪ ق خط (ق) مخبأة -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=URL العام AddBox=إضافة مربع SelectElementAndClick=Select an element and click %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=مشاريع مشتركة +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/ar_SA/other.lang b/htdocs/langs/ar_SA/other.lang index 7914fb9e376..847b95e991f 100644 --- a/htdocs/langs/ar_SA/other.lang +++ b/htdocs/langs/ar_SA/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=إذا قدر أعلى من٪ الصورة SourcesRepository=مستودع للمصادر Chart=Chart PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=صادرات المنطقة diff --git a/htdocs/langs/ar_SA/products.lang b/htdocs/langs/ar_SA/products.lang index e43e13d775c..fabeb3972b4 100644 --- a/htdocs/langs/ar_SA/products.lang +++ b/htdocs/langs/ar_SA/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=السعر الحالي AlwaysUseNewPrice=دائما استخدم السعر الحالي للمنتج / الخدمة AlwaysUseFixedPrice=استخدم السعر الثابت PriceByQuantity=أسعار مختلفة حسب الكمية +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=مدى الكمية MultipriceRules=Price segment rules UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/ar_SA/projects.lang b/htdocs/langs/ar_SA/projects.lang index bd877d910cf..11f389ec67d 100644 --- a/htdocs/langs/ar_SA/projects.lang +++ b/htdocs/langs/ar_SA/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=بانتظار OppStatusWON=فاز OppStatusLOST=ضائع Budget=Budget +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/ar_SA/website.lang b/htdocs/langs/ar_SA/website.lang index e019dc542aa..649c60e3080 100644 --- a/htdocs/langs/ar_SA/website.lang +++ b/htdocs/langs/ar_SA/website.lang @@ -3,15 +3,17 @@ Shortname=رمز WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them. DeleteWebsite=Delete website ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Page name/alias -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL of external CSS file WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Media library EditCss=Edit Style/CSS or HTML header EditMenu=Edit menu @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/bg_BG/accountancy.lang b/htdocs/langs/bg_BG/accountancy.lang index 67b0bd2c773..a6c9ecd1cfe 100644 --- a/htdocs/langs/bg_BG/accountancy.lang +++ b/htdocs/langs/bg_BG/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Номер на част TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=List of the accounting accounts UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal 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 Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution Modelcsv_quadratus=Export towards Quadratus QuadraCompta Modelcsv_ebp=Export towards EBP Modelcsv_cogilog=Export towards Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang index ff752032c3c..95780a9da29 100644 --- a/htdocs/langs/bg_BG/admin.lang +++ b/htdocs/langs/bg_BG/admin.lang @@ -539,7 +539,7 @@ Module320Desc=Добавяне на RSS емисия в страниците н Module330Name=Отметки Module330Desc=Управление на отметките Module400Name=Проекти/Възможности -Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar интеграция Module500Name=Special expenses @@ -890,7 +890,7 @@ DictionaryStaff=Staff DictionaryAvailability=Delivery delay DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Models for chart of accounts DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=Emails templates @@ -904,6 +904,7 @@ SetupSaved=Setup спаси SetupNotSaved=Setup not saved BackToModuleList=Обратно към списъка с модули BackToDictionaryList=Back to dictionaries list +TypeOfRevenueStamp=Type of revenue stamp VATManagement=Управление на ДДС VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is VAT=0. End of rule. VATIsNotUsedDesc=По подразбиране предложената ДДС е 0, които могат да бъдат използвани за подобни случаи сдружения, лицата ОУ малките фирми. @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/bg_BG/banks.lang b/htdocs/langs/bg_BG/banks.lang index 5df06ad1662..7bdcc6e9c22 100644 --- a/htdocs/langs/bg_BG/banks.lang +++ b/htdocs/langs/bg_BG/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Номер LineRecord=Транзакция AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Reconciled ConciliatedBy=Съгласуват от DateConciliating=Reconcile дата BankLineConciliated=Entry reconciled diff --git a/htdocs/langs/bg_BG/bills.lang b/htdocs/langs/bg_BG/bills.lang index 9007c189a35..f79fb429434 100644 --- a/htdocs/langs/bg_BG/bills.lang +++ b/htdocs/langs/bg_BG/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s BillsLate=Забавени плащания BillsStatistics=Статистика за продажни фактури BillsStatisticsSuppliers=Статистика за доставни фактури +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Disabled because cannot be erased InvoiceStandard=Стандартна фактура InvoiceStandardAsk=Стандартна фактура @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? ConfirmClassifyPaidPartiallyReasonAvoir=Неплатеният остатък (%s %s) е дадена отстъпка, защото плащането е направено преди срока за плащане. Урегулирам ДДС с кредитно известие. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Неплатеният остатък (%s %s) е дадена отстъпка, защото плащането е направено преди срока за плащане. Приемам да се загуби ДДС по тази отстъпка. ConfirmClassifyPaidPartiallyReasonDiscountVat=Неплатеният остатък (%s %s) е дадена отстъпка, защото плащането е направено преди срока за плащане Възстановявам ДДС по тази отстъпка без кредитно известие. ConfirmClassifyPaidPartiallyReasonBadCustomer=Лош клиент diff --git a/htdocs/langs/bg_BG/compta.lang b/htdocs/langs/bg_BG/compta.lang index c699b82a2c4..087313d328c 100644 --- a/htdocs/langs/bg_BG/compta.lang +++ b/htdocs/langs/bg_BG/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Плащания, които не са свързан PaymentsNotLinkedToUser=Плащанията, които не са свързани с никой потребител Profit=Печалба AccountingResult=Счетоводен резултат +BalanceBefore=Balance (before) Balance=Баланс Debit=Дебит Credit=Кредит diff --git a/htdocs/langs/bg_BG/donations.lang b/htdocs/langs/bg_BG/donations.lang index 8fcb853c017..06becf91cfd 100644 --- a/htdocs/langs/bg_BG/donations.lang +++ b/htdocs/langs/bg_BG/donations.lang @@ -31,3 +31,4 @@ DONATION_ART200=Показване на артикул 200 от CGI ако ст DONATION_ART238=Показване на артикул 238 от CGI ако сте загрижени DONATION_ART885=Показване на артикул 885 от CGI ако сте загрижени DonationPayment=Плащане на дарение +DonationValidated=Donation %s validated diff --git a/htdocs/langs/bg_BG/errors.lang b/htdocs/langs/bg_BG/errors.lang index fa4d90c11fa..451c05c6fc5 100644 --- a/htdocs/langs/bg_BG/errors.lang +++ b/htdocs/langs/bg_BG/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Празен израз ErrorPriceExpression21=Празен резултат '%s' ErrorPriceExpression22=Отрицателен резултат '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Вътрешна грешка '%s' ErrorPriceExpressionUnknown=Незнайна грешка '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs diff --git a/htdocs/langs/bg_BG/install.lang b/htdocs/langs/bg_BG/install.lang index 22d13b2125c..183ae0384f5 100644 --- a/htdocs/langs/bg_BG/install.lang +++ b/htdocs/langs/bg_BG/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=Вие използвате помощника за н UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Корекция на denormalized данни @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Update entity field value of llx_societe_remise MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except MigrationReloadModule=Презареждане на модула %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Показване на недостъпните опции HideNotAvailableOptions=Скриване на недостъпните опции ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. diff --git a/htdocs/langs/bg_BG/languages.lang b/htdocs/langs/bg_BG/languages.lang index fbf2539146f..59958660a2f 100644 --- a/htdocs/langs/bg_BG/languages.lang +++ b/htdocs/langs/bg_BG/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Испански (Парагвай) Language_es_PE=Испански (Перу) Language_es_PR=Испански (Пуерто Рико) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Spanish (Venezuela) Language_et_EE=Естонски Language_eu_ES=Баска diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang index 590cc060fdc..6013501d15e 100644 --- a/htdocs/langs/bg_BG/main.lang +++ b/htdocs/langs/bg_BG/main.lang @@ -548,6 +548,18 @@ MonthShort09=Сеп MonthShort10=Окт MonthShort11=Ное MonthShort12=Дек +MonthVeryShort01=J +MonthVeryShort02=П +MonthVeryShort03=П +MonthVeryShort04=A +MonthVeryShort05=П +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=Н +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Прикачени файлове и документи JoinMainDoc=Join main document DateFormatYYYYMM=YYYY-MM @@ -762,7 +774,7 @@ SetBankAccount=Дефинирай банкова сметка AccountCurrency=Account currency ViewPrivateNote=Биж бележки XMoreLines=%s ред(а) скрити -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=Публичен URL AddBox=Добави поле SelectElementAndClick=Select an element and click %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=Всички +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/bg_BG/other.lang b/htdocs/langs/bg_BG/other.lang index 2c936d6d4e8..915517301f7 100644 --- a/htdocs/langs/bg_BG/other.lang +++ b/htdocs/langs/bg_BG/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=Ако сумаta e по-висока от %s
    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/bg_BG/website.lang b/htdocs/langs/bg_BG/website.lang index 895ad634e50..d4dafa45840 100644 --- a/htdocs/langs/bg_BG/website.lang +++ b/htdocs/langs/bg_BG/website.lang @@ -3,15 +3,17 @@ Shortname=Код WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them. DeleteWebsite=Изтрийте уебсайт ConfirmDeleteWebsite=Сигурни ли сте, че искате да изтриете този уебсайт? Всички негови страници и съдържание ще бъдат премахнати. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Име на страницата -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=Линк към външен CSS файл WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Media library EditCss=Редактирай CSS или HTML header EditMenu=Редактирай @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/bn_BD/accountancy.lang b/htdocs/langs/bn_BD/accountancy.lang index 9dbf911a820..c4189507f60 100644 --- a/htdocs/langs/bn_BD/accountancy.lang +++ b/htdocs/langs/bn_BD/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Piece number TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=List of the accounting accounts UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal 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 Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution Modelcsv_quadratus=Export towards Quadratus QuadraCompta Modelcsv_ebp=Export towards EBP Modelcsv_cogilog=Export towards Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id diff --git a/htdocs/langs/bn_BD/admin.lang b/htdocs/langs/bn_BD/admin.lang index 4f3d25c4eb1..9dce46ab295 100644 --- a/htdocs/langs/bn_BD/admin.lang +++ b/htdocs/langs/bn_BD/admin.lang @@ -539,7 +539,7 @@ Module320Desc=Add RSS feed inside Dolibarr screen pages Module330Name=Bookmarks Module330Desc=Bookmarks management Module400Name=Projects/Opportunities/Leads -Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar integration Module500Name=Special expenses @@ -890,7 +890,7 @@ DictionaryStaff=Staff DictionaryAvailability=Delivery delay DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Models for chart of accounts DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=Emails templates @@ -904,6 +904,7 @@ SetupSaved=Setup saved SetupNotSaved=Setup not saved BackToModuleList=Back to modules list BackToDictionaryList=Back to dictionaries list +TypeOfRevenueStamp=Type of revenue stamp VATManagement=VAT Management VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is 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. @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/bn_BD/banks.lang b/htdocs/langs/bn_BD/banks.lang index b79571b6864..404dbbd0a69 100644 --- a/htdocs/langs/bn_BD/banks.lang +++ b/htdocs/langs/bn_BD/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Number LineRecord=Transaction AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Reconciled ConciliatedBy=Reconciled by DateConciliating=Reconcile date BankLineConciliated=Entry reconciled diff --git a/htdocs/langs/bn_BD/bills.lang b/htdocs/langs/bn_BD/bills.lang index 53fb235e3e1..de7c4aec4cc 100644 --- a/htdocs/langs/bn_BD/bills.lang +++ b/htdocs/langs/bn_BD/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s BillsLate=Late payments BillsStatistics=Customers invoices statistics BillsStatisticsSuppliers=Suppliers invoices statistics +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Disabled because cannot be erased InvoiceStandard=Standard invoice InvoiceStandardAsk=Standard invoice @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer diff --git a/htdocs/langs/bn_BD/compta.lang b/htdocs/langs/bn_BD/compta.lang index 4082b9fa9b7..df4942cf234 100644 --- a/htdocs/langs/bn_BD/compta.lang +++ b/htdocs/langs/bn_BD/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to PaymentsNotLinkedToUser=Payments not linked to any user Profit=Profit AccountingResult=Accounting result +BalanceBefore=Balance (before) Balance=Balance Debit=Debit Credit=Credit diff --git a/htdocs/langs/bn_BD/donations.lang b/htdocs/langs/bn_BD/donations.lang index f4578fa9fc3..5edc8d62033 100644 --- a/htdocs/langs/bn_BD/donations.lang +++ b/htdocs/langs/bn_BD/donations.lang @@ -31,3 +31,4 @@ 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 +DonationValidated=Donation %s validated diff --git a/htdocs/langs/bn_BD/errors.lang b/htdocs/langs/bn_BD/errors.lang index b02b70c9c9f..cff89a71d98 100644 --- a/htdocs/langs/bn_BD/errors.lang +++ b/htdocs/langs/bn_BD/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Empty expression ErrorPriceExpression21=Empty result '%s' ErrorPriceExpression22=Negative result '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs diff --git a/htdocs/langs/bn_BD/install.lang b/htdocs/langs/bn_BD/install.lang index 7a93fd20799..e602c54640c 100644 --- a/htdocs/langs/bn_BD/install.lang +++ b/htdocs/langs/bn_BD/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtua UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Fix for denormalized data @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Update entity field value of llx_societe_remise MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except MigrationReloadModule=Reload module %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Show not available options HideNotAvailableOptions=Hide not available options ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. diff --git a/htdocs/langs/bn_BD/languages.lang b/htdocs/langs/bn_BD/languages.lang index 05288a888eb..a062883d667 100644 --- a/htdocs/langs/bn_BD/languages.lang +++ b/htdocs/langs/bn_BD/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Spanish (Paraguay) Language_es_PE=Spanish (Peru) Language_es_PR=Spanish (Puerto Rico) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Spanish (Venezuela) Language_et_EE=Estonian Language_eu_ES=Basque diff --git a/htdocs/langs/bn_BD/main.lang b/htdocs/langs/bn_BD/main.lang index 893d992f2fd..fb23f749779 100644 --- a/htdocs/langs/bn_BD/main.lang +++ b/htdocs/langs/bn_BD/main.lang @@ -548,6 +548,18 @@ MonthShort09=Sep MonthShort10=Oct MonthShort11=Nov MonthShort12=Dec +MonthVeryShort01=J +MonthVeryShort02=F +MonthVeryShort03=M +MonthVeryShort04=A +MonthVeryShort05=M +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=S +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Attached files and documents JoinMainDoc=Join main document DateFormatYYYYMM=YYYY-MM @@ -762,7 +774,7 @@ SetBankAccount=Define Bank Account AccountCurrency=Account currency ViewPrivateNote=View notes XMoreLines=%s line(s) hidden -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=Public URL AddBox=Add box SelectElementAndClick=Select an element and click %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=Everybody +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/bn_BD/other.lang b/htdocs/langs/bn_BD/other.lang index 0d9d1cfbd85..1a5314a24d9 100644 --- a/htdocs/langs/bn_BD/other.lang +++ b/htdocs/langs/bn_BD/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=If amount higher than %s SourcesRepository=Repository for sources Chart=Chart PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=Exports area diff --git a/htdocs/langs/bn_BD/products.lang b/htdocs/langs/bn_BD/products.lang index 43c74c9b877..53835bd7f06 100644 --- a/htdocs/langs/bn_BD/products.lang +++ b/htdocs/langs/bn_BD/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Current price AlwaysUseNewPrice=Always use current price of product/service AlwaysUseFixedPrice=Use the fixed price PriceByQuantity=Different prices by quantity +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Quantity range MultipriceRules=Price segment rules UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/bn_BD/projects.lang b/htdocs/langs/bn_BD/projects.lang index f33a950acff..c69302deecb 100644 --- a/htdocs/langs/bn_BD/projects.lang +++ b/htdocs/langs/bn_BD/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=Pending OppStatusWON=Won OppStatusLOST=Lost Budget=Budget +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/bn_BD/website.lang b/htdocs/langs/bn_BD/website.lang index 3902febbfb7..6b4e2ada84a 100644 --- a/htdocs/langs/bn_BD/website.lang +++ b/htdocs/langs/bn_BD/website.lang @@ -3,15 +3,17 @@ Shortname=Code WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them. DeleteWebsite=Delete website ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Page name/alias -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL of external CSS file WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Media library EditCss=Edit Style/CSS or HTML header EditMenu=Edit menu @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/bs_BA/accountancy.lang b/htdocs/langs/bs_BA/accountancy.lang index a9125e4ce04..defc8131b1c 100644 --- a/htdocs/langs/bs_BA/accountancy.lang +++ b/htdocs/langs/bs_BA/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Piece number TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=List of the accounting accounts UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal Modelcsv=Model izvoza -OptionsDeactivatedForThisExportModel=Za ovaj model izvoza, opcije su onemogućene Selectmodelcsv=Odaberi model izvoza Modelcsv_normal=Klasični izvoz Modelcsv_CEGID=Izvoz prema CEGID Expert Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution Modelcsv_quadratus=Export towards Quadratus QuadraCompta Modelcsv_ebp=Export towards EBP Modelcsv_cogilog=Export towards Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang index 8d95d412bff..02ad97f4544 100644 --- a/htdocs/langs/bs_BA/admin.lang +++ b/htdocs/langs/bs_BA/admin.lang @@ -539,7 +539,7 @@ Module320Desc=Add RSS feed inside Dolibarr screen pages Module330Name=Bookmarks Module330Desc=Upravljanje bookmark-ima 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. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar integration Module500Name=Special expenses @@ -890,7 +890,7 @@ DictionaryStaff=Osoblje DictionaryAvailability=Delivery delay DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Models for chart of accounts DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=Emails templates @@ -904,6 +904,7 @@ SetupSaved=Postavke snimljene SetupNotSaved=Setup not saved BackToModuleList=Back to modules list BackToDictionaryList=Back to dictionaries list +TypeOfRevenueStamp=Type of revenue stamp VATManagement=VAT Management VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is 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. @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/bs_BA/banks.lang b/htdocs/langs/bs_BA/banks.lang index 30f2b1fdab3..325ac7bed89 100644 --- a/htdocs/langs/bs_BA/banks.lang +++ b/htdocs/langs/bs_BA/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Broj LineRecord=Transakcija AddBankRecord=Dodaj unos AddBankRecordLong=Dodaj unos ručno +Conciliated=Izmireno ConciliatedBy=Izmireno od strane DateConciliating=Datum izmirivanja BankLineConciliated=Transakcija izmirena diff --git a/htdocs/langs/bs_BA/bills.lang b/htdocs/langs/bs_BA/bills.lang index 77d49bfeba7..70bd829585d 100644 --- a/htdocs/langs/bs_BA/bills.lang +++ b/htdocs/langs/bs_BA/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Neplaćene fakture dobavljača za %s BillsLate=Zakašnjela plaćanja BillsStatistics=Statistika faktura kupaca BillsStatisticsSuppliers=Statistika faktura dobavljača +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Onemogućeno jer se ne može brisati InvoiceStandard=Standardna faktura InvoiceStandardAsk=Standardna faktura @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=Ova faktura nije potpuno plaćena. Koji su razlozi da zatvorite ovu fakturu? ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=Loš kupac diff --git a/htdocs/langs/bs_BA/compta.lang b/htdocs/langs/bs_BA/compta.lang index 3ed072de7b9..88b0e0b5b80 100644 --- a/htdocs/langs/bs_BA/compta.lang +++ b/htdocs/langs/bs_BA/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Plaćanja nisu povezana ni sa jednom fakturom, niti s PaymentsNotLinkedToUser=Plaćanja nisu povezana ni sa jednim korisnikom Profit=Dobit AccountingResult=Accounting result +BalanceBefore=Balance (before) Balance=Stanje Debit=Duguje Credit=Potražuje diff --git a/htdocs/langs/bs_BA/donations.lang b/htdocs/langs/bs_BA/donations.lang index ce91a6a7586..07437d96091 100644 --- a/htdocs/langs/bs_BA/donations.lang +++ b/htdocs/langs/bs_BA/donations.lang @@ -31,3 +31,4 @@ 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 +DonationValidated=Donation %s validated diff --git a/htdocs/langs/bs_BA/errors.lang b/htdocs/langs/bs_BA/errors.lang index f1fb2ae61fd..a86b46e6d79 100644 --- a/htdocs/langs/bs_BA/errors.lang +++ b/htdocs/langs/bs_BA/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Empty expression ErrorPriceExpression21=Empty result '%s' ErrorPriceExpression22=Negative result '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs diff --git a/htdocs/langs/bs_BA/install.lang b/htdocs/langs/bs_BA/install.lang index 4e3f8942c37..da5f554255d 100644 --- a/htdocs/langs/bs_BA/install.lang +++ b/htdocs/langs/bs_BA/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtua UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Fix for denormalized data @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Update entity field value of llx_societe_remise MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except MigrationReloadModule=Reload module %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Show not available options HideNotAvailableOptions=Hide not available options ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. diff --git a/htdocs/langs/bs_BA/languages.lang b/htdocs/langs/bs_BA/languages.lang index d50595be3e5..4f469ebcc7c 100644 --- a/htdocs/langs/bs_BA/languages.lang +++ b/htdocs/langs/bs_BA/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Španjolski (Paragvaj) Language_es_PE=Španjolski (Peru) Language_es_PR=Španjolski (Puerto Rico) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Spanish (Venezuela) Language_et_EE=Estonski Language_eu_ES=Baskijski diff --git a/htdocs/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang index f6d64b9f8cb..0f54dd72800 100644 --- a/htdocs/langs/bs_BA/main.lang +++ b/htdocs/langs/bs_BA/main.lang @@ -548,6 +548,18 @@ MonthShort09=sep MonthShort10=okt MonthShort11=nov MonthShort12=dec +MonthVeryShort01=J +MonthVeryShort02=P +MonthVeryShort03=P +MonthVeryShort04=A +MonthVeryShort05=P +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=S +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Priložene datoteke i dokumenti JoinMainDoc=Join main document DateFormatYYYYMM=MM-YYYY @@ -762,7 +774,7 @@ SetBankAccount=Definiraj bankovni račun AccountCurrency=Account currency ViewPrivateNote=Vidi zabilješke XMoreLines=%s red(ova) skriveno -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=Javni URL AddBox=Dodaj kutijicu SelectElementAndClick=Odaberite element i kliknite %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=Zajednički projekti +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/bs_BA/other.lang b/htdocs/langs/bs_BA/other.lang index 9018d114021..a3f3e92f64e 100644 --- a/htdocs/langs/bs_BA/other.lang +++ b/htdocs/langs/bs_BA/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=If amount higher than %s SourcesRepository=Repository for sources Chart=Chart PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=Exports area diff --git a/htdocs/langs/bs_BA/products.lang b/htdocs/langs/bs_BA/products.lang index c8443e474db..78c46bed191 100644 --- a/htdocs/langs/bs_BA/products.lang +++ b/htdocs/langs/bs_BA/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Current price AlwaysUseNewPrice=Always use current price of product/service AlwaysUseFixedPrice=Use the fixed price PriceByQuantity=Different prices by quantity +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Quantity range MultipriceRules=Price segment rules UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/bs_BA/projects.lang b/htdocs/langs/bs_BA/projects.lang index a33313d0c9e..10e9a9fcb0d 100644 --- a/htdocs/langs/bs_BA/projects.lang +++ b/htdocs/langs/bs_BA/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=Čekanje OppStatusWON=Won OppStatusLOST=Lost Budget=Budget +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/bs_BA/website.lang b/htdocs/langs/bs_BA/website.lang index 88290fd1225..630a62570b0 100644 --- a/htdocs/langs/bs_BA/website.lang +++ b/htdocs/langs/bs_BA/website.lang @@ -3,15 +3,17 @@ Shortname=Kod WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them. DeleteWebsite=Delete website ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Page name/alias -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL of external CSS file WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Media library EditCss=Edit Style/CSS or HTML header EditMenu=Edit menu @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang index 958289b4dd5..81b463e9d6b 100644 --- a/htdocs/langs/ca_ES/accountancy.lang +++ b/htdocs/langs/ca_ES/accountancy.lang @@ -8,7 +8,7 @@ ACCOUNTING_EXPORT_AMOUNT=Exporta l'import ACCOUNTING_EXPORT_DEVISE=Exporta la moneda Selectformat=Select the format for the file ACCOUNTING_EXPORT_FORMAT=Select the format for the file -ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type +ACCOUNTING_EXPORT_ENDLINE=Seleccioneu el tipus de retorn ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name ThisService=Aquest servei ThisProduct=Aquest producte @@ -33,10 +33,10 @@ ConfirmDeleteCptCategory=Estàs segur que vols eliminar aquest compte comptable JournalizationInLedgerStatus=Estat del diari AlreadyInGeneralLedger=Registrat en el Llibre Major NotYetInGeneralLedger=No s'ha registrat en el Llibre Major -GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group -DetailByAccount=Show detail by account -AccountWithNonZeroValues=Accounts with non zero values -ListOfAccounts=List of accounts +GroupIsEmptyCheckSetup=El grup està buit, comproveu la configuració del grup de comptabilitat personalitzat +DetailByAccount=Mostra detalls per compte +AccountWithNonZeroValues=Comptes amb valors no nuls +ListOfAccounts=Llista de comptes MainAccountForCustomersNotDefined=Compte comptable per a clients no definida en la configuració MainAccountForSuppliersNotDefined=Compte comptable per a proveïdors no definit en la configuració @@ -60,7 +60,7 @@ AccountancyAreaDescContrib=PAS %s: Defineix comptes comptables per defecte per d AccountancyAreaDescDonation=PAS %s: Defineix comptes comptables per defecte per a les donacions. Per això, utilitzeu l'entrada del menú %s. AccountancyAreaDescMisc=PAS %s: Defineix el compte comptable obligatori per defecte i els comptes comptables per defecte per a transaccions diverses. Per això, utilitzeu l'entrada del menú %s. AccountancyAreaDescLoan=PAS %s: Defineix comptes comptables per defecte per als préstecs. Per això, utilitzeu l'entrada del menú %s. -AccountancyAreaDescBank=STEP %s: Define accounting accounts and journal code for each bank and financial accounts. For this, use the menu entry %s. +AccountancyAreaDescBank=PAS %s: definiu comptes comptables i codis diaris per a cada compte bancari i financer. Per això, utilitzeu l'entrada del menú %s. AccountancyAreaDescProd=PAS %s: Defineix comptes comptables als vostres productes/serveis. Per això, utilitzeu l'entrada del menú %s. AccountancyAreaDescBind=PAS %s: Comproveu que els enllaços entre les línies %s existents i els comptes comptables és correcta, de manera que l'aplicació podrà registrar les transaccions al Llibre Major amb un sol clic. Completa les unions que falten. Per això, utilitzeu l'entrada del menú %s. @@ -69,7 +69,7 @@ AccountancyAreaDescAnalyze=PAS %s: Afegir o editar transaccions existents i gene AccountancyAreaDescClosePeriod=PAS %s: Tancar el període de forma que no pot fer modificacions en un futur. -TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts) +TheJournalCodeIsNotDefinedOnSomeBankAccount=No s'ha completat un pas obligatori en la configuració (el codi comptable diari no està definit per a tots els comptes bancaris) Selectchartofaccounts=Seleccionar el pla de comptes actiu ChangeAndLoad=Canviar i carregar Addanaccount=Afegir un compte comptable @@ -151,29 +151,29 @@ Docdate=Data Docref=Referència Code_tiers=Tercer LabelAccount=Etiqueta de compte -LabelOperation=Label operation +LabelOperation=Etiqueta de l'operació Sens=Significat Codejournal=Diari NumPiece=Número de peça TransactionNumShort=Número de transacció -AccountingCategory=Personalized groups +AccountingCategory=Grups personalitzats GroupByAccountAccounting=Agrupar per compte comptable -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=Per comptes -ByPredefinedAccountGroups=By predefined groups -ByPersonalizedAccountGroups=By personalized groups +ByPredefinedAccountGroups=Per grups predefinits +ByPersonalizedAccountGroups=Per grups personalitzats ByYear=Per any NotMatch=No definit DeleteMvt=Elimina línies del llibre major DelYear=Any a eliminar DelJournal=Diari per esborrar ConfirmDeleteMvt=Això eliminarà totes les línies del Llibre Major de l'any i/o d'un diari específic. Es requereix com a mínim un criteri. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvtPartial=Això eliminarà la transacció del Ledger (se suprimiran totes les línies relacionades amb la mateixa transacció) DelBookKeeping=Elimina el registre del libre major FinanceJournal=Finance journal ExpenseReportsJournal=Informe-diari de despeses DescFinanceJournal=Finance journal including all the types of payments by bank account -DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=Es tracta d'una vista dels registres que són vinculats al compte de comptabilitat i es poden registrar a la Ledger. VATAccountNotDefined=Comptes comptables de IVA sense definir ThirdpartyAccountNotDefined=Comptes comptables de tercers (clients o proveïdors) sense definir ProductAccountNotDefined=Comptes comptables per al producte sense definir @@ -191,10 +191,11 @@ DescThirdPartyReport=Consulti aquí la llista de tercers (cliente i proveïdors) ListAccounts=Llistat dels comptes comptables UnknownAccountForThirdparty=Compte comptable de tercer desconeguda, utilitzarem %s UnknownAccountForThirdpartyBlocking=Compte comptable de tercer desconegut. Error de bloqueig +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error -Pcgtype=Group of account -Pcgsubtype=Subgroup of account -PcgtypeDesc=Group and subgroup of account are used as predefined 'filter' and 'grouping' criterias for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report. +Pcgtype=Grup de compte +Pcgsubtype=Subgrup de compte +PcgtypeDesc=El grup i el subgrup del compte s'utilitzen com a criteris de "filtre" i "agrupació" predefinits per a alguns informes comptables. Per exemple, "INCOME" o "EXPENSE" s'utilitzen com a grups per als comptes comptables de productes per generar l'informe de despeses/ingressos. TotalVente=Total turnover before tax TotalMarge=Marge total de vendes @@ -220,20 +221,20 @@ MvtNotCorrectlyBalanced=Registre comptabilitzat incorrectament. Deure=%s. Haver= FicheVentilation=Fitxa de comptabilització GeneralLedgerIsWritten=Les transaccions s'han escrit al llibre major GeneralLedgerSomeRecordWasNotRecorded=Algunes de les transaccions no s'han registrat. Si no hi ha cap altre missatge d'error, probablement és perquè ja s'han registrat. -NoNewRecordSaved=No more record to journalize +NoNewRecordSaved=No hi ha més registres pel diari ListOfProductsWithoutAccountingAccount=Llista de productes no comptabilitzats en cap compte comptable ChangeBinding=Canvia la comptabilització ## Admin ApplyMassCategories=Aplica categories massives -AddAccountFromBookKeepingWithNoCategories=Available acccount not yet in a personalized group +AddAccountFromBookKeepingWithNoCategories=El compte disponible encara no està en un grup personalitzat CategoryDeleted=La categoria per al compte contable ha sigut eliminada AccountingJournals=Diari de comptabilitat AccountingJournal=Diari comptable NewAccountingJournal=Nou diari comptable ShowAccoutingJournal=Mostrar diari comptable Nature=Caràcter -AccountingJournalType1=Miscellaneous operation +AccountingJournalType1=Operació miscel·lània AccountingJournalType2=Vendes AccountingJournalType3=Compres AccountingJournalType4=Banc @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=Aquest diari ja està en ús ## Export ExportDraftJournal=Exportar esborranys del llibre Modelcsv=Model d'exportació -OptionsDeactivatedForThisExportModel=Per aquest model d'exportació les opcions estan desactivades Selectmodelcsv=Selecciona un model d'exportació Modelcsv_normal=Exportació clàssica Modelcsv_CEGID=Exporta cap a CEGID Expert Comptabilité @@ -254,22 +254,22 @@ Modelcsv_ciel=Exporta cap a Sage Ciel Compta o Compta Evolution Modelcsv_quadratus=Exporta cap a Quadratus QuadraCompta Modelcsv_ebp=Exporta cap a EBP Modelcsv_cogilog=Exporta cap a Cogilog -Modelcsv_agiris=Exportar a Agiris (Test) -Modelcsv_configurable=Export Configurable +Modelcsv_agiris=Exporta a Agiris +Modelcsv_configurable=Exportació configurable ChartofaccountsId=Id pla comptable ## Tools - Init accounting account on product / service InitAccountancy=Inicialitza la comptabilitat -InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases. +InitAccountancyDesc=Aquesta pàgina es pot utilitzar per inicialitzar un compte de comptabilitat en productes i serveis que no tenen compte comptable definit per a vendes i compres. DefaultBindingDesc=Aquesta pàgina pot ser utilitzat per establir un compte per defecte que s'utilitzarà per enllaçar registre de transaccions sobre els pagament de salaris, donació, impostos i IVA quan no hi ha encara compte comptable específic definit. Options=Opcions OptionModeProductSell=En mode vendes OptionModeProductBuy=En mode compres OptionModeProductSellDesc=Mostra tots els productes amb compte comptable per a les vendes. OptionModeProductBuyDesc=Mostra tots els productes amb compte comptable per a les compres. -CleanFixHistory=Remove accounting code from lines that not exists into charts of account +CleanFixHistory=Eliminar el codi comptable de les línies que no existeixen als gràfics de compte CleanHistory=Reinicia tota la comptabilització per l'any seleccionat -PredefinedGroups=Predefined groups +PredefinedGroups=Grups predefinits WithoutValidAccount=Sense compte dedicada vàlida WithValidAccount=Amb compte dedicada vàlida ValueNotIntoChartOfAccount=Aquest compte comptable no existeix al pla comptable @@ -287,6 +287,6 @@ BookeppingLineAlreayExists=Les línies ja existeixen en la comptabilitat NoJournalDefined=Cap diari definit Binded=Línies comptabilitzades ToBind=Línies a comptabilitzar -UseMenuToSetBindindManualy=Autodection not possible, use menu %s to make the binding manually +UseMenuToSetBindindManualy=No es possible auto-detectar, utilitzeu el menú %s per fer l'enllaç manualment -WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate. +WarningReportNotReliable=Avís, aquest informe no està basat en el Ledger, de manera que no conté transaccions manuals modificades en el Ledger. Si la vostra publicació diària està actualitzada, la vista de comptes és més precisa. diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang index 22eb8439710..6288e1d0a52 100644 --- a/htdocs/langs/ca_ES/admin.lang +++ b/htdocs/langs/ca_ES/admin.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - admin Foundation=Entitat Version=Versió -Publisher=Publisher +Publisher=Publicador VersionProgram=Versió programa VersionLastInstall=Versió d'instal·lació inicial VersionLastUpgrade=Versió de l'última actualització @@ -40,8 +40,8 @@ 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) DBStoringCharset=Codificació base de dades per emmagatzematge de dades DBSortingCharset=Codificació base de dades per classificar les dades -ClientCharset=Client charset -ClientSortingCharset=Client collation +ClientCharset=Joc de caràcters del client +ClientSortingCharset="Collation" del client WarningModuleNotActive=Mòdul %s no actiu WarningOnlyPermissionOfActivatedModules=Aquí només es mostren els permisos relacionats amb els mòduls activats. Pots activar altres mòduls en la pàgina Inici->Configuració->Mòduls. DolibarrSetup=Instal·lació/Actualització de Dolibarr @@ -131,11 +131,11 @@ HoursOnThisPageAreOnServerTZ=Avís, al contrari d'altres pantalles, les hores d' Box=Panell Boxes=Panells MaxNbOfLinesForBoxes=Màxim número de línies per panell -AllWidgetsWereEnabled=All available widgets are enabled +AllWidgetsWereEnabled=Tots els widgets disponibles estan habilitats PositionByDefault=Posició per defecte Position=Lloc MenusDesc=Els gestors de menú defineixen el contingut de les dos barres de menú (horitzontal i vertical) -MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.
    Some modules add menu entries (in menu All mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module. +MenusEditorDesc=L'editor de menús permet definir entrades a mida. S'ha d'emprar amb cura per evitar introduir entrades que no siguin no portin enlloc.
    Alguns mòduls afegeixen entrades de menú (normalment a Tots). Si per error elimineu cap d'aquestes entrades de menú, podeu restablir-les desactivant i tornant a activar el mòdul. MenuForUsers=Menú per als usuaris LangFile=arxiu .lang System=Sistema @@ -196,24 +196,24 @@ OnlyActiveElementsAreShown=Només els elements de mòduls activats ModulesDesc=Els mòduls Dolibarr defineixen quina aplicació/característica està habilitada al programari. Algunes aplicacions/mòduls requereixen permisos que has de concedir als usuaris, després d'activar-los. Fes clic al botó d'activació/desactivació per habilitar un mòdul/aplicació. ModulesMarketPlaceDesc=Pots trobar més mòduls per descarregar en pàgines web externes per internet... ModulesDeployDesc=Si els permisos en el seu sistema d'arxius ho permiteixen, pot utilitzar aquesta ferramente per instal·lar un mòdul extern. El mòdul estarà aleshores visible en la pestanya %s -ModulesMarketPlaces=Find external app/modules -ModulesDevelopYourModule=Develop your own app/modules -ModulesDevelopDesc=You can develop or find a partner to develop for you, your personalised module -DOLISTOREdescriptionLong=Instead of switching on www.dolistore.com web site to find an external module, you can use this embedded tool that will make the seach on the external market place for you (may be slow, need an internet access)... +ModulesMarketPlaces=Trobar mòduls/complements externs +ModulesDevelopYourModule=Desenvolupeu els vostres mòduls/aplicacions +ModulesDevelopDesc=Podeu desenvolupar o trobar un soci per desenvolupar per a vostè, el vostre mòdul personalitzat +DOLISTOREdescriptionLong=En lloc d'activar el lloc web www.dolistore.com per trobar un mòdul extern, podeu utilitzar aquesta eina incrustada que farà que la cerca en el lloc de mercat extern per a tu (pot ser lent, necessiteu un accés a internet) ... NewModule=Nou -FreeModule=Free -CompatibleUpTo=Compatible with version %s -NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s - Max %s). -CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s). -SeeInMarkerPlace=See in Market place -Updated=Updated -Nouveauté=Novelty -AchatTelechargement=Buy / Download +FreeModule=Gratuït +CompatibleUpTo=Compatible amb la versió %s +NotCompatible=Aquest mòdul no sembla compatible amb el vostre Dolibarr %s (Mín %s - Màx %s). +CompatibleAfterUpdate=Aquest mòdul requereix actualitzar el vostre Dolibarr %s (Mín %s - Màx %s). +SeeInMarkerPlace=Veure a la tenda d'apps +Updated=Actualitzat +Nouveauté=Novetat +AchatTelechargement=Comprar / Descarregar GoModuleSetupArea=Per instal·lar un nou mòdul, vaja al àrea de configuració de mòduls en %s. DoliStoreDesc=DoliStore, el lloc oficial de mòduls complementaris per Dolibarr ERP / CRM DoliPartnersDesc=Llista d'empreses que proporcionen desenvolupament a mida de mòduls o funcionalitats (Nota: qualsevol empresa amb experiència amb programació PHP pot proporcionar desenvolupament a mida per un projecte de codi obert) WebSiteDesc=Llocs web de referència per trobar més mòduls... -DevelopYourModuleDesc=Some solutions to develop your own module... +DevelopYourModuleDesc=Algunes solucions per desenvolupar el vostre propi mòdul... URL=Enllaç BoxesAvailable=Panells disponibles BoxesActivated=Panells activats @@ -260,18 +260,18 @@ FontSize=Tamany de font Content=Contingut NoticePeriod=Preavís NewByMonth=Nou per mes -Emails=Emails -EMailsSetup=Emails setup -EMailsDesc=This page allows you to overwrite your PHP parameters for emails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless. -EmailSenderProfiles=Emails sender profiles +Emails=Correus +EMailsSetup=Configuració de correu +EMailsDesc=Aquesta plana permet reescriure els paràmetres del PHP en quan a l'enviament de correus. A la majoria dels casos de sistemes operatius Unix/Linux, la configuració per defecte del PHP és correcta i no calen aquests paràmetres. +EmailSenderProfiles=Perfils de remitents de correus electrònics MAIN_MAIL_SMTP_PORT=Port del servidor SMTP (Per defecte a php.ini: %s) MAIN_MAIL_SMTP_SERVER=Nom host o ip del servidor SMTP (Per defecte en php.ini: %s) MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Port del servidor SMTP (No definit en PHP en sistemes de tipus Unix) MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Nom servidor o ip del servidor SMTP (No definit en PHP en sistemes de tipus Unix) -MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: %s) -MAIN_MAIL_ERRORS_TO=Sender email used for error returns emails sent +MAIN_MAIL_EMAIL_FROM=Remitent del correu per a correus automàtics (Valor per defecte a php.ini: 1%s) +MAIN_MAIL_ERRORS_TO=Remitent pels correus enviats retornant errors MAIN_MAIL_AUTOCOPY_TO= Envia automàticament una còpia oculta de tots els e-mails enviats a -MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos) +MAIN_DISABLE_ALL_MAILS=Deshabilitar l'enviament de tots els correus (per fer proves o en llocs tipus demo) MAIN_MAIL_SENDMODE=Mètode d'enviament d'e-mails MAIN_MAIL_SMTPS_ID=ID d'autenticació SMTP si es requereix autenticació SMTP MAIN_MAIL_SMTPS_PW=Contrasenya autentificació SMTP si es requereix autenticació SMTP @@ -280,7 +280,7 @@ MAIN_MAIL_EMAIL_STARTTLS= Ús d'encriptació TLS (STARTTLS) MAIN_DISABLE_ALL_SMS=Desactivar globalment tot enviament de SMS (per mode de proves o demo) MAIN_SMS_SENDMODE=Mètode d'enviament de SMS MAIN_MAIL_SMS_FROM=Número de telèfon per defecte per als enviaments SMS -MAIN_MAIL_DEFAULT_FROMTYPE=Sender email by default for manual sendings (User email or Company email) +MAIN_MAIL_DEFAULT_FROMTYPE=Remitent per defecte per a correus enviats manualment (adreça de correu d'usuari o d'empresa) UserEmail=Correu electrònic de l'usuari CompanyEmail=Correu electrònic de l'empresa FeatureNotAvailableOnLinux=Funcionalitat no disponible en sistemes Unix. Proveu el seu sendmail localment. @@ -314,8 +314,8 @@ UnpackPackageInModulesRoot=Per instal·lar un mòdul extern, descomprimir l'arxi SetupIsReadyForUse=La instal·lació del mòdul ha finalitzat. No obstant, ha d'habilitar i configurar el mòdul en la seva aplicació, aneu a la pàgina per configurar els mòduls: %s. NotExistsDirect=No s'ha definit el directori arrel alternatiu a un directori existent.
    InfDirAlt=Des de la versió 3, és possible definir un directori arrel alternatiu. Això li permet emmagatzemar, en un directori dedicat, plug-ins i plantilles personalitzades.
    Només ha de crear un directori a l'arrel de Dolibarr (per exemple: custom).
    -InfDirExample=
    Then declare it in the file conf.php
    $dolibarr_main_url_root_alt='/custom'
    $dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'
    If these lines are commented with "#", to enable them, just uncomment by removing the "#" character. -YouCanSubmitFile=For this step, you can submit the .zip file of module package here : +InfDirExample=
    Declareu-lo al fitxer conf.php
    $dolibarr_main_url_root_alt='/custom'
    $dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'
    Si aquestes línies ja hi són però comentades amb un "#", llavors simplement descomenteu-les treient aquest caràcter. +YouCanSubmitFile=Per a aquest pas, podeu pujar el fitxer .ZIP del mòdul aquí: CurrentVersion=Versió actual de Dolibarr CallUpdatePage=Ves a la pàgina que actualitza l'estructura de base de dades i les dades: %s LastStableVersion=Última versió estable @@ -349,7 +349,7 @@ AddCRIfTooLong=No hi ha línies de tall automàtic, de manera que si el text és ConfirmPurge=Estàs segur de voler realitzar aquesta purga?
    Això esborrarà definitivament totes les dades dels seus fitxers (àrea GED, arxius adjunts etc.). MinLength=Longuitud mínima LanguageFilesCachedIntoShmopSharedMemory=arxius .lang en memòria compartida -LanguageFile=Language file +LanguageFile=Fitxer d'idioma ExamplesWithCurrentSetup=Exemples amb la configuració activa actual ListOfDirectories=Llistat de directoris de plantilles OpenDocument ListOfDirectoriesForModelGenODT=Llista de directoris que contenen fitxers de plantilles amb format OpenDocument.

    Posa aqui el l'adreça completa dels directoris.
    Afegeix un "intro" entre cada directori.
    Per afegir un directori del mòdul GED, afegeix aquí DOL_DATA_ROOT/ecm/yourdirectoryname.

    Els fitxers d'aquests directoris han de tenir l'extensió .odt o .ods. @@ -373,8 +373,8 @@ PDF=PDF PDFDesc=Defineix les opcions globals relacionades a la generació de PDF PDFAddressForging=Regles de visualització d'adreces HideAnyVATInformationOnPDF=Amaga tota la informació relacionada amb l'IVA en els PDF generats -PDFLocaltax=Rules for %s -HideLocalTaxOnPDF=Hide %s rate into pdf column tax sale +PDFLocaltax=Regles per %s +HideLocalTaxOnPDF=Amagar la tasa %s a la columna d'impostos de venda del pdf HideDescOnPDF=Amagar descripció dels productes en la generació dels PDF HideRefOnPDF=Amagar referència dels productes en la generació dels PDF HideDetailsOnPDF=Oculta els detalls de les línies de producte en els PDFs generats @@ -410,11 +410,11 @@ ExtrafieldCheckBoxFromList=Caselles de verificació des de taula ExtrafieldLink=Enllaç a un objecte ComputedFormula=Camp calculat ComputedFormulaDesc=Podeu introduir aquí una fórmula usant altres propietats d'objecte o qualsevol codi PHP per obtenir un valor calculat dinàmic. Podeu utilitzar qualsevol fórmula compatible amb PHP, inclòs l'operador "?" i els següents objectes globals: $db, $conf, $langs, $mysoc, $user, $object.
    AVÍS: Només algunes propietats de $object poden estar disponibles. Si necessiteu una propietat que no s'hagi carregat, tan sols busqueu l'objecte en la formula com en el segon exemple.
    L'ús d'un camp calculat significa que no podeu introduir cap valor des de la interfície. A més, si hi ha un error de sintaxi, la fórmula potser no torni res.

    Exemple de fórmula:
    $object->id <10? round($object->id/2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)

    Exemple de recarrega d'object
    (($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'

    Un altre exemple de fórmula per forçar la càrrega de l'objecte i el seu objecte principal:
    (($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found' -ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')

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

    In order to have the list depending on another complementary attribute list :
    1,value1|options_parent_list_code:parent_key
    2,value2|options_parent_list_code:parent_key

    In order to have the list depending on another list :
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key -ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')

    for example :
    1,value1
    2,value2
    3,value3
    ... -ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')

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

    - idfilter is necessarly a primary int key
    - filter can be a simple test (eg active=1) to display only active value
    You can also use $ID$ in filter witch is the current id of current object
    To do a SELECT in filter use $SEL$
    if you want to filter on extrafields use syntax extra.fieldcode=... (where field code is the code of extrafield)

    In order to have the list depending on another complementary attribute list:
    c_typent:libelle:id:options_parent_list_code|parent_column:filter

    In order to have the list depending on another list:
    c_typent:libelle:id:parent_list_code|parent_column:filter -ExtrafieldParamHelpchkbxlst=List of values 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
    You can also use $ID$ in filter witch is the current id of current object
    To do a SELECT in filter use $SEL$
    if you want to filter on extrafields use syntax extra.fieldcode=... (where field code is the code of extrafield)

    In order to have the list depending on another complementary attribute list :
    c_typent:libelle:id:options_parent_list_code|parent_column:filter

    In order to have the list depending on another list:
    c_typent:libelle:id:parent_list_code|parent_column:filter +ExtrafieldParamHelpselect=La llista de valors ha de ser un conjunt de línies amb un par del tipus clau,valor (on la clau no pot ser '0')

    per exemple :
    clau1,valor1
    clau2,valor2
    clau3,valor3
    ...

    Per tenir la llista depenent d'una altra llista d'atributs complementaris:
    1,valor1|options_codi_llista_pare:clau_pare
    2,valor2|options_codi_llista_pare:clau_pare

    Per tenir la llista depenent d'una altra llista:
    1,valor1|codi_llista_pare:clau_pare
    2,valor2|codi_llista_pare:clau_pare +ExtrafieldParamHelpcheckbox=La llista de valor ha de ser un conjunt de línies del tipus clau,valor (a on la clau no pot ser '0')

    per exemple :
    1,valor1
    2,valor2
    3,valor3
    ... +ExtrafieldParamHelpradio=La llista de valor ha de ser un conjunt de línies del tipus clau,valor (a on la clau no pot ser '0')

    per exemple :
    1,valor1
    2,valor2
    3,valor3
    ... +ExtrafieldParamHelpsellist=Llista de valors que provenen d'una taula
    Sintaxi: nom_taula:nom_camp:id_camp::filtre
    Exemple : c_typent:libelle:id::filter

    - idfilter ha de ser necessàriament una "primary int key"
    - el filtre pot ser una comprovació senzilla (eg active=1) per mostrar només valors actius
    També es pot emprar $ID$ al filtre per representar el ID de l'actual objecte en curs
    Per fer un SELECT al filtre empreu $SEL$
    Si voleu filtrar per algun camp extra ("extrafields") empreu la sintaxi extra.codicamp=... (a on codicamp és el codi del camp extra)

    Per tenir la llista depenent d'una altre llista d'atributs complementaris:
    c_typent:libelle:id:options_codi_llista_pare|parent_column:filter

    Per tenir la llista depenent d'una altra llista:
    c_typent:libelle:id:codi_llista_pare|parent_column:filter +ExtrafieldParamHelpchkbxlst=La llista de valors prové d'una taula
    Sintaxi: nom_taula:nom_camp:id_camp::filtre
    Exemple: c_typent:libelle:id::filter

    filtre pot ser una comprovació simple (p. ex. active=1) per mostrar només el valor actiu
    També podeu utilitzar $ID$ en el filtre per representar l'ID actual de l'objecte en curs
    Per fer un SELECT en el filtre utilitzeu $SEL$
    si voleu filtrar per camps extra utilitzeu sintaxi extra.fieldcode=... (on el codi de camp és el codi del extrafield)

    Per tenir la llista depenent d'una altra llista d'atributs complementaris:
    c_typent:libelle:id:options_codi_llista_pare|parent_column: filter

    Per tenir la llista depenent d'una altra llista: c_typent:libelle:id:codi_llista_pare|parent_column:filter ExtrafieldParamHelplink=Els paràmetres han de ser Nom del Objecte:Url de la Clase
    Sintàxi: Nom Object:Url Clase
    Exemple: Societe:societe/class/societe.class.php LibraryToBuildPDF=Llibreria utilitzada per generar 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' @@ -443,9 +443,9 @@ DisplayCompanyInfo=Mostra l'adreça de l'empresa DisplayCompanyManagers=Mostra el gestor de noms DisplayCompanyInfoAndManagers=Mostra l'adreça de l'empresa i els noms del gerència EnableAndSetupModuleCron=Si vols tenir aquesta factura recurrent generada automàticament, el mòdul *%s* s'ha d'habilitar i configurar correctament. D'altra banda, la generació de factures s'ha de fer manualment des d'aquesta plantilla amb el bóto "Crea". Tingues en compte que si actives la generació automàtica, pots continuar generant factures manuals. No és possible la generació de duplicitats pel mateix període. -ModuleCompanyCodeAquarium=Return an accounting code built by:
    %s followed by third party supplier code for a supplier accounting code,
    %s followed by third party customer code for a customer accounting code. -ModuleCompanyCodePanicum=Return an empty accounting code. -ModuleCompanyCodeDigitaria=Accounting 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. +ModuleCompanyCodeAquarium=Retorna un codi comptable construït per:
    %s seguit pel codi d'un tercer proveïdor per a obtenir un codi comptable de proveïdor,
    %s seguit pel codi d'un tercer client per a obtenir un codi comptable de client. +ModuleCompanyCodePanicum=Retorna un codi comptable buit. +ModuleCompanyCodeDigitaria=El codi comptable depèn del codi del Tercer. El codi està format pel caràcter "C" a la primera posició seguit dels 5 primers caràcters del codi del Tercer. Use3StepsApproval=Per defecte, les comandes de compra necessiten ser creades i aprovades per 2 usuaris diferents (el primer pas/usuari és per a crear i un altre pas/usuari per aprovar. Noteu que si un usuari te permisos tant per crear com per aprovar, un sol pas/usuari serà suficient). Amb aquesta opció, tens la possibilitat d'introduir un tercer pas/usuari per a l'aprovació, si l'import es superior a un determinat valor (d'aquesta manera són necessaris 3 passos: 1=validació, 2=primera aprovació i 3=segona aprovació si l'import és suficient).
    Deixa-ho en blanc si només vols un nivell d'aprovació (2 passos); posa un valor encara que sigui molt baix (0,1) si vols una segona aprovació (3 passos). UseDoubleApproval=Utilitza una aprovació en 3 passos quan l'import (sense impostos) sigui més gran que... WarningPHPMail=ADVERTÈNCIA: Alguns proveïdors de correu electrònic (com Yahoo) no li permeten enviar un correu electrònic des d'un altre servidor que no sigui el servidor de Yahoo si l'adreça de correu electrònic utilitzada com a remitent és el seu correu correu electrònic de Yahoo (com myemail@yahoo.com, myemail@yahoo.fr, ...). La seva configuració actual utilitza el servidor de l'aplicació per enviar correu electrònic, de manera que alguns destinataris (compatibles amb el protocol restrictiu DMARC) li preguntaran a Yahoo si poden acceptar el seu e-mail i Yahoo respondrà "no" perquè el servidor no és un servidor Propietat de Yahoo, pel que alguns dels seus e-mails enviats poden no ser acceptats.
    Si el proveïdor de correu electrònic (com Yahoo) té aquesta restricció, ha de canviar la configuració de correu electrònic per a triar el mètode "servidor SMTP" i introdudir el servidor SMTP i credencials proporcionades pel seu proveïdor de correu electrònic (pregunti al seu proveïdor de correu electrònic les credencials SMTP per al seu compte). @@ -454,8 +454,8 @@ DependsOn=Aquest mòdul necesita el/s mòdul/s RequiredBy=Aquest mòdul és requerit pel/s mòdul/s TheKeyIsTheNameOfHtmlField=Aquest és el nom del camp HTML. Això necessita tenir coneixements tècnics per llegir el contingut de la pàgina HTML per obtenir el nom clau d'un camp. PageUrlForDefaultValues=Has d'introduir aquí l'URL relatiu de la pàgina. Si inclous paràmetres a l'URL, els valors predeterminats seran efectius si tots els paràmetres s'estableixen en el mateix valor. Exemples: -PageUrlForDefaultValuesCreate=
    For form to create a new thirdparty, it is %s,
    If you want default value only if url has some parameter, you can use %s -PageUrlForDefaultValuesList=
    For page that list thirdparties, it is %s,
    If you want default value only if url has some parameter, you can use %s +PageUrlForDefaultValuesCreate=
    Per formulari per crear un nou Tercer, és %s,
    Si voleu un valor per defecte només si la URL conté algun paràmetre, llavors podeu emprar %s +PageUrlForDefaultValuesList=
    Per la plana que enllista els Tercers, és %s,
    Si voleu un valor per defecte només si la URL conté algun paràmetre, llavors podeu emprar %s EnableDefaultValues=Permet l'ús de valors predeterminats personalitzats EnableOverwriteTranslation=Habilita l'ús de la traducció sobreescrita GoIntoTranslationMenuToChangeThis=S'ha trobat una traducció per a la clau amb aquest codi, per tant, per canviar aquest valor, heu d'editar-lo des de Inici-Configuració-Traducció. @@ -464,9 +464,9 @@ Field=Camp ProductDocumentTemplates=Plantilles de documents per generar document de producte FreeLegalTextOnExpenseReports=Text legal lliure en informes de despeses WatermarkOnDraftExpenseReports=Marca d'aigua en informes de despeses esborrany -AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable) -FilesAttachedToEmail=Attach file -SendEmailsReminders=Send agenda reminders by emails +AttachMainDocByDefault=Establiu-lo a 1 si voleu adjuntar el document principal al correu electrònic de manera predeterminada (si escau) +FilesAttachedToEmail=Adjuntar fitxer +SendEmailsReminders=Enviar recordatoris d'agenda per correu electrònic # Modules Module0Name=Usuaris i grups Module0Desc=Gestió d'usuaris / empleats i grups @@ -539,7 +539,7 @@ Module320Desc=Addició de fils d'informació RSS en les pantalles Dolibarr Module330Name=Bookmarks Module330Desc=Gestió de marcadors Module400Name=Projectes/Oportunitats/Leads -Module400Desc=Gestió de projectes, oportunitats o clients potencials. A continuació pots assignar un element (factura, comanda, pressupost, intervenció, ...) a un projecte i obtenir una visió transversal de la vista del projecte. +Module400Desc=Gestió de projectes, oportunitats/leads i/o tasques. Pots asignar també qualsevol element (factura, comanda, pressupost, intervenció...) a un projecte i obtindre una vista transversal del projecte. Module410Name=Webcalendar Module410Desc=Interface amb el calendari webcalendar Module500Name=Pagaments especials @@ -548,9 +548,9 @@ Module510Name=Pagament de salaris dels empleats Module510Desc=Registre i seguiment del pagament dels salaris dels empleats Module520Name=Préstec Module520Desc=Gestió de préstecs -Module600Name=Notifications on business events -Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), to third-party contacts (setup defined on each third party) or to fixed emails -Module600Long=Note that this module is dedicated to send real time emails when a dedicated business event occurs. If you are looking for a feature to send reminders by email of your agenda events, go into setup of module Agenda. +Module600Name=Notificacions sobre events de negoci +Module600Desc=Enviar notificacions per correu (arran de cert esdeveniments de negoci) a usuaris (configuració a establir per a cada usuari), a contactes de tercers (configuració a establir per a cada tercer) o a adreces fixes +Module600Long=Tingueu en compte que aquest mòdul està dedicat a enviar correus electrònics en temps real quan es produeix un esdeveniment de negoci dedicat. Si cerqueu una característica per enviar recordatoris per correu electrònic dels esdeveniments de l'agenda, aneu a la configuració del mòdul Agenda. Module700Name=Donacions Module700Desc=Gestió de donacions Module770Name=Informes de despeses @@ -568,7 +568,7 @@ Module2000Desc=Permet editar algunes àrees de text utilitzant un editor avança Module2200Name=Multi-preus Module2200Desc=Activar l'ús d'expressions matemàtiques per als preus Module2300Name=Tasques programades -Module2300Desc=Scheduled jobs management (alias cron or chrono table) +Module2300Desc=Gestió de tasques programades (alias cron o taula chrono) Module2400Name=Esdeveniments/Agenda Module2400Desc=Segueix els esdeveniments realitzats o propers. Permet a l'aplicació registrar esdeveniments automàtics per seguiment o registra manualment els esdeveniments o cites. Module2500Name=Gestió Electrònica de Documents @@ -589,23 +589,23 @@ Module3100Desc=Afegeix un botó d'Skype a les fitxes dels usuaris / tercers / co Module3200Name=Registres no reversibles Module3200Desc=Activa el registre d'alguns esdeveniments de negoci en un registre no reversible. Els esdeveniments s'arxiven en temps real. El registre és una taula d'esdeveniments encadenats que es pot llegir i exportar. Aquest mòdul pot ser obligatori per a alguns països. Module4000Name=RRHH -Module4000Desc=Human resources management (management of department, employee contracts and feelings) +Module4000Desc=Gestió de recursos humans (gestionar departaments, empleats, contractes i "feelings") Module5000Name=Multi-empresa Module5000Desc=Permet gestionar diverses empreses Module6000Name=Workflow Module6000Desc=Gestió Workflow Module10000Name=Pàgines web -Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name. +Module10000Desc=Crear un portal web amb un editor WYSIWG. Només heu de configurar el vostre servidor web (Apache, Nginx, ...) per apuntar al directori dedicat de Dolibarr per tenir-ho publicat en línia amb el vostre propi domini. Module20000Name=Dies lliures Module20000Desc=Gestió dels dies lliures dels empleats Module39000Name=Lots de productes Module39000Desc=Gestió de lots o series, dates de caducitat i venda dels productes Module50000Name=PayBox -Module50000Desc=Module to offer an online payment page accepting payments with Credit/Debit card via PayBox. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...) +Module50000Desc=Mòdul per oferir una plana de pagament en línia, acceptant pagaments amb targeta de dèbit/crèdit via PayBox. Pot ser emprat per permetre als vostres clients fer pagaments lliures o bé per pagar algun objecte particular del Dolibarr (factura, comanda, etc...) Module50100Name=TPV Module50100Desc=Mòdul Terminal Punt Venda (TPV) Module50200Name=Paypal -Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...) +Module50200Desc=Mòdul per oferir una pàgina de pagament en línia que accepti pagaments mitjançant PayPal (targeta de crèdit o amb crèdit PayPal). Això es pot utilitzar per permetre als vostres clients fer pagaments lliures o el pagament d'un objecte particular de Dolibarr (factura, comanda, ...) Module50400Name=Comptabilitat (avançat) Module50400Desc=Gestió comptable (entrades dobles, suport a llibres major i auxiliar) Module54000Name=PrintIPP @@ -884,13 +884,13 @@ DictionaryTypeContact=Tipus de contactes/adreces DictionaryEcotaxe=Barems CEcoParticipación (DEEE) DictionaryPaperFormat=Formats paper DictionaryFormatCards=Formats de fitxes -DictionaryFees=Expense report - Types of expense report lines +DictionaryFees=Informe de despeses - Tipus de línies d'informe de despeses DictionarySendingMethods=Mètodes d'expedició DictionaryStaff=Empleats DictionaryAvailability=Temps de lliurament DictionaryOrderMethods=Mètodes de comanda DictionarySource=Orígens de pressupostos/comandes -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Models de plans comptables DictionaryAccountancyJournal=Diari de comptabilitat DictionaryEMailTemplates=Models d'emails @@ -898,12 +898,13 @@ DictionaryUnits=Unitats DictionaryProspectStatus=Estat del client potencial DictionaryHolidayTypes=Tipus de dies lliures DictionaryOpportunityStatus=Estat de l'oportunitat pel projecte/lead -DictionaryExpenseTaxCat=Expense report - Transportation categories -DictionaryExpenseTaxRange=Expense report - Range by transportation category +DictionaryExpenseTaxCat=Informe de despeses - Categories de transport +DictionaryExpenseTaxRange=Informe de despeses - Rang per categoria de transport SetupSaved=Configuració desada SetupNotSaved=Configuració no desada BackToModuleList=Retornar llista de mòduls BackToDictionaryList=Tornar a la llista de diccionaris +TypeOfRevenueStamp=Tipus timbre fiscal 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, asigna IVA per defecte a 0. Final de regla.
    Si el país del venedor=país del comprador, asigna per defecte el IVA del producte en el país venut. Final de regla.
    Si el venedor i comprador resideixen a la Comunitat Europea i els béns venuts són productes de transport (cotxe, vaixell, avió), asigna IVA per defecte a 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 el comprador no és una empresa, asigna per defecte l'IVA del producte venut. Final de regla.
    Si el venedor i comprador resideixen a la Comunitat Europea i el comprador és una empresa, asigna per defecte l'IVA 0 Final de regla.
    En qualsevol altre cas l'IVA proposat per defecte és 0. Final de regla. VATIsNotUsedDesc=El tipus d'IVA proposat per defecte és 0. Aquest és el cas d'associacions, particulars o algunes petites societats. @@ -949,7 +950,7 @@ Offset=Decàleg AlwaysActive=Sempre actiu Upgrade=Actualització MenuUpgrade=Actualització / Extensió -AddExtensionThemeModuleOrOther=Deploy/install external app/module +AddExtensionThemeModuleOrOther=Instal·lar mòduls/complements externs WebServer=Servidor web DocumentRootServer=Carpeta arrel de les pàgines web DataRootServer=Carpeta arrel dels arxius de dades @@ -1046,7 +1047,7 @@ SystemInfoDesc=La informació del sistema és informació tècnica accessible no SystemAreaForAdminOnly=Aquesta àrea només és accessible als usuaris de tipus administradors. Cap permís Dolibarr permet estendre el cercle de usuaris autoritzats a aquesta áera. CompanyFundationDesc=Edita en aquesta pàgina tota la informació coneguda sobre l'empresa o entitat a administrar (Fes clic al botó "Modificar" o "Desar" a peu de pàgina) DisplayDesc=Selecciona els paràmetres relacionats amb l'aparença de Dolibarr -AvailableModules=Available app/modules +AvailableModules=Mòduls/complements disponibles ToActivateModule=Per activar els mòduls, aneu a l'àrea de Configuració (Inici->Configuració->Mòduls). SessionTimeOut=Timeout de sesions SessionExplanation=Assegura que el període de sessions no expirarà abans d'aquest moment. Tanmateix, la gestió del període de sessions de PHP no garanteix que el període de sessions expirar després d'aquest període: Aquest serà el cas si un sistema de neteja del cau de sessions és actiu.
    Nota: Sense mecanisme especial, el mecanisme intern per netejar el període de sessions de PHP tots els accessos %s /%s, però només al voltant de l'accés d'altres períodes de sessions. @@ -1094,11 +1095,11 @@ ShowProfIdInAddress=Mostrar l'identificador professional en les direccions dels ShowVATIntaInAddress=Oculta el NIF intracomunitari en les direccions dels documents TranslationUncomplete=Traducció parcial MAIN_DISABLE_METEO=Deshabilitar la vista meteo -MeteoStdMod=Standard mode -MeteoStdModEnabled=Standard mode enabled -MeteoPercentageMod=Percentage mode -MeteoPercentageModEnabled=Percentage mode enabled -MeteoUseMod=Click to use %s +MeteoStdMod=Mode estàndard +MeteoStdModEnabled=Mode estàndard habilitat +MeteoPercentageMod=Mode percentual +MeteoPercentageModEnabled=Mode de percentatge activat +MeteoUseMod=Prèmer per utilitzar %s TestLoginToAPI=Comprovar connexió a l'API ProxyDesc=Algunes de les característiques de Dolibarr requereixen que el servidor tingui accés a Internet. Definiu aquí els paràmetres per a aquest accés. Si el servidor està darrere d'un proxy, aquests paràmetres s'indiquen a Dolibarr com passar-ho. ExternalAccess=Accés extern @@ -1110,7 +1111,7 @@ MAIN_PROXY_PASS=Contrasenya del servidor proxy DefineHereComplementaryAttributes=Defineix tots els atributs complementaris, no disponibles per defecte, que vols gestionar per %s. ExtraFields=Atributs complementaris ExtraFieldsLines=Atributs complementaris (línies) -ExtraFieldsLinesRec=Complementary attributes (templates invoices lines) +ExtraFieldsLinesRec=Atributs complementaris (línies de plantilles de factures) ExtraFieldsSupplierOrdersLines=Atributs complementaris (línies de comanda) ExtraFieldsSupplierInvoicesLines=Atributs complementaris (línies de factura) ExtraFieldsThirdParties=Atributs complementaris (tercers) @@ -1118,7 +1119,7 @@ ExtraFieldsContacts=Atributs complementaris (contactes/adreçes) ExtraFieldsMember=Atributs complementaris (soci) ExtraFieldsMemberType=Atributs complementaris (tipus de socis) ExtraFieldsCustomerInvoices=Atributs complementaris (factures) -ExtraFieldsCustomerInvoicesRec=Complementary attributes (templates invoices) +ExtraFieldsCustomerInvoicesRec=Atributs complementaris (plantilles de factura) ExtraFieldsSupplierOrders=Atributs complementaris (comandes) ExtraFieldsSupplierInvoices=Atributs complementaris (factures) ExtraFieldsProject=Atributs complementaris (projectes) @@ -1132,7 +1133,7 @@ SendmailOptionMayHurtBuggedMTA=La funcionalitat d'enviar correus electrònics a TranslationSetup=Configuració de traducció TranslationKeySearch=Cerca una clau o cadena de traducció TranslationOverwriteKey=Sobreescriu una cadena de traducció -TranslationDesc=How to set displayed application language :
    * Systemwide: menu Home - Setup - Display
    * Per user: Use the User display setup tab on user card (click on username at the top of the screen). +TranslationDesc=Com configurar l'idioma de visualització de l'aplicació:
    * Sistema: menú Inici - Configuració - Entorn
    * Per usuari: utilitzeu la pestanya Configuració de l'entorn d'usuari a la pestanya d'usuari (feu clic al nom d'usuari a la part superior de la pantalla). TranslationOverwriteDesc=També pot reemplaçar cadenes omplint la taula següent. Triï el seu idioma a la llista desplegable "%s", inserta la clau de la traducció a "%s" i la seva nova traducció a "%s" TranslationOverwriteDesc2=Podeu utilitzar un altra pestanya per ajudar a saber quina clau de conversió utilitzar TranslationString=Cadena de traducció @@ -1178,7 +1179,7 @@ HRMSetup=Configuració de mòdul de gestió de recursos humans ##### Company setup ##### CompanySetup=Configuració del mòdul empreses CompanyCodeChecker=Mòdul de generació i control dels codis de tercers (clients/proveïdors) -AccountCodeManager=Module for accounting code generation (customer or supplier) +AccountCodeManager=Mòdul per generació de codis comptables (clients o proveïdors) NotificationsDesc=La funció de les notificacions permet enviar automàticament un e-mail per alguns esdeveniments de Dolibarr. Els destinataris de les notificacions poden definir-se: NotificationsDescUser=* per usuaris, un usuari cada vegada NotificationsDescContact=* per contactes de tercers (clients o proveïdors), un contacte cada vegada @@ -1253,7 +1254,7 @@ MemberMainOptions=Opcions principals AdherentLoginRequired= Gestiona un compte d'usuari per a cada soci AdherentMailRequired=E-Mail obligatori per crear un nou soci MemberSendInformationByMailByDefault=Casella de verificació per enviar un missatge de confirmació als socis (validació o nova subscripció) activada per defecte -VisitorCanChooseItsPaymentMode=Visitor can choose among available payment modes +VisitorCanChooseItsPaymentMode=El visitant pot triar entre els modes de pagament disponibles ##### LDAP setup ##### LDAPSetup=Configuració de LDAP LDAPGlobalParameters=Paràmetres globals @@ -1271,7 +1272,7 @@ LDAPSynchronizeUsers=Organització dels usuaris a LDAP LDAPSynchronizeGroups=Organització dels grups a LDAP LDAPSynchronizeContacts=Organització dels contactes a LDAP LDAPSynchronizeMembers=Organització dels socis de l'entitat en LDAP -LDAPSynchronizeMembersTypes=Organization of foundation's members types in LDAP +LDAPSynchronizeMembersTypes=Organització dels tipus de membres de la fundació a LDAP LDAPPrimaryServer=Servidor primari LDAPSecondaryServer=Servidor secundari LDAPServerPort=Port del servidor @@ -1295,7 +1296,7 @@ LDAPDnContactActive=Sincronització de contactes LDAPDnContactActiveExample=Sincronització activada/desactivada LDAPDnMemberActive=Sincronització de socis LDAPDnMemberActiveExample=Sincronització activada/desactivada -LDAPDnMemberTypeActive=Members types' synchronization +LDAPDnMemberTypeActive=Sincronització de tipus de membres LDAPDnMemberTypeActiveExample=Sincronització activada/desactivada LDAPContactDn=DN dels contactes Dolibarr LDAPContactDnExample=DN complet (ej: ou=contacts,dc=example,dc=com) @@ -1303,8 +1304,8 @@ LDAPMemberDn=DN dels socis de Dolibarr LDAPMemberDnExample=DN complet (ex: ou=members,dc=example,dc=com) LDAPMemberObjectClassList=Llista de objectClass LDAPMemberObjectClassListExample=Llista de ObjectClass que defineixen els atributs d'un registre (ex: top, inetorgperson o top, user for active directory) -LDAPMemberTypeDn=Dolibarr members types DN -LDAPMemberTypepDnExample=Complete DN (ex: ou=memberstypes,dc=example,dc=com) +LDAPMemberTypeDn=Tipus de membres de Dolibarr DN +LDAPMemberTypepDnExample=DN complet (ex: ou=memberstypes,dc=example,dc=com) LDAPMemberTypeObjectClassList=Llista de objectClass LDAPMemberTypeObjectClassListExample=Llista de ObjectClass que defineixen els atributs d'un registre (ex: top, groupOfUniqueNames) LDAPUserObjectClassList=Llista de objectClass @@ -1318,7 +1319,7 @@ LDAPTestSynchroContact=Provar la sincronització de contactes LDAPTestSynchroUser=Provar la sincronització d'usuaris LDAPTestSynchroGroup=Provar la sincronització de grups LDAPTestSynchroMember=Prova la sincronització de socis -LDAPTestSynchroMemberType=Test member type synchronization +LDAPTestSynchroMemberType=Prova la sincronització del tipus de membre LDAPTestSearch= Provar una recerca LDAP LDAPSynchroOK=Prova de sincronització realitzada correctament LDAPSynchroKO=Prova de sincronització errònia @@ -1384,7 +1385,7 @@ LDAPDescContact=Aquesta pàgina permet definir el nom dels atributs de l'arbre L LDAPDescUsers=Aquesta pàgina permet definir el nom dels atributs de l'arbre LDAP per a cada informació dels usuaris Dolibarr. LDAPDescGroups=Aquesta pàgina permet definir el nom dels atributs de l'arbre LDAP per a cada informació dels grups usuaris Dolibarr. LDAPDescMembers=Aquesta pàgina permet definir el nom dels atributs LDAP de l'arbre per a cada informació trobada en el mòdul de Socis de Dolibarr. -LDAPDescMembersTypes=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members types. +LDAPDescMembersTypes=Aquesta pàgina us permet definir el nom d'atributs LDAP a l'arbre LDAP per a cada dada que es troba als tipus de membres de Dolibarr. LDAPDescValues=Els valors d'exemples s'adapten a OpenLDAP amb els schemas carregats: core.schema, cosine.schema, inetorgperson.schema ). Si vostè utilitza els a valors suggerits i OpenLDAP, modifiqui el seu fitxer de configuració LDAP slapd.conf per a tenir tots aquests schemas actius. ForANonAnonymousAccess=Per un accés autentificat PerfDolibarr=Configuració rendiment/informe d'optimització @@ -1408,7 +1409,7 @@ CompressionOfResources=Compressió de les respostes HTTP CompressionOfResourcesDesc=Per exemple, utilitzant la directiva Apache "AddOutputFilterByType DEFLATE" TestNotPossibleWithCurrentBrowsers=La detecció automàtica no és possible amb els navegadors actuals DefaultValuesDesc=Pots definir/forçar aquí el valor predeterminat que vols obtenir quan crees un registre nou, i/o filtres predeterminats o ordenació quan el teu llistat es registri. -DefaultCreateForm=Default values (on forms to create) +DefaultCreateForm=Valors per defecte (en formularis a crear) DefaultSearchFilters=Filtres de cerca per defecte DefaultSortOrder=Tipus d'ordenació per defecte DefaultFocus=Camps d'enfocament per defecte @@ -1547,20 +1548,20 @@ Buy=Compra Sell=Venda InvoiceDateUsed=Data utilitzada de factura YourCompanyDoesNotUseVAT=L'empresa s'ha configurat com a no subjecta a IVA (Inici - Configuració - Empresa/Organització), per tant no hi ha opcions per configurar l'IVA. -AccountancyCode=Accounting Code +AccountancyCode=Codi comptable AccountancyCodeSell=Codi comptable vendes AccountancyCodeBuy=Codi comptable compres ##### Agenda ##### 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 -> Dictionaries -> Type of agenda events) +AGENDA_USE_EVENT_TYPE=Utilitzar tipus d'events (gestionables a Configuració -> Diccionaris -> Tipus d'events d'agenda) AGENDA_USE_EVENT_TYPE_DEFAULT=Defineix automàticament aquest valor per defecte pels tipus d'events en el formulari de creació d'events AGENDA_DEFAULT_FILTER_TYPE=Establir per defecte aquest tipus d'esdeveniment en el filtre de cerca en la vista de la agenda AGENDA_DEFAULT_FILTER_STATUS=Establir per defecte aquest estat de esdeveniments en el filtre de cerca en la vista de la agenda AGENDA_DEFAULT_VIEW=Establir la pestanya per defecte al seleccionar el menú Agenda -AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). Note: Module %s must be enabled and correctly setup to have reminder sent at the correct frequency. -AGENDA_REMINDER_BROWSER=Enable event reminder on users browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_EMAIL=Activar el recordatori d'esdeveniments per correu electrònic (es pot definir l'opció retard en cada esdeveniment). Nota: el mòdul %s ha d'estar habilitat i configurat correctament per tenir un recordatori enviat amb la freqüència correcta. +AGENDA_REMINDER_BROWSER=Habilitar un recordatori d'esdeveniment al navegador dels usuaris (quan s'arribi a la data de l'esdeveniment, cada usuari pot rebutjar aquests recordatoris quan li demani confirmació el navegador) AGENDA_REMINDER_BROWSER_SOUND=Habilita les notificacions sonores AGENDA_SHOW_LINKED_OBJECT=Mostra l'objecte vinculat a la vista d'agenda ##### Clicktodial ##### @@ -1628,7 +1629,7 @@ ProjectsSetup=Configuració del mòdul Projectes ProjectsModelModule=Model de document per a informes de projectes TasksNumberingModules=Mòdul numeració de tasques TaskModelModule=Mòdul de documents informes de tasques -UseSearchToSelectProject=Wait you press a key before loading content of project combo list (This may increase performance if you have a large number of project, but it is less convenient) +UseSearchToSelectProject=S'espera a que premeu al menys una tecla per carregar el contingut de la llista desplegable de Projecte (Això incrementa el rendiment en el cas de que hi hagi un nombre llarg de projectes, però és menys convenient) ##### ECM (GED) ##### ##### Fiscal Year ##### AccountingPeriods=Períodes comptables @@ -1653,9 +1654,9 @@ TypePaymentDesc=0:Forma de pagament a client, 1:Forma de pagament a proveïdor, IncludePath=Incloure ruta (que es defineix a la variable %s) ExpenseReportsSetup=Configuració del mòdul Informe de Despeses TemplatePDFExpenseReports=Mòdels de documentació per generar informes de despeses -ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index -ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules -ExpenseReportNumberingModules=Expense reports numbering module +ExpenseReportsIkSetup=Configurar mòdul Informe de despeses - Índex milles +ExpenseReportsRulesSetup=Configurar mòdul Informes de despeses - Regles +ExpenseReportNumberingModules=Número del mòdul Informe de despeses NoModueToManageStockIncrease=No esta activat el mòdul per gestionar automàticament l'increment d'estoc. L'increment d'estoc es realitzara només amb l'entrada manual YouMayFindNotificationsFeaturesIntoModuleNotification=Pot trobar opcions per notificacions d'e-mail activant i configurant el mòdul "Notificacions" ListOfNotificationsPerUser=Llista de notificacions per usuari* @@ -1689,14 +1690,14 @@ UnicodeCurrency=Introduïu aquí entre claus, la llista de nombre de bytes que r ColorFormat=El color RGB es troba en format HEX, per exemple: FF0000 PositionIntoComboList=Posició de la línia en llistes combo SellTaxRate=Valor de l'IVA -RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases. +RecuperableOnly=Sí per l'IVA "No percebut sinó recuperable" dedicat per a algun estat a França. Manteniu el valor "No" en tots els altres casos. UrlTrackingDesc=Si el proveïdor o el servei de transport ofereixen una pàgina o un lloc web per comprovar l'estat del teu enviament , pots entrar aquí. Pots utilitzar la tecla {TrackID} en els paràmetres d'URL perquè el sistema ho reemplaçarà amb el valor del número de seguiment de l'usuari utilitzat en la targeta d'embarcament. OpportunityPercent=Quan crees una oportunitat, es defineix un import estimat de projecte. D'acord a l'estat de l'oportunitat, aquest import es pot multiplicar per aquest taxa per avaluar l'import global eventual per totes les oportunitats que es poden generar. El valor és un percentatge (entre o i 100). TemplateForElement=Aquest registre de plantilla es dedica a quin element TypeOfTemplate=Tipus de plantilla TemplateIsVisibleByOwnerOnly=La plantilla és visible només pel propietari -VisibleEverywhere=Visible everywhere -VisibleNowhere=Visible nowhere +VisibleEverywhere=Visible arreu +VisibleNowhere=Visible enlloc FixTZ=Fixar zona horaria FillFixTZOnlyIfRequired=Exemple: +2 (omple'l només si tens problemes) ExpectedChecksum=Checksum esperat @@ -1712,8 +1713,8 @@ MailToSendSupplierOrder=Enviar comanda de proveïdor MailToSendSupplierInvoice=Enviar factura de proveïdor MailToSendContract=Per a enviar un contracte MailToThirdparty=Per enviar correu electrònic des de la pàgina del tercer -MailToMember=To send email from member page -MailToUser=To send email from user page +MailToMember=Enviar correu electrònic des de la pàgina del membre +MailToUser=Enviar correu electrònic des de la pàgina d'usuari ByDefaultInList=Mostra per defecte en la vista del llistat YouUseLastStableVersion=Estàs utilitzant l'última versió estable TitleExampleForMajorRelease=Exemple de missatge que es pot utilitzar per anunciar aquesta actualització de versió (ets lliure d'utilitzar-ho a les teves webs) @@ -1724,13 +1725,13 @@ MultiPriceRuleDesc=Quan l'opció "Varis nivells de preus per producte/servei" es ModelModulesProduct=Plantilles per documents de productes ToGenerateCodeDefineAutomaticRuleFirst=Per poder generar codis automàticament, primer has de definir un responsable de autodefinir els números del codi de barres. SeeSubstitutionVars=Veure * nota per llistat de possibles variables de substitució -SeeChangeLog=See ChangeLog file (english only) +SeeChangeLog=Veure el fitxer ChangeLog (només en anglès) AllPublishers=Tots els publicadors UnknownPublishers=Publicadors desconeguts AddRemoveTabs=Afegeix o elimina pestanyes -AddDataTables=Add object tables -AddDictionaries=Add dictionaries tables -AddData=Add objects or dictionaries data +AddDataTables=Afegir taules d'objecte +AddDictionaries=Afegir taules de diccionari +AddData=Afegir objectes o dades de diccionari AddBoxes=Afegeix panells AddSheduledJobs=Afegeix tasques programades AddHooks=Afegeix hooks @@ -1756,12 +1757,13 @@ BaseCurrency=Moneda de referència de l'empresa (entra a la configuració de l'e WarningNoteModuleInvoiceForFrenchLaw=Aquest mòdul %s compleix les lleis franceses (Loi Finance 2016). WarningNoteModulePOSForFrenchLaw=Aquest mòdul %s compleix les lleis franceses (Loi Finance 2016) perquè el mòdul Non Reversible Logs s'ha activat automàticament. WarningInstallationMayBecomeNotCompliantWithLaw=Intenta instal·lar el mòdul %s que és un mòdul extern. Activar un mòdul extern significa que confia en l'editor del mòdul i està segur que aquest mòdul no alterarà negativament el comportament de la seva aplicació i compleix les lleis del seu país (%s). Si el mòdul ofereix una característica no legal, es fa responsable de l'ús d'un software il·legal. -MAIN_PDF_MARGIN_LEFT=Left margin on PDF -MAIN_PDF_MARGIN_RIGHT=Right margin on PDF -MAIN_PDF_MARGIN_TOP=Top margin on PDF -MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF +MAIN_PDF_MARGIN_LEFT=Marge esquerre al PDF +MAIN_PDF_MARGIN_RIGHT=Marge dret al PDF +MAIN_PDF_MARGIN_TOP=Marge superior al PDF +MAIN_PDF_MARGIN_BOTTOM=Marge inferior al PDF ##### Resource #### ResourceSetup=Configuració del mòdul Recurs UseSearchToSelectResource=Utilitza un formulari de cerca per a seleccionar un recurs (millor que una llista desplegable) DisabledResourceLinkUser=Recurs d'enllaç a usuari deshabilitat DisabledResourceLinkContact=Recurs d'enllaç a contacte deshabilitat +ConfirmUnactivation=Confirma el restabliment del mòdul diff --git a/htdocs/langs/ca_ES/agenda.lang b/htdocs/langs/ca_ES/agenda.lang index ec940e6cd5d..f5ed7d7f921 100644 --- a/htdocs/langs/ca_ES/agenda.lang +++ b/htdocs/langs/ca_ES/agenda.lang @@ -12,7 +12,7 @@ Event=Esdeveniment Events=Esdeveniments EventsNb=Nombre d'esdeveniments ListOfActions=Llista d'esdeveniments -EventReports=Event reports +EventReports=Informes d'esdeveniments Location=Localització ToUserOfGroup=A qualsevol usuari del grup EventOnFullDay=Esdeveniment per tot el dia @@ -35,7 +35,7 @@ AgendaAutoActionDesc= Defineix aqui els esdeveniments pels que vols que Dolibarr AgendaSetupOtherDesc= Aquesta pàgina permet configurar algunes opcions que permeten exportar una vista de la seva agenda Dolibar a un calendari extern (thunderbird, google calendar, ...) AgendaExtSitesDesc=Aquesta pàgina permet configurar calendaris externs per a la seva visualització en l'agenda de Dolibarr. ActionsEvents=Esdeveniments per a què Dolibarr crei una acció de forma automàtica -EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into Agenda module setup. +EventRemindersByEmailNotEnabled=Els recordatoris d'esdeveniments per correu electrònic no estaven habilitats en la configuració del mòdul d'Agenda. ##### Agenda event labels ##### NewCompanyToDolibarr=Tercer %s creat ContractValidatedInDolibarr=Contracte %s validat @@ -67,7 +67,7 @@ OrderApprovedInDolibarr=Comanda %s aprovada OrderRefusedInDolibarr=Comanda %s rebutjada OrderBackToDraftInDolibarr=Comanda %s tornada a estat esborrany ProposalSentByEMail=Pressupost %s enviat per e-mail -ContractSentByEMail=Contract %s sent by EMail +ContractSentByEMail=Enviat per correu electrònic el contracte %s OrderSentByEMail=Comanda de client %s enviada per e-mail InvoiceSentByEMail=Factura a client %s enviada per e-mail SupplierOrderSentByEMail=Comanda a proveïdor %s enviada per e-mail @@ -81,14 +81,14 @@ InvoiceDeleted=Factura esborrada PRODUCT_CREATEInDolibarr=Producte %s creat PRODUCT_MODIFYInDolibarr=Producte %s modificat PRODUCT_DELETEInDolibarr=Producte %s eliminat -EXPENSE_REPORT_CREATEInDolibarr=Expense report %s created -EXPENSE_REPORT_VALIDATEInDolibarr=Expense report %s validated -EXPENSE_REPORT_APPROVEInDolibarr=Expense report %s approved -EXPENSE_REPORT_DELETEInDolibarr=Expense report %s deleted -EXPENSE_REPORT_REFUSEDInDolibarr=Expense report %s refused +EXPENSE_REPORT_CREATEInDolibarr=Creat l'informe de despeses %s +EXPENSE_REPORT_VALIDATEInDolibarr=S'ha validat l'informe de despeses %s +EXPENSE_REPORT_APPROVEInDolibarr=Aprovat l'informe de despeses %s +EXPENSE_REPORT_DELETEInDolibarr=Esborrat l'informe de despeses %s +EXPENSE_REPORT_REFUSEDInDolibarr=Rebutjat l'informe de despeses %s PROJECT_CREATEInDolibarr=Projecte %s creat PROJECT_MODIFYInDolibarr=Projecte %s modificat -PROJECT_DELETEInDolibarr=Project %s deleted +PROJECT_DELETEInDolibarr=S'ha eliminat el projecte %s ##### End agenda events ##### AgendaModelModule=Plantilles de documents per esdeveniments DateActionStart=Data d'inici diff --git a/htdocs/langs/ca_ES/banks.lang b/htdocs/langs/ca_ES/banks.lang index 12366629ccd..16cff4fdc56 100644 --- a/htdocs/langs/ca_ES/banks.lang +++ b/htdocs/langs/ca_ES/banks.lang @@ -2,7 +2,7 @@ Bank=Banc MenuBankCash=Bancs/Caixes MenuVariousPayment=Pagaments varis -MenuNewVariousPayment=New Miscellaneous payment +MenuNewVariousPayment=Pagament extra nou BankName=Nom del banc FinancialAccount=Compte BankAccount=Compte bancari @@ -89,6 +89,7 @@ AccountIdShort=Número LineRecord=Registre AddBankRecord=Afegir registre AddBankRecordLong=Afegir registre manualment +Conciliated=Conciliat ConciliatedBy=Conciliat per DateConciliating=Data conciliació BankLineConciliated=Registre conciliat @@ -157,6 +158,6 @@ NewVariousPayment=Nou pagament varis VariousPayment=Pagaments varis VariousPayments=Pagaments varis ShowVariousPayment=Mostra els pagaments varis -AddVariousPayment=Add miscellaneous payments -YourSEPAMandate=Your SEPA mandate -FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to +AddVariousPayment=Afegir pagaments extres +YourSEPAMandate=La vostra ordre SEPA +FindYourSEPAMandate=Aquest és la vostra ordre SEPA per autoritzar a la nostra empresa a realitzar un ordre de dèbit directe al vostre banc. Gràcies per retornar-la signada (escanejar el document signat) o envieu-lo per correu a diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang index e9ace42de25..09cd4e9702c 100644 --- a/htdocs/langs/ca_ES/bills.lang +++ b/htdocs/langs/ca_ES/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s BillsLate=Retard en el pagament BillsStatistics=Estadístiques factures a clients BillsStatisticsSuppliers=Estadístiques factures de proveïdors +DisabledBecauseDispatchedInBookkeeping=Desactivat perquè la factura s'ha contabilitzat +DisabledBecauseNotLastInvoice=Desactivat perque la factura no es pot eliminar. S'han creat factures després d'aquesta i crearia buits al contador. DisabledBecauseNotErasable=Desactivat perque no es pot eliminar InvoiceStandard=Factura estàndard InvoiceStandardAsk=Factura estàndard @@ -149,19 +151,19 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Error, no és possible cancel·l BillFrom=Emissor BillTo=Enviar a ActionsOnBill=Eventos sobre la factura -RecurringInvoiceTemplate=Template / Recurring invoice +RecurringInvoiceTemplate=Plantilla / Factura recurrent NoQualifiedRecurringInvoiceTemplateFound=No s'ha qualificat cap plantilla de factura recurrent per generar-se. FoundXQualifiedRecurringInvoiceTemplate=S'ha trobat la plantilla de factura/es recurrent %s qualificada per generar-se. NotARecurringInvoiceTemplate=No és una plantilla de factura recurrent NewBill=Nova factura LastBills=Últimes %s factures -LatestTemplateInvoices=Latest %s template invoices -LatestCustomerTemplateInvoices=Latest %s customer template invoices -LatestSupplierTemplateInvoices=Latest %s supplier template invoices +LatestTemplateInvoices=Últimes %s plantilles de factura +LatestCustomerTemplateInvoices=Últimes %s plantilles de factures de client +LatestSupplierTemplateInvoices=Darreres %s plantilles de factures de proveïdor LastCustomersBills=Últimes %s factures de client LastSuppliersBills=Últimes %s factures de proveïdor AllBills=Totes les factures -AllCustomerTemplateInvoices=All template invoices +AllCustomerTemplateInvoices=Totes les plantilles de factura OtherBills=Altres factures DraftBills=Esborranys de factures CustomersDraftInvoices=Esborranys de factures de client @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Per quina raó vols classificar aquesta factura com 'a ConfirmClassifyPaidPartially=Està segur de voler classificar la factura %s com pagada? ConfirmClassifyPaidPartiallyQuestion=Aquesta factura no ha estat totalment pagada. Per què vol classificar-la com a pagada? ConfirmClassifyPaidPartiallyReasonAvoir=La resta a pagar (%s %s) és un descompte atorgat perquè el pagament es va fer abans de temps. Regularitzo l'IVA d'aquest descompte amb un abonament. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=La resta a pagar (%s %s) és un descompte acordat després de la facturació. Accepto perdre l'IVA d'aquest descompte ConfirmClassifyPaidPartiallyReasonDiscountVat=La resta a pagar (%s %s) és un descompte atorgat perquè el pagament es va fer abans de temps. Recupero l'IVA d'aquest descompte, sense un abonament. ConfirmClassifyPaidPartiallyReasonBadCustomer=Client morós @@ -233,7 +236,7 @@ SendReminderBillByMail=Envia recordatori per e-mail RelatedCommercialProposals=Pressupostos relacionats RelatedRecurringCustomerInvoices=Factures recurrents de client relacionades MenuToValid=A validar -DateMaxPayment=Payment due on +DateMaxPayment=Pagament vençut DateInvoice=Data facturació DatePointOfTax=Punt d'impostos NoInvoice=Cap factura @@ -331,15 +334,15 @@ ListOfNextSituationInvoices=Llista de factures de situació següents FrequencyPer_d=Cada %s dies FrequencyPer_m=Cada %s mesos FrequencyPer_y=Cada %s anys -FrequencyUnit=Frequency unit -toolTipFrequency=Examples:
    Set 7, Day: give a new invoice every 7 days
    Set 3, Month: give a new invoice every 3 month +FrequencyUnit=Unitat de freqüència +toolTipFrequency=Exemples:
    Set 7, Day: donar una factura nova cada 7 dies
    Set 3, Month: donar una factura nova cada 3 mesos NextDateToExecution=Data de la propera generació de factures -NextDateToExecutionShort=Date next gen. +NextDateToExecutionShort=Data següent gen. DateLastGeneration=Data de l'última generació -DateLastGenerationShort=Date latest gen. +DateLastGenerationShort=Data última gen. MaxPeriodNumber=Nº màxim de generació de factures NbOfGenerationDone=Nº de generació de factura ja realitzat -NbOfGenerationDoneShort=Nb of generation done +NbOfGenerationDoneShort=Nb de generació fet MaxGenerationReached=Nº màxim de generacions assollit InvoiceAutoValidate=Valida les factures automàticament GeneratedFromRecurringInvoice=Generat des de la plantilla de factura recurrent %s @@ -347,7 +350,7 @@ DateIsNotEnough=Encara no s'ha arribat a la data InvoiceGeneratedFromTemplate=La factura %s s'ha generat des de la plantilla de factura recurrent %s WarningInvoiceDateInFuture=Alerta, la data de factura és major que la data actual WarningInvoiceDateTooFarInFuture=Alerta, la data de factura és molt antiga respecte la data actual -ViewAvailableGlobalDiscounts=View available discounts +ViewAvailableGlobalDiscounts=Veure descomptes disponibles # PaymentConditions Statut=Estat PaymentConditionShortRECEP=A la recepció @@ -514,6 +517,6 @@ DeleteRepeatableInvoice=Elimina la factura recurrent ConfirmDeleteRepeatableInvoice=Vols eliminar la plantilla de factura? CreateOneBillByThird=Crea una factura per tercer (per la resta, una factura per comanda) BillCreated=%s càrrec(s) creats -StatusOfGeneratedDocuments=Status of document generation -DoNotGenerateDoc=Do not generate document file -AutogenerateDoc=Auto generate document file +StatusOfGeneratedDocuments=Estat de la generació de documents +DoNotGenerateDoc=No generar cap fitxer de document +AutogenerateDoc=Genera automàticament el fitxer del document diff --git a/htdocs/langs/ca_ES/commercial.lang b/htdocs/langs/ca_ES/commercial.lang index a8e740d859f..4135dceebce 100644 --- a/htdocs/langs/ca_ES/commercial.lang +++ b/htdocs/langs/ca_ES/commercial.lang @@ -71,9 +71,9 @@ Stats=Estadístiques de venda StatusProsp=Estat del pressupost DraftPropals=Pressupostos esborrany NoLimit=Sense límit -ToOfferALinkForOnlineSignature=Link for online signature -WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s -ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal -ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse -SignatureProposalRef=Signature of quote/commerical proposal %s -FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled +ToOfferALinkForOnlineSignature=Enllaç per a la signatura en línia +WelcomeOnOnlineSignaturePage=Benvingut a la pàgina per acceptar propostes comercials de %s +ThisScreenAllowsYouToSignDocFrom=Aquesta pantalla us permet acceptar i signar, o rebutjar, una cotització / proposta comercial +ThisIsInformationOnDocumentToSign=Es tracta d'informació sobre el document per acceptar o rebutjar +SignatureProposalRef=Signatura de pressupost / proposta comercial %s +FeatureOnlineSignDisabled=La funcionalitat de signatura en línia estava desactivada o bé el document va ser generat abans que fos habilitada la funció diff --git a/htdocs/langs/ca_ES/companies.lang b/htdocs/langs/ca_ES/companies.lang index 9552e2dcddd..17f21e97c2d 100644 --- a/htdocs/langs/ca_ES/companies.lang +++ b/htdocs/langs/ca_ES/companies.lang @@ -29,7 +29,7 @@ AliasNameShort=Nom comercial Companies=Empreses CountryIsInEEC=Pais de la Comunitat Econòmica Europea ThirdPartyName=Nom del tercer -ThirdPartyEmail=Third party email +ThirdPartyEmail=Correu electrònic del tercer ThirdParty=Tercer ThirdParties=Tercers ThirdPartyProspects=Clients potencials @@ -51,7 +51,7 @@ Lastname=Cognoms Firstname=Nom PostOrFunction=Càrrec laboral UserTitle=Títol cortesia -NatureOfThirdParty=Nature of Third party +NatureOfThirdParty=Naturalesa del tercer Address=Adreça State=Província StateShort=Estat @@ -267,7 +267,7 @@ CustomerAbsoluteDiscountShort=Descompte fixe CompanyHasRelativeDiscount=Aquest client té un descompte per defecte de %s%% CompanyHasNoRelativeDiscount=Aquest client no té descomptes relatius per defecte CompanyHasAbsoluteDiscount=Aquest client té descomptes disponibles (notes de crèdit o bestretes) per %s %s -CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for %s %s +CompanyHasDownPaymentOrCommercialDiscount=Aquest client té un descompte disponible (comercial, de pagament) per a %s%s CompanyHasCreditNote=Aquest client encara té abonaments per %s %s CompanyHasNoAbsoluteDiscount=Aquest client no té més descomptes fixos disponibles CustomerAbsoluteDiscountAllUsers=Descomptes fixos en curs (acordat per tots els usuaris) diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang index 3459af34031..1ba698df8d1 100644 --- a/htdocs/langs/ca_ES/compta.lang +++ b/htdocs/langs/ca_ES/compta.lang @@ -1,5 +1,5 @@ # Dolibarr language file - Source file is en_US - compta -MenuFinancial=Billing / Payment +MenuFinancial=Facturació / pagament TaxModuleSetupToModifyRules=Ves a la Configuració mòdul impostos per modificar les regles de càlcul TaxModuleSetupToModifyRulesLT=Ves a la Configuració de l'empresa per modificar les regles de càlcul OptionMode=Opció de gestió comptable @@ -18,12 +18,13 @@ Accountsparent=Comptes pare Income=Ingressos Outcome=Despeses MenuReportInOut=Resultat / Exercici -ReportInOut=Balance of income and expenses +ReportInOut=Saldo d'ingressos i despeses ReportTurnover=Volum de vendes PaymentsNotLinkedToInvoice=Pagaments vinculats a cap factura, per la qual cosa sense tercer PaymentsNotLinkedToUser=Pagaments no vinculats a un usuari Profit=Benefici AccountingResult=Resultat comptable +BalanceBefore=Balance (before) Balance=Saldo Debit=Dèbit Credit=Crèdit @@ -31,34 +32,34 @@ Piece=Doc. Comptabilitat AmountHTVATRealReceived=Total repercutit AmountHTVATRealPaid=Total pagat VATToPay=IVA vendes -VATReceived=Tax received -VATToCollect=Tax purchases -VATSummary=Tax Balance -VATPaid=Tax paid -LT1Summary=Tax 2 summary -LT2Summary=Tax 3 summary +VATReceived=Impost rebut +VATToCollect=Impost de compres +VATSummary=Saldo tributari +VATPaid=Impost pagat +LT1Summary=Resum d'impostos 2 +LT2Summary=Resum fiscal 3 LT1SummaryES=Balanç del RE LT2SummaryES=Balanç d'IRPF -LT1SummaryIN=CGST Balance -LT2SummaryIN=SGST Balance -LT1Paid=Tax 2 paid -LT2Paid=Tax 3 paid +LT1SummaryIN=Balanç CGST +LT2SummaryIN=Balanç SGST +LT1Paid=Impostos pagats 2 +LT2Paid=Impostos pagats 3 LT1PaidES=RE pagat LT2PaidES=IRPF Pagat -LT1PaidIN=CGST Paid -LT2PaidIN=SGST Paid -LT1Customer=Tax 2 sales -LT1Supplier=Tax 2 purchases +LT1PaidIN=CGST pagat +LT2PaidIN=SGST pagat +LT1Customer=Impostos vendes 2 +LT1Supplier=Impostos compres 2 LT1CustomerES=Vendes RE LT1SupplierES=Compres RE -LT1CustomerIN=CGST sales -LT1SupplierIN=CGST purchases -LT2Customer=Tax 3 sales -LT2Supplier=Tax 3 purchases +LT1CustomerIN=CGST vendes +LT1SupplierIN=Compres CGST +LT2Customer=Impostos vendes 3 +LT2Supplier=Impostos compres 3 LT2CustomerES=IRPF Vendes LT2SupplierES=IRPF compres -LT2CustomerIN=SGST sales -LT2SupplierIN=SGST purchases +LT2CustomerIN=Vendes SGST +LT2SupplierIN=Compres SGST VATCollected=IVA recuperat ToPay=A pagar SpecialExpensesArea=Àrea per tots els pagaments especials @@ -107,8 +108,8 @@ SocialContributionsPayments=Pagaments d'impostos varis ShowVatPayment=Veure pagaments IVA TotalToPay=Total a pagar BalanceVisibilityDependsOnSortAndFilters=El balanç es visible en aquest llistat només si la taula està ordenada de manera ascendent sobre %s i filtrada per 1 compte bancari -CustomerAccountancyCode=Customer accounting code -SupplierAccountancyCode=Supplier accounting code +CustomerAccountancyCode=Codi de comptable del client +SupplierAccountancyCode=Codi comptable del proveïdor CustomerAccountancyCodeShort=Codi compt. cli. SupplierAccountancyCodeShort=Codi compt. prov. AccountNumber=Número de compte @@ -136,7 +137,7 @@ CalcModeVATDebt=Mode d'%sIVA sobre comptabilitat de compromís%s . CalcModeVATEngagement=Mode d'%sIVA sobre ingressos-despeses%s. CalcModeDebt=Mode %sReclamacions-Deutes%s anomenada Comptabilitad de compromís. CalcModeEngagement=Mode %sIngressos-Despeses%s anomenada Comptabilitad de caixa. -CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table +CalcModeBookkeeping=Anàlisi de dades publicades a la taula de llibres de comptabilitat CalcModeLT1= Metode %sRE factures a clients - factures de proveïdors%s CalcModeLT1Debt=Metode %sRE a factures a clients%s CalcModeLT1Rec= Metode %sRE a factures de proveïdors%s @@ -145,21 +146,21 @@ CalcModeLT2Debt=Metode %sIRPF a factures a clients%s CalcModeLT2Rec= Metode %sIRPF a factures de proveïdors%s AnnualSummaryDueDebtMode=Saldo d'ingressos i despeses, resum anual AnnualSummaryInputOutputMode=Saldo d'ingressos i despeses, resum anual -AnnualByCompanies=Balance of income and expenses, by predefined groups of account -AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode %sClaims-Debts%s said Commitment accounting. -AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode %sIncomes-Expenses%s said cash accounting. +AnnualByCompanies=Saldo d'ingressos i despeses, per grups de compte predefinits +AnnualByCompaniesDueDebtMode=Saldo d'ingressos i despeses, detall per grups predefinits, mode %sReclamacions-Deutes%s és a dir Comptabilitat de compromisos. +AnnualByCompaniesInputOutputMode=Saldo d'ingressos i despeses, detall per grups predefinits, mode %sIngresos-Despeses%s és a dir comptabilitat d'efectiu. SeeReportInInputOutputMode=Veure l'informe %sIngressos-Despeses%s anomenat comptabilitat de caixa per a un càlcul sobre les factures pagades SeeReportInDueDebtMode=Veure l'informe %sCrèdits-Deutes%s anomenada comptabilitat de compromís per a un càlcul de les factures pendents de pagament -SeeReportInBookkeepingMode=See report %sBookeeping%s for a calculation on bookkeeping table analysis +SeeReportInBookkeepingMode=Vegeu l'informe %sLlibre%s per a un càlcul a anàlisi de taula de comptes RulesAmountWithTaxIncluded=- Els imports mostrats són amb tots els impostos inclosos. RulesResultDue=- Inclou les factures pendents, despeses, IVA, donacions estiguen o no pagades. També s'inclou salaris pagats.
    - Es basa en la data de la validació de les factures i l'IVA i en la data de venciment per a despeses. Per salaris definits amb el mòdul de Salari, s'utilitza la data de valor del pagament. RulesResultInOut=- Inclou els pagaments reals realitzats en les factures, les despeses, l'IVA i els salaris.
    - Es basa en les dates de pagament de les factures, les despeses, l'IVA i els salaris. La data de la donació per a la donació. RulesCADue=- Inclou les factures degudes del client estiguen pagades o no.
    - Es basa en la data de la validació d'aquestes factures.
    RulesCAIn=- Inclou els pagaments efectuats de les factures a clients.
    - Es basa en la data de pagament de les mateixes
    -RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME" -RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME" -RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts grouped by personalized groups -SeePageForSetup=See menu %s for setup +RulesAmountOnInOutBookkeepingRecord=Inclou un registre al vostre Llibre amb comptes comptables que tenen el grup "DESPESA" o "INGRÉS" +RulesResultBookkeepingPredefined=Inclou un registre al vostre Llibre amb comptes comptables que tenen el grup "DESPESA" o "INGRÉS" +RulesResultBookkeepingPersonalized=Mostra un registre al vostre Llibre amb comptes comptables agrupats per grups personalitzats +SeePageForSetup=Veure el menú %s per configurar-lo DepositsAreNotIncluded=- Les factures de bestreta no estan incloses DepositsAreIncluded=- Les factures de bestreta estan incloses LT2ReportByCustomersInInputOutputModeES=Informe per tercer del IRPF @@ -211,7 +212,7 @@ CalculationRuleDesc=Per calcular la totalitat de l'IVA, hi ha dos mètodes:
    M CalculationRuleDescSupplier=D'acord amb el proveïdor, tria el mètode apropiat per aplicar la mateixa regla de càlcul i aconseguir el mateix resultat esperat pel teu proveïdor. TurnoverPerProductInCommitmentAccountingNotRelevant=l'Informe Facturació per producte, quan s'utilitza el mode comptabilitat de caixa no és rellevant. Aquest informe només està disponible quan s'utilitza el mode compromís comptable(consulteu la configuració del mòdul de comptabilitat). CalculationMode=Mode de càlcul -AccountancyJournal=Accounting code journal +AccountancyJournal=Diari de codi de comptable ACCOUNTING_VAT_SOLD_ACCOUNT=Compte comptable per defecte per a IVA repercutit - IVA a les vendes (utilitzat si no ha estat definit al diccionari de IVA) ACCOUNTING_VAT_BUY_ACCOUNT=Compte comptable per defecte per a IVA suportat - IVA a les compres (utilitzat si no ha estat definit al diccionari de IVA) ACCOUNTING_VAT_PAY_ACCOUNT=Compte comptable per defecte per IVA pagat @@ -234,4 +235,4 @@ ImportDataset_tax_vat=Pagaments IVA ErrorBankAccountNotFound=Error: no s'ha trobat el compte bancari FiscalPeriod=Període comptable ListSocialContributionAssociatedProject=Llista de contribucions socials associades al projecte -DeleteFromCat=Remove from accounting group +DeleteFromCat=Elimina del grup comptable diff --git a/htdocs/langs/ca_ES/contracts.lang b/htdocs/langs/ca_ES/contracts.lang index d2431981ef8..c4dec160abc 100644 --- a/htdocs/langs/ca_ES/contracts.lang +++ b/htdocs/langs/ca_ES/contracts.lang @@ -31,11 +31,11 @@ NewContract=Nou contracte NewContractSubscription=Nou contracte/subscripció AddContract=Crear contracte DeleteAContract=Eliminar un contracte -ActivateAllOnContract=Activate all services +ActivateAllOnContract=Activar tots els serveis CloseAContract=Tancar un contracte ConfirmDeleteAContract=Vols eliminar aquest contracte i tots els seus serveis? ConfirmValidateContract=Estàs segur que vols validar aquest contracte sota el nom %s? -ConfirmActivateAllOnContract=This will open all services (not yet active). Are you sure you want to open all services? +ConfirmActivateAllOnContract=Això obrirà tots els serveis (encara no actius). Esteu segur que voleu obrir tots els serveis? ConfirmCloseContract=Això tancarà tots els serveis (actius o no). Estàs segur que vols tancar el contracte? ConfirmCloseService=Vols tancar aquest servei amb data %s? ValidateAContract=Validar un contracte @@ -68,7 +68,7 @@ BoardRunningServices=Serveis actius expirats ServiceStatus=Estat del servei DraftContracts=Contractes esborrany CloseRefusedBecauseOneServiceActive=El contracte no pot ser tancat ja que conté almenys un servei obert. -ActivateAllContracts=Activate all contract lines +ActivateAllContracts=Activar totes les línies de contracte CloseAllContracts=Tancar tots els serveis DeleteContractLine=Eliminar línia de contracte ConfirmDeleteContractLine=Vols eliminar aquesta línia de contracte? @@ -87,8 +87,8 @@ ContactNameAndSignature=Per %s, nom i signatura: OnlyLinesWithTypeServiceAreUsed=Només les línies amb tipus "Servei" seran clonades. CloneContract=Clona el contracte ConfirmCloneContract=Are you sure you want to clone the contract %s? -LowerDateEndPlannedShort=Lower planned end date of active services -SendContractRef=Contract information __REF__ +LowerDateEndPlannedShort=Baixa data de finalització planificada dels serveis actius +SendContractRef=Informació del contracte __REF__ ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Agent comercial signant del contracte TypeContact_contrat_internal_SALESREPFOLL=Agent comercial del seguiment del contracte diff --git a/htdocs/langs/ca_ES/cron.lang b/htdocs/langs/ca_ES/cron.lang index 9da936b25be..cc612a96d28 100644 --- a/htdocs/langs/ca_ES/cron.lang +++ b/htdocs/langs/ca_ES/cron.lang @@ -10,12 +10,12 @@ CronSetup= Pàgina de configuració del mòdul - Gestió de tasques planificades URLToLaunchCronJobs=URL per comprovar i posar en marxa les tasques automàtiques qualificades OrToLaunchASpecificJob=O per llançar una tasca específica KeyForCronAccess=Codi de seguretat per a la URL de llançament de tasques automàtiques -FileToLaunchCronJobs=Command line to check and launch qualified cron jobs +FileToLaunchCronJobs=Línia de comando per verificar i executar tasques cron qualificades CronExplainHowToRunUnix=A entorns Unix s'ha d'utilitzar la següent entrada crontab per executar la comanda cada 5 minuts CronExplainHowToRunWin=En entorns Microsoft (tm) Windows, pot utilitzar l'eina 'tareas programadas' per executar la comanda cada 5 minuts CronMethodDoesNotExists=La classe %s no conté cap mètode %s -CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s. -CronJobProfiles=List of predefined cron job profiles +CronJobDefDesc=Els perfils de tasques programades es defineixen a la fitxa del mòdul descriptor. Quan s'activa el mòdul, es carreguen i estan disponibles per poder administrar les tasques des del menú d'eines d'administració %s. +CronJobProfiles=Llista de perfils predefinits de tasques programades # Menu EnabledAndDisabled=Habilitat i deshabilitat # Page list @@ -55,28 +55,28 @@ CronSaveSucess=S'ha desat correctament CronNote=Nota CronFieldMandatory=El camp %s és obligatori CronErrEndDateStartDt=La data de fi no pot ser anterior a la d'inici -StatusAtInstall=Status at module installation +StatusAtInstall=Estat a la instal·lació del mòdul CronStatusActiveBtn=Activar CronStatusInactiveBtn=Desactivar CronTaskInactive=Aquesta tasca es troba desactivada CronId=Id CronClassFile=Filename with class -CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
    For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for module is
    product -CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory).
    For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/product.class.php, the value for class file name is
    product/class/product.class.php -CronObjectHelp=The object name to load.
    For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is
    Product -CronMethodHelp=The object method to launch.
    For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is
    fetch -CronArgsHelp=The method arguments.
    For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be
    0, ProductRef +CronModuleHelp=Nom del directori del mòdul de Dolibarr (també funciona amb mòduls externs).
    Per exemple, per cridar al mètode "fetch" de l'objecte Producte de Dolibarr /htdocs/product/class/product.class.php, el valor pel mòdul és product +CronClassFileHelp=La ruta relativa i el nom del fitxer a carregar (la ruta és relativa al directori arrel del servidor web).
    Per exemple, per cridar al mètode "fetch" de l'objecte Producte de Dolibarr /htdocs/product/class/product.class.php, el valor del nom del fitxer de classe és product/class/product.class.php +CronObjectHelp=El nom de l'objecte a carregar.
    Per exemple, per cridar al mètode "fetch" de l'objecte Producte de Dolibarr /htdocs/product/class/product.class.php, el valor pel nom del fitxer de classe és Product +CronMethodHelp=El mètode d'objecte a cridar.
    Per exemple, per cridar al mètode "fetch" de l'objecte Producte de Dolibarr /htdocs/product/class/product.class.php, el valor pel mètode és fetch +CronArgsHelp=Els arguments del mètode.
    Per exemple, cridar al mètode "fetch" de l'objecte Producte de Dolibarr /htdocs/product/class/product.class.php, el valor dels paràmetres pot ser
    0, ProductRef CronCommandHelp=El comando del sistema a executar CronCreateJob=Crear nova tasca programada CronFrom=De # Info # Common CronType=Tipus de tasca -CronType_method=Call method of a PHP Class +CronType_method=Mètode per cridar una classe PHP CronType_command=Comando Shell CronCannotLoadClass=impossible carregar la classe %s de l'objecte %s UseMenuModuleToolsToAddCronJobs=Ves a menú "Inici - Utilitats de sistema - Tasques programades" per veure i editar les tasques programades. JobDisabled=Tasca desactivada MakeLocalDatabaseDumpShort=Còpia de seguretat de la base de dades local -MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep +MakeLocalDatabaseDump=Crear un bolcat de la base de dades local. Els paràmetres són: compressió ('gz' o 'bz' o 'none'), tipus de còpia de seguretat ('mysql' o 'pgsql'), 1, 'auto' o nom de fitxer per a compilar, nombre de fitxers de còpia de seguretat per conservar WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of enabled jobs, your jobs may be delayed to a maximum of %s hours, before being run. diff --git a/htdocs/langs/ca_ES/dict.lang b/htdocs/langs/ca_ES/dict.lang index f6d51257aad..badfc41f25d 100644 --- a/htdocs/langs/ca_ES/dict.lang +++ b/htdocs/langs/ca_ES/dict.lang @@ -327,8 +327,8 @@ PaperFormatCAP5=Format canadec P5 PaperFormatCAP6=Format canadec P6 #### Expense report categories #### ExpAutoCat=Cotxe -ExpCycloCat=Moped -ExpMotoCat=Motorbike +ExpCycloCat=Ciclomotor +ExpMotoCat=Moto ExpAuto3CV=3 CV ExpAuto4CV=4 CV ExpAuto5CV=5 CV @@ -339,18 +339,18 @@ ExpAuto9CV=9 CV ExpAuto10CV=10 CV ExpAuto11CV=11 CV ExpAuto12CV=12 CV -ExpAuto3PCV=3 CV and more -ExpAuto4PCV=4 CV and more -ExpAuto5PCV=5 CV and more -ExpAuto6PCV=6 CV and more -ExpAuto7PCV=7 CV and more -ExpAuto8PCV=8 CV and more -ExpAuto9PCV=9 CV and more -ExpAuto10PCV=10 CV and more -ExpAuto11PCV=11 CV and more -ExpAuto12PCV=12 CV and more -ExpAuto13PCV=13 CV and more -ExpCyclo=Capacity lower to 50cm3 -ExpMoto12CV=Motorbike 1 or 2 CV -ExpMoto345CV=Motorbike 3, 4 or 5 CV -ExpMoto5PCV=Motorbike 5 CV and more +ExpAuto3PCV=3 CV i més +ExpAuto4PCV=4 CV i més +ExpAuto5PCV=5 CV i més +ExpAuto6PCV=6 CV i més +ExpAuto7PCV=7 CV i més +ExpAuto8PCV=8 CV i més +ExpAuto9PCV=9 CV i més +ExpAuto10PCV=10 CV i més +ExpAuto11PCV=11 CV i més +ExpAuto12PCV=12 CV i més +ExpAuto13PCV=13 CV i més +ExpCyclo=Capacitat inferior a 50cm3 +ExpMoto12CV=Moto 1 ó 2 CV +ExpMoto345CV=Moto 3, 4 ó 5 CV +ExpMoto5PCV=Moto 5 CV i més diff --git a/htdocs/langs/ca_ES/donations.lang b/htdocs/langs/ca_ES/donations.lang index 55ee8884291..d0072ad36df 100644 --- a/htdocs/langs/ca_ES/donations.lang +++ b/htdocs/langs/ca_ES/donations.lang @@ -31,3 +31,4 @@ DONATION_ART200=Mostrar article 200 del CGI si s'està interessat DONATION_ART238=Mostrar article 238 del CGI si s'està interessat DONATION_ART885=Mostrar article 885 del CGI si s'està interssat DonationPayment=Pagament de la donació +DonationValidated=Donation %s validated diff --git a/htdocs/langs/ca_ES/ecm.lang b/htdocs/langs/ca_ES/ecm.lang index ed36b5bd489..05f0edda325 100644 --- a/htdocs/langs/ca_ES/ecm.lang +++ b/htdocs/langs/ca_ES/ecm.lang @@ -6,7 +6,7 @@ ECMSectionAuto=Carpeta automàtica ECMSectionsManual=Arbre manual ECMSectionsAuto=Arbre automàtic ECMSections=Carpetes -ECMRoot=ECM Root +ECMRoot=Arrel del ECM ECMNewSection=Nova carpeta ECMAddSection=Afegir carpeta ECMCreationDate=Data creació @@ -18,7 +18,7 @@ ECMArea=Àrea GED ECMAreaDesc=L'àrea GED (Gestió Electrònica de Documents) li permet controlar ràpidament els documents en Dolibarr. ECMAreaDesc2=Podeu crear carpetes manuals i adjuntar els documents
    Les carpetes automàtiques són emplenades automàticament en l'addició d'un document en una fitxa. ECMSectionWasRemoved=La carpeta %s ha estat eliminada -ECMSectionWasCreated=Directory %s has been created. +ECMSectionWasCreated=S'ha creat el directori %s. ECMSearchByKeywords=Cercar per paraules clau ECMSearchByEntity=Cercar per objecte ECMSectionOfDocuments=Carpetes de documents @@ -42,9 +42,9 @@ ECMDirectoryForFiles=Carpeta relativa per a fitxers CannotRemoveDirectoryContainsFiles=No es pot eliminar perquè té arxius ECMFileManager=Explorador de fitxers ECMSelectASection=Seleccioneu una carpeta en l'arbre de l'esquerra -DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory. -ReSyncListOfDir=Resync list of directories -HashOfFileContent=Hash of file content -FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it) -FileSharedViaALink=File shared via a link -NoDirectoriesFound=No directories found +DirNotSynchronizedSyncFirst=Aquest directori sembla que s'ha creat o modificat fora del mòdul ECM. Heu de prémer el botó "Resincronitzar" per sincronitzar el disc i la base de dades per obtenir el contingut d'aquest directori. +ReSyncListOfDir=Resincronitzar la llista de directoris +HashOfFileContent=Resum matemàtic ("hash") del contingut del fitxer +FileNotYetIndexedInDatabase=Fitxer encara no indexat a la base de dades (intenteu pujant-lo de nou) +FileSharedViaALink=Fitxer compartit a través d'un enllaç +NoDirectoriesFound=No s'han trobat directoris diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang index 381ad0a2606..f737a0d9c89 100644 --- a/htdocs/langs/ca_ES/errors.lang +++ b/htdocs/langs/ca_ES/errors.lang @@ -75,7 +75,7 @@ ErrorCantSaveADoneUserWithZeroPercentage=No es pot canviar una acció al estat n ErrorRefAlreadyExists=La referència utilitzada per a la creació ja existeix ErrorPleaseTypeBankTransactionReportName=Si us plau, tecleja el nom del comunicat del banc a on s'informa de l'entrada (format AAAAMM o AAAAMMDD) ErrorRecordHasChildren=No s'ha pogut eliminar el registre, ja que té alguns registres fills. -ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s +ErrorRecordHasAtLeastOneChildOfType=L'objecte té almenys un fill de tipus %s ErrorRecordIsUsedCantDelete=No es pot eliminar el registre. S'està utilitzant o incloent en un altre objecte. ErrorModuleRequireJavascript=Javascript ha d'estar activat per a que aquesta opció pugui utilitzar-se. Per activar/desactivar JavaScript, ves al menú Inici->Configuració->Entorn. ErrorPasswordsMustMatch=Les 2 contrasenyes indicades s'han de correspondre @@ -104,7 +104,7 @@ ErrorForbidden2=Els permisos per a aquest usuari poden ser assignats per l'admin ErrorForbidden3=Dolibarr no sembla funcionar en una sessió autentificada. Consulteu la documentació d'instal lació de Dolibarr per saber com administrar les autenticacions (htacces, mod_auth o altre ...). ErrorNoImagickReadimage=No s'ha trobat la classe Imagick en aquesta instal lació PHP. La previsualització no està disponible. Els administradors poden deshabilitar aquesta pestanya en el menú Configuració - Entorn. ErrorRecordAlreadyExists=Registre ja existent -ErrorLabelAlreadyExists=This label already exists +ErrorLabelAlreadyExists=Aquesta etiqueta ja existeix ErrorCantReadFile=Error de lectura del fitxer '%s' ErrorCantReadDir=Error de lectura de la carpeta '%s' ErrorBadLoginPassword=Identificadors d'usuari o contrasenya incorrectes @@ -155,11 +155,12 @@ ErrorPriceExpression19=Expressió no trobada ErrorPriceExpression20=Expressió buida ErrorPriceExpression21=Resultat '%s' buit ErrorPriceExpression22=Resultat'%s' negatiu -ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression23=Variable desconeguda o no establerta '%s' a %s +ErrorPriceExpression24=La variable '%s' existeix però no té valor ErrorPriceExpressionInternal=Error intern '%s' ErrorPriceExpressionUnknown=Error desconegut '%s' ErrorSrcAndTargetWarehouseMustDiffers=Els magatzems d'origen i destí han de ser diferents -ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on product '%s' requiring lot/serial information +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, intentant fer un moviment d'estoc sense informació de lot/sèrie, al producte '%s' que requereix informació del lot o sèrie ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Totes les recepcions han de verificar-se primer (acceptades o denegades) abans per realitzar aquesta acció ErrorCantSetReceptionToTotalDoneWithReceptionDenied=Totes les recepcions han de verificar-se (acceptades) abans per poder-se realitzar a aquesta acció ErrorGlobalVariableUpdater0=Petició HTTP fallida amb error '%s' @@ -200,12 +201,12 @@ ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped. ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=No és possible la validació massiva quan s'estableix l'opció d'augmentar/disminuir l'estoc en aquesta acció (cal validar-ho un per un per poder definir el magatzem a augmentar/disminuir) ErrorObjectMustHaveStatusDraftToBeValidated=L'objecte %s ha de tenir l'estat 'Esborrany' per ser validat. ErrorObjectMustHaveLinesToBeValidated=L'objecte %s ha de tenir línies per ser validat. -ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Only validated invoices can be sent using the "Send by email" mass action. -ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a predefined product or not -ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before. -ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently. -ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference. -ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number. +ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Només es poden enviar factures validades mitjançant l'acció massiva "Enviar per correu electrònic". +ErrorChooseBetweenFreeEntryOrPredefinedProduct=Heu de triar si l'article és un producte predefinit o no +ErrorDiscountLargerThanRemainToPaySplitItBefore=El descompte que intenteu aplicar és més gran que el que queda per pagar. Dividiu el descompte en 2 descomptes menors abans. +ErrorFileNotFoundWithSharedLink=No s'ha trobat el fitxer. Pot ser que la clau compartida s'hagi modificat o el fitxer s'hagi eliminat recentment. +ErrorProductBarCodeAlreadyExists=El codi de barres de producte %s ja existeix en la referència d'un altre producte. +ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Tingueu en compte també que no és possible tenir un producte virtual amb auto increment/decrement de subproductes quan almenys un subproducte (o subproducte de subproductes) necessita un número de sèrie/lot. # Warnings WarningPasswordSetWithNoAccount=S'ha indicat una contrasenya per aquest soci. En canvi, no s'ha creat cap compte d'usuari, de manera que aquesta contrasenya s'ha desat però no pot ser utilitzada per entrar a Dolibarr. Es pot utilitzar per un mòdul/interfície extern, però si no cal definir cap usuari i contrasenya per un soci, pots deshabilitar la opció "Gestiona l'entrada per tots els socis" des de la configuració del mòdul Socis. Si necessites gestionar una entrada sense contrasenya, pots mantenir aquest camp buit i permetre aquest avís. Nota: El correu electrònic es pot utilitzar per entrar si el soci està enllaçat a un usuarí @@ -227,4 +228,4 @@ WarningTooManyDataPleaseUseMoreFilters=Massa dades (més de %s línies). Utilitz WarningSomeLinesWithNullHourlyRate=Algunes vegades es van registrar per alguns usuaris quan no s'havia definit el seu preu per hora. Es va utilitzar un valor de 0 %s per hora, però això pot resultar una valoració incorrecta del temps dedicat. WarningYourLoginWasModifiedPleaseLogin=El teu login s'ha modificat. Per seguretat has de fer login amb el nou login abans de la següent acció. WarningAnEntryAlreadyExistForTransKey=Ja existeix una entrada per la clau de traducció d'aquest idioma -WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to %s when using the bulk actions on lists +WarningNumberOfRecipientIsRestrictedInMassAction=Advertència: el nombre de destinataris diferents està limitat a %s quan s'utilitzen les accions massives sobre llistes diff --git a/htdocs/langs/ca_ES/holiday.lang b/htdocs/langs/ca_ES/holiday.lang index 0ba5724cb8b..01fb41eabea 100644 --- a/htdocs/langs/ca_ES/holiday.lang +++ b/htdocs/langs/ca_ES/holiday.lang @@ -79,8 +79,8 @@ HolidaysCancelation=Anulació de dies lliures EmployeeLastname=Cognoms de l'empleat EmployeeFirstname=Nom de l'empleat TypeWasDisabledOrRemoved=El tipus de dia lliure (id %s) ha sigut desactivat o eliminat -LastHolidays=Latest %s leave requests -AllHolidays=All leave requests +LastHolidays=Les darreres %s sol·licituds de permís +AllHolidays=Totes les sol·licituds de permís ## Configuration du Module ## LastUpdateCP=Última actualització automàtica de reserva de dies lliures diff --git a/htdocs/langs/ca_ES/install.lang b/htdocs/langs/ca_ES/install.lang index 551734dfd01..9146bb74e45 100644 --- a/htdocs/langs/ca_ES/install.lang +++ b/htdocs/langs/ca_ES/install.lang @@ -139,8 +139,9 @@ KeepDefaultValuesDeb=Estàs utilitzant l'assistent d'instal·lació Dolibarr d'u KeepDefaultValuesMamp=Estàs utilitzant l'assistent d'instal·lació de DoliMamp amb els valors proposats més òptims. Canvia'ls només si estàs segur del que estàs fent. KeepDefaultValuesProxmox=Estàs utilitzant l'assistent d'instal·lació de Dolibarr des d'una màquina virtual Proxmox amb els valors proposats més òptims. Canvia'ls només si estàs segur del que estàs fent. UpgradeExternalModule=Executa el procés d'actualització dedicat de mòduls externs -SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' -NothingToDelete=Nothing to clean/delete +SetAtLeastOneOptionAsUrlParameter=Estableix com a mínim una opció com a paràmetre a l'URL. Per exemple: '... repair.php?standard=confirmed' +NothingToDelete=Res per netejar / esborrar +NothingToDo=No hi ha res a fer ######### # upgrade MigrationFixData=Correcció de dades desnormalitzades @@ -192,10 +193,11 @@ MigrationActioncommElement=Actualització de les dades de accions sobre elements MigrationPaymentMode=Actualització de les formes de pagament MigrationCategorieAssociation=Actualització de les categories MigrationEvents=Migració d'esdeveniments per afegir propietari a la taula d'asignació -MigrationEventsContact=Migration of events to add event contact into assignement table +MigrationEventsContact=Migració d'esdeveniments per afegir contacte d'esdeveniments a la taula d'assignacions MigrationRemiseEntity=Actualitza el valor del camp entity de llx_societe_remise MigrationRemiseExceptEntity=Actualitza el valor del camp entity de llx_societe_remise_except MigrationReloadModule=Recarrega el mòdul %s +MigrationResetBlockedLog=Restablir el mòdul BlockedLog per l'algoritme v7 ShowNotAvailableOptions=Mostra opcions no disponibles HideNotAvailableOptions=Amaga opcions no disponibles ErrorFoundDuringMigration=S'ha reportat un error durant el procés de migració, de manera que el proper pas no està disponible. Per ignorar els errors, pots fer clic aqui, però l'aplicació o algunes funcionalitats podrien no funcionar correctament fins que no es corregeixi. diff --git a/htdocs/langs/ca_ES/interventions.lang b/htdocs/langs/ca_ES/interventions.lang index 680e3a85fe1..b1ea75c9aa7 100644 --- a/htdocs/langs/ca_ES/interventions.lang +++ b/htdocs/langs/ca_ES/interventions.lang @@ -47,12 +47,12 @@ TypeContact_fichinter_external_CUSTOMER=Contacte client seguiment intervenció PrintProductsOnFichinter=Imprimeix també les línies de tipus "producte" (no només serveis) en les fitxes d'intervencions. PrintProductsOnFichinterDetails=Intervencions generades des de comandes UseServicesDurationOnFichinter=Utilitza la durada dels serveis en les intervencions generades des de comandes -UseDurationOnFichinter=Hides the duration field for intervention records -UseDateWithoutHourOnFichinter=Hides hours and minutes off the date field for intervention records +UseDurationOnFichinter=Oculta el camp de durada dels registres d'intervenció +UseDateWithoutHourOnFichinter=Oculta hores i minuts del camp de dates dels registres d'intervenció InterventionStatistics=Estadístiques de intervencions NbOfinterventions=Nº de fitxes de intervenció NumberOfInterventionsByMonth=Nº de fitxes de intervenció per mes (data de validació) -AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them. +AmountOfInteventionNotIncludedByDefault=La quantitat d'intervenció no s'inclou de manera predeterminada en els beneficis (en la majoria dels casos, els fulls de temps s'utilitzen per comptar el temps dedicat). Per incloure'ls, afegiu la opció PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT amb el valor 1 a Configuració → Varis. ##### Exports ##### InterId=Id. d'intervenció InterRef=Ref. d'intervenció diff --git a/htdocs/langs/ca_ES/languages.lang b/htdocs/langs/ca_ES/languages.lang index ddf417bb9e2..04a27348afa 100644 --- a/htdocs/langs/ca_ES/languages.lang +++ b/htdocs/langs/ca_ES/languages.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - languages Language_ar_AR=Àrab -Language_ar_EG=Arabic (Egypt) +Language_ar_EG=Àrab (Egipte) Language_ar_SA=Àrab Language_bn_BD=Bengalí Language_bg_BG=Búlgar @@ -35,6 +35,7 @@ Language_es_PA=Espanyol (Panamà) Language_es_PY=Espanyol (Paraguai) Language_es_PE=Espanyol (Perú) Language_es_PR=Espanyol (Puerto Rico) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Espanyol (Veneçuela) Language_et_EE=Estonià Language_eu_ES=Basc diff --git a/htdocs/langs/ca_ES/ldap.lang b/htdocs/langs/ca_ES/ldap.lang index fcf2e5ef5b3..8b47bc5b455 100644 --- a/htdocs/langs/ca_ES/ldap.lang +++ b/htdocs/langs/ca_ES/ldap.lang @@ -6,7 +6,7 @@ LDAPInformationsForThisContact=Informació de la base de dades LDAP d'aquest con LDAPInformationsForThisUser=Informació de la base de dades LDAP d'aquest usuari LDAPInformationsForThisGroup=Informació de la base de dades LDAP d'aquest grup LDAPInformationsForThisMember=Informació en la base de dades LDAP per aquest soci -LDAPInformationsForThisMemberType=Information in LDAP database for this member type +LDAPInformationsForThisMemberType=Informació en la base de dades LDAP per a aquest tipus de membre LDAPAttributes=Atributs LDAP LDAPCard=Fitxa LDAP LDAPRecordNotFound=Registre no trobat a la base de dades LDAP @@ -21,7 +21,7 @@ LDAPFieldSkypeExample=Exemple : NomSkype UserSynchronized=Usuari sincronitzat GroupSynchronized=Grup sincronizado MemberSynchronized=Soci sincronitzat -MemberTypeSynchronized=Member type synchronized +MemberTypeSynchronized=Tipus de membre sincronitzat ContactSynchronized=Contacte sincronitzat ForceSynchronize=Forçar sincronització Dolibarr -> LDAP ErrorFailedToReadLDAP=Error de la lectura de l'anuari LDAP. Comprovar la configuració del mòdul LDAP i l'accessibilitat de l'anuari. diff --git a/htdocs/langs/ca_ES/mails.lang b/htdocs/langs/ca_ES/mails.lang index 6fc4a142a21..0b4a2610d40 100644 --- a/htdocs/langs/ca_ES/mails.lang +++ b/htdocs/langs/ca_ES/mails.lang @@ -49,7 +49,7 @@ NbOfUniqueEMails=Nº d'e-mails únics NbOfEMails=Nº de E-mails TotalNbOfDistinctRecipients=Nombre de destinataris únics NoTargetYet=Cap destinatari definit -NoRecipientEmail=No recipient email for %s +NoRecipientEmail=No hi ha cap correu destinatari per a %s RemoveRecipient=Eliminar destinatari YouCanAddYourOwnPredefindedListHere=Per crear el seu mòdul de selecció e-mails, mireu htdocs /core/modules/mailings/README. EMailTestSubstitutionReplacedByGenericValues=En mode prova, les variables de substitució són substituïdes per valors genèrics @@ -69,11 +69,11 @@ ActivateCheckReadKey=Clau utilitzada per encriptar la URL utilitzada per les car EMailSentToNRecipients=E-Mail enviat a %s destinataris. EMailSentForNElements=E-Mail enviat per %s elements. XTargetsAdded=%s destinataris agregats a la llista -OnlyPDFattachmentSupported=If the PDF documents were already generated for the objects to send, they will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version). -AllRecipientSelected=The recipients of the %s record selected (if their email is known). -GroupEmails=Group emails -OneEmailPerRecipient=One email per recipient (by default, one email per record selected) -WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them. +OnlyPDFattachmentSupported=Si els documents PDF ja s'havien generat per als objectes que s'envien, s'enviaran adjunts al correu electrònic. Si no, no s'enviarà cap correu (també, tingueu en compte que al menys en aquesta versió només es permeten documents pdf com a fitxer adjunt en l'enviament massiu). +AllRecipientSelected=Seleccionats els destinataris del registre %s (si es coneix el seu correu electrònic). +GroupEmails=Correus grupals +OneEmailPerRecipient=Un correu per destinatari (per defecte, un correu electrònic per registre seleccionat) +WarningIfYouCheckOneRecipientPerEmail=Advertència, si marqueu aquesta casella, significa que només s'enviarà un correu electrònic per a diversos registres seleccionats, de manera que, si el vostre missatge conté variables de substitució que fan referència a dades d'un registre, no és possible reemplaçar-les. ResultOfMailSending=Resultat de l'enviament massiu d'e-mails NbSelected=Nº seleccionats NbIgnored=Nº ignorats @@ -114,7 +114,7 @@ DeliveryReceipt=Justificant de recepció. YouCanUseCommaSeparatorForSeveralRecipients=Podeu usar el caràcter de separació coma per especificar múltiples destinataris. TagCheckMail=Seguiment de l'obertura del email TagUnsubscribe=Link de Desubscripció -TagSignature=Signature of sending user +TagSignature=Signatura de l'usuari remitent EMailRecipient=Email del destinatari TagMailtoEmail=Email del destinatari (inclòs l'enllaç html "mailto:") NoEmailSentBadSenderOrRecipientEmail=No s'ha enviat el correu electrònic. Enviador del correu incorrecte. Verifica el perfil d'usuari. @@ -159,7 +159,7 @@ NoContactWithCategoryFound=No s'han trobat contactes/adreces amb categoria NoContactLinkedToThirdpartieWithCategoryFound=No s'han trobat contactes/adreces amb categoria OutGoingEmailSetup=Configuració de correus electrònics sortints InGoingEmailSetup=Configuració de correus electrònics entrants -OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing) -DefaultOutgoingEmailSetup=Default outgoing email setup +OutGoingEmailSetupForEmailing=Configuració del correu electrònic sortint (per enviament de correus massiu) +DefaultOutgoingEmailSetup=Configuració per defecte del correu electrònic sortint Information=Informació diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang index 4c2043887b5..893d2b7cbac 100644 --- a/htdocs/langs/ca_ES/main.lang +++ b/htdocs/langs/ca_ES/main.lang @@ -24,7 +24,7 @@ FormatDateHourSecShort=%d/%m/%Y %H:%M:%S FormatDateHourTextShort=%d %b %Y %H:%M FormatDateHourText=%d %B %Y %H:%M DatabaseConnection=Connexió a la base de dades -NoTemplateDefined=No template available for this email type +NoTemplateDefined=No hi ha cap plantilla disponible per a aquest tipus de correu electrònic AvailableVariables=Variables de substitució disponibles NoTranslation=Sense traducció Translation=Traducció @@ -104,8 +104,8 @@ RequestLastAccessInError=Últimes peticions d'accés a la base de dades amb erro ReturnCodeLastAccessInError=Retorna el codi per les últimes peticions d'accés a la base de dades amb error InformationLastAccessInError=Informació de les últimes peticions d'accés a la base de dades amb error DolibarrHasDetectedError=Dolibarr ha trobat un error tècnic -YouCanSetOptionDolibarrMainProdToZero=You can read log file or set option $dolibarr_main_prod to '0' in your config file to get more information. -InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to remove such notices) +YouCanSetOptionDolibarrMainProdToZero=Podeu llegir el fitxer de registre o establir l'opció $dolibarr_main_prod a '0' al vostre fitxer de configuració per obtenir més informació. +InformationToHelpDiagnose=Aquesta informació pot ser útil per a fer diagnòstics (podeu configurar l'opció $dolibarr_main_prod a '1' per eliminar aquestes notificacions) MoreInformation=Més informació TechnicalInformation=Informació tècnica TechnicalID=ID Tècnic @@ -131,8 +131,8 @@ Never=Mai Under=baix Period=Període PeriodEndDate=Data fi període -SelectedPeriod=Selected period -PreviousPeriod=Previous period +SelectedPeriod=Període seleccionat +PreviousPeriod=Període anterior Activate=Activar Activated=Activat Closed=Tancat @@ -263,13 +263,13 @@ DateBuild=Data generació de l'informe DatePayment=Data pagament DateApprove=Data d'aprovació DateApprove2=Data d'aprovació (segona aprovació) -RegistrationDate=Registration date +RegistrationDate=Data d'enregistrament UserCreation=Usuari de creació UserModification=Usuari de modificació -UserValidation=Validation user +UserValidation=Validació d'usuari UserCreationShort=Usuari crea. UserModificationShort=Usuari modif. -UserValidationShort=Valid. user +UserValidationShort=Vàlid. usuari DurationYear=any DurationMonth=mes DurationWeek=setmana @@ -311,8 +311,8 @@ KiloBytes=Kilobytes MegaBytes=Megabytes GigaBytes=Gigabytes TeraBytes=Terabytes -UserAuthor=User of creation -UserModif=User of last update +UserAuthor=Usuari de la creació +UserModif=Usuari de l'última actualització b=b. Kb=Kb Mb=Mb @@ -365,31 +365,31 @@ Totalforthispage=Total per aquesta pàgina TotalTTC=Total TotalTTCToYourCredit=Total a crèdit TotalVAT=Total IVA -TotalVATIN=Total IGST +TotalVATIN=IGST total TotalLT1=Total impost 2 TotalLT2=total Impost 3 TotalLT1ES=Total RE TotalLT2ES=Total IRPF -TotalLT1IN=Total CGST -TotalLT2IN=Total SGST +TotalLT1IN=CGST total +TotalLT2IN=SGST total HT=Sense IVA TTC=IVA inclòs -INCVATONLY=Inc. VAT +INCVATONLY=IVA inclòs INCT=Inc. tots els impostos VAT=IVA VATIN=IGST VATs=IVAs -VATINs=IGST taxes -LT1=Sales tax 2 -LT1Type=Sales tax 2 type -LT2=Sales tax 3 -LT2Type=Sales tax 3 type +VATINs=Impostos IGST +LT1=Impost sobre vendes 2 +LT1Type=Tipus de l'impost sobre vendes 2 +LT2=Impost sobre vendes 3 +LT2Type=Tipus de l'impost sobre vendes 3 LT1ES=RE LT2ES=IRPF LT1IN=CGST LT2IN=SGST VATRate=Taxa IVA -DefaultTaxRate=Default tax rate +DefaultTaxRate=Tipus impositiu per defecte Average=Mitja Sum=Suma Delta=Diferència @@ -418,14 +418,14 @@ ActionRunningNotStarted=No començat ActionRunningShort=En progrés ActionDoneShort=Acabat ActionUncomplete=Incomplet -LatestLinkedEvents=Latest %s linked events +LatestLinkedEvents=Darrers %s esdeveniments vinculats CompanyFoundation=Empresa/Organització ContactsForCompany=Contactes d'aquest tercer ContactsAddressesForCompany=Contactes/adreces d'aquest tercer AddressesForCompany=Adreces d'aquest tercer ActionsOnCompany=Esdeveniments respecte aquest tercer ActionsOnMember=Esdeveniments d'aquest soci -ActionsOnProduct=Events about this product +ActionsOnProduct=Esdeveniments sobre aquest producte NActionsLate=%s en retard RequestAlreadyDone=Sol·licitud ja recollida Filter=Filtre @@ -475,7 +475,7 @@ Discount=Descompte Unknown=Desconegut General=General Size=Tamany -OriginalSize=Original size +OriginalSize=Mida original Received=Rebut Paid=Pagat Topic=Assumpte @@ -548,8 +548,20 @@ MonthShort09=set. MonthShort10=oct. MonthShort11=nov. MonthShort12=des. +MonthVeryShort01=G +MonthVeryShort02=F +MonthVeryShort03=M +MonthVeryShort04=A +MonthVeryShort05=M +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=S +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Arxius i documents adjunts -JoinMainDoc=Join main document +JoinMainDoc=Unir al document principal DateFormatYYYYMM=YYYY-MM DateFormatYYYYMMDD=YYYY-MM-DD DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS @@ -602,7 +614,7 @@ Undo=Desfer Redo=Refer ExpandAll=Expandir tot UndoExpandAll=Desfer expansió -SeeAll=See all +SeeAll=Veure tot Reason=Raó FeatureNotYetSupported=Funcionalitat encara no suportada CloseWindow=Tancar finestra @@ -678,8 +690,8 @@ Page=Pàgina Notes=Notes AddNewLine=Afegir nova línia AddFile=Afegir arxiu -FreeZone=Not a predefined product/service -FreeLineOfType=Not a predefined entry of type +FreeZone=No hi ha un producte/servei predefinit +FreeLineOfType=No hi ha una entrada predefinida de tipus CloneMainAttributes=Clonar l'objecte amb aquests atributs principals PDFMerge=Fussió PDF Merge=Fussió @@ -726,9 +738,9 @@ LinkToIntervention=Enllaça a intervenció CreateDraft=Crea esborrany SetToDraft=Tornar a redactar ClickToEdit=Clic per a editar -EditWithEditor=Edit with CKEditor -EditWithTextEditor=Edit with Text editor -EditHTMLSource=Edit HTML Source +EditWithEditor=Editar amb CKEditor +EditWithTextEditor=Editar amb l'editor de text +EditHTMLSource=Editar el codi HTML ObjectDeleted=Objecte %s eliminat ByCountry=Per país ByTown=Per població @@ -759,10 +771,10 @@ SaveUploadedFileWithMask=Desa el fitxer al servidor amb el nom "%shttps://transifex.com/projects/p/dolibarr/. -DirectDownloadLink=Direct download link (public/external) -DirectDownloadInternalLink=Direct download link (need to be logged and need permissions) +DirectDownloadLink=Enllaç de descàrrega directa (públic/extern) +DirectDownloadInternalLink=Enllaç directe de descàrrega (necessita estar registrat i tenir permisos) Download=Descarrega -DownloadDocument=Download document +DownloadDocument=Baixar el document ActualizeCurrency=Actualitza el canvi de divisa Fiscalyear=Any fiscal ModuleBuilder=Creador de mòdul @@ -821,8 +833,8 @@ SetMultiCurrencyCode=Estableix moneda BulkActions=Accions massives ClickToShowHelp=Fes clic per mostrar l'ajuda desplegable WebSite=Lloc web -WebSites=Web sites -WebSiteAccounts=Web site accounts +WebSites=Llocs web +WebSiteAccounts=Comptes de lloc web ExpenseReport=Informe de despeses ExpenseReports=Informes de despeses HR=RRHH @@ -830,10 +842,10 @@ HRAndBank=RRHH i banc AutomaticallyCalculated=Calculat automàticament TitleSetToDraft=Torna a esborrany ConfirmSetToDraft=Estàs segur que vols tornar a l'estat esborrany? -ImportId=Import id +ImportId=ID d'importació Events=Esdeveniments EMailTemplates=Models d'emails -FileNotShared=File not shared to exernal public +FileNotShared=Fitxer no compartit amb el públic extern Project=Projecte Projects=Projectes Rights=Permisos @@ -866,14 +878,14 @@ ShortThursday=Dj ShortFriday=Dv ShortSaturday=Ds ShortSunday=Dg -SelectMailModel=Select an email template +SelectMailModel=Seleccioneu una plantilla de correu electrònic SetRef=Indica ref Select2ResultFoundUseArrows=Alguns resultats trobats. Fes servir les fletxes per seleccionar. Select2NotFound=No s'han trobat resultats Select2Enter=Entrar Select2MoreCharacter=o més caràcter Select2MoreCharacters=o més caràcters -Select2MoreCharactersMore=Search syntax:
    | OR (a|b)
    * Any character (a*b)
    ^ Start with (^ab)
    $ End with (ab$)
    +Select2MoreCharactersMore=Sintaxi de cerca:
    | OR (a|b)
    *Qualsevol caràcter (a*b)
    ^ Començar amb (^ab)
    $ Acabar amb (ab$)
    Select2LoadingMoreResults=Carregant més resultats Select2SearchInProgress=Busqueda en progrés... SearchIntoThirdparties=Tercers @@ -895,8 +907,10 @@ SearchIntoCustomerShipments=Enviaments de client SearchIntoExpenseReports=Informes de despeses SearchIntoLeaves=Dies lliures CommentLink=Comentaris -NbComments=Number of comments -CommentPage=Comments space -CommentAdded=Comment added -CommentDeleted=Comment deleted +NbComments=Nombre de comentaris +CommentPage=Espai de comentaris +CommentAdded=Comentari afegit +CommentDeleted=Comentari suprimit Everybody=Projecte compartit +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/ca_ES/members.lang b/htdocs/langs/ca_ES/members.lang index 67ff89ee249..995e3a060b5 100644 --- a/htdocs/langs/ca_ES/members.lang +++ b/htdocs/langs/ca_ES/members.lang @@ -57,11 +57,11 @@ NewCotisation=Nova aportació PaymentSubscription=Nou pagament de quota SubscriptionEndDate=Data final d'afiliació MembersTypeSetup=Configuració dels tipus de socis -MemberTypeModified=Member type modified -DeleteAMemberType=Delete a member type -ConfirmDeleteMemberType=Are you sure you want to delete this member type? -MemberTypeDeleted=Member type deleted -MemberTypeCanNotBeDeleted=Member type can not be deleted +MemberTypeModified=Tipus de soci modificat +DeleteAMemberType=Elimina un tipus de soci +ConfirmDeleteMemberType=Estàs segur de voler eliminar aquest tipus de soci? +MemberTypeDeleted=Tipus de soci eliminat +MemberTypeCanNotBeDeleted=El tipus de soci no es pot eliminar NewSubscription=Nova afiliació NewSubscriptionDesc=Utilitzi aquest formulari per registrar-se com un nou soci de l'entitat. Per a una renovació (si ja és soci) poseu-vos en contacte amb l'entitat mitjançant l'e-mail %s. Subscription=Afiliació @@ -92,9 +92,9 @@ ValidateMember=Valida un soci ConfirmValidateMember=Vols validar aquest soci? FollowingLinksArePublic=Els enllaços següents són pàgines accessibles a tothom i no protegides per cap habilitació Dolibarr. PublicMemberList=Llistat públic de socis -BlankSubscriptionForm=Public self-subscription form -BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided. -EnablePublicSubscriptionForm=Enable the public website with self-subscription form +BlankSubscriptionForm=Formulari públic d'auto-subscripció +BlankSubscriptionFormDesc=Dolibarr us pot proporcionar una URL/lloc web públic per permetre que els visitants externs sol·licitin subscriure's a la fundació. Si un mòdul de pagament en línia està habilitat, també es pot proporcionar automàticament un formulari de pagament. +EnablePublicSubscriptionForm=Activa el lloc web públic amb el formulari d'auto-subscripció ForceMemberType=Força el tipus de soci ExportDataset_member_1=Socis i quotes ImportDataset_member_1=Socis @@ -168,12 +168,12 @@ TurnoverOrBudget=Volum de vendes (empresa) o Pressupost (associació o col.lecti DefaultAmount=Import per defecte cotització CanEditAmount=El visitant pot triar/modificar l'import de la seva cotització MEMBER_NEWFORM_PAYONLINE=Anar a la pàgina integrada de pagament en línia -ByProperties=By nature -MembersStatisticsByProperties=Members statistics by nature +ByProperties=Per naturalesa +MembersStatisticsByProperties=Estadístiques dels membres per naturalesa MembersByNature=Aquesta pantalla mostra estadístiques de socis per caràcter. MembersByRegion=Aquesta pantalla mostra les estadístiques de socis per regió. VATToUseForSubscriptions=Taxa d'IVA per les afiliacions NoVatOnSubscription=Sense IVA per a les afiliacions MEMBER_PAYONLINE_SENDEMAIL=E-Mail per advertir en cas de recepció de confirmació d'un pagament validat d'una afiliació (Exemple: pagament-fet@exemple.com) ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Producte utilitzat per la línia de subscripció a la factura: %s -NameOrCompany=Name or company +NameOrCompany=Nom o empresa diff --git a/htdocs/langs/ca_ES/modulebuilder.lang b/htdocs/langs/ca_ES/modulebuilder.lang index 5a70d94433b..b5e1c808489 100644 --- a/htdocs/langs/ca_ES/modulebuilder.lang +++ b/htdocs/langs/ca_ES/modulebuilder.lang @@ -3,8 +3,8 @@ ModuleBuilderDesc=Aquestes eines han de ser utilitzades per usuaris o desenvolup EnterNameOfModuleDesc=Introdueix el nom del mòdul/aplicació per crear sense espais. Utilitza majúscules per separar paraules (Per exemple: MyModule, EcommerceForShop, SyncWithMySystem...) EnterNameOfObjectDesc=Introduïu el nom de l'objecte que voleu crear sense espais. Utilitzeu majúscules per separar paraules (Per exemple: MyObject, Estudiant, Professor...). El fitxer de classes CRUD, però també el fitxer API, pàgines per a llistar/afegir/editar/eliminar objectes i els fitxers SQL es generaran. ModuleBuilderDesc2=Ruta on es generen/modifiquen els mòduls (primer directori alternatiu definit a %s): %s -ModuleBuilderDesc3=Generated/editable modules found: %s -ModuleBuilderDesc4=A module is detected as 'editable' when the file %s exists in root of module directory +ModuleBuilderDesc3=S'han trobat mòduls generats/editables: %s +ModuleBuilderDesc4=Es detecta un mòdul com "editable" quan el fitxer %s existeix al directori arrel del mòdul NewModule=Nou mòdul NewObject=Nou objecte ModuleKey=Clau del mòdul @@ -12,7 +12,7 @@ ObjectKey=Clau de l'objecte ModuleInitialized=Mòdul inicialitzat FilesForObjectInitialized=S'han inicialitzat els fitxers per al nou objecte '%s' FilesForObjectUpdated=Fitxers de l'objecte '%s' actualitzat (fitxers .sql i fitxer .class.php) -ModuleBuilderDescdescription=Enter here all general information that describe your module. +ModuleBuilderDescdescription=Introduïu aquí tota la informació general que descrigui el vostre mòdul. ModuleBuilderDescspecifications=Podeu introduir aquí un text llarg per descriure les especificacions del vostre mòdul que no està estructurat en altres pestanyes. Així que teniu a la vostra disposició totes les normes per desenvolupar. També aquest contingut de text s'inclourà a la documentació generada (veure l'última pestanya). Podeu utilitzar el format de Markdown, però es recomana utilitzar el format Asciidoc (Comparació entre .md i .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown). ModuleBuilderDescobjects=Definiu aquí els objectes que voleu gestionar amb el mòdul. Es crearà una classe CRUD DAO, fitxers SQL, una pàgina per llistar el registre d'objectes, per crear/editar/veure un registre i es generarà una API. ModuleBuilderDescmenus=Aquesta pestanya està dedicada a definir les entrades de menú proporcionades pel teu mòdul. @@ -26,69 +26,69 @@ EnterNameOfObjectToDeleteDesc=Pots eliminar un objecte. AVÍS: Tots els fitxers DangerZone=Zona perillosa BuildPackage=Construeix paquet/documentació BuildDocumentation=Construeix documentació -ModuleIsNotActive=This module was not activated yet. Go into %s to make it live or click here: +ModuleIsNotActive=Aquest mòdul no s'ha activat encara. Entreu a %s per posar-ho en marxa o feu clic aquí: ModuleIsLive=Aquest mòdul s'ha activat. Qualsevol canvi en ell pot trencar una característica activa actual. DescriptionLong=Descripció llarga EditorName=Nom de l'editor EditorUrl=URL d'editor DescriptorFile=Fitxer descriptor del mòdul -ClassFile=File for PHP DAO CRUD class +ClassFile=Fitxer per a la classe CRUD DAO PHP ApiClassFile=Fitxer per la classe PHP API PageForList=Pàgina PHP per a la llista de registres PageForCreateEditView=Pàgina PHP per crear/editar/veure un registre -PageForAgendaTab=PHP page for event tab -PageForDocumentTab=PHP page for document tab -PageForNoteTab=PHP page for note tab +PageForAgendaTab=Pàgina de PHP per a la pestanya d'esdeveniments +PageForDocumentTab=Pàgina de PHP per a la pestanya de documents +PageForNoteTab=Pàgina de PHP per a la pestanya de notes PathToModulePackage=Ruta al zip del paquet del mòdul/aplicació PathToModuleDocumentation=Ruta al fitxer de documentació del mòdul/aplicació SpaceOrSpecialCharAreNotAllowed=Els espais o caràcters especials no estan permesos. FileNotYetGenerated=El fitxer encara no s'ha generat SpecificationFile=Arxiu amb regles de negoci -LanguageFile=File for language +LanguageFile=Arxiu del llenguatge ConfirmDeleteProperty=Esteu segur que voleu suprimir la propietat %s Això canviarà el codi a la classe PHP, però també eliminarà la columna de la definició de la taula de l'objecte. NotNull=No és NULL -NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0). +NotNullDesc=1=Estableix la base de dades a NOT NULL. -1=Permet els valors nuls i força el valor a ser NULL si és buit ('' ó 0). SearchAll=Utilitzat per a 'cerca tot' DatabaseIndex=Índex de bases de dades FileAlreadyExists=El fitxer %s ja existeix TriggersFile=Fitxer del codi de triggers HooksFile=Fitxer per al codi de hooks -ArrayOfKeyValues=Array of key-val -ArrayOfKeyValuesDesc=Array of keys and values if field is a combo list with fixed values +ArrayOfKeyValues=Matriu de clau-valor +ArrayOfKeyValuesDesc=Matriu de claus i valors si el camp és una llista desplegable amb valors fixos WidgetFile=Fitxer de widget ReadmeFile=Fitxer Readme ChangeLog=Fitxer ChangeLog -TestClassFile=File for PHP Unit Test class +TestClassFile=Fitxer per a la classe de proves Unit amb PHP SqlFile=Fitxer Sql -PageForLib=File for PHP libraries -SqlFileExtraFields=Sql file for complementary attributes +PageForLib=Fitxer per a llibreries PHP +SqlFileExtraFields=Fitxer SQL per a atributs complementaris SqlFileKey=Fitxer Sql per a claus AnObjectAlreadyExistWithThisNameAndDiffCase=Ja existeix un objecte amb aquest nom i un cas diferent UseAsciiDocFormat=Podeu utilitzar el forma Markdown, però es recomana utilitzar el format Asciidoc (Comparació entre .md i .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown). -IsAMeasure=Is a measure -DirScanned=Directory scanned -NoTrigger=No trigger -NoWidget=No widget -GoToApiExplorer=Go to API explorer -ListOfMenusEntries=List of menu entries -ListOfPermissionsDefined=List of defined permissions -EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION) -VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only. Using a negative value means field is not shown by default on list but can be selected for viewing) -IsAMeasureDesc=Can the value of field be cumulated to get a total into list ? (Examples: 1 or 0) -SearchAllDesc=Is the field used to make a search from the quick search tool ? (Examples: 1 or 0) -SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax. -LanguageDefDesc=Enter in this files, all the key and the translation for each language file. -MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s) -PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s) -HooksDefDesc=Define in the module_parts['hooks'] property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on 'initHooks(' in core code).
    Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on 'executeHooks' in core code). -TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed. -SeeIDsInUse=See IDs in use in your installation -SeeReservedIDsRangeHere=See range of reserved IDs -ToolkitForDevelopers=Toolkit for Dolibarr developers -TryToUseTheModuleBuilder=If you have knowledge in SQL and PHP, you can try to use the native module builder wizard. Just enable the module and use the wizard by clicking the on the top right menu. Warning: This is a developer feature, bad use may breaks your application. -SeeTopRightMenu=See on the top right menu -AddLanguageFile=Add language file -YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages") -DropTableIfEmpty=(Delete table if empty) -TableDoesNotExists=The table %s does not exists -TableDropped=Table %s deleted +IsAMeasure=És una mesura +DirScanned=Directori escanejat +NoTrigger=Sense activador (trigger) +NoWidget=Sense widget +GoToApiExplorer=Ves a l'explorador de l'API +ListOfMenusEntries=Llista d'entrades de menú +ListOfPermissionsDefined=Llista de permisos definits +EnabledDesc=Condició per tenir activat aquest camp (Exemples: 1 ó $conf->global->MYMODULE_MYOPTION) +VisibleDesc=El camp és visible? (Exemples: 0=Mai visible, 1=Visible en llistes i en formularis de creació/actualització/visualització, 2=Visible només en llistes, 3=Visible només en formularis de creació/actualització/visualització. Si s'assigna un valor negatiu el camp no es mostra per defecte en llistes, però es pot seleccionar per visualitzar. +IsAMeasureDesc=Es pot acumular el valor del camp per obtenir una suma total de la llista? (Exemples: 1 ó 0) +SearchAllDesc=S'utilitza el camp per realitzar una cerca des de l'eina de cerca ràpida? (Exemples: 1 ó 0) +SpecDefDesc=Introduïu aquí tota la documentació que voleu proporcionar amb el vostre mòdul que encara no està definit per altres pestanyes. Podeu utilitzar .md o millor, la sintaxi enriquida .asciidoc. +LanguageDefDesc=Introduïu a aquests fitxers, totes les claus i les traduccions per a cada fitxer d'idioma. +MenusDefDesc=Definiu aquí els menús proporcionats pel vostre mòdul (un cop definits, són visibles en l'editor de menús %s) +PermissionsDefDesc=Definiu aquí els nous permisos proporcionats pel vostre mòdul (una vegada definit, són visibles a la configuració de permisos del sistema %s) +HooksDefDesc=Definiu a la propietat module_parts['hooks'], en el descriptor del mòdul, el context dels "hooks" que voleu gestionar (una llista de contextos es pot trobar si cerqueu 'initHooks' (en el codi del nucli de Dolibarr.
    Editeu el fitxer del "hook" per afegir el codi de les vostres funcions "hookables" (les quals es poden trobar cercant "executeHooks" en el codi del nucli de Dolibarr). +TriggerDefDesc=Definiu en el fitxer "trigger" el codi que voleu executar per a cada esdeveniment de negoci executat. +SeeIDsInUse=Veure IDs en ús a la vostra instal·lació +SeeReservedIDsRangeHere=Consultar l'interval d'identificadors reservats +ToolkitForDevelopers=Kit d'eines per als desenvolupadors de Dolibarr +TryToUseTheModuleBuilder=Si teniu coneixements de SQL i PHP, podeu provar d'utilitzar l'assistent de generador de mòduls nadiu. Només activeu el mòdul i utilitzeu l'assistent fent clic a al menú superior dret. Advertència: aquesta és una eina per a desenvolupadors, un mal ús pot fer malbé la vostra aplicació. +SeeTopRightMenu=Vegeu al menú superior dret +AddLanguageFile=Afegir un fitxer d'idioma +YouCanUseTranslationKey=Podeu utilitzar aquí una clau que és la clau de traducció que es troba en el fitxer d'idioma (vegeu la pestanya "Idiomes"). +DropTableIfEmpty=(Suprimeix la taula si està buida) +TableDoesNotExists=La taula %s no existeix +TableDropped=S'ha esborrat la taula %s diff --git a/htdocs/langs/ca_ES/multicurrency.lang b/htdocs/langs/ca_ES/multicurrency.lang index 04b52f7e356..5254cf2401d 100644 --- a/htdocs/langs/ca_ES/multicurrency.lang +++ b/htdocs/langs/ca_ES/multicurrency.lang @@ -7,14 +7,14 @@ multicurrency_syncronize_error=Error de sincronització: %s MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Utilitza la data del document per trobar el tipus de canvi, en lloc d'utilitzar la conversió més recent coneguda multicurrency_useOriginTx=Quan un objecte es crea des d'un altre, manté la conversió original de l'objecte origen (en cas contrari, utilitza l'última conversió coneguda) CurrencyLayerAccount=API Moneda-Layer -CurrencyLayerAccount_help_to_synchronize=You sould create an account on their website to use this functionnality
    Get your API key
    If you use a free account you can't change the currency source (USD by default)
    But if your main currency isn't USD you can use the alternate currency source to force you main currency

    You are limited at 1000 synchronizations per month +CurrencyLayerAccount_help_to_synchronize=Hauríeu de crear un compte al seu lloc web per utilitzar aquesta funcionalitat.
    Obteniu la vostra clau per l'API
    Si utilitzeu un compte gratuït, no podeu canviar la moneda d'origen (USD per defecte)
    Però si la vostra moneda principal no és USD, podeu utilitzar una moneda alternativa d'origen per forçar la vostra moneda principal

    Esteu limitat a 1000 sincronitzacions per mes multicurrency_appId=Clau API multicurrency_appCurrencySource=Moneda origen -multicurrency_alternateCurrencySource=Alternate currency source +multicurrency_alternateCurrencySource=Moneda d'origen alternativa CurrenciesUsed=Monedes utilitzades CurrenciesUsed_help_to_add=Afegeix les diferents monedes i conversions que necessitis per utilitzar pressupostos, comandes, etc. rate=Taxa MulticurrencyReceived=Rebut, moneda original MulticurrencyRemainderToTake=Import restant, moneda original MulticurrencyPaymentAmount=Import de pagament, moneda original -AmountToOthercurrency=Amount To (in currency of receiving account) +AmountToOthercurrency=Import (en la moneda del compte que rep) diff --git a/htdocs/langs/ca_ES/opensurvey.lang b/htdocs/langs/ca_ES/opensurvey.lang index 209beb7544c..8111659f00b 100644 --- a/htdocs/langs/ca_ES/opensurvey.lang +++ b/htdocs/langs/ca_ES/opensurvey.lang @@ -57,4 +57,4 @@ ErrorInsertingComment=S'ha produït un error ha l'inserir el seu comentari MoreChoices=Introdueixi més opcions pels votants SurveyExpiredInfo=L'enquesta s'ha tancat o el temps de votació s'ha acabat. EmailSomeoneVoted=%s ha emplenat una línia.\nPot trobar la seva enquesta en l'enllaç:\n%s -ShowSurvey=Show survey +ShowSurvey=Mostra l'enquesta diff --git a/htdocs/langs/ca_ES/orders.lang b/htdocs/langs/ca_ES/orders.lang index 13bb8ae418c..a7ad18af446 100644 --- a/htdocs/langs/ca_ES/orders.lang +++ b/htdocs/langs/ca_ES/orders.lang @@ -152,7 +152,7 @@ OrderCreated=Les seves comandes han estat creats OrderFail=S'ha produït un error durant la creació de les seves comandes CreateOrders=Crear comandes ToBillSeveralOrderSelectCustomer=Per crear una factura per nombroses comandes, faci primer clic sobre el client i després esculli "%s". -OptionToSetOrderBilledNotEnabled=Option (from module Workflow) to set order to 'Billed' automatically when invoice is validated is off, so you will have to set status of order to 'Billed' manually. -IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated. +OptionToSetOrderBilledNotEnabled=Està desactivada l'opció (del mòdul Workflow) per canviar automàticament l'estat de la comanda com a "Facturada" quan la factura es valida, així que haurà d'establir manualment l'estat de la comanda com a "Facturada". +IfValidateInvoiceIsNoOrderStayUnbilled=Si la validació de la factura és "No", l'ordre romandrà a l'estat "No facturat" fins que es validi la factura. CloseReceivedSupplierOrdersAutomatically=Tanca automàticament la comada a "%s" si es reben tots els productes. SetShippingMode=Indica el tipus d'enviament diff --git a/htdocs/langs/ca_ES/other.lang b/htdocs/langs/ca_ES/other.lang index 2435d415e26..fb160904f6b 100644 --- a/htdocs/langs/ca_ES/other.lang +++ b/htdocs/langs/ca_ES/other.lang @@ -3,7 +3,7 @@ SecurityCode=Codi de seguretat NumberingShort=N° Tools=Utilitats TMenuTools=Utilitats -ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.

    All the tools can be reached in the left menu. +ToolsDesc=Aquí es recullen totes les eines diverses que no s'inclouen en altres entrades del menú.

    Podeu accedir a totes les eines des del menú de l'esquerra. Birthday=Aniversari BirthdayDate=Data d'aniversari DateToBirth=Data de naixement @@ -11,23 +11,23 @@ BirthdayAlertOn=alerta aniversari activada BirthdayAlertOff=alerta aniversari desactivada TransKey=Traducció de la clau TransKey MonthOfInvoice=Mes (número 1-12) de la data de la factura -TextMonthOfInvoice=Month (text) of invoice date +TextMonthOfInvoice=Mes (text) de la data de factura PreviousMonthOfInvoice=Mes anterior (número 1-12) de la data de la factura TextPreviousMonthOfInvoice=Mes anterior (text) de la data de la factura NextMonthOfInvoice=Mes següent (número 1-12) de la data de la factura TextNextMonthOfInvoice=Mes següent (text) de la data de la factura ZipFileGeneratedInto=Fitxer Zip generat a %s. DocFileGeneratedInto=Fitxer del document generat a %s. -JumpToLogin=Disconnected. Go to login page... -MessageForm=Message on online payment form +JumpToLogin=Desconnectat. Aneu a la pàgina d'inici de sessió ... +MessageForm=Missatge al formulari de pagament en línia MessageOK=Missatge a la pàgina de retorn de pagament confirmat MessageKO=Missatge a la pàgina de retorn de pagament cancel·lat YearOfInvoice=Any de la data de factura PreviousYearOfInvoice=Any anterior de la data de la factura NextYearOfInvoice=Any següent de la data de la factura -DateNextInvoiceBeforeGen=Date of next invoice (before generation) -DateNextInvoiceAfterGen=Date of next invoice (after generation) +DateNextInvoiceBeforeGen=Data de la propera factura (abans de la generació) +DateNextInvoiceAfterGen=Data de la propera factura (després de la generació) Notify_FICHINTER_ADD_CONTACT=Contacte afegit a la intervenció Notify_FICHINTER_VALIDATE=Validació fitxa intervenció @@ -76,19 +76,19 @@ MaxSize=Tamany màxim AttachANewFile=Adjuntar nou arxiu/document LinkedObject=Objecte adjuntat NbOfActiveNotifications=Nombre de notificacions (nº de destinataris) -PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__ -PredefinedMailTestHtml=__(Hello)__\nThis is a test mail (the word test must be in bold).
    The two lines are separated by a carriage return.

    __USER_SIGNATURE__ -PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__ -PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__ -PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__ -PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__ -PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__ -PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__ -PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__ -PredefinedMailContentSendShipping=__(Hello)__\n\nYou will find here the shipping __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__ -PredefinedMailContentSendFichInter=__(Hello)__\n\nYou will find here the intervention __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__ -PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__ -PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__ +PredefinedMailTest=__(Hello)__\nAquest és un correu electrònic de prova enviat a __EMAIL__.\nLes dues línies estan separades per un salt de línia.\n\n__USER_SIGNATURE__ +PredefinedMailTestHtml=__(Hello)__\nAquest és un correu electrònic de prova (la paraula prova ha d'estar en negreta).
    Les dues línies es separen amb un salt de línia.

    __USER_SIGNATURE__ +PredefinedMailContentSendInvoice=__(Hello)__\n\nAquí trobareu la factura __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__ +PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nEns agradaria advertir-vos de que la factura __REF__ sembla que no està pagada. Així que s'ha adjuntat de nou el fitxer de la factura, com a recordatori.\n\n__ONLINE_PAYMENT_URL__\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__ +PredefinedMailContentSendProposal=__(Hello)__\n\nTrobareu aquí la proposta comercial __PREF__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nTrobareu aquí la sol·licitud de cotització __REF__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__ +PredefinedMailContentSendOrder=__(Hello)__\n\nTrobareu aquí la comanda __REF__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__ +PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nTrobareu aquí la nostra comanda __REF__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__ +PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nTrobareu aquí la factura __REF__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__ +PredefinedMailContentSendShipping=__(Hello)__\n\nTrobareu aquí l'enviament __REF__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__ +PredefinedMailContentSendFichInter=__(Hello)__\n\nTrobareu aquí la intervenció __REF__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__ +PredefinedMailContentThirdparty=__(Hello)__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__ +PredefinedMailContentUser=__(Hello)__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__ DemoDesc=Dolibarr és un ERP/CRM per a la gestió de negocis (professionals o associacions), compost de mòduls funcionals independents i opcionals. Una demostració que incloga tots aquests mòduls no té sentit perquè no utilitzarà tots els mòduls al mateix temps. Per això, hi han disponibles diferents tipus de perfils de demostració. ChooseYourDemoProfil=Selecciona el perfil de demo que cobreixi millor les teves necessitats... ChooseYourDemoProfilMore=o construeix el teu perfil
    (selecció de mòduls manual) @@ -162,9 +162,9 @@ SizeUnitinch=polzada SizeUnitfoot=peu SizeUnitpoint=punt BugTracker=Incidències -SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.
    Change will become effective once you click on the confirmation link in the email.
    Check your inbox. +SendNewPasswordDesc=Aquest formulari us permet sol·licitar una nova contrasenya. Se us enviarà a la vostra adreça electrònica. El canvi es farà efectiu una vegada que feu clic a l'enllaç de confirmació al correu electrònic.
    Comproveu la vostra safata d'entrada. BackToLoginPage=Tornar a la pàgina de connexió -AuthenticationDoesNotAllowSendNewPassword=Authentication mode is %s.
    In this mode, Dolibarr can't know nor change your password.
    Contact your system administrator if you want to change your password. +AuthenticationDoesNotAllowSendNewPassword=El mode d'autenticació és %s.
    En aquest mode, Dolibarr no pot saber ni canviar la vostra contrasenya.
    Contacteu l'administrador del sistema si voleu canviar la vostra contrasenya. EnableGDLibraryDesc=Instala o habilita la llibreria GD en la teva instal·lació PHP per poder utilitzar aquesta opció. ProfIdShortDesc=Prof Id %s és una informació que depèn del país del tercer.
    Per exemple, per al país %s, és el codi %s. DolibarrDemo=Demo de Dolibarr ERP/CRM @@ -186,7 +186,7 @@ EMailTextInterventionAddedContact=La nova intervenció %s t'ha sigut assignada. EMailTextInterventionValidated=Fitxa intervenció %s validada EMailTextInvoiceValidated=Factura %s validada EMailTextProposalValidated=El pressupost %s que el concerneix ha estat validat. -EMailTextProposalClosedSigned=The proposal %s has been closed signed. +EMailTextProposalClosedSigned=La proposta %s s'ha tancat signada. EMailTextOrderValidated=La comanda %s que el concerneix ha estat validada. EMailTextOrderApproved=Comanda %s aprovada EMailTextOrderValidatedBy=La comanda %s ha sigut registrada per %s. @@ -214,7 +214,7 @@ StartUpload=Transferir CancelUpload=Cancel·lar transferència FileIsTooBig=L'arxiu és massa gran PleaseBePatient=Preguem esperi uns instants... -ResetPassword=Reset password +ResetPassword=Restablir la contrasenya RequestToResetPasswordReceived=S'ha rebut una sol·licitud per canviar la contrasenya de Dolibarr NewKeyIs=Aquesta és la nova contrasenya per iniciar sessió NewKeyWillBe=La seva nova contrasenya per iniciar sessió en el software serà @@ -224,7 +224,9 @@ ForgetIfNothing=Si vostè no ha sol·licitat aquest canvi, simplement ignori aqu IfAmountHigherThan=si l'import es major que %s SourcesRepository=Repositori de fonts Chart=Gràfic -PassEncoding=Password encoding +PassEncoding=Codificació de contrasenya +PermissionsAdd=Permisos afegits +PermissionsDelete=Permisos eliminats ##### Export ##### ExportsArea=Àrea d'exportacions diff --git a/htdocs/langs/ca_ES/paybox.lang b/htdocs/langs/ca_ES/paybox.lang index 88200028d48..8eed83c2fd4 100644 --- a/htdocs/langs/ca_ES/paybox.lang +++ b/htdocs/langs/ca_ES/paybox.lang @@ -10,7 +10,7 @@ ToComplete=A completar YourEMail=E-mail de confirmació de pagament Creditor=Beneficiari PaymentCode=Codi de pagament -PayBoxDoPayment=Pay with Credit or Debit Card (Paybox) +PayBoxDoPayment=Pagament amb targeta de crèdit o dèbit (Paybox) ToPay=Emetre pagament YouWillBeRedirectedOnPayBox=Serà redirigit a la pàgina segura de PayBox per indicar la seva targeta de crèdit Continue=Continuar diff --git a/htdocs/langs/ca_ES/paypal.lang b/htdocs/langs/ca_ES/paypal.lang index 1314c1bf851..591d5da3c25 100644 --- a/htdocs/langs/ca_ES/paypal.lang +++ b/htdocs/langs/ca_ES/paypal.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - paypal PaypalSetup=Configuració mòdul PayPal PaypalDesc=Aquest mòdul ofereix una pàgina de pagament a través del proveïdor Paypal per realitzar qualsevol pagament o un pagament en relació amb un objecte Dolibarr (factures, comandes ...) -PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal) +PaypalOrCBDoPayment=Pagament amb Paypal (Targeta de crèdit o Paypal) PaypalDoPayment=Continuar el pagament mitjançant Paypal PAYPAL_API_SANDBOX=Mode de proves(sandbox) PAYPAL_API_USER=Nom usuari API @@ -11,11 +11,11 @@ PAYPAL_SSLVERSION=Versió Curl SSL PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Proposar pagament integral (Targeta+Paypal) o només Paypal PaypalModeIntegral=Integral PaypalModeOnlyPaypal=Només PayPal -ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page +ONLINE_PAYMENT_CSS_URL=URL opcional del full d'estil CSS a la pàgina de pagament en línia ThisIsTransactionId=Identificador de la transacció: %s PAYPAL_ADD_PAYMENT_URL=Afegir la url del pagament Paypal en enviar un document per e-mail PredefinedMailContentLink=Podeu fer clic a l'enllaç assegurança de sota per realitzar el seu pagament a través de PayPal\n\n%s\n\n -YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode +YouAreCurrentlyInSandboxMode=Actualment esteu en el mode %s "sandbox" NewOnlinePaymentReceived=Nou pagament online rebut NewOnlinePaymentFailed=S'ha intentat el nou pagament online però ha fallat ONLINE_PAYMENT_SENDEMAIL=E-Mail a avisar en cas de pagament (amb èxit o no) diff --git a/htdocs/langs/ca_ES/printing.lang b/htdocs/langs/ca_ES/printing.lang index 60a1050d818..2f483e1af3d 100644 --- a/htdocs/langs/ca_ES/printing.lang +++ b/htdocs/langs/ca_ES/printing.lang @@ -9,8 +9,8 @@ PrintingDriverDesc=Configuració variables pel driver d'impressió ListDrivers=Llista de controladors PrintTestDesc=Llista de impressores FileWasSentToPrinter=L'arxiu %s ha sigut enviat a la impressora -ViaModule=via the module -NoActivePrintingModuleFound=No active driver to print document. Check setup of module %s. +ViaModule=a través del mòdul +NoActivePrintingModuleFound=No hi ha cap controlador d'impressió actiu. Comproveu la configuració del mòdul %s. PleaseSelectaDriverfromList=Seleccini un driver del llistat PleaseConfigureDriverfromList=Configura el driver seleccionat del llistat. SetupDriver=Configuració del driver diff --git a/htdocs/langs/ca_ES/productbatch.lang b/htdocs/langs/ca_ES/productbatch.lang index 66e0b855f93..8d74fd47544 100644 --- a/htdocs/langs/ca_ES/productbatch.lang +++ b/htdocs/langs/ca_ES/productbatch.lang @@ -21,4 +21,4 @@ ProductDoesNotUseBatchSerial=Aquest producte no utilitza lot/número de sèrie ProductLotSetup=Configuració del mòdul lot/sèries ShowCurrentStockOfLot=Mostra l'estoc actual de la parella producte/lot ShowLogOfMovementIfLot=Mostra el registre de moviments de la parella producte/lot -StockDetailPerBatch=Stock detail per lot +StockDetailPerBatch=Detalls del stock per lot diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang index ef4434ed052..b31933a41b4 100644 --- a/htdocs/langs/ca_ES/products.lang +++ b/htdocs/langs/ca_ES/products.lang @@ -20,10 +20,10 @@ ProductVatMassChange=Canvi d'IVA massiu ProductVatMassChangeDesc=Pot utilitzar aquesta pàgina per modificar la tassa d'IVA definida en els productes o serveis d'un valor a un altre. Atenció, ja aquest canvi es realitzara en tota la base de dades. MassBarcodeInit=Inicialització massiu de codis de barres MassBarcodeInitDesc=Pot utilitzar aquesta pàgina per inicialitzar el codi de barres en els objectes que no tenen un codi de barres definit. Comprovi abans que el mòdul de codis de barres estar ben configurat -ProductAccountancyBuyCode=Accounting code (purchase) -ProductAccountancySellCode=Accounting code (sale) -ProductAccountancySellIntraCode=Accounting code (sale intra-community) -ProductAccountancySellExportCode=Accounting code (sale export) +ProductAccountancyBuyCode=Codi comptable (compra) +ProductAccountancySellCode=Codi comptable (venda) +ProductAccountancySellIntraCode=Codi comptable (venda intracomunitària) +ProductAccountancySellExportCode=Codi comptable (exportació de venda) ProductOrService=Producte o servei ProductsAndServices=Productes i serveis ProductsOrServices=Productes o serveis @@ -143,7 +143,7 @@ RowMaterial=Matèria prima CloneProduct=Clonar producte/servei ConfirmCloneProduct=Estàs segur que vols clonar el producte o servei %s? CloneContentProduct=Clonar només la informació general del producte/servei -ClonePricesProduct=Clone prices +ClonePricesProduct=Clonar preus CloneCompositionProduct=Clonar productes/serveis compostos CloneCombinationsProduct=Clonar variants de producte ProductIsUsed=Aquest producte és utilitzat @@ -153,7 +153,7 @@ BuyingPrices=Preus de compra CustomerPrices=Preus de client SuppliersPrices=Preus de proveïdor SuppliersPricesOfProductsOrServices=Preus de proveïdors (productes o serveis) -CustomCode=Customs/Commodity/HS code +CustomCode=Duana/mercaderia/codi HS CountryOrigin=País d'origen Nature=Caràcter ShortLabel=Etiqueta curta @@ -196,14 +196,15 @@ CurrentProductPrice=Preu actual AlwaysUseNewPrice=Utilitzar sempre el preu actual AlwaysUseFixedPrice=Utilitzar el preu fixat PriceByQuantity=Preus diferents per quantitat +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Rang de quantitats MultipriceRules=Regles de nivell de preu UseMultipriceRules=Utilitza les regles de preu per nivell (definit en la configuració del mòdul de productes) per autocalcular preus dels altres nivells en funció del primer nivell PercentVariationOver=%% variació sobre %s PercentDiscountOver=%% descompte sobre %s KeepEmptyForAutoCalculation=Mantingueu-lo buit per obtenir-ho calculat automàticament pel pes o el volum dels productes -VariantRefExample=Example: COL -VariantLabelExample=Example: Color +VariantRefExample=Exemple: COL +VariantLabelExample=Exemple: color ### composition fabrication Build=Fabricar ProductsMultiPrice=Productes i preus per cada nivell de preu @@ -273,7 +274,7 @@ WarningSelectOneDocument=Selecciona com a mínim un document DefaultUnitToShow=Unitat NbOfQtyInProposals=Qtat. en pressupostos ClinkOnALinkOfColumn=Fes clic en l'enllaç de columna %s per aconseguir una vista detallada... -ProductsOrServicesTranslations=Products or services translation +ProductsOrServicesTranslations=Traducció de productes o serveis TranslatedLabel=Etiqueta traduïda TranslatedDescription=Descripció traduïda TranslatedNote=Notes traduïdes @@ -287,8 +288,8 @@ ConfirmDeleteProductBuyPrice=Esteu segur de voler eliminar aquest preu de compra SubProduct=Subproducte ProductSheet=Fulla de producte ServiceSheet=Fulla de servei -PossibleValues=Possible values -GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...) +PossibleValues=Valors possibles +GoOnMenuToCreateVairants=Anar al menu %s - %s per preparar variants de l'atribut (com colors, mides, etc...) #Attributes VariantAttributes=Atributs de variants diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang index 68a0c7f3ff3..07f9e8c03ab 100644 --- a/htdocs/langs/ca_ES/projects.lang +++ b/htdocs/langs/ca_ES/projects.lang @@ -10,18 +10,18 @@ PrivateProject=Contactes del projecte ProjectsImContactFor=Projectes on sóc explícitament un contacte AllAllowedProjects=Tots els projectes que puc llegir (meu + públic) AllProjects=Tots els projectes -MyProjectsDesc=This view is limited to projects you are a contact for. +MyProjectsDesc=Aquesta vista es limita als projectes dels quals sou un contacte. ProjectsPublicDesc=Aquesta vista mostra tots els projectes en els que vostè té dret a tenir visibilitat. TasksOnProjectsPublicDesc=Aquesta vista mostra totes les tasques en projectes en els que tens permisos de lectura. ProjectsPublicTaskDesc=Aquesta vista mostra tots els projectes als que té dret a visualitzar ProjectsDesc=Aquesta vista mostra tots els projectes (les seves autoritzacions li ofereixen una visió completa). TasksOnProjectsDesc=Aquesta vista mostra totes les tasques en tots els projectes (els teus permisos d'usuari et donen dret a visualitzar-ho tot). -MyTasksDesc=This view is limited to projects or tasks you are a contact for. +MyTasksDesc=Aquesta vista es limita als projectes o a les tasques pels quals sou un contacte. OnlyOpenedProject=Només visibles els projectes oberts (els projectes en estat d'esborrany o tancats no són visibles) ClosedProjectsAreHidden=Els projectes tancats no són visibles. 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 qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it. +AllTaskVisibleButEditIfYouAreAssigned=Totes les tasques per a projectes qualificats són visibles, però podeu ingressar només el temps per a la tasca assignada a l'usuari seleccionat. Assigneu la tasca si necessiteu introduir-hi el temps. OnlyYourTaskAreVisible=Només són visibles les tasques que tens assignades. Assigna't tasques si no són visibles i vols afegir-hi les hores. ImportDatasetTasks=Tasques de projectes ProjectCategories=Etiquetes de projecte @@ -76,7 +76,7 @@ Time=Temps ListOfTasks=Llistat de tasques GoToListOfTimeConsumed=Ves al llistat de temps consumit GoToListOfTasks=Ves al llistat de tasques -GanttView=Gantt View +GanttView=Vista de Gantt ListProposalsAssociatedProject=Llistat de pressupostos associats al projecte ListOrdersAssociatedProject=Llista de comandes de client associades al projecte ListInvoicesAssociatedProject=Llista de factures de client associades al projecte @@ -88,7 +88,7 @@ ListShippingAssociatedProject=Llista d'expedicions associades al projecte ListFichinterAssociatedProject=Llistat d'intervencions associades al projecte ListExpenseReportsAssociatedProject=Llistat d'informes de despeses associades al projecte ListDonationsAssociatedProject=Llistat de donacions associades al projecte -ListVariousPaymentsAssociatedProject=List of miscellaneous payments associated with the project +ListVariousPaymentsAssociatedProject=Llista de pagaments extres associats al projecte ListActionsAssociatedProject=Llista d'esdeveniments associats al projecte ListTaskTimeUserProject=Llistat del temps consumit en tasques d'aquest projecte ActivityOnProjectToday=Activitat en el projecte avui @@ -97,7 +97,7 @@ ActivityOnProjectThisWeek=Activitat en el projecte aquesta setmana ActivityOnProjectThisMonth=Activitat en el projecte aquest mes ActivityOnProjectThisYear=Activitat en el projecte aquest any ChildOfProjectTask=Fil de la tasca -ChildOfTask=Child of task +ChildOfTask=Dependències de la tasca NotOwnerOfProject=No és responsable d'aquest projecte privat AffectedTo=Assignat a CantRemoveProject=No es pot eliminar aquest projecte perquè està enllaçat amb altres objectes (factures, comandes o altres). Consulta la pestanya Referències. @@ -109,7 +109,7 @@ AlsoCloseAProject=Tancar també el projecte (mantindre obert si encara necessita ReOpenAProject=Reobrir projecte ConfirmReOpenAProject=Vols reobrir aquest projecte? ProjectContact=Contactes projecte -TaskContact=Task contacts +TaskContact=Contactes de la tasca ActionsOnProject=Esdeveniments del projecte YouAreNotContactOfProject=Vostè no és contacte d'aquest projecte privat UserIsNotContactOfProject=L'usuari no és un contacte d'aquest objecte privat @@ -117,7 +117,7 @@ DeleteATimeSpent=Elimina el temps dedicat ConfirmDeleteATimeSpent=Estàs segur que vols suprimir aquest temps emprat? DoNotShowMyTasksOnly=Veure també tasques no assignades a mi ShowMyTasksOnly=Veure només les tasques que tinc assignades -TaskRessourceLinks=Contacts task +TaskRessourceLinks=Contactes de la tasca ProjectsDedicatedToThisThirdParty=Projectes dedicats a aquest tercer NoTasks=Cap tasca per a aquest projecte LinkedToAnotherCompany=Enllaçat a una altra empresa @@ -171,13 +171,13 @@ ProjectMustBeValidatedFirst=El projecte primer ha de ser validat FirstAddRessourceToAllocateTime=Associa un recurs d'usuari per reservar el temps de la tasca InputPerDay=Entrada per dia InputPerWeek=Entrada per setmana -InputDetail=Input detail +InputDetail=Detall d'entrada TimeAlreadyRecorded=Aquest és el temps dedicat ja registrat per a aquesta tasca/dia i l'usuari %s ProjectsWithThisUserAsContact=Projectes amb aquest usuari com a contacte TasksWithThisUserAsContact=Tasques asignades a l'usuari ResourceNotAssignedToProject=No assignat a cap projecte ResourceNotAssignedToTheTask=No assignat a la tasca -TimeSpentBy=Time spent by +TimeSpentBy=Temps gastat per TasksAssignedTo=Tasques assignades a AssignTaskToMe=Assignar-me una tasca AssignTaskToUser=Assigna una tasca a %s @@ -211,9 +211,12 @@ OppStatusPENDING=Pendent OppStatusWON=Guanyat OppStatusLOST=Perdut Budget=Pressupost -LatestProjects=Latest %s projects -LatestModifiedProjects=Latest %s modified projects -OtherFilteredTasks=Other filtered tasks +AllowToLinkFromOtherCompany=Permet enllaçar projectes procedents d'altres companyies

    Valors possibles :
    - Mantenir en blanc: Pot enllaçar qualsevol projecte de la companyia (per defecte)
    - "tot" : Pot enllaçar qualsevol projecte, inclòs projectes d'altres companyies
    - Llista d'identificadors de tercers separats per comes : Pot enllaçar tots els projectes dels tercers definits dintre d'aquesta llista (Exemple : 123,4795,53)
    +LatestProjects=Darrers %s projectes +LatestModifiedProjects=Darrers %s projectes modificats +OtherFilteredTasks=Altres tasques filtrades +NoAssignedTasks=No hi ha tasques assignades (Assigneu-vos projectes/tasques des del quadre de selecció superior per introduir-hi temps) # Comments trans -AllowCommentOnTask=Allow user comments on tasks -AllowCommentOnProject=Allow user comments on projects +AllowCommentOnTask=Permet comentaris dels usuaris a les tasques +AllowCommentOnProject=Permetre comentaris dels usuaris als projectes + diff --git a/htdocs/langs/ca_ES/salaries.lang b/htdocs/langs/ca_ES/salaries.lang index 89a7405504d..3106ce2fe2b 100644 --- a/htdocs/langs/ca_ES/salaries.lang +++ b/htdocs/langs/ca_ES/salaries.lang @@ -13,5 +13,5 @@ TJM=Tarifa diaria mitjana CurrentSalary=Salari actual THMDescription=Aquest valor es pot utilitzar per calcular el cost del temps consumit per usuaris en un projecte sencer (si el mòdul del projecte està en ús) TJMDescription=Aquest valor només és informatiu i no s'utilitza en cap càlcul -LastSalaries=Latest %s salary payments -AllSalaries=All salary payments +LastSalaries=Últims %s pagaments de salari +AllSalaries=Tots els pagaments de salari diff --git a/htdocs/langs/ca_ES/sendings.lang b/htdocs/langs/ca_ES/sendings.lang index a75a539722c..423aaefb493 100644 --- a/htdocs/langs/ca_ES/sendings.lang +++ b/htdocs/langs/ca_ES/sendings.lang @@ -18,13 +18,13 @@ SendingCard=Fitxa d'enviament NewSending=Nou enviament CreateShipment=Crear enviament QtyShipped=Qt. enviada -QtyShippedShort=Qty ship. +QtyShippedShort=Quant. env. QtyPreparedOrShipped=Quantitat preparada o enviada QtyToShip=Qt. a enviar QtyReceived=Qt. rebuda QtyInOtherShipments=Quantitat a altres enviaments KeepToShip=Resta a enviar -KeepToShipShort=Remain +KeepToShipShort=Roman OtherSendingsForSameOrder=Altres enviaments d'aquesta comanda SendingsAndReceivingForSameOrder=Enviaments i recepcions per aquesta comanda SendingsToValidate=Enviaments a validar diff --git a/htdocs/langs/ca_ES/sms.lang b/htdocs/langs/ca_ES/sms.lang index a09ae3adc84..8d35e5f2ad7 100644 --- a/htdocs/langs/ca_ES/sms.lang +++ b/htdocs/langs/ca_ES/sms.lang @@ -48,4 +48,4 @@ SmsInfoNumero= (format internacional ex: +33899701761) DelayBeforeSending=Retard abans d'enviar (en minuts) SmsNoPossibleSenderFound=No hi ha qui envia. Comprova la configuració del proveïdor de SMS. SmsNoPossibleRecipientFound=No hi ha destinataris. Comproveu la configuració del seu proveïdor d'SMS. -DisableStopIfSupported=Disable STOP message (if supported) +DisableStopIfSupported=Desactiveu el missatge STOP (si és compatible) diff --git a/htdocs/langs/ca_ES/stocks.lang b/htdocs/langs/ca_ES/stocks.lang index 09b0dd14597..2d179b390b0 100644 --- a/htdocs/langs/ca_ES/stocks.lang +++ b/htdocs/langs/ca_ES/stocks.lang @@ -22,7 +22,7 @@ Movements=Moviments ErrorWarehouseRefRequired=El nom de referència del magatzem és obligatori ListOfWarehouses=Llistat de magatzems ListOfStockMovements=Llistat de moviments de estoc -MovementId=Movement ID +MovementId=ID del moviment StockMovementForId=ID de moviment %d ListMouvementStockProject=Llista de moviments d'estoc associats al projecte StocksArea=Àrea de magatzems @@ -34,7 +34,7 @@ LastMovement=Últim moviment LastMovements=Últims moviments Units=Unitats Unit=Unitat -StockCorrection=Stock correction +StockCorrection=Regularització d'estoc CorrectStock=Regularització d'estoc StockTransfer=Transferencia d'estoc TransferStock=Transferència d'estoc @@ -50,13 +50,13 @@ EnhancedValue=Valor PMPValue=Valor (PMP) PMPValueShort=PMP EnhancedValueOfWarehouses=Valor d'estocs -UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user +UserWarehouseAutoCreate=Crea un usuari de magatzem automàticament quan es crea un usuari AllowAddLimitStockByWarehouse=Permet afegir estoc límit i desitjat per parella (producte, magatzem) en lloc de únicament per producte IndependantSubProductStock=Estoc del producte i estoc del subproducte són independents QtyDispatched=Quantitat desglossada QtyDispatchedShort=Quant. rebuda QtyToDispatchShort=Quant. a enviar -OrderDispatch=Item receipts +OrderDispatch=Articles rebuts RuleForStockManagementDecrease=Regla per la reducció automàtica d'estoc (la reducció manual sempre és possible, excepte si hi ha una regla de reducció automàtica activada) RuleForStockManagementIncrease=Regla per l'increment automàtic d'estoc (l'increment manual sempre és possible, excepte si hi ha una regla d'increment automàtica activada) DeStockOnBill=Decrementar els estocs físics sobre les factures/abonaments a clients @@ -72,7 +72,7 @@ NoPredefinedProductToDispatch=No hi ha productes predefinits en aquest objecte. DispatchVerb=Desglossar StockLimitShort=Límit per l'alerta StockLimit=Estoc límit per les alertes -StockLimitDesc=(empty) means no warning.
    0 can be used for a warning as soon as stock is empty. +StockLimitDesc=(buit) significa cap advertència.
    0 es pot utilitzar per a una advertència quan l'estoc sigui buit. PhysicalStock=Estoc físic RealStock=Estoc real RealStockDesc=L'estoc físic o real és l'estoc que tens actualment als teus magatzems/emplaçaments interns. @@ -131,11 +131,11 @@ StockMustBeEnoughForInvoice=El nivell d'existències ha de ser suficient per afe StockMustBeEnoughForOrder=El nivell d'existències ha de ser suficient per afegir productes/serveis a comandes (la comprovació es fa quan s'afegeix una línia a la comanda en el cas de regles automàtiques de canvis d'estoc) StockMustBeEnoughForShipment= El nivell d'existències ha de ser suficient per afegir productes/serveis a enviaments (la comprovació es fa quan s'afegeix una línia a l'enviament en el cas de regles automàtiques de canvis d'estoc) MovementLabel=Etiqueta del moviment -DateMovement=Date of movement +DateMovement=Data de moviment InventoryCode=Moviments o codi d'inventari IsInPackage=Contingut en producte compost WarehouseAllowNegativeTransfer=L'estoc pot ser negatiu -qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks. +qtyToTranferIsNotEnough=No tens estoc suficient en el magatzem d'origen i la configuració no permet estocs negatius ShowWarehouse=Mostrar magatzem MovementCorrectStock=Ajustament d'estoc del producte %s MovementTransferStock=Transferència d'estoc de producte %s a un altre magatzem @@ -177,7 +177,7 @@ SelectFournisseur=Filtre de proveïdor inventoryOnDate=Inventari INVENTORY_DISABLE_VIRTUAL=Permet no canviar l'estoc del producte fill d'un kit a l'inventari INVENTORY_USE_MIN_PA_IF_NO_LAST_PA=Utilitza el preu de compra si no es pot trobar l'últim preu de compra -INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=Stock movement have date of inventory +INVENTORY_USE_INVENTORY_DATE_FROM_DATEMVT=El moviment d'estoc té data d'inventari inventoryChangePMPPermission=Permet canviar el valor PMP d'un producte ColumnNewPMP=Nova unitat PMP OnlyProdsInStock=No afegeixis producte sense estoc @@ -198,5 +198,5 @@ ExitEditMode=Surt de l'edició inventoryDeleteLine=Elimina la línia RegulateStock=Regula l'estoc ListInventory=Llistat -StockSupportServices=Stock management support services -StockSupportServicesDesc=By default, you can stock only product with type "product". If on, and if module service is on, you can also stock a product with type "service" +StockSupportServices=Serveis de suport a la gestió d'estoc +StockSupportServicesDesc=De manera predeterminada, només es pot assignar estoc als productes del tipus "producte". Si està activat i si el mòdul Serveis està activat, també podeu assignar estoc als productes del tipus "servei" diff --git a/htdocs/langs/ca_ES/stripe.lang b/htdocs/langs/ca_ES/stripe.lang index 264d2c762ec..8ea2f7fbc39 100644 --- a/htdocs/langs/ca_ES/stripe.lang +++ b/htdocs/langs/ca_ES/stripe.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - stripe StripeSetup=Configuració del mòdul Stripe -StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via Stripe. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...) +StripeDesc=Mòdul per oferir una pàgina de pagament en línia que accepti pagaments amb targeta de crèdit/dèbit mitjançant Stripe. Això es pot utilitzar per permetre als vostres clients fer pagaments oberts o el pagament d'un objecte particular de Dolibarr (factura, comanda, ...) StripeOrCBDoPayment=Pagar amb targeta de crèdit o Stripe FollowingUrlAreAvailableToMakePayments=Les següents URL estan disponibles per a permetre a un client fer un cobrament en objectes de Dolibarr PaymentForm=Formulari de pagament @@ -12,7 +12,7 @@ YourEMail=E-mail de confirmació de pagament STRIPE_PAYONLINE_SENDEMAIL=E-Mail a avisar en cas de pagament (amb èxit o no) Creditor=Beneficiari PaymentCode=Codi de pagament -StripeDoPayment=Pay with Credit or Debit Card (Stripe) +StripeDoPayment=Pagament amb targeta de crèdit o dèbit (Stripe) YouWillBeRedirectedOnStripe=Se us redirigirà a la pàgina de Stripe assegurada per introduir la informació de la vostra targeta de crèdit Continue=Continuar ToOfferALinkForOnlinePayment=URL de pagament %s diff --git a/htdocs/langs/ca_ES/suppliers.lang b/htdocs/langs/ca_ES/suppliers.lang index 09d31aef7a3..ca81f0dd61d 100644 --- a/htdocs/langs/ca_ES/suppliers.lang +++ b/htdocs/langs/ca_ES/suppliers.lang @@ -43,5 +43,5 @@ NotTheGoodQualitySupplier=Qualitat incorrecte ReputationForThisProduct=Reputació BuyerName=Nom del comprador AllProductServicePrices=Tots els preus de producte / servei -AllProductReferencesOfSupplier=All product / service references of supplier +AllProductReferencesOfSupplier=Totes les referències dels productes/serveis del proveïdor BuyingPriceNumShort=Preus de proveïdor diff --git a/htdocs/langs/ca_ES/trips.lang b/htdocs/langs/ca_ES/trips.lang index 7975687d8a8..43dabee6f5c 100644 --- a/htdocs/langs/ca_ES/trips.lang +++ b/htdocs/langs/ca_ES/trips.lang @@ -10,8 +10,8 @@ ListOfFees=Llistat notes de honoraris TypeFees=Tipus de despeses ShowTrip=Mostra l'informe de despeses NewTrip=Nou informe de despeses -LastExpenseReports=Latest %s expense reports -AllExpenseReports=All expense reports +LastExpenseReports=Últims %s informes de despeses +AllExpenseReports=Tots els informes de despeses CompanyVisited=Empresa/organització visitada FeesKilometersOrAmout=Import o quilòmetres DeleteTrip=Eliminar informe de despeses @@ -49,30 +49,30 @@ TF_PEAGE=Peatge TF_ESSENCE=Combustible TF_HOTEL=Hotel TF_TAXI=Taxi -EX_KME=Mileage costs -EX_FUE=Fuel CV +EX_KME=Cost de quilometratge +EX_FUE=CV de benzina EX_HOT=Hotel -EX_PAR=Parking CV -EX_TOL=Toll CV -EX_TAX=Various Taxes -EX_IND=Indemnity transportation subscription -EX_SUM=Maintenance supply -EX_SUO=Office supplies -EX_CAR=Car rental -EX_DOC=Documentation -EX_CUR=Customers receiving -EX_OTR=Other receiving -EX_POS=Postage -EX_CAM=CV maintenance and repair -EX_EMM=Employees meal -EX_GUM=Guests meal -EX_BRE=Breakfast -EX_FUE_VP=Fuel PV -EX_TOL_VP=Toll PV -EX_PAR_VP=Parking PV -EX_CAM_VP=PV maintenance and repair -DefaultCategoryCar=Default transportation mode -DefaultRangeNumber=Default range number +EX_PAR=CV d'aparcament +EX_TOL=CV de peatge +EX_TAX=Impostos varis +EX_IND=Indemnització de subscripció de transport +EX_SUM=Subministrament de manteniment +EX_SUO=Material d'oficina +EX_CAR=Lloguer de cotxes +EX_DOC=Documentació +EX_CUR=Clients que reben +EX_OTR=Altres que reben +EX_POS=Franqueig +EX_CAM=CV de manteniment i reparació +EX_EMM=Dinar dels empleats +EX_GUM=Menjar de convidats +EX_BRE=Esmorzar +EX_FUE_VP=PV de benzina +EX_TOL_VP=PV de peatge +EX_PAR_VP=PV d'aparcament +EX_CAM_VP=PV de manteniment i reparació +DefaultCategoryCar=Mode de transport per defecte +DefaultRangeNumber=Número de rang per defecte ErrorDoubleDeclaration=Has declarat un altre informe de despeses en un altre rang de dates semblant AucuneLigne=Encara no hi ha informe de despeses declarat @@ -114,43 +114,43 @@ ExpenseReportsToApprove=Informes de despeses per aprovar ExpenseReportsToPay=Informes de despeses a pagar CloneExpenseReport=Clona el informe de despeses ConfirmCloneExpenseReport=Estàs segur de voler clonar aquest informe de despeses ? -ExpenseReportsIk=Expense report milles index -ExpenseReportsRules=Expense report rules -ExpenseReportIkDesc=You can modify the calculation of kilometers expense by category and range who they are previously defined. d is the distance in kilometers -ExpenseReportRulesDesc=You can create or update any rules of calculation. This part will be used when user will create a new expense report +ExpenseReportsIk=Índex d'informes de despesa en quilometratge +ExpenseReportsRules=Normes d'informe de despeses +ExpenseReportIkDesc=Podeu modificar el càlcul de les despeses de quilometratge per categoria i abast, els quals s'han definit anteriorment. d és la distància en quilòmetres +ExpenseReportRulesDesc=Podeu crear o actualitzar les regles del càlcul. Aquesta part s'utilitzarà quan l'usuari crei un nou informe de despeses expenseReportOffset=Decàleg -expenseReportCoef=Coefficient -expenseReportTotalForFive=Example with d = 5 -expenseReportRangeFromTo=from %d to %d -expenseReportRangeMoreThan=more than %d -expenseReportCoefUndefined=(value not defined) -expenseReportCatDisabled=Category disabled - see the c_exp_tax_cat dictionary -expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionay +expenseReportCoef=Coeficient +expenseReportTotalForFive=Exemple amb d = 5 +expenseReportRangeFromTo=de %d a %d +expenseReportRangeMoreThan=més de %d +expenseReportCoefUndefined=(valor no definit) +expenseReportCatDisabled=Categoria deshabilitada: consulteu el diccionari c_exp_tax_cat +expenseReportRangeDisabled=S'ha desactivat el rang: consulteu el diccionari c_exp_tax_range expenseReportPrintExample=offset + (d x coef) = %s -ExpenseReportApplyTo=Apply to -ExpenseReportDomain=Domain to apply -ExpenseReportLimitOn=Limit on +ExpenseReportApplyTo=Aplicar a +ExpenseReportDomain=Domini al que aplicar +ExpenseReportLimitOn=Limitar a ExpenseReportDateStart=Data inici ExpenseReportDateEnd=Data fi -ExpenseReportLimitAmount=Limite amount -ExpenseReportRestrictive=Restrictive -AllExpenseReport=All type of expense report -OnExpense=Expense line -ExpenseReportRuleSave=Expense report rule saved +ExpenseReportLimitAmount=Import límit +ExpenseReportRestrictive=Restrictiu +AllExpenseReport=Tot tipus d'informe de despeses +OnExpense=Línia de despesa +ExpenseReportRuleSave=S'ha desat la regla del informe de despeses ExpenseReportRuleErrorOnSave=Error: %s -RangeNum=Range %d +RangeNum=Rang %d -ExpenseReportConstraintViolationError=Constraint violation id [%s]: %s is superior to %s %s -byEX_DAY=by day (limitation to %s) -byEX_MON=by month (limitation to %s) -byEX_YEA=by year (limitation to %s) -byEX_EXP=by line (limitation to %s) -ExpenseReportConstraintViolationWarning=Constraint violation id [%s]: %s is superior to %s %s -nolimitbyEX_DAY=by day (no limitation) -nolimitbyEX_MON=by month (no limitation) -nolimitbyEX_YEA=by year (no limitation) -nolimitbyEX_EXP=by line (no limitation) +ExpenseReportConstraintViolationError=Violació de restricció de ID [%s]: %s és superior a %s %s +byEX_DAY=per dia (limitació a %s) +byEX_MON=per mes (limitació a %s) +byEX_YEA=per any (limitació a %s) +byEX_EXP=per línia (limitació a %s) +ExpenseReportConstraintViolationWarning=Violació de restricció de ID [%s]: %s és superior a %s %s +nolimitbyEX_DAY=per dia (sense límits) +nolimitbyEX_MON=per mes (sense límits) +nolimitbyEX_YEA=per any (sense límits) +nolimitbyEX_EXP=per línia (sense límits) -CarCategory=Category of car -ExpenseRangeOffset=Offset amount: %s -RangeIk=Mileage range +CarCategory=Categoria de cotxe +ExpenseRangeOffset=Quantitat d'offset: %s +RangeIk=Rang de quilometratge diff --git a/htdocs/langs/ca_ES/users.lang b/htdocs/langs/ca_ES/users.lang index 07baa657585..88008d33ac4 100644 --- a/htdocs/langs/ca_ES/users.lang +++ b/htdocs/langs/ca_ES/users.lang @@ -96,11 +96,11 @@ HierarchicView=Vista jeràrquica UseTypeFieldToChange=Modificar el camp Tipus per canviar OpenIDURL=URL d'OpenID LoginUsingOpenID=Utilitzeu OpenID per iniciar sessió -WeeklyHours=Hours worked (per week) -ExpectedWorkedHours=Expected worked hours per week +WeeklyHours=Hores treballades (per setmana) +ExpectedWorkedHours=Hores treballades setmanals esperades ColorUser=Color d'usuari DisabledInMonoUserMode=Deshabilitat en mode manteniment -UserAccountancyCode=User accounting code +UserAccountancyCode=Codi comptable de l'usuari UserLogoff=Usuari desconnectat UserLogged=Usuari connectat DateEmployment=Data d'ocupació diff --git a/htdocs/langs/ca_ES/website.lang b/htdocs/langs/ca_ES/website.lang index 8454e424ffe..944b48ee82e 100644 --- a/htdocs/langs/ca_ES/website.lang +++ b/htdocs/langs/ca_ES/website.lang @@ -3,25 +3,27 @@ Shortname=Codi WebsiteSetupDesc=Crea tantes entrades com número de pàgines web que necessitis. Després ves al menú Pàgines web per editar-les. DeleteWebsite=Elimina la pàgina web ConfirmDeleteWebsite=Estàs segur de voler elimiar aquesta pàgina web? També s'esborraran totes les pàgines i el seu contingut. +WEBSITE_TYPE_CONTAINER=Tipus de pàgina/contenidor WEBSITE_PAGENAME=Nom/alies de pàgina -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL del fitxer CSS extern -WEBSITE_CSS_INLINE=CSS file content (common to all pages) -WEBSITE_JS_INLINE=Javascript file content (common to all pages) -WEBSITE_ROBOT=Robot file (robots.txt) -WEBSITE_HTACCESS=Web site .htaccess file +WEBSITE_CSS_INLINE=Fitxer de contingut CSS (comú a totes les pàgines) +WEBSITE_JS_INLINE=Fitxer amb contingut Javascript (comú a totes les pàgines) +WEBSITE_HTML_HEADER=Afegit a la part inferior de l'encapçalament HTML (comú a totes les pàgines) +WEBSITE_ROBOT=Fitxer per robots (robots.txt) +WEBSITE_HTACCESS=Fitxer .htaccess del lloc web +HtmlHeaderPage=Encapçalament HTML (específic sols per aquesta pàgina) PageNameAliasHelp=Nom o àlies de la pàgina.
    Aquest àlies també s'utilitza per construir un URL de SEO quan el lloc web es llanci des d'un Host Virtual d'un servidor web (com Apache, Nginx...). Utilitzeu el botó "%s" per editar aquest àlies. +EditTheWebSiteForACommonHeader=Nota: si voleu definir un encapçalament personalitzat per a totes les pàgines, editeu el encapçalament al nivell del lloc en comptes de la pàgina/contenidor. MediaFiles=Llibreria Media EditCss=Edita l'estil/CSS o la capçalera HTML EditMenu=Edita menú -EditMedias=Edit medias +EditMedias=Editar multimèdia EditPageMeta=Edita "meta" -AddWebsite=Add website +AddWebsite=Afegir lloc web Webpage=Pàgina/contenidor web AddPage=Afegeix pàgina/contenidor HomePage=Pàgina d'inici -PageContainer=Page/container +PageContainer=Pàgina/contenidor PreviewOfSiteNotYetAvailable=La previsualització del teu lloc web %s encara no està disponible. Primer has d'afegir una pàgina. RequestedPageHasNoContentYet=La pàgina sol·licitada amb l'identificador %s encara no té contingut, o el fitxer de memòria cau .tpl.php s'ha eliminat. Edita el contingut de la pàgina per solucionar-ho. PageContent=Pàgina/Contenidor @@ -37,23 +39,28 @@ PreviewSiteServedByWebServer=Previsualització de %s en una nova pestanya
    < PreviewSiteServedByDolibarr=Vista prèvia %s en una nova pestanya

    El %s serà servit pel servidor Dolibarr, per la qual cosa no necessita instal·lar cap servidor web extra (com Apache, Nginx, IIS).
    L'inconvenient és que l'URL de les pàgines no són amigable i comencen per la ruta del vostre Dolibarr.
    URL de Dolibarr:
    %s

    Per utilitzar el teu propi servidor web extern per a servir aquesta web, crea un host virtual al teu servidor web que apunti al directori
    %s
    i a continuació, introduïu el nom d'aquest servidor virtual i feu clic a l'altre botó de vista prèvia. VirtualHostUrlNotDefined=No s'ha definit la URL de l'amfitrió virtual que serveix el servidor web extern NoPageYet=Encara sense pàgines -SyntaxHelp=Help on specific syntax tips -YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +SyntaxHelp=Ajuda sobre consells de sintaxi específics +YouCanEditHtmlSourceckeditor=Podeu editar el codi font HTML usant el botó "Codi font" a l'editor. +YouCanEditHtmlSource=
    Pots incloure codi PHP code dintre d'aquesta font utilitzant etiquetes (tags) <?php ?>. Les següents variables globals estan disponibles: $conf, $langs, $db, $mysoc, $user, $website.

    Pots també incloure contingut d'altres pàgines/contenidor (Page/Container) amb la següent sintaxi:
    <?php includeContainer('alias_of_container_to_include'); ?>

    Per a incloure un enllaç per a descarregar un fitxer emmagatzemat dintre del directori de documents, usa el document.php "wrapper":
    Exemple, per a un fitxer dintre dels documents/ecm (necessites estar registrat / "logged"), la sintaxi és:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    Per a un fitxer dintre dels documents/medias (open directory per a accés públic), la sintaxi és:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    Per a un fitxer compartit amb un enllaç compartit (open access using the sharing hash key of file), la sintaxi és:
    <a href="/document.php?hashp=publicsharekeyoffile">

    Per a incloure un imatge emmagatzemada dintre d'un directori documents, usa la viewimage.php "wrapper":
    Exemple, per a una imatge dintre de documents/medias (open access), la sintaxi és:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clona la pàgina/contenidor CloneSite=Clona el lloc -SiteAdded=Web site added -ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page. -PageIsANewTranslation=The new page is a translation of the current page ? -LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page. -ParentPageId=Parent page ID -WebsiteId=Website ID -CreateByFetchingExternalPage=Create page/container by fetching page from external URL... -OrEnterPageInfoManually=Or create empty page from scratch... -FetchAndCreate=Fetch and Create -ExportSite=Export site -IDOfPage=Id of page -WebsiteAccount=Web site account -WebsiteAccounts=Web site accounts -AddWebsiteAccount=Create web site account -BackToListOfThirdParty=Back to list for Third Party +SiteAdded=Lloc web afegit +ConfirmClonePage=Introduïu el codi/àlies de la pàgina nova i si és una traducció de la pàgina clonada. +PageIsANewTranslation=La nova pàgina és una traducció de la pàgina actual? +LanguageMustNotBeSameThanClonedPage=Cloneu una pàgina com a una traducció. L'idioma de la nova pàgina ha de ser diferent del llenguatge de la pàgina d'origen. +ParentPageId=ID de la pàgina pare +WebsiteId=ID del lloc web +CreateByFetchingExternalPage=Crear una pàgina/contenidor mitjançant l'obtenció del continugt des d'una URL externa ... +OrEnterPageInfoManually=O creeu una pàgina buida des de zero ... +FetchAndCreate=Obtenir i crear +ExportSite=Exportar el lloc web +IDOfPage=Id de la pàgina +Banner=Cartell +BlogPost=Publicació del bloc +WebsiteAccount=Compte de lloc web +WebsiteAccounts=Comptes de lloc web +AddWebsiteAccount=Crear un compte de lloc web +BackToListOfThirdParty=Tornar a la llista de Tercers +DisableSiteFirst=Deshabilita primer el lloc web +MyContainerTitle=Títol del meu lloc web +AnotherContainer=Un altre contenidor diff --git a/htdocs/langs/ca_ES/withdrawals.lang b/htdocs/langs/ca_ES/withdrawals.lang index 041bb087aa7..362854a3246 100644 --- a/htdocs/langs/ca_ES/withdrawals.lang +++ b/htdocs/langs/ca_ES/withdrawals.lang @@ -12,7 +12,7 @@ WithdrawalsLines=Línies de ordres de domiciliació bancària RequestStandingOrderToTreat=Petició per a processar ordres de pagament mitjançant domiciliació bancària RequestStandingOrderTreated=Petició per a processar ordres de pagament mitjançant domiciliació bancària finalitzada NotPossibleForThisStatusOfWithdrawReceiptORLine=Encara no és possible. L'estat de la domiciliació ter que ser 'abonada' abans de poder realitzar devolucions a les seves línies -NbOfInvoiceToWithdraw=Nb. of qualified invoice with waiting direct debit order +NbOfInvoiceToWithdraw=Nombre de factures qualificades esperant l'ordre de domiciliació bancària NbOfInvoiceToWithdrawWithInfo=Nombre de factura de client amb pagament per domiciliació bancària havent definit la informació del compte bancari InvoiceWaitingWithdraw=Factura esperant per domiciliació bancària AmountToWithdraw=Import a domiciliar @@ -55,9 +55,9 @@ StatusMotif5=Compte inexistent StatusMotif6=Compte sense saldo StatusMotif7=Decisió judicial StatusMotif8=Altre motiu -CreateForSepaFRST=Create direct debit file (SEPA FRST) -CreateForSepaRCUR=Create direct debit file (SEPA RCUR) -CreateAll=Create direct debit file (all) +CreateForSepaFRST=Crear un fitxer de domiciliació bancària (SEPA FRST) +CreateForSepaRCUR=Crea un fitxer de domiciliació bancària (SEPA RCUR) +CreateAll=Crear un fitxer de domiciliació bancària (tot) CreateGuichet=Només oficina CreateBanque=Només banc OrderWaiting=A l'espera de procés @@ -74,7 +74,7 @@ IfInvoiceNeedOnWithdrawPaymentWontBeClosed=No obstant això, si la factura té p DoStandingOrdersBeforePayments=Aquesta llengüeta et permet fer una petició de pagament per domiciliació bancària. Un cop feta, aneu al menú Bancs -> Domiciliacions bancàries per a gestionar el pagament per domiciliació. Quan el pagament és tancat, el pagament sobre la factura serà automàticament gravat, i la factura tancada si el pendent a pagar re-calculat resulta cero. WithdrawalFile=Arxiu de la domiciliació SetToStatusSent=Classificar com "Arxiu enviat" -ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null +ThisWillAlsoAddPaymentOnInvoice=Això també registrarà els pagaments a les factures i les classificarà com a "Pagades" quan el que resti per pagar sigui nul StatisticsByLineStatus=Estadístiques per estats de línies RUM=UMR RUMLong=Referència de mandat única (UMR) @@ -96,8 +96,8 @@ SEPAFrstOrRecur=Tipus de pagament ModeRECUR=Pagament recurrent ModeFRST=Pagament únic PleaseCheckOne=Si us plau marqui només una -DirectDebitOrderCreated=Direct debit order %s created -AmountRequested=Amount requested +DirectDebitOrderCreated=S'ha creat l'ordre de domiciliació bancària %s +AmountRequested=Quantitat sol·licitada ### Notifications InfoCreditSubject=Pagament de rebuts domiciliats %s pel banc diff --git a/htdocs/langs/ca_ES/workflow.lang b/htdocs/langs/ca_ES/workflow.lang index 74e52300990..4ff216fcafa 100644 --- a/htdocs/langs/ca_ES/workflow.lang +++ b/htdocs/langs/ca_ES/workflow.lang @@ -12,9 +12,9 @@ descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classifica els pressupostos vinculats descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classifica els pressupostos vinculats d'origen com a facturats quan la factura del client es validi (i si l'import de la factura és igual a l'import total dels pressupostos vinculats i signats) descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classifica les comandes de client vinculades d'origen com a facturades quan la factura del client es validi (i si l'import de la factura és igual a l'import total de les comandes vinculades) descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classifica les comandes de client vinculades d'origen com a facturades quan la factura del client es posi com a pagada (i si l'import de la factura és igual a l'import total de les comandes vinculades) -descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update) +descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classifiqueu com a "Enviada" la comanda de client original enllaçada quan es validi un enviament (sempre que la quantitat d'articles enviada per tots els enviaments sigui la mateixa que la de la comanda) # Autoclassify supplier order -descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals) -descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders) +descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classifiqueu com a "Facturada" la proposta (o propostes) del proveïdor originals enllaçades quan es validi la factura del proveïdor (sempre i quan l'import de la factura sigui igual a la quantitat total de propostes enllaçades) +descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classifiqueu com a "Facturada" la comanda (o comandes) de proveïdor originals enllaçades quan es validi la factura del proveïdor (sempre i quan l'import de la factura sigui igual al total de les comandes vinculades) AutomaticCreation=Creació automàtica AutomaticClassification=Classificació automàtica diff --git a/htdocs/langs/cs_CZ/accountancy.lang b/htdocs/langs/cs_CZ/accountancy.lang index 3b8cfac19ab..4c3459abef4 100644 --- a/htdocs/langs/cs_CZ/accountancy.lang +++ b/htdocs/langs/cs_CZ/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=počet kusů TransactionNumShort=Num. transakce AccountingCategory=Personalized groups GroupByAccountAccounting=Skupina účetním účtu -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Konzultujte zde seznam třetích stran, zákazníky a dodav ListAccounts=Seznam účetních účtů UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=Tento deník se již používá ## Export ExportDraftJournal=Export draft journal Modelcsv=Model exportu -OptionsDeactivatedForThisExportModel=Možnosti pro tento exportní model jsou deaktivovány Selectmodelcsv=Vyberte způsob exportu Modelcsv_normal=Klasický export Modelcsv_CEGID=Export směrem CEGID Expert Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Export na Sage Ciel Compta nebo Compta Evolution Modelcsv_quadratus=Export směrem quadratus QuadraCompta Modelcsv_ebp=Export na EBP Modelcsv_cogilog=Export směrem Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Schéma Id účtů diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang index a9798d8de94..bce7b2ae8a5 100644 --- a/htdocs/langs/cs_CZ/admin.lang +++ b/htdocs/langs/cs_CZ/admin.lang @@ -260,8 +260,8 @@ FontSize=Velikost písma Content=Obsah NoticePeriod=Výpovědní lhůta NewByMonth=New podle měsíce -Emails=Emails -EMailsSetup=Emails setup +Emails=Emaily +EMailsSetup=Nastavení emailů EMailsDesc=This page allows you to overwrite your PHP parameters for emails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless. EmailSenderProfiles=Emails sender profiles MAIN_MAIL_SMTP_PORT=SMTP / SMTPS Port (Výchozí nastavení v php.ini: %s) @@ -539,7 +539,7 @@ Module320Desc=Přidat RSS kanál uvnitř obrazovek Dolibarr Module330Name=Záložky Module330Desc=Záložky řízení Module400Name=Projekty/Příležitosti/Vedení -Module400Desc=Řízení projektů, příležitostí nebo vedení. Můžete přiřadit libovolný prvek (faktura, objednávka, návrh, intervence, ...) na projekt a získat příčný pohled z pohledu projektu. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=WebCalendar Module410Desc=WebCalendar integrace Module500Name=Zvláštní výdaje @@ -890,7 +890,7 @@ DictionaryStaff=Zaměstnanci DictionaryAvailability=Zpoždění dodávky DictionaryOrderMethods=Metody objednávání DictionarySource=Původ nabídky/objednávky -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Modely pro účetní osnovy DictionaryAccountancyJournal=účetní deníky DictionaryEMailTemplates=E-maily šablony @@ -904,6 +904,7 @@ SetupSaved=Nastavení uloženo SetupNotSaved=Setup not saved BackToModuleList=Zpět na seznam modulů BackToDictionaryList=Zpět k seznamu slovníků +TypeOfRevenueStamp=Type of revenue stamp VATManagement=DPH řízení VATIsUsedDesc=Ve výchozím nastavení při vytváření vyhlídky, faktury, objednávky atd sazba DPH se řídí pravidlem aktivní standardní:.
    Je-li prodávající nepodléhá dani z přidané hodnoty, pak výchozí DPH na 0. Konec vlády
    li (prodejní země = kupovat zemi), pak se DPH standardně rovná DPH výrobku v prodejním zemi. Konec pravidla.
    Pokud prodávající a kupující jsou oba v Evropském společenství a zboží přepravní zařízení (auto, loď, letadlo), výchozí DPH je 0 (DPH by měla být hradí kupující na customoffice své země, a nikoli na prodávající). Konec pravidla.
    Pokud prodávající a kupující jsou oba v Evropském společenství a kupující není společnost, pak se DPH prodlením k DPH z prodaného produktu. Konec pravidla.
    Pokud prodávající a kupující jsou oba v Evropském společenství a kupujícím je společnost, pak je daň 0 ve výchozím nastavení. Konec pravidla.
    V každém čiš případě navrhované default je DPH = 0. Konec pravidla. VATIsNotUsedDesc=Ve výchozím nastavení je navrhovaná DPH 0, který lze použít v případech, jako je sdružení jednotlivců ou malých podniků. @@ -954,7 +955,7 @@ WebServer=Webový server DocumentRootServer=Kořenový adresář webového serveru DataRootServer=Adresář souboru dat IP=IP -Port=Přístav +Port=Port VirtualServerName=Název virtuálního serveru OS=OS PhpWebLink=Web Php link @@ -1765,3 +1766,4 @@ ResourceSetup=Konfigurace modulu Zdroje UseSearchToSelectResource=Použijte vyhledávací formulář k výběru zdroje (spíše než rozevírací seznam). DisabledResourceLinkUser=Disabled odkaz zdroj, který uživatele DisabledResourceLinkContact=Zakázán link zdrojů do kontaktu +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/cs_CZ/banks.lang b/htdocs/langs/cs_CZ/banks.lang index 260e7ef0785..5a0a3f9f321 100644 --- a/htdocs/langs/cs_CZ/banks.lang +++ b/htdocs/langs/cs_CZ/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Číslo LineRecord=Transakce AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Reconciled ConciliatedBy=Porovnáno DateConciliating=Datum porovnání BankLineConciliated=Entry reconciled diff --git a/htdocs/langs/cs_CZ/bills.lang b/htdocs/langs/cs_CZ/bills.lang index 07423988bbc..c26bc17acfc 100644 --- a/htdocs/langs/cs_CZ/bills.lang +++ b/htdocs/langs/cs_CZ/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Nezaplacené faktury dodavatele pro %s BillsLate=Opožděné platby BillsStatistics=Statistiky zákaznických faktur BillsStatisticsSuppliers=Statistiky dodavatelských faktur +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Zakázáno, protože nelze odstranit InvoiceStandard=Standardní faktura InvoiceStandardAsk=Standardní faktura @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Proč chcete klasifikovat fakturu jako 'opuštěnou' ? ConfirmClassifyPaidPartially=Jste si jisti, že chcete změnit fakturu %s do stavu uhrazeno? ConfirmClassifyPaidPartiallyQuestion=Tato faktura nebyla zaplacena úplně. Z jakých důvodů chcete uzavřít tuto fakturu? ConfirmClassifyPaidPartiallyReasonAvoir=Zbývající neuhrazené (%s %s), je poskytnutá sleva, protože platba byla provedena před termínem splatnosti. Opravte částku DPH dobropisem. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Zbývající neuhrazené (%s %s), je poskytnutá sleva, protože platba byla provedena před termínem splatnosti. Souhlasím se ztrátou DPH z této slevy. ConfirmClassifyPaidPartiallyReasonDiscountVat=Zbývající neuhrazené (%s %s), je poskytnutá sleva, protože platba byla provedena před termínem splatnosti. Vrátím zpět DPH na této slevě bez dobropisu ConfirmClassifyPaidPartiallyReasonBadCustomer=Špatný zákazník diff --git a/htdocs/langs/cs_CZ/compta.lang b/htdocs/langs/cs_CZ/compta.lang index 146be55dbd9..b760d374cd2 100644 --- a/htdocs/langs/cs_CZ/compta.lang +++ b/htdocs/langs/cs_CZ/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Platby nepropojené s jakoukoli fakturu, takže nejso PaymentsNotLinkedToUser=Platby nepropojené s libovolným uživatelem Profit=Zisk AccountingResult=Účetní výsledek +BalanceBefore=Balance (before) Balance=Zůstatek Debit=Debet Credit=Kredit diff --git a/htdocs/langs/cs_CZ/donations.lang b/htdocs/langs/cs_CZ/donations.lang index 21055164973..4f01f38c6de 100644 --- a/htdocs/langs/cs_CZ/donations.lang +++ b/htdocs/langs/cs_CZ/donations.lang @@ -31,3 +31,4 @@ DONATION_ART200=Zobrazit článek 200 od CGI, pokud máte obavy DONATION_ART238=Zobrazit článek 238 od CGI, pokud máte obavy DONATION_ART885=Zobrazit článek 885 od CGI, pokud máte obavy DonationPayment=Platba daru +DonationValidated=Donation %s validated diff --git a/htdocs/langs/cs_CZ/errors.lang b/htdocs/langs/cs_CZ/errors.lang index b680c8f8228..9f227e58df7 100644 --- a/htdocs/langs/cs_CZ/errors.lang +++ b/htdocs/langs/cs_CZ/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Prázdný výraz. Něčím ho naplňte ..... ErrorPriceExpression21=Nenalezeno ‚%s‘ ErrorPriceExpression22=Negativní výsledek ‚%s‘ ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Internal error '%s' Použijte osmikilové kladivo, nebo hledejte na netu .... ErrorPriceExpressionUnknown=Neznámá chyba ‚%s‘ Zkuste jasnovidce .... ErrorSrcAndTargetWarehouseMustDiffers=Zdrojové a cílové sklady musí se liší diff --git a/htdocs/langs/cs_CZ/help.lang b/htdocs/langs/cs_CZ/help.lang index d0566a4d4f2..4ed8ab1fd2a 100644 --- a/htdocs/langs/cs_CZ/help.lang +++ b/htdocs/langs/cs_CZ/help.lang @@ -11,7 +11,7 @@ TypeOfSupport=Zdroj podpory TypeSupportCommunauty=Komunita (zdarma) TypeSupportCommercial=Obchodní TypeOfHelp=Typ -NeedHelpCenter=Need help or support? +NeedHelpCenter=Potřebujete pomoc nebo podporu? Efficiency=Účinnost TypeHelpOnly=Pouze nápověda TypeHelpDev=Nápověda + Development diff --git a/htdocs/langs/cs_CZ/install.lang b/htdocs/langs/cs_CZ/install.lang index e4dbd123623..783f2544cfc 100644 --- a/htdocs/langs/cs_CZ/install.lang +++ b/htdocs/langs/cs_CZ/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=Používáte instalaci Dolibarr pomocí Proxmox, takže UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Oprava denormalizovaných dat @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Update entity field value of llx_societe_remise MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except MigrationReloadModule=Načíst modul %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Ukázat nedostupné možnosti HideNotAvailableOptions=Skrýt nedostupné možnosti ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. diff --git a/htdocs/langs/cs_CZ/languages.lang b/htdocs/langs/cs_CZ/languages.lang index 36bd4541f9c..835ebda11bb 100644 --- a/htdocs/langs/cs_CZ/languages.lang +++ b/htdocs/langs/cs_CZ/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Španělština (Paraguay) Language_es_PE=Španělština (Peru) Language_es_PR=Španělština (Puerto Rico) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Spanish (Venezuela) Language_et_EE=Estonština Language_eu_ES=Basque diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang index c0883eaeead..47f793186ad 100644 --- a/htdocs/langs/cs_CZ/main.lang +++ b/htdocs/langs/cs_CZ/main.lang @@ -548,6 +548,18 @@ MonthShort09=Zá. MonthShort10=Říj. MonthShort11=List. MonthShort12=Pros. +MonthVeryShort01=J +MonthVeryShort02=PÁ +MonthVeryShort03=P +MonthVeryShort04=A +MonthVeryShort05=P +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=N +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Přiložené soubory a dokumenty JoinMainDoc=Join main document DateFormatYYYYMM=YYYY-MM @@ -762,7 +774,7 @@ SetBankAccount=Definujte bankovní účet AccountCurrency=Account currency ViewPrivateNote=Zobrazit poznámky XMoreLines=%s řádky(ů) skryto -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=Veřejná URL AddBox=Přidejte box SelectElementAndClick=Select an element and click %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=Všichni +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/cs_CZ/other.lang b/htdocs/langs/cs_CZ/other.lang index 42bb5ad29a6..b0010e88b7f 100644 --- a/htdocs/langs/cs_CZ/other.lang +++ b/htdocs/langs/cs_CZ/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=je-li množství vyšší než %s SourcesRepository=Úložiště pro zdroje Chart=Schéma PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=Exportní plocha diff --git a/htdocs/langs/cs_CZ/products.lang b/htdocs/langs/cs_CZ/products.lang index c225614cb26..8d4497c11d2 100644 --- a/htdocs/langs/cs_CZ/products.lang +++ b/htdocs/langs/cs_CZ/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Aktuální cena AlwaysUseNewPrice=Vždy používejte aktuální cenu produktu/služby AlwaysUseFixedPrice=Použijte pevnou cenu PriceByQuantity=Různé ceny podle množství +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Množstevní rozsah MultipriceRules=Pravidla segmentu cen UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/cs_CZ/projects.lang b/htdocs/langs/cs_CZ/projects.lang index a5292de4e27..f340ed18915 100644 --- a/htdocs/langs/cs_CZ/projects.lang +++ b/htdocs/langs/cs_CZ/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=Čeká OppStatusWON=Vyhrál OppStatusLOST=Ztracený Budget=Rozpočet +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/cs_CZ/users.lang b/htdocs/langs/cs_CZ/users.lang index 25add82bbe1..40fea8799ca 100644 --- a/htdocs/langs/cs_CZ/users.lang +++ b/htdocs/langs/cs_CZ/users.lang @@ -96,11 +96,11 @@ HierarchicView=Hierarchické zobrazení UseTypeFieldToChange=Použijte pole Typ pro změnu OpenIDURL=OpenID URL LoginUsingOpenID=Použijte OpenID pro přihlášení -WeeklyHours=Hours worked (per week) -ExpectedWorkedHours=Expected worked hours per week +WeeklyHours=Odpracovaných hodin (za týden) +ExpectedWorkedHours=Předpoklad odpracovaných hodin za týden ColorUser=Barva uživatele DisabledInMonoUserMode=Zakázán v režimu údržby -UserAccountancyCode=User accounting code +UserAccountancyCode=Účetní kód uživatele UserLogoff=odhlášení uživatele UserLogged=přihlášený uživatel DateEmployment=Datum zaměstnanost diff --git a/htdocs/langs/cs_CZ/website.lang b/htdocs/langs/cs_CZ/website.lang index a8c421b2596..63300e36e13 100644 --- a/htdocs/langs/cs_CZ/website.lang +++ b/htdocs/langs/cs_CZ/website.lang @@ -3,15 +3,17 @@ Shortname=Kód WebsiteSetupDesc=Vytvořte zde tolik vstupů jako množství různých webových stránek, které potřebujete. Pak přejděte do nabídky webové stránky na jejich editaci. DeleteWebsite=Odstranit web ConfirmDeleteWebsite=Jste si jisti, že chcete smazat tuto webovou stránku? Všechny stránky a obsah budou odstraněny. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Název stránky / alias -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL externího souboru CSS WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=knihovna multimédií EditCss=Edit Style/CSS or HTML header EditMenu=Úprava menu @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang index a84203eb43a..862faa4eae5 100644 --- a/htdocs/langs/da_DK/accountancy.lang +++ b/htdocs/langs/da_DK/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Partsnummer TransactionNumShort=Transaktionsnr. AccountingCategory=Regnskabskontogrupper GroupByAccountAccounting=Gruppér efter regnskabskonto -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=Konti ByPredefinedAccountGroups=Efter foruddefinerede grupper ByPersonalizedAccountGroups=Efter brugerdefinerede grupper @@ -191,6 +191,7 @@ DescThirdPartyReport=Her findes listen over tredjepartskunder, leverandører og ListAccounts=Liste over regnskabskonti UnknownAccountForThirdparty=Ukendt tredjepartskonto. Vi vil bruge %s UnknownAccountForThirdpartyBlocking=Ukendt tredjepartskonto. Blokerende fejl +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Kontoens gruppe Pcgsubtype=Kontoens undergruppe @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=Denne kladde er allerede i brug ## Export ExportDraftJournal=Eksporter udkast til kladde Modelcsv=Eksportmodel -OptionsDeactivatedForThisExportModel=For this export model, options are deactivated Selectmodelcsv=Vælg en eksportmodel Modelcsv_normal=Klassisk eksport Modelcsv_CEGID=Eksporter med CEGID Ekspert-kompatibilitet @@ -254,7 +254,7 @@ Modelcsv_ciel=Eksporter til Sage Ciel Compta eller Compta Evolution Modelcsv_quadratus=Eksporter til Quadratus QuadraCompta Modelcsv_ebp=Eksporter til EBP Modelcsv_cogilog=Ekpsporter til Cogilog -Modelcsv_agiris=Eksporter til Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=ID for kontoplan diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang index 4f6d2b3bdcc..48edc1227dc 100644 --- a/htdocs/langs/da_DK/admin.lang +++ b/htdocs/langs/da_DK/admin.lang @@ -539,7 +539,7 @@ Module320Desc=Tilføj RSS feed inde Dolibarr skærmen sider Module330Name=Bogmærker Module330Desc=Bogmærker forvaltning 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. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar integration Module500Name=Særlige udgifter @@ -890,7 +890,7 @@ DictionaryStaff=Personale DictionaryAvailability=Levering forsinkelse DictionaryOrderMethods=Bestilling af metoder DictionarySource=Oprindelse af tilbud/ordrer -DictionaryAccountancyCategory=Regnskabskontogrupper +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Models for chart of accounts DictionaryAccountancyJournal=Kontokladder DictionaryEMailTemplates=E-mail skabeloner @@ -904,6 +904,7 @@ SetupSaved=Setup gemt SetupNotSaved=Setup not saved BackToModuleList=Tilbage til moduler liste BackToDictionaryList=Tilbage til liste over ordbøger +TypeOfRevenueStamp=Type of revenue stamp VATManagement=Momshåndtering VATIsUsedDesc=Når der oprettes tilbud, fakturaer, ordrer osv., bruges som standard følgende regler for moms:
    • Hvis sælger ikke er momspligtig, benyttes momssatsen 0.
    • Hvis afsenderlandet er det samme som modtagerlandet, benyttes momssatsen for varen i afsenderlandet.
    • Hvis både sælger og køber befinder sig i EU, og det drejer sig om fysiske varer, benyttes momssatsen 0. (Det forventes at køber betaler momsen i det modtagende land).
    • Hvis både sælger og køber befinder sig i EU, og køber er en privatperson, benyttes momssatsen for varen i afsenderlandet.
    • Hvis både sælger og køber befinder sig i EU, og køber er et firma, benyttes momssatsen 0.
    • I alle andre tilfælde benyttes momssatsen 0. VATIsNotUsedDesc=Som standard benyttes momssatsen 0. Dette anvendes til regnskab for foreninger, enkeltpersoner eller virksomheder med lav omsætning (under 50.000 kr). @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/da_DK/banks.lang b/htdocs/langs/da_DK/banks.lang index 6a739e09c55..d701008db4f 100644 --- a/htdocs/langs/da_DK/banks.lang +++ b/htdocs/langs/da_DK/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Antal LineRecord=Transaktion AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Reconciled ConciliatedBy=Afstemt af DateConciliating=Aftemningsdato BankLineConciliated=Entry reconciled diff --git a/htdocs/langs/da_DK/bills.lang b/htdocs/langs/da_DK/bills.lang index b9d1163946e..3a2c59b2f88 100644 --- a/htdocs/langs/da_DK/bills.lang +++ b/htdocs/langs/da_DK/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Ubetalte leverandørfakturaer for %s BillsLate=Forsinkede betalinger BillsStatistics=Statistik for kundefakturaer BillsStatisticsSuppliers=Statistik for leverandørfakturaer +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Deaktiveret, da sletning ikke er muligt InvoiceStandard=Standardfaktura InvoiceStandardAsk=Standardfaktura @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad kunde diff --git a/htdocs/langs/da_DK/compta.lang b/htdocs/langs/da_DK/compta.lang index c9357136b57..85e0330277b 100644 --- a/htdocs/langs/da_DK/compta.lang +++ b/htdocs/langs/da_DK/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Betalinger ikke er knyttet til en faktura, så der ik PaymentsNotLinkedToUser=Betalinger ikke er knyttet til en bruger Profit=Profit AccountingResult=Accounting result +BalanceBefore=Balance (before) Balance=Balance Debit=Debet Credit=Kredit diff --git a/htdocs/langs/da_DK/donations.lang b/htdocs/langs/da_DK/donations.lang index d6d4d97aa62..90494b266e0 100644 --- a/htdocs/langs/da_DK/donations.lang +++ b/htdocs/langs/da_DK/donations.lang @@ -31,3 +31,4 @@ 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 +DonationValidated=Donation %s validated diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang index 1a7e9c33409..e9331ffa00d 100644 --- a/htdocs/langs/da_DK/errors.lang +++ b/htdocs/langs/da_DK/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Empty expression ErrorPriceExpression21=Empty result '%s' ErrorPriceExpression22=Negative result '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs diff --git a/htdocs/langs/da_DK/install.lang b/htdocs/langs/da_DK/install.lang index 1479232f5fd..5dae9504898 100644 --- a/htdocs/langs/da_DK/install.lang +++ b/htdocs/langs/da_DK/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=Du bruger Dolibarr opsætningsguiden fra en Proxmox vir UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Fix for denormalized data @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Update entity field value of llx_societe_remise MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except MigrationReloadModule=Reload module %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Show not available options HideNotAvailableOptions=Hide not available options ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. diff --git a/htdocs/langs/da_DK/languages.lang b/htdocs/langs/da_DK/languages.lang index 2a983b42411..e98ec0c5536 100644 --- a/htdocs/langs/da_DK/languages.lang +++ b/htdocs/langs/da_DK/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Spansk (Paraguay) Language_es_PE=Spansk (Peru) Language_es_PR=Spansk (Puerto Rico) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Spanish (Venezuela) Language_et_EE=Estisk Language_eu_ES=Basque diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang index aee68303e61..f6dc7a6d48b 100644 --- a/htdocs/langs/da_DK/main.lang +++ b/htdocs/langs/da_DK/main.lang @@ -548,6 +548,18 @@ MonthShort09=sep MonthShort10=okt MonthShort11=nov MonthShort12=dec +MonthVeryShort01=J +MonthVeryShort02=F +MonthVeryShort03=M +MonthVeryShort04=A +MonthVeryShort05=M +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=S +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Vedhæftede filer og dokumenter JoinMainDoc=Join main document DateFormatYYYYMM=ÅÅÅÅ-MM @@ -762,7 +774,7 @@ SetBankAccount=Define Bank Account AccountCurrency=Account currency ViewPrivateNote=View notes XMoreLines=%s line(s) hidden -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=Public URL AddBox=Add box SelectElementAndClick=Select an element and click %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=Fælles projekt +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/da_DK/other.lang b/htdocs/langs/da_DK/other.lang index 95159063bdb..10de4e059d9 100644 --- a/htdocs/langs/da_DK/other.lang +++ b/htdocs/langs/da_DK/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=If amount higher than %s SourcesRepository=Repository for sources Chart=Chart PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=Eksport område diff --git a/htdocs/langs/da_DK/products.lang b/htdocs/langs/da_DK/products.lang index fc5c89f42ef..e27db07cc8a 100644 --- a/htdocs/langs/da_DK/products.lang +++ b/htdocs/langs/da_DK/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Nuværende pris AlwaysUseNewPrice=Brug altid den aktuelle pris for vare/ydelse AlwaysUseFixedPrice=Use the fixed price PriceByQuantity=Different prices by quantity +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Quantity range MultipriceRules=Price segment rules UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/da_DK/projects.lang b/htdocs/langs/da_DK/projects.lang index 882269fe62c..dfece3c4c96 100644 --- a/htdocs/langs/da_DK/projects.lang +++ b/htdocs/langs/da_DK/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=Pending OppStatusWON=Won OppStatusLOST=Lost Budget=Budget +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/da_DK/website.lang b/htdocs/langs/da_DK/website.lang index a4d40eeb359..f8c6361b2cc 100644 --- a/htdocs/langs/da_DK/website.lang +++ b/htdocs/langs/da_DK/website.lang @@ -3,15 +3,17 @@ Shortname=Kode WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them. DeleteWebsite=Delete website ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Page name/alias -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL of external CSS file WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Media library EditCss=Edit Style/CSS or HTML header EditMenu=Edit menu @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/de_CH/admin.lang b/htdocs/langs/de_CH/admin.lang index f887d449d4b..c83802037c0 100644 --- a/htdocs/langs/de_CH/admin.lang +++ b/htdocs/langs/de_CH/admin.lang @@ -1,7 +1,13 @@ # Dolibarr language file - Source file is en_US - admin Foundation=Verein +Publisher=Herausgeber VersionLastInstall=Erste installierte Version VersionLastUpgrade=Version der letzten Aktualisierung +FileCheckDolibarr=Überprüfen Sie die Integrität der Anwendungsdateien +AvailableOnlyOnPackagedVersions=Die lokale Datei für die Integritätsprüfung ist nur dann verfügbar, wenn die Anwendung von einem offiziellen Paket installiert wurde +XmlNotFound=Xml Integritätsdatei der Anwendung ​​nicht gefunden +ConfirmPurgeSessions=Wollen Sie wirklich alle Sessions beenden ? Dadurch werden alle Benutzer getrennt (ausser Ihnen) +ClientCharset=Benutzer-Zeichensatz FormToTestFileUploadForm=Formular für das Testen von Datei-Uplads (je nach Konfiguration) SecurityFilesDesc=Sicherheitseinstellungen für den Dateiupload definieren. ErrorModuleRequirePHPVersion=Fehler: Dieses Modul benötigt PHP Version %s oder höher @@ -11,6 +17,9 @@ Dictionary=Wörterbücher ErrorCodeCantContainZero=Code darf keinen Wert 0 enthalten UseSearchToSelectCompanyTooltip=Wenn Sie eine grosse Anzahl von Geschäftspartnern (> 100'000) haben, können Sie die Geschwindigkeit verbessern, indem Sie in Einstellungen -> Andere die Konstante COMPANY_DONOTSEARCH_ANYWHERE auf 1 setzen. Die Suche startet dann am Beginn des Strings. UseSearchToSelectContactTooltip=Wenn Sie eine grosse Anzahl von Kontakten (> 100.000) haben, können Sie die Geschwindigkeit verbessern, indem Sie in Einstellungen -> Andere die Konstante CONTACT_DONOTSEARCH_ANYWHERE auf 1 setzen. Die Suche startet dann am Beginn des Strings. +DelaiedFullListToSelectCompany=Warte auf Tastendruck, bevor der Inhalt der Partner-Combo-Liste geladen wird (Dies kann die Leistung verbessern, wenn Sie eine grosse Anzahl von Partnern haben). +DelaiedFullListToSelectContact=Warte auf Tastendruck, bevor der Inhalt der Kontakt-Combo-Liste geladen wird (Dies kann die Leistung verbessern, wenn Sie eine grosse Anzahl von Kontakten haben). +AllowToSelectProjectFromOtherCompany=Erlaube bei den Elementen eines Partners, die Projekte von anderen Partnern zu verlinken Space=Raum MustBeLowerThanPHPLimit=Hinweis: Ihre PHP-Einstellungen beschränken die Grösse für Dateiuploads auf %s%s NoMaxSizeByPHPLimit=Hinweis: In Ihren PHP-Einstellungen sind keine Grössenbeschränkungen hinterlegt @@ -22,17 +31,28 @@ MenuIdParent=Eltern-Menü-ID DetailPosition=Reihungsnummer für definition der Menüposition MaxNbOfLinesForBoxes=Maximale Zeilenanzahl für Boxen MenusDesc=In der Menüverwaltung können Sie den Inhalt der beiden Menüleisten (Horizontal und Vertikal) festlegen +MenusEditorDesc=Mit dem Menü-Editor können Sie benutzerdefinierte Menüeinträge erstellen. Verwenden Sie dies vorsichtig, um Instabilität und dauerhaft unerreichbare Menüeinträge zu vermeiden.
    Einige Module fügen Menüeinträge hinzu (meistens im Menü Alle ). Wenn Sie einen dieser Einträge versehentlich entfernen, können Sie ihn wiederherstellen, indem Sie das Modul deaktivieren und erneut aktivieren. PurgeAreaDesc=Hier können Sie alle vom System erzeugten und gespeicherten Dateien löschen (temporäre Dateien oder alle Dateien im Verzeichnis %s). Diese Funktion ist richtet sich vorwiegend an Benutzer ohne Zugriff auf das Dateisystem des Webservers (z.B. Hostingpakete) PurgeDeleteTemporaryFiles=Alle temporären Dateien löschen (kein Datenverlustrisiko) PurgeDeleteTemporaryFilesShort=Temporärdateien löschen PurgeDeleteAllFilesInDocumentsDir=Alle Datein im Verzeichnis %s löschen. Dies beinhaltet temporäre Dateien ebenso wie Datenbanksicherungen, Dokumente (Geschäftspartner, Rechnungen, ...) und alle Inhalte des ECM-Moduls. PurgeNothingToDelete=Keine zu löschenden Verzeichnisse oder Dateien +PurgeNDirectoriesFailed=Löschen von %s Dateien oder Verzeichnisse fehlgeschlagen. +ConfirmPurgeAuditEvents=Möchten Sie wirklich alle Sicherheitsereignisse löschen? Alle Sicherheits-Logs werden gelöscht, aber keine anderen Daten entfernt. ExportMethod=Export-Methode ImportMethod=Import-Methode +IgnoreDuplicateRecords=Fehler durch doppelte Zeilen ignorieren (INSERT IGNORE) BoxesDesc=Boxen sind auf manchen Seiten angezeigte Informationsbereiche. Sie können die Anzeige einer Box einstellen, indem Sie auf die Zielseite klicken und 'Aktivieren' wählen. Zum Ausblenden einer Box klicken Sie einfach auf den Papierkorb. +ModulesDesc=Die Module bestimmen, welche Funktionalität in Dolibarr verfügbar ist. Manche Module erfordern zusätzliche Berechtigungen, welche den Benutzern zugewiesen werden muss, nachdem das Modul aktiviert wurde. \nKlicken Sie auf die Schaltfläche on/off, um ein Modul/Anwendung zu aktivieren. ModulesMarketPlaceDesc=Sie finden weitere Module auf externen Websites +ModulesDevelopYourModule=Entwicklen Sie Ihre eigenes Modul/Anwendung +FreeModule=Kostenlose Module +NotCompatible=Dieses Modul scheint nicht mit Ihrer Dolibarr Version %s (Min %s - Max %s) kompatibel zu sein. +CompatibleAfterUpdate=Dieses Modul benötigt eine Update Ihrer Dolibarr Version %s (Min %s - Max %s). +SeeInMarkerPlace=Siehe im Marktplatz DoliPartnersDesc=Unternehmensliste, die Zusatzmodule oder Funktionen entwicklen können. (Hinweis: Alle Entwickler mit PHP Kentinissen können Dolibarr erweitern) WebSiteDesc=Webseite für die Suche nach weiteren Modulen +DevelopYourModuleDesc=Einige Lösungen um Ihr eigenes Modul zu entwickeln... BoxesActivated=Aktivierte Boxen OfficialWebSite=Offizielle Website ReferencedPreferredPartners=Bevorzugte Geschäftspartner @@ -41,6 +61,7 @@ HelpCenterDesc1=In diesem Bereich können Sie sich ein Hilfe-Support-Service auf MeasuringUnit=Masseinheit MAIN_MAIL_SMTP_PORT=SMTP-Port (standardmässig in der php.ini: %s) MAIN_MAIL_SMTP_SERVER=SMTP-Host (standardmässig in php.ini: %s) +MAIN_MAIL_EMAIL_FROM=E-Mail-Absender für automatisch erzeugte Mails (standardmässig in php.ini: %s) MAIN_MAIL_EMAIL_STARTTLS=TLS (STARTTLS) Verschlüsselung verwenden SubmitTranslation=Wenn die Übersetzung der Sprache unvollständig ist oder wenn Sie Fehler finden, können Sie können Sie die entsprechenden Sprachdateien im Verzeichnis langs/%s korrigieren und und anschliessend Ihre Änderungen unter www.transifex.com/dolibarr-association/dolibarr/ teilen. SubmitTranslationENUS=Sollte die Übersetzung für eine Sprache nicht vollständig sein oder Fehler beinhalten, können Sie die entsprechenden Sprachdateien im Verzeichnis langs/%s bearbeiten und anschliessend Ihre Änderungen an dolibarr.org/forum oder für Entwickler auf github.com/Dolibarr/dolibarr. übertragen. @@ -48,17 +69,32 @@ ModuleFamilyCrm=Kundenverwaltung (CRM) ModuleFamilySrm=Lieferantenverwaltung (SRM) CallUpdatePage=Zur Aktualisierung der Daten und der Datenbankstruktur gehen Sie zur Seite %s. 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} der Kunden-Code mit n Zeichen
    {cccc000} der Kunden-Code mit n Zeichen, gefolgt von der dem Kunden zugeordneten Partner ID. Dieser Zähler wird gleichzeitig mit dem Globalen Zähler zurückgesetzt.
    {tttt} Die Partner ID mit n Zeichen (siehe unter Einstellungen->Stammdaten->Arten von Partnern). Wenn diese Option aktiv ist, wird für jede Partnerart ein separater Zähler geführt.
    GenericMaskCodes4b=Beispiel für Dritte erstellt am 2007-03-01:
    UMaskExplanation=Über diesen Parameter können Sie die standardmässigen Dateiberechtigungen für vom System erzeugte/verwaltete Inhalte festlegen.
    Erforderlich ist ein Oktalwert (0666 bedeutet z.B. Lesen und Schreiben für alle).
    Auf Windows-Umgebungen haben diese Einstellungen keinen Effekt. +ConfirmPurge=Möchten Sie wirklich endgültig löschen?
    Alle Dateien werden unwiderbringlich gelöscht (Attachments, Angebote, Rechnungen usw.) DescWeather=Die folgenden Diagramme werden auf der Übersicht Startseite angezeigt, wenn die entsprechenden Toleranzwerte erreicht werden: HideAnyVATInformationOnPDF=Unterdrücken aller MwSt.-Informationen auf dem generierten PDF +HideLocalTaxOnPDF=Unterdrücke %s Satz in der PDF Steuerspalte HideDetailsOnPDF=Unterdrücke Produktzeilen in generierten PDF PlaceCustomerAddressToIsoLocation=ISO Position für die Kundenadresse verwenden +ButtonHideUnauthorized=Buttons für Nicht-Admins ausblenden anstatt ausgrauen? OldVATRates=Alter MwSt. Satz NewVATRates=Neuer MwSt. Satz Float=Gleitkommazahl +ExtrafieldRadio=Radio Button (Nur eine Auswahl möglich) LibraryToBuildPDF=Verwendete Bibliothek zur PDF-Erzeugung SetAsDefault=Als Standard definieren +ConfirmEraseAllCurrentBarCode=Wirklich alle aktuellen Barcode-Werte löschen? +DisplayCompanyManagers=Anzeige der Namen der Geschäftsführung +Use3StepsApproval=Standardmässig, Einkaufsaufträge müssen durch zwei unterschiedlichen Benutzer erstellt und freigegeben werden (ein Schritt/Benutzer zum Erstellen und ein Schritt/Benutzer für die Freigabe). Beachten Sie, wenn ein Benutzer beide Rechte hat - zum Erstellen und Freigeben, dann reicht ein Benutzer für diesen Vorgang. Optional können Sie einen zusätzlichen Schritt/User für die Freigabe einrichten, wenn der Betrag einen bestimmten dedizierten Wert übersteigt (wenn der Betrag höher wird, werden 3 Stufen notwendig: 1=Validierung, 2=erste Freigabe und 3=Gegenfreigabe.
    Lassen Sie das Feld leer, wenn eine Freigabe (2 Schritte) ausreicht; tragen Sie einen sehr niedrigen Wert (0.1) ein, wenn eine zweite Freigabe notwendig ist. +UseDoubleApproval=3-fach Verarbeitungsschritte verwenden, wenn der Betrag (ohne Steuer) höher ist als ... +ClickToShowDescription=Klicken um die Beschreibung zu sehen +DependsOn=Dieses Modul benötigt die folgenden Module +PageUrlForDefaultValues=Hier muss die relative URL der Seite eingetragen werden. Wenn Parameter in der URL angegeben werden, dann werden alle Vorgabewerte auf den gleichen Wert gesetzt. Beispiele: +GoIntoTranslationMenuToChangeThis=Eine Übersetzung wurde für diesen Schlüssel gefunden, um die Übersetzung anzupassen, gehen Sie ins Menü "Home->Setup->Überseztungen" +WarningSettingSortOrder=Warnung: Änderungen an der Standardsortierreihenfolge können zu Fehlern führen, falls das betreffende Feld nicht vorhanden ist. Falls dies passiert, entfernen sie das betreffende Feld oder stellen die den Defaultwert wieder her. +AttachMainDocByDefault=Setzen Sie diesen Wert auf 1, wenn Sie das Hauptdokument standardmässig per E-Mail anhängen möchten (falls zutreffend). Module1Name=Geschäftspartner Module1Desc=Geschäftspartner- und Kontakteverwaltung (Kunden, Leads, ...) Module20Desc=Angeboteverwaltung @@ -68,7 +104,6 @@ Module80Name=Auslieferungen Module240Desc=Werkzeug zum Datenexport (mit Assistent) Module250Desc=Werkzeug zum Dateninport (mit Assistent) Module330Desc=Lesezeichenverwaltung -Module400Desc=Projektmanagement, Aufträge oder Leads. Anschliessend können Sie ein beliebiges Element (Rechnung, Bestellung, Angebot, Intervention, ...) einem Projekt zuordnen und eine Queransicht von der Projektanzeige bekommen. Module1200Desc=Mantis-Integation Module2000Desc=Texte mit dem WYSIWYG Editor bearbeiten (Basierend auf CKEditor) Module3100Desc=Skypebutton bei Kontakten / Drittparteien / Mitgliedern hinzufügen @@ -112,6 +147,9 @@ LocalTax1IsNotUsedDescES=Standardmässig werden die vorgeschlagenen RE 0 ist. En LocalTax2IsUsedDescES=Die RE Rate standardmässig beim Erstellen Aussichten, Rechnungen, Bestellungen etc. folgen die aktive Standard-Regel:
    Ist der Verkäufer nicht zu IRPF ausgesetzt, dann durch IRPF default = 0. Ende der Regel.
    Ist der Verkäufer zur IRPF dann der Einkommenssteuer unterworfen standardmässig. Ende der Regel.
    LocalTax2IsNotUsedDescES=Standardmässig werden die vorgeschlagenen IRPF 0 ist. Ende der Regel. LocalTax2IsNotUsedExampleES=In Spanien sind sie bussines nicht der Steuer unterliegen System von Modulen. +MenuCompanySetup=Firma/Organisation +CompanyInfo=Firmen-/Organisationsinformationen +CompanyIds=Firmen-/Organisations-IDs Delays_MAIN_DELAY_ACTIONS_TODO=Verzögerungstoleranz (in Tagen) vor Warnung für nicht erledigte Ereignisse Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Verzögerungstoleranz (in Tagen) vor Warnung für nicht fristgerecht geschlossene Projekte Delays_MAIN_DELAY_TASKS_TODO=Verzögerungstoleranz (in Tagen) vor Warnung für nicht erledigte Projektaufgaben @@ -129,13 +167,16 @@ SystemAreaForAdminOnly=Dieser Bereich steht ausschliesslich Administratoren zur TriggersDesc=Trigger sind Dateien, die nach einem Kopieren in das Verzeichnis htdocs/core/triggers das Workflow-Verhalten des Systems beeinflussen. Diese stellen neue, mit Systemereignissen verbundene, Ereignisse dar (Neuer Geschäftspartner angelegt, Rechnung freigegeben, ...). TriggerDisabledByName=Trigger in dieser Datei sind durch das -NORUN-Suffix in ihrem Namen deaktviert. DictionaryDesc=Definieren Sie hier alle Defaultwerte. Sie können die vordefinierten Werte mit ihren eigenen ergänzen. +ConstDesc=Diese Seite erlaubt es alle anderen Parameter einzustellen, die auf den vorherigen Seiten nicht verfügbar sind. Dies sind meist reservierte Parameter für Entwickler oder für die erweiterte Fehlersuche. Für eine Liste von Optionen hier überprüfen . MiscellaneousDesc=Alle anderen sicherheitsrelevanten Parameter werden hier definiert. MAIN_ROUNDING_RULE_TOT=Rundungseinstellung (Für Länder in denen nicht auf 10er basis Gerundet wird. zB. 0.05 damit in 0.05 Schritten gerundet wirb) TotalPriceAfterRounding=Gesamtpreis (Netto/MwSt./Brutto) gerundet NoEventOrNoAuditSetup=Keine sicherheitsrelevanten Protokollereignisse. Überprüfen Sie die Aktivierung dieser Funktionen unter 'Einstellunge-Sicherheit-Protokoll'. 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). +PreviousDumpFiles=generierte Databank Backup Dateien DownloadMoreSkins=Weitere grafische Oberflächen/Themes herunterladen ShowVATIntaInAddress=Ausblenden MwSt. Nummer in Adressen auf Dokumenten. +MeteoStdMod=Standard Modus DefineHereComplementaryAttributes=Definieren Sie hier alle Attribute, die nicht standardmässig vorhanden sind, und in %s unterstützt werden sollen. ExtraFieldsSupplierOrdersLines=Ergänzende Attribute (in Bestellungszeile) ExtraFieldsThirdParties=Ergänzende Attribute (Geschäftspartner) @@ -143,6 +184,7 @@ SendmailOptionNotComplete=Achtung, auf einigen Linux-Systemen, E-Mails von Ihrem AddRefInList=Darstellung Kunden- /Lieferanten- Nr. in Listen (Listbox oder ComboBox) und die meisten von Hyperlinks. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp". AskForPreferredShippingMethod=Bevorzugte Kontaktmethode bei Partnern fragen. PasswordGenerationNone=Keine automatische Passwortvorschläge, das Passwort muss manuell eingegeben werden. +HRMSetup=HRM Modul Einstellungen CompanyCodeChecker=Modul für Geschäftspartner-Code-Erstellung (Kunden oder Lieferanten) CompanyIdProfChecker=Berufs-Identifikation einzigartige SuggestPaymentByRIBOnAccount=Zahlung per Lastschrift vorschlagen diff --git a/htdocs/langs/de_CH/main.lang b/htdocs/langs/de_CH/main.lang index 82b62aa23d5..f235b6a7e1a 100644 --- a/htdocs/langs/de_CH/main.lang +++ b/htdocs/langs/de_CH/main.lang @@ -69,6 +69,7 @@ RefPayment=Zahlungs-Nr. ActionsToDo=unvollständige Ereignisse ActionsToDoShort=Zu erledigen ActionRunningNotStarted=Nicht begonnen +CompanyFoundation=Firma/Organisation ContactsForCompany=Ansprechpartner/Adressen dieses Geschäftspartners ContactsAddressesForCompany=Ansprechpartner / Adressen zu diesem Geschäftspartner AddressesForCompany=Adressen für den Geschäftspartner diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang index 1df94d5eb72..d09d99d485c 100644 --- a/htdocs/langs/de_DE/accountancy.lang +++ b/htdocs/langs/de_DE/accountancy.lang @@ -8,7 +8,7 @@ ACCOUNTING_EXPORT_AMOUNT=Exportiere Betrag ACCOUNTING_EXPORT_DEVISE=Exportiere Währung Selectformat=Wählen Sie das Format für die Datei ACCOUNTING_EXPORT_FORMAT=Wählen Sie das Format für die Datei -ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type +ACCOUNTING_EXPORT_ENDLINE=Art des Zeilenumbruchs wählen ACCOUNTING_EXPORT_PREFIX_SPEC=Präfix für den Dateinamen angeben ThisService=Diese Leistung ThisProduct=Dieses Produkt @@ -30,18 +30,18 @@ OverviewOfAmountOfLinesBound=Übersicht über die Anzahl der bereits an ein Buch OtherInfo=Zusatzinformationen DeleteCptCategory=Buchhaltungskonto aus Gruppe entfernen ConfirmDeleteCptCategory=Soll dieses Buchhaltungskonto wirklich aus der Gruppe entfernt werden? -JournalizationInLedgerStatus=Status of journalization -AlreadyInGeneralLedger=Already journalized in ledgers -NotYetInGeneralLedger=Not yet journalized in ledgers -GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group -DetailByAccount=Show detail by account -AccountWithNonZeroValues=Accounts with non zero values -ListOfAccounts=List of accounts +JournalizationInLedgerStatus=Status der Journalisierung +AlreadyInGeneralLedger=Schon ins Hauptbuch übernommen +NotYetInGeneralLedger=Noch nicht ins Hauptbuch übernommen +GroupIsEmptyCheckSetup=Gruppe ist leer, kontrollieren Sie die persönlichen Kontogruppen +DetailByAccount=Detail pro Konto zeigen +AccountWithNonZeroValues=Konto mit Werten != 0 +ListOfAccounts=Kontenplan -MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup -MainAccountForSuppliersNotDefined=Main accounting account for suppliers not defined in setup -MainAccountForUsersNotDefined=Main accounting account for users not defined in setup -MainAccountForVatPaymentNotDefined=Main accounting account for VAT payment not defined in setup +MainAccountForCustomersNotDefined=Standardkonto für Kunden im Setup nicht definiert +MainAccountForSuppliersNotDefined=Standardkonto für Lieferanten ist im Setup nicht definiert +MainAccountForUsersNotDefined=STandardkonto für Benutzer ist im Setup nicht definiert +MainAccountForVatPaymentNotDefined=Standardkonto für MWSt Zahlungen ist im Setup nicht definiert AccountancyArea=Buchhaltung AccountancyAreaDescIntro=Die Verwendung des Buchhaltungsmoduls erfolgt in mehreren Schritten: @@ -58,9 +58,9 @@ AccountancyAreaDescExpenseReport=SCHRITT %s: Definition der Buchhaltungskonten f AccountancyAreaDescSal=SCHRITT %s: Buchhaltungskonto für Lohnzahlungen definieren. Kann im Menü %s geändert werden. AccountancyAreaDescContrib=SCHRITT %s: Definition der Buchhaltungskonten für besondere Aufwendungen (Sonstige Steuern) . Kann im Menü %s geändert werden. AccountancyAreaDescDonation=SCHRITT %s: Definition der Buchhaltungskonten für Spenden. Kann im Menü %s geändert werden. -AccountancyAreaDescMisc=STEP %s: Define mandatory default account and default accounting accounts for miscellaneous transactions. For this, use the menu entry %s. +AccountancyAreaDescMisc=SCHRITT %s: Buchhaltungskonto für nicht zugeordnete Buchungen definieren. Kann im Menü %s geändert werden. AccountancyAreaDescLoan=SCHRITT %s: Definitiond der Buchhaltungskonten für Darlehenszahlungen. Kann im Menü %s geändert werden. -AccountancyAreaDescBank=STEP %s: Define accounting accounts and journal code for each bank and financial accounts. For this, use the menu entry %s. +AccountancyAreaDescBank=SCHRITT %s: Definition der Buchhaltungskonten für jede Bank und Finanzkonten. Kann im Menü %s geändert werden. AccountancyAreaDescProd=SCHRITT %s: Definition der Buchhaltungskonten für Ihre Produkte/Dienstleistungen. Kann im Menü %s geändert werden. AccountancyAreaDescBind=SCHRITT %s: Kontrolle der Zuweisung zwischen bestehenden %s Buchungszeilen und Konten ist erledigt damit die Anwendung die übernahme der Buchungen ins Hauptbuch mit einem klick erfolgen kann. Wir im Menü %s eingestellt. @@ -69,7 +69,7 @@ AccountancyAreaDescAnalyze=SCHRITT %s: Vorhandene Transaktionen hinzufügen oder AccountancyAreaDescClosePeriod=SCHRITT %s: Schließen Sie die Periode, damit wir in Zukunft keine Veränderungen vornehmen können. -TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts) +TheJournalCodeIsNotDefinedOnSomeBankAccount=Eine erofrderliche Einrichtung wurde nicht abgeschlossen. (Kontierungsinformationen fehlen bei einigen Finanzkonten) Selectchartofaccounts=Kontenplan wählen ChangeAndLoad=Ändere und Lade Addanaccount=Fügen Sie ein Buchhaltungskonto hinzu @@ -93,11 +93,11 @@ SuppliersVentilation=Lieferantenrechnungen zusammenfügen ExpenseReportsVentilation=Spesenabrechnung Zuordnung CreateMvts=Neue Transaktion erstellen UpdateMvts=Änderung einer Transaktion -ValidTransaction=Validate transaction +ValidTransaction=Transaktion bestätigen WriteBookKeeping=Buchungen ins Hauptbuch übernehmen Bookkeeping=Hauptbuch AccountBalance=Saldo Sachkonto -ObjectsRef=Source object ref +ObjectsRef=Quellreferenz CAHTF=Einkaufssume pro Lieferant ohne Steuer TotalExpenseReport=Gesamtausgaben Bericht InvoiceLines=Zeilen der Rechnungen zu verbinden @@ -117,7 +117,7 @@ LineOfExpenseReport=Zeilen der Spesenabrechnung NoAccountSelected=Kein Buchhaltungskonto ausgewählt VentilatedinAccount=erfolgreich zu dem Buchhaltungskonto zugeordnet NotVentilatedinAccount=Nicht zugeordnet, zu einem Buchhaltungskonto -XLineSuccessfullyBinded=%s products/services successfully bound to an accounting account +XLineSuccessfullyBinded=%s Produkte/Leistungen erfolgreich an Buchhaltungskonto zugewiesen XLineFailedToBeBinded=%s Produkte/Leistungen waren an kein Buchhaltungskonto zugeordnet ACCOUNTING_LIMIT_LIST_VENTILATION=Anzahl der Elemente, die beim Kontieren angezeigt werden (empfohlen Max.: 50) @@ -151,29 +151,29 @@ Docdate=Datum Docref=Referenz Code_tiers=Partner LabelAccount=Konto-Beschriftung -LabelOperation=Label operation +LabelOperation=Bezeichnung der Operation Sens=Zweck Codejournal=Journal NumPiece=Teilenummer TransactionNumShort=Anz. Buchungen -AccountingCategory=Personalized groups +AccountingCategory=Personalisierte Gruppen GroupByAccountAccounting=Gruppieren nach Buchhaltungskonto -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. -ByAccounts=By accounts -ByPredefinedAccountGroups=By predefined groups -ByPersonalizedAccountGroups=By personalized groups +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. +ByAccounts=Pro Konto +ByPredefinedAccountGroups=Pro vordefinierten Gruppen +ByPersonalizedAccountGroups=Pro persönlichen Gruppierung ByYear=Bis zum Jahresende NotMatch=undefiniert DeleteMvt=Zeilen im Hauptbuch löschen DelYear=Jahr zu entfernen DelJournal=Journal zu entfernen ConfirmDeleteMvt=Es werden alle Zeilen des Hauptbuchs für Jahr und/oder eines bestimmten Journals gelöscht. Mindestens ein Kriterium ist erforderlich. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvtPartial=Die Buchung wird aus dem Hauptbuch gelöscht (Alle Einträge aus dieser Buchung werden gelöscht) DelBookKeeping=Eintrag im Hauptbuch löschen FinanceJournal=Finanzjournal ExpenseReportsJournal=Spesenabrechnungsjournal DescFinanceJournal=Finanzjournal inklusive aller Arten von Zahlungen mit Bankkonto -DescJournalOnlyBindedVisible=This is a view of record that are bound to accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=Ansicht der Datensätze, die an ein Produkt- / Dienstleistungskonto gebunden sind und in das Hauptbuch übernommen werden können. VATAccountNotDefined=Steuerkonto nicht definiert ThirdpartyAccountNotDefined=Konto für Adresse nicht definiert ProductAccountNotDefined=Konto für Produkt nicht definiert @@ -189,12 +189,13 @@ AddCompteFromBK=Buchhaltungskonten zur Gruppe hinzufügen ReportThirdParty=Zeige Partner DescThirdPartyReport=Kontieren Sie hier die Liste der Kunden und Lieferanten zu Ihrem Buchhaltungs-Konten ListAccounts=Liste der Abrechnungskonten -UnknownAccountForThirdparty=Unknown third party account. We will use %s -UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdparty=Unbekanntes Konto, %s wird verwendet +UnknownAccountForThirdpartyBlocking=Unbekanntes Konto, weiterfahren nicht möglich +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error -Pcgtype=Group of account -Pcgsubtype=Subgroup of account -PcgtypeDesc=Group and subgroup of account are used as predefined 'filter' and 'grouping' criterias for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report. +Pcgtype=Kontenklasse +Pcgsubtype=Unterkontenklasse +PcgtypeDesc=Gruppen und Untergruppen der Konten werden as vordefinierte 'Filter' und 'Gruppierung' Merkmale in manchen Finanzberichten verwendet. z.B. 'Aufwand' oder 'Ertrag' werden als Gruppen im Kontenplan für den Bericht verwendet. TotalVente=Verkaufssumme ohne Steuer TotalMarge=Gesamt-Spanne @@ -216,35 +217,34 @@ ValidateHistory=automatisch verbinden AutomaticBindingDone=automatische Zuordnung erledigt ErrorAccountancyCodeIsAlreadyUse=Fehler, Sie können dieses Buchhaltungskonto nicht löschen, da es benutzt wird. -MvtNotCorrectlyBalanced=Movement not correctly balanced. Credit = %s. Debit = %s +MvtNotCorrectlyBalanced=Der Saldo der Buchung ist nicht ausgeglichen. Haben = %s. Soll = %s FicheVentilation=Zuordnungs Karte GeneralLedgerIsWritten=Operationen werden ins Hauptbuch geschrieben GeneralLedgerSomeRecordWasNotRecorded=Einige der Buchungen konnten nicht übernommen werden. Es gab keine Fehler, vermutlich wurden diese Buchungen schon früher übernommen. -NoNewRecordSaved=No more record to journalize +NoNewRecordSaved=Keine weiteren Einträge zum Übernehmen ListOfProductsWithoutAccountingAccount=Liste der Produkte, die nicht an ein Buchhaltungskonto gebunden sind ChangeBinding=Ändern der Zuordnung ## Admin ApplyMassCategories=Massenaktualisierung der Kategorien -AddAccountFromBookKeepingWithNoCategories=Available acccount not yet in a personalized group +AddAccountFromBookKeepingWithNoCategories=Verfügbares Konto nicht in der persönlichen Liste CategoryDeleted=Die Gruppe für das Buchhaltungskonto wurde entfernt AccountingJournals=Buchhaltungsjournale AccountingJournal=Buchhaltungsjournal NewAccountingJournal=Neues Buchhaltungsjournal ShowAccoutingJournal=Buchhaltungsjournal anzeigen Nature=Art -AccountingJournalType1=Miscellaneous operation +AccountingJournalType1=Verschiedene Aktionen AccountingJournalType2=Verkauf AccountingJournalType3=Einkauf AccountingJournalType4=Bank -AccountingJournalType5=Expenses report +AccountingJournalType5=Spesenabrechnungen AccountingJournalType9=Hat neue ErrorAccountingJournalIsAlreadyUse=Dieses Journal wird bereits verwendet ## Export -ExportDraftJournal=Export draft journal +ExportDraftJournal=Entwurfsjournal exportieren Modelcsv=Exportmodell -OptionsDeactivatedForThisExportModel=Für dieses Exportmodell sind die Einstellungen deaktiviert Selectmodelcsv=Wählen Sie ein Exportmodell Modelcsv_normal=Klassischer Export Modelcsv_CEGID=Export zu CEGID Expert Buchhaltung @@ -254,22 +254,22 @@ Modelcsv_ciel=Export zu Sage Ciel Compta oder Compta Evolution Modelcsv_quadratus=Export zu Quadratus QuadraCompta Modelcsv_ebp=Export zu EBP Modelcsv_cogilog=Export zu Cogilog -Modelcsv_agiris=Nach Agiris exportieren (Test) -Modelcsv_configurable=Export Configurable +Modelcsv_agiris=Nach Agiris exportieren +Modelcsv_configurable=Konfigurierbarer Export ChartofaccountsId=Kontenplan ID ## Tools - Init accounting account on product / service InitAccountancy=Rechnungswesen initialisieren -InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accounting account defined for sales and purchases. +InitAccountancyDesc=Auf dieser Seite kann ein Sachkonto für Artikel und Dienstleistungen vorgegeben werden, wenn noch kein Buchhaltungs-Konto für Ein- und Verkäufe definiert ist. DefaultBindingDesc=Diese Seite kann verwendet werden, um ein Standardkonto festzulegen, das für die Verknüpfung von Transaktionsdatensätzen zu Lohnzahlungen, Spenden, Steuern und Mwst. verwendet werden soll, wenn kein bestimmtes Konto angegeben wurde. Options=Optionen OptionModeProductSell=Modus Verkauf OptionModeProductBuy=Modus Einkäufe OptionModeProductSellDesc=Alle Artikel mit Sachkonten für Vertrieb anzeigen OptionModeProductBuyDesc=Alle Artikel mit Sachkonten für Einkauf anzeigen -CleanFixHistory=Remove accounting code from lines that not exists into charts of account +CleanFixHistory=Nicht existierenden Buchhaltungskonten von Positionen entfernen, die im Kontenplan nicht vorkommen. CleanHistory=Aller Zuordungen für das selektierte Jahr zurücksetzen -PredefinedGroups=Predefined groups +PredefinedGroups=Vordefinierte Gruppen WithoutValidAccount=Mit keinem gültigen dedizierten Konto WithValidAccount=Mit gültigen dedizierten Konto ValueNotIntoChartOfAccount=Dieser Wert für das Buchhaltungs-Konto existiert nicht im Kontenplan @@ -287,6 +287,6 @@ BookeppingLineAlreayExists=Datensätze existieren bereits in der Buchhaltung NoJournalDefined=Kein Journal definiert Binded=Zeilen verbunden ToBind=Zeilen für Zuordnung -UseMenuToSetBindindManualy=Autodection not possible, use menu %s to make the binding manually +UseMenuToSetBindindManualy=Automatische Kontierung nicht möglich, verwende das Menü %s um die Zuweisung manuell zu machen -WarningReportNotReliable=Warning, this report is not based on the Ledger, so does not contains transaction modified manualy in the Ledger. If your journalization is up to date, the bookkeeping view is more accurate. +WarningReportNotReliable=Warnung: Dieser Bericht basiert nicht auf dem Hauptbuch, daruch werden keine im Hauptbuch veränderten Buchungen berücksichtigt. Wenn die Buchhaltung aktuell ist, ist die Buchhaltungsansicht aussagekräftiger. diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang index 15f0f4c8440..d1361558141 100644 --- a/htdocs/langs/de_DE/admin.lang +++ b/htdocs/langs/de_DE/admin.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - admin Foundation=Institution Version=Version -Publisher=Publisher +Publisher=Verfasser VersionProgram=Programmversion VersionLastInstall=Version Erstinstallation VersionLastUpgrade=Letzte Versionsaktualisierung @@ -41,7 +41,7 @@ NoSessionFound=Ihre PHP -Konfiguration scheint keine Liste aktiver Sitzungen zuz DBStoringCharset=Zeichensatz der Datenbank-Speicherung DBSortingCharset=Zeichensatz der Datenbank-Sortierung ClientCharset=Client-Zeichensatz -ClientSortingCharset=Client collation +ClientSortingCharset=Client Sortierreihenfolge WarningModuleNotActive=Modul %s muss aktiviert sein WarningOnlyPermissionOfActivatedModules=Achtung, hier werden nur Berechtigungen im Zusammenhang mit aktivierten Module angezeigt. Weitere Module können Sie unter Start->Einstellungen-Module aktivieren. DolibarrSetup=dolibarr Installation oder Upgrade @@ -151,7 +151,7 @@ PurgeDeleteAllFilesInDocumentsDir=Alle Dateien im Verzeichnis %s löschen PurgeRunNow=Jetzt bereinigen PurgeNothingToDelete=Kein Ordner oder Datei zum löschen. PurgeNDirectoriesDeleted=%s Dateien oder Verzeichnisse gelöscht. -PurgeNDirectoriesFailed=Failed to delete %s files or directories. +PurgeNDirectoriesFailed=Dateien oder Verzeichnisse %s konnten nicht gelöscht werden PurgeAuditEvents=Bereinige alle Sicherheitsereignisse ConfirmPurgeAuditEvents=Möchten Sie wirklich alle Sicherheitsereignisse löschen ? GenerateBackup=Sicherung erzeugen @@ -197,23 +197,23 @@ ModulesDesc=Die Module bestimmen, welche Funktionalität in Dolibarr verfügbar ModulesMarketPlaceDesc=Sie finden weitere Module auf externen Web-Sites... ModulesDeployDesc=Wenn die Rechte Ihres Dateisystems es zulassen, können Sie mit diesem Werkzeug ein externes Modul installieren. Es wird dann im Reiter %s erscheinen. ModulesMarketPlaces=Suche externe Module -ModulesDevelopYourModule=Develop your own app/modules +ModulesDevelopYourModule=Eigene App/Modul entwickeln ModulesDevelopDesc=You can develop or find a partner to develop for you, your personalised module DOLISTOREdescriptionLong=Instead of switching on www.dolistore.com web site to find an external module, you can use this embedded tool that will make the seach on the external market place for you (may be slow, need an internet access)... NewModule=Neu -FreeModule=Free +FreeModule=Frei CompatibleUpTo=Kompatibel mit Version %s NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s - Max %s). CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s). -SeeInMarkerPlace=See in Market place +SeeInMarkerPlace=Siehe Marktplatz Updated=Aktualisiert -Nouveauté=Novelty +Nouveauté=Neuheit AchatTelechargement=Kaufen / Herunterladen GoModuleSetupArea=Um ein neues Modul zu installieren, gehen Sie auf die Modul-Setup Seite %s. DoliStoreDesc=DoliStore, der offizielle Marktplatz für dolibarr Module/Erweiterungen DoliPartnersDesc=Firmenliste die Kundenspezifische Module oder Funktionen entwickeln. (Hinweis: Jedermann mit PHP Erfahrung kann Kundenspezifische Funktionen für Opensource Projekte Entwickeln) WebSiteDesc=Anbieter für weitere Module... -DevelopYourModuleDesc=Some solutions to develop your own module... +DevelopYourModuleDesc=Lösungen um eigene Module zu entwickeln... URL=Link BoxesAvailable=Verfügbare Boxen BoxesActivated=Boxen aktiviert @@ -314,7 +314,7 @@ UnpackPackageInModulesRoot=Um eine externes Modul bereit zu stellen, entpacken S SetupIsReadyForUse=Modul-Installation abgeschlossen, es muss aber noch aktiviert und konfiguriert werden: %s. NotExistsDirect=Das alternative Stammverzeichnis ist nicht zu einem existierenden Verzeichnis definiert.
    InfDirAlt=Seit Version 3 ist es möglich, ein alternatives Stammverzeichnis anzugeben. Dies ermöglicht, Erweiterungen und eigene Templates am gleichen Ort zu speichern.
    Erstellen Sie einfach ein Verzeichis im Hauptverzeichnis von Dolibarr an (z.B. "custom").
    -InfDirExample=
    Then declare it in the file conf.php
    $dolibarr_main_url_root_alt='/custom'
    $dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'
    If these lines are commented with "#", to enable them, just uncomment by removing the "#" character. +InfDirExample=
    Danach in der Datei conf.php deklarieren
    $dolibarr_main_root_alt='/custom'
    $dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'
    Wenn diese Zeilen mit "#" auskommentiert sind, um sie zu aktivieren, einfach das Zeichen "#" entfernen. YouCanSubmitFile=In diesen Schritt können Sie die .zip-Datei des Modul-Pakets auswählen: CurrentVersion=Aktuelle dolibarr-Version CallUpdatePage=Zur Aktualisierung der Daten und Datenbankstrukturen zur Seite %s gehen. @@ -349,7 +349,7 @@ AddCRIfTooLong=Kein automatischer Zeilenumbruch. Entsprechend müssen Sie, falls ConfirmPurge=Möchten Sie wirklich endgültig löschen ?
    Alle Dateien werden unwiderbringlich gelöscht (Attachments, Angebote, Rechnungen usw.) MinLength=Mindestlänge LanguageFilesCachedIntoShmopSharedMemory=.lang-Sprachdateien in gemeinsamen Cache geladen -LanguageFile=Language file +LanguageFile=Sprachdatei ExamplesWithCurrentSetup=Beispiele mit der derzeitigen Systemkonfiguration ListOfDirectories=Liste der OpenDocument-Vorlagenverzeichnisse ListOfDirectoriesForModelGenODT=Liste der Verzeichnisse mit Vorlagendateien mit OpenDocument-Format.

    Fügen Sie hier den vollständigen Pfad der Verzeichnisse ein.
    Trennen Sie jedes Verzeichnis mit einer Zeilenschaltung
    Verzeichnisse des ECM-Moduls fügen Sie z.B. so ein DOL_DATA_ROOT/ecm/yourdirectoryname.

    Dateien in diesen Verzeichnissen müssen mit .odt oder .ods enden. @@ -466,7 +466,7 @@ FreeLegalTextOnExpenseReports=Freier Rechtstext auf Spesenabrechnungen WatermarkOnDraftExpenseReports=Wasserzeichen auf Entwurf von Ausgabenbelegen AttachMainDocByDefault=Setzen Sie diesen Wert auf 1, wenn Sie das Hauptdokument standardmäßig per E-Mail anhängen möchten (falls zutreffend). FilesAttachedToEmail=Datei hinzufügen -SendEmailsReminders=Send agenda reminders by emails +SendEmailsReminders=Erinnerung per E-Mail versenden # Modules Module0Name=Benutzer und Gruppen Module0Desc=Benutzer / Mitarbeiter und Gruppen Administration @@ -539,7 +539,7 @@ Module320Desc=RSS-Feed-Bildschirm innerhalb des Systems anzeigen Module330Name=Lesezeichen Module330Desc=Verwalten von Lesezeichen Module400Name=Projekte / Chancen / Leads -Module400Desc=Projektmanagement, Aufträge oder Leads. Anschließend können Sie ein beliebiges Element (Rechnung, Bestellung, Angebot, Serviceaufträge, ...) einem Projekt zuordnen und eine Queransicht von der Projektanzeige bekommen. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webkalender Module410Desc=Webkalenderintegration Module500Name=Sonderausgaben @@ -549,7 +549,7 @@ Module510Desc=Verwaltung der Angestellten-Löhne und -Zahlungen Module520Name=Darlehen Module520Desc=Verwaltung von Darlehen Module600Name=Benachrichtigungen bei Geschäftsereignissen -Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), to third-party contacts (setup defined on each third party) or to fixed emails +Module600Desc=Email-Benachrichtigung (ausgelößt durch einige Ereignisse) zu Benutzern (seperate Einstellungen je Benutzer), Partner-Kontakte (seperate Einstellung für jeden Partner) oder festen Email-Adressen. Module600Long=Note that this module is dedicated to send real time emails when a dedicated business event occurs. If you are looking for a feature to send reminders by email of your agenda events, go into setup of module Agenda. Module700Name=Spenden Module700Desc=Spendenverwaltung @@ -568,7 +568,7 @@ Module2000Desc=Bearbeitung von machen Textbereichen mit erweiterten Editor (basi Module2200Name=Dynamische Preise Module2200Desc=Mathematische Ausdrücke für Preise aktivieren Module2300Name=Geplante Aufträge -Module2300Desc=Scheduled jobs management (alias cron or chrono table) +Module2300Desc=Verwaltung geplanter Aufgaben (Cron oder chrono Tabelle) Module2400Name=Ereignisse/Termine Module2400Desc=Folgeereignisse oder Termine. Ereignisse manuell in der Agenda erfassen oder Applikationen erlauben Termine zur Nachverfolgung zu erstellen. Module2500Name=Inhaltsverwaltung(ECM) @@ -601,11 +601,11 @@ Module20000Desc=Definieren und beobachten sie die Urlaubsanträge Ihrer Angestel Module39000Name=Chargen-/ Seriennummern Module39000Desc=Chargen oder Seriennummer, Haltbarkeitsdatum und Verfallsdatum Management für Produkte Module50000Name=PayBox -Module50000Desc=Module to offer an online payment page accepting payments with Credit/Debit card via PayBox. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...) +Module50000Desc=Modul um Onlinezahlungen von Debit/Kreditkarten via PayBox entgegennehmen. Ihre Kunden können damit freie Zahlungen machen, oder Dolibarr Objekte (Rechnungen, Bestelltungen...) bezahlen Module50100Name=Kasse Module50100Desc=Modul Point of Sale (POS)\n Module50200Name=Paypal -Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...) +Module50200Desc=Modul um Online Zahlungen via PayPal entgegenzunehmen. Ihre Kunden können damit freie Zahlungen machen, oder Dolibarr Objekte (Rechnungen, Bestelltungen...) bezahlen Module50400Name=Buchhaltung (erweitert) Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers) Module54000Name=PrintIPP @@ -773,10 +773,10 @@ Permission401=Rabatte einsehen Permission402=Rabatte erstellen/bearbeiten Permission403=Rabatte freigeben Permission404=Rabatte löschen -Permission501=Read employee contracts/salaries +Permission501=Mitarbeiter Verträge und Löhne einlesen Permission502=Create/modify employee contracts/salaries -Permission511=Read payment of salaries -Permission512=Create/modify payment of salaries +Permission511=Lohnzahlungen einlesen +Permission512=Lohnzahlungen erstellen/bearbeiten Permission514=Löhne löschen Permission517=Löhne exportieren Permission520=Darlehen einsehen @@ -890,7 +890,7 @@ DictionaryStaff=Mitarbeiter DictionaryAvailability=Lieferverzug DictionaryOrderMethods=Bestellmethoden DictionarySource=Quelle der Angebote/Aufträge -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Kontenplan Modul DictionaryAccountancyJournal=Buchhaltungsjournale DictionaryEMailTemplates=Textvorlagen für E-Mails @@ -898,12 +898,13 @@ DictionaryUnits=Einheiten DictionaryProspectStatus=Geschäftsanbahnungsarten DictionaryHolidayTypes=Urlaubsarten DictionaryOpportunityStatus=Verkaufschancen für Projekt/Lead -DictionaryExpenseTaxCat=Expense report - Transportation categories +DictionaryExpenseTaxCat=Spesenbericht - Mobilität DictionaryExpenseTaxRange=Expense report - Range by transportation category SetupSaved=Einstellungen gespeichert SetupNotSaved=Einstellungen nicht gespeichert BackToModuleList=Zurück zur Modulübersicht BackToDictionaryList=Zurück zur der Stammdatenübersicht +TypeOfRevenueStamp=Type of revenue stamp VATManagement=USt-Verwaltung VATIsUsedDesc=Beim Erstellen von Leads, Rechnungen, Bestellungen, etc. wird folgende Regel zum Berechnen des USt.-Satz verwendet:
    Wenn der Verkäufer nicht der MwSt. unterliegt, wird ein MwSt. Satz von 0 verwendet. Ende der Regel.
    Wenn Verkäufer- und Käufer-Land identisch sind, wird der MwSt. Satz des Produktes verwendet. Ende der Regel.
    Wenn Verkäufer und Käufer beide in der EU sind und es sich um Transportprodukte (Autos, Schiffe, Flugzeuge) handelt, wird ein MwSt. Satz von 0 verwendet. (Die MwSt. muss durch den Käufer in seinem Land abgerechnet werden). Ende der Regel.
    Wenn Verkäufer und Käufer beide in der EU sind und der Käufer kein Unternehmen ist, dann wird der MwSt. Satz des Produktes verwendet.
    Wenn Verkäufer und Käufer beide in der EU sind, und der Käufer ein Unternehen ist, dann wird ein MwSt. Satz von 0 verwendet. Ende der Regel.
    In allen andere Fällen wird ein MwSt. Satz von 0 vorgeschlagen. Ende der Regel. VATIsNotUsedDesc=Die vorgeschlagene USt. ist standardmäßig 0 für alle Fälle wie Stiftungen, Einzelpersonen oder Kleinunternehmen. @@ -1083,7 +1084,7 @@ RestoreDesc2=Wiederherstellung der Archivdatei des Dokumentenverzeichnis (zum Be 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=Generated database backup files +PreviousDumpFiles=Datenbanksicherung in Dateien erstellt WeekStartOnDay=Wochenstart RunningUpdateProcessMayBeRequired=Eine Systemaktualisierung scheint erforderlich (Programmversion %s unterscheidet sich von Datenbankversion %s) YouMustRunCommandFromCommandLineAfterLoginToUser=Diesen Befehl müssen Sie auf der Kommandozeile (nach Login auf der Shell mit Benutzer %s) ausführen. @@ -1096,9 +1097,9 @@ TranslationUncomplete=Teilweise Übersetzung MAIN_DISABLE_METEO=Deaktivere Wetteransicht MeteoStdMod=Standart Modus MeteoStdModEnabled=Standardmodus aktiviert -MeteoPercentageMod=Percentage mode -MeteoPercentageModEnabled=Percentage mode enabled -MeteoUseMod=Click to use %s +MeteoPercentageMod=Prozentmodus +MeteoPercentageModEnabled=Prozentmodus aktiviert +MeteoUseMod=Ancklicken um %s zu verwenden TestLoginToAPI=Testen Sie sich anmelden, um API ProxyDesc=Einige Features von Dolibarr müssen einen Internet-Zugang zu Arbeit haben. Definieren Sie hier Parameter für diese. Wenn die Dolibarr Server hinter einem Proxy-Server, erzählt jene Parameter Dolibarr wie man Internet über ihn zugreifen. ExternalAccess=Externer Zugriff @@ -1110,7 +1111,7 @@ MAIN_PROXY_PASS=Kennwort ein, um den Proxy-Server verwenden 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) -ExtraFieldsLinesRec=Complementary attributes (templates invoices lines) +ExtraFieldsLinesRec=Zusätzliche Attribute (Rechnungsvorlage, Zeilen) ExtraFieldsSupplierOrdersLines=Ergänzende Attribute (in Bestellposition) ExtraFieldsSupplierInvoicesLines=Ergänzende Attribute (in Rechnungszeile) ExtraFieldsThirdParties=Ergänzende Attribute (Partner) @@ -1118,7 +1119,7 @@ ExtraFieldsContacts=Ergänzende Attribute (Kontakt) ExtraFieldsMember=Ergänzende Attribute (Mitglied) ExtraFieldsMemberType=Ergänzende Attribute (Mitglied) ExtraFieldsCustomerInvoices=Ergänzende Attribute (Rechnungen) -ExtraFieldsCustomerInvoicesRec=Complementary attributes (templates invoices) +ExtraFieldsCustomerInvoicesRec=Zusätzliche Attribute (Rechnungsvorlagen) ExtraFieldsSupplierOrders=Ergänzende Attribute (Bestellungen) ExtraFieldsSupplierInvoices=Ergänzende Attribute (Rechnungen) ExtraFieldsProject=Ergänzende Attribute (Projekte) @@ -1178,7 +1179,7 @@ HRMSetup=PV Modul Einstellungen ##### Company setup ##### CompanySetup=Unternehmenseinstellungen CompanyCodeChecker=Modul für Partner-Code-Erstellung (Kunden oder Lieferanten) -AccountCodeManager=Module for accounting code generation (customer or supplier) +AccountCodeManager=Modul zur Generierung der Buchhaltungskennzeichen (für Kunden und Lieferanten) NotificationsDesc=Die Funktion der E-Mail-Benachrichtigung erlaubt Ihnen den stillen und automatischen Versand von E-Mails zu einigen Dolibarr-Ereignissen. Folgende Ziele können definiert werden: NotificationsDescUser=* pro Benutzer, ein Benutzer pro mal NotificationsDescContact=* pro Partnerkontakte (Kunden oder Lieferanten), ein Kontakt pro mal @@ -1253,7 +1254,7 @@ MemberMainOptions=Haupteinstellungen AdherentLoginRequired= Verwalten Sie eine Anmeldung für jedes Mitglied AdherentMailRequired=Für das Anlegen eines neuen Mitglieds ist eine E-Mail-Adresse erforderlich MemberSendInformationByMailByDefault=Das Kontrollkästchen für den automatischen Mail-Bestätigungsversand an Mitglieder (bei Freigabe oder neuem Abonnement) ist standardmäßig aktiviert -VisitorCanChooseItsPaymentMode=Visitor can choose among available payment modes +VisitorCanChooseItsPaymentMode=Besucher können zwischen den verfügbaren Zahlungsarten wählen ##### LDAP setup ##### LDAPSetup=LDAP-Einstellungen LDAPGlobalParameters=Globale LDAP-Parameter @@ -1295,7 +1296,7 @@ LDAPDnContactActive=Kontaktesynchronisation LDAPDnContactActiveExample=Aktivierte/Deaktivierte Synchronisation LDAPDnMemberActive=Mitgliedersynchronisation LDAPDnMemberActiveExample=Aktivierte/Deaktivierte Synchronisation -LDAPDnMemberTypeActive=Members types' synchronization +LDAPDnMemberTypeActive=Mitgliedsarten Synchronisieren LDAPDnMemberTypeActiveExample=Aktivierte/Deaktivierte Synchronisation LDAPContactDn=Dolibarr Kontakte DN LDAPContactDnExample=Vollständige DN (zB: ou=users,dc=society,dc=com) @@ -1303,8 +1304,8 @@ LDAPMemberDn=Dolibarr Mitglieder DN LDAPMemberDnExample=Vollständige DN (zB: ou=members,dc=example,dc=com) LDAPMemberObjectClassList=Liste der objectClass LDAPMemberObjectClassListExample=Liste der objectClass-definierenden Eintragsattribute (z.B.: top,inetOrgPerson oder top,user für ActiveDirectory) -LDAPMemberTypeDn=Dolibarr members types DN -LDAPMemberTypepDnExample=Complete DN (ex: ou=memberstypes,dc=example,dc=com) +LDAPMemberTypeDn=Dolibarr Mitgliedsarten DN +LDAPMemberTypepDnExample=Komplette DN (z.B.: ou=membertypes,dc=example,dc=com) LDAPMemberTypeObjectClassList=Liste der objectClass LDAPMemberTypeObjectClassListExample=Liste der objectClass-definierenden Eintragsattribute(z.B.: top, groupOfUniqueNames) LDAPUserObjectClassList=Liste der objectClass @@ -1318,7 +1319,7 @@ LDAPTestSynchroContact=Kontaktsynchronisation testen LDAPTestSynchroUser=Benutzersynchronisation testen LDAPTestSynchroGroup=Gruppensynchronisation testen LDAPTestSynchroMember=Mitgliedersynchronisation testen -LDAPTestSynchroMemberType=Test member type synchronization +LDAPTestSynchroMemberType=Mitgliedersynchronisation testen LDAPTestSearch= LDAP-Suche testen LDAPSynchroOK=Synchronisationstest erfolgreich LDAPSynchroKO=Synchronisationstest fehlgeschlagen @@ -1547,7 +1548,7 @@ Buy=Kaufen Sell=Verkaufen InvoiceDateUsed=Rechnungsdatum verwendet YourCompanyDoesNotUseVAT=Für Ihr Unternehmen wurde keine USt.-Verwendung definiert (Start->Einstellungen->Unternehmen/Stiftung), entsprechend stehen in der Konfiguration keine USt.-Optionen zur Verfügung. -AccountancyCode=Accounting Code +AccountancyCode=Kontierungs-Code AccountancyCodeSell=Verkaufskonto-Code AccountancyCodeBuy=Einkaufskonto-Code ##### Agenda ##### @@ -1653,9 +1654,9 @@ TypePaymentDesc=0:Kunden-Zahlungs-Typ, 1:Lieferanten-Zahlungs-Typ, 2:Sowohl Kund IncludePath=Include-Pfad (in Variable '%s' definiert) ExpenseReportsSetup=Einstellungen des Moduls Spesenabrechnung TemplatePDFExpenseReports=Dokumentvorlagen zur Erstellung einer Spesenabrechnung -ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index +ExpenseReportsIkSetup=Einstellungen des Spesenmoduls - Meilenindex ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules -ExpenseReportNumberingModules=Expense reports numbering module +ExpenseReportNumberingModules=Nummerierung Spesenabrechnungen 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. ListOfNotificationsPerUser=Liste der Benachrichtigungen nach Benutzer* @@ -1712,8 +1713,8 @@ MailToSendSupplierOrder=Um Lieferantenbestellung zu schicken MailToSendSupplierInvoice=Um Lieferantenrechnung zu schicken MailToSendContract=um den Vertrag zu senden MailToThirdparty=Um E-Mail von Partner zu schicken -MailToMember=To send email from member page -MailToUser=To send email from user page +MailToMember=Email senden von Mitgliederseite +MailToUser=E-Mail von Benutzerseite aus senden ByDefaultInList=Standardanzeige als Listenansicht YouUseLastStableVersion=Sie verwenden die letzte stabile Version TitleExampleForMajorRelease=Beispielnachricht, die Sie nutzen können, um eine Hauptversion anzukündigen. Sie können diese auf Ihrer Website verwenden. @@ -1728,9 +1729,9 @@ SeeChangeLog=Siehe ChangeLog-Datei (nur Englisch) AllPublishers=Alle Verfasser UnknownPublishers=Verfasser unbekannt AddRemoveTabs=Reiter entfernen oder hinzufügen -AddDataTables=Add object tables -AddDictionaries=Add dictionaries tables -AddData=Add objects or dictionaries data +AddDataTables=Objekttabelle hinzufügen +AddDictionaries=Stammdatentabellen hinzufügen +AddData=Objekte oder Wörterbucheinträge hinzufügen AddBoxes=Boxen hinzufügen AddSheduledJobs=Geplante Aufgaben hinzufügen AddHooks=Hook anfügen @@ -1765,3 +1766,4 @@ ResourceSetup=Konfiguration des Modul Ressourcen UseSearchToSelectResource=Verwende ein Suchformular um eine Ressource zu wählen (eher als eine Dropdown-Liste) zu wählen. DisabledResourceLinkUser=Deaktivierter Ressource Link zu Benutzer DisabledResourceLinkContact=Deaktivierter Ressource Link zu Kontakt +ConfirmUnactivation=Modul zurücksetzen bestätigen diff --git a/htdocs/langs/de_DE/agenda.lang b/htdocs/langs/de_DE/agenda.lang index 0a5a6204b72..a306be21f74 100644 --- a/htdocs/langs/de_DE/agenda.lang +++ b/htdocs/langs/de_DE/agenda.lang @@ -12,7 +12,7 @@ Event=Ereignis Events=Ereignisse EventsNb=Anzahl der Ereignisse ListOfActions=Liste Ereignisse -EventReports=Event reports +EventReports=Ereignisbericht Location=Ort ToUserOfGroup=Für jeden Benutzer in der Gruppe EventOnFullDay=Ganztägig @@ -35,7 +35,7 @@ AgendaAutoActionDesc= Definieren sie hier Ereignisse für die Dolibarr automatis AgendaSetupOtherDesc= Diese Seite ermöglicht die Konfiguration anderer Parameter des Tagesordnungsmoduls. AgendaExtSitesDesc=Diese Seite erlaubt Ihnen externe Kalender zu konfigurieren. ActionsEvents=Veranstaltungen zur automatischen Übernahme in die Agenda -EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into Agenda module setup. +EventRemindersByEmailNotEnabled=Aufgaben-/Terminerinnerungen via E-Mail sind in den Einstellungen des Agendomoduls nicht aktiviert. ##### Agenda event labels ##### NewCompanyToDolibarr=Partner %s erstellt ContractValidatedInDolibarr=Vertrag %s freigegeben @@ -67,7 +67,7 @@ OrderApprovedInDolibarr=Bestellen %s genehmigt OrderRefusedInDolibarr=Bestellung %s abgelehnt OrderBackToDraftInDolibarr=Bestellen %s zurück nach Draft-Status ProposalSentByEMail=Angebot %s per E-Mail versendet -ContractSentByEMail=Contract %s sent by EMail +ContractSentByEMail=Vertrag %s via E-Mail gesendet OrderSentByEMail=Kundenauftrag %s per E-Mail versendet InvoiceSentByEMail=Kundenrechnung %s per E-Mail versendet SupplierOrderSentByEMail=Lieferantenbestellung %s per E-Mail versendet @@ -81,11 +81,11 @@ InvoiceDeleted=Rechnung gelöscht PRODUCT_CREATEInDolibarr=Produkt %s erstellt PRODUCT_MODIFYInDolibarr=Produkt %s aktualisiert PRODUCT_DELETEInDolibarr=Produkt %s gelöscht -EXPENSE_REPORT_CREATEInDolibarr=Expense report %s created +EXPENSE_REPORT_CREATEInDolibarr=Spesenabrechnung %s erstellt EXPENSE_REPORT_VALIDATEInDolibarr=Ausgabenbericht %s validiert -EXPENSE_REPORT_APPROVEInDolibarr=Expense report %s approved -EXPENSE_REPORT_DELETEInDolibarr=Expense report %s deleted -EXPENSE_REPORT_REFUSEDInDolibarr=Expense report %s refused +EXPENSE_REPORT_APPROVEInDolibarr=Spesenabrechnung %s genehmigt +EXPENSE_REPORT_DELETEInDolibarr=Spesenabrechnung %s gelöscht +EXPENSE_REPORT_REFUSEDInDolibarr=Spesenabrechnung %s abgelehnt PROJECT_CREATEInDolibarr=Projekt %s erstellt PROJECT_MODIFYInDolibarr=Projekt %s geändert PROJECT_DELETEInDolibarr=Projekt %s gelöscht @@ -95,8 +95,8 @@ DateActionStart=Beginnt DateActionEnd=Endet AgendaUrlOptions1=Sie können die Ausgabe über folgende Parameter filtern: AgendaUrlOptions3=logina=%s begrenzt die Ausgabe auf den Benutzer %s erstellte Ereignissen. -AgendaUrlOptionsNotAdmin=logina=!%s to restrict output to actions not owned by user %s. -AgendaUrlOptions4=logint=%s to restrict output to actions assigned to user %s (owner and others). +AgendaUrlOptionsNotAdmin=logina=!%s begrenzt die Ausgabe auf dem Benutzer %s nicht als Eigentümer zugewiesene Aktionen. +AgendaUrlOptions4=logint=%s begrenzt die Ausgabe auf den Benutzer %s (Eigentümer und andere) zugewiesene Aktionen. AgendaUrlOptionsProject=project=PROJECT_ID begrenzt die Ausgabe auf die dem Projekte PROJECT_ID zugewiesene Ereignissen. AgendaShowBirthdayEvents=Geburtstage von Kontakten anzeigen AgendaHideBirthdayEvents=Geburtstage von Kontakten nicht anzeigen diff --git a/htdocs/langs/de_DE/banks.lang b/htdocs/langs/de_DE/banks.lang index 12d278172f1..83ec9fc5b69 100644 --- a/htdocs/langs/de_DE/banks.lang +++ b/htdocs/langs/de_DE/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Nummer LineRecord=Transaktion AddBankRecord=Erstelle Transaktion AddBankRecordLong=Eintrag manuell hinzufügen +Conciliated=ausgelichen ConciliatedBy=Ausgeglichen durch DateConciliating=Ausgleichsdatum BankLineConciliated=Transaktion ausgeglichen @@ -159,4 +160,4 @@ VariousPayments=Sonstige Zahlungen ShowVariousPayment=Zeige sonstige Zahlungen AddVariousPayment=Sonstige Zahlung hinzufügen YourSEPAMandate=Ihr SEPA-Mandat -FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Thanks to return it signed (scan of the signed document) or sent it by mail to +FindYourSEPAMandate=Dies ist Ihr SEPA-Auftrag, um unser Unternehmen zu autorisieren, einen Lastschriftauftrag an Ihre Bank zu erteilen. Bedanken, um es Unterschrieben zurück zu senden (Scan des signierten Dokuments) oder senden Sie es per Post an diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang index 56ef94cdd57..470d1a1892a 100644 --- a/htdocs/langs/de_DE/bills.lang +++ b/htdocs/langs/de_DE/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Unbezahlte Lieferantenrechnungen für %s BillsLate=Verspätete Zahlungen BillsStatistics=Statistik Kundenrechnungen BillsStatisticsSuppliers=Statistik Lieferantenrechnungen +DisabledBecauseDispatchedInBookkeeping=Deaktiviert da die Rechnung schon in die Buchhaltung übernommen wurde +DisabledBecauseNotLastInvoice=Deaktiviert da die Rechnung nicht gelöscht werden kann. Es wurden schon Rechnungen nach dieser Rechnung erstellt, so dass die Nummerierung nicht fortlaufend wäre. DisabledBecauseNotErasable=Deaktiviert, da löschen nicht möglich InvoiceStandard=Standardrechnung InvoiceStandardAsk=Standardrechnung @@ -156,7 +158,7 @@ NotARecurringInvoiceTemplate=keine Vorlage für wiederkehrende Rechnung NewBill=Neue Rechnung LastBills=Neueste %s Rechnungen LatestTemplateInvoices=Neueste %s Rechnungsvorlagen -LatestCustomerTemplateInvoices=Latest %s customer template invoices +LatestCustomerTemplateInvoices=Letzte %s Kundenrechnungsvorlage LatestSupplierTemplateInvoices=Neueste %s Lieferantenrechungs-Vorlagen LastCustomersBills=Neueste %s Kundenrechnungen LastSuppliersBills=Neueste %s Lieferantenrechnungen @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Möchten Sie diesen Sozialbeitrag wirklich als 'abgebr ConfirmClassifyPaidPartially=Möchten Sie die Rechnung %s wirklich als 'bezahlt' markieren? ConfirmClassifyPaidPartiallyQuestion=Diese Rechnung wurde noch nicht vollständig bezahlt. Warum möchten Sie diese Rechnung als erledigt bestätigen ? ConfirmClassifyPaidPartiallyReasonAvoir=Der offene Zahlbetrag ( %s %s) resultiert aus einem gewährten Skonto. Zur Korrektur der USt. wird eine Gutschrift angelegt. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Der offene Zahlbetrag ( %s %s) resultiert aus einem gewährten Skonto. Ich akzeptiere den Verlust der USt. aus diesem Rabatt. ConfirmClassifyPaidPartiallyReasonDiscountVat=Der offene Zahlbetrag ( %s %s) resultiert aus einem gewährten Skonto. Die Mehrwertsteuer aus diesem Rabatt wird ohne Gutschrift wieder hergestellt. ConfirmClassifyPaidPartiallyReasonBadCustomer=schlechter Zahler @@ -331,15 +334,15 @@ ListOfNextSituationInvoices=Liste der nächsten Fortschrittsrechnungen FrequencyPer_d=alle %s Tage FrequencyPer_m=Alle %s Monate FrequencyPer_y=Alle %s Jahre -FrequencyUnit=Frequency unit -toolTipFrequency=Examples:
    Set 7, Day: give a new invoice every 7 days
    Set 3, Month: give a new invoice every 3 month +FrequencyUnit=Wiederholungseinheit +toolTipFrequency=Beispiel:
    7 Tage: erstellt alle 7 Tage eine neue Rechnung
    3 Monate: erstellt alle 3 Monate eine neue Rechnung NextDateToExecution=Datum der nächsten Rechnungserstellung -NextDateToExecutionShort=Date next gen. +NextDateToExecutionShort=Datum nächste Generierung DateLastGeneration=Datum der letzten Generierung -DateLastGenerationShort=Date latest gen. +DateLastGenerationShort=Datum letzte Generierung MaxPeriodNumber=max. Anzahl an Rechnungen NbOfGenerationDone=Anzahl bisher erstellter Rechnungen -NbOfGenerationDoneShort=Nb of generation done +NbOfGenerationDoneShort=Anzahl Generierungen erledigt MaxGenerationReached=Max. Anzahl Rechnungsgenerierungen erreicht InvoiceAutoValidate=Rechnungen automatisch freigeben GeneratedFromRecurringInvoice=Erstelle wiederkehrende Rechnung %s aus Vorlage @@ -514,6 +517,6 @@ DeleteRepeatableInvoice=Rechnungs-Template löschen ConfirmDeleteRepeatableInvoice=Möchten Sie diese Rechnungsvorlage wirklich löschen? CreateOneBillByThird=Erstelle eine Rechnung pro Partner (andernfalls, eine Rechnung pro Bestellung) BillCreated=%s Rechnung(en) erstellt -StatusOfGeneratedDocuments=Status of document generation +StatusOfGeneratedDocuments=Status der Dokumentenerstellung DoNotGenerateDoc=Dokumentdatei nicht erstellen -AutogenerateDoc=Auto generate document file +AutogenerateDoc=Dokumentdatei automatisch erstellen diff --git a/htdocs/langs/de_DE/commercial.lang b/htdocs/langs/de_DE/commercial.lang index ecd2c19916d..ac3736bc0fc 100644 --- a/htdocs/langs/de_DE/commercial.lang +++ b/htdocs/langs/de_DE/commercial.lang @@ -66,14 +66,14 @@ ActionAC_OTH=Sonstiges ActionAC_OTH_AUTO=Automatisch eingefügte Ereignisse ActionAC_MANUAL=Manuell eingefügte Ereignisse ActionAC_AUTO=Automatisch eingefügte Ereignisse -ActionAC_OTH_AUTOShort=Auto +ActionAC_OTH_AUTOShort=Automatisch Stats=Verkaufsstatistik StatusProsp=Lead Status DraftPropals=Entworfene Angebote NoLimit=Kein Limit -ToOfferALinkForOnlineSignature=Link for online signature -WelcomeOnOnlineSignaturePage=Welcome on the page to accept commerical proposals from %s -ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal -ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse -SignatureProposalRef=Signature of quote/commerical proposal %s -FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled +ToOfferALinkForOnlineSignature=Link zur Onlinesignatur +WelcomeOnOnlineSignaturePage=Wilkommen auf der Seite um die Angebote von %s zu akzeptieren +ThisScreenAllowsYouToSignDocFrom=Auf dieser Seite können Angebote akzeptiert und unterschreiben oder ablehnt werden +ThisIsInformationOnDocumentToSign=Information zum Dokument zum Akzeptieren oder Ablehnen +SignatureProposalRef=Unterschrift des Angebotes %s +FeatureOnlineSignDisabled=Onlineunterschrift ist deaktiviert oder das Dokument wurde erstellt, bevor dieses Funktion aktiviert wurde diff --git a/htdocs/langs/de_DE/compta.lang b/htdocs/langs/de_DE/compta.lang index 0997f457dc5..0296aaaf512 100644 --- a/htdocs/langs/de_DE/compta.lang +++ b/htdocs/langs/de_DE/compta.lang @@ -18,12 +18,13 @@ Accountsparent=Übergeordnete Konten Income=Einnahmen Outcome=Ausgaben MenuReportInOut=Ergebnis / Geschäftsjahr -ReportInOut=Balance of income and expenses +ReportInOut=Übersicht Aufwand/Ertrag ReportTurnover=Umsatz PaymentsNotLinkedToInvoice=Zahlungen mit keiner Rechnung und damit auch keinem Partner verbunden PaymentsNotLinkedToUser=Zahlungen mit keinem Benutzer verbunden Profit=Gewinn AccountingResult=Buchhaltungsergebnis +BalanceBefore=Balance (before) Balance=Saldo Debit=Soll Credit=Haben @@ -31,34 +32,34 @@ Piece=Beleg AmountHTVATRealReceived=Einnahmen (netto) AmountHTVATRealPaid=Ausgaben (netto) VATToPay=MwSt. Verkäufe - USt. -VATReceived=Tax received -VATToCollect=Tax purchases -VATSummary=Tax Balance +VATReceived=USt. Verkäufe +VATToCollect=USt. Einkäufe +VATSummary=USt. Saldo VATPaid=Bezahlte USt. -LT1Summary=Tax 2 summary -LT2Summary=Tax 3 summary +LT1Summary=Steuer 2 Zusammenfassung +LT2Summary=Steuer 3 Zusammenfassung LT1SummaryES=Saldo RE LT2SummaryES=EKSt. Saldo -LT1SummaryIN=CGST Balance -LT2SummaryIN=SGST Balance -LT1Paid=Tax 2 paid -LT2Paid=Tax 3 paid +LT1SummaryIN=CGST Total +LT2SummaryIN=SGST Total +LT1Paid=Steuer 2 bezahlt +LT2Paid=Steuer 3 bezahlt LT1PaidES=RE Zahlungen LT2PaidES=EKSt. gezahlt -LT1PaidIN=CGST Paid -LT2PaidIN=SGST Paid -LT1Customer=Tax 2 sales -LT1Supplier=Tax 2 purchases +LT1PaidIN=CGST bezahlt +LT2PaidIN=SGST Bezahlt +LT1Customer=Steuer 2 Verkauf +LT1Supplier=Steuer 2 Einkäufe LT1CustomerES=RE Verkäufe LT1SupplierES=RE Einkäufe -LT1CustomerIN=CGST sales -LT1SupplierIN=CGST purchases -LT2Customer=Tax 3 sales -LT2Supplier=Tax 3 purchases +LT1CustomerIN=CGST Verkäufe +LT1SupplierIN=CGST Einkäufe +LT2Customer=Steuer 3 Verkäufe +LT2Supplier=Steuer 3 Einkäufe LT2CustomerES=EKSt. Verkauf LT2SupplierES=EKSt. Einkauf -LT2CustomerIN=SGST sales -LT2SupplierIN=SGST purchases +LT2CustomerIN=SGST Verkäufe +LT2SupplierIN=SGST Einkäufe VATCollected=Erhobene USt. ToPay=Zu zahlen SpecialExpensesArea=Bereich für alle Sonderzahlungen @@ -107,8 +108,8 @@ SocialContributionsPayments=Sozialabgaben-/Steuer Zahlungen ShowVatPayment=Zeige USt. Zahlung TotalToPay=Zu zahlender Gesamtbetrag BalanceVisibilityDependsOnSortAndFilters=Differenz ist nur in dieser Liste sichtbar, wenn die Tabelle aufsteigend nach %s sortiert ist und gefiltert mit nur 1 Bankkonto -CustomerAccountancyCode=Customer accounting code -SupplierAccountancyCode=Supplier accounting code +CustomerAccountancyCode=Kontierungscode Kunde +SupplierAccountancyCode=Kontierungscode Lieferant CustomerAccountancyCodeShort=Buchh. Kunden-Konto SupplierAccountancyCodeShort=Buchh.-Lieferanten-Konto AccountNumber=Kontonummer @@ -136,7 +137,7 @@ CalcModeVATDebt=Modus %s USt. auf Engagement Rechnungslegung %s. CalcModeVATEngagement=Modus %sTVA auf Einnahmen-Ausgaben%s. CalcModeDebt=Modus %sForderungen-Verbindlichkeiten%s sagt Engagement Rechnungslegung. CalcModeEngagement=Modus %sEinnahmen-Ausgaben%s die Kassenbuchführung -CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table +CalcModeBookkeeping=Analyse der journalisierten Daten im Hauptbuch CalcModeLT1= Modus %sRE auf Kundenrechnungen - Lieferantenrechnungen%s CalcModeLT1Debt=Modus %sRE auf Kundenrechnungen%s CalcModeLT1Rec= Modus %sRE auf Lieferantenrechnungen%s @@ -145,20 +146,20 @@ CalcModeLT2Debt=Modus %sIRPF auf Kundenrechnungen%s CalcModeLT2Rec= Modus %sIRPF auf Lieferantenrechnungen%s AnnualSummaryDueDebtMode=Saldo der Erträge und Aufwendungen, Jahresübersicht AnnualSummaryInputOutputMode=Saldo der Erträge und Aufwendungen, Jahresübersicht -AnnualByCompanies=Balance of income and expenses, by predefined groups of account -AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by predefined groups, mode %sClaims-Debts%s said Commitment accounting. -AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by predefined groups, mode %sIncomes-Expenses%s said cash accounting. +AnnualByCompanies=Bilanz Ertrag/Aufwand, pro vordefinierten Kontogruppen +AnnualByCompaniesDueDebtMode=Die Ertrags-/Aufwands-Bilanz nach vordefinierten Gruppen, im Modus %sForderungen-Verbindlichkeiten%s meldet Kameralistik. +AnnualByCompaniesInputOutputMode=Die Ertrags-/Aufwands-Bilanz im Modus %sEinkünfte-Ausgaben%s meldet Ist-Besteuerung. SeeReportInInputOutputMode=Der %sEinkünfte-Ausgaben%s-Bericht meldet Ist-Besteuerung für eine Berechnung der tatsächlich erfolgten Zahlungsströme. SeeReportInDueDebtMode=Der %sForderungen-Verbindlichkeiten%s-Bericht meldet Kameralistik für eine Berechnung auf Basis der ausgestellten Rechnungen. -SeeReportInBookkeepingMode=See report %sBookeeping%s for a calculation on bookkeeping table analysis +SeeReportInBookkeepingMode=Siehe Bericht %sHauptbuch%s für die Berechnung via Hauptbuch Analyse RulesAmountWithTaxIncluded=- Angezeigte Beträge enthalten alle Steuern RulesResultDue=- Dies beinhaltet ausstehende Rechnungen, Aufwendungen, Umsatzsteuern, Abgaben, ob sie bezahlt wurden oder nicht. Auch die gezahlten Gehälter.
    - Es gilt das Freigabedatum von den Rechnungen und USt., sowie das Fälligkeitsdatum für Aufwendungen. Für Gehälter definiert mit dem Modul Löhne, wird das Valutadatum der Zahlung verwendet. RulesResultInOut=- Es sind nur tatsächliche Zahlungen für Rechnungen, Kostenabrechnungen, USt und Gehälter enthalten.
    - Bei Rechnungen, Kostenabrechnungen, USt und Gehälter gilt das Zahlugnsdatum. Bei Spenden gilt das Spendendatum. RulesCADue=- es beinhaltet alle fälligen Kundenrechnungen, unabhängig von ihrem Zahlungsstatus.
    - Es gilt das Freigabedatum der Rechnungen.
    RulesCAIn=- Beinhaltet alle tatsächlich erfolgten Zahlungen von Kunden.
    - Es gilt das Zahlungsdatum der Rechnungen.
    -RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME" -RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME" -RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts grouped by personalized groups +RulesAmountOnInOutBookkeepingRecord=Beinhaltet Datensätze aus dem Hauptbuch mit den Gruppen "Aufwand" oder "Ertrag" +RulesResultBookkeepingPredefined=Beinhaltet Datensätze aus dem Hauptbuch mit den Gruppen "Aufwand" oder "Ertrag" +RulesResultBookkeepingPersonalized=Zeigt die Buchungen im Hauptbuch mit Konten gruppiert nach Kontengruppen SeePageForSetup=Siehe Menü %s für die Einrichtung DepositsAreNotIncluded=- Ohne Anzahlungsrechnungen DepositsAreIncluded=- Inklusive Anzahlungsrechnungen @@ -211,14 +212,14 @@ CalculationRuleDesc=Zur Berechnung der Gesamt-USt. gibt es zwei Methoden:
    Me CalculationRuleDescSupplier=Gemäß Ihrem Lieferanten, wählen Sie die geeignete Methode, um die gleiche Berechnungsregel anzuwenden um das selbe Ergebnis wie Ihr Lieferant zu bekommen. TurnoverPerProductInCommitmentAccountingNotRelevant=Umsatz Bericht pro Produkt, bei der Verwendung einer Kassabuch Buchhaltung ist der Modus nicht relevant. Dieser Bericht ist nur bei Verwendung Buchführungsmodus Periodenrechnung (siehe Setup das Modul Buchhaltung). CalculationMode=Berechnungsmodus -AccountancyJournal=Accounting code journal +AccountancyJournal=Kontierungscode-Journal ACCOUNTING_VAT_SOLD_ACCOUNT=Standard Buchhaltungs-Konto für die Erhebung der MwSt. - Mehrwertsteuer auf den Umsatz (wird verwendet, wenn nicht bei der Konfiguration des MwSt-Wörterbuch definiert) ACCOUNTING_VAT_BUY_ACCOUNT=Standard Buchhaltungs-Konto für Vorsteuer - Ust bei Einkäufen (wird verwendet, wenn nicht unter Einstellungen->Stammdaten USt.-Sätze definiert) ACCOUNTING_VAT_PAY_ACCOUNT=Standard-Aufwandskonto, um MwSt zu bezahlen ACCOUNTING_ACCOUNT_CUSTOMER=Standard Buchhaltungskonto für Kunden/Debitoren (wenn nicht beim Partner definiert) -ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated customer accouting account on third party is not defined. +ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Buchhaltungskonten die auf der Partnerkarte definiert wurden werden für die Nebenbücher verwendet, für das Hauptbuch oder als Vorgabewert für Nebenbücher falls kein Buchhaltungskonto auf der Kunden-Partnerkarte definiert wurde ACCOUNTING_ACCOUNT_SUPPLIER=Standard Buchhaltungskonto für Lieferanten/Kreditoren (wenn nicht beim Lieferanten definiert) -ACCOUNTING_ACCOUNT_SUPPLIER_Desc=The dedicated accounting account defined on third party card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated supplier accouting account on third party is not defined. +ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Buchhaltungskonten die auf der Partnerkarte definiert wurden werden nur für die Nebenbücher verwendet. Dieses wird für das Hauptbuch oder als Vorgabewert für Nebenbücher falls kein Buchhaltungskonto auf der Lieferanten-Partnerkarte definiert wurde. CloneTax=Dupliziere Sozialabgabe/Steuersatz ConfirmCloneTax=Bestätigen Sie die Duplizierung der Steuer-/Sozialabgaben-Zahlung CloneTaxForNextMonth=Für nächsten Monat duplizieren @@ -234,4 +235,4 @@ ImportDataset_tax_vat=USt.-Zahlungen ErrorBankAccountNotFound=Fehler: Bankkonto nicht gefunden FiscalPeriod=Buchhaltungs Periode ListSocialContributionAssociatedProject=Liste der Sozialabgaben für dieses Projekt -DeleteFromCat=Remove from accounting group +DeleteFromCat=Aus Kontengruppe entfernen diff --git a/htdocs/langs/de_DE/contracts.lang b/htdocs/langs/de_DE/contracts.lang index dce1ed6004c..957c8c735cc 100644 --- a/htdocs/langs/de_DE/contracts.lang +++ b/htdocs/langs/de_DE/contracts.lang @@ -31,11 +31,11 @@ NewContract=Neuer Vertrag NewContractSubscription=Neuer Vertrag/Abonnement AddContract=Vertrag erstellen DeleteAContract=Löschen eines Vertrages -ActivateAllOnContract=Activate all services +ActivateAllOnContract=Alle Dienstleistungen aktivieren CloseAContract=Schließen eines Vertrages ConfirmDeleteAContract=Möchten Sie diesen Vertrag und alle verbundenen Dienste wirklich löschen? ConfirmValidateContract=Möchten Sie diesen Vertrag wirklich unter dem Namen %s freigeben? -ConfirmActivateAllOnContract=This will open all services (not yet active). Are you sure you want to open all services? +ConfirmActivateAllOnContract=Dies wird alle Dienstleistungen aktivieren (Die noch nicht aktiv sind). Sollen wirklich alle Dienstleistungen aktiviert werden? ConfirmCloseContract=Die beendet alle Dienstleistungen (aktiv oder nicht). Wollen Sie diesen Vertrag deaktivieren ? ConfirmCloseService=Möchten Sie diesen Service wirklich mit Datum %s deaktivieren? ValidateAContract=Einen Vertrag freigeben @@ -68,7 +68,7 @@ BoardRunningServices=Abgelaufene, aktive Leistungen ServiceStatus=Leistungs-Status DraftContracts=Vertragsentwürfe CloseRefusedBecauseOneServiceActive=Schließen nicht möglich, es existieren noch aktive Leistungen -ActivateAllContracts=Activate all contract lines +ActivateAllContracts=Alle Vertragszeilen aktivieren CloseAllContracts=schließe alle Vertragsleistungen DeleteContractLine=Vertragsposition löschen ConfirmDeleteContractLine=Möchten Sie diese Position wirklich löschen? @@ -87,8 +87,8 @@ ContactNameAndSignature=Für %s, Name und Unterschrift OnlyLinesWithTypeServiceAreUsed=Nur die Zeile der Kategorie "Service" wird kopiert. CloneContract=Dupliziere Vertrag ConfirmCloneContract=Möchten Sie den Vertrag %s wirklich duplizieren? -LowerDateEndPlannedShort=Lower planned end date of active services -SendContractRef=Contract information __REF__ +LowerDateEndPlannedShort=Frühestes geplantes Enddatum der aktiven Dienstleistungen +SendContractRef=Vertragsinformationen __REF__ ##### Types de contacts ##### TypeContact_contrat_internal_SALESREPSIGN=Vertragsunterzeichnung durch Vertreter TypeContact_contrat_internal_SALESREPFOLL=Vertrag Nachbetreuung durch Vertreter diff --git a/htdocs/langs/de_DE/cron.lang b/htdocs/langs/de_DE/cron.lang index 6ce2d946b63..79103b6c846 100644 --- a/htdocs/langs/de_DE/cron.lang +++ b/htdocs/langs/de_DE/cron.lang @@ -10,12 +10,12 @@ CronSetup= Jobverwaltungs-Konfiguration URLToLaunchCronJobs=URL zum Prüfen und Starten von speziellen Jobs OrToLaunchASpecificJob=Oder zum Prüfen und Starten von speziellen Jobs KeyForCronAccess=Sicherheitsschlüssel für URL zum Starten von Cronjobs -FileToLaunchCronJobs=Command line to check and launch qualified cron jobs +FileToLaunchCronJobs=Befehlszeile zum Überprüfen und Starten von qualifizierten Cron-Jobs CronExplainHowToRunUnix=In Unix-Umgebung sollten Sie die folgenden crontab-Eintrag verwenden, um die Befehlszeile alle 5 Minuten ausführen CronExplainHowToRunWin=In Microsoft(tm) Windows Umgebungen kannst Du die Aufgabenplanung benutzen um die Kommandozeile jede 5 Minuten aufzurufen CronMethodDoesNotExists=Klasse %s enthält keine Methode %s -CronJobDefDesc=Cron job profiles are defined into the module descriptor file. When module is activated, they are loaded and available so you can administer the jobs from the admin tools menu %s. -CronJobProfiles=List of predefined cron job profiles +CronJobDefDesc=Cron-Jobprofile sind in der Moduldeskriptordatei definiert. Wenn das Modul aktiviert ist, sind diese geladen und verfügbar, so dass Sie die Jobs über das Menü admin tools %s verwalten können. +CronJobProfiles=Liste vordefinierter Cron-Jobprofile # Menu EnabledAndDisabled=Aktiviert und Deaktiviert # Page list @@ -55,28 +55,28 @@ CronSaveSucess=Erfolgreich gespeichert CronNote=Kommentar CronFieldMandatory=Feld %s ist zwingend nötig CronErrEndDateStartDt=Enddatum kann nicht vor dem Startdatum liegen -StatusAtInstall=Status at module installation +StatusAtInstall=Status bei der Modulinstallation CronStatusActiveBtn=Aktivieren CronStatusInactiveBtn=Deaktivieren CronTaskInactive=Dieser Job ist deaktiviert CronId=ID CronClassFile=Dateiname mit Klasse -CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
    For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for module is
    product -CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory).
    For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/product.class.php, the value for class file name is
    product/class/product.class.php -CronObjectHelp=The object name to load.
    For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is
    Product -CronMethodHelp=The object method to launch.
    For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is
    fetch -CronArgsHelp=The method arguments.
    For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be
    0, ProductRef +CronModuleHelp=Name des Dolibarr-Modulverzeichnisses (funktioniert auch mit externem Dolibarr-Modul).
    Um zum Beispiel die Fetch-Methode des Dolibarr-Produktobjekts /htdocs/product/class/product.class.php aufzurufen, ist der Wert für das Modul ein Produkt +CronClassFileHelp=Der relative Pfad und Dateiname, der geladen werden soll (Pfad ist relativ zum Webserver-Stammverzeichnis).
    Um zum Beispiel die Fetch-Methode des Dolibarr-Produktobjekts htdocs / product / class / product.class.php aufzurufen, lautet der Wert für den Klassendateinamen: product / class / product.class.php +CronObjectHelp=Der Objektname, der geladen werden soll.
    Um zum Beispiel die Fetch-Methode des Dolibarr-Produktobjekts /htdocs/product/class/product.class.php aufzurufen, lautet der Wert für den Klassendateinamen
    Produkt +CronMethodHelp=Die zu startende Objektmethode.
    Um zum Beispiel die Fetch-Methode des Dolibarr-Produktobjekts /htdocs/product/class/product.class.php aufzurufen, lautet der Wert für Methode: +CronArgsHelp=Das Methodenargument.
    Um zum Beispiel die Methode fetch des Dolibarr Produkt Objektes /htdocs/product/class/product.class.php aufzurufen, ist der Input-Parameter-Wert 0, ProductRef CronCommandHelp=Die auszuführende System-Kommandozeile CronCreateJob=Erstelle neuen cronjob CronFrom=Von # Info # Common CronType=Job Typ -CronType_method=Call method of a PHP Class +CronType_method=Aufruf-Methode einer PHP-Klasse CronType_command=Shell-Befehl CronCannotLoadClass=Kann Klasse %s oder Object %s nicht laden UseMenuModuleToolsToAddCronJobs=Gehen Sie in Menü "Start - Module Hilfsprogramme - Geplante Aufträge" um geplante Aufträge zu sehen/bearbeiten. JobDisabled=Aufgabe deaktiviert MakeLocalDatabaseDumpShort=lokales Datenbankbackup -MakeLocalDatabaseDump=Create a local database dump. Parameters are: compression ('gz' or 'bz' or 'none'), backup type ('mysql' or 'pgsql'), 1, 'auto' or filename to build, nb of backup files to keep +MakeLocalDatabaseDump=Erstelle einen lokalen Datenbankdump. Parameter sind: compression ('gz' or 'bz' or 'none'), Backupart ('mysql' oder 'pgsql'), 1, 'auto' oder Dateiname, Anzahl der Datensicherungen zum Aufbewahren WarningCronDelayed=Bitte beachten: Aus Leistungsgründen können Ihre Jobs um bis zu %s Stunden verzögert werden, unabhängig vom nächsten Ausführungstermin. diff --git a/htdocs/langs/de_DE/dict.lang b/htdocs/langs/de_DE/dict.lang index b38a00eb76a..df67a2a5440 100644 --- a/htdocs/langs/de_DE/dict.lang +++ b/htdocs/langs/de_DE/dict.lang @@ -339,18 +339,18 @@ ExpAuto9CV=9 CV ExpAuto10CV=10 CV ExpAuto11CV=11 CV ExpAuto12CV=12 CV -ExpAuto3PCV=3 CV and more -ExpAuto4PCV=4 CV and more -ExpAuto5PCV=5 CV and more -ExpAuto6PCV=6 CV and more -ExpAuto7PCV=7 CV and more -ExpAuto8PCV=8 CV and more -ExpAuto9PCV=9 CV and more -ExpAuto10PCV=10 CV and more -ExpAuto11PCV=11 CV and more -ExpAuto12PCV=12 CV and more -ExpAuto13PCV=13 CV and more -ExpCyclo=Capacity lower to 50cm3 -ExpMoto12CV=Motorbike 1 or 2 CV -ExpMoto345CV=Motorbike 3, 4 or 5 CV -ExpMoto5PCV=Motorbike 5 CV and more +ExpAuto3PCV=3 CV und mehr +ExpAuto4PCV=4 CV und mehr +ExpAuto5PCV=5 CV und mehr +ExpAuto6PCV=6 CV und mehr +ExpAuto7PCV=7 CV und mehr +ExpAuto8PCV=8 CV und mehr +ExpAuto9PCV=9 CV und mehr +ExpAuto10PCV=10 CV und mehr +ExpAuto11PCV=11 CV und mehr +ExpAuto12PCV=12 CV und mehr +ExpAuto13PCV=13 CV und mehr +ExpCyclo=Kapazität niedriger als 50cm3 +ExpMoto12CV=Motorrad 1 oder 2 CV +ExpMoto345CV=Motorrad 3, 4 oder 5 CV +ExpMoto5PCV=Motorrad 5 CV und mehr diff --git a/htdocs/langs/de_DE/donations.lang b/htdocs/langs/de_DE/donations.lang index 226f95da4d8..589ceb62328 100644 --- a/htdocs/langs/de_DE/donations.lang +++ b/htdocs/langs/de_DE/donations.lang @@ -31,3 +31,4 @@ DONATION_ART200=Zeige Artikel 200 des CGI, falls Sie betroffen sind DONATION_ART238=Zeige Artikel 238 des CGI, falls Sie betroffen sind DONATION_ART885=Zeige Artikel 885 des CGI, falls Sie betroffen sind DonationPayment=Spendenzahlung +DonationValidated=Donation %s validated diff --git a/htdocs/langs/de_DE/ecm.lang b/htdocs/langs/de_DE/ecm.lang index 6b6c9090683..ac9457995d3 100644 --- a/htdocs/langs/de_DE/ecm.lang +++ b/htdocs/langs/de_DE/ecm.lang @@ -6,7 +6,7 @@ ECMSectionAuto=Automatischer Ordner ECMSectionsManual=manuelle Hierarchie ECMSectionsAuto=automatische Hierarchie ECMSections=Ordner -ECMRoot=ECM Root +ECMRoot=Stammordner ECMNewSection=Neuer Ordner ECMAddSection=Ordner hinzufügen ECMCreationDate=Erstellungsdatum @@ -18,7 +18,7 @@ ECMArea=EDM-Übersicht ECMAreaDesc=Die EDM (Elektronisches Dokumenten Management)-Übersicht erlaubt Ihnen das Speichern, Teilen und rasches Auffinden aller Dokumenten in Dolibarr. ECMAreaDesc2=* In den automatischen Verzeichnissen werden die vom System erzeugten Dokumente abgelegt.
    * Die manuellen Verzeichnisse können Sie selbst verwalten und zusätzliche nicht direkt zuordenbare Dokument hinterlegen. ECMSectionWasRemoved=Ordner %s wurde gelöscht. -ECMSectionWasCreated=Directory %s has been created. +ECMSectionWasCreated=Verzeichnis %s wurde erstellt. ECMSearchByKeywords=Suche nach Stichwörtern ECMSearchByEntity=Suche nach Objekt ECMSectionOfDocuments=Dokumentenordnern @@ -42,9 +42,9 @@ ECMDirectoryForFiles=Relatives Verzeichnis für Dateien CannotRemoveDirectoryContainsFiles=Entfernen des Ordners nicht möglich, da dieser noch Dateien enthält ECMFileManager=Dateiverwaltung ECMSelectASection=Wähle einen Ordner aus der Baumansicht links ... -DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory. -ReSyncListOfDir=Resync list of directories -HashOfFileContent=Hash of file content -FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it) -FileSharedViaALink=File shared via a link -NoDirectoriesFound=No directories found +DirNotSynchronizedSyncFirst=Dieses Verzeichnis scheint außerhalb des ECM Moduls erstellt oder verändert worden zu sein. Sie müssten auf den "Aktualisieren"-Button klicken, um den Inhalt der Festplatte mit der Datenbank zu synchronisieren. +ReSyncListOfDir=Liste der Verzeichnisse nochmals synchronisieren +HashOfFileContent=Hashwert der Datei +FileNotYetIndexedInDatabase=Datei noch nicht in Datenbank indiziert (Datei nochmals hochladen) +FileSharedViaALink=Datei via Link geteilt +NoDirectoriesFound=Keine Verzeichnisse gefunden diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang index ba54c244191..d2d22edaca8 100644 --- a/htdocs/langs/de_DE/errors.lang +++ b/htdocs/langs/de_DE/errors.lang @@ -75,7 +75,7 @@ ErrorCantSaveADoneUserWithZeroPercentage=Ereignisse können nicht mit Status "Ni ErrorRefAlreadyExists=Die Nr. für den Erstellungsvorgang ist bereits vergeben ErrorPleaseTypeBankTransactionReportName=Geben Sie den Kontoauszug an, in dem die Zahlung enthalten ist (Format JJJJMM oder JJJJMMTT) ErrorRecordHasChildren=Kann diesen Eintrag nicht löschen. Dieser Eintrag wird von mindestens einem untergeordneten Datensatz verwendet. -ErrorRecordHasAtLeastOneChildOfType=Object has at least one child of type %s +ErrorRecordHasAtLeastOneChildOfType=Objekt hat mindestens einen Untereintrag vom Typ %s ErrorRecordIsUsedCantDelete=Eintrag kann nicht gelöscht werden. Er wird bereits benutzt oder ist in einem anderen Objekt enthalten. ErrorModuleRequireJavascript=Diese Funktion erfordert aktiviertes JavaScript. Aktivieren/deaktivieren können Sie Javascript im Menü Start-> Einstellungen->Anzeige. ErrorPasswordsMustMatch=Die eingegebenen Passwörter müssen identisch sein. @@ -104,7 +104,7 @@ ErrorForbidden2=Die Zugriffsberechtigungen für diese Anmeldung kann Ihr Adminis ErrorForbidden3=Es scheint keine ordnungsgemäße Authentifizierung für das System vorzuliegen. Bitte werfen Sie einen Blick auf die Systemdokumentation um die entsprechenden Authentifizierungsoptionen zu verwalten (htaccess, mod_auth oder andere...) ErrorNoImagickReadimage=Imagick_readimage Funktion in dieser PHP-Version nicht vorhanden. Vorschaubilder sind nicht möglich. Administratoren können diese Registerkarte unter Einstellungen-Display ausblenden. ErrorRecordAlreadyExists=Datensatz bereits vorhanden -ErrorLabelAlreadyExists=This label already exists +ErrorLabelAlreadyExists=Dieses Label existiert schon ErrorCantReadFile=Fehler beim Lesen der Datei '%s' ErrorCantReadDir=Fehler beim Lesen des Verzeichnisses '%s' ErrorBadLoginPassword=Benutzername oder Passwort falsch @@ -155,11 +155,12 @@ ErrorPriceExpression19=Ausdruck nicht gefunden ErrorPriceExpression20=Leerer Ausdruck ErrorPriceExpression21=Leeres Ergebnis '%s' ErrorPriceExpression22=Negatives Ergebnis '%s' -ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression23=Unbekannte oder nicht gesetzte Variable '%s' in %s +ErrorPriceExpression24=Variable '%s' existiert, hat aber keinen Wert ErrorPriceExpressionInternal=Interner Fehler '%s' ErrorPriceExpressionUnknown=Unbekannter Fehler '%s' ErrorSrcAndTargetWarehouseMustDiffers=Quelle und Ziel-Lager müssen unterschiedlich sein -ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on product '%s' requiring lot/serial information +ErrorTryToMakeMoveOnProductRequiringBatchData=Fehler, Sie versuchen Sie eine Lagerbewegung ohne Chargen-/Seriennummer für Produkt '%s' zu machen, welches diese Information benötigt ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Alle erfassten Eingänge müssen zunächst überprüft werden (genehmigt oder abgelehnt), bevor es erlaubt ist diese Aktion auszuführen ErrorCantSetReceptionToTotalDoneWithReceptionDenied=Alle gespeicherten Empfänge müssen erst überprüft werden (zugelassen), bevor es ihm gestattet ist diese Aktion zu tun ErrorGlobalVariableUpdater0=HTTP-Anforderung ist mit dem Fehler '%s' fehlgeschlagen @@ -197,15 +198,15 @@ ErrorDuplicateTrigger=Fehler, doppelter Triggername %s. Schon geladen durch %s. ErrorNoWarehouseDefined=Fehler, keine Warenlager definiert. ErrorBadLinkSourceSetButBadValueForRef=Der Link ist ungültig. Die Quelle für die Zahlung ist definiert, aber die Referenz ist ungültig. ErrorTooManyErrorsProcessStopped=Zu viele Fehler, Verarbeitung abgebrochen. -ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Mass validation is not possible when option to increase/decrease stock is set on this action (you must validate one by one so you can define the warehouse to increase/decrease) -ErrorObjectMustHaveStatusDraftToBeValidated=Object %s must have status 'Draft' to be validated. -ErrorObjectMustHaveLinesToBeValidated=Object %s must have lines to be validated. -ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Only validated invoices can be sent using the "Send by email" mass action. -ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a predefined product or not -ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before. -ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently. -ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference. -ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number. +ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Massenfreigabe ist nicht Möglich, wenn die Option um den Lagerbestand zu Verändern eingeschaltet ist (Sie müssen jedes Dokument einzeln freigeben umd das Lager für die Lagerbewegung anzugeben) +ErrorObjectMustHaveStatusDraftToBeValidated=Objekt %s muss im Entwurfstatus sein um es zu bestätigen. +ErrorObjectMustHaveLinesToBeValidated=Objekt %s muss Zeilen haben damit es bestätigt werden kann. +ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Nur freigegebene Rechnungen können mittels der "Via E-Mail senden" Massenaktion versendet werden. +ErrorChooseBetweenFreeEntryOrPredefinedProduct=Sie müssen angeben ob der Artikel ein vordefiniertes Produkt ist oder nicht +ErrorDiscountLargerThanRemainToPaySplitItBefore=Der Rabatt den Sie anwenden wollen ist grösser als der verbleibende Rechnungsbetrag. Teilen Sie den Rabatt in zwei kleinere Rabatte auf. +ErrorFileNotFoundWithSharedLink=Datei nicht gefunden. Eventuell wurde der Sharekey verändert oder die Datei wurde gelöscht. +ErrorProductBarCodeAlreadyExists=Der Produktbarcode %sexistiert schon bei einer anderen Produktreferenz +ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Das verwenden von virtuellen Produkten welche den Lagerbestand von Unterprodukten verändern ist nicht möglich, wenn ein Unterprodukt (Oder Unter-Unterprodukt) eine Seriennummer oder Chargennummer benötigt. # Warnings WarningPasswordSetWithNoAccount=Es wurde ein Passwort für dieses Mitglied vergeben, aber kein Benutzer erstellt. Das Passwort wird gespeichert, aber kann nicht für die Anmeldung an Dolibarr verwendet werden. Es kann von einem externen Modul/einer Schnittstelle verwendet werden, aber wenn Sie kein Login oder Passwort für dieses Mitglied definiert müssen, können Sie die Option "Login für jedes Mitglied verwalten" in den Mitgliedseinstellungen deaktivieren. Wenn Sie ein Login aber kein Passwort benötige, lassen Sie dieses Feld leer, um diese Meldung zu deaktivieren. Anmerkung: Die E-Mail-Adresse kann auch zur Anmeldung verwendet werden, wenn das Mitglied mit einem Benutzer verbunden wird. @@ -227,4 +228,4 @@ WarningTooManyDataPleaseUseMoreFilters=Zu viele Ergebnisse (mehr als %s Zeilen). WarningSomeLinesWithNullHourlyRate=Einige erfasste Zeiten wurden von Benutzern erfasst bei denen der Stundensatz undefiniert war. Ein Stundenansatz von 0 %s pro Stunde wurde verwendet, was eine fehlerhafte Zeitauswertungen zur Folge haben kann. WarningYourLoginWasModifiedPleaseLogin=Ihr Login wurde verändert. Aus Sicherheitsgründen müssen Sie sich vor der nächsten Aktion mit Ihrem neuen Login anmelden. WarningAnEntryAlreadyExistForTransKey=Eine Übersetzung für diesen Übersetzungsschlüssel existiert schon für diese Sprache -WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to %s when using the bulk actions on lists +WarningNumberOfRecipientIsRestrictedInMassAction=Achtung, die Anzahl unterschiedlicher Empfänger ist auf %s begrenzt, wenn sie Massenaktionen auf dieser Liste verwenden diff --git a/htdocs/langs/de_DE/holiday.lang b/htdocs/langs/de_DE/holiday.lang index 65e6e85deff..cae372df349 100644 --- a/htdocs/langs/de_DE/holiday.lang +++ b/htdocs/langs/de_DE/holiday.lang @@ -79,8 +79,8 @@ HolidaysCancelation=Urlaubsantrag stornieren EmployeeLastname=Mitarbeiter Nachname EmployeeFirstname=Vorname des Mitarbeiters TypeWasDisabledOrRemoved=Abreise-Art (Nr %s) war deaktiviert oder entfernt -LastHolidays=Latest %s leave requests -AllHolidays=All leave requests +LastHolidays=%sneuste Ferienanträge +AllHolidays=Allen Ferienanträge ## Configuration du Module ## LastUpdateCP=Letzte automatische Aktualisierung der Urlaubstage diff --git a/htdocs/langs/de_DE/install.lang b/htdocs/langs/de_DE/install.lang index 041531e7e51..f1ea32417f1 100644 --- a/htdocs/langs/de_DE/install.lang +++ b/htdocs/langs/de_DE/install.lang @@ -56,7 +56,7 @@ CreateDatabase=Datenbank erstellen CreateUser=Erzeuge Besitzer oder erteile dem Benutzer Berechtigung für die Datenbank DatabaseSuperUserAccess=Datenbankserver - Superadministrator-Zugriff CheckToCreateDatabase=Aktivieren Sie dieses Kontrollkästchen, falls Sie noch keine Datenbank angelegt haben und diese im Zuge der Installation erstellt werden soll.
    Hierfür müssen Sie Benutzername und Passwort des Datenbank-Superusers am Ende der Seite angeben. -CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.
    In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists. +CheckToCreateUser=Aktivieren Sie dieses Kontrollkästchen, falls Sie noch keinen Datenbankbenutzer angelegt haben und dieser im Zuge der Installation erstellt werden soll.
    Hierfür müssen Sie Benutzername und Passwort des Datenbank-Superusers am Ende der Seite angeben. Wenn dies nicht angekreuzt ist, müssen Datenbankeigentümer und Passwort schon existieren. DatabaseRootLoginDescription=Anmeldedaten des Datenbank-Superusers zur Erstellung neuer Datenbanken und -benutzer. Sollten diese bereits existieren (z.B. weil Ihre Website bei einem Hosting-Provider liegt), ist diese Option nutzlos. KeepEmptyIfNoPassword=Leer lassen wenn der Benutzer kein Passwort hat (nicht empfohlen) SaveConfigurationFile=Konfigurationsdatei wird gespeichert @@ -139,8 +139,9 @@ KeepDefaultValuesDeb=Sie verwenden den Dolibarr-Installationsassistenten in eine KeepDefaultValuesMamp=Sie verwenden den DoliMamp-Installationsassistent, entsprechend werden hier bereits Werte vorgeschlagen. Bitte nehmen Sie nur Änderungen vor wenn Sie wissen was Sie tun. KeepDefaultValuesProxmox=Sie verwenden den Dolibarr Installationsassistenten einer Proxmox "virtual appliance". Die hier vorgeschlagenen Werte sind bereits optimiert. Bitte nehmen Sie nur Änderungen vor wenn Sie wissen was Sie tun. UpgradeExternalModule=Dedizierten Upgradeprozess für externe Module ausführen -SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' +SetAtLeastOneOptionAsUrlParameter=Zumindest eine Option für die URL Argumente ist notwendig. z.B. '...repair.php?standard=confirmed' NothingToDelete=Nichts zu säubern / zu löschen +NothingToDo=Keine Aufgaben zum erledigen ######### # upgrade MigrationFixData=Denormalisierte Daten bereinigen @@ -192,10 +193,11 @@ MigrationActioncommElement=Aktualisiere die Termine/Aufgaben MigrationPaymentMode=Migration der Daten für die Zahlungsart MigrationCategorieAssociation=Migration von Kategorien MigrationEvents=Ereignisse migrierern, um den Besitzer des Ereignisses der Zuordnungstabelle hinzuzufügen -MigrationEventsContact=Migration of events to add event contact into assignement table +MigrationEventsContact=Migration der Ereignisse um die Kontaktinformationen in die Zuweisungstabelle hinzuzufügen MigrationRemiseEntity=Aktualisieren Sie den Wert des Feld "entity" der Tabelle "llx_societe_remise" MigrationRemiseExceptEntity=Aktualisieren Sie den Wert des Feld "entity" der Tabelle "llx_societe_remise_except" MigrationReloadModule=Neu Laden von Modul %s +MigrationResetBlockedLog=Modul BlockedLog für v7 Algorithmus zurücksetzen ShowNotAvailableOptions=Nicht verfügbare Optionen anzeigen HideNotAvailableOptions=Nicht verfügbare Optionen ausblenden ErrorFoundDuringMigration=Während der Migration ist ein Fehler aufgetaucht, dadurch ist der nächste Schritt nicht verfügbar. Sie können hier cklicken um den Fehler zu ignorieren, aber die Anwendung oder manche Features werden unter Umständen nicht richtig funktionieren, solange der Fehler nicht behoben wurde. diff --git a/htdocs/langs/de_DE/interventions.lang b/htdocs/langs/de_DE/interventions.lang index 6a5ca41939a..c2fc9d029a9 100644 --- a/htdocs/langs/de_DE/interventions.lang +++ b/htdocs/langs/de_DE/interventions.lang @@ -47,12 +47,12 @@ TypeContact_fichinter_external_CUSTOMER=Kundenkontakt-Nachbetreuung PrintProductsOnFichinter=Auch Produktzeilen (Nicht nur Leistungen) auf der Serviceauftragskarte drucken PrintProductsOnFichinterDetails=Serviceaufträge durch Bestellungen generiert UseServicesDurationOnFichinter=Standard-Wert der Dauer für diesen Service aus dem Auftrag übernehmen -UseDurationOnFichinter=Hides the duration field for intervention records -UseDateWithoutHourOnFichinter=Hides hours and minutes off the date field for intervention records +UseDurationOnFichinter=Feld 'Dauer' für Einsatzeinträge nicht anzeigen +UseDateWithoutHourOnFichinter=Stunden und Minutenfelder beim Datum von Einsatzeinträgen nicht anzeigen InterventionStatistics=Statistik Serviceaufträge NbOfinterventions=Anzahl Karten für Serviceaufträge NumberOfInterventionsByMonth=Anzahl Karten für Serviceaufträge pro Monat (Freigabedatum) -AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them. +AmountOfInteventionNotIncludedByDefault=Die Anzahl an Einsätzen ist normalerweise nicht im Umsatz enthalten. (In den meisten Fällen werden sie Einsatzstunden separat erfasst) Setzen Sie die globale Option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT auf 1 damit diese berücksichtigt werden. ##### Exports ##### InterId=Serviceauftrag ID InterRef=Serviceauftrag Ref. diff --git a/htdocs/langs/de_DE/languages.lang b/htdocs/langs/de_DE/languages.lang index 8191cbf7eb4..a4e0de0c9e8 100644 --- a/htdocs/langs/de_DE/languages.lang +++ b/htdocs/langs/de_DE/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Spanisch (Paraguay) Language_es_PE=Spanisch (Peru) Language_es_PR=Spanisch (Puerto Rico) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Spanisch (Venezuela) Language_et_EE=Estnisch Language_eu_ES=Baskisch diff --git a/htdocs/langs/de_DE/ldap.lang b/htdocs/langs/de_DE/ldap.lang index 0c5ccaf79fd..9c9768e0c7b 100644 --- a/htdocs/langs/de_DE/ldap.lang +++ b/htdocs/langs/de_DE/ldap.lang @@ -6,7 +6,7 @@ LDAPInformationsForThisContact=Informationen in der LDAP-Datenbank für diesen K LDAPInformationsForThisUser=Informationen in der LDAP-Datenbank für diesen Benutzer LDAPInformationsForThisGroup=Informationen in der LDAP-Datenbank für diese Gruppe LDAPInformationsForThisMember=Informationen in der LDAP-Datenbank für dieses Mitglied -LDAPInformationsForThisMemberType=Information in LDAP database for this member type +LDAPInformationsForThisMemberType=Information in der LDAP Datenbank für diese Mitgliedsart LDAPAttributes=LDAP-Attribute LDAPCard=LDAP - Karte LDAPRecordNotFound=LDAP-Datenbankeintrag nicht gefunden @@ -21,7 +21,7 @@ LDAPFieldSkypeExample=Beispiel: Skype-Name UserSynchronized=Benutzer synchronisiert GroupSynchronized=Gruppe synchronisiert MemberSynchronized=Mitglied synchronisiert -MemberTypeSynchronized=Member type synchronized +MemberTypeSynchronized=Mitgliedsart synchronisiert ContactSynchronized=Kontakt synchronisiert ForceSynchronize=Erzwinge Synchronisation Dolibarr -> LDAP ErrorFailedToReadLDAP=Fehler beim Lesen der LDAP-Datenbank. Überprüfen Sie die Verfügbarkeit der Datenbank sowie die entsprechenden Moduleinstellungen. diff --git a/htdocs/langs/de_DE/mails.lang b/htdocs/langs/de_DE/mails.lang index e257a0e907e..6e662d8f397 100644 --- a/htdocs/langs/de_DE/mails.lang +++ b/htdocs/langs/de_DE/mails.lang @@ -69,11 +69,11 @@ ActivateCheckReadKey=Schlüssel um die URL für "Lesebestätigung" und "Abmelden EMailSentToNRecipients=E-Mail versandt an %s Empfänger. EMailSentForNElements=%s e-Mails verschickt XTargetsAdded=%s Empfänger der Liste zugefügt -OnlyPDFattachmentSupported=If the PDF documents were already generated for the objects to send, they will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version). -AllRecipientSelected=The recipients of the %s record selected (if their email is known). -GroupEmails=Group emails -OneEmailPerRecipient=One email per recipient (by default, one email per record selected) -WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them. +OnlyPDFattachmentSupported=Wenn das PDF Dokument schon erstellt wurde, wird es als Anhang versendet. Falls nicht, wird kein E-Mail versendet. (Es werden nur PDF Dokumente für den Massenversand in dieser Version verwendet). +AllRecipientSelected=Die Empfänger der %sDatensätze selektiert (Wenn eine E-Mailadresse hinterlegt ist) +GroupEmails=Gruppenmails +OneEmailPerRecipient=Ein E-Mail pro Empfänger (Standardmässig, ein E-Mail pro Datensatz ausgewählt) +WarningIfYouCheckOneRecipientPerEmail=Achtung: Wenn diese Checkbox angekreuzt ist, wird nur eine E-Mail für mehrere Datensätze versendet. Falls Sie Variablen verwenden die sich auf den Datensatz beziehen, werden diese Variablen nicht ersetzt). ResultOfMailSending=Sende-Ergebnis der E-Mail-Kampagne NbSelected=Anz. gewählte NbIgnored=Anz. ignoriert @@ -159,7 +159,7 @@ NoContactWithCategoryFound=Kein Kontakt/Adresse mit einer Kategorie gefunden NoContactLinkedToThirdpartieWithCategoryFound=Kein Kontakt/Adresse mit einer Kategorie gefunden OutGoingEmailSetup=eMail Postausgang Einstellungen InGoingEmailSetup=eMail Posteingang Einstellungen -OutGoingEmailSetupForEmailing=Outgoing email setup (for mass emailing) +OutGoingEmailSetupForEmailing=Einstellung ausgehende E-Mails (für den Massenversand) DefaultOutgoingEmailSetup=Standardeinstellungen für ausgehende E-Mails Information=Information diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang index 902133f780b..18a94b8ad3d 100644 --- a/htdocs/langs/de_DE/main.lang +++ b/htdocs/langs/de_DE/main.lang @@ -104,7 +104,7 @@ RequestLastAccessInError=Letzter Fehlerhafter Datenbankzugriff ReturnCodeLastAccessInError=Rückgabewert des letzten fehlerhaften Datenbankzugriff InformationLastAccessInError=Information zum letzten fehlerhaften Datenbankzugriff DolibarrHasDetectedError=Das System hat einen technischen Fehler festgestellt -YouCanSetOptionDolibarrMainProdToZero=You can read log file or set option $dolibarr_main_prod to '0' in your config file to get more information. +YouCanSetOptionDolibarrMainProdToZero=Sie können die Protokolldatei lesen oder die Option $dolibarr_main_prod in Ihrer Konfigurationsdatei auf '0' setzen, um weitere Informationen zu erhalten. InformationToHelpDiagnose=Diese Informationen können bei der Fehlersuche hilfreich sein (Hinweise können entfernt werden indem $dolibarr_main_prod auf '1' gesetzt wird) MoreInformation=Weitere Informationen TechnicalInformation=Technische Information @@ -131,8 +131,8 @@ Never=Nie Under=Unter Period=Zeitraum PeriodEndDate=Enddatum für Zeitraum -SelectedPeriod=Selected period -PreviousPeriod=Previous period +SelectedPeriod=Ausgewählter Zeitraum +PreviousPeriod=Vorherige Periode Activate=Aktivieren Activated=Aktiviert Closed=Geschlossen @@ -201,7 +201,7 @@ Parameter=Parameter Parameters=Parameter Value=Wert PersonalValue=Persönlicher Wert -NewObject=New %s +NewObject=Neu %s NewValue=Neuer Wert CurrentValue=Aktueller Wert Code=Code @@ -266,10 +266,10 @@ DateApprove2=Genehmigungsdatum (zweite Genehmigung) RegistrationDate=Registrierungsdatum UserCreation=Erzeugungs-Benutzer UserModification=Aktualisierungs-Benutzer -UserValidation=Validation user +UserValidation=Gültigkeitsprüfung Benutzer UserCreationShort=Erzeuger UserModificationShort=Aktualisierer -UserValidationShort=Valid. user +UserValidationShort=Gültiger Benutzer DurationYear=Jahr DurationMonth=Monat DurationWeek=Woche @@ -311,8 +311,8 @@ KiloBytes=Kilobyte MegaBytes=Megabyte GigaBytes=Gigabyte TeraBytes=Terabyte -UserAuthor=User of creation -UserModif=User of last update +UserAuthor=Benutzer der Erstellung +UserModif=Benutzer des letzten Updates b=b. Kb=Kb Mb=Mb @@ -365,13 +365,13 @@ Totalforthispage=Gesamtbetrag dieser Seite TotalTTC=Bruttosumme TotalTTCToYourCredit=\nGesamtbetrag (inkl. USt.) zu ihren Gunsten TotalVAT=USt. gesamt -TotalVATIN=Total IGST +TotalVATIN=Gesamt IGST TotalLT1=USt. gesamt 2 TotalLT2=USt. gesamt 3 TotalLT1ES=Summe RE TotalLT2ES=Summe IRPF -TotalLT1IN=Total CGST -TotalLT2IN=Total SGST +TotalLT1IN=Gesamt CGST +TotalLT2IN=Gesamt SGST HT=Netto TTC=Brutto INCVATONLY=Inkl. USt. @@ -379,11 +379,11 @@ INCT=Inkl. aller Steuern VAT=USt. VATIN=IGST VATs=Mehrwertsteuern -VATINs=IGST taxes -LT1=Sales tax 2 -LT1Type=Sales tax 2 type -LT2=Sales tax 3 -LT2Type=Sales tax 3 type +VATINs=IGST Steuern +LT1=Umsatzsteuer 2 +LT1Type=Umsatzsteuer 2 Typ +LT2=Mehrwertsteuer 3 +LT2Type=Umsatzsteuer 3 Typ LT1ES=RE LT2ES=EKSt. LT1IN=CGST @@ -425,7 +425,7 @@ ContactsAddressesForCompany=Ansprechpartner / Adressen zu diesem Partner AddressesForCompany=Anschriften zu diesem Partner ActionsOnCompany=Ereignisse zu diesem Partner ActionsOnMember=Aktionen zu diesem Mitglied -ActionsOnProduct=Events about this product +ActionsOnProduct=Ereignisse zu diesem Produkt NActionsLate=%s verspätet RequestAlreadyDone=Anfrage bereits bekannt Filter=Filter @@ -548,8 +548,20 @@ MonthShort09=Sep MonthShort10=Okt MonthShort11=Nov MonthShort12=Dez +MonthVeryShort01=J +MonthVeryShort02=Fr +MonthVeryShort03=Mo +MonthVeryShort04=A +MonthVeryShort05=Mo +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=So +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Angehängte Dateien und Dokumente -JoinMainDoc=Join main document +JoinMainDoc=Hauptdokument verbinden DateFormatYYYYMM=MM-YYYY DateFormatYYYYMMDD=DD-MM-YYYY DateFormatYYYYMMDDHHMM=DD-MM-YYYY HH:SS @@ -679,7 +691,7 @@ Notes=Hinweise AddNewLine=Neue Zeile hinzufügen AddFile=Datei hinzufügen FreeZone=Freier Text -FreeLineOfType=Not a predefined entry of type +FreeLineOfType=Kein vordefinierter Eintrag vom Typ CloneMainAttributes=Objekt mit Haupteigenschaften duplizieren PDFMerge=PDFs verbinden Merge=Verbinden @@ -762,7 +774,7 @@ SetBankAccount=Bankkonto angeben AccountCurrency=Kontowährung ViewPrivateNote=Zeige Hinweise XMoreLines=%s Zeile(n) versteckt -ShowMoreLines=Zeige weitere Zeilen +ShowMoreLines=Mehr/weniger Zeilen anzeigen PublicUrl=Öffentliche URL AddBox=Box anfügen SelectElementAndClick=Element auswählen und %s anklicken @@ -773,7 +785,7 @@ ShowContract=Zeige Vertrag GoIntoSetupToChangeLogo=Gehen Sie zu Start - Einstellungen - Firma/Stiftung um das Logo zu ändern oder gehen Sie in Start -> Einstellungen -> Anzeige um es zu verstecken. Deny=ablehnen Denied=abgelehnt -ListOf=List of %s +ListOf=Liste von %s ListOfTemplates=Liste der Vorlagen Gender=Geschlecht Genderman=männlich @@ -790,7 +802,7 @@ TooManyRecordForMassAction=Zu viele Datensätze für Massenaktion ausgewählt. S NoRecordSelected=Kein Datensatz ausgewählt MassFilesArea=Bereich für Dateien aus Massenaktionen ShowTempMassFilesArea=Bereich für Dateien aus Massenaktionen zeigen -ConfirmMassDeletion=Bulk delete confirmation +ConfirmMassDeletion=MassenLöschbestätigung ConfirmMassDeletionQuestion=Möchten Sie den/die %s ausgewählten Datensatz wirklich löschen? RelatedObjects=Verknüpfte Objekte ClassifyBilled=Als verrechnet markieren @@ -811,18 +823,18 @@ ViewFlatList=Listenansicht zeigen RemoveString=Entfernen Sie die Zeichenfolge '%s' SomeTranslationAreUncomplete=Einige Sprachen sind nur teilweise übersetzt oder enthalten Fehler. Wenn Sie dies feststellen, können Sie die Übersetzungen unter http://transifex.com/projects/p/dolibarr/ \nverbessern bzw. ergänzen. DirectDownloadLink=Direkter Download Link -DirectDownloadInternalLink=Direct download link (need to be logged and need permissions) +DirectDownloadInternalLink=Direkter Download-Link (muss angemeldet sein und benötigt Berechtigungen) Download=Download DownloadDocument=Dokument herunterladen ActualizeCurrency=Update-Wechselkurs Fiscalyear=Fiskalisches Jahr -ModuleBuilder=Module Builder +ModuleBuilder=Modul-Generator SetMultiCurrencyCode=Währung festlegen BulkActions=Massenaktionen ClickToShowHelp=Klicken um die Tooltiphilfe anzuzeigen WebSite=Webseite WebSites=Internetseiten -WebSiteAccounts=Web site accounts +WebSiteAccounts=Website-Konten ExpenseReport=Spesenabrechnung ExpenseReports=Spesenabrechnungen HR=Personalabteilung @@ -830,10 +842,10 @@ HRAndBank=HR und Bank AutomaticallyCalculated=Automatisch berechnet TitleSetToDraft=Zurück zu Entwurf gehen ConfirmSetToDraft=Wirklich zurück zum Entwurfstatus gehen? -ImportId=Import id +ImportId=Import ID Events=Ereignisse EMailTemplates=Textvorlagen für E-Mails -FileNotShared=File not shared to exernal public +FileNotShared=Datei nicht öffentlich zugänglich Project=Projekt Projects=Projekte Rights=Berechtigungen @@ -873,7 +885,7 @@ Select2NotFound=Kein Ergebnis gefunden Select2Enter=Enter Select2MoreCharacter=oder mehr Zeichen Select2MoreCharacters=oder mehr Zeichen -Select2MoreCharactersMore=Search syntax:
    | OR (a|b)
    * Any character (a*b)
    ^ Start with (^ab)
    $ End with (ab$)
    +Select2MoreCharactersMore=1 Select2LoadingMoreResults=Weitere Ergebnisse werden geladen ... Select2SearchInProgress=Suche läuft ... SearchIntoThirdparties=Partner @@ -896,7 +908,9 @@ SearchIntoExpenseReports=Spesenabrechnungen SearchIntoLeaves=Urlaube CommentLink=Kommentare NbComments=Anzahl der Kommentare -CommentPage=Comments space +CommentPage=Kommentare Leerzeichen CommentAdded=Kommentar hinzugefügt CommentDeleted=Kommentar gelöscht Everybody=Jeder +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/de_DE/members.lang b/htdocs/langs/de_DE/members.lang index ea1006a6de2..b3caf8578a3 100644 --- a/htdocs/langs/de_DE/members.lang +++ b/htdocs/langs/de_DE/members.lang @@ -57,11 +57,11 @@ NewCotisation=Neuer Beitrag PaymentSubscription=Neue Beitragszahlung SubscriptionEndDate=Abonnement Ablaufdatum MembersTypeSetup=Mitgliedsarten einrichten -MemberTypeModified=Member type modified -DeleteAMemberType=Delete a member type -ConfirmDeleteMemberType=Are you sure you want to delete this member type? -MemberTypeDeleted=Member type deleted -MemberTypeCanNotBeDeleted=Member type can not be deleted +MemberTypeModified=Mitgliedstyp geändert +DeleteAMemberType=Löschen Sie einen Mitgliedstyp +ConfirmDeleteMemberType=Möchten Sie diesen Mitgliedstyp wirklich löschen? +MemberTypeDeleted=Mitgliedstyp gelöscht +MemberTypeCanNotBeDeleted=Mitgliedstyp kann nicht gelöscht werden NewSubscription=Neues Abonnement NewSubscriptionDesc=In diesem Formular können Sie Ihr Abonnement als neues Mitglied der Stiftung angeben. Wenn Sie Ihr Abonnement erneuern (falls Sie Mitglied sind) wollen, kontaktieren Sie bitte den Stiftungsrat per E-Mail %s. Subscription=Abonnement @@ -92,9 +92,9 @@ ValidateMember=Mitglied freigeben ConfirmValidateMember=Möchten Sie dieses Mitglied wirklich aktivieren? FollowingLinksArePublic=Die folgenden Links sind öffentlich zugängliche Seiten und als solche nicht durch die Dolibarr-Zugriffskontrolle geschützt. Es handelt sich dabei zudem um unformatierte Seiten, die beispielsweise eine Liste aller in der Datenbank eingetragenen Mitglieder anzeigen. PublicMemberList=Liste öffentlicher Mitglieder -BlankSubscriptionForm=Public self-subscription form -BlankSubscriptionFormDesc=Dolibarr can provide you a public URL/website to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form may also be automatically provided. -EnablePublicSubscriptionForm=Enable the public website with self-subscription form +BlankSubscriptionForm=Öffentliches Selbstabonnement +BlankSubscriptionFormDesc=Dolibarr kann Ihnen eine öffentliche URL / Website zur Verfügung stellen, die es externen Besuchern erlaubt, die Stiftung zu abonnieren. Wenn ein Online-Zahlungsmodul aktiviert ist, kann auch automatisch ein Zahlungsformular bereitgestellt werden. +EnablePublicSubscriptionForm=Aktivieren Sie die öffentliche Website mit dem Formular für das Selbstabonnement ForceMemberType=Mitgliedsart erzwingen ExportDataset_member_1=Mitglieder und Abonnements ImportDataset_member_1=Mitglieder @@ -168,8 +168,8 @@ TurnoverOrBudget=Umsatz (für eine Firma) oder Budget (für eine Stiftung) DefaultAmount=Standardbetrag für ein Abonnement CanEditAmount=Besucher können die Höhe auswählen oder ändern für den Beitrag MEMBER_NEWFORM_PAYONLINE=Gehen Sie zu integrierten Bezahlseite -ByProperties=By nature -MembersStatisticsByProperties=Members statistics by nature +ByProperties=Natürlich +MembersStatisticsByProperties=Natürliche Mitgliederstatistiken MembersByNature=Dieser Bildschirm zeigt ihre Statistiken über ihre Mitgliedschaft. MembersByRegion=Dieser Bildschirm zeigt Ihnen Statistiken über Mitglieder nach Regionen. VATToUseForSubscriptions=Mehrwertsteuersatz für Mitgliedschaften diff --git a/htdocs/langs/de_DE/multicurrency.lang b/htdocs/langs/de_DE/multicurrency.lang index 5b432c22e12..1e8d7b67a1c 100644 --- a/htdocs/langs/de_DE/multicurrency.lang +++ b/htdocs/langs/de_DE/multicurrency.lang @@ -4,17 +4,17 @@ ErrorAddRateFail=Fehler in hinzugefügtem Währungskurs ErrorAddCurrencyFail=Fehler in hinzugefügter Währung ErrorDeleteCurrencyFail=Fehler, konnte Daten nicht löschen multicurrency_syncronize_error=Synchronisationsfehler: %s -MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use date of document to find currency rate, instead of using latest known rate -multicurrency_useOriginTx=When an object is created from another, keep the original rate of source object (otherwise use the latest known rate) +MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Dokumentendatum zum Ermitteln des Währungskurs verwenden, sonst wird der aktuelle Währungskurs verwendet. +multicurrency_useOriginTx=Wenn ein Objekt anhand eines anderen Erstellt wird, den Währungskurs des Originals beibehalten (Ansonsten wird der aktuelle Währungskurs verwendet) CurrencyLayerAccount=Währungslayer API -CurrencyLayerAccount_help_to_synchronize=You sould create an account on their website to use this functionnality
    Get your API key
    If you use a free account you can't change the currency source (USD by default)
    But if your main currency isn't USD you can use the alternate currency source to force you main currency

    You are limited at 1000 synchronizations per month +CurrencyLayerAccount_help_to_synchronize=Erstellen Sie ein Konto auf ihrer Webseite um die Funktionalität
    nutzen zu können.
    Erhalten sie ihren API key
    Bei Gratisaccounts kann die Währungsquelle nicht verändert werden (USD Standard)
    Wenn ihre Basiswährung nicht USD ist, kann die Alternative Währungsquelle zum übersteuern der Hauptwährung verwendet werden
    Sie sind auf 1000 Synchronisationen pro Monat begrenzt multicurrency_appId=API key multicurrency_appCurrencySource=Währungsquelle -multicurrency_alternateCurrencySource=Alternate currency source +multicurrency_alternateCurrencySource=Alternative Währungsquelle CurrenciesUsed=Verwendete Währungen CurrenciesUsed_help_to_add=Währungen und Währungskurse erfassen, die Sie für Angebote, Bestellungen, etc. benötigen rate=Währungskurs MulticurrencyReceived=Erhalten, Originalwährung MulticurrencyRemainderToTake=Verbleibender Betrag, Originalwährung MulticurrencyPaymentAmount=Zahlungsbetrag, Originalwährung -AmountToOthercurrency=Amount To (in currency of receiving account) +AmountToOthercurrency=Betrag (In der Währung des Empfängers) diff --git a/htdocs/langs/de_DE/opensurvey.lang b/htdocs/langs/de_DE/opensurvey.lang index 3434bcf15e1..3ae1d6b6d5e 100644 --- a/htdocs/langs/de_DE/opensurvey.lang +++ b/htdocs/langs/de_DE/opensurvey.lang @@ -57,4 +57,4 @@ ErrorInsertingComment=Beim Eintragen Ihres Kommentars ist ein Fehler aufgetreten MoreChoices=Geben Sie weitere Wahlmöglichkeiten ein SurveyExpiredInfo=Die Umfrage ist geschlossen oder beendet. EmailSomeoneVoted=%s hat eine Zeile gefüllt. Sie können Ihre Umfrage unter dem Link finden: %s -ShowSurvey=Show survey +ShowSurvey=Umfrage anzeigen diff --git a/htdocs/langs/de_DE/orders.lang b/htdocs/langs/de_DE/orders.lang index 9444ef9208e..d2317355201 100644 --- a/htdocs/langs/de_DE/orders.lang +++ b/htdocs/langs/de_DE/orders.lang @@ -152,7 +152,7 @@ OrderCreated=Ihre Bestellungen wurden erstellt 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 wählen Sie dann "%s". -OptionToSetOrderBilledNotEnabled=Option (from module Workflow) to set order to 'Billed' automatically when invoice is validated is off, so you will have to set status of order to 'Billed' manually. -IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated. +OptionToSetOrderBilledNotEnabled=Option (Aus dem Workflow Modul) um die Bestellung als 'Verrechnet' zu markieren wenn die Rechnung freigegeben wurde ist deaktiviert, sie müssen den Status der Bestellung manuell auf 'Verrechnet' setzen. +IfValidateInvoiceIsNoOrderStayUnbilled=Wenn die Rechnungsprüfung "Nein" lautet, bleibt die Bestellung bis zur Validierung der Rechnung im Status 'Nicht ausgefüllt'. CloseReceivedSupplierOrdersAutomatically=Schließe die Bestellung nach „%s“ automatisch, wenn alle Produkte empfangen wurden. SetShippingMode=Setze die Versandart diff --git a/htdocs/langs/de_DE/other.lang b/htdocs/langs/de_DE/other.lang index 2bf33a2e20e..2fb9537d51d 100644 --- a/htdocs/langs/de_DE/other.lang +++ b/htdocs/langs/de_DE/other.lang @@ -3,7 +3,7 @@ SecurityCode=Sicherheitsschlüssel NumberingShort=Nr. Tools=Hilfsprogramme TMenuTools=Hilfsprogramme -ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.

    All the tools can be reached in the left menu. +ToolsDesc=Alle sonstigen Hilfsprogramme, die nicht in anderen Menü-Einträgen enthalten sind, werden hier zusammengefasst.

    Alle Hilfsprogramme können über das linke Menü erreicht werden. Birthday=Geburtstag BirthdayDate=Geburtstag DateToBirth=Geburtsdatum @@ -11,23 +11,23 @@ BirthdayAlertOn=Geburtstagserinnerung EIN BirthdayAlertOff=Geburtstagserinnerung AUS TransKey=Übersetzung des Schlüssels TransKey MonthOfInvoice=Monat (1-12) des Rechnungsdatum -TextMonthOfInvoice=Month (text) of invoice date +TextMonthOfInvoice=Monat (Text) des Rechnungsdatums PreviousMonthOfInvoice=Vorangehender Monat (1-12) des Rechnungsdatums TextPreviousMonthOfInvoice=Vorangehender Monat (Text) des Rechnungsdatums NextMonthOfInvoice=Folgender Monat (1-12) des Rechnungsdatums TextNextMonthOfInvoice=Folgender Monat (1-12) des Rechnungsdatum ZipFileGeneratedInto=ZIP-Datei erstellt in %s. -DocFileGeneratedInto=Doc file generated into %s. -JumpToLogin=Disconnected. Go to login page... -MessageForm=Message on online payment form +DocFileGeneratedInto=Doc Datei in %s generiert. +JumpToLogin=Abgemeldet. Zur Anmeldeseite... +MessageForm=Mitteilung im Onlinezahlungsformular MessageOK=Nachrichtenseite für bestätigte Zahlung MessageKO=Nachrichtenseite für stornierte Zahlung YearOfInvoice=Jahr der Rechnung PreviousYearOfInvoice=Vorangehendes Jahr des Rechnungsdatums NextYearOfInvoice=Folgendes Jahr des Rechnungsdatums -DateNextInvoiceBeforeGen=Date of next invoice (before generation) -DateNextInvoiceAfterGen=Date of next invoice (after generation) +DateNextInvoiceBeforeGen=Datum der nächsten Rechnung (Vor Generierung) +DateNextInvoiceAfterGen=Datum der nächsten Rechnung (Nach Generierung) Notify_FICHINTER_ADD_CONTACT=Kontakt zum Serviceauftrag hinzufügen Notify_FICHINTER_VALIDATE=Serviceauftrag freigegeben @@ -76,17 +76,17 @@ MaxSize=Maximalgröße AttachANewFile=Neue Datei/Dokument anhängen LinkedObject=Verknüpftes Objekt NbOfActiveNotifications= Anzahl Benachrichtigungen ( Anz. E-Mail Empfänger) -PredefinedMailTest=__(Hello)__\nThis is a test mail sent to __EMAIL__.\nThe two lines are separated by a carriage return.\n\n__USER_SIGNATURE__ -PredefinedMailTestHtml=__(Hello)__\nThis is a test mail (the word test must be in bold).
    The two lines are separated by a carriage return.

    __USER_SIGNATURE__ -PredefinedMailContentSendInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__ -PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nWe would like to warn you that the invoice __REF__ seems to not be payed. So this is the invoice in attachment again, as a reminder.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__ -PredefinedMailContentSendProposal=__(Hello)__\n\nYou will find here the commercial proposal __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__ -PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nYou will find here the price request __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__ -PredefinedMailContentSendOrder=__(Hello)__\n\nYou will find here the order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__ -PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nYou will find here our order __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__ -PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nYou will find here the invoice __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__ -PredefinedMailContentSendShipping=__(Hello)__\n\nYou will find here the shipping __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__ -PredefinedMailContentSendFichInter=__(Hello)__\n\nYou will find here the intervention __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__ +PredefinedMailTest=__(Hello)__\nDas ist ein Test-Mail gesendet an __EMAIL__.\nDie beiden Zeilen sind durch einem Zeilenumbruch getrennt.\n\n__USER_SIGNATURE__ +PredefinedMailTestHtml=Dies ist ein Test Mail (das Wort Test muss in Fettschrift erscheinen).
    Die beiden Zeilen sollten durch einen Zeilenumbruch getrennt sein.

    __USER_SIGNATURE__ +PredefinedMailContentSendInvoice=__(Hello)__\n\nAnbei erhalten Sie die Rechnung __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__ +PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nBedauerlicherweise ist die Rechnung __REF__ bislang unbeglichen. Zur Erinnerung übersenden wir Ihnen diese nochmals als Anhang.\n\n__ONLINE_PAYMENT_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__ +PredefinedMailContentSendProposal=__(Hello)__\n\nBitte entnehmen Sie dem Anhang unser Angebot __PREF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__ +PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nHier die gewünschte Preisauskunft __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__ +PredefinedMailContentSendOrder=__(Hello)__\n\nBitte entnehmen Sie dem Anhang die Bestellung __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__ +PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nBitte entnehmen Sie dem Anhang unsere Bestellung __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__ +PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nAnbei erhalten Sie die Rechnung __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__ +PredefinedMailContentSendShipping=__(Hello)__\n\nAls Anlage erhalten Sie unsere Lieferung __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__ +PredefinedMailContentSendFichInter=__(Hello)__\n\nAnbei finden Sie den Serviceauftrag __REF__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__ PredefinedMailContentThirdparty=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__ PredefinedMailContentUser=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__ DemoDesc=Dolibarr ist eine Management-Software die mehrere Business-Module anbietet. Eine Demo, die alle Module beinhaltet ist nicht sinnvoll , weil der Fall nie existiert (Hunderte von verfügbaren Module). Es stehen auch einige Demo-Profile Typen zur Verfügung. @@ -162,9 +162,9 @@ SizeUnitinch=Zoll SizeUnitfoot=Fuß SizeUnitpoint=Punkt BugTracker=Fehlerverfolgung (Bug-Tracker) -SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.
    Change will become effective once you click on the confirmation link in the email.
    Check your inbox. +SendNewPasswordDesc=Sie können sich ein neues Passwort zusenden lassen
    Die Änderungen an Ihrem Passwort werden erst wirksam, wenn Sie auf den im Mail enthaltenen Bestätigungslink klicken.
    Überprüfen Sie den Posteingang Ihrer E-Mail-Anwendung. BackToLoginPage=Zurück zur Anmeldeseite -AuthenticationDoesNotAllowSendNewPassword=Authentication mode is %s.
    In this mode, Dolibarr can't know nor change your password.
    Contact your system administrator if you want to change your password. +AuthenticationDoesNotAllowSendNewPassword=Im derzeit gewählten Authentifizierungsmodus (%s) kann das System nicht auf Ihre Passwortdaten zugreifen und diese auch nicht ändern.
    Wenden Sie sich hierzu bitte an den Systemadministrator wenn die das Passwort ändern möchten. EnableGDLibraryDesc=Installiere oder aktiviere die GD Bibliothek in der PHP Installtion um dieses Option zu verwenden. ProfIdShortDesc=Prof ID %s dient zur Speicherung landesabhängiger Partnerdaten.
    Für das Land %s ist dies beispielsweise Code %s. DolibarrDemo=Dolibarr ERP/CRM-Demo @@ -186,7 +186,7 @@ EMailTextInterventionAddedContact=Ein neuer Serviceauftrag %s wurde Ihnen zugewi EMailTextInterventionValidated=Serviceauftrag %s wurde freigegeben EMailTextInvoiceValidated=Rechnung %s wurde freigegeben EMailTextProposalValidated=Angebot %s wurde freigegeben -EMailTextProposalClosedSigned=The proposal %s has been closed signed. +EMailTextProposalClosedSigned=Das Angebot %s wurde unterschrieben. EMailTextOrderValidated=Bestellung %s wurde freigegeben EMailTextOrderApproved=Bestellung %s genehmigt EMailTextOrderValidatedBy=Der Auftrag %s wurde von %s freigegeben. @@ -214,7 +214,7 @@ StartUpload=Hochladen starten CancelUpload=Hochladen abbrechen FileIsTooBig=Dateien sind zu groß PleaseBePatient=Bitte haben Sie ein wenig Geduld ... -ResetPassword=Reset password +ResetPassword=Kennwort zurücksetzen RequestToResetPasswordReceived=Eine Anfrage zur Änderung Ihres Dolibarr Passworts traf ein. NewKeyIs=Dies sind Ihre neuen Anmeldedaten NewKeyWillBe=Ihr neuer Anmeldeschlüssel für die Software ist @@ -224,7 +224,9 @@ ForgetIfNothing=Wenn Sie diese Änderung nicht beantragt haben, löschen Sie ein IfAmountHigherThan=Wenn der Betrag höher als %s SourcesRepository=Repository für Quellcodes Chart=Grafik -PassEncoding=Password encoding +PassEncoding=Kennwort Encoding +PermissionsAdd=Berechtigungen hinzugefügt +PermissionsDelete=Berechtigungen entfernt ##### Export ##### ExportsArea=Exportübersicht diff --git a/htdocs/langs/de_DE/productbatch.lang b/htdocs/langs/de_DE/productbatch.lang index f2d0840530b..da4d945c45b 100644 --- a/htdocs/langs/de_DE/productbatch.lang +++ b/htdocs/langs/de_DE/productbatch.lang @@ -21,4 +21,4 @@ ProductDoesNotUseBatchSerial=Dieses Produkt verwendet keine Lose oder Seriennumm ProductLotSetup=Verwaltung von Modul Charge / Seriennummern ShowCurrentStockOfLot=Warenbestand anzeigen für Produkt/Charge ShowLogOfMovementIfLot=Zeige Bewegungen für Produkt/Chargen -StockDetailPerBatch=Stock detail per lot +StockDetailPerBatch=Lagerdetail pro Los diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang index 18306fc64ad..bfaaa218ebf 100644 --- a/htdocs/langs/de_DE/products.lang +++ b/htdocs/langs/de_DE/products.lang @@ -22,8 +22,8 @@ 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=Rechnungscode (Einkauf) ProductAccountancySellCode=Buchhaltungscode (Verkauf) -ProductAccountancySellIntraCode=Accounting code (sale intra-community) -ProductAccountancySellExportCode=Accounting code (sale export) +ProductAccountancySellIntraCode=Kontierungscode (Verkauf Firmen) +ProductAccountancySellExportCode=Kontierungscode (Verkauf Export) ProductOrService=Produkt oder Leistung ProductsAndServices=Produkte und Leistungen ProductsOrServices=Produkte oder Leistungen @@ -153,7 +153,7 @@ BuyingPrices=Einkaufspreis CustomerPrices=Kundenpreise SuppliersPrices=Lieferantenpreise SuppliersPricesOfProductsOrServices=Lieferantenpreise (von Produkten oder Leistungen) -CustomCode=Customs/Commodity/HS code +CustomCode=Customs/Commodity/HS Kode CountryOrigin=Urspungsland Nature=Art ShortLabel=Kurzbezeichnung @@ -196,13 +196,14 @@ CurrentProductPrice=Aktueller Preis AlwaysUseNewPrice=Immer aktuellen Preis von Produkt/Leistung nutzen AlwaysUseFixedPrice=Festen Preis nutzen PriceByQuantity=Unterschiedliche Preise nach Menge +DisablePriceByQty=Preise nach Menge ausschalten PriceByQuantityRange=Bereich der Menge MultipriceRules=Regeln der Preisstufen UseMultipriceRules=Verwende Preissegmentregeln (Im Produkt Modul Setup definiert) um automatisch Preise für alle anderen Segmente anhand des ersten Segmentes zu berechnen PercentVariationOver=%% Veränderung über %s PercentDiscountOver=%% Nachlass über %s KeepEmptyForAutoCalculation=Leer lassen um den Wert basierend auf Gewicht oder Volumen der Produkte automatisch zu berechnen -VariantRefExample=Example: COL +VariantRefExample=Beispiel: COL VariantLabelExample=Beispiel: Farbe ### composition fabrication Build=Produzieren diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang index 71c10847520..1f4abd6946f 100644 --- a/htdocs/langs/de_DE/projects.lang +++ b/htdocs/langs/de_DE/projects.lang @@ -171,13 +171,13 @@ ProjectMustBeValidatedFirst=Projekt muss erst bestätigt werden FirstAddRessourceToAllocateTime=Benutzer eine Ressource pro Aufgabe zuordnen, um eine Zeitspanne einzuräumen InputPerDay=Eingang pro Tag InputPerWeek=Eingang pro Woche -InputDetail=Input detail +InputDetail=Eingabedetail TimeAlreadyRecorded=Zeitaufwand für diese Aufgabe/Tag und Benutzer %s bereits aufgenommen ProjectsWithThisUserAsContact=Projekte mit diesem Anwender als Kontakt TasksWithThisUserAsContact=Aufgaben zugeordnet zu diesem Anwender ResourceNotAssignedToProject=Zugewiesen zu Projekt ResourceNotAssignedToTheTask=nicht der Aufgabe zugewiesen -TimeSpentBy=Time spent by +TimeSpentBy=Zeitaufwand durch TasksAssignedTo=Aufgabe zugewiesen an AssignTaskToMe=Aufgabe mir selbst zuweisen AssignTaskToUser=Aufgabe an %s zuweisen @@ -211,9 +211,12 @@ OppStatusPENDING=Anstehend OppStatusWON=Gewonnen OppStatusLOST=Verloren Budget=Budget +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=%s neueste Projekte LatestModifiedProjects=Neueste %s modifizierte Projekte -OtherFilteredTasks=Other filtered tasks +OtherFilteredTasks=Andere gefilterte Aufgaben +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans -AllowCommentOnTask=Allow user comments on tasks -AllowCommentOnProject=Allow user comments on projects +AllowCommentOnTask=Alle Benutzerkommentare zur Aufgabe +AllowCommentOnProject=Benutzer dürfen Projekte kommentieren + diff --git a/htdocs/langs/de_DE/salaries.lang b/htdocs/langs/de_DE/salaries.lang index bcbdab8543d..6961691aee2 100644 --- a/htdocs/langs/de_DE/salaries.lang +++ b/htdocs/langs/de_DE/salaries.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - salaries -SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties -SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accouting account on user is not defined. +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Standard Buchhaltungskonto für Benutzer Partner +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Das in der Benutzerkarte hinterlegte Konto wird nur für die Nebenbücher verwendet. Dieses Konto wird für das Hauptbuch und als Vorgabewert für die Nebnbücher verwendet, wenn beim Benutzer kein Konto hinterlegt ist. SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Standard Buchhaltungskonto für persönliche Aufwendungen Salary=Lohn Salaries=Löhne @@ -13,5 +13,5 @@ TJM=Durchschnittlicher Tagessatz CurrentSalary=aktueller Lohn THMDescription=Dieser Wert kann verwendet werden, um die Kosten für die verbrauchte Zeit eines Anwender zu berechnen, wenn das Modul Projektverwaltung verwendet wird, TJMDescription=Dieser Wert ist aktuell nur zu Informationszwecken und wird nicht für eine Berechnung verwendet -LastSalaries=Latest %s salary payments -AllSalaries=All salary payments +LastSalaries=Letzte %sLohnzahlungen +AllSalaries=Alle Lohnzahlungen diff --git a/htdocs/langs/de_DE/sendings.lang b/htdocs/langs/de_DE/sendings.lang index 550841ebd59..ae2c2c25474 100644 --- a/htdocs/langs/de_DE/sendings.lang +++ b/htdocs/langs/de_DE/sendings.lang @@ -18,13 +18,13 @@ SendingCard=Lieferung - Karte NewSending=Neue Auslieferung CreateShipment=Auslieferung erstellen QtyShipped=Liefermenge -QtyShippedShort=Qty ship. +QtyShippedShort=Gelieferte Menge QtyPreparedOrShipped=Menge vorbereitet oder versendet QtyToShip=Versandmenge QtyReceived=Erhaltene Menge QtyInOtherShipments=Menge in anderen Lieferungen KeepToShip=Zum Versand behalten -KeepToShipShort=Remain +KeepToShipShort=übrigbleiben OtherSendingsForSameOrder=Weitere Lieferungen zu dieser Bestellung SendingsAndReceivingForSameOrder=Warenerhalt und Versand dieser Bestellung SendingsToValidate=Freizugebende Auslieferungen diff --git a/htdocs/langs/de_DE/sms.lang b/htdocs/langs/de_DE/sms.lang index ab8cf17e6b1..d0ac5b1e013 100644 --- a/htdocs/langs/de_DE/sms.lang +++ b/htdocs/langs/de_DE/sms.lang @@ -48,4 +48,4 @@ SmsInfoNumero= (Format der Rufnummer: ++33899701761) DelayBeforeSending=Warten vor dem Senden (in Minuten) SmsNoPossibleSenderFound=Kein Sender verfügbar. Prüfen Sie die Einstellungen Ihres SMS Providers. SmsNoPossibleRecipientFound=Keine möglichen Empfänger gefunden. Prüfen Sie die Einstellungen Ihres SMS Anbieters. -DisableStopIfSupported=Disable STOP message (if supported) +DisableStopIfSupported=STOP-Meldung deaktivieren (falls unterstützt) diff --git a/htdocs/langs/de_DE/stocks.lang b/htdocs/langs/de_DE/stocks.lang index 2af37dee296..8d1021d4b70 100644 --- a/htdocs/langs/de_DE/stocks.lang +++ b/htdocs/langs/de_DE/stocks.lang @@ -34,7 +34,7 @@ LastMovement=Letzte Bewegung LastMovements=Letzte Bewegungen Units=Einheiten Unit=Einheit -StockCorrection=Stock correction +StockCorrection=Lagerkorrektur CorrectStock=Lagerstandsanpassung StockTransfer=Lagerbewegung TransferStock=Bestand umbuchen @@ -50,7 +50,7 @@ EnhancedValue=Warenwert PMPValue=Gewichteter Warenwert PMPValueShort=DSWP EnhancedValueOfWarehouses=Lagerwert -UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user +UserWarehouseAutoCreate=Automatisch ein Lager erstellen wenn ein neuer Benutzer erstellt wird AllowAddLimitStockByWarehouse=Ermöglicht es, Grenzwerte und erwünschten Lagerbestand pro Produkt+Warenlager zu definieren, anstelle nur pro Produkt IndependantSubProductStock=Produkt Lager und Unterprodukt Lager sind unabhängig QtyDispatched=Versandmenge @@ -131,7 +131,7 @@ StockMustBeEnoughForInvoice=Der Lagerbestand muss ausreichend sein um ein Produk StockMustBeEnoughForOrder=Der Lagerbestand muss ausreichend sein um ein Produkt/Dienstleistung zum Versand hinzuzufügen. (Die Prüfung erfolgt auf Basis des aktuellen realen Lagerbestandes, wenn eine Zeile zum Auftrag hinzugefügt wird, unabhängig von der Regel zur automatischen Veränderung des Lagerbestands.) StockMustBeEnoughForShipment= Der Lagerbestand muss ausreichend sein um ein Produkt/Dienstleistung zum Versand hinzuzufügen. (Die Prüfung erfolgt auf Basis des aktuellen realen Lagerbestandes, wenn eine Zeile zum Versand hinzugefügt wird, unabhängig von der Regel zur automatischen Veränderung des Lagerbestands.) MovementLabel=Titel der Lagerbewegung -DateMovement=Date of movement +DateMovement=Datum Lagerbewegung InventoryCode=Bewegungs- oder Bestandscode IsInPackage=In Paket enthalten WarehouseAllowNegativeTransfer=Bestand kann negativ sein diff --git a/htdocs/langs/de_DE/stripe.lang b/htdocs/langs/de_DE/stripe.lang index 827e93185f7..1f238c537b4 100644 --- a/htdocs/langs/de_DE/stripe.lang +++ b/htdocs/langs/de_DE/stripe.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - stripe StripeSetup=Strip Moduleeinstellungen -StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via Stripe. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...) +StripeDesc=Modul zur Bereitstellung einer Online-Zahlungsseite für Zahlungen mit Kredit- / Debitkarten über Stripe . Dies kann verwendet werden, um Ihren Kunden eine kostenlose Zahlung oder eine Zahlung für ein bestimmtes Dolibarr-Objekt (Rechnung, Bestellung, ...) zu ermöglichen. StripeOrCBDoPayment=Zahlen mit Kreditkarte oder Stripe FollowingUrlAreAvailableToMakePayments=Für Kundenzahlungen stehen Ihnen die folgenden URLs zur Verfügung: PaymentForm=Zahlungsformular @@ -12,7 +12,7 @@ YourEMail=E-Mail-Adresse für die Zahlungsbestätigung STRIPE_PAYONLINE_SENDEMAIL=Status-E-Mail nach einer Zahlung (erfolgreich oder nicht) Creditor=Zahlungsempfänger PaymentCode=Zahlungscode -StripeDoPayment=Pay with Credit or Debit Card (Stripe) +StripeDoPayment=Bezahlen mit Kredit- oder Debitkarte (Stripe) YouWillBeRedirectedOnStripe=Zur Eingabe Ihrer Kreditkartendaten werden Sie auf die sichere Bezahlseite von Stripe weitergeleitet. Continue=Nächster ToOfferALinkForOnlinePayment=URL für %s Zahlung diff --git a/htdocs/langs/de_DE/suppliers.lang b/htdocs/langs/de_DE/suppliers.lang index 35103014235..82acc05c028 100644 --- a/htdocs/langs/de_DE/suppliers.lang +++ b/htdocs/langs/de_DE/suppliers.lang @@ -43,5 +43,5 @@ NotTheGoodQualitySupplier=Ungültige Qualität ReputationForThisProduct=Reputation BuyerName=Käufer AllProductServicePrices=Alle Produkt/Leistung Preise -AllProductReferencesOfSupplier=All product / service references of supplier +AllProductReferencesOfSupplier=Alle Produkt- / Service-Referenzen des Lieferanten BuyingPriceNumShort=Lieferantenpreise diff --git a/htdocs/langs/de_DE/trips.lang b/htdocs/langs/de_DE/trips.lang index 24733634237..1faffe69958 100644 --- a/htdocs/langs/de_DE/trips.lang +++ b/htdocs/langs/de_DE/trips.lang @@ -1,17 +1,17 @@ # Dolibarr language file - Source file is en_US - trips ShowExpenseReport=Spesenabrechnung anzeigen Trips=Spesenabrechnungen -TripsAndExpenses=Reise- und Fahrtspesen +TripsAndExpenses=Spesenabrechnungen TripsAndExpensesStatistics=Reise- und Fahrtspesen Statistik TripCard=Reisekosten - Karte -AddTrip=Reisekostenabrechnung erstellen +AddTrip=Spesenabrechnung erstellen ListOfTrips=Aufstellung Spesenabrechnungen ListOfFees=Liste der Spesen TypeFees=Gebührenarten ShowTrip=Spesenabrechnung anzeigen NewTrip=neue Spesenabrechnung -LastExpenseReports=Latest %s expense reports -AllExpenseReports=All expense reports +LastExpenseReports=Letzte %s Spesenabrechnungen +AllExpenseReports=Alle Spesenabrechnungen CompanyVisited=Besuchter Partner FeesKilometersOrAmout=Spesenbetrag bzw. Kilometergeld DeleteTrip=Spesenabrechnung löschen @@ -62,16 +62,16 @@ EX_CAR=Car rental EX_DOC=Documentation EX_CUR=Customers receiving EX_OTR=Other receiving -EX_POS=Postage +EX_POS=Porto EX_CAM=CV maintenance and repair EX_EMM=Employees meal EX_GUM=Guests meal -EX_BRE=Breakfast +EX_BRE=Frühstück EX_FUE_VP=Fuel PV EX_TOL_VP=Toll PV EX_PAR_VP=Parking PV EX_CAM_VP=PV maintenance and repair -DefaultCategoryCar=Default transportation mode +DefaultCategoryCar=Standardmäßiges Verkehrsmittel DefaultRangeNumber=Default range number ErrorDoubleDeclaration=Sie haben bereits eine andere Spesenabrechnung in einem ähnlichen Datumsbereich erstellt. @@ -121,8 +121,8 @@ ExpenseReportRulesDesc=You can create or update any rules of calculation. This p expenseReportOffset=Wertsprung expenseReportCoef=Coefficient expenseReportTotalForFive=Example with d = 5 -expenseReportRangeFromTo=from %d to %d -expenseReportRangeMoreThan=more than %d +expenseReportRangeFromTo=von %d bis %d +expenseReportRangeMoreThan=mehr als %d expenseReportCoefUndefined=(value not defined) expenseReportCatDisabled=Category disabled - see the c_exp_tax_cat dictionary expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionay diff --git a/htdocs/langs/de_DE/website.lang b/htdocs/langs/de_DE/website.lang index 5a6af13b276..8689c22eab6 100644 --- a/htdocs/langs/de_DE/website.lang +++ b/htdocs/langs/de_DE/website.lang @@ -3,57 +3,64 @@ Shortname=Code WebsiteSetupDesc=Erstellen Sie hier für jede benötigte Website einen Eintrag. Gehen Sie anschließend in das Menü Websites zur Bearbeitung. DeleteWebsite=Website löschen ConfirmDeleteWebsite=Möchten Sie diese Website wirklich löschen? Alle Seiten inkl. Inhalt werden auch gelöscht. +WEBSITE_TYPE_CONTAINER=Art der Seite/Containers WEBSITE_PAGENAME=Seitenname/Alias -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL der externen CSS-Datei -WEBSITE_CSS_INLINE=CSS file content (common to all pages) -WEBSITE_JS_INLINE=Javascript file content (common to all pages) -WEBSITE_ROBOT=Robot file (robots.txt) -WEBSITE_HTACCESS=Web site .htaccess file -PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +WEBSITE_CSS_INLINE=CSS-Dateiinhalt (für alle Seiten gleich) +WEBSITE_JS_INLINE=Javascript-Dateiinhalt (für alle Seiten gleich) +WEBSITE_HTML_HEADER=Diesen Code am Schluss des HTML Headers anhängen (Für alle Seiten gleich) +WEBSITE_ROBOT=Roboterdatei (robots.txt) +WEBSITE_HTACCESS=Website .htaccess-Datei +HtmlHeaderPage=HTML Header (Nur für diese Seite) +PageNameAliasHelp=Name oder Alias der Seite.
    Dieser Alias wird auch zum erstellen einer SEO URL verwendet, wenn die Webseite auf einem Virtuellen Webserver läuft. Verwenden Sie der Button "%s" um den Alias zu ändern. +EditTheWebSiteForACommonHeader=Hinweis: Um einen personalisierten Header für alles Seiten zu erstellen, muss der Header auf Site-Level bearbeitet werden, anstelle auf Seiten/Containerebene. MediaFiles=Medienbibliothek -EditCss=Edit Style/CSS or HTML header +EditCss=Bearbeiten Sie Style / CSS oder HTML-Header EditMenu=Menü bearbeiten -EditMedias=Edit medias +EditMedias=Medien bearbeiten EditPageMeta=Meta bearbeiten -AddWebsite=Add website -Webpage=Web page/container -AddPage=Add page/container -HomePage=Home Page -PageContainer=Page/container +AddWebsite=Website hinzufügen +Webpage=Webseite / Container +AddPage=Seite/Container hinzufügen +HomePage=Startseite +PageContainer=Seite / Container PreviewOfSiteNotYetAvailable=Vorschau ihrer Webseite %s noch nicht Verfügbar. Zuerst muss eine Seite hinzugefügt werden. -RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this. -PageContent=Page/Contenair -PageDeleted=Page/Contenair '%s' of website %s deleted -PageAdded=Page/Contenair '%s' added +RequestedPageHasNoContentYet=Die Seite mit id %s hat keinen Inhalt oder die Cachedatei .tpl.php wurde gelöscht. Editieren Sie den Inhalt der Seite um das Problem zu lösen. +PageContent=Seite / Container +PageDeleted=Seite / Container '%s' der Website %s gelöscht +PageAdded=Seite / Container '%s' hinzugefügt ViewSiteInNewTab=Webseite in neuen Tab anzeigen ViewPageInNewTab=Seite in neuem Tab anzeigen SetAsHomePage=Als Startseite festlegen RealURL=Echte URL ViewWebsiteInProduction=Anzeige der Webseite über die Startseite\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\nüber die URL der Homepage -SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on %s
    then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server. +SetHereVirtualHost=Wenn Sie auf Ihrem Webserver einen dedizierten virtuellen Host mit dem Hauptverzeichnis %s und aktiviertem PHP einrichten können, geben Sie hier den virtuellen Host-Namen ein, so dass die Vorschau dann über den direkten Web-Server Zugriff funktioniert und nicht nur der Dolibarr Server benutzt werden kann. PreviewSiteServedByWebServer=Vorschau %s in neuem Tab.

    %s wird durch einen externen Webserver (Wie Apache, Nginx, IIS) ausgeliefert. Dieser Server muss installiert sein. Verzeichnis
    %s
    als URL
    %s durch den externen Webserver freigeben -PreviewSiteServedByDolibarr=Preview %s in a new tab.

    The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.
    The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.
    URL served by Dolibarr:
    %s

    To use your own external web server to serve this web site, create a virtual host on your web server that point on directory
    %s
    then enter the name of this virtual server and click on the other preview button. -VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined -NoPageYet=No pages yet -SyntaxHelp=Help on specific syntax tips -YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    -ClonePage=Clone page/container -CloneSite=Clone site -SiteAdded=Web site added -ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page. -PageIsANewTranslation=The new page is a translation of the current page ? -LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page. -ParentPageId=Parent page ID -WebsiteId=Website ID -CreateByFetchingExternalPage=Create page/container by fetching page from external URL... -OrEnterPageInfoManually=Or create empty page from scratch... -FetchAndCreate=Fetch and Create -ExportSite=Export site -IDOfPage=Id of page -WebsiteAccount=Web site account -WebsiteAccounts=Web site accounts -AddWebsiteAccount=Create web site account -BackToListOfThirdParty=Back to list for Third Party +PreviewSiteServedByDolibarr=Vorschau %sin neuem Tab.

    %swird durch den Dolibarr Server ausgeliefert, so dass kein zusätzlicher Webserver (Wie Apache, Nginx, IIS) notwendig ist.
    Dadurch erhalten die Seiten URL's die nicht so Benutzerfreundlich sind und der Pfad beginnt mit ihrer Dolibarr Installation.
    URL durch Dolibarr ausgeliefert:
    %s

    Um einen externen Webserver zu verwenden, muss ein Virtualhost auf Ihrem Webserver eingerichtet werden, welchers das Verzeichnis
    %s
    auf dem neuen virtuellen Server freigibt. Vorschau durch klick auf den anderen Vorschaubutton. +VirtualHostUrlNotDefined=URL des virtuellen Hosts, der von einem externen Webserver bedient wird, ist nicht definiert +NoPageYet=Noch keine Seiten +SyntaxHelp=Hilfe zu bestimmten Syntaxtipps +YouCanEditHtmlSourceckeditor=Sie können den HTML-Quellcode über die Schaltfläche "Quelle" im Editor bearbeiten. +YouCanEditHtmlSource=
    Sie können hier PHP-Code einfügen, indem Sie die Tags <?php? > verwenden. Die folgenden globalen Variablen sind verfügbar: $conf, $langs, $db, $mysoc, $user, $website.

    Sie können auch Inhalt einer anderen Seite / Container mit folgender Syntax einbinden:
    <?php includeContainer ('alias_of_container_to_include'); ?>

    Um einen Link zum Herunterladen eines im Dokumentenverzeichnis, verwenden Sie den document.php -Wrapper:
    Beispiel, für eine Datei in Dokumente / ecm (muss protokolliert werden) lautet die Syntax:
    <a href = "/document.php?modulefct=ecm&file=[relative_dir/]filename.ext" >
    Für eine Datei in Dokumente / Medien (offenes Verzeichnis für den öffentlichen Zugriff) lautet die Syntax:
    <a href = "/ document.php? modulepart = medias & file = [relative_dir /] filename.ext" >
    Für eine Datei, die mit einem Share-Link geteilt wird (offener Zugriff mit dem Sharing-Hash-Schlüssel der Datei), ist die Syntax:
    <a href = "/ dokument.php? hashp = publicsharekeyoffile" >

    Für ein Bild gespeichert im Verzeichnis Dokumente , verwenden Sie den Wrapper viewimage.php .
    Beispiel für ein Bild in Dokumente / Medien (Open Access), Syntax:
    <a href = "/ viewimage.php? modulpart = medias&file = [relative_verz /] filename.ext" >
    +ClonePage=Seite klonen +CloneSite=Seite klonen +SiteAdded=Website hinzugefügt +ConfirmClonePage=Bitte geben Sie den Code / Alias ​​einer neuen Seite ein und ob es sich um eine Übersetzung der geklonten Seite handelt. +PageIsANewTranslation=Die neue Seite ist eine Übersetzung der aktuellen Seite? +LanguageMustNotBeSameThanClonedPage=Sie klonen eine Seite als Übersetzung. Die Sprache der neuen Seite muss sich von der Sprache der Quellseite unterscheiden. +ParentPageId=ID der übergeordneten Seite +WebsiteId=Website-ID +CreateByFetchingExternalPage=Erstellen Sie eine Seite / einen Container, indem Sie die Seite von einer externen URL abrufen ... +OrEnterPageInfoManually=Oder leere Seite von Grund auf erstellen ... +FetchAndCreate=Abrufen und erstellen +ExportSite=Website exportieren +IDOfPage=ID der Seite +Banner=Banner +BlogPost=Blog Eintrag +WebsiteAccount=Website-Konto +WebsiteAccounts=Website-Konten +AddWebsiteAccount=Erstellen Sie ein Website-Konto +BackToListOfThirdParty=Zurück zur Liste für Drittanbieter +DisableSiteFirst=Webseite zuerst deaktivieren +MyContainerTitle=Titel der Webseite +AnotherContainer=Ein weiterer Container diff --git a/htdocs/langs/de_DE/withdrawals.lang b/htdocs/langs/de_DE/withdrawals.lang index 136ab2f22ee..7e15f4b5c3c 100644 --- a/htdocs/langs/de_DE/withdrawals.lang +++ b/htdocs/langs/de_DE/withdrawals.lang @@ -20,7 +20,7 @@ WithdrawsRefused=Lastschrift-Einzug abgelehnt NoInvoiceToWithdraw=No customer invoice with open 'Direct debit requests' is waiting. Go on tab '%s' on invoice card to make a request. ResponsibleUser=Verantwortlicher Benutzer WithdrawalsSetup=Einstellungen für Lastschriftaufträge -WithdrawStatistics=Direct debit payment statistics +WithdrawStatistics=Statistik Lastschriftzahlungen WithdrawRejectStatistics=Statistik abgelehnter Lastschriftzahlungen LastWithdrawalReceipt=Latest %s direct debit receipts MakeWithdrawRequest=Make a direct debit payment request diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang index 9fcd1b44d01..ba7d192701b 100644 --- a/htdocs/langs/el_GR/accountancy.lang +++ b/htdocs/langs/el_GR/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Piece number TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=Λίστα των λογιστικών λογαριασμών UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal Modelcsv=Πρότυπο εξαγωγής -OptionsDeactivatedForThisExportModel=Γι 'αυτό το μοντέλο εξαγωγών, οι επιλογές είναι απενεργοποιημένες Selectmodelcsv=Επιλέξτε ένα πρότυπο από την εξαγωγή Modelcsv_normal=Κλασική εξαγωγή Modelcsv_CEGID=Export towards CEGID Expert Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution Modelcsv_quadratus=Export towards Quadratus QuadraCompta Modelcsv_ebp=Export towards EBP Modelcsv_cogilog=Export towards Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang index 590cbe506f7..3bc21667a61 100644 --- a/htdocs/langs/el_GR/admin.lang +++ b/htdocs/langs/el_GR/admin.lang @@ -539,7 +539,7 @@ Module320Desc=Εισαγωγή RSS feed εντός των σελίδων του Module330Name=Σελιδοδείκτες Module330Desc=Διαχείριση σελιδοδεικτών Module400Name=Έργα/Ευκαιρίες/Leads -Module400Desc=Διαχείριση έργων, ευκαιρίες ή leads. Στη συνέχεια μπορείτε να ορίσετε οποιοδήποτε στοιχείο (τιμολόγιο, παραγγελία, προσφορά, παρέμβαση, ...) σε ένα έργο και να πάρετε μια εγκάρσια όψη από την προβολή του έργου. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Ημερολόγιο ιστού Module410Desc=Διεπαφή ημερολογίου ιστού Module500Name=Ειδικά έξοδα @@ -890,7 +890,7 @@ DictionaryStaff=Προσωπικό DictionaryAvailability=Καθυστέρηση παράδοσης DictionaryOrderMethods=Μέθοδος Παραγγελίας DictionarySource=Προέλευση των προτάσεων/παραγγελιών -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Μοντέλα λογιστικού σχεδίου DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=Πρότυπα email @@ -904,6 +904,7 @@ SetupSaved=Οι ρυθμίσεις αποθηκεύτηκαν SetupNotSaved=Setup not saved BackToModuleList=Πίσω στη λίστα με τα modules BackToDictionaryList=Επιστροφή στη λίστα λεξικών +TypeOfRevenueStamp=Type of revenue stamp VATManagement=Διαχείριση Φ.Π.Α. VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is 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. @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/el_GR/banks.lang b/htdocs/langs/el_GR/banks.lang index 51529609529..4429a22d854 100644 --- a/htdocs/langs/el_GR/banks.lang +++ b/htdocs/langs/el_GR/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Αριθμός LineRecord=Συναλλαγή AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Reconciled ConciliatedBy=Πραγματοποίηση Συναλλαγής από DateConciliating=Ημερομ. Πραγματοποίησης Συναλλαγής BankLineConciliated=Entry reconciled diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang index 7cc01cbda46..2e22aa41acf 100644 --- a/htdocs/langs/el_GR/bills.lang +++ b/htdocs/langs/el_GR/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s BillsLate=Καθυστερημένες Πληρωμές BillsStatistics=Στατιστικά για τα τιμολόγια των πελατών BillsStatisticsSuppliers=Στατιστικά για τα τιμολόγια των προμηθευτών +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Απενεργοποιημένο επειδή δεν μπορεί να διαγραφή InvoiceStandard=Τυπικό Τιμολόγιο InvoiceStandardAsk=Τυπικό Τιμολόγιο @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? ConfirmClassifyPaidPartiallyReasonAvoir=Παραμένουν απλήρωτα (%s %s) έχει μια έκπτωση που χορηγήθηκε επειδή η πληρωμή έγινε πριν από την περίοδο. Έχει τακτοποιηθεί το ΦΠΑ με πιστωτικό τιμολόγιο. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Παραμένουν απλήρωτα (%s %s) έχει μια έκπτωση που χορηγήθηκε επειδή η πληρωμή έγινε πριν από την περίοδο. Δέχομαι να χάσω το ΦΠΑ για την έκπτωση αυτή. ConfirmClassifyPaidPartiallyReasonDiscountVat=Παραμένουν απλήρωτα (%s %s) έχει μια έκπτωση που χορηγήθηκε επειδή η πληρωμή έγινε πριν από την περίοδο. Έχω την επιστροφή του ΦΠΑ για την έκπτωση αυτή χωρίς πιστωτικό τιμολόγιο. ConfirmClassifyPaidPartiallyReasonBadCustomer=Κακός πελάτης diff --git a/htdocs/langs/el_GR/compta.lang b/htdocs/langs/el_GR/compta.lang index 3461dc91f36..4bc4a6eb118 100644 --- a/htdocs/langs/el_GR/compta.lang +++ b/htdocs/langs/el_GR/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Η πληρωμή δεν είναι συνδεδεμ PaymentsNotLinkedToUser=Η πληρωμή δεν είναι συνδεδεμένη με κάποιον πελάτη Profit=Κέρδος AccountingResult=Λογιστικό αποτέλεσμα +BalanceBefore=Balance (before) Balance=Ισοζύγιο Debit=Χρέωση Credit=Πίστωση diff --git a/htdocs/langs/el_GR/donations.lang b/htdocs/langs/el_GR/donations.lang index dd1ef9822ac..ea2fdaccb78 100644 --- a/htdocs/langs/el_GR/donations.lang +++ b/htdocs/langs/el_GR/donations.lang @@ -31,3 +31,4 @@ DONATION_ART200=Δείτε το άρθρο 200 από το CGI αν ανησυχ DONATION_ART238=Δείτε το άρθρο 238 από το CGI αν ανησυχείτε DONATION_ART885=Δείτε το άρθρο 885 από το CGI αν ανησυχείτε DonationPayment=Πληρωμή Δωρεάς +DonationValidated=Donation %s validated diff --git a/htdocs/langs/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang index befa6f0defa..9bf1c660882 100644 --- a/htdocs/langs/el_GR/errors.lang +++ b/htdocs/langs/el_GR/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Κενή έκφραση ErrorPriceExpression21=Κενό αποτέλεσμα '%s' ErrorPriceExpression22=Αρνητικό αποτέλεσμα '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Εσωτερικό σφάλμα '%s' ErrorPriceExpressionUnknown=Άγνωστο σφάλμα '%s' ErrorSrcAndTargetWarehouseMustDiffers=Η πηγή και ο στόχος των αποθηκών πρέπει να είναι διαφορετικός. diff --git a/htdocs/langs/el_GR/install.lang b/htdocs/langs/el_GR/install.lang index 4661602c4b5..b1c5b231c8e 100644 --- a/htdocs/langs/el_GR/install.lang +++ b/htdocs/langs/el_GR/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=Χρησιμοποιείτε τον οδηγό εγκα UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Fix for denormalized data @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Ενημέρωση φορέα τιμών πεδίου στον πίνακα llx_societe_remise MigrationRemiseExceptEntity=Ενημέρωση φορέα τιμών πεδίου στον πίνακα llx_societe_remise_except MigrationReloadModule=Επαναφόρτωση ενθεμάτων %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Εμφάνιση μη διαθέσιμων επιλογών HideNotAvailableOptions=Απόκρυψη μη μη διαθέσιμων επιλογών ErrorFoundDuringMigration=Αναφέρθηκε σφάλμα κατά τη διαδικασία μεταφοράς, οπότε το επόμενο βήμα δεν είναι δυνατό. Για να αγνοήστε το σφάλμα, μπορείτε να πατήσετε εδώ, αλλά η εφαρμογή ή κάποιες λειτουργείες μπορεί να μην λειτουργού σωστά μέχρι να διορθωθεί. diff --git a/htdocs/langs/el_GR/languages.lang b/htdocs/langs/el_GR/languages.lang index fb4f38eff91..8f4ae0c5555 100644 --- a/htdocs/langs/el_GR/languages.lang +++ b/htdocs/langs/el_GR/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Ισπανικά (Παραγουάη) Language_es_PE=Ισπανικά (Περού) Language_es_PR=Ισπανικά (Πουέρτο Ρίκο) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Ισπανικά (Βενεζουέλας) Language_et_EE=Εσθονίας Language_eu_ES=Βάσκων diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang index 18cb96a070f..eb0ee52a612 100644 --- a/htdocs/langs/el_GR/main.lang +++ b/htdocs/langs/el_GR/main.lang @@ -548,6 +548,18 @@ MonthShort09=Σεπ MonthShort10=Οκτ MonthShort11=Νοέ MonthShort12=Δεκ +MonthVeryShort01=J +MonthVeryShort02=Π +MonthVeryShort03=Δ +MonthVeryShort04=A +MonthVeryShort05=Δ +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=Κ +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Επισυναπτόμενα αρχεία και έγγραφα JoinMainDoc=Join main document DateFormatYYYYMM=YYYY-MM @@ -762,7 +774,7 @@ SetBankAccount=Προσδιορίστε Τραπεζικό λογαριασμό AccountCurrency=Account currency ViewPrivateNote=Προβολή σημειώσεων XMoreLines=%s γραμμή (ές) κρυμμένη -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=Δημόσια URL AddBox=Προσθήκη πεδίου SelectElementAndClick=Select an element and click %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=Όλοι +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/el_GR/other.lang b/htdocs/langs/el_GR/other.lang index 2b5ad81f659..4a0e5f1b33a 100644 --- a/htdocs/langs/el_GR/other.lang +++ b/htdocs/langs/el_GR/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=Εάν το ποσό υπερβαίνει %s SourcesRepository=Αποθετήριο για τις πηγές Chart=Γράφημα PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=Exports area diff --git a/htdocs/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang index 3c84d4d8a25..e087a98e8ce 100644 --- a/htdocs/langs/el_GR/products.lang +++ b/htdocs/langs/el_GR/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Τρέχουσα Τιμή AlwaysUseNewPrice=Always use current price of product/service AlwaysUseFixedPrice=Use the fixed price PriceByQuantity=Διαφορετικές τιμές από την ποσότητα +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Quantity range MultipriceRules=Price segment rules UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang index af010b9324d..bd0dfd0e9d4 100644 --- a/htdocs/langs/el_GR/projects.lang +++ b/htdocs/langs/el_GR/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=Εκκρεμεί OppStatusWON=Won OppStatusLOST=Lost Budget=Budget +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/el_GR/website.lang b/htdocs/langs/el_GR/website.lang index 64500e6cc9c..ad8722058c3 100644 --- a/htdocs/langs/el_GR/website.lang +++ b/htdocs/langs/el_GR/website.lang @@ -3,15 +3,17 @@ Shortname=Κώδικας WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them. DeleteWebsite=Διαγραφή ιστοχώρου ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Page name/alias -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL of external CSS file WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Βιβλιοθήκη πολυμέσων EditCss=Edit Style/CSS or HTML header EditMenu=Επεξεργασία μενού @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/en_GB/accountancy.lang b/htdocs/langs/en_GB/accountancy.lang index 381e8cb2d90..8639f6dde52 100644 --- a/htdocs/langs/en_GB/accountancy.lang +++ b/htdocs/langs/en_GB/accountancy.lang @@ -107,7 +107,6 @@ Modelcsv_ciel=Export to Sage Ciel Compta or Compta Evolution Modelcsv_quadratus=Export to Quadratus QuadraCompta Modelcsv_ebp=Export to EBP Modelcsv_cogilog=Export to Cogilog -Modelcsv_agiris=Export to Agiris (Test) ChartofaccountsId=Chart of accounts ID DefaultBindingDesc=This page can be used to set a default account for linking transaction records about payments, salaries, donations, taxes and vat when no specific finance account had already been set. OptionModeProductSell=Type of sale diff --git a/htdocs/langs/en_GB/admin.lang b/htdocs/langs/en_GB/admin.lang index 69cd399f5c0..a9f12d8b90c 100644 --- a/htdocs/langs/en_GB/admin.lang +++ b/htdocs/langs/en_GB/admin.lang @@ -82,6 +82,8 @@ NumberOfModelFilesFound=Number of ODT/ODS template files found in those director ExampleOfDirectoriesForModelGen=Examples of syntax:
    c:\\mydir
    /home/mydir
    DOL_DATA_ROOT/ecm/ecmdir FollowingSubstitutionKeysCanBeUsed=
    To learn how to create your .odt document templates, before storing them in those directories, read wiki documentation: DescWeather=The following pictures will be shown on the dashboard when the number of late actions reaches the following values: +ThisForceAlsoTheme=This menu manager will use its own theme irrespective of user choice. This menu manager is also specialised for some but not all, smartphones. Use another menu manager if you experience problems with yours. +ConnectionTimeout=Connection timeout Module330Desc=Bookmark management Module50200Name=PayPal Permission300=Read barcodes diff --git a/htdocs/langs/en_GB/main.lang b/htdocs/langs/en_GB/main.lang index 619f78a6738..2dd70365ce4 100644 --- a/htdocs/langs/en_GB/main.lang +++ b/htdocs/langs/en_GB/main.lang @@ -43,7 +43,6 @@ Favorite=Favourite ActionUncomplete=Incomplete GeneratedOn=Built on %s OtherInformations=Other information -Check=Cheque Canceled=Cancelled Color=Colour Informations=Information diff --git a/htdocs/langs/es_CL/accountancy.lang b/htdocs/langs/es_CL/accountancy.lang index 6967a52506b..c98c669ebe4 100644 --- a/htdocs/langs/es_CL/accountancy.lang +++ b/htdocs/langs/es_CL/accountancy.lang @@ -8,7 +8,6 @@ ACCOUNTING_EXPORT_AMOUNT=Monto de exportación ACCOUNTING_EXPORT_DEVISE=Moneda de exportación Selectformat=Seleccione el formato para el archivo ACCOUNTING_EXPORT_FORMAT=Seleccione el formato para el archivo -ACCOUNTING_EXPORT_ENDLINE=Seleccione el tipo de retorno de carro ACCOUNTING_EXPORT_PREFIX_SPEC=Especifíque el prefijo para el nombre de archivo DefaultForService=Predeterminado para servicio DefaultForProduct=Predeterminado para producto @@ -32,7 +31,6 @@ NotYetInGeneralLedger=Aún no se ha contabilizado en libros mayores GroupIsEmptyCheckSetup=El grupo está vacío, verifique la configuración del grupo de contabilidad personalizado DetailByAccount=Mostrar detalles por cuenta AccountWithNonZeroValues=Cuentas con valores distintos de cero -ListOfAccounts=Lista de cuentas MainAccountForCustomersNotDefined=Cuenta de contabilidad principal para los clientes no definidos en la configuración MainAccountForSuppliersNotDefined=Cuenta de contabilidad principal para proveedores no definidos en la configuración MainAccountForUsersNotDefined=Cuenta de contabilidad principal para los usuarios no definidos en la configuración @@ -41,14 +39,14 @@ AccountancyArea=Área de contabilidad AccountancyAreaDescActionOnce=Las siguientes acciones generalmente se ejecutan una sola vez o una vez al año ... AccountancyAreaDescActionOnceBis=Deben seguirse los pasos para ahorrarle tiempo en el futuro al sugerirle la cuenta de contabilidad predeterminada correcta al hacer la publicación (registro de escritura en Revistas y Libro mayor) AccountancyAreaDescActionFreq=Las siguientes acciones generalmente se ejecutan cada mes, semana o día para empresas muy grandes ... -AccountancyAreaDescJournalSetup=PASO %s: cree o verifique el contenido de su lista de publicaciones desde el menú %s +AccountancyAreaDescJournalSetup=PASO %s: Cree o verifique el contenido de su lista de publicaciones desde el menú %s AccountancyAreaDescChartModel=PASO %s: Cree un modelo de tabla de cuenta desde el menú %s AccountancyAreaDescChart=PASO %s: Cree o verifique el contenido de su plan de cuentas desde el menú %s -AccountancyAreaDescVat=PASO %s: defina cuentas contables para cada tasa de IVA. Para esto, use la entrada del menú %s. -AccountancyAreaDescExpenseReport=PASO %s: defina las cuentas de contabilidad predeterminadas para cada tipo de informe de gastos. Para esto, use la entrada del menú %s. +AccountancyAreaDescVat=PASO %s: Defina cuentas contables para cada tasa de IVA. Para esto, use la entrada del menú %s. +AccountancyAreaDescExpenseReport=PASO %s: Defina las cuentas de contabilidad predeterminadas para cada tipo de informe de gastos. Para esto, use la entrada del menú %s. AccountancyAreaDescSal=PASO %s: Defina cuentas de contabilidad predeterminadas para el pago de salarios. Para esto, use la entrada del menú %s. -AccountancyAreaDescContrib=PASO %s: Defina cuentas de contabilidad predeterminadas para gastos especiales (impuestos varios). Para esto, use la entrada del menú %s. -AccountancyAreaDescDonation=PASO %s: defina las cuentas de contabilidad predeterminadas para la donación. Para esto, use la entrada del menú %s. +AccountancyAreaDescContrib=PASO %s: Defina cuentas de contabilidad predeterminadas para pagos especiales (impuestos varios). Para esto, use la entrada del menú %s. +AccountancyAreaDescDonation=PASO %s: Defina las cuentas de contabilidad predeterminadas para la donación. Para esto, use la entrada del menú %s. AccountancyAreaDescMisc=PASO %s: Defina la cuenta predeterminada obligatoria y cuentas de contabilidad predeterminadas para transacciones misceláneas. Para esto, use la entrada del menú %s. AccountancyAreaDescLoan=PASO %s: defina cuentas de contabilidad predeterminadas para préstamos. Para esto, use la entrada del menú %s. AccountancyAreaDescBank=PASO %s: Defina las cuentas de contabilidad y el código del diario para cada banco y cuenta financiera. Para esto, use la entrada del menú %s. @@ -60,7 +58,7 @@ AccountancyAreaDescClosePeriod=PASO %s: Cierre el período para que no podamos r TheJournalCodeIsNotDefinedOnSomeBankAccount=Un paso obligatorio en la configuración no fue completo (diario de códigos de contabilidad no definido para todas las cuentas bancarias) Selectchartofaccounts=Seleccione gráfico de cuentas activo Addanaccount=Agregar cuenta contable -SubledgerAccount=Cuenta de Subledger +SubledgerAccount=Cuenta de libro auxiliar ShowAccountingAccount=Mostrar cuenta contable MenuDefaultAccounts=Cuentas predeterminadas MenuBankAccounts=cuentas bancarias @@ -77,7 +75,7 @@ ValidTransaction=Validar transacción WriteBookKeeping=Registrar transacciones en Ledger Bookkeeping=Libro mayor ObjectsRef=Referencia de objeto de origen -CAHTF=Proveedor total de compras antes de impuestos +CAHTF=Total de compras a proveedor antes de impuestos TotalExpenseReport=Informe de gastos totales InvoiceLines=Líneas de facturas para enlazar InvoiceLinesDone=Líneas de facturas encuadernadas @@ -102,6 +100,7 @@ ACCOUNTING_LENGTH_GACCOUNT=Longitud de las cuentas de contabilidad generales (si ACCOUNTING_LENGTH_AACCOUNT=Longitud de las cuentas de contabilidad de terceros (si establece el valor en 6 aquí, la cuenta '401' aparecerá como '401000' en la pantalla) ACCOUNTING_MANAGE_ZERO=Permitir administrar un número diferente de cero al final de una cuenta de contabilidad. Necesario para algunos países (como Suiza). Si se mantiene desactivado (predeterminado), puede configurar los 2 parámetros siguientes para solicitar a la aplicación que agregue cero virtual. BANK_DISABLE_DIRECT_INPUT=Deshabilitar la grabación directa de transacciones en cuenta bancaria +ACCOUNTING_SELL_JOURNAL=Libro de ventas ACCOUNTING_MISCELLANEOUS_JOURNAL=Diario misceláneo ACCOUNTING_EXPENSEREPORT_JOURNAL=Diario del informe de gastos ACCOUNTING_ACCOUNT_TRANSFER_CASH=Cuenta contable de transferencia @@ -117,12 +116,10 @@ LabelOperation=Operación de etiqueta Sens=Significado NumPiece=Pieza número TransactionNumShort=Num. transacción -AccountingAccountGroupsDesc=Puede definir aquí algunos grupos de cuentas contables. Se usará en el informe %s para mostrar su ingreso / gasto con datos agrupados de acuerdo con estos grupos. DeleteMvt=Eliminar líneas de libro mayor DelYear=Año para borrar DelJournal=Diario para eliminar ConfirmDeleteMvt=Esto eliminará todas las líneas del Libro mayor por año y / o desde un diario específico. Se requiere al menos un criterio. -ConfirmDeleteMvtPartial=Esto eliminará la transacción del libro mayor (se eliminarán todas las líneas relacionadas con la misma transacción) DelBookKeeping=Eliminar el registro del Libro mayor FinanceJournal=Diario de finanzas ExpenseReportsJournal=Diario de informes de gastos @@ -153,7 +150,7 @@ DescVentilDoneCustomer=Consulte aquí la lista de las líneas de clientes de fac DescVentilTodoCustomer=Vincular líneas de factura que ya no están vinculadas con una cuenta de contabilidad de producto ChangeAccount=Cambie la cuenta de contabilidad de producto / servicio para líneas seleccionadas con la siguiente cuenta de contabilidad: DescVentilSupplier=Consulte aquí la lista de líneas de factura de proveedores vinculadas o aún no vinculadas a una cuenta de contabilidad de producto -DescVentilDoneSupplier=Consulte aquí la lista de las líneas de proveedor de facturas y su cuenta de contabilidad +DescVentilDoneSupplier=Consulte aquí la lista de las líneas de proveedor de facturas y su cuenta de contable DescVentilTodoExpenseReport=Vincular las líneas de informe de gastos que ya no están vinculadas con una cuenta de contabilidad de tarifas DescVentilExpenseReport=Consulte aquí la lista de líneas de informe de gastos vinculadas (o no) a una cuenta de contabilidad de tasas DescVentilExpenseReportMore=Si configura la cuenta de contabilidad en el tipo de líneas de informe de gastos, la aplicación podrá realizar todos los enlaces entre sus líneas de informe de gastos y la cuenta de contabilidad de su plan de cuentas, solo con un clic con el botón "%s". Si la cuenta no se configuró en el diccionario de tarifas o si aún tiene algunas líneas no vinculadas a ninguna cuenta, deberá realizar una vinculación manual desde el menú "%s". @@ -171,20 +168,19 @@ ChangeBinding=Cambiar la encuadernación ApplyMassCategories=Aplicar categorías de masa AddAccountFromBookKeepingWithNoCategories=Cuenta disponible aún no en un grupo personalizado CategoryDeleted=La categoría de la cuenta de contabilidad ha sido eliminada -AccountingJournals=Revistas contables +AccountingJournals=Libros contables AccountingJournal=Diario de contabilidad NewAccountingJournal=Nueva revista de contabilidad AccountingJournalType1=Operación miscelánea AccountingJournalType5=Informe de gastos ErrorAccountingJournalIsAlreadyUse=Este diario ya es uso ExportDraftJournal=Exportar borrador del diario -OptionsDeactivatedForThisExportModel=Opciones desactivadas para este modelo de exportación Selectmodelcsv=Seleccione un modelo Modelcsv_normal=Exportación clasica Modelcsv_CEGID=Exportación hacia CEGID Expert Comptabilité Modelcsv_ebp=Exportar hacia EBP Modelcsv_cogilog=Exportar hacia Cogilog -Modelcsv_agiris=Exportar hacia Agiris (Prueba) +Modelcsv_agiris=Exportar hacia Agiris Modelcsv_configurable=Exportable Configurable ChartofaccountsId=Plan de cuentas Id InitAccountancy=Contabilidad inicial diff --git a/htdocs/langs/es_CL/admin.lang b/htdocs/langs/es_CL/admin.lang index 75c7c137799..cbf83f9eb3b 100644 --- a/htdocs/langs/es_CL/admin.lang +++ b/htdocs/langs/es_CL/admin.lang @@ -29,8 +29,6 @@ WebUserGroup=Usuario / grupo del servidor web NoSessionFound=Parece que su PHP no permite listar sesiones activas. El directorio utilizado para guardar sesiones (%s) puede estar protegido (por ejemplo, por permisos del sistema operativo o por la directiva PHP open_basedir). DBStoringCharset=Juego de caracteres de base de datos para almacenar datos DBSortingCharset=Juego de caracteres de base de datos para ordenar los datos -ClientCharset=Juego de caracteres del cliente -ClientSortingCharset=Colación de clientes WarningModuleNotActive=El módulo %s debe estar habilitado. WarningOnlyPermissionOfActivatedModules=Aquí solo se muestran los permisos relacionados con los módulos activados. Puede activar otros módulos en la página Inicio-> Configuración-> Módulos. DolibarrSetup=Instalación o actualización de Dolibarr @@ -103,7 +101,7 @@ HoursOnThisPageAreOnServerTZ=Advertencia, a diferencia de otras pantallas, las h MaxNbOfLinesForBoxes=Número máximo de líneas para widgets PositionByDefault=Orden predeterminada MenusDesc=Los administradores de menú establecen el contenido de las dos barras de menú (horizontal y vertical). -MenusEditorDesc=El editor de menú le permite definir entradas de menú personalizadas. Úselo con cuidado para evitar la inestabilidad y las entradas de menú permanentemente inalcanzables. Algunos módulos agregan entradas de menú (en el menú Todo principalmente). Si elimina algunas de estas entradas por error, puede restablecerlas deshabilitando y volviendo a habilitar el módulo. +MenusEditorDesc=El editor de menú le permite definir entradas de menú personalizadas. Úselo con cuidado para evitar la inestabilidad y las entradas de menú permanentemente inalcanzables.
    Algunos módulos agregan entradas de menú (en el menú Todo principalmente). Si elimina algunas de estas entradas por error, puede restablecerlas deshabilitando y volviendo a habilitar el módulo. MenuForUsers=Menú para usuarios SystemInfo=Información del sistema SystemToolsArea=Área de herramientas del sistema @@ -118,7 +116,7 @@ PurgeNDirectoriesDeleted=%s archivos o directorios eliminados. PurgeNDirectoriesFailed=Error al eliminar directorios o archivos %s. PurgeAuditEvents=Purgar todos los eventos de seguridad ConfirmPurgeAuditEvents=¿Estás seguro de que quieres purgar todos los eventos de seguridad? Se eliminarán todos los registros de seguridad, no se eliminarán otros datos. -Backup=Apoyo +Backup=Respaldo Restore=Restaurar RunCommandSummary=La copia de seguridad se ha lanzado con el siguiente comando BackupFileSuccessfullyCreated=Archivo de respaldo generado con éxito @@ -127,7 +125,6 @@ NoBackupFileAvailable=No hay archivos de respaldo disponibles. ToBuildBackupFileClickHere=Para crear un archivo de copia de seguridad, haga clic aquí . ImportMySqlDesc=Para importar un archivo de copia de seguridad, debe usar el comando mysql desde la línea de comando: ImportPostgreSqlDesc=Para importar un archivo de copia de seguridad, debe usar el comando pg_restore desde la línea de comando: -ImportMySqlCommand=%s %s echa un vistazo a la Wiki de Dolibarr:
    %s < / b> -ForAnswersSeeForum=Para cualquier otra pregunta / ayuda, puede utilizar el foro de Dolibarr:
    %s +ForDocumentationSeeWiki=Para documentación del usuario o desarrollador (Doc, Preguntas frecuentes ...),
    echa un vistazo a la Wiki de Dolibarr:
    %s +ForAnswersSeeForum=Para cualquier otra pregunta/ayuda, puede utilizar el foro de Dolibarr:
    %s HelpCenterDesc1=Esta área puede ayudarlo a obtener un servicio de ayuda de Ayuda en Dolibarr. -HelpCenterDesc2=Alguna parte de este servicio está disponible solo en inglés . +HelpCenterDesc2=Alguna parte de este servicio está disponible solo en inglés. CurrentMenuHandler=Manejador de menú actual SpaceX=Espacio X SpaceY=Espacio Y @@ -234,19 +231,19 @@ UnpackPackageInModulesRoot=Para implementar/instalar un módulo externo, descomp SetupIsReadyForUse=La implementación del módulo ha finalizado. Sin embargo, debe habilitar y configurar el módulo en su aplicación yendo a la página para configurar los módulos: %s . NotExistsDirect=El directorio raíz alternativo no está definido en un directorio existente.
    InfDirAlt=Desde la versión 3, es posible definir un directorio raíz alternativo. Esto le permite almacenar, en un directorio dedicado, complementos y plantillas personalizadas.
    Simplemente cree un directorio en la raíz de Dolibarr (p. Ej .: personalizado).
    -InfDirExample=
    Entonces, declararlo en el archivo conf.php
    $ dolibarr_main_url_root_alt = '/ custom'
    $ dolibarr_main_document_root_alt = '/ path / of / dolibarr / htdocs / custom'
    Si estas líneas se comentan con "#", para habilitarlas, simplemente elimine el comentario del carácter "#". +InfDirExample=
    Entonces, declare en el archivo conf.php
    $dolibarr_main_url_root_alt = '/ custom'
    $ dolibarr_main_document_root_alt = '/path/of /dolibarr/htdocs /custom'
    Si estas líneas se comentan con "#", para habilitarlas, simplemente elimine el comentario del carácter "#". YouCanSubmitFile=Para este paso, puede enviar el archivo .zip del paquete de módulo aquí: CallUpdatePage=Vaya a la página que actualiza la estructura de la base de datos y los datos: %s. LastActivationIP=Última activación IP UpdateServerOffline=Actualizar servidor fuera de línea WithCounter=Administrar un contador -GenericMaskCodes=Puede ingresar cualquier máscara de numeración. En esta máscara, se podrían usar las siguientes etiquetas:
    {000000} corresponde a un número que se incrementará en cada %s. Ingrese tantos ceros como la longitud deseada del contador. El contador se completará con ceros desde la izquierda para tener tantos ceros como la máscara.
    {000000 + 000} igual que el anterior, pero se aplica un desplazamiento correspondiente al número a la derecha del signo + a partir del primer %s.
    {000000 @ x} igual que el anterior pero el contador se restablece a cero cuando se alcanza el mes x (x entre 1 y 12, o 0 para usar los primeros meses del año fiscal definidos en su configuración, o 99 para restablecer a cero cada mes). Si se usa esta opción y x es 2 o mayor, también se requiere la secuencia {aa} {mm} o {aaaa} {mm}.
    {dd} día (01 a 31).
    {mm} mes (01 a 12).
    {yy} < / b>, {aaaa} o {y} años en 2, 4 o 1 números.
    -GenericMaskCodes2= {cccc} el código del cliente en n caracteres
    {cccc000} el código del cliente en n caracteres va seguido de un contador dedicado para el cliente. Este contador dedicado al cliente se restablece al mismo tiempo que el contador global.
    {tttt} El código de tipo de tercero en n caracteres (consulte el menú Inicio - Configuración - Diccionario - Tipos de terceros) . Si agrega esta etiqueta, el contador será diferente para cada tipo de tercero.
    +GenericMaskCodes=Puede ingresar cualquier máscara de numeración. En esta máscara, se podrían usar las siguientes etiquetas:
    {000000} corresponde a un número que se incrementará en cada %s. Ingrese tantos ceros como la longitud deseada del contador. El contador se completará con ceros desde la izquierda para tener tantos ceros como la máscara.
    {000000+000} igual que el anterior, pero se aplica un desplazamiento correspondiente al número a la derecha del signo + a partir del primer %s.
    {000000@x} igual que el anterior pero el contador se restablece a cero cuando se alcanza el mes x (x entre 1 y 12, o 0 para usar los primeros meses del año fiscal definidos en su configuración, o 99 para restablecer a cero cada mes). Si se usa esta opción y x es 2 o mayor, también se requiere la secuencia {aa} {mm} o {aaaa} {mm}.
    {dd} día (01 a 31).
    {mm} mes (01 a 12).
    {yy}, {aaaa} o {y} años en 2, 4 o 1 números.
    +GenericMaskCodes2={cccc} el código del cliente en n caracteres
    {cccc000} el código del cliente en n caracteres va seguido de un contador dedicado para el cliente. Este contador dedicado al cliente se restablece al mismo tiempo que el contador global.
    {tttt} El código de tipo de tercero en n caracteres (consulte el menú Inicio - Configuración - Diccionario - Tipos de terceros) . Si agrega esta etiqueta, el contador será diferente para cada tipo de tercero.
    GenericMaskCodes3=Todos los demás personajes de la máscara permanecerán intactos.
    No se permiten espacios.
    -GenericMaskCodes4a= Ejemplo en el 99º %s del tercero TheCompany, con fecha 2007-01-31:
    -GenericMaskCodes4b= Ejemplo de un tercero creado en 2007-03-01:
    -GenericMaskCodes4c= Ejemplo de producto creado el 2007-03-01:
    -GenericMaskCodes5= ABC {yy} {mm} - {000000} dará ABC0701-000099
    {0000 + 100 @ 1} -ZZZ / {dd} / XXX dará 0199-ZZZ / 31 / XXX
    IN {aa} {mm} - {0000} - {t} dará IN0701-0099-A si el tipo de compañía es 'Responsable Inscripto' con código para el tipo 'A_RI' +GenericMaskCodes4a=Ejemplo en el 99º %s del tercero TheCompany, con fecha 2007-01-31:
    +GenericMaskCodes4b=Ejemplo de un tercero creado en 2007-03-01:
    +GenericMaskCodes4c=Ejemplo de producto creado el 2007-03-01:
    +GenericMaskCodes5=ABC{yy}{mm}-{000000} dará ABC0701-000099
    {0000+100@1}-ZZZ/{dd}/XXX dará 0199-ZZZ/31/XXX
    IN{yy}{mm}-{0000}-{t}dará IN0701-0099-A si el tipo de compañía es 'Responsable Inscripto' con código para el tipo 'A_RI' GenericNumRefModelDesc=Devuelve un número personalizable según una máscara definida. ServerAvailableOnIPOrPort=El servidor está disponible en la dirección %s en el puerto %s ServerNotAvailableOnIPOrPort=El servidor no esta disponible en la dirección %s en el puerto %s @@ -259,7 +256,7 @@ UMask=Parámetro UMask para nuevos archivos en el sistema de archivos Unix / Lin UMaskExplanation=Este parámetro le permite definir permisos establecidos por defecto en los archivos creados por Dolibarr en el servidor (durante la carga, por ejemplo).
    Debe ser el valor octal (por ejemplo, 0666 significa leer y escribir para todos).
    parámetro es inútil en un servidor de Windows. SeeWikiForAllTeam=Echa un vistazo a la página wiki para ver una lista completa de todos los actores y su organización UseACacheDelay=Retardo para la respuesta de exportación en caché en segundos (0 o vacío para no caché) -DisableLinkToHelpCenter=Ocultar enlace " Necesita ayuda o soporte " en la página de inicio de sesión +DisableLinkToHelpCenter=Ocultar enlace "Necesita ayuda o soporte" en la página de inicio de sesión DisableLinkToHelp=Ocultar link para ayuda online "%s" AddCRIfTooLong=No hay ajuste automático, por lo que si la línea está fuera de página en los documentos porque es demasiado larga, debe agregar los retornos de carro en el área de texto. ConfirmPurge=¿Estás seguro de que deseas ejecutar esta purga?
    Esto eliminará definitivamente todos tus archivos de datos sin forma de restaurarlos (archivos ECM, archivos adjuntos ...). @@ -267,7 +264,7 @@ MinLength=Longitud mínima LanguageFilesCachedIntoShmopSharedMemory=Archivos .lang cargados en la memoria compartida ExamplesWithCurrentSetup=Ejemplos con la configuración de ejecución actual ListOfDirectories=Lista de directorios de plantillas de OpenDocument -ListOfDirectoriesForModelGenODT=Lista de directorios que contienen archivos de plantillas con formato OpenDocument.

    Ponga aquí la ruta completa de directorios.
    Agregue un retorno de carro entre el directorio eah.
    Para agregar un directorio del módulo GED, agregue aquí DOL_DATA_ROOT / ecm / yourdirectoryname .

    Los archivos en esos directorios deben terminar con .odt o .ods . +ListOfDirectoriesForModelGenODT=Lista de directorios que contienen archivos de plantillas con formato OpenDocument.

    Ponga aquí la ruta completa de directorios.
    Agregue un retorno de carro entre cada directorio.
    Para agregar un directorio del módulo GED, agregue aquí DOL_DATA_ROOT/ecm/yourdirectoryname.

    Los archivos en esos directorios deben terminar con .odt o .ods. NumberOfModelFilesFound=Número de archivos de plantillas ODT / ODS encontrados en esos directorios ExampleOfDirectoriesForModelGen=Examples of syntax:
    c:\\mydir
    /home/mydir
    DOL_DATA_ROOT/ecm/ecmdir FollowingSubstitutionKeysCanBeUsed=
    Para saber cómo crear sus plantillas de documento Odt, antes de almacenarlas en esos directorios, lea la documentación wiki: @@ -287,8 +284,8 @@ PDFDesc=Puede establecer cada opción global relacionada con la generación de P PDFAddressForging=Reglas para forjar cuadros de direcciones HideAnyVATInformationOnPDF=Ocultar toda la información relacionada con el IVA en PDF generado HideLocalTaxOnPDF=Ocultar %s tasa en venta de impuestos en la columna de PDF -HideDescOnPDF=Ocultar descripción de productos en PDF generado -HideRefOnPDF=Ocultar productos ref. en PDF generado +HideDescOnPDF=Ocultar la descripción de productos en PDF generado +HideRefOnPDF=Ocultar REF. de productos en PDF generado HideDetailsOnPDF=Ocultar detalles de líneas de productos en PDF generado PlaceCustomerAddressToIsoLocation=Utilice la posición estándar francesa (La Poste) para la posición de la dirección del cliente Library=Biblioteca @@ -313,15 +310,15 @@ ExtrafieldCheckBox=Casillas de verificación ExtrafieldCheckBoxFromList=Casillas de verificación de la mesa ExtrafieldLink=Enlace a un objeto ComputedFormula=Campo computado -ComputedFormulaDesc=Puede ingresar aquí una fórmula usando otras propiedades del objeto o cualquier código PHP para obtener un valor calculado dinámico. Puede usar cualquier fórmula compatible con PHP, incluido el "?" operador de condición y objeto global siguiente: $ db, $ conf, $ langs, $ mysoc, $ usuario, $ object .
    ADVERTENCIA : solo algunas propiedades de $ objeto puede estar disponible. Si necesita propiedades no cargadas, simplemente busque el objeto en su fórmula como en el segundo ejemplo.
    Usar un campo calculado significa que no puede ingresar ningún valor desde la interfaz. Además, si hay un error de sintaxis, la fórmula puede devolver nada.

    Ejemplo de fórmula:
    $ object-> id <10? round ($ object-> id / 2, 2): ($ object-> id + 2 * $ user-> id) * (int) substr ($ mysoc-> zip, 1, 2)

    Ejemplo para recargar objeto
    (($ reloadedobj = new Societe ($ db)) && ($ reloadedobj-> fetch ($ obj-> id? $ Obj-> id: ($ obj-> rowid? $ Obj-> rowid: $ object-> id))> 0))? $ reloadedobj-> array_options ['options_extrafieldkey'] * $ reloadedobj-> capital / 5: '-1'

    Otro ejemplo de fórmula para forzar la carga del objeto y su objeto principal:
    (($ reloadedobj = nueva tarea ($ db)) && ($ reloadedobj-> fetch ($ object-> id)> 0) && ($ secondloadedobj = new Project ($ db)) && ($ secondloadedobj-> fetch ($ reloadedobj-> fk_project )> 0))? $ secondloadedobj-> ref: 'Proyecto principal no encontrado' -ExtrafieldParamHelpselect=La lista de valores debe ser líneas con formato clave, valor (donde la clave no puede ser '0')

    por ejemplo:
    1, valor1
    2, valor2
    código3, valor3 < br> ...

    Para que la lista dependa de otra lista de atributos complementarios:
    1, valor1 | opciones_ parent_list_code : parent_key
    2, value2 | options_ parent_list_code : parent_key

    Para que la lista dependa de otra lista:
    1, value1 | parent_list_code : parent_key
    2, value2 | parent_list_code : parent_key -ExtrafieldParamHelpcheckbox=La lista de valores debe ser líneas con formato clave, valor (donde la clave no puede ser '0')

    por ejemplo:
    1, valor1
    2, valor2
    3, valor3 < br> ... -ExtrafieldParamHelpradio=La lista de valores debe ser líneas con formato clave, valor (donde la clave no puede ser '0')

    por ejemplo:
    1, valor1
    2, valor2
    3, valor3 < br> ... -ExtrafieldParamHelpsellist=Lista de valores proviene de una tabla
    Sintaxis: table_name: label_field: id_field :: filter
    Ejemplo: c_typent: libelle: id :: filter

    - idfilter es necesariamente una clave int primaria
    - filtro puede ser una prueba simple (por ejemplo, activo = 1) para mostrar solo valor activo
    También puede usar $ ID $ en filtro que es la identificación actual del objeto actual
    Para hacer un SELECCIONAR en filtro use $ SEL $
    si quieres filtrar en extrafields utiliza la sintaxis extra.fieldcode = ... (donde el código de campo es el código de extrafield)

    Para que la lista dependa de otra lista de atributos complementarios: < br> c_typent: libelle: id: options_ parent_list_code | parent_column: filter

    Para que la lista dependa de otra lista:
    c_typent: libelle: id: parent_list_code | parent_column: filter -ExtrafieldParamHelpchkbxlst=La lista de valores proviene de una tabla
    Sintaxis: table_name: label_field: id_field :: filter
    Ejemplo: c_typent: libelle: id :: filter

    el filtro puede ser una prueba simple (por ejemplo, active = 1 ) para mostrar solo el valor activo
    También puede usar $ ID $ en el filtro bruja es la identificación actual del objeto actual
    Para hacer un SELECCIONAR en filtro use $ SEL $ si desea filtrar el uso de campos extraños sintaxis extra.fieldcode = ... (donde el código de campo es el código de extrafield)

    Para que la lista dependa de otra lista de atributos complementarios:
    c_typent: libelle: id: options_ parent_list_code | parent_column: filter

    Para que la lista dependa de otra lista:
    c_typent: libelle: id: parent_list_code | parent_column: filter +ComputedFormulaDesc=Puede ingresar aquí una fórmula usando otras propiedades del objeto o cualquier código PHP para obtener un valor calculado dinámico. Puede usar cualquier fórmula compatible con PHP, incluido el "?" operador de condición y objeto global siguiente: $db, $conf, $langs, $mysoc, $user, $object.
    ADVERTENCIA: solo algunas propiedades de $object puede estar disponible. Si necesita propiedades no cargadas, simplemente busque el objeto en su fórmula como en el segundo ejemplo.
    Usar un campo calculado significa que no puede ingresar ningún valor desde la interfaz. Además, si hay un error de sintaxis, la fórmula puede devolver nada.

    Ejemplo de fórmula:
    $object-> id <10? round ($ object-> id / 2, 2): ($ object-> id + 2 * $ user-> id) * (int) substr ($ mysoc-> zip, 1, 2)

    Ejemplo para recargar objeto
    (($reloadedobj = new Societe ($db)) && ($reloadedobj-> fetch ($obj-> id? $Obj-> id: ($obj-> rowid? $Obj-> rowid: $ object-> id))> 0))? $reloadedobj-> array_options ['options_extrafieldkey'] * $ reloadedobj-> capital / 5: '-1'

    Otro ejemplo de fórmula para forzar la carga del objeto y su objeto principal:
    (($reloadedobj = new task ($ db)) && ($ reloadedobj-> fetch ($ object-> id)> 0) && ($ secondloadedobj = new Project ($ db)) && ($secondloadedobj-> fetch ($reloadedobj-> fk_project )> 0))? $secondloadedobj-> ref: 'Proyecto principal no encontrado' +ExtrafieldParamHelpselect=La lista de valores debe ser líneas con formato clave, valor (donde la clave no puede ser '0')

    por ejemplo:
    1, valor1
    2, valor2
    código3, valor3
    ...

    Para que la lista dependa de otra lista de atributos complementarios:
    1, valor1 | opciones_ parent_list_code: parent_key
    2, value2 | options_parent_list_code:parent_key

    Para que la lista dependa de otra lista:
    1, value1 | parent_list_code :parent_key
    2,value2| parent_list_code :parent_key +ExtrafieldParamHelpcheckbox=La lista de valores debe ser líneas con formato clave, valor (donde la clave no puede ser '0')

    por ejemplo:
    1, valor1
    2, valor2
    3, valor3
    ... +ExtrafieldParamHelpradio=La lista de valores debe ser líneas con formato clave, valor (donde la clave no puede ser '0')

    por ejemplo:
    1, valor1
    2, valor2
    3, valor3
    ... +ExtrafieldParamHelpsellist=Lista de valores proviene de una tabla
    Sintaxis: table_name: label_field: id_field :: filter
    Ejemplo: c_typent: libelle: id :: filter

    -idfilter es necesariamente una clave int primaria
    - filtro puede ser una prueba simple (por ejemplo, activo = 1) para mostrar solo valor activo
    También puede usar $ ID $ en filtro que es la identificación actual del objeto actual
    Para hacer un SELECCIONAR en filtro use $ SEL $
    si quieres filtrar en extrafields utiliza la sintaxis extra.fieldcode = ... (donde el código de campo es el código de extrafield)

    Para que la lista dependa de otra lista de atributos complementarios:
    c_typent: libelle: id: options_ parent_list_code |parent_column: filter

    Para que la lista dependa de otra lista:
    c_typent: libelle: id: parent_list_code |parent_column:filter +ExtrafieldParamHelpchkbxlst=La lista de valores proviene de una tabla
    Sintaxis: table_name: label_field: id_field :: filter
    Ejemplo: c_typent: libelle: id :: filter

    el filtro puede ser una prueba simple (por ejemplo, active = 1 ) para mostrar solo el valor activo
    También puede usar $ ID $ en el filtro bruja es la identificación actual del objeto actual
    Para hacer un SELECCIONAR en filtro use $ SEL $
    si desea filtrar el uso de campos extraños sintaxis extra.fieldcode = ... (donde el código de campo es el código de extrafield)

    Para que la lista dependa de otra lista de atributos complementarios:
    c_typent: libelle: id: options_ parent_list_code|parent_column: filter

    Para que la lista dependa de otra lista:
    c_typent: libelle: id: parent_list_codelparent_column: filter ExtrafieldParamHelplink=Los parámetros deben ser ObjectName: Classpath
    Sintaxis: ObjectName: Classpath
    Ejemplo: Societe: societe / class / societe.class.php LibraryToBuildPDF=Biblioteca utilizada para la generación de PDF -WarningUsingFPDF=Advertencia: su conf.php contiene la directiva dolibarr_pdf_force_fpdf = 1 . Esto significa que usa la biblioteca FPDF para generar archivos PDF. Esta biblioteca es antigua y no admite muchas características (Unicode, transparencia de imagen, cirílico, árabe y asiático, ...), por lo que puede experimentar errores durante la generación de PDF.
    Para solucionar esto y tener un soporte completo de la generación de PDF, descargue la biblioteca TCPDF , luego comente o elimine la línea $ dolibarr_pdf_force_fpdf = 1 , y en su lugar, agregue $ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir' +WarningUsingFPDF=Advertencia: su conf.php contiene la directiva dolibarr_pdf_force_fpdf = 1. Esto significa que usa la biblioteca FPDF para generar archivos PDF. Esta biblioteca es antigua y no admite muchas características (Unicode, transparencia de imagen, cirílico, árabe y asiático, ...), por lo que puede experimentar errores durante la generación de PDF.
    Para solucionar esto y tener un soporte completo de la generación de PDF, descargue la librería TCPDF, luego comente o elimine la línea $dolibarr_pdf_force_fpdf = 1, y en su lugar, agregue $dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir' LocalTaxDesc=Algunos países aplican 2 o 3 impuestos en cada línea de factura. Si este es el caso, elija tipo para el segundo y tercer impuesto y su tasa. El tipo posible es:
    1: impuesto local se aplica a productos y servicios sin IVA (el impuesto local se calcula sobre el monto sin impuestos)
    2: se aplica el impuesto local sobre productos y servicios, incluido el IVA (el impuesto local se calcula sobre el monto + impuesto principal )
    3: el impuesto local se aplica a los productos sin IVA (el impuesto local se calcula sobre el monto sin impuestos)
    4: se aplica el impuesto local sobre los productos, incluido IVA (el impuesto local se calcula sobre el monto + el IVA principal)
    5: local se aplica impuesto sobre los servicios sin IVA (el impuesto local se calcula sobre el monto sin impuestos)
    6: el impuesto local se aplica a los servicios, incluido el IVA (el impuesto local se calcula sobre el monto + impuestos) LinkToTestClickToDial=Ingrese un número de teléfono para llamar y mostrar un enlace para probar la URL de ClickToDial para el usuario %s RefreshPhoneLink=Actualizar enlace @@ -342,7 +339,7 @@ ShowDetailsInPDFPageFoot=Agregue más detalles en el pie de página de los archi NoDetails=No hay más detalles en el pie de página DisplayCompanyManagers=Mostrar nombres de administrador DisplayCompanyInfoAndManagers=Mostrar los nombres de administrador y dirección de la compañía -EnableAndSetupModuleCron=Si desea que esta factura recurrente sea generada automáticamente, el módulo * %s * debe estar habilitado y configurado correctamente. De lo contrario, la generación de facturas se debe hacer manualmente desde esta plantilla con el botón * Crear *. Tenga en cuenta que incluso si activó la generación automática, puede iniciar de forma segura la generación manual. La generación de duplicados para el mismo período no es posible. +EnableAndSetupModuleCron=Si desea que esta factura recurrente sea generada automáticamente, el módulo *%s* debe estar habilitado y configurado correctamente. De lo contrario, la generación de facturas se debe hacer manualmente desde esta plantilla con el botón * Crear *. Tenga en cuenta que incluso si activó la generación automática, puede iniciar de forma segura la generación manual. La generación de duplicados para el mismo período no es posible. ModuleCompanyCodeAquarium=Devuelva un código de contabilidad creado por:
    %s seguido de un código de proveedor de terceros para un código de contabilidad de proveedor,
    %s seguido de un código de cliente de terceros para un código de contabilidad de cliente. ModuleCompanyCodePanicum=Devuelve un código de contabilidad vacío. ModuleCompanyCodeDigitaria=El código de contabilidad depende del código de un tercero. El código se compone del carácter "C" en la primera posición seguido de los primeros 5 caracteres del código de terceros. @@ -362,7 +359,6 @@ ProductDocumentTemplates=Plantillas de documentos para generar documentos de pro FreeLegalTextOnExpenseReports=Texto legal gratuito en informes de gastos WatermarkOnDraftExpenseReports=Marca de agua en los borradores de informes de gastos AttachMainDocByDefault=Establezca esto en 1 si desea adjuntar el documento principal al correo electrónico de forma predeterminada (si corresponde) -SendEmailsReminders=Enviar recordatorios de la agenda por correo electrónico Module0Desc=Gestión de usuarios / empleados y grupos Module1Desc=Empresas y gestión de contactos (clientes, prospectos ...) Module2Desc=Administración comercial @@ -372,7 +368,6 @@ Module20Desc=Gestión de cotizaciones/propuestas comerciales Module22Name=E-mailings masivos Module22Desc=Gestión masiva de correo electrónico Module23Desc=Monitoreo del consumo de energías -Module25Name=Pedidos de los clientes Module25Desc=Gestión de pedidos del cliente Module30Name=Facturas Module30Desc=Gestión de facturas y notas de crédito para clientes. Gestión de facturas para proveedores @@ -383,10 +378,8 @@ Module49Desc=Gestión del editor Module50Desc=Gestión de producto Module51Name=Envíos masivos Module51Desc=Gerencia de correo de papel en masa -Module52Name=Cepo Module52Desc=Gestión de stock (productos) Module53Desc=Gestión De Servicios -Module54Name=Contratos / Suscripciones Module54Desc=Gestión de contratos (servicios o suscripciones de reconexión) Module55Desc=Gestión del código de barras Module56Desc=Integración de telefonía @@ -399,7 +392,6 @@ Module75Name=Notas de gastos y viaje Module75Desc=Gestión de gastos y viajes Module80Name=Envíos Module80Desc=Gestión de envíos y entrega -Module85Name=Bancos y efectivo Module85Desc=Gestión de cuentas bancarias o de efectivo Module100Name=Sitio externo Module100Desc=Este módulo incluye un sitio web externo o una página en los menús de Dolibarr y lo visualiza en un marco de Dolibarr @@ -413,10 +405,9 @@ Module250Desc=Herramienta para importar datos en Dolibarr (con asistentes) Module310Desc=Gestión de miembros de la Fundación Module320Desc=Agregar fuente RSS dentro de las páginas de pantalla de Dolibarr Module400Name=Proyectos / Oportunidades / Leads -Module400Desc=Gestión de proyectos, oportunidades o leads. A continuación, puede asignar cualquier elemento (factura, orden, propuesta, intervención, ...) a un proyecto y obtener una vista transversal desde la vista del proyecto. +Module400Desc=Gestión de proyectos, oportunidades / clientes potenciales y / o tareas. También puede asignar cualquier elemento (factura, orden, propuesta, intervención, ...) a un proyecto y obtener una vista transversal desde la vista del proyecto. Module410Desc=Integración de Webcalendar -Module500Name=Gastos especiales -Module500Desc=Gestión de gastos especiales (impuestos, impuestos sociales o fiscales, dividendos) +Module500Desc=Gestión de pagos especiales (impuestos, impuestos sociales o fiscales, dividendos) Module510Name=Pago de los salarios de los empleados Module510Desc=Registre y siga el pago de los salarios de sus empleados Module520Name=Préstamo @@ -426,8 +417,7 @@ Module600Desc=Enviar notificaciones de correo electrónico (activadas por alguno Module600Long=Tenga en cuenta que este módulo está dedicado a enviar correos electrónicos en tiempo real cuando ocurre un evento comercial dedicado. Si está buscando una función para enviar recordatorios por correo electrónico de los eventos de su agenda, vaya a la configuración del módulo Agenda. Module770Name=Reporte de gastos Module770Desc=Informes de gestión y reclamación de gastos (transporte, comida, ...) -Module1120Name=Propuesta comercial del proveedor -Module1120Desc=Solicitar propuesta comercial del proveedor y precios +Module1120Desc=Solicitar presupuesto de proveedor y precios Module1200Desc=Integración Mantis Module1520Name=Generación de documentos Module1520Desc=Generación masiva de documentos de correo @@ -446,7 +436,7 @@ Module2600Desc=Habilite el servidor Dolibarr SOAP que proporciona servicios de A Module2610Name=API / servicios web (servidor REST) Module2610Desc=Habilite el servidor REST Dolibarr proporcionando servicios API Module2660Name=Llamar a WebServices (cliente SOAP) -Module2660Desc=Habilite el cliente de servicios web Dolibarr (se puede usar para enviar datos / solicitudes a servidores externos. Pedidos de proveedores admitidos solo por el momento) +Module2660Desc=Habilite el cliente de servicios web Dolibarr (se puede usar para enviar datos / solicitudes a servidores externos. Pedidos a proveedores admitidos solo por el momento) Module2700Desc=Use el servicio Gravatar en línea (www.gravatar.com) para mostrar la foto de los usuarios / miembros (que se encuentra con sus correos electrónicos). Necesita un acceso a internet Module2900Desc=Capacidades de conversiones GeoIP Maxmind Module3100Desc=Agregar un botón de Skype a los usuarios / terceros / contactos / tarjetas de miembros @@ -456,7 +446,7 @@ Module5000Name=Multi-compañía Module5000Desc=Le permite administrar múltiples compañías Module6000Desc=Gestión de flujo de trabajo Module10000Desc=Crea sitios web públicos con un editor WYSIWG. Simplemente configure su servidor web (Apache, Nginx, ...) para que apunte al directorio dedicado de Dolibarr para tenerlo en línea en Internet con su propio nombre de dominio. -Module20000Name=Deje la gestión de las solicitudes +Module20000Name=Administración de peticiones días libres Module20000Desc=Declarar y seguir a los empleados deja las solicitudes Module39000Name=Lote de producto Module39000Desc=Número de lote o de serie, administración de la fecha de caducidad y de vencimiento en los productos @@ -472,7 +462,7 @@ Module59000Desc=Módulo para administrar márgenes Module60000Desc=Módulo para gestionar comisiones Module63000Desc=Administre los recursos (impresoras, automóviles, habitaciones, ...) que luego puede compartir en eventos Permission11=Lea las facturas de los clientes -Permission12=Crear / modificar facturas de clientes +Permission12=Crear/modificar facturas de clientes Permission13=Desvalorizar facturas de clientes Permission14=Validar facturas de clientes Permission15=Enviar facturas de clientes por correo electrónico @@ -486,73 +476,64 @@ Permission26=Cerrar cotizaciones Permission27=Eliminar cotizaciones Permission28=Exportar las cotizaciones Permission31=Leer productos -Permission32=Crear / modificar productos Permission36=Ver / administrar productos ocultos Permission41=Leer proyectos y tareas (proyecto compartido y proyectos para los que estoy en contacto). También puede ingresar el tiempo consumido, para mí o mi jerarquía, en las tareas asignadas (parte de horas) -Permission42=Crear / modificar proyectos (proyectos y proyectos compartidos para los que soy contacto). También puede crear tareas y asignar usuarios a proyectos y tareas +Permission42=Crear/modificar proyectos (proyectos y proyectos compartidos para los que soy contacto). También puede crear tareas y asignar usuarios a proyectos y tareas Permission44=Eliminar proyectos (proyectos compartidos y proyectos para los que soy contacto) Permission45=Proyectos de exportación Permission61=Leer intervenciones -Permission62=Crear / modificar intervenciones Permission67=Intervenciones de exportación Permission71=Leer miembros -Permission72=Crear / modificar miembros Permission75=Configurar los tipos de membresía Permission78=Leer suscripciones -Permission79=Crear / modificar suscripciones +Permission79=Crear/modificar suscripciones Permission81=Leer pedidos de clientes -Permission82=Crear / modificar pedidos de clientes Permission88=Cancelar pedidos de clientes Permission91=Leer impuestos y tina sociales o fiscales -Permission92=Crear / modificar impuestos y cánones sociales o fiscales +Permission92=Crear/modificar impuestos y cánones sociales o fiscales Permission93=Eliminar impuestos sociales y fiscales y IVA Permission94=Exportación de impuestos sociales o fiscales Permission95=Leer informes Permission101=Leer envíos -Permission102=Crear / modificar envíos +Permission102=Crear/modificar envíos Permission104=Validar envíos Permission106=Exportar envíos Permission109=Eliminar envíos Permission111=Leer cuentas financieras -Permission112=Crear / modificar / eliminar y comparar transacciones +Permission112=Crear/modificar / eliminar y comparar transacciones Permission113=Configurar cuentas financieras (crear, administrar categorías) Permission114=Conciliar transacciones Permission115=Exportar transacciones y estados de cuenta Permission116=Transferencias entre cuentas Permission117=Administrar el envío de cheques Permission121=Leer terceros vinculados al usuario -Permission122=Crear / modificar terceros vinculados al usuario +Permission122=Crear/modificar terceros vinculados al usuario Permission125=Eliminar terceros vinculados al usuario Permission126=Exportar terceros Permission141=Lee todos los proyectos y tareas (también proyectos privados para los que no estoy en contacto) -Permission142=Crear / modificar todos los proyectos y tareas (también proyectos privados para los que no estoy en contacto) +Permission142=Crear/modificar todos los proyectos y tareas (también proyectos privados para los que no estoy en contacto) Permission144=Eliminar todos los proyectos y tareas (también proyectos privados para los que no estoy en contacto) Permission146=Leer proveedores Permission147=Leer estadísticas Permission151=Lea las órdenes de pago de débito directo -Permission152=Crear / modificar una orden de pago de débito directo +Permission152=Crear/modificar una orden de pago de débito directo Permission153=Enviar / Transmitir órdenes de pago de débito directo Permission154=Registro de créditos / rechazos de órdenes de pago de débito directo -Permission161=Leer contratos / suscripciones -Permission162=Crear / modificar contratos / suscripciones +Permission161=Leer contratos/suscripciones Permission163=Activar un servicio / suscripción de un contrato Permission164=Deshabilitar un servicio / suscripción de un contrato -Permission165=Eliminar contratos / suscripciones Permission167=Contratos de exportación Permission171=Lea viajes y gastos (el suyo y sus subordinados) -Permission172=Crear / modificar viajes y gastos +Permission172=Crear/modificar viajes y gastos Permission173=Eliminar viajes y gastos Permission174=Lee todos los viajes y gastos Permission178=Viajes y gastos de exportación Permission180=Leer proveedores -Permission181=Leer pedidos de proveedores -Permission182=Crear / modificar pedidos de proveedores +Permission181=Leer pedidos a proveedores Permission183=Validar órdenes de proveedor -Permission184=Aprobar pedidos de proveedores -Permission185=Ordene o cancele pedidos de proveedores -Permission186=Reciba pedidos de proveedores -Permission187=Cerrar pedidos de proveedores -Permission188=Cancelar pedidos de proveedores +Permission185=Ordene o cancele pedidos a proveedores +Permission186=Reciba pedidos a proveedores +Permission188=Cancelar pedidos a proveedores Permission194=Lee las líneas de bandwith Permission203=Ordenar pedidos de conexiones Permission204=Solicitar conexiones @@ -563,112 +544,98 @@ Permission212=Líneas de pedido Permission213=Activar línea Permission215=Instalar proveedores Permission221=Leer correos electrónicos -Permission222=Crear / modificar correos electrónicos (tema, destinatarios ...) +Permission222=Crear/modificar correos electrónicos (tema, destinatarios ...) Permission223=Validar correos electrónicos (permite el envío) Permission229=Eliminar correos electrónicos Permission237=Ver destinatarios e información Permission238=Enviar correos manualmente Permission239=Eliminar correos después de la validación o enviado Permission241=Leer categorías -Permission242=Crear / modificar categorías Permission244=Ver los contenidos de las categorías ocultas Permission251=Leer otros usuarios y grupos PermissionAdvanced251=Leer otros usuarios Permission252=Permisos de lectura de otros usuarios -Permission253=Crear / modificar otros usuarios, grupos y permisos -PermissionAdvanced253=Crear / modificar usuarios y permisos internos / externos -Permission254=Crear / modificar solo usuarios externos +Permission253=Crear/modificar otros usuarios, grupos y permisos +PermissionAdvanced253=Crear/modificar usuarios y permisos internos / externos +Permission254=Crear/modificar solo usuarios externos Permission256=Eliminar o deshabilitar a otros usuarios Permission262=Ampliar el acceso a todos los terceros (no solo a terceros que el usuario sea un representante de ventas). No es efectivo para usuarios externos (siempre se limitan a ellos mismos para propuestas, pedidos, facturas, contratos, etc.). No es efectivo para proyectos (solo reglas sobre permisos de proyecto, visibilidad y asuntos de asignación). Permission271=Lee CA Permission272=Leer facturas Permission273=Emitir facturas Permission281=Leer contactos -Permission282=Crear / modificar contactos Permission291=Tarifas de lectura Permission292=Establecer permisos sobre las tarifas Permission293=Modificar las tarifas de los clientes Permission300=Leer códigos de barras -Permission301=Crear / modificar códigos de barras Permission302=Eliminar códigos de barras -Permission311=Servicios de lectura +Permission311=Leer Servicios Permission312=Asignar servicio / suscripción al contrato Permission331=Leer marcadores -Permission332=Crear / modificar marcadores Permission341=Lea sus propios permisos -Permission342=Crear / modificar su propia información de usuario +Permission342=Crear/modificar su propia información de usuario Permission351=Grupos de lectura Permission352=Lea los permisos de los grupos -Permission353=Crear / modificar grupos +Permission353=Crear/modificar grupos Permission354=Eliminar o deshabilitar grupos -Permission358=Usuarios de exportación Permission401=Leer descuentos -Permission402=Crear / modificar descuentos +Permission402=Crear/modificar descuentos Permission403=Validar descuentos Permission404=Eliminar descuentos -Permission501=Leer los contratos / salarios de los empleados -Permission502=Crear / modificar contratos de empleados / salarios +Permission501=Leer contratos/salarios de empleados +Permission502=Crear/modificar contratos/salarios de empleados Permission511=Leer el pago de los salarios -Permission512=Crear / modificar el pago de los salarios +Permission512=Crear/modificar el pago de los salarios Permission517=Salarios de exportación Permission520=Leer préstamos -Permission522=Crear / modificar préstamos +Permission522=Crear/modificar préstamos Permission524=Eliminar préstamos Permission525=Calculadora de préstamo de acceso Permission527=Préstamos a la exportación -Permission531=Servicios de lectura -Permission532=Crear / modificar servicios +Permission531=Leer Servicios Permission536=Ver / administrar servicios ocultos Permission538=Servicios de exportación Permission701=Leer donaciones -Permission702=Crear / modificar donaciones Permission771=Lea los informes de gastos (el suyo y sus subordinados) -Permission772=Crear / modificar informes de gastos +Permission772=Crear/modificar informes de gastos Permission773=Eliminar informes de gastos Permission774=Lea todos los informes de gastos (incluso para usuarios no subordinados) Permission775=Aprobar informes de gastos Permission776=Pagar informes de gastos Permission779=Informes de gastos de exportación -Permission1001=Leer acciones -Permission1002=Crear / modificar almacenes -Permission1004=Leer movimientos de acciones -Permission1005=Crear / modificar movimientos de stock +Permission1001=Leer stocks Permission1101=Leer órdenes de entrega -Permission1102=Crear / modificar órdenes de entrega +Permission1102=Crear/modificar órdenes de entrega Permission1104=Validar órdenes de entrega Permission1109=Eliminar pedidos de entrega Permission1181=Leer proveedores -Permission1182=Leer pedidos de proveedores -Permission1183=Crear / modificar pedidos de proveedores +Permission1182=Leer pedidos a proveedores +Permission1183=Crear/modificar pedidos a proveedores Permission1184=Validar órdenes de proveedor -Permission1185=Aprobar pedidos de proveedores -Permission1186=Ordene pedidos de proveedores -Permission1187=Acuse de recibo de pedidos de proveedores -Permission1188=Eliminar pedidos de proveedores -Permission1190=Aprobar (segunda aprobación) pedidos de proveedores +Permission1186=Ordene pedidos a proveedores +Permission1187=Acuse de recibo de pedidos a proveedores +Permission1188=Eliminar pedidos a proveedores Permission1201=Obtener el resultado de una exportación Permission1202=Crear / Modificar una exportación -Permission1231=Lea las facturas del proveedor -Permission1232=Crear / modificar facturas de proveedores +Permission1231=Leer facturas de proveedores +Permission1232=Crear/modificar facturas de proveedores Permission1235=Enviar facturas de proveedores por correo electrónico Permission1236=Exportar facturas, atributos y pagos de proveedores -Permission1237=Exportar pedidos de proveedores y sus detalles +Permission1237=Exportar pedidos a proveedores y sus detalles Permission1251=Ejecutar las importaciones masivas de datos externos en la base de datos (carga de datos) Permission1321=Exportar facturas, atributos y pagos de clientes Permission1322=Reabrir una factura paga Permission1421=Exportar pedidos y atributos de los clientes Permission20001=Lea las solicitudes de ausencia (la suya y la de sus subordinados) -Permission20002=Crea / modifica tus solicitudes de permiso +Permission20002=Crea/modifica tus solicitudes de permiso Permission20003=Eliminar solicitudes de permiso -Permission20004=Lea todas las solicitudes de licencia (incluso usuarios no subordinados) -Permission20005=Crear / modificar solicitudes de permiso para todos +Permission20004=Leer todas las solicitudes de permisos (incluso usuarios no subordinados) +Permission20005=Crear/modificar solicitudes de permiso para todos Permission20006=Solicitudes de permiso de administrador (configuración y saldo de actualización) Permission23001=Leer trabajo programado Permission23002=Crear / actualizar trabajo programado Permission23003=Eliminar trabajo programado Permission23004=Ejecutar trabajo programado -Permission2402=Crear / modificar acciones (eventos o tareas) vinculadas a su cuenta -Permission2412=Crear / modificar acciones (eventos o tareas) de otros Permission2414=Exportar acciones / tareas de otros Permission2501=Leer / Descargar documentos Permission2502=Descargar documentos @@ -680,9 +647,7 @@ Permission50101=Use el punto de venta Permission50201=Leer transacciones Permission50202=Transacciones de importación Permission54001=Impresión -Permission55002=Crear / modificar encuestas Permission59003=Lea cada margen de usuario -Permission63002=Crear / modificar recursos Permission63004=Enlace de recursos a eventos de la agenda DictionaryCompanyJuridicalType=Formas legales de terceros DictionaryProspectLevel=Nivel de potencial prospectivo @@ -699,19 +664,17 @@ DictionaryStaff=Personal DictionaryAvailability=Retraso en la entrega DictionarySource=Origen de las propuestas / órdenes DictionaryAccountancysystem=Modelos para el cuadro de cuentas -DictionaryAccountancyJournal=Revistas contables +DictionaryAccountancyJournal=Libros contables DictionaryEMailTemplates=Plantillas de correos electrónicos DictionaryProspectStatus=Estado de prospección -DictionaryHolidayTypes=Tipos de hojas +DictionaryHolidayTypes=Tipos de Vacaciones DictionaryOpportunityStatus=Estado de oportunidad para el proyecto / plomo -DictionaryExpenseTaxCat=Informe de gastos - Categorías de transporte -DictionaryExpenseTaxRange=Informe de gastos - Rango por categoría de transporte +TypeOfRevenueStamp=Tipo de sello de ingresos VATManagement=Gestión del IVA VATIsUsedDesc=Por defecto cuando se crean prospectos, facturas, pedidos, etc., la tasa del IVA sigue la regla del estándar activo:
    Si el vendedor no está sujeto al IVA, entonces el IVA predeterminado es 0. Fin de la regla.
    Si el (país de venta = país de compra), entonces el IVA por defecto es igual al IVA del producto en el país de venta. Fin de la regla
    Si el vendedor y el comprador pertenecen a la Comunidad Europea y los productos son de transporte (automóvil, barco, avión), el IVA por defecto es 0 (el comprador debe pagar el IVA a la oficina de su país y no a la vendedor). Fin de la regla.
    Si el vendedor y el comprador están en la Comunidad Europea y el comprador no es una empresa, entonces el IVA se convierte por defecto en el IVA del producto vendido. Fin de la regla.
    Si el vendedor y el comprador están en la Comunidad Europea y el comprador es una empresa, entonces el IVA es 0 por defecto. Fin de la regla.
    En cualquier otro caso, el valor predeterminado propuesto es el IVA = 0. Fin de la regla VATIsNotUsedDesc=Por defecto, el IVA propuesto es 0, que puede utilizarse para casos como asociaciones, particulares o pequeñas empresas. VATIsUsedExampleFR=En Francia, significa empresas u organizaciones que tienen un sistema fiscal real (real simplificado real o real). Un sistema en el que se declara el IVA. VATIsNotUsedExampleFR=En Francia, significa las asociaciones que no están declaradas con IVA o las empresas, organizaciones o profesiones liberales que han elegido el sistema fiscal de microempresas (IVA en franquicia) y pagaron una franquicia con IVA sin ninguna declaración de IVA. Esta elección mostrará la referencia "IVA no aplicable - art-293B de CGI" en las facturas. -LTRate=Tarifa LocalTax1IsNotUsed=No use el segundo impuesto LocalTax1IsUsedDesc=Use un segundo tipo de impuesto (que no sea el IVA) LocalTax1IsNotUsedDesc=No use otro tipo de impuesto (que no sea el IVA) @@ -734,7 +697,7 @@ CalcLocaltax2Desc=Los informes de impuestos locales son el total de compras de i CalcLocaltax3Desc=Los informes de impuestos locales son el total de las ventas de impuestos locales LabelUsedByDefault=Etiqueta usada por defecto si no se puede encontrar traducción para el código LabelOnDocuments=Etiqueta en documentos -NbOfDays=Nb de días +NbOfDays=N° de días AtEndOfMonth=Al final del mes CurrentNext=Actual / Siguiente Offset=Compensar @@ -749,11 +712,11 @@ DatabasePort=Puerto de base DatabaseUser=Usuario de la base DatabasePassword=Contraseña de la base Tables=Mesas -NbOfRecord=Nb de registros +NbOfRecord=N° de registros DriverType=Tipo de controlador SummarySystem=Resumen de información del sistema SummaryConst=Lista de todos los parámetros de configuración de Dolibarr -MenuCompanySetup=Empresa / Organización +MenuCompanySetup=Empresa/Organización DefaultMenuManager=Administrador de menú estándar DefaultMenuSmartphoneManager=Administrador de menú de teléfono inteligente Skin=Tema de la piel @@ -767,11 +730,9 @@ PermanentLeftSearchForm=Formulario de búsqueda permanente en el menú de la izq DefaultLanguage=Lenguaje predeterminado para usar (código de idioma) EnableMultilangInterface=Habilitar interfaz multilingüe EnableShowLogo=Mostrar logo en el menú de la izquierda -CompanyInfo=Información de la empresa / organización -CompanyIds=Identidades de empresa / organización +CompanyInfo=Información empresa/organización +CompanyIds=Identidades de empresa/organización CompanyName=Nombre -CompanyZip=Cremallera -CompanyTown=Pueblo CompanyCurrency=Moneda principal DoNotSuggestPaymentMode=No sugiera NoActiveBankAccountDefined=No se definió una cuenta bancaria activa @@ -784,7 +745,7 @@ Delays_MAIN_DELAY_ACTIONS_TODO=Tolerancia de retraso (en días) antes de la aler Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Tolerancia de retraso (en días) antes de que la alerta en el proyecto no se cierre a tiempo Delays_MAIN_DELAY_TASKS_TODO=Tolerancia de retraso (en días) antes de la alerta en las tareas planificadas (tareas del proyecto) aún no completada Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Tolerancia de retardo (en días) antes de la alerta en pedidos no procesados ​​todavía -Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Tolerancia de retraso (en días) antes de la alerta en pedidos de proveedores aún no procesados +Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Tolerancia de retraso (en días) antes de la alerta en pedidos a proveedores aún no procesados Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Tolerancia de retraso antes de la alerta (en días) sobre cotizaciones a cerrar Delays_MAIN_DELAY_PROPALS_TO_BILL=Tolerancia de retraso antes de la alerta (en días) sobre cotizaciones no facturadas Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Retraso de tolerancia (en días) antes de la alerta en los servicios para activar @@ -809,7 +770,7 @@ InfoDatabase=Acerca de la base InfoPerf=Sobre representaciones BrowserOS=Sistema operativo del navegador ListOfSecurityEvents=Lista de eventos de seguridad de Dolibarr -LogEventDesc=Puede habilitar aquí el registro de eventos de seguridad de Dolibarr. Los administradores pueden ver su contenido a través del menú Herramientas del sistema - Auditoría . Advertencia, esta característica puede consumir una gran cantidad de datos en la base de datos. +LogEventDesc=Puede habilitar aquí el registro de eventos de seguridad de Dolibarr. Los administradores pueden ver su contenido a través del menú Herramientas del sistema - Auditoría. Advertencia, esta característica puede consumir una gran cantidad de datos en la base de datos. AreaForAdminOnly=Los usuarios administradores solo pueden configurar los parámetros de configuración. SystemInfoDesc=La información del sistema es información técnica miscelánea que obtienes en modo solo lectura y visible solo para los administradores. SystemAreaForAdminOnly=Esta área está disponible solo para usuarios administradores. Ninguno de los permisos de Dolibarr puede reducir este límite. @@ -827,7 +788,7 @@ TriggerAlwaysActive=Los activadores en este archivo están siempre activos, cual TriggerActiveAsModuleActive=Los disparadores en este archivo están activos ya que el módulo %s está habilitado. GeneratedPasswordDesc=Define aquí qué regla quieres usar para generar una nueva contraseña si pides tener contraseña generada automáticamente DictionaryDesc=Inserta todos los datos de referencia. Puede agregar sus valores a los valores predeterminados. -ConstDesc=Esta página le permite editar todos los demás parámetros no disponibles en páginas anteriores. Estos son principalmente parámetros reservados para desarrolladores o resolución avanzada de problemas. Para obtener una lista de opciones, marque aquí . +ConstDesc=Esta página le permite editar todos los demás parámetros no disponibles en páginas anteriores. Estos son principalmente parámetros reservados para desarrolladores o resolución avanzada de problemas. Para obtener una lista de opciones revise aquí. MiscellaneousDesc=Todos los demás parámetros relacionados con la seguridad se definen aquí. LimitsSetup=Límites / configuración de precisión LimitsDesc=Puede definir los límites, las precisiones y las optimizaciones utilizadas por Dolibarr aquí @@ -857,7 +818,7 @@ WeekStartOnDay=Primer dia de la semana RunningUpdateProcessMayBeRequired=Parece que es necesario ejecutar el proceso de actualización (la versión de programas %s difiere de la de la base de datos %s) YouMustRunCommandFromCommandLineAfterLoginToUser=Debe ejecutar este comando desde la línea de comando después de iniciar sesión en un shell con el usuario %s o debe agregar la opción -W al final de la línea de comandos para proporcionar una contraseña de %s. DownloadMoreSkins=Más pieles para descargar -SimpleNumRefModelDesc=Devuelve el número de referencia con el formato %syymm-nnnn donde yy es año, mm es mes y nnnn es una secuencia sin orificio y sin reinicio +SimpleNumRefModelDesc=Devuelve el número de referencia con el formato %syymm-nnnn donde yy es año, mm es mes y nnnn es una secuencia sin saltos ni reinicio ShowProfIdInAddress=Mostrar id. Profesional con direcciones en documentos ShowVATIntaInAddress=Ocultar IVA Intra num con direcciones en documentos MAIN_DISABLE_METEO=Desactivar vista meteo @@ -872,13 +833,12 @@ MAIN_PROXY_PASS=Contraseña para usar el servidor proxy DefineHereComplementaryAttributes=Defina aquí todos los atributos, que aún no están disponibles de manera predeterminada, y que desea que sean compatibles con %s. ExtraFields=Atributos complementarios ExtraFieldsLines=Atributos complementarios (líneas) -ExtraFieldsLinesRec=Atributos complementarios (líneas de facturas de plantillas) -ExtraFieldsThirdParties=Atributos complementarios (tercera parte) -ExtraFieldsContacts=Atributos complementarios (contacto / dirección) +ExtraFieldsLinesRec=Atributos complementarios (líneas plantillas de facturas) +ExtraFieldsThirdParties=Atributos complementarios (terceros) +ExtraFieldsContacts=Atributos complementarios (contacto/dirección) ExtraFieldsMember=Atributos complementarios (miembro) ExtraFieldsMemberType=Atributos complementarios (tipo de miembro) ExtraFieldsCustomerInvoices=Atributos complementarios (facturas) -ExtraFieldsCustomerInvoicesRec=Atributos complementarios (facturas de plantillas) ExtraFieldsSupplierOrders=Atributos complementarios (pedidos) ExtraFieldsSupplierInvoices=Atributos complementarios (facturas) ExtraFieldsProject=Atributos complementarios (proyectos) @@ -925,7 +885,7 @@ RuleForGeneratedPasswords=Regla para generar contraseñas sugeridas o validar co DisableForgetPasswordLinkOnLogonPage=No mostrar el enlace "Olvidé mi contraseña" en la página de inicio de sesión UsersSetup=Configuración del módulo de usuarios UserMailRequired=Se requiere correo electrónico para crear un nuevo usuario -HRMSetup=Configuración del módulo HRM +HRMSetup=Configuración del módulo RRHH CompanySetup=Configuración del módulo de empresas CompanyCodeChecker=Módulo para la generación y verificación de código de terceros (cliente o proveedor) AccountCodeManager=Módulo para la generación de códigos contables (cliente o proveedor) @@ -969,7 +929,7 @@ BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Preguntar por el destino de la cuent OrdersSetup=Configuración de administración de pedidos OrdersNumberingModules=Modelos de numeración de pedidos OrdersModelModule=Modelos de documentos de pedido -WatermarkOnDraftOrders=Marca de agua en los borradores de órdenes (ninguna si está vacía) +WatermarkOnDraftOrders=Marca de agua a borradores de pedidos (ninguna si está vacía) ShippableOrderIconInList=Agregue un ícono en la lista de Pedidos que indique si el pedido se puede enviar BANK_ASK_PAYMENT_BANK_DURING_ORDER=Preguntar por el destino de la cuenta bancaria de la orden InterventionsSetup=Configuración del módulo de intervenciones @@ -1047,23 +1007,21 @@ LDAPFieldPasswordNotCrypted=La contraseña no está encriptada LDAPFieldPasswordExample=Ejemplo: userPassword LDAPFieldCommonNameExample=Ejemplo: cn LDAPFieldNameExample=Ejemplo: sn -LDAPFieldFirstName=Nombre de pila +LDAPFieldFirstName=Primer nombre LDAPFieldFirstNameExample=Ejemplo: givenName LDAPFieldMail=Dirección de correo electrónico LDAPFieldMailExample=Ejemplo: correo LDAPFieldPhone=Número de teléfono profesional LDAPFieldPhoneExample=Ejemplo: número telefonico LDAPFieldHomePhone=Número de teléfono personal -LDAPFieldHomePhoneExample=Ejemplo: teléfono de casa +LDAPFieldHomePhoneExample=Ejemplo: teléfono particular LDAPFieldMobile=Teléfono celular LDAPFieldMobileExample=Ejemplo: móvil LDAPFieldFax=Número de fax LDAPFieldFaxExample=Ejemplo: facsimiletelephonenumber LDAPFieldAddress=Calle LDAPFieldAddressExample=Ejemplo: calle -LDAPFieldZip=Cremallera LDAPFieldZipExample=Ejemplo: código postal -LDAPFieldTown=Pueblo LDAPFieldTownExample=Ejemplo: l LDAPFieldDescriptionExample=Ejemplo: descripción LDAPFieldNotePublic=Nota pública @@ -1298,7 +1256,7 @@ ListOfNotificationsPerUser=Lista de notificaciones por usuario * ListOfNotificationsPerUserOrContact=Lista de notificaciones por usuario * o por contacto ** ListOfFixedNotifications=Lista de notificaciones fijas GoOntoUserCardToAddMore=Vaya a la pestaña "Notificaciones" de un usuario para agregar o eliminar notificaciones para los usuarios -GoOntoContactCardToAddMore=Vaya a la pestaña "Notificaciones" de un tercero para agregar o eliminar notificaciones de contactos / direcciones +GoOntoContactCardToAddMore=Vaya a la pestaña "Notificaciones" de un tercero para agregar o eliminar notificaciones de contactos/direcciones Threshold=Límite BackupDumpWizard=Asistente para compilar un archivo de volcado de copia de seguridad SomethingMakeInstallFromWebNotPossible=La instalación del módulo externo no es posible desde la interfaz web por el siguiente motivo: @@ -1374,12 +1332,12 @@ DetectionNotPossible=La detección no es posible UrlToGetKeyToUseAPIs=URL para obtener token para utilizar API (una vez que se ha recibido el token, se guarda en la tabla de usuario de la base de datos y se debe proporcionar en cada llamada de API) ListOfAvailableAPIs=Lista de API disponibles activateModuleDependNotSatisfied=El módulo "%s" depende del módulo "%s" que falta, por lo que el módulo "%1$s" puede no funcionar correctamente. Instale el módulo "%2$s" o deshabilite el módulo "%1$s" si quiere estar a salvo de cualquier sorpresa -CommandIsNotInsideAllowedCommands=El comando que intenta ejecutar no está dentro de la lista de comandos permitidos definidos en el parámetro $ dolibarr_main_restrict_os_commands en el archivo conf.php . +CommandIsNotInsideAllowedCommands=El comando que intenta ejecutar no está dentro de la lista de comandos permitidos definidos en el parámetro $dolibarr_main_restrict_os_commands en el archivo conf.php. LandingPage=Página de destino SamePriceAlsoForSharedCompanies=Si utiliza un módulo multicompañía, con la opción "precio único", el precio también será el mismo para todas las empresas si los productos se comparten entre entornos ModuleEnabledAdminMustCheckRights=Módulo ha sido activado. Los permisos para los módulos activados se otorgaron solo a los usuarios administradores. Es posible que deba otorgar permisos a otros usuarios o grupos manualmente si es necesario. UserHasNoPermissions=Este usuario no tiene permiso definido -TypeCdr=Use "Ninguno" si la fecha del plazo de pago es la fecha de la factura más un delta en días (delta es el campo "Nb de días")
    Utilice "Al final del mes" si, después del delta, la fecha debe aumentarse para llegar al final del mes (+ un "Offset" opcional en días)
    Utilice "Current / Next" para que la fecha del plazo de pago sea la primera Nth del mes (N se almacena en el campo "Nb of days") +TypeCdr=Use "Ninguno" si la fecha del plazo de pago es la fecha de la factura más un delta en días (delta es el campo "N° de días")
    Utilice "Al final del mes" si, después del delta, la fecha debe aumentarse para llegar al final del mes (+ un "Offset" opcional en días)
    Utilice "Current / Next" para que la fecha del plazo de pago sea la primera Nth del mes (N se almacena en el campo "N° of days") BaseCurrency=Moneda de referencia de la empresa (entre en la configuración de la empresa para cambiar esto) WarningNoteModulePOSForFrenchLaw=Este módulo %s cumple con las leyes francesas (Loi Finance 2016) porque el módulo Registros no reversibles se activa automáticamente. WarningInstallationMayBecomeNotCompliantWithLaw=Intenta instalar el módulo %s que es un módulo externo. Activar un módulo externo significa que confía en el editor del módulo y está seguro de que este módulo no altera negativamente el comportamiento de su aplicación y cumple con las leyes de su país (%s). Si el módulo trae una característica no legal, usted se convierte en responsable del uso de un software no legal. @@ -1387,3 +1345,4 @@ ResourceSetup=Recurso de configuración del módulo UseSearchToSelectResource=Use un formulario de búsqueda para elegir un recurso (en lugar de una lista desplegable). DisabledResourceLinkUser=Enlace de recurso desactivado al usuario DisabledResourceLinkContact=Enlace de recurso desactivado al contacto +ConfirmUnactivation=Confirmar restablecimiento del módulo diff --git a/htdocs/langs/es_CL/agenda.lang b/htdocs/langs/es_CL/agenda.lang index be3fa584f9e..8b8203105cd 100644 --- a/htdocs/langs/es_CL/agenda.lang +++ b/htdocs/langs/es_CL/agenda.lang @@ -67,7 +67,7 @@ DefaultWorkingDays=Rango predeterminado de días laborables en la semana (Ejempl DefaultWorkingHours=Horas de trabajo predeterminadas en el día (Ejemplo: 9-18) ExtSites=Importar calendarios externos ExtSitesEnableThisTool=Mostrar los calendarios externos (definidos en la configuración global) en la agenda. No afecta los calendarios externos definidos por los usuarios. -AgendaExtNb=Calendario nb %s +AgendaExtNb=Calendario N° %s ExtSiteUrlAgenda=URL para acceder al archivo .ical DateActionBegin=Fecha del evento de inicio ConfirmCloneEvent=¿Seguro que quieres clonar el evento %s? diff --git a/htdocs/langs/es_CL/banks.lang b/htdocs/langs/es_CL/banks.lang index 203e7fa53b0..3134b917ba1 100644 --- a/htdocs/langs/es_CL/banks.lang +++ b/htdocs/langs/es_CL/banks.lang @@ -1,9 +1,9 @@ # Dolibarr language file - Source file is en_US - banks -MenuBankCash=Banco / efectivo +MenuBankCash=Banco/Caja MenuVariousPayment=Pagos diversos MenuNewVariousPayment=Nuevo pago misceláneo BankAccount=cuenta bancaria -BankAccounts=cuentas bancarias +BankAccounts=Cuentas bancarias AccountRef=Ref de cuenta financiera AccountLabel=Etiqueta de cuenta financiera CashAccount=Cuenta de efectivo @@ -28,9 +28,6 @@ AccountStatementShort=Declaración AccountStatements=Estados de cuenta LastAccountStatements=Últimos estados de cuenta IOMonthlyReporting=Informes mensuales -BankAccountDomiciliation=Dirección de cuenta -BankAccountOwner=Nombre del propietario de la cuenta -BankAccountOwnerAddress=Dirección del propietario de la cuenta RIBControlError=La verificación de integridad de los valores falla. Esto significa que la información para este número de cuenta no está completa o es incorrecta (ver país, números e IBAN). CreateAccount=Crear una cuenta MenuNewFinancialAccount=Nueva cuenta financiera @@ -72,7 +69,7 @@ BankLineConciliated=Entrada reconciliada CustomerInvoicePayment=Pago del Cliente SupplierInvoicePayment=Pago del proveedor WithdrawalPayment=Pago de retiros -SocialContributionPayment=Pago de impuestos sociales / fiscales +SocialContributionPayment=Pago de impuestos sociales/fiscales BankTransfer=transferencia bancaria BankTransfers=transferencias bancarias TransferDesc=Transferencia de una cuenta a otra, Dolibarr escribirá dos registros (un débito en la cuenta de origen y un crédito en la cuenta de destino. Se usará la misma cantidad (excepto el signo), la etiqueta y la fecha para esta transacción) @@ -86,7 +83,7 @@ ConfirmDeleteCheckReceipt=¿Seguro que quieres eliminar este recibo de cheque? BankChecks=Cheques bancarios BankChecksToReceipt=Cheques en espera de depósito ShowCheckReceipt=Mostrar recibo de depósito de cheques -NumberOfCheques=Nb de cheque +NumberOfCheques=N° de cheque DeleteTransaction=Eliminar la entrada ConfirmDeleteTransaction=¿Seguro que quieres eliminar esta entrada? ThisWillAlsoDeleteBankRecord=Esto también eliminará la entrada bancaria generada @@ -107,7 +104,6 @@ InputReceiptNumber=Elija el extracto bancario relacionado con la conciliación. EventualyAddCategory=Eventualmente, especifique una categoría en la cual clasificar los registros ToConciliate=¿Para reconciliar? ThenCheckLinesAndConciliate=Luego, verifique las líneas presentes en el extracto bancario y haga clic -DefaultRIB=Predeterminado BAN AllRIB=Todos BAN NoBANRecord=Sin registro de BAN DeleteARib=Eliminar registro BAN diff --git a/htdocs/langs/es_CL/bills.lang b/htdocs/langs/es_CL/bills.lang index b760cd69f0f..0110156b9ef 100644 --- a/htdocs/langs/es_CL/bills.lang +++ b/htdocs/langs/es_CL/bills.lang @@ -1,5 +1,5 @@ # Dolibarr language file - Source file is en_US - bills -BillsCustomers=Facturas del cliente +BillsCustomers=Facturas de cliente BillsCustomer=Factura del cliente BillsCustomersUnpaid=Facturas pendientes de pago de los clientes BillsCustomersUnpaidForCompany=Facturas impagadas de los clientes para %s @@ -7,6 +7,8 @@ BillsSuppliersUnpaid=Facturas pendientes de pago del proveedor BillsSuppliersUnpaidForCompany=Facturas pendientes de pago para %s BillsLate=Pagos atrasados BillsStatistics=Estadísticas de facturas de clientes +DisabledBecauseDispatchedInBookkeeping=Desactivado porque la factura se envió a la contabilidad +DisabledBecauseNotLastInvoice=Desactivado porque la factura no se puede borrar. Algunas facturas se registraron después de esta y crearán agujeros en el contador. DisabledBecauseNotErasable=Deshabilitado porque no se puede borrar InvoiceStandardDesc=Este tipo de factura es la factura común. InvoiceDepositDesc=Este tipo de factura se realiza cuando se ha recibido un anticipo. @@ -15,10 +17,10 @@ InvoiceProFormaAsk=Factura de proforma InvoiceProFormaDesc= Factura proforma es una imagen de una factura verdadera pero no tiene valor contable. InvoiceReplacement=Factura de reemplazo InvoiceReplacementAsk=Reemplazo de factura por factura -InvoiceReplacementDesc= La factura de reemplazo se utiliza para cancelar y reemplazar completamente una factura sin pago recibido.

    Nota: Solo se pueden reemplazar las facturas sin pago. Si la factura que reemplaza aún no está cerrada, se cerrará automáticamente a 'abandonada'. +InvoiceReplacementDesc=La factura de reemplazo se utiliza para cancelar y reemplazar completamente una factura sin pago recibido.

    Nota: Solo se pueden reemplazar las facturas sin pago. Si la factura que reemplaza aún no está cerrada, se cerrará automáticamente a 'abandonada'. InvoiceAvoir=Nota de crédito InvoiceAvoirAsk=Nota de crédito para corregir la factura -InvoiceAvoirDesc=La nota de crédito es una factura negativa utilizada para resolver el hecho de que una factura tiene una cantidad diferente a la cantidad realmente pagada (porque el cliente pagó demasiado por error o no pagó por completo ya que devolvió algunos productos para ejemplo). +InvoiceAvoirDesc=La nota de crédito es una factura negativa utilizada para resolver el hecho de que una factura tiene una cantidad diferente a la cantidad realmente pagada (porque el cliente pagó demasiado por error o no pagó por completo ya que devolvió algunos productos para ejemplo). invoiceAvoirWithLines=Crear nota de crédito con líneas de la factura de origen invoiceAvoirWithPaymentRestAmount=Crear nota de crédito con la factura pendiente de pago de origen invoiceAvoirLineWithPaymentRestAmount=Nota de crédito por el monto restante no pagado @@ -46,7 +48,7 @@ CustomerInvoicePaymentBack=Pago de vuelta PaymentsBack=Pagos de vuelta paymentInInvoiceCurrency=en la moneda de las facturas DeletePayment=Eliminar pago -ConfirmDeletePayment=Are you sure you want to delete this payment ? +ConfirmDeletePayment=¿Seguro que quieres eliminar este pago? ConfirmConvertToReduc=¿Desea convertir este %s en un descuento absoluto?
    El importe se guardará entre todos los descuentos y podría utilizarse como descuento para una factura actual o futura para este cliente. SupplierPayments=Pagos de proveedores ReceivedCustomersPayments=Pagos recibidos de los clientes @@ -121,12 +123,12 @@ RecurringInvoiceTemplate=Plantilla / factura recurrente NoQualifiedRecurringInvoiceTemplateFound=No hay una factura recurrente de la plantilla calificada para la generación. FoundXQualifiedRecurringInvoiceTemplate=Se encontró %s factura (s) de plantilla recurrente calificadas para la generación. NotARecurringInvoiceTemplate=No es una factura de plantilla recurrente -LatestTemplateInvoices=Las últimas facturas de plantilla %s -LatestCustomerTemplateInvoices=Las últimas facturas de plantilla de cliente %s -LatestSupplierTemplateInvoices=Las últimas facturas de plantilla de proveedor %s +LatestTemplateInvoices=%s últimas plantillas de facturas +LatestCustomerTemplateInvoices=%s últimas plantillas de facturas de cliente +LatestSupplierTemplateInvoices=%s últimas plantillas de facturas de proveedor LastCustomersBills=Últimas facturas de clientes %s LastSuppliersBills=Últimas facturas del proveedor %s -AllCustomerTemplateInvoices=Todas las facturas de plantilla +AllCustomerTemplateInvoices=Todas las plantillas de facturas DraftBills=Borrador de facturas CustomersDraftInvoices=Factura del cliente SuppliersDraftInvoices=Facturas de giro del proveedor @@ -156,8 +158,8 @@ ConfirmCustomerPayment=¿Confirma esta entrada de pago para %s %s? ConfirmSupplierPayment=¿Confirma esta entrada de pago para %s %s? ConfirmValidatePayment=¿Seguro que quieres validar este pago? No se puede hacer ningún cambio una vez que se valida el pago. UnvalidateBill=Desvalidar factura -NumberOfBills=Nb de facturas -NumberOfBillsByMonth=Nb de facturas por mes +NumberOfBills=N° de facturas +NumberOfBillsByMonth=N° de facturas por mes AmountOfBills=Cantidad de facturas AmountOfBillsByMonthHT=Importe de facturas por mes (neto de impuestos) ShowSocialContribution=Mostrar impuesto social / fiscal @@ -192,7 +194,7 @@ SendReminderBillByMail=Enviar recordatorio por correo electrónico RelatedCommercialProposals=Cotizaciones asociadas RelatedRecurringCustomerInvoices=Facturas de clientes recurrentes relacionadas MenuToValid=Para valido -DateMaxPayment=Pago debido en +DateMaxPayment=Compromiso de pago el DateInvoice=Fecha de la factura DatePointOfTax=Punto de impuesto NoInvoice=Sin factura @@ -205,7 +207,7 @@ SetMode=Establecer el modo de pago SetRevenuStamp=Establecer sello de ingresos Billed=Pagado RepeatableInvoice=Factura de la plantilla -RepeatableInvoices=Facturas de plantilla +RepeatableInvoices=Plantillas de factura Repeatable=Modelo ChangeIntoRepeatableInvoice=Convertir en factura de plantilla CreateRepeatableInvoice=Crear factura de plantilla @@ -214,7 +216,9 @@ CustomersInvoicesAndInvoiceLines=Facturas del cliente y líneas de la factura CustomersInvoicesAndPayments=Facturas y pagos de clientes ExportDataset_invoice_1=Lista de facturas del cliente y líneas de la factura ExportDataset_invoice_2=Facturas y pagos de clientes +ReductionShort=Dcto. Reductions=Reducciones +ReductionsShort=Dcto. AddDiscount=Crear descuento AddRelativeDiscount=Crear descuentos relativos AddGlobalDiscount=Crea un descuento absoluto @@ -253,8 +257,8 @@ WatermarkOnDraftBill=Marca de agua en borradores de facturas (nada si está vac InvoiceNotChecked=Sin factura seleccionada ConfirmCloneInvoice=¿Seguro que quieres clonar esta factura %s? DisabledBecauseReplacedInvoice=Acción deshabilitada porque la factura ha sido reemplazada -DescTaxAndDividendsArea=Esta área presenta un resumen de todos los pagos realizados para gastos especiales. Solo registro con pago durante el año fijo se incluyen aquí. -NbOfPayments=Nb de pagos +DescTaxAndDividendsArea=Esta área presenta un resumen de todos los pagos realizados para pagos especiales. Solo registro con pago durante el año fijo se incluyen aquí. +NbOfPayments=N° de pagos SplitDiscount=Split de descuento en dos ConfirmSplitDiscount=¿Seguro que quieres dividir este descuento del %s %s en 2 descuentos más bajos? TypeAmountOfEachNewDiscount=Cantidad de entrada para cada una de las dos partes: @@ -275,21 +279,17 @@ ListOfNextSituationInvoices=Lista de próximas facturas de situación FrequencyUnit=Unidad de frecuencia toolTipFrequency=Ejemplos:
    Establecer 7, Día : dar una nueva factura cada 7 días
    Establecer 3, Mes : dar una nueva factura cada 3 meses NextDateToExecution=Fecha para la próxima generación de facturas -NextDateToExecutionShort=Fecha próxima generación DateLastGeneration=Fecha de última generación -DateLastGenerationShort=Fecha última generación -MaxPeriodNumber=Máx nb de generación de factura -NbOfGenerationDone=Nb de generación de facturas ya hecho -NbOfGenerationDoneShort=Nb de generación hecho -MaxGenerationReached=Máximo nb de generaciones alcanzadas +MaxPeriodNumber=Máx N° de generación de factura +NbOfGenerationDone=N° de generación de facturas ya hecho +NbOfGenerationDoneShort=N° de generación hecho +MaxGenerationReached=Máximo N° de generaciones alcanzadas GeneratedFromRecurringInvoice=Generado a partir de la factura recurrente de la plantilla %s DateIsNotEnough=Fecha no alcanzada todavía InvoiceGeneratedFromTemplate=Factura %s generada a partir de la factura recurrente de la plantilla %s WarningInvoiceDateInFuture=Advertencia, la fecha de la factura es más alta que la fecha actual WarningInvoiceDateTooFarInFuture=Advertencia, la fecha de la factura está muy lejos de la fecha actual ViewAvailableGlobalDiscounts=Ver descuentos disponibles -PaymentConditionShortRECEP=Debido a la recepción -PaymentConditionRECEP=Debido a la recepción PaymentConditionShort30D=30 dias PaymentCondition30D=30 dias PaymentConditionShort30DENDMONTH=30 días de fin de mes @@ -315,8 +315,6 @@ PaymentTypePRE=Orden de pago de débito directo PaymentTypeShortPRE=Orden de pago de débito PaymentTypeCB=Tarjeta de crédito PaymentTypeShortCB=Tarjeta de crédito -PaymentTypeCHQ=Comprobar -PaymentTypeShortCHQ=Comprobar PaymentTypeTIP=TIP (Documentos contra pago) PaymentTypeVAD=Pago en línea PaymentTypeShortVAD=Pago en línea @@ -329,15 +327,15 @@ BankAccountNumberKey=Llave Residence=Débito directo IBANNumber=Número IBAN BIC=BIC / SWIFT -BICNumber=Número BIC / SWIFT +BICNumber=Identificador BIC/SWIFT ExtraInfos=Infos adicionales RegulatedOn=Regulado en ChequeNumber=Verificar N ° ChequeOrTransferNumber=Verificar / Transferir N ° ChequeBordereau=Verifique el horario -ChequeMaker=Comprobar / Transferir transmisor +ChequeMaker=Portador Cheque/Transferencia ChequeBank=Banco de cheque -CheckBank=Comprobar +CheckBank=Cheque PrettyLittleSentence=Acepte la cantidad de pagos adeudados por cheques emitidos a mi nombre como miembro de una asociación contable aprobada por la Administración Fiscal. IntracommunityVATNumber=Número intracomunitario de IVA PaymentByChequeOrderedTo=El pago del cheque (incluido el impuesto) se paga a %s enviar a @@ -420,6 +418,3 @@ DeleteRepeatableInvoice=Eliminar factura de plantilla ConfirmDeleteRepeatableInvoice=¿Estás seguro de que deseas eliminar la factura de la plantilla? CreateOneBillByThird=Cree una factura por un tercero (de lo contrario, una factura por pedido) BillCreated=%s factura (s) creada (s) -StatusOfGeneratedDocuments=Estado de la generación de documentos -DoNotGenerateDoc=No generar archivo de documento -AutogenerateDoc=Generar automáticamente archivo de documento diff --git a/htdocs/langs/es_CL/boxes.lang b/htdocs/langs/es_CL/boxes.lang index e81ceefcd2f..ef99d84fefd 100644 --- a/htdocs/langs/es_CL/boxes.lang +++ b/htdocs/langs/es_CL/boxes.lang @@ -1,29 +1,25 @@ # Dolibarr language file - Source file is en_US - boxes -BoxLoginInformation=Información Entrar +BoxLoginInformation=Información Login BoxLastRssInfos=Rss información BoxLastProducts=Últimos %s productos / servicios -BoxLastProductsInContract=Últimos %s productos / servicios contratados BoxLastSupplierBills=Últimas facturas del proveedor BoxLastCustomerBills=Últimas facturas de clientes BoxOldestUnpaidCustomerBills=Las facturas impagas más antiguas de los clientes BoxOldestUnpaidSupplierBills=Las facturas impagas más antiguas de proveedores BoxLastProposals=Últimas propuestas comerciales -BoxLastProspects=Últimas perspectivas modificadas +BoxLastProspects=Últimas prospectos modificados BoxLastCustomerOrders=Últimos pedidos de clientes -BoxLastContacts=Últimos contactos / direcciones BoxCurrentAccounts=Abre el saldo de cuentas BoxTitleLastRssInfos=Las últimas %s noticias de %s -BoxTitleLastProducts=Últimos productos/servicios %s modificados -BoxTitleProductsAlertStock=Productos en stock de alerta -BoxTitleLastCustomersOrProspects=Los últimos %s clientes o prospectos +BoxTitleProductsAlertStock=Productos con alerta de stock +BoxTitleLastCustomersOrProspects=Últimos %s clientes o prospectos BoxTitleLastCustomerBills=Últimas facturas de clientes %s BoxTitleLastSupplierBills=Últimas facturas del proveedor %s -BoxTitleLastModifiedProspects=Últimas %s perspectivas modificadas +BoxTitleLastModifiedProspects=Últimos %s prospectos modificados BoxTitleLastFicheInter=Últimas intervenciones modificadas con %s -BoxTitleOldestUnpaidCustomerBills=Las facturas pendientes más antiguas del cliente %s -BoxTitleOldestUnpaidSupplierBills=Las facturas de proveedor impagas %s más antiguas -BoxTitleCurrentAccounts=Abre saldos de cuentas -BoxTitleLastModifiedContacts=Últimos %s contactos / direcciones modificados +BoxTitleOldestUnpaidCustomerBills=Las %s facturas más antiguas impagas por cliente +BoxTitleOldestUnpaidSupplierBills=Las %s facturas más antiguas impagas a proveedor +BoxTitleCurrentAccounts=Cuentas con balances abiertos BoxOldestExpiredServices=Servicios expirados activos más antiguos BoxLastExpiredServices=Últimos %s contactos más antiguos con servicios activos caducados BoxTitleLastActionsToDo=Últimas %s acciones para hacer @@ -46,19 +42,16 @@ NoUnpaidSupplierBills=Sin facturas impagas de proveedores NoModifiedSupplierBills=Sin facturas registradas del proveedor NoRecordedProducts=Sin productos / servicios grabados NoRecordedProspects=Sin perspectivas registradas -NoContractedProducts=No hay productos / servicios contratados +NoContractedProducts=No hay productos/servicios contratados NoRecordedContracts=Sin contratos grabados NoRecordedInterventions=Sin intervenciones registradas -BoxLatestSupplierOrders=Últimos pedidos de proveedores BoxCustomersInvoicesPerMonth=Facturas de clientes por mes -BoxSuppliersOrdersPerMonth=Pedidos de proveedores por mes BoxProposalsPerMonth=Cotizaciones por mes NoTooLowStockProducts=Ningún producto bajo el límite de stock bajo BoxProductDistribution=Distribución de productos / servicios -BoxTitleLastModifiedSupplierBills=Últimas facturas de proveedor modificadas %s +BoxTitleLastModifiedSupplierBills=Últimas %s facturas de proveedor modificadas BoxTitleLatestModifiedSupplierOrders=Últimas %s órdenes de proveedor modificadas BoxTitleLastModifiedCustomerBills=Últimas %s facturas modificadas del cliente -BoxTitleLastModifiedCustomerOrders=Últimas %s pedidos de clientes modificados BoxTitleLastModifiedPropals=Últimas %s propuestas modificadas ForCustomersInvoices=Facturas de clientes ForProposals=Cotizaciones diff --git a/htdocs/langs/es_CL/commercial.lang b/htdocs/langs/es_CL/commercial.lang index a749504a326..20ee2378ddf 100644 --- a/htdocs/langs/es_CL/commercial.lang +++ b/htdocs/langs/es_CL/commercial.lang @@ -16,14 +16,14 @@ ShowCustomer=Mostrar cliente ShowProspect=Mostrar perspectiva ListOfProspects=Lista de prospectos ListOfCustomers=Lista de clientes -LastActionsToDo=Older %s acciones no completadas +LastDoneTasks=%s últimas acciones completadas +LastActionsToDo=%s acciones más antiguas no completadas DoneAndToDoActions=Eventos completados y pendientes DoneActions=Eventos completados ToDoActions=Eventos incompletos SendPropalRef=Envío de la cotización %s SendOrderRef=Presentación del pedido %s StatusNotApplicable=No aplica -StatusActionToDo=Que hacer StatusActionDone=Completar StatusActionInProcess=En proceso TasksHistoryForThisContact=Eventos para este contacto @@ -40,7 +40,7 @@ ActionAC_RDV=Reuniones ActionAC_INT=Intervención en el sitio ActionAC_FAC=Enviar la factura del cliente por correo ActionAC_REL=Enviar la factura del cliente por correo (recordatorio) -ActionAC_CLO=Cerca +ActionAC_CLO=Cerrar ActionAC_EMAILING=Enviar correo masivo ActionAC_COM=Enviar la orden del cliente por correo ActionAC_SHIP=Enviar el envío por correo @@ -54,5 +54,4 @@ Stats=Estadísticas de ventas StatusProsp=Estado de la perspectiva DraftPropals=Cotizaciones borrador WelcomeOnOnlineSignaturePage=Bienvenido a la página para aceptar propuestas comerciales de %s -ThisScreenAllowsYouToSignDocFrom=Esta pantalla le permite aceptar y firmar, o rechazar, una propuesta de cotización / comercial -SignatureProposalRef=Firma del presupuesto / propuesta comercial %s +ThisScreenAllowsYouToSignDocFrom=Esta pantalla le permite aceptar y firmar, o rechazar, un presupuesto/propuesta comercial diff --git a/htdocs/langs/es_CL/companies.lang b/htdocs/langs/es_CL/companies.lang index 999158baeab..22f96498a73 100644 --- a/htdocs/langs/es_CL/companies.lang +++ b/htdocs/langs/es_CL/companies.lang @@ -15,13 +15,14 @@ ProspectionArea=Área de Prospección IdThirdParty=Id tercero IdCompany=ID de la compañía IdContact=ID de contacto -Contacts=Contactos / Direcciones +Contacts=Contactos/Direcciones ThirdPartyContacts=Contactos de terceros ThirdPartyContact=Contacto / dirección de terceros AliasNames=Nombre de alias (comercial, marca registrada, ...) +AliasNameShort=Alias Companies=Compañías CountryIsInEEC=El país está dentro de la Comunidad Económica Europea -ThirdPartyName=Nombre de un tercero +ThirdPartyName=Nombre de tercero ThirdPartyEmail=Correo electrónico de terceros ThirdPartyProspects=Perspectivas ThirdPartyProspectsStats=Perspectivas @@ -34,14 +35,12 @@ ReportByCustomers=Informe de los clientes CivilityCode=Código de civilidad RegisteredOffice=Oficina registrada Lastname=Apellido -Firstname=Nombre de pila -UserTitle=Título +Firstname=Primer nombre NatureOfThirdParty=Naturaleza de un tercero State=Estado / Provincia CountryCode=Código de país CountryId=Identificación del país Call=Llamada -PhonePro=Prof. teléfono PhonePerso=Pers. teléfono No_Email=Rechazar correos electrónicos masivos Town=Ciudad @@ -87,9 +86,9 @@ ProfId2TN=Prof Id 2 (matrícula fiscal) ProfId3TN=Prof Id 3 (código de Douane) ProfId1US=ID del profesor VATIntra=Número de valor agregado -VATIntraShort=Número de valor agregado +VATIntraShort=Numero IVA VATIntraSyntaxIsValid=La sintaxis es valida -ProspectCustomer=Perspectiva / Cliente +ProspectCustomer=Prospecto/Cliente Prospect=Prospectar CustomerCard=Tarjeta Cliente CustomerRelativeDiscount=Descuento relativo del cliente @@ -104,7 +103,6 @@ CustomerAbsoluteDiscountMy=Descuentos absolutos (otorgados por usted) AddContactAddress=Crear contacto / dirección EditContactAddress=Editar contacto / dirección ContactId=ID de contacto -ContactsAddresses=Contactos / Direcciones NoContactDefinedForThirdParty=Sin contacto definido para este tercero NoContactDefined=Sin contacto definido DefaultContact=Contacto / dirección predeterminados @@ -121,8 +119,8 @@ ValidityControledByModule=Validez controlada por módulo ThisIsModuleRules=Estas son las reglas para este módulo ProspectToContact=Perspectiva de contactar CompanyDeleted=La compañía "%s" eliminada de la base de datos. -ListOfContacts=Lista de contactos / direcciones -ListOfContactsAddresses=Lista de contactos / direcciones +ListOfContacts=Lista de contactos/direcciones +ListOfContactsAddresses=Lista de contactos/direcciones ListOfThirdParties=Lista de terceros ShowCompany=Mostrar un tercero ContactsAllShort=Todo (Sin filtro) @@ -137,15 +135,14 @@ NoContactForAnyOrderOrShipments=Este contacto no es un contacto para ningún ped NoContactForAnyProposal=Este contacto no es contacto de ninguna cotización NoContactForAnyContract=Este contacto no es un contacto para ningún contrato NoContactForAnyInvoice=Este contacto no es un contacto para ninguna factura -NewContactAddress=Nuevo contacto / dirección EditCompany=Editar empresa ThisUserIsNot=Este usuario no es un prospecto, cliente ni proveedor -VATIntraCheck=Comprobar +VATIntraCheck=Cheque VATIntraCheckDesc=El enlace %s permite preguntar al servicio europeo de verificación de IVA. Se requiere un acceso externo a Internet desde el servidor para que este servicio funcione. VATIntraCheckableOnEUSite=Consultar el IVA intracomunitario en el sitio de la comisión europea VATIntraManualCheck=También puede verificar manualmente desde el sitio web europeo %s -ErrorVATCheckMS_UNAVAILABLE=Comprobar no es posible. El estado miembro no proporciona el servicio de verificación (%s). -NorProspectNorCustomer=Ni perspectiva, ni cliente +ErrorVATCheckMS_UNAVAILABLE=No es posible comprobar. El servicio de verificación no proporcionado por el estado miembro (%s). +NorProspectNorCustomer=Ni prospecto, ni cliente Staff=Personal ProspectLevel=Potencial prospectivo OthersNotLinkedToThirdParty=Otros, no vinculados a un tercero @@ -174,7 +171,6 @@ NoDolibarrAccess=Sin acceso a Dolibarr ExportDataset_company_1=Terceros (Empresas / fundaciones / personas físicas) y propiedades ExportDataset_company_2=Contactos y propiedades ImportDataset_company_1=Terceros (Empresas / fundaciones / personas físicas) y propiedades -ImportDataset_company_2=Contactos / Direcciones (de terceros o no) y atributos ImportDataset_company_3=Detalles del banco ImportDataset_company_4=Terceros / representantes de ventas (afectar a los representantes de ventas de los usuarios a las empresas) DeliveryAddress=Dirección de entrega diff --git a/htdocs/langs/es_CL/compta.lang b/htdocs/langs/es_CL/compta.lang index 7ccdd443385..a4c3095b546 100644 --- a/htdocs/langs/es_CL/compta.lang +++ b/htdocs/langs/es_CL/compta.lang @@ -1,5 +1,5 @@ # Dolibarr language file - Source file is en_US - compta -MenuFinancial=Pago de facturación +MenuFinancial=Facturación/Pagos TaxModuleSetupToModifyRules=Vaya a Configuración del módulo de impuestos para modificar las reglas de cálculo TaxModuleSetupToModifyRulesLT=Vaya a Configuración de la empresa para modificar las reglas de cálculo OptionMode=Opción para contabilidad @@ -26,9 +26,9 @@ Credit=Crédito Piece=Contabilidad Doc. AmountHTVATRealReceived=Neto recaudado AmountHTVATRealPaid=Neto pagado -VATToPay=IVA vende +VATToPay=IVA Debito VATReceived=Impuesto recibido -VATToCollect=Compras de impuestos +VATToCollect=IVA Crédito VATSummary=Balance de impuestos VATPaid=Impuesto pagado LT1Summary=Resumen de impuestos 2 @@ -57,17 +57,15 @@ SpecialExpensesArea=Área para todos los pagos especiales SocialContribution=Impuesto social o fiscal LabelContrib=Contribución de etiqueta TypeContrib=Tipo contribución -MenuSpecialExpenses=Gastos especiales MenuTaxAndDividends=Impuestos y dividendos -MenuSocialContributions=Impuestos sociales / fiscales MenuNewSocialContribution=Nuevo impuesto social / fiscal NewSocialContribution=Nuevo impuesto social / fiscal AddSocialContribution=Agregar impuesto social / fiscal -ContributionsToPay=Impuestos sociales / fiscales a pagar +ContributionsToPay=Impuestos sociales/fiscales a pagar AccountancyTreasuryArea=Área de Contabilidad / Tesorería PaymentCustomerInvoice=Pago de factura de cliente PaymentSupplierInvoice=Pago de factura del proveedor -PaymentSocialContribution=Pago de impuestos sociales / fiscales +PaymentSocialContribution=Pago de impuestos sociales/fiscales PaymentVat=Pago del IVA ListPayment=Lista de pagos ListOfCustomerPayments=Lista de pagos de clientes @@ -87,7 +85,7 @@ VATPayment=Pago de impuestos a las ventas VATPayments=Pagos de impuestos de ventas VATRefund=Reembolso del impuesto a las ventas Refund=Reembolso -SocialContributionsPayments=Pagos de impuestos sociales / fiscales +SocialContributionsPayments=Pagos de impuestos sociales/fiscales ShowVatPayment=Mostrar el pago del IVA BalanceVisibilityDependsOnSortAndFilters=El saldo es visible en esta lista solo si la tabla se ordena de forma ascendente en %s y se filtra para 1 cuenta bancaria CustomerAccountancyCode=Código de contabilidad del cliente @@ -106,11 +104,11 @@ NewCheckDeposit=Nuevo depósito de cheque NewCheckDepositOn=Crear recibo para el depósito en la cuenta: %s NoWaitingChecks=No hay cheques pendientes de depósito. DateChequeReceived=Verificar fecha de recepción -NbOfCheques=Nb de cheques +NbOfCheques=N° de cheques PaySocialContribution=Pagar un impuesto social / fiscal ConfirmPaySocialContribution=¿Estás seguro de que quieres clasificar este impuesto social o fiscal como pagado? DeleteSocialContribution=Eliminar un pago de impuestos sociales o fiscales -ConfirmDeleteSocialContribution=¿Estás seguro de que deseas eliminar este pago de impuestos sociales / fiscales? +ConfirmDeleteSocialContribution=¿Estás seguro de que deseas eliminar este pago de impuestos sociales/fiscales? ExportDataset_tax_1=Impuestos y pagos sociales y fiscales CalcModeVATDebt=Modo %sIVA sobre compromisos contables%s. CalcModeVATEngagement=Modo %s IVA en ingresos-gastos%s. @@ -166,15 +164,16 @@ Dispatch=Despacho Dispatched=Despachado ToDispatch=Para despachar ThirdPartyMustBeEditAsCustomer=El tercero debe definirse como un cliente +SellsJournal=Libro de Ventas +DescSellsJournal=Libro de Ventas CodeNotDef=No definida WarningDepositsNotIncluded=Las facturas de anticipo no están incluidas en esta versión con este módulo contable. DatePaymentTermCantBeLowerThanObjectDate=La fecha del plazo de pago no puede ser menor que la fecha del objeto. -Pcg_version=Modelos de plan de cuentas Pcg_type=Tipo de Pcg Pcg_subtype=Subtipo Pcg InvoiceLinesToDispatch=Líneas de factura para enviar RefExt=Ref externo -ToCreateAPredefinedInvoice=Para crear una factura de plantilla, cree una factura estándar, luego, sin validarla, haga clic en el botón "%s". +ToCreateAPredefinedInvoice=Para crear una plantilla de factura, cree una factura estándar, luego, sin validarla, haga clic en el botón "%s". LinkedOrder=Enlace a la orden CalculationRuleDesc=Para calcular el IVA total, hay dos métodos:
    El método 1 es redondear el IVA en cada línea y luego sumarlas.
    El método 2 es sumar todos los IVA en cada línea, luego redondear el resultado.
    El resultado final puede diferir de algunos centavos. El modo predeterminado es el modo %s. CalculationRuleDescSupplier=De acuerdo con el proveedor, elija el método apropiado para aplicar la misma regla de cálculo y obtenga el mismo resultado esperado por su proveedor. @@ -183,7 +182,7 @@ AccountancyJournal=Revista de códigos contables ACCOUNTING_VAT_SOLD_ACCOUNT=Cuenta de contabilidad por defecto para cobrar el IVA - IVA sobre las ventas (se usa si no está definido en la configuración del diccionario del IVA) ACCOUNTING_VAT_BUY_ACCOUNT=Cuenta de contabilidad por defecto para el IVA recuperado - IVA en compras (utilizado si no está definido en la configuración del diccionario de IVA) ACCOUNTING_VAT_PAY_ACCOUNT=Cuenta de contabilidad por defecto para pagar el IVA -ACCOUNTING_ACCOUNT_CUSTOMER=Cuenta de contabilidad utilizada para terceros de clientes +ACCOUNTING_ACCOUNT_CUSTOMER=Cuenta de contabilidad utilizada para terceros clientes ACCOUNTING_ACCOUNT_CUSTOMER_Desc=La cuenta de contabilidad dedicada definida en la tarjeta de un tercero se utilizará solo para los contadores de Subledger. Este se usará para el Libro mayor y como valor predeterminado de la contabilidad del Libro mayor auxiliar si no se define una cuenta de cliente dedicada dedicada a terceros. ACCOUNTING_ACCOUNT_SUPPLIER=Cuenta de contabilidad utilizada para terceros proveedores ACCOUNTING_ACCOUNT_SUPPLIER_Desc=La cuenta de contabilidad dedicada definida en la tarjeta de un tercero se utilizará solo para los contadores de Subledger. Este se usará para el Libro mayor y como valor predeterminado de la contabilidad del Libro mayor auxiliar si no se define una cuenta de abono del proveedor dedicada a un tercero. @@ -196,7 +195,6 @@ BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=En funció SameCountryCustomersWithVAT=Informe nacional de clientes BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Según las dos primeras letras del número de IVA, es el mismo que el código de país de su empresa LinkedFichinter=Enlace a una intervención -ImportDataset_tax_contrib=Impuestos sociales / fiscales ImportDataset_tax_vat=Pagos de IVA ErrorBankAccountNotFound=Error: cuenta bancaria no encontrada FiscalPeriod=Período contable diff --git a/htdocs/langs/es_CL/ecm.lang b/htdocs/langs/es_CL/ecm.lang index e3a8b8ed01b..455403b320a 100644 --- a/htdocs/langs/es_CL/ecm.lang +++ b/htdocs/langs/es_CL/ecm.lang @@ -1,5 +1,5 @@ # Dolibarr language file - Source file is en_US - ecm -ECMNbOfDocs=Nb de documentos en el directorio +ECMNbOfDocs=N° de documentos en el directorio ECMAddSection=Agregar directorio ECMCreationDate=Fecha de creación ECMNbOfSubDir=Cantidad de subdirectorios @@ -29,4 +29,3 @@ ECMSelectASection=Seleccione un directorio en el árbol de la izquierda ... DirNotSynchronizedSyncFirst=Este directorio parece ser creado o modificado fuera del módulo ECM. Primero debe hacer clic en el botón "Resincronizar" para sincronizar el disco y la base de datos para obtener el contenido de este directorio. HashOfFileContent=Hash del contenido del archivo FileNotYetIndexedInDatabase=Archivo aún no indexado en la base de datos (intente volver a subirlo) -NoDirectoriesFound=No se encontraron directorios diff --git a/htdocs/langs/es_CL/install.lang b/htdocs/langs/es_CL/install.lang index 5f2d4d5df79..e5d97d9ae47 100644 --- a/htdocs/langs/es_CL/install.lang +++ b/htdocs/langs/es_CL/install.lang @@ -44,7 +44,7 @@ CreateDatabase=Crear base de datos CreateUser=Crear propietario u otorgarle permiso en la base de datos DatabaseSuperUserAccess=Servidor de base de datos: acceso de superusuario CheckToCreateDatabase=Marque la casilla si la base de datos no existe y debe crearse.
    En este caso, debe completar el nombre de usuario / contraseña para la cuenta de superusuario en la parte inferior de esta página. -CheckToCreateUser=Marque la casilla si el propietario de la base de datos no existe y debe crearse, o si existe, pero la base de datos no existe y se deben otorgar permisos. En este caso, debe elegir su nombre de usuario y contraseña y también completar el nombre de usuario / contraseña para la cuenta de superusuario en la parte inferior de esta página. Si esta casilla no está marcada, la base de datos del propietario y sus contraseñas deben existir. +CheckToCreateUser=Marque la casilla si el propietario de la base de datos no existe y debe crearse, o si existe, pero la base de datos no existe y se deben otorgar permisos.
    En este caso, debe elegir su nombre de usuario y contraseña y también completar el nombre de usuario/contraseña para la cuenta de superusuario en la parte inferior de esta página. Si esta casilla no está marcada, la base de datos del propietario y sus contraseñas deben existir. DatabaseRootLoginDescription=El inicio de sesión del usuario le permite crear nuevas bases de datos o nuevos usuarios, obligatorio si su base de datos o su propietario aún no existe. KeepEmptyIfNoPassword=Déjelo en blanco si el usuario no tiene contraseña (evítelo) SaveConfigurationFile=Guardar valores @@ -168,7 +168,6 @@ MigrationActioncommElement=Actualizar datos sobre acciones MigrationPaymentMode=Migración de datos para el modo de pago MigrationCategorieAssociation=Migración de categorías MigrationEvents=Migración de eventos para agregar el propietario del evento a la tabla de asignación -MigrationEventsContact=Migración de eventos para agregar contacto de evento en la tabla de asignación MigrationRemiseEntity=Actualizar el valor del campo de entidad de llx_societe_remise MigrationRemiseExceptEntity=Actualizar el valor del campo de entidad de llx_societe_remise_except ErrorFoundDuringMigration=Se informó un error durante el proceso de migración, por lo que el siguiente paso no está disponible. Para ignorar los errores, puede hacer clic aquí , pero la aplicación o algunas características pueden no funcionar correctamente hasta que se solucionen. diff --git a/htdocs/langs/es_CL/interventions.lang b/htdocs/langs/es_CL/interventions.lang index 9b6cfe4e25b..c9f94d2bd0b 100644 --- a/htdocs/langs/es_CL/interventions.lang +++ b/htdocs/langs/es_CL/interventions.lang @@ -34,7 +34,7 @@ TypeContact_fichinter_external_CUSTOMER=Seguimiento de contacto con el cliente PrintProductsOnFichinter=Imprima también líneas de tipo "producto" (no solo servicios) en la tarjeta de intervención PrintProductsOnFichinterDetails=intervenciones generadas a partir de órdenes UseServicesDurationOnFichinter=Usar la duración de los servicios para las intervenciones generadas a partir de órdenes -NbOfinterventions=Nb de tarjetas de intervención +NbOfinterventions=N° de tarjetas de intervención NumberOfInterventionsByMonth=Número de tarjetas de intervención por mes (fecha de validación) AmountOfInteventionNotIncludedByDefault=La cantidad de intervención no se incluye por defecto en los beneficios (en la mayoría de los casos, las hojas de tiempo se utilizan para contar el tiempo invertido). Agregue la opción PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT a 1 en home-setup-other para incluirlos. InterId=Id de intervención diff --git a/htdocs/langs/es_CL/main.lang b/htdocs/langs/es_CL/main.lang index a5f07fa5bb2..85e09b6399c 100644 --- a/htdocs/langs/es_CL/main.lang +++ b/htdocs/langs/es_CL/main.lang @@ -31,7 +31,7 @@ ErrorCanNotCreateDir=No se puede crear el dir %s ErrorCanNotReadDir=No se puede leer dir %s ErrorConstantNotDefined=El parámetro %s no está definido ErrorLogoFileNotFound=No se encontró el archivo de logotipo '%s' -ErrorGoToGlobalSetup=Ir a la configuración de 'Empresa / Organización' para arreglar esto +ErrorGoToGlobalSetup=Ir a la configuración de 'Empresa/Organización' para arreglar esto ErrorGoToModuleSetup=Ir a la configuración del módulo para arreglar esto ErrorFailedToSendMail=Error al enviar el correo (remitente = %s, receptor = %s) ErrorFileNotUploaded=El archivo no fue cargado. Compruebe que el tamaño no exceda el máximo permitido, que el espacio libre esté disponible en el disco y que no haya un archivo con el mismo nombre en este directorio. @@ -46,10 +46,10 @@ ErrorSomeErrorWereFoundRollbackIsDone=Se encontraron algunos errores. Revertimos ErrorConfigParameterNotDefined=El parámetro %s no está definido en el archivo de configuración conf.php Dolibarr. ErrorCantLoadUserFromDolibarrDatabase=Falló al encontrar el usuario %s en la base de datos Dolibarr. ErrorNoVATRateDefinedForSellerCountry=Error, sin tasas de IVA definidas para el país '%s'. -ErrorNoSocialContributionForSellerCountry=Error, ningún tipo de impuestos sociales / fiscales definidos para el país '%s'. +ErrorNoSocialContributionForSellerCountry=Error, ningún tipo de impuestos sociales/fiscales definidos para el país '%s'. ErrorFailedToSaveFile=Error, no se pudo guardar el archivo. ErrorCannotAddThisParentWarehouse=Está intentando agregar un almacén principal que ya es hijo de uno actual -MaxNbOfRecordPerPage=Máx nb de registro por página +MaxNbOfRecordPerPage=N° máx de registro por página NotAuthorized=Usted no está autorizado a hacer eso. SetDate=Establece la fecha SeeAlso=Véase también %s @@ -87,7 +87,6 @@ NotePrivate=Nota (privado) PrecisionUnitIsLimitedToXDecimals=Dolibarr se configuró para limitar la precisión del precio unitario a %s decimales. DoTest=Prueba WarningYouHaveAtLeastOneTaskLate=Advertencia, tiene al menos un elemento que ha excedido el retraso de tolerancia. -Home=Casa OnlineHelp=Ayuda en linea Under=debajo Period=Período @@ -95,11 +94,10 @@ PeriodEndDate=Fecha de finalización del período NotClosed=No se ha cerrado Enabled=Habilitado Disable=Inhabilitar -Disabled=Discapacitado +Disabled=Deshabilitado AddLink=Agregar enlace AddToDraft=Agregar al borrador Update=Actualizar -Close=Cerca CloseBox=Retire el widget de su tablero de instrumentos ConfirmSendCardByMail=¿Realmente quieres mandar el contenido de esta tarjeta al email %s? Delete=Borrar @@ -108,15 +106,15 @@ Resiliate=Terminar Cancel=Cancelar ValidateAndApprove=Validar y aprobar ToValidate=Validar -Save=Salvar +Save=Guardar SaveAs=Guardar como TestConnection=Conexión de prueba -ToClone=Clon +ToClone=Clonar ConfirmClone=Elija los datos que desea clonar: NoCloneOptionsSpecified=No hay datos para clonar definidos. Run=correr -Show=Espectáculo -Hide=Esconder +Show=Mostrar +Hide=Ocultar ShowCardHere=Mostrar tarjeta SearchOf=Buscar Valid=Válido @@ -128,7 +126,6 @@ PasswordRetype=Reescribe tu contraseña NoteSomeFeaturesAreDisabled=Tenga en cuenta que muchas características / módulos están deshabilitados en esta demostración. PersonalValue=Valor personal MultiLanguage=Multi lenguaje -RefOrLabel=Árbitro. o etiqueta Info=Iniciar sesión Model=Plantilla de documento DefaultModel=Plantilla de documento predeterminada @@ -139,7 +136,6 @@ Logout=Cerrar sesión NoLogoutProcessWithAuthMode=Sin función de desconexión aplicativa con modo de autenticación %s Setup=Configurar Cards=Tarjetas -Card=Tarjeta DateToday=El día de hoy DateEnd=Fecha final DateCreationShort=Creat. fecha @@ -147,7 +143,7 @@ DateModificationShort=Modif. fecha DateValue=Fecha de valor DateValueShort=Fecha de valor DateOperation=Fecha de operación -DateOperationShort=Oper. Fecha +DateOperationShort=Fecha Oper. DateRequest=Fecha de solicitud DateProcess=Fecha de procesamiento DateBuild=Fecha de creación del informe @@ -159,9 +155,8 @@ UserCreationShort=Creat. usuario UserModificationShort=Modif. usuario UserValidationShort=Válido. usuario Tomorrow=mañana -HourShort=MARIDO MinuteShort=Minnesota -Rate=Tarifa +Rate=Tasa UseLocalTax=Incluye impuestos UserAuthor=Usuario de creación b=segundo. @@ -173,17 +168,17 @@ DefaultValues=Valores predeterminados UnitPriceHT=Precio unitario (neto) UnitPriceTTC=Precio unitario PriceU=ARRIBA. -PriceUHT=ARRIBA. (red) +PriceUHT=P.U. (net) PriceUHTCurrency=U.P (moneda) PriceUTTC=ARRIBA. (inc. impuesto) Amount=Cantidad AmountInvoice=Importe de la factura AmountPayment=Monto del pago AmountHTShort=Monto (neto) -AmountTTCShort=Monto (impuesto inc.) +AmountTTCShort=Monto (IVA inc.) AmountHT=Monto (neto de impuestos) AmountTTC=Monto (impuesto inc.) -AmountVAT=Impuesto a la cantidad +AmountVAT=IVA MulticurrencyAlreadyPaid=Ya pagó, moneda original MulticurrencyRemainderToPay=Permanecer en el pago, moneda original MulticurrencyPaymentAmount=Importe del pago, moneda original @@ -197,11 +192,11 @@ AmountTotal=Cantidad total AmountAverage=Cantidad promedio PriceQtyMinHT=Cantidad de precio min. (impuesto neto) SubTotal=Total parcial -TotalHTShort=Neto total) +TotalHTShort=Total (neto) TotalHTShortCurrency=Total (neto en moneda) -TotalTTCShort=Total (impuesto inc.) -TotalHT=Total (neto de impuestos) -TotalHTforthispage=Total (neto de impuestos) para esta página +TotalTTCShort=Total (IVA inc.) +TotalHT=Total +TotalHTforthispage=Total para esta página Totalforthispage=Total para esta página TotalTTC=Total (impuesto inc.) TotalTTCToYourCredit=Total (impuesto inc.) A su crédito @@ -213,7 +208,6 @@ HT=Impuesto neto TTC=Inc. impuesto INCVATONLY=IVA incluido INCT=Inc. todos los impuestos -VAT=Impuesto de venta VATs=Impuestos de ventas VATINs=IGST impuestos LT1=Impuesto a las ventas 2 @@ -225,41 +219,34 @@ DefaultTaxRate=Tasa de impuesto predeterminada Average=Promedio Module=Módulo / Aplicación Modules=Módulos / Aplicaciones -List=Lista FullList=Lista llena -Statistics=Estadística -Ref=Árbitro. -ExternalRef=Árbitro. externo -RefSupplier=Árbitro. proveedor -RefPayment=Árbitro. pago +ExternalRef=Ref. externo CommercialProposalsShort=Cotizaciones ActionsToDo=Eventos para hacer ActionsToDoShort=Que hacer ActionsDoneShort=Hecho ActionNotApplicable=No aplica ActionRunningNotStarted=Para comenzar -CompanyFoundation=Empresa / Organización +CompanyFoundation=Empresa/Organización ContactsForCompany=Contactos para este tercero -ContactsAddressesForCompany=Contactos / direcciones para este tercero +ContactsAddressesForCompany=Contactos/direcciones para este tercero AddressesForCompany=Direcciones para este tercero ActionsOnCompany=Eventos sobre este tercero ActionsOnMember=Eventos sobre este miembro -ActionsOnProduct=Eventos sobre este producto NActionsLate=%s tarde RequestAlreadyDone=Solicitud ya grabada Filter=Filtrar FilterOnInto=Criterio de búsqueda '%s' en los campos %s ChartGenerated=Gráfico generado GeneratedOn=Construir en %s -DolibarrStateBoard=Estadísticas de la base -DolibarrWorkBoard=Tablero de elementos abiertos +DolibarrStateBoard=Estadísticas en Base de Datos +DolibarrWorkBoard=Tablero de items pendientes NoOpenedElementToProcess=Sin elemento abierto para procesar NotYetAvailable=No disponible aún Categories=Etiquetas / categorías Category=Etiqueta / categoría Qty=Cantidad ChangedBy=Cambiado por -Refused=Rehusó ResultKo=Fracaso Reporting=Informes Drafts=Borrador @@ -268,10 +255,9 @@ Size=tamaño Topic=Tema ByCompanies=Por terceros ByUsers=Por los usuarios -Links=Campo de golf Link=Enlazar Rejects=Rechaza -Preview=Avance +Preview=Previsualizar NextStep=Próximo paso None=Ninguna Late=Tarde @@ -288,10 +274,8 @@ MayMin=Mayo Month05=Mayo MonthShort01=Ene MonthShort04=Abr -MonthShort05=Mayo MonthShort08=Ago MonthShort12=Dic -AttachedFiles=Archivos adjuntos y documentos JoinMainDoc=Unir el documento principal DateFormatYYYYMMDD=AAAA-MM-DD DateFormatYYYYMMDDHHMM=AAAA-MM-DD HH: SS @@ -302,14 +286,14 @@ Fill=Llenar Reset=Reiniciar NotAllowed=No permitido ReadPermissionNotAllowed=Permiso de lectura no permitido -AmountInCurrency=Monto en %s moneda +AmountInCurrency=Monto en %s NoExample=Ningún ejemplo NbOfThirdParties=Cantidad de terceros NbOfLines=Número de líneas NbOfObjectReferers=Número de artículos relacionados Referers=Artículos relacionados DateFrom=Desde %s -Check=Comprobar +Check=Cheque Uncheck=Desmarcar Internals=Interno Externals=Externo @@ -320,7 +304,6 @@ CustomerPreview=Vista previa del cliente SupplierPreview=Vista previa del proveedor ShowCustomerPreview=Mostrar vista previa del cliente ShowSupplierPreview=Mostrar vista previa del proveedor -RefCustomer=Árbitro. cliente Currency=Moneda InfoAdmin=Información para administradores Undo=Deshacer @@ -354,7 +337,7 @@ CompleteOrNoMoreReceptionExpected=Completo o nada más esperado YouCanChangeValuesForThisListFromDictionarySetup=Puede cambiar los valores para esta lista desde el menú Configuración - Diccionarios YouCanChangeValuesForThisListFrom=Puede cambiar los valores para esta lista desde el menú %s YouCanSetDefaultValueInModuleSetup=Puede establecer el valor predeterminado utilizado al crear un nuevo registro en la configuración del módulo -Documents=Archivos vinculados +Documents=Archivos UploadDisabled=Carga inhabilitada MenuAgendaGoogle=Agenda de Google ThisLimitIsDefinedInSetup=Límite Dolibarr (menú home-setup-security): %s Kb, límite PHP: %s Kb @@ -403,7 +386,6 @@ ClickToEdit=Haz click para editar EditHTMLSource=Editar fuente HTML ByCountry=Por país ByTown=Por la ciudad -ByMonthYear=Por mes / año BySalesRepresentative=Por representante de ventas LinkedToSpecificUsers=Vinculado a un contacto de usuario particular NoResults=No hay resultados @@ -464,7 +446,6 @@ EMailTemplates=Plantillas de correos electrónicos FileNotShared=Archivo no compartido para el público externo Monday=lunes Tuesday=martes -Wednesday=miércoles Thursday=jueves Friday=viernes Saturday=sábado @@ -473,12 +454,11 @@ MondayMin=Mes WednesdayMin=Nosotros Day1=lunes Day2=martes -Day3=miércoles Day4=jueves Day5=viernes Day6=sábado Day0=domingo -ShortMonday=METRO +ShortWednesday=M SelectMailModel=Seleccione una plantilla de correo electrónico Select2ResultFoundUseArrows=Algunos resultados encontrados. Usa las flechas para seleccionar. Select2NotFound=No se han encontrado resultados @@ -488,14 +468,13 @@ Select2MoreCharacters=o más personajes Select2MoreCharactersMore= Sintaxis de búsqueda:
    | O (a | b)
    * Cualquier carácter (a * b)
    ^ Comience con (^ ab)
    $ Finaliza con (ab $)
    Select2LoadingMoreResults=Cargando más resultados ... Select2SearchInProgress=Búsqueda en progreso ... -SearchIntoCustomerInvoices=Facturas del cliente -SearchIntoCustomerOrders=Pedidos de los clientes -SearchIntoSupplierOrders=Pedidos de proveedores +SearchIntoCustomerInvoices=Facturas de cliente +SearchIntoSupplierOrders=Pedidos a proveedores SearchIntoCustomerProposals=Propuestas de clientes SearchIntoSupplierProposals=Propuestas de proveedores SearchIntoCustomerShipments=Envíos de clientes SearchIntoExpenseReports=Reporte de gastos -SearchIntoLeaves=Hojas +SearchIntoLeaves=Vacaciones NbComments=Numero de comentarios CommentAdded=Comentario agregado Everybody=Todos diff --git a/htdocs/langs/es_CL/members.lang b/htdocs/langs/es_CL/members.lang index 17bd9e285be..29d57cd65b8 100644 --- a/htdocs/langs/es_CL/members.lang +++ b/htdocs/langs/es_CL/members.lang @@ -6,7 +6,7 @@ ShowMember=Mostrar tarjeta de miembro ThirdpartyNotLinkedToMember=Tercero no vinculado a un miembro MembersTickets=Entradas de los miembros FundationMembers=Miembros de la fundación -ErrorMemberIsAlreadyLinkedToThisThirdParty=Otro miembro (nombre: %s, login: %s) ya está vinculado a un tercero %s. Primero elimine este enlace porque un tercero no puede vincularse solo a un miembro (y viceversa). +ErrorMemberIsAlreadyLinkedToThisThirdParty=Otro miembro (nombre: %s, login: %s) ya está asignado al tercero %s. Primero elimine la asignación, porque un tercero no puede vincularse solo a un miembro (y viceversa). ErrorUserPermissionAllowsToLinksToItselfOnly=Por razones de seguridad, debe tener permiso para editar a todos los usuarios para poder vincular a un miembro con un usuario que no es el suyo. ThisIsContentOfYourCard=Hola.

    Esto es un recordatorio de la información que obtenemos sobre usted. No dude en contactarnos si algo parece estar mal.

    CardContent=Contenido de su tarjeta de miembro diff --git a/htdocs/langs/es_CL/orders.lang b/htdocs/langs/es_CL/orders.lang index 3af6c9560bb..b224a65c271 100644 --- a/htdocs/langs/es_CL/orders.lang +++ b/htdocs/langs/es_CL/orders.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - orders OrdersArea=Área de pedidos de clientes -SuppliersOrdersArea=Área de pedidos de proveedores +SuppliersOrdersArea=Área de pedidos a proveedores OrderCard=Tarjeta de pedido OrderId=Solicitar ID Order=Orden @@ -8,46 +8,41 @@ OrderLine=Fila para ordenar OrderDate=Fecha de orden OrderDateShort=Fecha de orden OrderToProcess=Orden para procesar -NewOrder=Nuevo orden +NewOrder=Nueva orden ToOrder=Hacer orden MakeOrder=Hacer orden -SupplierOrder=Orden del proveedor -SuppliersOrders=Pedidos de proveedores -SuppliersOrdersRunning=Pedidos de proveedores actuales +SupplierOrder=Orden al proveedor +SuppliersOrders=Pedidos a proveedores +SuppliersOrdersRunning=Pedidos a proveedores actuales CustomerOrder=Pedido del cliente -CustomersOrders=Pedidos de los clientes CustomersOrdersRunning=Pedidos de clientes actuales OrdersDeliveredToBill=Pedidos de clientes entregados a la cuenta OrdersToBill=Pedidos de clientes entregados OrdersToProcess=Pedidos de clientes para procesar -SuppliersOrdersToProcess=Pedidos de proveedores para procesar +SuppliersOrdersToProcess=Pedidos a proveedores para procesar StatusOrderCanceledShort=Cancelado StatusOrderSentShort=En proceso StatusOrderSent=Envío en proceso -StatusOrderOnProcessShort=Ordenado StatusOrderProcessedShort=Procesada StatusOrderDelivered=Entregado StatusOrderDeliveredShort=Entregado StatusOrderToBillShort=Entregado -StatusOrderRefusedShort=Rehusó StatusOrderBilledShort=Pagado StatusOrderToProcessShort=Para procesar -StatusOrderReceivedPartiallyShort=Parcialmente recibido StatusOrderCanceled=Cancelado StatusOrderDraft=Borrador (debe ser validado) StatusOrderOnProcess=Pedido - Recepción en espera StatusOrderOnProcessWithValidation=Pedido: recepción o validación en espera StatusOrderProcessed=Procesada StatusOrderToBill=Entregado -StatusOrderRefused=Rehusó StatusOrderBilled=Pagado -StatusOrderReceivedPartially=Parcialmente recibido +StatusOrderReceivedAll=Recibidos completamente ShippingExist=Existe un envío QtyOrdered=Cantidad ordenada ProductQtyInDraft=Cantidad de producto en órdenes de giro ProductQtyInDraftOrWaitingApproved=Cantidad de producto en borradores o pedidos aprobados, aún no ordenados MenuOrdersToBill=Pedidos entregados -CreateOrder=Crear orden +CreateOrder=Crear Pedido RefuseOrder=Orden de rechazo ApproveOrder=Aprobar orden Approve2Order=Aprobar orden (segundo nivel) @@ -56,15 +51,14 @@ UnvalidateOrder=Desvalidar orden DeleteOrder=Eliminar orden CancelOrder=Cancelar orden OrderReopened=Ordene %s Reabierto -AddOrder=Crear orden AddToDraftOrders=Añadir a orden de borrador OrdersOpened=Órdenes para procesar -NoDraftOrders=No hay borradores de órdenes +NoDraftOrders=No hay borradores de pedidos NoOrder=Sin orden NoSupplierOrder=Sin orden de proveedor LastOrders=Últimas %s pedidos de clientes LastCustomerOrders=Últimas %s pedidos de clientes -LastSupplierOrders=Últimas %s pedidos de proveedores +LastSupplierOrders=%s últimos pedidos a proveedores LastModifiedOrders=Últimas %s órdenes modificadas AllOrders=Todas las órdenes NbOfOrders=Numero de ordenes @@ -81,13 +75,13 @@ ConfirmCancelOrder=¿Seguro que quieres cancelar esta orden? ConfirmMakeOrder=¿Estas seguro que deseas confirmar esta orden realizada %s? GenerateBill=Generar factura ClassifyShipped=Clasificar entregado -DraftOrders=Borradores de órdenes -DraftSuppliersOrders=Borrador de pedidos de proveedores +DraftOrders=Borradores de pedidos +DraftSuppliersOrders=Borrador de pedidos a proveedores OnProcessOrders=En órdenes de proceso -RefOrder=Árbitro. orden -RefCustomerOrder=Árbitro. orden para el cliente -RefOrderSupplier=Árbitro. orden para el proveedor -RefOrderSupplierShort=Árbitro. proveedor de la orden +RefOrder=Ref. orden +RefCustomerOrder=Ref. orden para el cliente +RefOrderSupplier=Ref. orden para el proveedor +RefOrderSupplierShort=Ref. proveedor de la orden SendOrderByMail=Enviar pedido por correo ActionsOnOrder=Eventos por encargo NoArticleOfTypeProduct=Ningún artículo del tipo 'producto' por lo que no se puede enviar un artículo para este pedido @@ -120,7 +114,7 @@ OrderByEMail=Correo electrónico PDFEinsteinDescription=Un modelo de pedido completo (logotipo ...) PDFEdisonDescription=Un modelo de orden simple PDFProformaDescription=Una factura proforma completa (logotipo ...) -CreateInvoiceForThisCustomer=Órdenes de Bill +CreateInvoiceForThisCustomer=Pagar Pedidos NoOrdersToInvoice=No hay pedidos facturables CloseProcessedOrdersAutomatically=Clasifique "Procesado" todas las órdenes seleccionadas. OrderCreation=Creación de orden @@ -129,6 +123,5 @@ OrderCreated=Tus pedidos han sido creados OrderFail=Se produjo un error durante la creación de sus pedidos ToBillSeveralOrderSelectCustomer=Para crear una factura para varios pedidos, haga clic primero en el cliente, luego elija "%s". OptionToSetOrderBilledNotEnabled=La opción (del flujo de trabajo del módulo) para configurar el pedido en 'Facturado' automáticamente cuando se valida la factura está desactivado, por lo que deberá establecer el estado de la orden en 'Facturado' manualmente. -IfValidateInvoiceIsNoOrderStayUnbilled=Si la validación de la factura es 'No', la orden permanecerá en estado 'Sin facturar' hasta que la factura sea validada. CloseReceivedSupplierOrdersAutomatically=Cierre el pedido a "%s" automáticamente si se reciben todos los productos. SetShippingMode=Establecer el modo de envío diff --git a/htdocs/langs/es_CL/other.lang b/htdocs/langs/es_CL/other.lang index c2ab4338c5b..dcbeb67cdb6 100644 --- a/htdocs/langs/es_CL/other.lang +++ b/htdocs/langs/es_CL/other.lang @@ -59,7 +59,7 @@ TotalSizeOfAttachedFiles=Tamaño total de los archivos / documentos adjuntos MaxSize=Talla máxima AttachANewFile=Adjunte un nuevo archivo / documento LinkedObject=Objeto vinculado -NbOfActiveNotifications=Número de notificaciones (nb de correos electrónicos de destinatarios) +NbOfActiveNotifications=Número de notificaciones (N° de correos electrónicos de destinatarios) PredefinedMailTest=__(Hola)__\nEste es un correo de prueba enviado a __EMAIL__.\nLas dos líneas están separadas por un retorno de carro.\n\n__USER_SIGNATURE__ PredefinedMailTestHtml=__(Hola)__\nEste es un correo de prueba (la palabra prueba debe estar en negrita).
    Las dos líneas están separadas por un retorno de carro.

    __USER_SIGNATURE__ PredefinedMailContentSendInvoice=__(Hola)__\n\nAquí encontrará la factura __REF__\n\n__ONLINE_PAYMENT_URL__\n\n__(Sinceramente)__\n\n__USER_SIGNATURE__ @@ -108,17 +108,17 @@ EnableGDLibraryDesc=Instale o habilite la biblioteca de GD en su instalación de ProfIdShortDesc=Prof Id %s es una información que depende del país de un tercero.
    Por ejemplo, para el país %s, es el código%s. DolibarrDemo=Demo de Dolibarr ERP / CRM StatsByNumberOfUnits=Estadísticas para suma de cantidad de productos / servicios -StatsByNumberOfEntities=Estadísticas en número de entidades remitentes (nb de factura, u orden ...) +StatsByNumberOfEntities=Estadísticas en número de entidades remitentes (N° de factura, u orden ...) NumberOfProposals=Número de propuestas NumberOfCustomerInvoices=Número de facturas de clientes NumberOfSupplierProposals=Número de propuestas de proveedores -NumberOfSupplierOrders=Número de pedidos de proveedores +NumberOfSupplierOrders=Número de pedidos a proveedores NumberOfSupplierInvoices=Número de facturas del proveedor NumberOfUnitsProposals=Número de unidades en las propuestas NumberOfUnitsCustomerOrders=Número de unidades en pedidos de clientes NumberOfUnitsCustomerInvoices=Número de unidades en las facturas de los clientes NumberOfUnitsSupplierProposals=Número de unidades en propuestas de proveedores -NumberOfUnitsSupplierOrders=Número de unidades en pedidos de proveedores +NumberOfUnitsSupplierOrders=Número de unidades en pedidos a proveedores NumberOfUnitsSupplierInvoices=Número de unidades en las facturas del proveedor EMailTextInterventionAddedContact=Se le ha asignado una nueva intervención %s. EMailTextInterventionValidated=La intervención %s ha sido validada. @@ -155,6 +155,7 @@ ForgetIfNothing=Si no solicitó este cambio, simplemente olvide este correo elec IfAmountHigherThan=Si la cantidad es superior a %s SourcesRepository=Repositorio de fuentes PassEncoding=Codificación de contraseña +PermissionsAdd=Permisos agregados LibraryUsed=Biblioteca utilizada LibraryVersion=Versión de biblioteca NoExportableData=No se pueden exportar datos (no hay módulos con datos exportables cargados o sin permisos) diff --git a/htdocs/langs/es_CL/products.lang b/htdocs/langs/es_CL/products.lang index 774b6fec967..068f78e0cf3 100644 --- a/htdocs/langs/es_CL/products.lang +++ b/htdocs/langs/es_CL/products.lang @@ -15,14 +15,14 @@ ProductAccountancySellCode=Código de contabilidad (venta) ProductOrService=Producto o Servicio ProductsAndServices=Productos y Servicios ProductsOrServices=Productos o Servicios +ProductsOnSaleOnly=Productos solo para venta ProductsOnPurchaseOnly=Productos solo para compra ProductsNotOnSell=Productos no en venta y no en compra -ProductsOnSellAndOnBuy=Productos para la venta y para la compra +ProductsOnSellAndOnBuy=Productos para venta y compra ServicesOnSaleOnly=Servicios solo para venta ServicesOnPurchaseOnly=Servicios solo para compra ServicesNotOnSell=Servicios no en venta y no en compra -ServicesOnSellAndOnBuy=Servicios para la venta y para la compra -LastModifiedProductsAndServices=Últimos productos/servicios %s modificados +ServicesOnSellAndOnBuy=Servicios para venta y compra LastRecordedProducts=Últimos %s productos grabados LastRecordedServices=Últimos %s servicios grabados CardProduct0=Tarjeta de producto @@ -112,8 +112,6 @@ PriceByQuantityRange=Rango Cantidad MultipriceRules=Reglas del segmento de precios UseMultipriceRules=Utilice las reglas del segmento de precios (definidas en la configuración del módulo del producto) para autocalcular los precios de todos los demás segmentos de acuerdo con el primer segmento KeepEmptyForAutoCalculation=Manténgase vacío para que esto se calcule automáticamente a partir del peso o volumen de productos -VariantRefExample=Ejemplo: COL -VariantLabelExample=Ejemplo: Color Build=Producir ProductsMultiPrice=Productos y precios para cada segmento de precio ProductsOrServiceMultiPrice=Precios del cliente (de productos o servicios, precios múltiples) @@ -180,8 +178,6 @@ VolumeUnits=Unidad de volumen SizeUnits=Unidad de tamaño ConfirmDeleteProductBuyPrice=¿Estás seguro de que deseas eliminar este precio de compra? SubProduct=Sub producto -PossibleValues=Valores posibles -GoOnMenuToCreateVairants=Vaya al menú %s - %s para preparar variantes de atributos (como colores, tamaño, ...) ProductAttributeName=Atributo de variante %s ProductAttributeDeleteDialog=¿Estás seguro de que deseas eliminar este atributo? Todos los valores serán eliminados ProductAttributeValueDeleteDialog=¿Estás seguro de que deseas eliminar el valor "%s" con la referencia "%s" de este atributo? @@ -200,7 +196,7 @@ TooMuchCombinationsWarning=Generar muchas variantes puede dar como resultado una DoNotRemovePreviousCombinations=No eliminar variantes anteriores UsePercentageVariations=Usar variaciones porcentuales ErrorDeletingGeneratedProducts=Hubo un error al intentar eliminar las variantes de productos existentes -NbOfDifferentValues=Nb de diferentes valores +NbOfDifferentValues=N° de diferentes valores NbProducts=Nótese bien. de productos ParentProduct=Producto principal HideChildProducts=Ocultar productos variantes diff --git a/htdocs/langs/es_CL/projects.lang b/htdocs/langs/es_CL/projects.lang index 71f3dec5a3c..19dc9aa1b69 100644 --- a/htdocs/langs/es_CL/projects.lang +++ b/htdocs/langs/es_CL/projects.lang @@ -1,6 +1,4 @@ # Dolibarr language file - Source file is en_US - projects -RefProject=Árbitro. proyecto -ProjectRef=Proyecto ref. ProjectId=Proyecto Id ProjectLabel=Etiqueta del proyecto ProjectsArea=Área de proyectos @@ -14,12 +12,12 @@ TasksOnProjectsPublicDesc=Esta vista presenta todas las tareas en proyectos que ProjectsPublicTaskDesc=Esta vista presenta todos los proyectos y tareas que puede leer. ProjectsDesc=Esta vista presenta todos los proyectos (sus permisos de usuario le otorgan permiso para ver todo). TasksOnProjectsDesc=Esta vista presenta todas las tareas en todos los proyectos (sus permisos de usuario le otorgan permiso para ver todo). -MyTasksDesc=Esta vista se limita a proyectos o tareas para los que es contacto. +MyTasksDesc=Esta sección está limitada a proyectos o tareas en las que eres contacto. OnlyOpenedProject=Solo los proyectos abiertos son visibles (los proyectos en borrador o cerrados no son visibles). TasksPublicDesc=Esta vista presenta todos los proyectos y tareas que puede leer. TasksDesc=Esta vista presenta todos los proyectos y tareas (sus permisos de usuario le otorgan permiso para ver todo). AllTaskVisibleButEditIfYouAreAssigned=Todas las tareas para proyectos calificados son visibles, pero puede ingresar la hora solo para la tarea asignada al usuario seleccionado. Asignar tarea si necesita ingresar tiempo en ella. -OnlyYourTaskAreVisible=Solo las tareas asignadas a usted son visibles. Asignar la tarea a ti mismo si no está visible y necesitas ingresar tiempo en ella. +OnlyYourTaskAreVisible=Solo las tareas asignadas a ti son visibles. Asigna la tarea a ti mismo si no está visible y si necesitas ingresarle tiempo. ProjectCategories=Etiquetas / categorías de proyecto ConfirmDeleteAProject=¿Seguro que quieres eliminar este proyecto? ConfirmDeleteATask=¿Seguro que quieres eliminar esta tarea? @@ -29,17 +27,14 @@ ShowProject=Mostrar proyecto ShowTask=Mostrar tarea SetProject=Establecer proyecto NoProject=Ningún proyecto definido o propiedad -NbOfProjects=Nb de proyectos -NbOfTasks=Nb de tareas -TimeSpent=Tiempo usado +NbOfProjects=N° de proyectos +NbOfTasks=N° de tareas TimeSpentByYou=Tiempo pasado por ti TimeSpentByUser=Tiempo dedicado por el usuario -TimesSpent=Tiempo usado -RefTask=Árbitro. tarea +TimesSpent=Tiempo dedicado LabelTask=Etiqueta de tarea TaskTimeSpent=Tiempo dedicado a tareas -NewTimeSpent=Tiempo usado -MyTimeSpent=Mi tiempo pasó +NewTimeSpent=Tiempo dedicado TaskDateStart=Fecha de inicio de la tarea TaskDateEnd=Fecha de finalización de tarea TaskDescription=Descripción de la tarea @@ -57,8 +52,8 @@ GoToListOfTasks=Ir a la lista de tareas ListProposalsAssociatedProject=Listado de cotizaciones asociadas al proyecto ListOrdersAssociatedProject=Lista de pedidos de clientes asociados con el proyecto ListInvoicesAssociatedProject=Lista de facturas de clientes asociadas con el proyecto -ListPredefinedInvoicesAssociatedProject=Lista de facturas de plantilla de cliente asociadas con el proyecto -ListSupplierOrdersAssociatedProject=Lista de pedidos de proveedores asociados con el proyecto +ListPredefinedInvoicesAssociatedProject=Lista de plantillas de facturas de cliente asociadas al proyecto +ListSupplierOrdersAssociatedProject=Lista de pedidos a proveedores asociados con el proyecto ListSupplierInvoicesAssociatedProject=Lista de facturas de proveedores asociadas con el proyecto ListContractAssociatedProject=Lista de contratos asociados con el proyecto ListShippingAssociatedProject=Lista de envíos asociados con el proyecto @@ -73,7 +68,6 @@ ActivityOnProjectThisWeek=Actividad en proyecto esta semana ActivityOnProjectThisMonth=Actividad en proyecto este mes ActivityOnProjectThisYear=Actividad en proyecto este año ChildOfProjectTask=Hijo del proyecto / tarea -ChildOfTask=Hijo de la tarea NotOwnerOfProject=No es dueño de este proyecto privado CantRemoveProject=Este proyecto no puede eliminarse ya que otros objetos lo hacen referencia (factura, pedidos u otros). Ver la pestaña de referers. ConfirmValidateProject=¿Seguro que quieres validar este proyecto? @@ -93,7 +87,7 @@ LinkedToAnotherCompany=Vinculado a otro tercero TaskIsNotAssignedToUser=Tarea no asignada al usuario. Use el botón '%s' para asignar la tarea ahora. ErrorTimeSpentIsEmpty=El tiempo pasado está vacío ThisWillAlsoRemoveTasks=Esta acción también borrara todo las tareas del proyecto (%s tareas al momento) y todas las entradas de tiempo consumido. -IfNeedToUseOhterObjectKeepEmpty=Si algunos objetos (factura, orden, ...), pertenecientes a otro tercero, deben estar vinculados al proyecto para crear, manténgalos vacíos para que el proyecto sea de varios terceros. +IfNeedToUseOhterObjectKeepEmpty=Si algunos objetos (factura, orden, ...), pertenecen a otro tercero, deben estar vinculados al proyecto para crear, manténgalos vacíos para que el proyecto sea de varios terceros. CloneProject=Proyecto clon CloneTasks=Clonar tareas CloneContacts=Clon contactos @@ -113,15 +107,15 @@ OpportunityAmount=Cantidad de oportunidad OpportunityAmountShort=Opp. cantidad OpportunityAmountAverageShort=Opp promedio cantidad OpportunityAmountWeigthedShort=Opp ponderado cantidad -WonLostExcluded=Ganado / Perdido excluido +WonLostExcluded=Ganado/Perdido excluido TypeContact_project_internal_PROJECTLEADER=Líder del proyecto TypeContact_project_external_PROJECTLEADER=Líder del proyecto -TypeContact_project_internal_PROJECTCONTRIBUTOR=Contribuyente -TypeContact_project_external_PROJECTCONTRIBUTOR=Contribuyente -TypeContact_project_task_internal_TASKEXECUTIVE=Ejecutivo de tareas -TypeContact_project_task_external_TASKEXECUTIVE=Ejecutivo de tareas -TypeContact_project_task_internal_TASKCONTRIBUTOR=Contribuyente -TypeContact_project_task_external_TASKCONTRIBUTOR=Contribuyente +TypeContact_project_internal_PROJECTCONTRIBUTOR=Colaborador +TypeContact_project_external_PROJECTCONTRIBUTOR=Colaborador +TypeContact_project_task_internal_TASKEXECUTIVE=Ejecutor de tarea +TypeContact_project_task_external_TASKEXECUTIVE=Ejecutor de tarea +TypeContact_project_task_internal_TASKCONTRIBUTOR=Colaborador +TypeContact_project_task_external_TASKCONTRIBUTOR=Colaborador SelectElement=Seleccionar elemento AddElement=Enlace al elemento DocumentModelBeluga=Plantilla de proyecto para vista general de objetos vinculados @@ -130,7 +124,6 @@ PlannedWorkload=Carga de trabajo planificada ProjectReferers=Artículos relacionados ProjectMustBeValidatedFirst=El proyecto debe ser validado primero FirstAddRessourceToAllocateTime=Asignar un recurso de usuario a la tarea para asignar tiempo -InputDetail=Detalle de entrada TimeAlreadyRecorded=Este es el tiempo que ya se ha registrado para esta tarea / día y el usuario %s TimeSpentBy=Tiempo consumido por AssignTaskToMe=Asignarme una tarea @@ -145,7 +138,7 @@ ProjectOppAmountOfProjectsByMonth=Cantidad de oportunidades por mes ProjectWeightedOppAmountOfProjectsByMonth=Cantidad ponderada de oportunidades por mes ProjectOpenedProjectByOppStatus=Abrir proyecto / conducir por estado de oportunidad ProjectsStatistics=Estadísticas de proyectos / leads -TasksStatistics=Estadísticas sobre proyectos / tareas principales +TasksStatistics=Estadísticas sobre proyectos/tareas principales TaskAssignedToEnterTime=Tarea asignada Ingresar el tiempo en esta tarea debería ser posible. IdTaskTime=Tiempo de la tarea de identificación YouCanCompleteRef=Si desea completar la referencia con cierta información (para utilizarla como filtros de búsqueda), se recomienda agregar un carácter para separarla, por lo que la numeración automática seguirá funcionando correctamente para los próximos proyectos. Por ejemplo %s-ABC. También puede preferir agregar claves de búsqueda en la etiqueta. Pero la mejor práctica puede ser agregar un campo dedicado, también llamado atributos complementarios. @@ -156,7 +149,8 @@ OpportunityPonderatedAmount=Cantidad ponderada de oportunidades OpportunityPonderatedAmountDesc=Cantidad de oportunidades ponderada con probabilidad OppStatusQUAL=Calificación OppStatusPROPO=Cotización +AllowToLinkFromOtherCompany=Permitir vincular proyecto de otra empresa

    Valores admitidos:
    - Mantener vacío: puede vincular cualquier proyecto de la empresa (predeterminado)
    - "todo": puede vincular cualquier proyecto, incluso proyecto de otras empresas
    - Una lista de identificación de terceros separada por comas: puede vincular todos los proyectos de estos terceros definidos (Ejemplo: 123,4795,53)
    LatestProjects=Últimos %s proyectos LatestModifiedProjects=Últimos proyectos modificados %s -OtherFilteredTasks=Otras tareas filtradas +NoAssignedTasks=Sin tareas asignadas (se asigna proyecto / tareas desde el cuadro de selección superior para ingresar la hora en él) AllowCommentOnProject=Permitir comentarios de los usuarios sobre los proyectos diff --git a/htdocs/langs/es_CL/workflow.lang b/htdocs/langs/es_CL/workflow.lang index 9bca2f3b442..cd9e6580ee7 100644 --- a/htdocs/langs/es_CL/workflow.lang +++ b/htdocs/langs/es_CL/workflow.lang @@ -6,7 +6,7 @@ descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crear automáticamente un pedido de cliente descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Cree automáticamente una factura de cliente después de que se firme una propuesta comercial (la nueva factura tendrá el mismo importe que la propuesta) descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Crear automáticamente una factura de cliente después de que un contrato es validado descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Cree automáticamente una factura de cliente después de cerrar una orden de cliente (la nueva factura tendrá el mismo importe que la orden) -descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Clasifique la (s) propuesta (s) fuente (s) vinculada (s) a facturar cuando el pedido del cliente se configura para facturar (y si el monto del pedido es igual al monto total de propuestas vinculadas firmadas) +descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Clasifique la(s) fuente(s) propuesta(s) vinculada(s) a facturar cuando el pedido del cliente se configura para facturar (y si el monto del pedido es igual al monto total de propuestas vinculadas firmadas) descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Clasifique la (s) propuesta (s) fuente (s) vinculada (s) para facturar cuando la factura del cliente sea validada (y si el monto de la factura es igual al monto total de las propuestas vinculadas firmadas) descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Clasifique los pedidos de origen del cliente vinculados para facturar cuando se valida la factura del cliente (y si el importe de la factura es igual al importe total de los pedidos vinculados) descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Clasifique los pedidos de origen del cliente vinculados para facturar cuando la factura del cliente se establece como pagada (y si el importe de la factura es igual al importe total de los pedidos vinculados) diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang index a07b67603b4..a128bf4e651 100644 --- a/htdocs/langs/es_CO/admin.lang +++ b/htdocs/langs/es_CO/admin.lang @@ -1,9 +1,76 @@ # Dolibarr language file - Source file is en_US - admin +VersionProgram=Versión del programa +VersionLastInstall=Versión instalación inicial +VersionLastUpgrade=Última versión de actualización VersionUnknown=Desconocido -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" +VersionRecommanded=Recomendado +SessionId=ID Sesión +SessionSaveHandler=Manejador para grabar sesiones +SessionSavePath=Ubicación de almacenamiento de sesión +PurgeSessions=Limpiado de sesiones +ConfirmPurgeSessions=¿Realmente quiere eliminar todas las sesiones? Ésto desconectará todos los usuarios (excepto a usted). +NoSessionListWithThisHandler=El manejador para grabar sesiones configurado en su PHP no permite listar todas las sesiones activas. +LockNewSessions=Bloquear conexiones nuevas +ConfirmLockNewSessions=¿Está seguro que desea restringir solo a usted cualquier conexión nueva a Dolibarr? Solo el usuario %s podrá conectarse después de esto. +UnlockNewSessions=Eliminar el bloqueo de conexión +Sessions=La sesión de usuarios +WebUserGroup=Grupo/Usuario del servidor web +NoSessionFound=Al parecer su PHP no permite listar las sesiones activas. La directiva usada para grabar sesiones (%s) parece estar protegida (Por ejemplo, por permisos del SO o por la directiva PHP open_basedir). +DBStoringCharset=Conjunto de caracteres de la base de datos para almacenar datos +DBSortingCharset=Conjunto de caracteres para organizar datos +WarningModuleNotActive=El módulo %s debe estar activo +WarningOnlyPermissionOfActivatedModules=Solo los permisos relacionados a los modulos activos se muestran acá. Puede activar otros modulos en la página Inicio->Configuración->Módulos. +DolibarrSetup=Instalación o actualización de Dolibarr +GUISetup=Mostrar +SetupArea=Área de configuración +FormToTestFileUploadForm=Formulario para probar la importación de archivos (según configuración) +IfModuleEnabled=Nota: solo aplica el SI en caso de que el modulo %s esté activo +RemoveLock=Eliminar el archivo %s solo en caso de existir para permitir el uso de la herramienta actualizar. +RestoreLock=Restaurar el archivo %s, con permisos de solo lectura, para desactivar cualquier uso de la herramienta actualizar. +SecuritySetup=Configuración de seguridad +ErrorModuleRequirePHPVersion=Error, éste módulo requiere la versión de PHP %s o superior +ErrorModuleRequireDolibarrVersion=Error, éste módulo requiere la versión Dolibarr %s o superior +ErrorDecimalLargerThanAreForbidden=Error, una precisión superior a %s no está soportada. +ErrorReservedTypeSystemSystemAuto=Los valores 'system' y 'systemauto' están reservados para tipo. Puede usar 'user' como valor para agregar su propio registro +ErrorCodeCantContainZero=El código no puede contener un valor de 0 +DisableJavascript=Desactivar las funcionalidades de Ajax y JavaScript (Recomendado para personas con discapacidad visual o navegadores de solo texto) +NumberOfKeyToSearch=Nro de caracteres para activar la búsqueda: %s +NotAvailableWhenAjaxDisabled=No disponible con Ajax desactivado +JavascriptDisabled=JavaScript desactivado +UsePreviewTabs=Use las pestañas de vista previa +ShowPreview=Mostrar vista previa +ThemeCurrentlyActive=Tema activo actualmente +CurrentTimeZone=Zona horaria de PHP (servidor) +Space=Espacio +Mask=Enmascarado +NextValue=Siguiente valor +NextValueForInvoices=Siguiente valor (facturas) +NextValueForCreditNotes=Siguiente valor (notas crédito) +MustBeLowerThanPHPLimit=Nota: su PHP limita el tamaño de cada archivo para importar a %s%s, cualquiera que sea el valor de éste parámetro +NoMaxSizeByPHPLimit=Nota: en la configuración de su PHP no está definido un límite +MaxSizeForUploadedFiles=Tamaño máximo para archivos importados (0 para desactivar cualquier importación) +UseCaptchaCode=Usar código gráfico (CAPTCHA) en la página de inicio de sesión +AntiVirusCommand=Ruta completa para el comando del antivirus +AntiVirusCommandExample=Ejemplo para ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
    Ejemplo para ClamAv: /usr/bin/clamscan +AntiVirusParam=Más parámetros en la línea de comando +ComptaSetup=Configuración del módulo contable +UserSetup=Configuración de la administración de usuarios +MenuLimits=Precisión y límites +MenuIdParent=ID del menú principal +DetailMenuIdParent=ID de un menú principal (dejar vacío para menú superior) +DetailPosition=Organizar número para definir la posición del menú AllMenus=Todo SetupShort=Configuración +OtherSetup=Otra configuración +CurrentValueSeparatorDecimal=Separador de decimales +CurrentValueSeparatorThousand=Separador de miles +LanguageBrowserParameter=Parámetro %s +ClientTZ=Zona Horaria del Cliente (usuario) +ClientHour=Hora del Cliente (usuario) +OSTZ=Zona Horaria del SO del Servidor +PHPTZ=Zona Hora del servidor PHP +DaylingSavingTime=Horario de verano +CurrentHour=Hora del PHP (servidor) Position=Puesto ExampleOfDirectoriesForModelGen=Examples of syntax:
    c:\\mydir
    /home/mydir
    DOL_DATA_ROOT/ecm/ecmdir Module42Name=Log diff --git a/htdocs/langs/es_EC/admin.lang b/htdocs/langs/es_EC/admin.lang index feb1ac47f06..3224e309358 100644 --- a/htdocs/langs/es_EC/admin.lang +++ b/htdocs/langs/es_EC/admin.lang @@ -28,7 +28,6 @@ WebUserGroup=Usuario/grupo del servidor web NoSessionFound=Su PHP parece no permitir la lista de sesiones activas. El directorio utilizado para guardar las sesiones (%s) puede estar protegido (por ejemplo, por los permisos del sistema operativo o por la directiva PHP open_basedir). DBStoringCharset=Conjunto de caracteres de base de datos para almacenar datos DBSortingCharset=Conjunto de caracteres de base de datos para ordenar los datos -ClientCharset=Juego de caracteres del cliente ClientSortingCharset=Intercalación de clientes WarningModuleNotActive=Módulo %s debe estar habilitado WarningOnlyPermissionOfActivatedModules=Solamente los permisos relacionados con los módulos activados se muestran aquí. Puede activar otros módulos desde: Inicio-> Configuración-> Página Módulos. @@ -366,7 +365,6 @@ ProductDocumentTemplates=Plantillas para generar documento de producto FreeLegalTextOnExpenseReports=Texto legal gratuita en los informes de gastos WatermarkOnDraftExpenseReports=Marca de agua en informes de gastos preliminares AttachMainDocByDefault=Configúrelo en 1 si desea adjuntar el documento principal al correo electrónico de forma predeterminada (si corresponde) -SendEmailsReminders=Enviar recordatorios de la agenda por correo electrónico Module0Name=Usuarios & Grupos Module0Desc=Gestión de Usuarios / Empleados y Grupos Module1Name=Clientes / Proveedores @@ -422,7 +420,7 @@ Module320Name=RSS Module320Desc=Añadir RSS dentro de las páginas de Dolibarr Module330Desc=Administración de marcadores Module400Name=Proyectos / Oportunidades / Prospectos -Module400Desc=Administración de proyectos, oportunidades o prospectos. A continuación, puede asignar cualquier elemento (factura, pedido, propuesta, intervención, ...) a un proyecto y obtener una vista transversal desde la vista de proyecto. +Module400Desc=198/5000\nGestión de proyectos, oportunidades/clientes potenciales y/o tareas. También puede asignar cualquier elemento (factura, orden, propuesta, intervención, ...) a un proyecto y obtener una vista transversal desde la vista del proyecto. Module410Name=Calendario web Module410Desc=Integración calendario web Module500Name=Gastos especiales @@ -706,8 +704,7 @@ DictionaryEMailTemplates=Plantillas de correo electrónico DictionaryProspectStatus=Estado de la prospección DictionaryHolidayTypes=Tipos de hojas DictionaryOpportunityStatus=Estado de la oportunidad del proyecto -DictionaryExpenseTaxCat=Informe de gastos - Categorías de transporte -DictionaryExpenseTaxRange=Informe de gastos - Rango por categoría de transporte +TypeOfRevenueStamp=Tipo de sello de ingresos VATManagement=Administración del IVA VATIsUsedDesc=Por defecto al crear prospectos, facturas, órdenes, etc la tasa de IVA sigue la regla estándar activa:
    Si el vendedor no está sujeto al IVA, entonces el IVA por defecto es 0. Fin de la regla.
    Si el (país vendedor = país comprador), entonces el IVA por defecto es igual al IVA del producto en el país vendedor. Fin de la regla.
    Si el vendedor y el comprador están en la Comunidad Europea y los bienes son productos de transporte (automóvil, barco, avión), el IVA por defecto es 0 (el IVA debe ser pagado por el comprador a la aduana de su país y no al vendedor). Fin de la regla.
    Si el vendedor y el comprador están en la Comunidad Europea y el comprador no es una empresa, entonces el IVA por defecto es el IVA del producto vendido. Fin de la regla.
    Si el vendedor y el comprador están en la Comunidad Europea y el comprador es una empresa, entonces el IVA es 0 por defecto. Fin de la regla.
    En cualquier otro caso, el impuesto por defecto es IVA = 0. Fin de la regla. VATIsNotUsedDesc=Por defecto, el IVA propuesto es 0, que puede utilizarse para casos como asociaciones, particulares o pequeñas empresas. @@ -1386,3 +1383,4 @@ WarningInstallationMayBecomeNotCompliantWithLaw=Intenta instalar el módulo %s q ResourceSetup=Configuración del módulo Recurso DisabledResourceLinkUser=Enlace de recurso inhabilitado al usuario DisabledResourceLinkContact=Enlace de recurso inhabilitado para contactar +ConfirmUnactivation=Confirmar restablecimiento del módulo diff --git a/htdocs/langs/es_EC/main.lang b/htdocs/langs/es_EC/main.lang index 532ca7bb612..3f299b9d4a5 100644 --- a/htdocs/langs/es_EC/main.lang +++ b/htdocs/langs/es_EC/main.lang @@ -238,7 +238,6 @@ ContactsAddressesForCompany=Contactos/direcciones de clientes AddressesForCompany=Direcciones de clientes ActionsOnCompany=Eventos sobre clientes ActionsOnMember=Eventos sobre miembros -ActionsOnProduct=Eventos sobre este producto NActionsLate=%s tarde RequestAlreadyDone=La solicitud ya se registró Filter=Filtrar diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang index 42804ff41ab..a5e4fbdf465 100644 --- a/htdocs/langs/es_ES/accountancy.lang +++ b/htdocs/langs/es_ES/accountancy.lang @@ -8,7 +8,7 @@ ACCOUNTING_EXPORT_AMOUNT=Exportar importe ACCOUNTING_EXPORT_DEVISE=Exportar divisa Selectformat=Seleccione el formato del archivo ACCOUNTING_EXPORT_FORMAT=Seleccione el formato del archivo -ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type +ACCOUNTING_EXPORT_ENDLINE=Seleccione el tipo de retorno de carro ACCOUNTING_EXPORT_PREFIX_SPEC=Especifique el prefijo del nombre de archivo ThisService=Este servicio ThisProduct=Este producto @@ -36,7 +36,7 @@ NotYetInGeneralLedger=No se ha registrado en el Libro Mayor GroupIsEmptyCheckSetup=El grupo está vacío, compruebe la configuración de grupos contables DetailByAccount=Ver detalles por cuenta AccountWithNonZeroValues=Cuentas con valores no cero -ListOfAccounts=List of accounts +ListOfAccounts=Lista de cuentas MainAccountForCustomersNotDefined=Cuenta contable para clientes no definida en la configuración MainAccountForSuppliersNotDefined=Cuenta contable para proveedores no definida en la configuración @@ -158,7 +158,7 @@ NumPiece=Apunte TransactionNumShort=Núm. transacción AccountingCategory=Grupos personalizados GroupByAccountAccounting=Agrupar por cuenta contable -AccountingAccountGroupsDesc=Puede definir aquí algunos grupos de cuentas contables. Se utilizarán en el informe %s para mostrar sus ingresos/gastos con los datos agrupados de acuerdo con estos grupos. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=Por cuentas ByPredefinedAccountGroups=Por grupos predefinidos ByPersonalizedAccountGroups=Por grupos personalizados @@ -168,7 +168,7 @@ DeleteMvt=Eliminar líneas del Libro Mayor DelYear=Año a eliminar DelJournal=Diario a eliminar ConfirmDeleteMvt=Esto eliminará todas las lineas del Libro Mayor del año y/o de un diario específico. Se requiere al menos un criterio. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvtPartial=Esto eliminará la transacción del libro mayor (se eliminarán todas las líneas relacionadas con la misma transacción) DelBookKeeping=Eliminar los registros del Libro Mayor FinanceJournal=Diario financiero ExpenseReportsJournal=Diario informe de gastos @@ -191,6 +191,7 @@ DescThirdPartyReport=Consulte aquí el listado de clientes y proveedores y sus c ListAccounts=Listado de cuentas contables UnknownAccountForThirdparty=Cuenta contable de tercero desconocida, usaremos %s UnknownAccountForThirdpartyBlocking=Cuenta contable de tercero desconocida. Error de bloqueo +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Grupo de cuenta Pcgsubtype=Subgrupo de cuenta @@ -220,7 +221,7 @@ MvtNotCorrectlyBalanced=Asiento contabilizado incorrectamente. Debe=%s. Haber=%s FicheVentilation=Ficha contable GeneralLedgerIsWritten=Transacciones escritas en el Libro Mayor GeneralLedgerSomeRecordWasNotRecorded=Algunas de las operaciones que no podrán registrarse. Si no hay un mensaje de error, es probable que ya estén contabilizadas -NoNewRecordSaved=No more record to journalize +NoNewRecordSaved=No hay más registros para el diario ListOfProductsWithoutAccountingAccount=Listado de productos sin cuentas contables ChangeBinding=Cambiar la unión @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=Este diario ya esta siendo usado ## Export ExportDraftJournal=Exportar libro borrador Modelcsv=Modelo de exportación -OptionsDeactivatedForThisExportModel=Las opciones están desactivadas para este modelo de exportación Selectmodelcsv=Seleccione un modelo de exportación Modelcsv_normal=Exportación clásica Modelcsv_CEGID=Exportar hacia CEGID Expert Comptabilité @@ -254,8 +254,8 @@ Modelcsv_ciel=Exportar hacia Sage Ciel Compta o Compta Evolution Modelcsv_quadratus=Exportar hacia Quadratus QuadraCompta Modelcsv_ebp=Exportar a EBP Modelcsv_cogilog=Eportar a Cogilog -Modelcsv_agiris=Exportar a Agiris (Test) -Modelcsv_configurable=Export Configurable +Modelcsv_agiris=Exportar a Agiris +Modelcsv_configurable=Exportación configurable ChartofaccountsId=Id plan contable ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index 288ebcfbf88..c8e8d5cfe43 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -40,8 +40,8 @@ WebUserGroup=Servidor web usuario/grupo NoSessionFound=Parece que su PHP no puede listar las sesiones activas. El directorio utilizado para el guardado de sesiones (%s) puede estar protegido (por ejemplo, por los permisos del sistema operativo o por la directiva open_basedir de su PHP). DBStoringCharset=Codificación de la base de datos para el almacenamiento de datos DBSortingCharset=Codificación de la base de datos para clasificar los datos -ClientCharset=Client charset -ClientSortingCharset=Client collation +ClientCharset=Juego de caracteres del cliente +ClientSortingCharset=Colación de clientes WarningModuleNotActive=El módulo %s debe ser activado WarningOnlyPermissionOfActivatedModules=Atención, solamente los permisos relacionados con los módulos activados se indican aquí. Puede activar los otros módulos en la página Configuración->Módulos DolibarrSetup=Instalación/Actualización de Dolibarr @@ -131,7 +131,7 @@ HoursOnThisPageAreOnServerTZ=Atención, al contrario de otras pantallas, las hor Box=Panel Boxes=Paneles MaxNbOfLinesForBoxes=Número máximo de líneas para paneles -AllWidgetsWereEnabled=All available widgets are enabled +AllWidgetsWereEnabled=Todos los widgets disponibles están habilitados PositionByDefault=Posición por defecto Position=Posición MenusDesc=Los gestores de menús definen el contenido de las dos barras de menú (horizontal y vertical) @@ -466,7 +466,7 @@ FreeLegalTextOnExpenseReports=Texto libre legal en los informes de gastos WatermarkOnDraftExpenseReports=Marca de agua en los informes de gastos AttachMainDocByDefault=Establezca esto en 1 si desea adjuntar el documento principal al e-mail de forma predeterminada (si corresponde) FilesAttachedToEmail=Adjuntar archivo -SendEmailsReminders=Send agenda reminders by emails +SendEmailsReminders=Enviar recordatorios de la agenda por correo electrónico # Modules Module0Name=Usuarios y grupos Module0Desc=Gestión de Usuarios / Empleados y grupos @@ -539,7 +539,7 @@ Module320Desc=Adición de hilos de información RSS en las pantallas Dolibarr Module330Name=Marcadores Module330Desc=Gestión de marcadores Module400Name=Proyectos/Oportunidades/Leads -Module400Desc=Gestión de proyectos, oportunidades o leads, Puede asignar cualquier elemento (factura, pedido, presupuesto, intervención, etc.) a un proyecto y obtener una vista transversal del proyecto +Module400Desc=Gestión de proyectos, oportunidades/leads o tareas, Puede asignar cualquier elemento (factura, pedido, presupuesto, intervención...) a un proyecto y obtener una vista transversal del proyecto Module410Name=Webcalendar Module410Desc=Interfaz con el calendario Webcalendar Module500Name=Pagos especiales @@ -601,11 +601,11 @@ Module20000Desc=Gestión de los días libres retribuidos de los empleados Module39000Name=Lotes de producto Module39000Desc=Gestión de lotes o series, fechas de caducidad y venta de los productos Module50000Name=PayBox -Module50000Desc=Module to offer an online payment page accepting payments with Credit/Debit card via PayBox. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...) +Module50000Desc=Módulo para ofrecer pagos online aceptando pagos con tarjeta de Débito/Crédito via PayBox. Esto puede ser usado para permitir a tus clientes realizar pagos libres o pagos en un objeto de Dolibarr en particular (factura, pedido...) Module50100Name=TPV Module50100Desc=Módulo punto de venta (TPV) Module50200Name=Paypal -Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...) +Module50200Desc=Módulo para ofrecer pagos online aceptando pagos utilizando PayPal (tarjeta de crédito o crédito PayPal). Esto puede ser usado para permitir a tus clientes realizar pagos libres o pagos en un objeto de Dolibarr en particular (factura, pedido...) Module50400Name=Contabilidad (avanzada) Module50400Desc=Gestión contable (doble partida, libros generales y auxiliares) Module54000Name=PrintIPP @@ -884,13 +884,13 @@ DictionaryTypeContact=Tipos de contactos/direcciones DictionaryEcotaxe=Baremos CEcoParticipación (DEEE) DictionaryPaperFormat=Formatos de papel DictionaryFormatCards=Formatos de fichas -DictionaryFees=Expense report - Types of expense report lines +DictionaryFees=Informe de gastos - Tipos de líneas de informe de gastos DictionarySendingMethods=Métodos de expedición DictionaryStaff=Empleados DictionaryAvailability=Tiempos de entrega DictionaryOrderMethods=Métodos de pedido DictionarySource=Orígenes de presupuestos/pedidos -DictionaryAccountancyCategory=Grupos personalizados +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Modelos de planes contables DictionaryAccountancyJournal=Diarios contables DictionaryEMailTemplates=Plantillas E-Mails @@ -898,12 +898,13 @@ DictionaryUnits=Unidades DictionaryProspectStatus=Estado cliente potencial DictionaryHolidayTypes=Tipos de honorarios DictionaryOpportunityStatus=Estado de oportunidad para el proyecto/lead -DictionaryExpenseTaxCat=Expense report - Transportation categories -DictionaryExpenseTaxRange=Expense report - Range by transportation category +DictionaryExpenseTaxCat=Informe de gastos - Categorías de transporte +DictionaryExpenseTaxRange=Informe de gastos - Rango por categoría de transporte SetupSaved=Configuración guardada SetupNotSaved=Configuración no guardada BackToModuleList=Volver a la lista de módulos BackToDictionaryList=Volver a la lista de diccionarios +TypeOfRevenueStamp=Tipo VATManagement=Gestión IVA VATIsUsedDesc=Por defecto cuando se crean presupuestos, facturas, pedidos, etc. el tipo de IVA sigue la regla estándar seleccionada:
    . Si el vendedor no está sujeto a IVA, entonces IVA por defecto es 0. Fin de la regla
    Si el país del vendedor = país del comprador, entonces el IVA por defecto es igual al IVA del producto en el país del vendedor. Fin de la regla.
    Si el vendedor y el comprador son de la Comunidad Europea y los bienes son productos de transporte (coche, barco, avión), el IVA por defecto es 0 (El IVA debe ser pagado por el comprador a la hacienda de su país y no al vendedor). Fin de la regla.
    Si el vendedor y el comprador están ambos en la Comunidad Europea y el comprador no es una empresa, entonces el IVA por defecto es el IVA del producto vendido. Fin de la regla.
    Si el vendedor y el comprador son de la Comunidad Europea y el comprador es una empresa, entonces el IVA es 0 por defecto. Fin de la regla.
    En cualquier otro caso el IVA propuesto por defecto es 0. Fin de la regla. VATIsNotUsedDesc=El tipo de IVA propuesto por defecto es 0. Este es el caso de asociaciones, particulares o algunas pequeñas sociedades. @@ -1408,7 +1409,7 @@ CompressionOfResources=Compresión de las respuestas HTTP CompressionOfResourcesDesc=Por ejemplo, utilizando la directiva Apache "AddOutputFilterByType DEFLATE" TestNotPossibleWithCurrentBrowsers=La detección automática no es posible con el navegador actual DefaultValuesDesc=Puede definir/forzar aquí el valor predeterminado que desea obtener cuando cree un nuevo registro y/o defina filtros u ordenaciones en sus registros de listados. -DefaultCreateForm=Default values (on forms to create) +DefaultCreateForm=Valores predeterminados (en formularios para crear) DefaultSearchFilters=Filtros de búsqueda por defecto DefaultSortOrder=Ordenaciones por defecto DefaultFocus=Campos de enfoque predeterminados @@ -1559,8 +1560,8 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Establecer automáticamente este valor por defecto AGENDA_DEFAULT_FILTER_TYPE=Establecer por defecto este tipo de evento en el filtro de búsqueda en la vista de la agenda AGENDA_DEFAULT_FILTER_STATUS=Establecer por defecto este estado de eventos en el filtro de búsqueda en la vista de la agenda AGENDA_DEFAULT_VIEW=Establecer la pestaña por defecto al seleccionar el menú Agenda -AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). Note: Module %s must be enabled and correctly setup to have reminder sent at the correct frequency. -AGENDA_REMINDER_BROWSER=Enable event reminder on users browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_EMAIL=Habilitar recordatorio de eventos por e-mail (definido en cada evento). Nota: El módulo %s debe estar habilitado y configurado correctamente para que el recordatorio se envíe a la frecuencia correcta. +AGENDA_REMINDER_BROWSER=Habilitar recordatorio de eventos en el navegador de los usuarios (cuando llega la fecha del evento, cada usuario puede rechazar esto desde la pregunta de confirmación del navegador) AGENDA_REMINDER_BROWSER_SOUND=Activar sonido de notificación AGENDA_SHOW_LINKED_OBJECT=Mostrar el link en la agenda ##### Clicktodial ##### @@ -1765,3 +1766,4 @@ ResourceSetup=Configuración del módulo Recursos UseSearchToSelectResource=Utilice un formulario de búsqueda para elegir un recurso (en lugar de una lista desplegable). DisabledResourceLinkUser=Desactivar enlace recursos a usuario DisabledResourceLinkContact=Desactivar enlace recurso a contacto +ConfirmUnactivation=Confirme el restablecimiento del módulo diff --git a/htdocs/langs/es_ES/banks.lang b/htdocs/langs/es_ES/banks.lang index a14a1975e7e..85bc94d9040 100644 --- a/htdocs/langs/es_ES/banks.lang +++ b/htdocs/langs/es_ES/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Número LineRecord=Registro AddBankRecord=Añadir registro AddBankRecordLong=Añadir registro manual +Conciliated=Reconciliado ConciliatedBy=Conciliado por DateConciliating=Fecha conciliación BankLineConciliated=Registro conciliado diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang index e4b3d93e527..7cf978aba75 100644 --- a/htdocs/langs/es_ES/bills.lang +++ b/htdocs/langs/es_ES/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Facturas pendientes de pago a %s BillsLate=Retraso en el pago BillsStatistics=Estadísticas de facturas a clientes BillsStatisticsSuppliers=Estadísticas de facturas de proveedores +DisabledBecauseDispatchedInBookkeeping=Desactivado porque la factura se contabilizó +DisabledBecauseNotLastInvoice=Desactivado porque la factura no se puede borrar. Se han creado facturas después de esta y crearían huecos en el contador. DisabledBecauseNotErasable=Desactivado ya que no puede eliminarse InvoiceStandard=Factura estándar InvoiceStandardAsk=Factura estándar @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=¿Porqué quiere clasificar esta factura como 'abandon ConfirmClassifyPaidPartially=¿Está seguro de querer cambiar el estado de la factura %s a pagado? ConfirmClassifyPaidPartiallyQuestion=Esta factura no ha sido pagado completamente. ¿Cual es la razón para cerrar esta factura? ConfirmClassifyPaidPartiallyReasonAvoir=El resto a pagar (%s %s) es un descuento otorgado por pronto pago. Regularizaré el IVA con un abono. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=El resto a pagar (%s %s) es un descuento otorgado por pronto pago. Acepto perder el IVA en este descuento. ConfirmClassifyPaidPartiallyReasonDiscountVat=El resto a pagar (%s %s) es un descuento otorgado por pronto pago. Recuperaré el IVA sin usar un abono. ConfirmClassifyPaidPartiallyReasonBadCustomer=Cliente moroso @@ -334,9 +337,9 @@ FrequencyPer_y=Cada %s años FrequencyUnit=Frecuencia toolTipFrequency=Ejemplos:
    Indicar 7, Día: creará una nueva factura cada 7 días
    Indicar 3, Mes: creará una nueva factura cada 3 meses NextDateToExecution=Fecha para la generación de la próxima factura -NextDateToExecutionShort=Date next gen. +NextDateToExecutionShort=Fecha próxima generación DateLastGeneration=Fecha de la última generación -DateLastGenerationShort=Date latest gen. +DateLastGenerationShort=Fecha última generación MaxPeriodNumber=Nº máximo de facturas a generar NbOfGenerationDone=Nº de facturas ya generadas NbOfGenerationDoneShort=Generados @@ -514,6 +517,6 @@ DeleteRepeatableInvoice=Eliminar plantilla de factura ConfirmDeleteRepeatableInvoice=¿Está seguro de querer borrar la plantilla para facturas? CreateOneBillByThird=Crear una factura por tercero (de lo contrario, una factura por pedido) BillCreated=%s factura(s) creadas -StatusOfGeneratedDocuments=Status of document generation -DoNotGenerateDoc=Do not generate document file -AutogenerateDoc=Auto generate document file +StatusOfGeneratedDocuments=Estado de la generación de documentos +DoNotGenerateDoc=No generar archivo de documento +AutogenerateDoc=Generar automáticamente archivo de documento diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang index 02b78ad6253..18eb89f6dbd 100644 --- a/htdocs/langs/es_ES/compta.lang +++ b/htdocs/langs/es_ES/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Pagos vinculados a ninguna factura, por lo que ningu PaymentsNotLinkedToUser=Pagos no vinculados a un usuario Profit=Beneficio AccountingResult=Resultado contable +BalanceBefore=Balance (before) Balance=Saldo Debit=Debe Credit=Haber diff --git a/htdocs/langs/es_ES/donations.lang b/htdocs/langs/es_ES/donations.lang index f115cf9aa66..fddc435971d 100644 --- a/htdocs/langs/es_ES/donations.lang +++ b/htdocs/langs/es_ES/donations.lang @@ -31,3 +31,4 @@ 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=Pago de donación +DonationValidated=Donation %s validated diff --git a/htdocs/langs/es_ES/ecm.lang b/htdocs/langs/es_ES/ecm.lang index fbd0f0b1f70..d0dd4ed578a 100644 --- a/htdocs/langs/es_ES/ecm.lang +++ b/htdocs/langs/es_ES/ecm.lang @@ -6,7 +6,7 @@ ECMSectionAuto=Directorio automático ECMSectionsManual=Árbol manual ECMSectionsAuto=Árbol automático ECMSections=Directorios -ECMRoot=ECM Root +ECMRoot=Raíz del ECM ECMNewSection=Nuevo directorio ECMAddSection=Añadir directorio ECMCreationDate=Fecha creación @@ -18,7 +18,7 @@ ECMArea=Área GED ECMAreaDesc=El área GED (Gestión Electrónica de Documentos) le permite guardar, compartir y buscar rápidamente todo tipo de documentos en Dolibarr. ECMAreaDesc2=Puede crear directorios manuales y adjuntar los documentos
    Los directorios automáticos son rellenados automáticamente en la adición de un documento en una ficha. ECMSectionWasRemoved=El directorio %s ha sido eliminado -ECMSectionWasCreated=Directory %s has been created. +ECMSectionWasCreated=El directorio %s ha sido creado. ECMSearchByKeywords=Buscar por palabras clave ECMSearchByEntity=Buscar por objeto ECMSectionOfDocuments=Directorios de documentos @@ -47,4 +47,4 @@ ReSyncListOfDir=Resincronizar la lista de directorios HashOfFileContent=Hash de contenido de archivo FileNotYetIndexedInDatabase=Archivo aún no indexado en la base de datos (intente volver a cargarlo) FileSharedViaALink=Archivo compartido a través de un enlace -NoDirectoriesFound=No directories found +NoDirectoriesFound=No se encontraron directorios diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang index 7f70290f9d6..bdd30414b9a 100644 --- a/htdocs/langs/es_ES/errors.lang +++ b/htdocs/langs/es_ES/errors.lang @@ -155,7 +155,8 @@ ErrorPriceExpression19=Expresión no encontrada ErrorPriceExpression20=Expresión vacía ErrorPriceExpression21=Resultado '%s' vacío ErrorPriceExpression22=Resultado '%s' negativo -ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression23=Variable desconocida o no establecida '%s' en %s +ErrorPriceExpression24=La variable '%s' existe pero no tiene valor ErrorPriceExpressionInternal=Error interno '%s' ErrorPriceExpressionUnknown=Error desconocido '%s' ErrorSrcAndTargetWarehouseMustDiffers=Los almacenes de origen y destino deben de ser diferentes @@ -203,9 +204,9 @@ ErrorObjectMustHaveLinesToBeValidated=Objeto %s debe tener líneas para ser vali ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Sólo se pueden enviar facturas validadas mediante la acción masiva "Enviar por e-mail". ErrorChooseBetweenFreeEntryOrPredefinedProduct=Debe elegir si el artículo es un producto predefinido o no ErrorDiscountLargerThanRemainToPaySplitItBefore=El descuento que usted intenta aplicar es más grande que el resto a pagar. Divida el descuento en 2 descuentos más pequeños antes. -ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently. -ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference. -ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number. +ErrorFileNotFoundWithSharedLink=Archivo no encontrado. Puede ser que la clave compartida se haya modificado o que el archivo se haya eliminado recientemente. +ErrorProductBarCodeAlreadyExists=El código de barras del producto %s ya existe en otra referencia de producto. +ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Tenga en cuenta también que no es posible utilizar productos virtuales para aumentar/disminuir automáticamente subproductos cuando al menos un subproducto (o subproducto de subproductos) necesita un número de serie/lote. # Warnings WarningPasswordSetWithNoAccount=Se fijó una contraseña para este miembro. Sin embargo, no se ha creado ninguna cuenta de usuario. Así que esta contraseña no se puede utilizar para acceder a Dolibarr. Puede ser utilizada por un módulo/interfaz externo, pero si no necesitar definir accesos de un miembro, puede desactivar la opción "Administrar un inicio de sesión para cada miembro" en la configuración del módulo miembros. Si necesita administrar un inicio de sesión, pero no necesita ninguna contraseña, puede dejar este campo vacío para evitar esta advertencia. Nota: También puede usarse el correo electrónico como inicio de sesión si el miembro está vinculada a un usuario. diff --git a/htdocs/langs/es_ES/install.lang b/htdocs/langs/es_ES/install.lang index c0fb4bdfd34..d35c414f40c 100644 --- a/htdocs/langs/es_ES/install.lang +++ b/htdocs/langs/es_ES/install.lang @@ -139,8 +139,9 @@ KeepDefaultValuesDeb=Está utilizando el asistente de instalación Dolibarr de u KeepDefaultValuesMamp=Está utilizando el asistente de instalación DoliMamp, los valores propuestos aquí están optimizados. Cambielos solamente si está seguro de ello. KeepDefaultValuesProxmox=Está utilizando el asistente de instalación Dolibarr desde una máquina virtual Proxmox, los valores propuestos aquí están optimizados. Cambielos solamente si está seguro de ello. UpgradeExternalModule=Ejecutar proceso dedicado para actualizar módulos externos -SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' -NothingToDelete=Nothing to clean/delete +SetAtLeastOneOptionAsUrlParameter=Establezca al menos una opción como parámetro en URL. Por ejemplo: '... repair.php?standard=confirmed' +NothingToDelete=Nada para limpiar/eliminar +NothingToDo=Nada que hacer ######### # upgrade MigrationFixData=Corrección de datos desnormalizados @@ -192,10 +193,11 @@ MigrationActioncommElement=Actualización de los datos de acciones sobre element MigrationPaymentMode=Actualización de los modos de pago MigrationCategorieAssociation=Actualización de las categorías MigrationEvents=Migración de eventos para agregar propietario de evento en la tabla de asignacion -MigrationEventsContact=Migration of events to add event contact into assignement table +MigrationEventsContact=Migración de eventos para agregar contacto de evento en la tabla de asignación MigrationRemiseEntity=Actualizando el campo entity de llx_societe_remise MigrationRemiseExceptEntity=Actualizando el campo entity de llx_societe_remise_except MigrationReloadModule=Recargar módulo %s +MigrationResetBlockedLog=Restablecer el módulo BlockedLog para el algoritmo v7 ShowNotAvailableOptions=Mostrar opciones no disponibles HideNotAvailableOptions=Ocultar opciones no disponibles ErrorFoundDuringMigration=Se ha producido un error durante el proceso de migración, por lo que el siguiente paso no está disponible. Para ignorar errores puede hacer clic aquí, pero la aplicación a algunas funcionalidades pueden no funcionar correctamente mientras no se arregle el problema. diff --git a/htdocs/langs/es_ES/languages.lang b/htdocs/langs/es_ES/languages.lang index df07ba7d72d..d460b1e968f 100644 --- a/htdocs/langs/es_ES/languages.lang +++ b/htdocs/langs/es_ES/languages.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - languages Language_ar_AR=Árabe -Language_ar_EG=Arabic (Egypt) +Language_ar_EG=Árabe (Egipto) Language_ar_SA=Árabe Language_bn_BD=Bengalí Language_bg_BG=Búlgaro @@ -35,6 +35,7 @@ Language_es_PA=Español (Panamá) Language_es_PY=Español (Paraguay) Language_es_PE=Español (Perú) Language_es_PR=Español (Puerto Rico) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Español (Venezuela) Language_et_EE=Estonio Language_eu_ES=Vasco diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang index 0e416883d1e..729daa6ebcf 100644 --- a/htdocs/langs/es_ES/main.lang +++ b/htdocs/langs/es_ES/main.lang @@ -425,7 +425,7 @@ ContactsAddressesForCompany=Contactos/direcciones de este tercero AddressesForCompany=Direcciones de este tercero ActionsOnCompany=Eventos respecto a este tercero ActionsOnMember=Eventos respecto a este miembro -ActionsOnProduct=Events about this product +ActionsOnProduct=Eventos sobre este producto NActionsLate=%s en retraso RequestAlreadyDone=Solicitud ya registrada Filter=Filtro @@ -548,6 +548,18 @@ MonthShort09=sep. MonthShort10=oct. MonthShort11=nov. MonthShort12=dic. +MonthVeryShort01=J +MonthVeryShort02=V +MonthVeryShort03=L +MonthVeryShort04=A +MonthVeryShort05=L +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=D +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Archivos y documentos adjuntos JoinMainDoc=Unir al documento principal DateFormatYYYYMM=YYYY-MM @@ -762,7 +774,7 @@ SetBankAccount=Definir cuenta bancaria AccountCurrency=Divisa de la cuenta ViewPrivateNote=Ver notas XMoreLines=%s línea(s) ocultas -ShowMoreLines=Mostrar más líneas +ShowMoreLines=Mostrar más/menos líneas PublicUrl=URL pública AddBox=Añadir caja SelectElementAndClick=Seleccione un elemento y haga clic %s @@ -900,3 +912,5 @@ CommentPage=Espacio de comentarios CommentAdded=Comentario añadido CommentDeleted=Comentario borrado Everybody=Proyecto compartido +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/es_ES/modulebuilder.lang b/htdocs/langs/es_ES/modulebuilder.lang index 150e62b39b5..6be47b732bf 100644 --- a/htdocs/langs/es_ES/modulebuilder.lang +++ b/htdocs/langs/es_ES/modulebuilder.lang @@ -60,7 +60,7 @@ ReadmeFile=Fichero leeme ChangeLog=Fichero ChangeLog TestClassFile=Archivo para la clase de PHP Test SqlFile=Fichero Sql -PageForLib=File for PHP libraries +PageForLib=Archivo para bibliotecas PHP SqlFileExtraFields=Archivo Sql para atributos complementarios SqlFileKey=Fichero Sql de claves AnObjectAlreadyExistWithThisNameAndDiffCase=Un objeto ya existe con este nombre y un caso diferente @@ -70,7 +70,7 @@ DirScanned=Directorio analizado NoTrigger=No hay trigger NoWidget=No hay widget GoToApiExplorer=Ir al Explorador de API -ListOfMenusEntries=List of menu entries +ListOfMenusEntries=Lista de entradas de menú ListOfPermissionsDefined=Listado de permisos definidos EnabledDesc=Condición para tener este campo activo (Ejemplos: 1 o $conf->global->MYMODULE_MYOPTION) VisibleDesc=¿Es el campo visible? (Ejemplos: 0=Nunca visible, 1=Visible en listado y en formularios creación /actualización/visualización, 2=Visible en listado solamente, 3=Visible en formularios creación /actualización/visualización. Usar un valor negativo significa que no se muestra el campo predeterminado en el listado pero se puede seleccionar para verlo) @@ -85,10 +85,10 @@ TriggerDefDesc=Defina en el archivo trigger el código que desea ejecutar para c SeeIDsInUse=Ver IDs en uso en su instalación SeeReservedIDsRangeHere=Ver rango de IDs reservados ToolkitForDevelopers=Herramientas para desarrolladores de Dolibarr -TryToUseTheModuleBuilder=If you have knowledge in SQL and PHP, you can try to use the native module builder wizard. Just enable the module and use the wizard by clicking the on the top right menu. Warning: This is a developer feature, bad use may breaks your application. -SeeTopRightMenu=See on the top right menu -AddLanguageFile=Add language file -YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages") -DropTableIfEmpty=(Delete table if empty) -TableDoesNotExists=The table %s does not exists -TableDropped=Table %s deleted +TryToUseTheModuleBuilder=Si tiene conocimientos en SQL y PHP, puede intentar utilizar el asistente nativo de creación de módulos. Simplemente active el módulo y use el asistente haciendo clic en en el menú superior derecho. Advertencia: esta es una funcionalidad para desarrolladores, un uso inadecuado puede romper su aplicación. +SeeTopRightMenu=Ver en el menú superior derecho +AddLanguageFile=Añadir archivo de idioma +YouCanUseTranslationKey=Aquí puede usar una clave que es la clave de traducción encontrada en el archivo de idioma (ver pestaña "Idiomas") +DropTableIfEmpty=(Eliminar tabla si está vacía) +TableDoesNotExists=La tabla %s no existe +TableDropped=Tabla %s eliminada diff --git a/htdocs/langs/es_ES/opensurvey.lang b/htdocs/langs/es_ES/opensurvey.lang index d76f22d0177..d8c903ef943 100644 --- a/htdocs/langs/es_ES/opensurvey.lang +++ b/htdocs/langs/es_ES/opensurvey.lang @@ -57,4 +57,4 @@ ErrorInsertingComment=Se ha producido un error al insertar su comentario MoreChoices=Introduzca más opciones para los votantes SurveyExpiredInfo=La encuesta se ha cerrado o el periodo para la votación de ha terminado. EmailSomeoneVoted=%s ha rellenado una línea.\nPuede encontrar su encuesta en el enlace:\n%s -ShowSurvey=Show survey +ShowSurvey=Mostrar encuesta diff --git a/htdocs/langs/es_ES/orders.lang b/htdocs/langs/es_ES/orders.lang index 3676a11fe28..25e4a009ea8 100644 --- a/htdocs/langs/es_ES/orders.lang +++ b/htdocs/langs/es_ES/orders.lang @@ -152,7 +152,7 @@ OrderCreated=Sus pedidos han sido creados OrderFail=Se ha producido un error durante la creación de sus pedidos CreateOrders=Crear pedidos ToBillSeveralOrderSelectCustomer=Para crear una factura para numerosos pedidos, haga primero click sobre el cliente y luego elija "%s". -OptionToSetOrderBilledNotEnabled=Option (from module Workflow) to set order to 'Billed' automatically when invoice is validated is off, so you will have to set status of order to 'Billed' manually. -IfValidateInvoiceIsNoOrderStayUnbilled=If invoice validation is 'No', the order will remain to status 'Unbilled' until the invoice is validated. +OptionToSetOrderBilledNotEnabled=La opción (del módulo Flujo de trabajo) para configurar automáticamente el pedido como 'Facturado' cuando se valida la factura está desactivado, por lo que deberá establecer el estado de la orden en 'Facturado' manualmente. +IfValidateInvoiceIsNoOrderStayUnbilled=Si la validación de la factura es 'No', la orden permanecerá en estado 'Sin facturar' hasta que la factura sea validada. CloseReceivedSupplierOrdersAutomatically=Cerrar el pedido automáticamente a "%s" si se han recibido todos los productos SetShippingMode=Indica el modo de envío diff --git a/htdocs/langs/es_ES/other.lang b/htdocs/langs/es_ES/other.lang index 32247b5643c..2646aea5291 100644 --- a/htdocs/langs/es_ES/other.lang +++ b/htdocs/langs/es_ES/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=si el importe es mayor que %s SourcesRepository=Repositorio de los fuentes Chart=Gráfico PassEncoding=Cifrado de contraseña +PermissionsAdd=Permisos añadidos +PermissionsDelete=Permisos eliminados ##### Export ##### ExportsArea=Área de exportaciones diff --git a/htdocs/langs/es_ES/printing.lang b/htdocs/langs/es_ES/printing.lang index 32d63a413d6..352718f6cb9 100644 --- a/htdocs/langs/es_ES/printing.lang +++ b/htdocs/langs/es_ES/printing.lang @@ -9,8 +9,8 @@ PrintingDriverDesc=Configuración variables para el driver de impresión. ListDrivers=Listado de drivers PrintTestDesc=Listado de Impresoras. FileWasSentToPrinter=El archivo %s ha sido enviado a la impresora -ViaModule=via the module -NoActivePrintingModuleFound=No active driver to print document. Check setup of module %s. +ViaModule=a través del módulo +NoActivePrintingModuleFound=No hay un controlador activo para imprimir el documento. Verifique la configuración del módulo %s. PleaseSelectaDriverfromList=Seleccione un driver del listado. PleaseConfigureDriverfromList=Configure el driver seleccionado del listado. SetupDriver=Configuración driver diff --git a/htdocs/langs/es_ES/productbatch.lang b/htdocs/langs/es_ES/productbatch.lang index fca5f648e32..1a6500487f1 100644 --- a/htdocs/langs/es_ES/productbatch.lang +++ b/htdocs/langs/es_ES/productbatch.lang @@ -21,4 +21,4 @@ ProductDoesNotUseBatchSerial=Este producto no usa lotes/series ProductLotSetup=Configuración del módulo lotes/series ShowCurrentStockOfLot=Mostrar el stock actual de este producto/lote ShowLogOfMovementIfLot=Ver los movimientos de stock de este producto/lote -StockDetailPerBatch=Stock detail per lot +StockDetailPerBatch=Detalle de stock por lote diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang index 9b5829341f8..394aa9e6be1 100644 --- a/htdocs/langs/es_ES/products.lang +++ b/htdocs/langs/es_ES/products.lang @@ -196,14 +196,15 @@ CurrentProductPrice=Precio actual AlwaysUseNewPrice=Usar siempre el precio actual AlwaysUseFixedPrice=Usar el precio fijado PriceByQuantity=Precios diferentes por cantidad +DisablePriceByQty=Desactivar precios por cantidad PriceByQuantityRange=Rango cantidad MultipriceRules=Reglas para segmento de precios UseMultipriceRules=Use las reglas de segmentación de precios (definidas en la configuración de módulo de productos) para autocalcular los precios de todos los demás segmentos de acuerdo con el primer segmento PercentVariationOver=%% variación sobre %s PercentDiscountOver=%% descuento sobre %s KeepEmptyForAutoCalculation=Manténgase vacío para que se calcule automáticamente el peso o volumen de productos -VariantRefExample=Example: COL -VariantLabelExample=Example: Color +VariantRefExample=Ejemplo: COL +VariantLabelExample=Ejemplo: Color ### composition fabrication Build=Fabricar ProductsMultiPrice=Productos y precios para cada segmento de precios @@ -287,8 +288,8 @@ ConfirmDeleteProductBuyPrice=¿Está seguro de querer eliminar este precio de co SubProduct=Subproducto ProductSheet=Hoja de producto ServiceSheet=Hoja de servicio -PossibleValues=Possible values -GoOnMenuToCreateVairants=Go on menu %s - %s to prepare attribute variants (like colors, size, ...) +PossibleValues=Valores posibles +GoOnMenuToCreateVairants=Vaya al menú %s - %s para preparar variantes de atributos (como colores, tamaño, ...) #Attributes VariantAttributes=Atributos de variantes diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang index 1391de93c1a..52220bc443c 100644 --- a/htdocs/langs/es_ES/projects.lang +++ b/htdocs/langs/es_ES/projects.lang @@ -21,7 +21,7 @@ OnlyOpenedProject=Sólo los proyectos abiertos son visibles (los proyectos en es ClosedProjectsAreHidden=Los proyectos cerrados 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=All tasks for qualified projects are visible, but you can enter time only for task assigned to selected user. Assign task if you need to enter time on it. +AllTaskVisibleButEditIfYouAreAssigned=Todas las tareas de este proyecto son visibles, pero solo puede indicar tiempos en las tareas que tenga asignadas. Asígnese tareas si desea indicar tiempos en ellas. OnlyYourTaskAreVisible=Sólo puede ver tareas que le son asignadas. Asignese tareas si no son visibles y desea indicar tiempos en ellas. ImportDatasetTasks=Tareas de proyectos ProjectCategories=Etiquetas/categorías de proyectos @@ -97,7 +97,7 @@ ActivityOnProjectThisWeek=Actividad en el proyecto esta semana ActivityOnProjectThisMonth=Actividad en el proyecto este mes ActivityOnProjectThisYear=Actividad en el proyecto este año ChildOfProjectTask=Hilo de la tarea -ChildOfTask=Child of task +ChildOfTask=Hijo de la tarea NotOwnerOfProject=No es responsable de este proyecto privado AffectedTo=Asignado a CantRemoveProject=Este proyecto no puede ser eliminado porque está referenciado por muchos objetos (facturas, pedidos u otras). ver la lista en la pestaña Referencias. @@ -171,13 +171,13 @@ ProjectMustBeValidatedFirst=El proyecto debe validarse primero FirstAddRessourceToAllocateTime=Asignar un usuario a la tarea para asignar tiempo InputPerDay=Entrada por día InputPerWeek=Entrada por semana -InputDetail=Input detail +InputDetail=Detalle de entrada TimeAlreadyRecorded=Tiempo dedicado ya registrado para esta tarea/día y usuario %s ProjectsWithThisUserAsContact=Proyectos con este usuario como contacto TasksWithThisUserAsContact=Tareas asignadas a este usuario ResourceNotAssignedToProject=No asignado al proyecto ResourceNotAssignedToTheTask=No asignado a la tarea -TimeSpentBy=Time spent by +TimeSpentBy=Tiempo dedicado por TasksAssignedTo=Tareas asignadas a AssignTaskToMe=Asignarme tarea AssignTaskToUser=Asignar la tarea a %s @@ -211,9 +211,12 @@ OppStatusPENDING=Pendiente OppStatusWON=Ganado OppStatusLOST=Perdido Budget=Presupuesto +AllowToLinkFromOtherCompany=Permitir vincular proyecto de otra empresa

    Valores admitidos:
    - Mantener vacío: puede vincular cualquier proyecto de la empresa (predeterminado)
    - "todo": puede vincular cualquier proyecto, incluso proyectos de otras empresas
    - Una lista de identificación de terceros separada por comas: puede vincular todos los proyectos de esos terceros definidos (Ejemplo: 123,4795,53)
    LatestProjects=Últimos %s presupuestos -LatestModifiedProjects=Latest %s modified projects -OtherFilteredTasks=Other filtered tasks +LatestModifiedProjects=Últimos %s proyectos modificados +OtherFilteredTasks=Otras tareas filtradas +NoAssignedTasks=Sin tareas asignadas ( Asígnese tareas si desea indicar tiempos en ellas) # Comments trans AllowCommentOnTask=Permitir comentarios de los usuarios sobre las tareas AllowCommentOnProject=Permitir comentarios de los usuarios en los proyectos + diff --git a/htdocs/langs/es_ES/stripe.lang b/htdocs/langs/es_ES/stripe.lang index ea506474dc6..36b58efe61e 100644 --- a/htdocs/langs/es_ES/stripe.lang +++ b/htdocs/langs/es_ES/stripe.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - stripe StripeSetup=Configuración del módulo Stripe -StripeDesc=Module to offer an online payment page accepting payments with Credit/Debit card via Stripe. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...) +StripeDesc=Este módulo le ofrece páginas para permitir el pago a clientes mediante Stripe. Puede usarse para un pago libre o para un pago de un objeto en concreto de Dolibarr (factura, pedido...) StripeOrCBDoPayment=Pagar con tarjeta de crédito o Stripe FollowingUrlAreAvailableToMakePayments=Las siguientes URL están disponibles para permitir a un cliente efectuar un pago PaymentForm=Formulario de pago diff --git a/htdocs/langs/es_ES/website.lang b/htdocs/langs/es_ES/website.lang index 5ec93449518..38a2155f292 100644 --- a/htdocs/langs/es_ES/website.lang +++ b/htdocs/langs/es_ES/website.lang @@ -3,15 +3,17 @@ Shortname=Código WebsiteSetupDesc=Cree aquí tanto la entrada como el número de diferentes sitios web que necesita. Entonces entre en el menú de sitios web para editarlos. DeleteWebsite=Eliminar sitio web ConfirmDeleteWebsite=¿Está seguro de querer eliminar este sitio web? Todas las páginas y contenido también sera eliminado +WEBSITE_TYPE_CONTAINER=Tipo de página/contenedor WEBSITE_PAGENAME=Nombre/alias página -WEBSITE_HTML_HEADER=Cabecera HTML -HtmlHeaderPage=Encabezado HTML específico para la página WEBSITE_CSS_URL=URL del fichero CSS externo WEBSITE_CSS_INLINE=Contenido del archivo CSS (común a todas las páginas) WEBSITE_JS_INLINE=Contenido del archivo Javascript (común a todas las páginas) +WEBSITE_HTML_HEADER=Adición en la parte inferior del encabezado HTML (común a todas las páginas) WEBSITE_ROBOT=Archivo de robots (robots.txt) WEBSITE_HTACCESS=Archivo .htaccess del sitio web +HtmlHeaderPage=Encabezado HTML (específico de esta página solamente) PageNameAliasHelp=Nombre o alias de la página.
    Este alias es utilizado también para construir una URL SEO cuando el website sea lanzado desde un Host Virtual de un servidor (como Apache, Nginx...). Usar el botón "%s" para editar este alias. +EditTheWebSiteForACommonHeader=Nota: Si desea definir un encabezado personalizado para todas las páginas, edite el encabezado en el nivel del sitio en lugar de en la página/contenedor. MediaFiles=Librería de medios EditCss=Editar Estilo/CSS o cabecera HTML EditMenu=Editar menu @@ -21,7 +23,7 @@ AddWebsite=Añadir sitio web Webpage=Página web/Contenedor AddPage=Añadir página/contenedor HomePage=Página de inicio -PageContainer=Page/container +PageContainer=Página/contenedor PreviewOfSiteNotYetAvailable=Vista previa de su sitio web %s todavía no disponible. Debe de añadir primero una página. RequestedPageHasNoContentYet=La página pedida con id %s todavía no tiene contenido, o cache file.tpl.php ha sido eliminado. Editar el contenido de la página para resolverlo. PageContent=Página/Contenedor @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL del Host Virtual servido por un servidor externo no NoPageYet=No hay páginas todavía SyntaxHelp=Ayuda en la sintaxis del código YouCanEditHtmlSourceckeditor=Puede editar código fuente HTML utilizando el botón "Origen" en el editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=Puede editar el código fuente HTML usando el botón "Origen" en el editor. También puede incluir código PHP en esta fuente mediante etiquetas <?php ?>. Las siguientes variables globales están disponibles: $conf, $langs, $db, $mysoc, $user, $website.

    También puede incluir contenido de otra Página/Contenedor con la siguiente sintaxis: <?php dolIncludeHtmlContent ($websitekey. '/contentaliastoinclude.php'); ?>

    Para incluir un vínculo para descargar un archivo almacenado en el directorio de documentos/medios, utilice la sintaxis:
    <a href="/document.php?modulepart=medias&file=filename.ext". ClonePage=Clonar página/contenedor CloneSite=Clonar sitio SiteAdded=Sitio web agregado @@ -53,7 +55,12 @@ OrEnterPageInfoManually=O crear una página vacía desde cero ... FetchAndCreate=Buscar y crear ExportSite=Exportar sitio IDOfPage=Id de la página +Banner=Anuncio +BlogPost=Entrada en el blog WebsiteAccount=Cuenta del sitio web WebsiteAccounts=Cuentas del sitio web AddWebsiteAccount=Crear cuenta de sitio web -BackToListOfThirdParty=Back to list for Third Party +BackToListOfThirdParty=Volver a la lista de Terceros +DisableSiteFirst=Deshabilite primero el sitio web +MyContainerTitle=Título de mi sitio web +AnotherContainer=Otro contenedor diff --git a/htdocs/langs/es_ES/workflow.lang b/htdocs/langs/es_ES/workflow.lang index 90ed8ecebcb..1f20a2bc19e 100644 --- a/htdocs/langs/es_ES/workflow.lang +++ b/htdocs/langs/es_ES/workflow.lang @@ -12,9 +12,9 @@ descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Clasificar presupuesto(s) origen como descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Clasificar los presupuesto(s) origen como facturados cuando la factura a cliente sea validada (y si el importe de la factura es igual a la suma de los importes de los presupuestos relacionados) descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Clasificar pedido(s) de cliente origen como facturado cuando la factura a cliente se valide (y si el importe de la factura es igual a la suma de los importes de los pedidos relacionados) descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Clasificar pedido(s) de cliente origen como facturado cuando la factura a cliente sea marcada como pagada (y si el importe de la factura es la misma que la suma de los importes de los pedidos relacionados) -descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update) +descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Clasificar automáticamente el pedido origen como enviado cuando el envío se valide (y si la cantidad enviada por todos los envíos sea la misma que el pedido) # Autoclassify supplier order -descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals) -descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders) +descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Clasificar automáticamente el presupuestos(s) de proveedor como facturado cuando la factura se valide (y si el importe de la factura sea la misma que el total de los presupuestos enlazados) +descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Clasificar automáticamente el pedido(s) a proveedor como facturado cuando la factura se valide (y si el importe de la factura sea la misma que el total de los pedidos enlazados) AutomaticCreation=Creación automática AutomaticClassification=Clasificación automática diff --git a/htdocs/langs/es_MX/accountancy.lang b/htdocs/langs/es_MX/accountancy.lang index fe048417f2e..845cd70b1fe 100644 --- a/htdocs/langs/es_MX/accountancy.lang +++ b/htdocs/langs/es_MX/accountancy.lang @@ -67,7 +67,6 @@ AccountingJournalType9=Tiene nuevo ErrorAccountingJournalIsAlreadyUse=Este diario ya está en uso ExportDraftJournal=Exportar borrador de diario Modelcsv_CEGID=Exportar con compatibilidad para CEGID Expert -Modelcsv_agiris=Exportar a Agiris (En pruebas aún) SomeMandatoryStepsOfSetupWereNotDone=Algunos pasos obligatorios de la instalación no se realizaron, favor de completar ExportNotSupported=El formato de exportación configurado no se admite en esta página NoJournalDefined=Ningún diario definido diff --git a/htdocs/langs/es_PE/accountancy.lang b/htdocs/langs/es_PE/accountancy.lang index 360f1e5239b..b1df43fc96a 100644 --- a/htdocs/langs/es_PE/accountancy.lang +++ b/htdocs/langs/es_PE/accountancy.lang @@ -49,5 +49,4 @@ Codejournal=Periódico DelBookKeeping=Eliminar registro del libro mayor FinanceJournal=Periodo Financiero TotalMarge=Margen total de ventas -OptionsDeactivatedForThisExportModel=Para este modelo de exportación, las opciones están desactivadas Modelcsv_CEGID=Exportar hacia CEGID Experto contable diff --git a/htdocs/langs/et_EE/accountancy.lang b/htdocs/langs/et_EE/accountancy.lang index f2d1f83b70c..0ab54681bf1 100644 --- a/htdocs/langs/et_EE/accountancy.lang +++ b/htdocs/langs/et_EE/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Piece number TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=List of the accounting accounts UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal Modelcsv=Eksportimise mudel -OptionsDeactivatedForThisExportModel=For this export model, options are deactivated Selectmodelcsv=Vali eksportimise mudel Modelcsv_normal=Tavaline eksportimine Modelcsv_CEGID=Export towards CEGID Expert Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution Modelcsv_quadratus=Export towards Quadratus QuadraCompta Modelcsv_ebp=Export towards EBP Modelcsv_cogilog=Export towards Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang index be7a6dda739..006931843c5 100644 --- a/htdocs/langs/et_EE/admin.lang +++ b/htdocs/langs/et_EE/admin.lang @@ -539,7 +539,7 @@ Module320Desc=Lisa RSS voog Dolibarri lehtedele Module330Name=Järjehoidjad Module330Desc=Järjehoidjate haldamine 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. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=WebCalendari integratsioon Module500Name=Erikulud @@ -890,7 +890,7 @@ DictionaryStaff=Personal DictionaryAvailability=Tarneaeg DictionaryOrderMethods=Tellimisviisid DictionarySource=Pakkumiste/tellimuste päritolu -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Kontoplaani mudelid DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=Emails templates @@ -904,6 +904,7 @@ SetupSaved=Seadistused salvestatud SetupNotSaved=Setup not saved BackToModuleList=Tagasi moodulite nimekirja BackToDictionaryList=Tagasi sõnastike nimekirja +TypeOfRevenueStamp=Type of revenue stamp VATManagement=Käibemaksu haldamine VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is VAT=0. End of rule. VATIsNotUsedDesc=Vaikimisi pakutakse käibemaksumääraks 0, mida kasutavad näiteks mittetulundusühingud, eraisikud või väikesed ettevõtted. @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/et_EE/banks.lang b/htdocs/langs/et_EE/banks.lang index 579b0cd9aa7..dc8a3661c9b 100644 --- a/htdocs/langs/et_EE/banks.lang +++ b/htdocs/langs/et_EE/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Number LineRecord=Tehing AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Reconciled ConciliatedBy=Tehingu kandis sisse DateConciliating=Vastavusse viimise kuupäev BankLineConciliated=Entry reconciled diff --git a/htdocs/langs/et_EE/bills.lang b/htdocs/langs/et_EE/bills.lang index c26f3de0451..5644528524b 100644 --- a/htdocs/langs/et_EE/bills.lang +++ b/htdocs/langs/et_EE/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s BillsLate=Hilinenud maksed BillsStatistics=Müügiiarvete statistika BillsStatisticsSuppliers=Ostuarvete statistika +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Disabled because cannot be erased InvoiceStandard=Standardne arve InvoiceStandardAsk=Standardne arve @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=Halb klient diff --git a/htdocs/langs/et_EE/compta.lang b/htdocs/langs/et_EE/compta.lang index 9a3994dd100..e67c48cc64b 100644 --- a/htdocs/langs/et_EE/compta.lang +++ b/htdocs/langs/et_EE/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Makseid ei ole seotud ühegi arvega, seega ei ole nad PaymentsNotLinkedToUser=Ühegi kasutajaga sidumata maksed Profit=Kasum AccountingResult=Accounting result +BalanceBefore=Balance (before) Balance=Saldo Debit=Deebet Credit=Kreedit diff --git a/htdocs/langs/et_EE/donations.lang b/htdocs/langs/et_EE/donations.lang index 6b7606b2d12..3ce6a497b4a 100644 --- a/htdocs/langs/et_EE/donations.lang +++ b/htdocs/langs/et_EE/donations.lang @@ -31,3 +31,4 @@ 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 +DonationValidated=Donation %s validated diff --git a/htdocs/langs/et_EE/errors.lang b/htdocs/langs/et_EE/errors.lang index 152510c711f..940d0719bc9 100644 --- a/htdocs/langs/et_EE/errors.lang +++ b/htdocs/langs/et_EE/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Empty expression ErrorPriceExpression21=Empty result '%s' ErrorPriceExpression22=Negative result '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Lähteladu ja sihtladu peavad olema erinevad diff --git a/htdocs/langs/et_EE/install.lang b/htdocs/langs/et_EE/install.lang index e5b727dcb91..552a4aac11b 100644 --- a/htdocs/langs/et_EE/install.lang +++ b/htdocs/langs/et_EE/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=Kasutad Proxmoxi virtuaalrakendusest pärit Dolibarri p UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Paranda denormaliseeritud andmed @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Update entity field value of llx_societe_remise MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except MigrationReloadModule=Reload module %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Näita mitte saadaval olevaid lisavalikuid HideNotAvailableOptions=Peida mitte saadaval olevad lisavalikud ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. diff --git a/htdocs/langs/et_EE/languages.lang b/htdocs/langs/et_EE/languages.lang index 91d15131487..030be5b8ea5 100644 --- a/htdocs/langs/et_EE/languages.lang +++ b/htdocs/langs/et_EE/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Hispaania (Paraguay) Language_es_PE=Hispaania (Peruu) Language_es_PR=Hispaania (Puerto Rico) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Spanish (Venezuela) Language_et_EE=Eesti Language_eu_ES=Baski diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang index 1b598e53cad..01fb2752d12 100644 --- a/htdocs/langs/et_EE/main.lang +++ b/htdocs/langs/et_EE/main.lang @@ -548,6 +548,18 @@ MonthShort09=sep MonthShort10=okt MonthShort11=nov MonthShort12=det +MonthVeryShort01=J +MonthVeryShort02=R +MonthVeryShort03=E +MonthVeryShort04=A +MonthVeryShort05=E +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=P +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Manustatud failid ja dokumendid JoinMainDoc=Join main document DateFormatYYYYMM=YYYY-MM @@ -762,7 +774,7 @@ SetBankAccount=Määratle pangakonto AccountCurrency=Account currency ViewPrivateNote=Vaata märkmeid XMoreLines=%s joon(t) varjatud -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=Avalik link AddBox=Lisa kast SelectElementAndClick=Select an element and click %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=Kõik +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/et_EE/other.lang b/htdocs/langs/et_EE/other.lang index 6409c9b4a15..88d84d606e7 100644 --- a/htdocs/langs/et_EE/other.lang +++ b/htdocs/langs/et_EE/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=If amount higher than %s SourcesRepository=Repository for sources Chart=Chart PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=Ekspordi ala diff --git a/htdocs/langs/et_EE/products.lang b/htdocs/langs/et_EE/products.lang index e30dc551627..fcf07a643cd 100644 --- a/htdocs/langs/et_EE/products.lang +++ b/htdocs/langs/et_EE/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Hetkehind AlwaysUseNewPrice=Kasuta alati toote/teenuse hetkehinda AlwaysUseFixedPrice=Kasuta fikseeritud hinda PriceByQuantity=Different prices by quantity +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Koguse ulatus MultipriceRules=Price segment rules UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/et_EE/projects.lang b/htdocs/langs/et_EE/projects.lang index 78a5267fde7..8a372222602 100644 --- a/htdocs/langs/et_EE/projects.lang +++ b/htdocs/langs/et_EE/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=Ootel OppStatusWON=Won OppStatusLOST=Lost Budget=Budget +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/et_EE/website.lang b/htdocs/langs/et_EE/website.lang index 6e7966a1f8b..cc369c00dfe 100644 --- a/htdocs/langs/et_EE/website.lang +++ b/htdocs/langs/et_EE/website.lang @@ -3,15 +3,17 @@ Shortname=Kood WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them. DeleteWebsite=Delete website ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Page name/alias -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL of external CSS file WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Media library EditCss=Edit Style/CSS or HTML header EditMenu=Edit menu @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/eu_ES/accountancy.lang b/htdocs/langs/eu_ES/accountancy.lang index 9dbf911a820..c4189507f60 100644 --- a/htdocs/langs/eu_ES/accountancy.lang +++ b/htdocs/langs/eu_ES/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Piece number TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=List of the accounting accounts UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal 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 Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution Modelcsv_quadratus=Export towards Quadratus QuadraCompta Modelcsv_ebp=Export towards EBP Modelcsv_cogilog=Export towards Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang index eea71e0240f..2f7ab7e0ce5 100644 --- a/htdocs/langs/eu_ES/admin.lang +++ b/htdocs/langs/eu_ES/admin.lang @@ -539,7 +539,7 @@ Module320Desc=Add RSS feed inside Dolibarr screen pages Module330Name=Laster-markak Module330Desc=Laster-marken kudeaketa 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. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Web-egutegia Module410Desc=Web-egutegiaren integrazioa Module500Name=Special expenses @@ -890,7 +890,7 @@ DictionaryStaff=Staff DictionaryAvailability=Delivery delay DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Models for chart of accounts DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=Emails templates @@ -904,6 +904,7 @@ SetupSaved=Setup saved SetupNotSaved=Setup not saved BackToModuleList=Back to modules list BackToDictionaryList=Back to dictionaries list +TypeOfRevenueStamp=Type of revenue stamp VATManagement=BEZ-a kudeatzea VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is 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. @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/eu_ES/banks.lang b/htdocs/langs/eu_ES/banks.lang index dc363563b41..21f332fa231 100644 --- a/htdocs/langs/eu_ES/banks.lang +++ b/htdocs/langs/eu_ES/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Zenbakia LineRecord=Transaction AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Reconciled ConciliatedBy=Reconciled by DateConciliating=Reconcile date BankLineConciliated=Entry reconciled diff --git a/htdocs/langs/eu_ES/bills.lang b/htdocs/langs/eu_ES/bills.lang index 63b2be5a53e..6e7b05d08cd 100644 --- a/htdocs/langs/eu_ES/bills.lang +++ b/htdocs/langs/eu_ES/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s BillsLate=Late payments BillsStatistics=Customers invoices statistics BillsStatisticsSuppliers=Suppliers invoices statistics +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Disabled because cannot be erased InvoiceStandard=Standard invoice InvoiceStandardAsk=Standard invoice @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=Bezero txarra diff --git a/htdocs/langs/eu_ES/compta.lang b/htdocs/langs/eu_ES/compta.lang index ec2dc84599c..680c0555449 100644 --- a/htdocs/langs/eu_ES/compta.lang +++ b/htdocs/langs/eu_ES/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to PaymentsNotLinkedToUser=Payments not linked to any user Profit=Profit AccountingResult=Accounting result +BalanceBefore=Balance (before) Balance=Balance Debit=Debit Credit=Credit diff --git a/htdocs/langs/eu_ES/donations.lang b/htdocs/langs/eu_ES/donations.lang index b0f418974f8..413f5a28f1c 100644 --- a/htdocs/langs/eu_ES/donations.lang +++ b/htdocs/langs/eu_ES/donations.lang @@ -31,3 +31,4 @@ 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 +DonationValidated=Donation %s validated diff --git a/htdocs/langs/eu_ES/errors.lang b/htdocs/langs/eu_ES/errors.lang index b02b70c9c9f..cff89a71d98 100644 --- a/htdocs/langs/eu_ES/errors.lang +++ b/htdocs/langs/eu_ES/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Empty expression ErrorPriceExpression21=Empty result '%s' ErrorPriceExpression22=Negative result '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs diff --git a/htdocs/langs/eu_ES/install.lang b/htdocs/langs/eu_ES/install.lang index 7a93fd20799..e602c54640c 100644 --- a/htdocs/langs/eu_ES/install.lang +++ b/htdocs/langs/eu_ES/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtua UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Fix for denormalized data @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Update entity field value of llx_societe_remise MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except MigrationReloadModule=Reload module %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Show not available options HideNotAvailableOptions=Hide not available options ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. diff --git a/htdocs/langs/eu_ES/languages.lang b/htdocs/langs/eu_ES/languages.lang index a0f667de010..e3469947240 100644 --- a/htdocs/langs/eu_ES/languages.lang +++ b/htdocs/langs/eu_ES/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Spanish (Paraguay) Language_es_PE=Gaztelania (Peru) Language_es_PR=Spanish (Puerto Rico) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Spanish (Venezuela) Language_et_EE=Estonian Language_eu_ES=Euskera diff --git a/htdocs/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang index fb42141e5ca..30faa02c7d2 100644 --- a/htdocs/langs/eu_ES/main.lang +++ b/htdocs/langs/eu_ES/main.lang @@ -548,6 +548,18 @@ MonthShort09=Ira MonthShort10=Urr MonthShort11=Aza MonthShort12=Abe +MonthVeryShort01=J +MonthVeryShort02=F +MonthVeryShort03=M +MonthVeryShort04=A +MonthVeryShort05=M +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=S +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Attached files and documents JoinMainDoc=Join main document DateFormatYYYYMM=UUUU-HH @@ -762,7 +774,7 @@ SetBankAccount=Define Bank Account AccountCurrency=Account currency ViewPrivateNote=View notes XMoreLines=%s line(s) hidden -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=Public URL AddBox=Add box SelectElementAndClick=Select an element and click %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=Everybody +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/eu_ES/other.lang b/htdocs/langs/eu_ES/other.lang index 53998f6926a..0f56f48ece3 100644 --- a/htdocs/langs/eu_ES/other.lang +++ b/htdocs/langs/eu_ES/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=If amount higher than %s SourcesRepository=Repository for sources Chart=Chart PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=Exports area diff --git a/htdocs/langs/eu_ES/products.lang b/htdocs/langs/eu_ES/products.lang index 279f7a8173a..c00526a519e 100644 --- a/htdocs/langs/eu_ES/products.lang +++ b/htdocs/langs/eu_ES/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Current price AlwaysUseNewPrice=Always use current price of product/service AlwaysUseFixedPrice=Use the fixed price PriceByQuantity=Different prices by quantity +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Quantity range MultipriceRules=Price segment rules UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/eu_ES/projects.lang b/htdocs/langs/eu_ES/projects.lang index 17489a8b419..ae7bfdb824a 100644 --- a/htdocs/langs/eu_ES/projects.lang +++ b/htdocs/langs/eu_ES/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=Pending OppStatusWON=Won OppStatusLOST=Lost Budget=Budget +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/eu_ES/website.lang b/htdocs/langs/eu_ES/website.lang index 16827743cbb..0b56dc760b0 100644 --- a/htdocs/langs/eu_ES/website.lang +++ b/htdocs/langs/eu_ES/website.lang @@ -3,15 +3,17 @@ Shortname=Kodea WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them. DeleteWebsite=Delete website ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Page name/alias -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL of external CSS file WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Media library EditCss=Edit Style/CSS or HTML header EditMenu=Edit menu @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/fa_IR/accountancy.lang b/htdocs/langs/fa_IR/accountancy.lang index aae67f99d75..7cfb9e9c178 100644 --- a/htdocs/langs/fa_IR/accountancy.lang +++ b/htdocs/langs/fa_IR/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Piece number TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=فهرست حساب های حسابداری UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal Modelcsv=نوع صادرات -OptionsDeactivatedForThisExportModel=برای این نوع صادرات، انتخاب ها غیر فعال شده است Selectmodelcsv=انتخاب مدل صادرات Modelcsv_normal=صادرات سنتی Modelcsv_CEGID=صادرات بر اساس CEGID Expert Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution Modelcsv_quadratus=Export towards Quadratus QuadraCompta Modelcsv_ebp=Export towards EBP Modelcsv_cogilog=Export towards Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang index 81015a336ca..7059048d107 100644 --- a/htdocs/langs/fa_IR/admin.lang +++ b/htdocs/langs/fa_IR/admin.lang @@ -539,7 +539,7 @@ Module320Desc=اضافه کردن خوراک RSS در داخل صفحات صفح Module330Name=بوک مارک ها Module330Desc=مدیریت بوک مارک ها Module400Name=Projects/Opportunities/Leads -Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=ادغام Webcalendar Module500Name=هزینه های ویژه @@ -890,7 +890,7 @@ DictionaryStaff=کارکنان DictionaryAvailability=تاخیر در تحویل DictionaryOrderMethods=مرتب سازی بر روش DictionarySource=منبع از پیشنهادات / سفارشات -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=مدل برای نمودار حساب DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=الگوهای ایمیل @@ -904,6 +904,7 @@ SetupSaved=راه اندازی نجات داد SetupNotSaved=Setup not saved BackToModuleList=بازگشت به لیست ماژول ها BackToDictionaryList=برگشت به فهرست واژه نامه ها +TypeOfRevenueStamp=Type of revenue stamp VATManagement=مدیریت مالیات بر ارزش افزوده VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is VAT=0. End of rule. VATIsNotUsedDesc=به طور پیش فرض مالیات بر ارزش افزوده ارائه شده است 0 که می تواند برای موارد مانند ارتباط استفاده می شود، افراد عضو جدید می توانید شرکت های کوچک است. @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/fa_IR/banks.lang b/htdocs/langs/fa_IR/banks.lang index a36e1ccb8d5..1a89cbbc589 100644 --- a/htdocs/langs/fa_IR/banks.lang +++ b/htdocs/langs/fa_IR/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=شماره LineRecord=معامله AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Reconciled ConciliatedBy=آشتی با DateConciliating=تاريخ آشتی BankLineConciliated=Entry reconciled diff --git a/htdocs/langs/fa_IR/bills.lang b/htdocs/langs/fa_IR/bills.lang index c3afcfbb9c5..16d0242444b 100644 --- a/htdocs/langs/fa_IR/bills.lang +++ b/htdocs/langs/fa_IR/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s BillsLate=پرداخت در اواخر BillsStatistics=Customers invoices statistics BillsStatisticsSuppliers=Suppliers invoices statistics +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Disabled because cannot be erased InvoiceStandard=صورت حساب استاندارد InvoiceStandardAsk=صورت حساب استاندارد @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=مشتری بد diff --git a/htdocs/langs/fa_IR/compta.lang b/htdocs/langs/fa_IR/compta.lang index 27d2cca66ed..b48ecdb2521 100644 --- a/htdocs/langs/fa_IR/compta.lang +++ b/htdocs/langs/fa_IR/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=پرداخت به هر فاکتور در ارتباط PaymentsNotLinkedToUser=پرداخت به هر کاربر در ارتباط نیست Profit=سود AccountingResult=Accounting result +BalanceBefore=Balance (before) Balance=تعادل Debit=بدهی Credit=اعتبار diff --git a/htdocs/langs/fa_IR/donations.lang b/htdocs/langs/fa_IR/donations.lang index 62295b56b9e..2bb1d0bb466 100644 --- a/htdocs/langs/fa_IR/donations.lang +++ b/htdocs/langs/fa_IR/donations.lang @@ -31,3 +31,4 @@ 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 +DonationValidated=Donation %s validated diff --git a/htdocs/langs/fa_IR/errors.lang b/htdocs/langs/fa_IR/errors.lang index 55420e2b360..6979cd9ffe4 100644 --- a/htdocs/langs/fa_IR/errors.lang +++ b/htdocs/langs/fa_IR/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Empty expression ErrorPriceExpression21=Empty result '%s' ErrorPriceExpression22=Negative result '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=منبع و هدف انبارها باید متفاوت diff --git a/htdocs/langs/fa_IR/install.lang b/htdocs/langs/fa_IR/install.lang index 21b705e8c25..4fec2d61286 100644 --- a/htdocs/langs/fa_IR/install.lang +++ b/htdocs/langs/fa_IR/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=شما با استفاده از جادوگر در را UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=ثابت برای داده های denormalized @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Update entity field value of llx_societe_remise MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except MigrationReloadModule=Reload module %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=نمایش گزینه های در دسترس نیست HideNotAvailableOptions=پنهان کردن گزینه های در دسترس نیست ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. diff --git a/htdocs/langs/fa_IR/languages.lang b/htdocs/langs/fa_IR/languages.lang index 2f1a72260ac..1ea52293ee3 100644 --- a/htdocs/langs/fa_IR/languages.lang +++ b/htdocs/langs/fa_IR/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=اسپانیایی پروگوئه Language_es_PE=اسپانیایی پرو Language_es_PR=اسپانیایی (پورتوریکو) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Spanish (Venezuela) Language_et_EE=زبان استونی Language_eu_ES=باسک diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang index 8e6cfc1b06b..fa304b6f5b5 100644 --- a/htdocs/langs/fa_IR/main.lang +++ b/htdocs/langs/fa_IR/main.lang @@ -548,6 +548,18 @@ MonthShort09=سپتامبر MonthShort10=اکتبر MonthShort11=نوامبر MonthShort12=دسامبر +MonthVeryShort01=J +MonthVeryShort02=F +MonthVeryShort03=M +MonthVeryShort04=A +MonthVeryShort05=M +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=S +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=اسناد و فایل های پیوست شده JoinMainDoc=Join main document DateFormatYYYYMM=YYYY-MM @@ -762,7 +774,7 @@ SetBankAccount=تعریف حساب های بانکی AccountCurrency=Account currency ViewPrivateNote=مشاهده یادداشت XMoreLines=٪ خط (بازدید کنندگان) پنهان -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=URL عمومی AddBox=اضافه کردن جعبه SelectElementAndClick=Select an element and click %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=هر کسی +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/fa_IR/other.lang b/htdocs/langs/fa_IR/other.lang index 7f2e33d29e9..76b29107e18 100644 --- a/htdocs/langs/fa_IR/other.lang +++ b/htdocs/langs/fa_IR/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=If amount higher than %s SourcesRepository=Repository for sources Chart=Chart PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=منطقه صادرات diff --git a/htdocs/langs/fa_IR/products.lang b/htdocs/langs/fa_IR/products.lang index dd278be1111..959ec00e0c0 100644 --- a/htdocs/langs/fa_IR/products.lang +++ b/htdocs/langs/fa_IR/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=قیمت کنونی AlwaysUseNewPrice=همیشه قیمت فعلی محصول / خدمات استفاده AlwaysUseFixedPrice=استفاده از قیمت های ثابت PriceByQuantity=Different prices by quantity +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=دامنه تعداد MultipriceRules=Price segment rules UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/fa_IR/projects.lang b/htdocs/langs/fa_IR/projects.lang index fc4a4cc0b79..a9d49fb7817 100644 --- a/htdocs/langs/fa_IR/projects.lang +++ b/htdocs/langs/fa_IR/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=در انتظار OppStatusWON=Won OppStatusLOST=Lost Budget=Budget +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/fa_IR/website.lang b/htdocs/langs/fa_IR/website.lang index e019dc542aa..649c60e3080 100644 --- a/htdocs/langs/fa_IR/website.lang +++ b/htdocs/langs/fa_IR/website.lang @@ -3,15 +3,17 @@ Shortname=رمز WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them. DeleteWebsite=Delete website ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Page name/alias -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL of external CSS file WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Media library EditCss=Edit Style/CSS or HTML header EditMenu=Edit menu @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/fi_FI/accountancy.lang b/htdocs/langs/fi_FI/accountancy.lang index 18b50c3d63f..d9b92969f3d 100644 --- a/htdocs/langs/fi_FI/accountancy.lang +++ b/htdocs/langs/fi_FI/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Piece number TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=List of the accounting accounts UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal 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 Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution Modelcsv_quadratus=Export towards Quadratus QuadraCompta Modelcsv_ebp=Export towards EBP Modelcsv_cogilog=Export towards Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang index 7dc4b1ffd00..428a0dbbd78 100644 --- a/htdocs/langs/fi_FI/admin.lang +++ b/htdocs/langs/fi_FI/admin.lang @@ -539,7 +539,7 @@ Module320Desc=Lisää RSS-syöte sisällä Dolibarr näytön sivuilla Module330Name=Kirjanmerkit Module330Desc=Kirjanmerkkien hallinta 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. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar yhdentyminen Module500Name=Special expenses @@ -890,7 +890,7 @@ DictionaryStaff=Henkilökunta DictionaryAvailability=Toimituksen viivästyminen DictionaryOrderMethods=Tilaaminen menetelmät DictionarySource=Alkuperä ehdotusten / tilaukset -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Models for chart of accounts DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=Emails templates @@ -904,6 +904,7 @@ SetupSaved=Setup tallennettu SetupNotSaved=Setup not saved BackToModuleList=Palaa moduulien luetteloon BackToDictionaryList=Palaa sanakirjat luettelo +TypeOfRevenueStamp=Type of revenue stamp VATManagement=Alv Management VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is VAT=0. End of rule. VATIsNotUsedDesc=Oletusarvon ehdotettu alv on 0, jota voidaan käyttää tapauksissa, kuten yhdistysten, yksityishenkilöiden tai pieniä yrityksiä. @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/fi_FI/banks.lang b/htdocs/langs/fi_FI/banks.lang index 258f3c98889..677b6e428cb 100644 --- a/htdocs/langs/fi_FI/banks.lang +++ b/htdocs/langs/fi_FI/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Numero LineRecord=Tapahtuma AddBankRecord=Lisää merkintä AddBankRecordLong=Lisää mernkintä manuaalisesti +Conciliated=Täsmäytetty ConciliatedBy=Sovetteli DateConciliating=Sovittelupäivä BankLineConciliated=Merkintä täsmäytetty diff --git a/htdocs/langs/fi_FI/bills.lang b/htdocs/langs/fi_FI/bills.lang index 66e97851998..f1eda0303a3 100644 --- a/htdocs/langs/fi_FI/bills.lang +++ b/htdocs/langs/fi_FI/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s BillsLate=Maksuviivästykset BillsStatistics=Asiakkaiden laskujen tilastot BillsStatisticsSuppliers=Tavarantoimittaja laskujen tilastot +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Poistettu käytöstä koska ei voida poistaa InvoiceStandard=Oletuslasku InvoiceStandardAsk=Oletuslasku @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=Huono asiakas diff --git a/htdocs/langs/fi_FI/compta.lang b/htdocs/langs/fi_FI/compta.lang index a6dd9d1fa12..61f1f3dab58 100644 --- a/htdocs/langs/fi_FI/compta.lang +++ b/htdocs/langs/fi_FI/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Maksut eivät ole sidoksissa mihinkään lasku, joten PaymentsNotLinkedToUser=Maksut eivät ole sidoksissa mihinkään käyttäjä Profit=Voitto AccountingResult=Accounting result +BalanceBefore=Balance (before) Balance=Saldo Debit=Debet Credit=Credit diff --git a/htdocs/langs/fi_FI/donations.lang b/htdocs/langs/fi_FI/donations.lang index daaefc0f5a7..93072e82e4b 100644 --- a/htdocs/langs/fi_FI/donations.lang +++ b/htdocs/langs/fi_FI/donations.lang @@ -31,3 +31,4 @@ 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 +DonationValidated=Donation %s validated diff --git a/htdocs/langs/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang index 6985eb1860b..31d528c7170 100644 --- a/htdocs/langs/fi_FI/errors.lang +++ b/htdocs/langs/fi_FI/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Empty expression ErrorPriceExpression21=Empty result '%s' ErrorPriceExpression22=Negative result '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs diff --git a/htdocs/langs/fi_FI/install.lang b/htdocs/langs/fi_FI/install.lang index dba45650cf0..88b0dd14a50 100644 --- a/htdocs/langs/fi_FI/install.lang +++ b/htdocs/langs/fi_FI/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=Käytät Dolibarr ohjatun päässä Proxmox virtuaaline UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Korjaus denormalized tiedot @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Update entity field value of llx_societe_remise MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except MigrationReloadModule=Reload module %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Näytä ei saatavilla olevat valinnat HideNotAvailableOptions=Piilota ei saatavilla olevat valinnat ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. diff --git a/htdocs/langs/fi_FI/languages.lang b/htdocs/langs/fi_FI/languages.lang index f5dade45bfe..b85a07f5bb9 100644 --- a/htdocs/langs/fi_FI/languages.lang +++ b/htdocs/langs/fi_FI/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Espanja (Paraguay) Language_es_PE=Espanja (Peru) Language_es_PR=Espanja (Puerto Rico) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Spanish (Venezuela) Language_et_EE=Virolainen Language_eu_ES=Baski diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang index 2ff248c9e68..629acd09211 100644 --- a/htdocs/langs/fi_FI/main.lang +++ b/htdocs/langs/fi_FI/main.lang @@ -548,6 +548,18 @@ MonthShort09=syyskuu MonthShort10=lokakuu MonthShort11=marraskuu MonthShort12=joulukuu +MonthVeryShort01=J +MonthVeryShort02=PE +MonthVeryShort03=MA +MonthVeryShort04=A +MonthVeryShort05=MA +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=SU +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Liitetyt tiedostot ja asiakirjat JoinMainDoc=Join main document DateFormatYYYYMM=VVVV-KK @@ -762,7 +774,7 @@ SetBankAccount=Define Bank Account AccountCurrency=Account currency ViewPrivateNote=Katso huomiot XMoreLines=%s rivi(ä) piilossa -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=Julkinen URL AddBox=Lisää laatikko SelectElementAndClick=Select an element and click %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=Yhteiset hanke +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/fi_FI/other.lang b/htdocs/langs/fi_FI/other.lang index de5cfdffa9a..9b6f9678493 100644 --- a/htdocs/langs/fi_FI/other.lang +++ b/htdocs/langs/fi_FI/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=If amount higher than %s SourcesRepository=Repository for sources Chart=Chart PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=Vienti alueen diff --git a/htdocs/langs/fi_FI/products.lang b/htdocs/langs/fi_FI/products.lang index 856b9ec0b3d..17f05adf40d 100644 --- a/htdocs/langs/fi_FI/products.lang +++ b/htdocs/langs/fi_FI/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Nykyinen hinta AlwaysUseNewPrice=Always use current price of product/service AlwaysUseFixedPrice=Use the fixed price PriceByQuantity=Different prices by quantity +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Quantity range MultipriceRules=Price segment rules UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/fi_FI/projects.lang b/htdocs/langs/fi_FI/projects.lang index eed3b793f7b..edc2999efa2 100644 --- a/htdocs/langs/fi_FI/projects.lang +++ b/htdocs/langs/fi_FI/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=Pending OppStatusWON=Won OppStatusLOST=Lost Budget=Budget +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/fi_FI/website.lang b/htdocs/langs/fi_FI/website.lang index 87de6df7170..7be7649bc02 100644 --- a/htdocs/langs/fi_FI/website.lang +++ b/htdocs/langs/fi_FI/website.lang @@ -3,15 +3,17 @@ Shortname=Koodi WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them. DeleteWebsite=Delete website ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Page name/alias -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL of external CSS file WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Media library EditCss=Edit Style/CSS or HTML header EditMenu=Edit menu @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/fr_CA/accountancy.lang b/htdocs/langs/fr_CA/accountancy.lang index 785340659cb..ef4fb31a806 100644 --- a/htdocs/langs/fr_CA/accountancy.lang +++ b/htdocs/langs/fr_CA/accountancy.lang @@ -127,7 +127,6 @@ Modelcsv_ciel=Exporter vers Sage Ciel Compta ou Compta Evolution Modelcsv_quadratus=Exporter vers Quadratus QuadraCompta Modelcsv_ebp=Exporter vers EBP Modelcsv_cogilog=Exporter vers Cogilog -Modelcsv_agiris=Export vers Agiris (test) ChartofaccountsId=Carte comptable Id InitAccountancy=Compabilité initiale DefaultBindingDesc=Cette page peut être utilisée pour définir un compte par défaut à utiliser pour lier l'historique des transactions sur les salaires de paiement, le don, les taxes et la TVA lorsque aucun compte comptable spécifique n'a été défini. diff --git a/htdocs/langs/fr_CA/admin.lang b/htdocs/langs/fr_CA/admin.lang index b2e68576096..926fa1b27ba 100644 --- a/htdocs/langs/fr_CA/admin.lang +++ b/htdocs/langs/fr_CA/admin.lang @@ -240,6 +240,7 @@ AskForPreferredShippingMethod=Demandez la méthode d'envoi préférée pour les PasswordGenerationNone=Aucune suggestion de mot de passe généré . Le mot de passe doit être saisi manuellement. PasswordGenerationPerso=Retour un mot de passe en fonction de votre configuration personnellement défini. PasswordPatternDesc=Description du modèle de mot de passe +DisableForgetPasswordLinkOnLogonPage=Ne pas afficher le lien "Mot de passe oublié" sur la page de connexion HRMSetup=Configuration du module de GRH NotificationsDesc=La fonction de notification des messages électroniques vous permet d'envoyer automatiquement un courrier automatique pour certains événements Dolibarr. Les cibles des notifications peuvent être définies: NotificationsDescUser=* Par utilisateur, un utilisateur à l'heure. diff --git a/htdocs/langs/fr_CA/main.lang b/htdocs/langs/fr_CA/main.lang index 343df729008..61b4a0f9d4f 100644 --- a/htdocs/langs/fr_CA/main.lang +++ b/htdocs/langs/fr_CA/main.lang @@ -27,6 +27,7 @@ ErrorNoSocialContributionForSellerCountry=Erreur, aucun type de charges défini ErrorCannotAddThisParentWarehouse=Vous essayez d'ajouter un entrepôt parent qui est déjà un enfant de l'actuel MaxNbOfRecordPerPage=Nombre maximum d'enregistrements par page NotAuthorized=Vous n'êtes pas autorisé à le faire. +SeeHere=Regardez ici GoToWikiHelpPage=Lire l'aide en ligne (accès Internet nécessaire) DolibarrInHttpAuthenticationSoPasswordUseless=Le mode d'authentification Dolibarr est défini sur %s dans le fichier de configuration conf.php.
    Cela signifie que la base de données de mots de passe est externe à Dolibarr, donc changer ce champ peut ne pas avoir d'effet . PasswordForgotten=Mot de passe oublié? @@ -101,6 +102,9 @@ LateDesc=Retard pour définir si un enregistrement est en retard ou non dépend DeletePicture=Supprimer image ConfirmDeletePicture=Etes-vous sur de vouloir supprimer cette image ? EnterLoginDetail=Entrez les détails de connexion +MonthVeryShort02=V +MonthVeryShort05=L +MonthVeryShort09=D NbOfObjectReferers=Nombre d'articles connexes Referers=Articles connexes SendAcknowledgementByMail=Envoyer un email de confirmation @@ -114,6 +118,7 @@ YouCanChangeValuesForThisListFrom=Vous pouvez modifier les valeurs de cette list YouCanSetDefaultValueInModuleSetup=Vous pouvez configurer la valeur par défaut utilisée lors de la création d'un nouvel enregistrement dans la configuration du module Layout=Disposition Screen=Écran +Merge=Fusion CoreErrorMessage=Désolé, une erreur s'est produite. Contactez votre administrateur système pour vérifier les journaux ou désactiver $ dolibarr_main_prod = 1 pour obtenir plus d'informations. LinkToProposal=Lier à une proposition LinkToSupplierProposal=Lier à une proposition fournisseur diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang index 4da556cbeb3..9f801986442 100644 --- a/htdocs/langs/fr_FR/accountancy.lang +++ b/htdocs/langs/fr_FR/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Numéro de pièce TransactionNumShort=Num. transaction AccountingCategory=Groupes personnalisés GroupByAccountAccounting=Grouper par compte comptable -AccountingAccountGroupsDesc=Vous pouvez définir ici les regroupements de compte comptable. Ces regroupements seront utilisés dans le rapport %s pour afficher vos recettes/dépenses avec les données regroupés comme défini. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=Par compte comptable ByPredefinedAccountGroups=Par groupes prédéfinis ByPersonalizedAccountGroups=Par groupes personnalisés @@ -191,6 +191,7 @@ DescThirdPartyReport=Consultez ici la liste des tiers clients et fournisseurs et ListAccounts=Liste des comptes comptables UnknownAccountForThirdparty=Compte de tiers inconnu. %s sera utilisé UnknownAccountForThirdpartyBlocking=Compte de tiers inconnu. Erreur bloquante. +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Groupe de comptes comptables Pcgsubtype=Sous-groupe de comptes comptables diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index a8a82d77d7d..0953014aa91 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -40,8 +40,8 @@ WebUserGroup=Serveur web utilisateur/groupe NoSessionFound=Votre PHP ne semble pas pouvoir lister les sessions actives. Le répertoire de sauvegarde des sessions (%s) est peut être protégé (Par exemple, par les permissions de l'OS ou par la directive open_basedir de votre PHP, ce qui d'un point de vue sécurité est une bonne chose). DBStoringCharset=Encodage base pour stockage données DBSortingCharset=Encodage base pour tri données -ClientCharset=Client charset -ClientSortingCharset=En-cas client +ClientCharset=Jeu de caractères du client +ClientSortingCharset=Jeu de caractère de tri du client WarningModuleNotActive=Le module %s doit être activé pour utiliser cette fonction. WarningOnlyPermissionOfActivatedModules=Attention, seules les permissions en rapport avec les modules activés sont affichées ici. Vous pouvez activer d'autres modules sur la page Accueil->Configuration->Modules. DolibarrSetup=Installation ou mise à jour de Dolibarr @@ -199,7 +199,7 @@ ModulesDeployDesc=Si les permissions de votre système de fichier le permettent ModulesMarketPlaces=Rechercher un module/application externe ModulesDevelopYourModule=Développer son propre module/application ModulesDevelopDesc=Vous pouvez développer vous-même ou trouver un partenaire pour faire développer votre module personnalisé -DOLISTOREdescriptionLong=Instead of switching on www.dolistore.com web site to find an external module, you can use this embedded tool that will make the seach on the external market place for you (may be slow, need an internet access)... +DOLISTOREdescriptionLong=Au lieu de basculer sur le site web www.dolistore.com pour trouver un module externe, vous pouvez utiliser cet outil intégré qui fera la recherche sur la place de marché pour vous (peut être lent, besoin d'un accès Internet) ... NewModule=Nouveau FreeModule=Gratuit CompatibleUpTo=Compatible avec la version %s @@ -464,7 +464,7 @@ Field=Champ ProductDocumentTemplates=Modèle de document pour la fiche produit FreeLegalTextOnExpenseReports=Mention complémentaire sur les notes de frais WatermarkOnDraftExpenseReports=Filigrane sur les notes de frais -AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable) +AttachMainDocByDefault=Définissez cette valeur sur 1 si vous souhaitez joindre le document principal au courrier électronique par défaut (si applicable) FilesAttachedToEmail=Joindre le fichier SendEmailsReminders=Envoyer des alertes agenda par e-mails # Modules @@ -550,7 +550,7 @@ Module520Name=Emprunt Module520Desc=Gestion des emprunts Module600Name=Notifications d'événements métiers Module600Desc=Envoi de notifications par e-mails (déclenchées par des événements métiers) aux utilisateurs (configuration faite sur chaque fiche utilisateur), contacts de tiers (configuration faite sur chaque fiche tiers) ou vers des adresses e-mails spécifiques. -Module600Long=Note that this module is dedicated to send real time emails when a dedicated business event occurs. If you are looking for a feature to send reminders by email of your agenda events, go into setup of module Agenda. +Module600Long=Notez que ce module est dédié à l'envoi d'e-mails en temps réel lorsqu'un événement métier dédié se produit. Si vous cherchez une fonctionnalité pour envoyer des rappels par email de vos événements agenda, allez dans la configuration du module Agenda. Module700Name=Dons Module700Desc=Gestion des dons Module770Name=Notes de frais @@ -890,7 +890,7 @@ DictionaryStaff=Effectifs DictionaryAvailability=Délai de livraison DictionaryOrderMethods=Méthodes de commandes DictionarySource=Origines des propales/commandes -DictionaryAccountancyCategory=Groupes personnalisés pour les rapports +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Modèles de plan comptable DictionaryAccountancyJournal=Journaux comptables DictionaryEMailTemplates=Modèles des courriels @@ -904,7 +904,7 @@ SetupSaved=Configuration sauvegardée SetupNotSaved=Configuration non enregistrée BackToModuleList=Retour liste des modules BackToDictionaryList=Retour liste des dictionnaires -TypeOfRevenueStamp=Type of revenue stamp +TypeOfRevenueStamp=Type de timbre fiscal VATManagement=Gestion TVA VATIsUsedDesc=Le taux de TVA proposé par défaut lors de la création de proposition commerciale, facture, commande, etc... répond à la règle standard suivante :
    Si vendeur non assujetti à TVA, TVA par défaut=0. Fin de règle.
    Si le (pays vendeur= pays acheteur) alors TVA par défaut=TVA du produit vendu. Fin de règle.
    Si vendeur et acheteur dans Communauté européenne et bien vendu= moyen de transport neuf (auto, bateau, avion), TVA par défaut=0 (La TVA doit être payée par acheteur au centre d'impôts de son pays et non au vendeur). Fin de règle.
    Si vendeur et acheteur dans Communauté européenne et acheteur= particulier alors TVA par défaut=TVA du produit vendu (TVA pays vendeur si < seuil du pays et si avant 01/01/2015, TVA pays acheteur après le 01/01/2015). Fin de règle.
    Si vendeur et acheteur dans Communauté européenne et acheteur= entreprise alors TVA par défaut=0. Fin de règle.
    Sinon TVA proposée par défaut=0. Fin de règle.
    VATIsNotUsedDesc=Le taux de TVA proposé par défaut est 0. C'est le cas d'associations, particuliers ou certaines petites sociétés. @@ -1560,8 +1560,8 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Configurez automatiquement cette valeur par défau AGENDA_DEFAULT_FILTER_TYPE=Régler automatiquement ce type d'événement dans le filtre de recherche de la vue agenda AGENDA_DEFAULT_FILTER_STATUS=Régler automatiquement le statut d'événement dans le filtre de recherche de la vue agenda AGENDA_DEFAULT_VIEW=Quel onglet voulez-vous voir ouvrir par défaut quand on choisit le menu Agenda -AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). Note: Module %s must be enabled and correctly setup to have reminder sent at the correct frequency. -AGENDA_REMINDER_BROWSER=Enable event reminder on users browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_EMAIL=Activer le rappel d'événement par e-mail (l'option de rappel / délai peut être défini pour chaque événement). Remarque: Le module %s doit être activé et configuré correctement pour que le rappel soit envoyé à la bonne fréquence. +AGENDA_REMINDER_BROWSER=Activer la notification d'événement dans le navigateur de l'utilisateur (lorsque la date de l'événement est atteinte, chaque utilisateur peut refuser ceci au moment de la question de confirmation posée par le navigateur) AGENDA_REMINDER_BROWSER_SOUND=Activer les notifications sonores. AGENDA_SHOW_LINKED_OBJECT=Afficher l'objet lié dans la vue agenda ##### Clicktodial ##### @@ -1680,7 +1680,7 @@ BackgroundColor=Couleur de fond TopMenuBackgroundColor=Couleur de fond pour le menu Haut TopMenuDisableImages=Cacher les images du menu principal LeftMenuBackgroundColor=Couleur de fond pour le menu Gauche -BackgroundTableTitleColor=Couleur de fond pour les titres des lignes des tables +BackgroundTableTitleColor=Couleur de fond pour la ligne de titres des liste/tableaux BackgroundTableLineOddColor=Couleur de fond pour les lignes impaires des tables BackgroundTableLineEvenColor=Couleur de fond pour les lignes paires des tales MinimumNoticePeriod=Période de préavis minimum (Votre demande de congé doit être faite avant ce délai) diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang index f33cfe70dd6..efce18bfe12 100644 --- a/htdocs/langs/fr_FR/banks.lang +++ b/htdocs/langs/fr_FR/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Numéro LineRecord=Ecriture AddBankRecord=Ajouter écriture AddBankRecordLong=Saisie d'une écriture manuelle +Conciliated=Rapproché ConciliatedBy=Rapproché par DateConciliating=Date rapprochement BankLineConciliated=Écriture rapprochée diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang index a4475f93e3b..9e9887ad5f3 100644 --- a/htdocs/langs/fr_FR/bills.lang +++ b/htdocs/langs/fr_FR/bills.lang @@ -178,6 +178,7 @@ ConfirmCancelBillQuestion=Pour quelle raison voulez-vous classer la facture aban ConfirmClassifyPaidPartially=Êtes-vous sûr de vouloir classer la facture %s comme payée ? ConfirmClassifyPaidPartiallyQuestion=Cette facture n'a pas été payée à hauteur du montant initial. Pour quelle raison voulez-vous la classer malgré tout ? ConfirmClassifyPaidPartiallyReasonAvoir=Le reste à payer (%s %s) est un trop facturé (car article retourné, oubli, escompte réalisé...), régularisé par un avoir +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Le reste à payer (%s %s) est un escompte accordé après facture. J'accepte de perdre la TVA sur cet escompte ConfirmClassifyPaidPartiallyReasonDiscountVat=Le reste à payer (%s %s) est un escompte ConfirmClassifyPaidPartiallyReasonBadCustomer=Mauvais payeur diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang index dcbb8229788..1cdf2ff1a0e 100644 --- a/htdocs/langs/fr_FR/compta.lang +++ b/htdocs/langs/fr_FR/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Paiements liés à aucune facture, donc aucun tiers PaymentsNotLinkedToUser=Paiements non liés à un utilisateur Profit=Bénéfice AccountingResult=Résultat comptable +BalanceBefore=Balance (before) Balance=Solde Debit=Débit Credit=Crédit @@ -71,7 +72,7 @@ TypeContrib=Type de la charge MenuSpecialExpenses=Dépenses spéciales MenuTaxAndDividends=Taxes et charges MenuSocialContributions=Charges fiscales/sociales -MenuNewSocialContribution=Nouvelle taxe sociale +MenuNewSocialContribution=Nouvelle charge NewSocialContribution=Nouvelle charge fiscale/sociale AddSocialContribution=Ajouter taxe sociale/fiscale ContributionsToPay=Charges fiscales/sociales à payer @@ -136,7 +137,7 @@ CalcModeVATDebt=Mode %sTVA sur débit%s. CalcModeVATEngagement=Mode %sTVA sur encaissement%s. CalcModeDebt=Mode %sCréances-Dettes%s dit comptabilité d'engagement. CalcModeEngagement=Mode %sRecettes-Dépenses%s dit comptabilité de caisse. -CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table +CalcModeBookkeeping=Analyse des données journalisées dans le grand livre CalcModeLT1= Mode %sRE sur factures clients - factures fournisseurs%s CalcModeLT1Debt=Mode %sRE sur factures clients%s CalcModeLT1Rec= Mode %sRE sur factures fournisseurs%s @@ -150,15 +151,15 @@ AnnualByCompaniesDueDebtMode=Bilan des recettes et dépenses, détaillé par reg AnnualByCompaniesInputOutputMode=Bilan des recettes et dépenses, détaillé par regroupements prédéfinis, mode %sRecettes-Dépenses%s dit comptabilité de caisse. SeeReportInInputOutputMode=Cliquer sur %sRecettes-Dépenses%s dit comptabilité de caisse pour un calcul sur les paiements effectivement réalisés SeeReportInDueDebtMode=Cliquer sur %sCréances-Dettes%s dit comptabilité d'engagement pour un calcul sur les factures émises -SeeReportInBookkeepingMode=Voir le %sGrand livre%s pour un calcul basé sur l'analyse des valeurs correspondantes +SeeReportInBookkeepingMode=Voir le %sGrand livre%s pour un calcul basé sur l'analyse du Grand Livre RulesAmountWithTaxIncluded=- Les montants affichés sont les montants taxe incluse RulesResultDue=- Il comprend les factures impayées, les dépenses, la TVA, les dons, qu'ils soient payées ou non. Il comprend également les salaires versés.
    - Il est basé sur la date de validation des factures et de la TVA et à la date prévue pour les dépenses. Pour les salaires définis avec le module de salaire, la date de paiement de la valeur est utilisée. RulesResultInOut=- Il comprend les paiements réels effectués sur les factures, les dépenses, la TVA et les salaires.
    - Il est basé sur les dates de paiement des factures, les dépenses, la TVA et les salaires. La date du don pour le don. RulesCADue=- Il comprend les factures dues par le client si elles sont payées ou non.
    - Il est basé sur la date de validation de ces factures.
    RulesCAIn=- Il inclut les règlements effectivement reçus des factures clients.
    - Il se base sur la date de règlement de ces factures
    -RulesAmountOnInOutBookkeepingRecord=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME" -RulesResultBookkeepingPredefined=It includes record in your Ledger with accounting accounts that has the group "EXPENSE" or "INCOME" -RulesResultBookkeepingPersonalized=It show record in your Ledger with accounting accounts grouped by personalized groups +RulesAmountOnInOutBookkeepingRecord=Cela inclut les enregistrements dans votre Grand Livre ayant les comptes de comptabilité qui ont le groupe "EXPENSE" ou "INCOME" +RulesResultBookkeepingPredefined=Cela inclut les enregistrements dans votre Grand Livre ayant les comptes de comptabilité qui ont le groupe "EXPENSE" ou "INCOME" +RulesResultBookkeepingPersonalized=Cela inclut les enregistrements dans votre Grand Livre ayant les comptes de comptabilité regroupés par les groupes personnalisés SeePageForSetup=Voir le menu %s pour la configuration DepositsAreNotIncluded=- Les factures d'acomptes ne sont pas incluses DepositsAreIncluded=- Les factures d'acomptes sont incluses diff --git a/htdocs/langs/fr_FR/cron.lang b/htdocs/langs/fr_FR/cron.lang index c0aac3493fe..ace54bbd82a 100644 --- a/htdocs/langs/fr_FR/cron.lang +++ b/htdocs/langs/fr_FR/cron.lang @@ -63,7 +63,7 @@ CronId=Id CronClassFile=Nom de fichier intégrant la classe CronModuleHelp=Nom du dossier du module dans Dolibarr (fonctionne aussi avec les modules externes).
    Par exemple, pour appeler la méthode d'appel des produits Dolibarr /htdocs/product/class/product.class.php, la valeur du module est
    product. CronClassFileHelp=The relative path and file name to load (path is relative to web server root directory).
    For exemple to call the fetch method of Dolibarr Product object htdocs/product/class/product.class.php, the value for class file name is
    product/class/product.class.php -CronObjectHelp=The object name to load.
    For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for class file name is
    Product +CronObjectHelp=Le nom de l'objet à charger.
    Par exemple pour appeler la méthode de récupération de l'objet Produut Dolibarr /htdocs/product/class/product.class.php, la valeur du nom de fichier de classe est
    Product CronMethodHelp=The object method to launch.
    For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for method is
    fetch CronArgsHelp=The method arguments.
    For exemple to call the fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value for paramters can be
    0, ProductRef CronCommandHelp=La commande système a exécuter. diff --git a/htdocs/langs/fr_FR/donations.lang b/htdocs/langs/fr_FR/donations.lang index ed975470e59..73f9a0b3512 100644 --- a/htdocs/langs/fr_FR/donations.lang +++ b/htdocs/langs/fr_FR/donations.lang @@ -31,3 +31,4 @@ DONATION_ART200=Afficher article 200 du CGI si vous êtes concernés DONATION_ART238=Afficher article 238 du CGI si vous êtes concernés DONATION_ART885=Afficher article 885 du CGI si vous êtes concernés DonationPayment=Paiement du don +DonationValidated=Donation %s validated diff --git a/htdocs/langs/fr_FR/install.lang b/htdocs/langs/fr_FR/install.lang index 93ec1fd75f0..fe568be51f6 100644 --- a/htdocs/langs/fr_FR/install.lang +++ b/htdocs/langs/fr_FR/install.lang @@ -139,7 +139,7 @@ KeepDefaultValuesDeb=Vous utilisez l'assistant d'installation depuis un environn KeepDefaultValuesMamp=Vous utilisez l'assistant d'installation DoliMamp. Les valeurs présentes ici sont pré-remplies. Leur modification ne doit être effectuée qu'en connaissance de cause. KeepDefaultValuesProxmox=Vous utilisez l'assistant d'installation depuis une application Proxmox. Les valeurs présentes ici sont pré-remplies. Leur modification ne doit être effectuée qu'en connaissance de cause. UpgradeExternalModule=Lancer le processus de mise à jour d'un module externe -SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' +SetAtLeastOneOptionAsUrlParameter=Définissez au moins une option en tant que paramètre dans l'URL. Par exemple: '... repair.php?standard=confirmed' NothingToDelete=Rien a supprimer NothingToDo=Rien à faire ######### @@ -193,11 +193,11 @@ MigrationActioncommElement=Mise à jour des données des actions des éléments MigrationPaymentMode=Migration des modes de paiement MigrationCategorieAssociation=Migration des categories MigrationEvents=Migration des évènements pour ajouter les propriétaires dans la table des utilisateurs assignés -MigrationEventsContact=Migration of events to add event contact into assignement table +MigrationEventsContact=Migration des événements pour ajouter le contact de l'événement dans la table d'affectation MigrationRemiseEntity=Mettre à jour le champ "entity" de la table "llx_societe_remise MigrationRemiseExceptEntity=Mettre à jour le champ "entity" de la table "llx_societe_remise_except" MigrationReloadModule=Rechargement du module %s -MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm +MigrationResetBlockedLog=Réinitialiser le module BlockedLog pour l'algorithme v7 ShowNotAvailableOptions=Afficher les choix non disponibles HideNotAvailableOptions=Cacher les choix non disponibles ErrorFoundDuringMigration=Une erreur est survenu lors du processus de migration, aussi l'étape suivante ne peut pas être réalisée. Pour ignorer les erreurs, vous pouvez cliquer ici, mais l'application ou certaines fonctionnalités risquent de présenter des dysfonctionnements jusqu'à la résolution de la ou des erreurs diff --git a/htdocs/langs/fr_FR/languages.lang b/htdocs/langs/fr_FR/languages.lang index bd7f12da153..a45a606d1a0 100644 --- a/htdocs/langs/fr_FR/languages.lang +++ b/htdocs/langs/fr_FR/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Espagnol (Panama) Language_es_PY=Espagnol (Paraguay) Language_es_PE=Espagnol (Peru) Language_es_PR=Espagnol (Puerto Rico) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Espagnol (Venezuela) Language_et_EE=Estonien Language_eu_ES=Basque diff --git a/htdocs/langs/fr_FR/ldap.lang b/htdocs/langs/fr_FR/ldap.lang index ec91e1bebe9..5041be4b300 100644 --- a/htdocs/langs/fr_FR/ldap.lang +++ b/htdocs/langs/fr_FR/ldap.lang @@ -6,7 +6,7 @@ LDAPInformationsForThisContact=Informations en base LDAP pour ce contact LDAPInformationsForThisUser=Informations en base LDAP pour cet utilisateur LDAPInformationsForThisGroup=Informations en base LDAP pour ce groupe LDAPInformationsForThisMember=Informations en base LDAP pour ce membre -LDAPInformationsForThisMemberType=Information in LDAP database for this member type +LDAPInformationsForThisMemberType=Informations dans la base de données LDAP pour ce type d'adhérent LDAPAttributes=Attributs LDAP LDAPCard=Fiche LDAP LDAPRecordNotFound=Enregistrement non trouvé dans la base LDAP diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 8cc450e29d9..c2fd860a678 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -69,7 +69,7 @@ NotAuthorized=Vous n'êtes pas autorisé pour cette action. SetDate=Définir date SelectDate=Sélectionnez une date SeeAlso=Voir aussi %s -SeeHere=Regardez ici +SeeHere=Voir ici Apply=Appliquer BackgroundColorByDefault=Couleur de fond FileRenamed=Le fichier a été renommé avec succès @@ -104,7 +104,7 @@ RequestLastAccessInError=Requête dernier accès en base en erreur ReturnCodeLastAccessInError=Code retour dernier accès en base en erreur InformationLastAccessInError=Information sur le dernier accès en base en erreur DolibarrHasDetectedError=Dolibarr a détecté une erreur technique -YouCanSetOptionDolibarrMainProdToZero=You can read log file or set option $dolibarr_main_prod to '0' in your config file to get more information. +YouCanSetOptionDolibarrMainProdToZero=Vous pouvez lire le fichier log ou définir l'option $dolibarr_main_prod sur '0' dans votre fichier de configuration pour obtenir plus d'informations. InformationToHelpDiagnose=Voici les informations qui pourront aider au diagnostic (Vous pouvez fixer l'option $dolibarr_main_prod sur '1' pour supprimer quelques notifications) MoreInformation=Plus d'information TechnicalInformation=Informations techniques @@ -803,7 +803,7 @@ NoRecordSelected=Aucu enregistrement sélectionné MassFilesArea=Zone des fichiers générés en masse ShowTempMassFilesArea=Afficher la zone des fichiers générés en masse ConfirmMassDeletion=Confirmation de suppression en masse -ConfirmMassDeletionQuestion=Êtes-vous sur de vouloir supprimer la %s valeur sélectionnée ? +ConfirmMassDeletionQuestion=Êtes-vous sur de vouloir supprimer la(les) %s valeur(s) sélectionnée(s) ? RelatedObjects=Objets liés ClassifyBilled=Classer facturé Progress=Progression @@ -834,7 +834,7 @@ BulkActions=Actions de masse ClickToShowHelp=Cliquez pour montrer l'info-bulle d'aide WebSite=Site web WebSites=Sites web -WebSiteAccounts=Comptes du site web +WebSiteAccounts=Comptes de site web ExpenseReport=Note de frais ExpenseReports=Notes de frais HR=HR @@ -912,3 +912,5 @@ CommentPage=Commentaires CommentAdded=Commentaire ajouté CommentDeleted=Commentaire supprimé Everybody=Tout le monde +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/fr_FR/modulebuilder.lang b/htdocs/langs/fr_FR/modulebuilder.lang index ad72e5dc09e..a689ca07ec1 100644 --- a/htdocs/langs/fr_FR/modulebuilder.lang +++ b/htdocs/langs/fr_FR/modulebuilder.lang @@ -4,7 +4,7 @@ EnterNameOfModuleDesc=Saisissez le nom du module/application à créer, sans esp EnterNameOfObjectDesc=Entrez le nom de l'objet à créer sans espaces. Utilisez les majuscules pour séparer des mots (par exemple: MyObject, Student, Teacher ...). Le fichier de classe CRUD, mais aussi le fichier API, les pages à afficher / ajouter / éditer / supprimer des objets et des fichiers SQL seront générés. ModuleBuilderDesc2=Chemin ou les modules sont générés/modifiés ( premier répertoire alternatif défini dans %s):%s ModuleBuilderDesc3=Modules générés/éditables trouvés : %s -ModuleBuilderDesc4=A module is detected as 'editable' when the file %s exists in root of module directory +ModuleBuilderDesc4=Un module est détecté comme 'modifiable' quand le fichier %s existe à la racine du répertoire du module NewModule=Nouveau module NewObject=Nouvel objet ModuleKey=Clé du module @@ -47,7 +47,7 @@ SpecificationFile=Fichier de description des règles métiers LanguageFile=Fichier langue ConfirmDeleteProperty=Êtes-vous sûr de vouloir supprimer la propriété%s ? Cela changera le code dans la classe PHP, mais supprimera également la colonne de la définition de table d'objet. NotNull=Non NULL -NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0). +NotNullDesc=1=Définir le champ en base à NOT NULL. -1=Autoriser les valeurs nulles et forcer la valeur à NULL si vide ('' ou 0). SearchAll=Utilisé par la "recherche globale" DatabaseIndex=Index en base FileAlreadyExists=Le fichier %s existe déjà @@ -72,7 +72,7 @@ NoWidget=Aucun widget GoToApiExplorer=Se rendre sur l'explorateur d'API ListOfMenusEntries=Liste des entrées du menu ListOfPermissionsDefined=Liste des permissions -EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION) +EnabledDesc=Condition pour que ce champ soit actif (Exemples: 1 ou $conf->global->MYMODULE_MYOPTION) VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only. Using a negative value means field is not shown by default on list but can be selected for viewing) IsAMeasureDesc=Can the value of field be cumulated to get a total into list ? (Examples: 1 or 0) SearchAllDesc=Is the field used to make a search from the quick search tool ? (Examples: 1 or 0) @@ -81,7 +81,7 @@ LanguageDefDesc=Enter in this files, all the key and the translation for each la MenusDefDesc=Define here the menus provided by your module (once defined, they are visible into the menu editor %s) PermissionsDefDesc=Define here the new permissions provided by your module (once defined, they are visible into the default permissions setup %s) HooksDefDesc=Define in the module_parts['hooks'] property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on 'initHooks(' in core code).
    Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on 'executeHooks' in core code). -TriggerDefDesc=Define in the trigger file the code you want to execute for each business event executed. +TriggerDefDesc=Définissez dans le fichier trigger le code que vous souhaitez exécuter pour chaque événement métier exécuté. SeeIDsInUse=Voir les IDs utilisés dans votre installation SeeReservedIDsRangeHere=Voir la plage des ID réservés ToolkitForDevelopers=Boîte à outils pour développeurs Dolibarr @@ -89,6 +89,6 @@ TryToUseTheModuleBuilder=If you have knowledge in SQL and PHP, you can try to us SeeTopRightMenu=Voir à droite de votre barre de menu principal AddLanguageFile=Ajouter le fichier de langue YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages") -DropTableIfEmpty=(Delete table if empty) +DropTableIfEmpty=(Supprimer la table si vide) TableDoesNotExists=La table %s n'existe pas TableDropped=La table %s a été supprimée diff --git a/htdocs/langs/fr_FR/paypal.lang b/htdocs/langs/fr_FR/paypal.lang index 5e9ba594b9d..e4bd2341c06 100644 --- a/htdocs/langs/fr_FR/paypal.lang +++ b/htdocs/langs/fr_FR/paypal.lang @@ -11,7 +11,7 @@ PAYPAL_SSLVERSION=Curl Version SSL PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Proposer le paiement intégral (Carte+Paypal) ou Paypal seul PaypalModeIntegral=Intégral PaypalModeOnlyPaypal=PayPal seul -ONLINE_PAYMENT_CSS_URL=Optionnal URL of CSS style sheet on online payment page +ONLINE_PAYMENT_CSS_URL=URL optionnelle de la feuille de style CSS sur la page de paiement en ligne ThisIsTransactionId=Voici l'identifiant de la transaction: %s PAYPAL_ADD_PAYMENT_URL=Ajouter l'URL de paiement Paypal lors de l'envoi d'un document par email PredefinedMailContentLink=Vous pouvez cliquer sur le lien sécurisé ci-dessous pour effectuer votre paiement (Paypal) si ce dernier n'a pas encore été fait.\n\n%s\n\n @@ -29,4 +29,4 @@ ShortErrorMessage=Message d'erreur court ErrorCode=Code erreur ErrorSeverityCode=Code d'erreur sévérité OnlinePaymentSystem=Système de paiement en ligne -PaypalLiveEnabled=Paypal live activé ( différent du mode test/bac à sable ) +PaypalLiveEnabled=Paypal live activé (sinon mode test/bac à sable) diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang index 1737242f4ba..3a94e1cc0c6 100644 --- a/htdocs/langs/fr_FR/products.lang +++ b/htdocs/langs/fr_FR/products.lang @@ -153,7 +153,7 @@ BuyingPrices=Prix d'achat CustomerPrices=Prix clients SuppliersPrices=Prix fournisseurs SuppliersPricesOfProductsOrServices=Prix fournisseurs (des produits ou services) -CustomCode=Nomenclature douanière/Code SH +CustomCode=Nomenclature douanière / Code SH CountryOrigin=Pays d'origine Nature=Nature ShortLabel=Libellé court @@ -196,6 +196,7 @@ CurrentProductPrice=Prix actuel AlwaysUseNewPrice=Toujours utiliser le prix du jour AlwaysUseFixedPrice=Utiliser le prix fixé PriceByQuantity=Prix différents par quantité +DisablePriceByQty=Désactiver les prix par quantité PriceByQuantityRange=Grille de quantités MultipriceRules=Règles du niveau de prix UseMultipriceRules=Utilisation des règles de niveau de prix (définies dans la configuration du module de produit) pour calculer automatiquement le prix de tous les autres niveaux en fonction de premier niveau diff --git a/htdocs/langs/fr_FR/trips.lang b/htdocs/langs/fr_FR/trips.lang index 3b4a7fad4e3..ada5f240cb9 100644 --- a/htdocs/langs/fr_FR/trips.lang +++ b/htdocs/langs/fr_FR/trips.lang @@ -125,8 +125,8 @@ expenseReportRangeFromTo=de %d à %d expenseReportRangeMoreThan=Plus de %d expenseReportCoefUndefined=(valeur non définie) expenseReportCatDisabled=Catégorie désactivée - Voir la dictionnaire c_exp_tax_cat dictionary -expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionay -expenseReportPrintExample=offset + (d x coef) = %s +expenseReportRangeDisabled=Plage désactivée - voir le dictionay c_exp_tax_range +expenseReportPrintExample=décalage + (d x coef) = %s ExpenseReportApplyTo=Appliquer à ExpenseReportDomain=Nom de domaine à utiliser ExpenseReportLimitOn=Limite sur diff --git a/htdocs/langs/fr_FR/website.lang b/htdocs/langs/fr_FR/website.lang index de951903e25..6c69896c70d 100644 --- a/htdocs/langs/fr_FR/website.lang +++ b/htdocs/langs/fr_FR/website.lang @@ -8,12 +8,12 @@ WEBSITE_PAGENAME=Nom/alias de la page WEBSITE_CSS_URL=URL du fichier de la feuille de style (CSS) externe WEBSITE_CSS_INLINE=Contenu du fichier CSS (commun à toute les pages) WEBSITE_JS_INLINE=Contenu du fichier Javascript (commun à toutes les pages) -WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) +WEBSITE_HTML_HEADER=Ajout en bas de l'en-tête HTML (commun à toutes les pages) WEBSITE_ROBOT=Fichier robot (robots.txt) WEBSITE_HTACCESS=Fichier .htaccess du site web -HtmlHeaderPage=HTML header (specific to this page only) +HtmlHeaderPage=En-tête HTML (spécifique pour la page uniquement) PageNameAliasHelp=Nom ou alias de la page.
    Cet alias est également utilisé pour forger une URL SEO lorsque le site Web est exécuté à partir d'un hôte virtuel d'un serveur Web (comme Apache, Nginx, ...). Utilisez le bouton "%s" pour modifier cet alias. -EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. +EditTheWebSiteForACommonHeader=Remarque: Si vous souhaitez définir un en-tête personnalisé pour toutes les pages, modifiez l'en-tête au niveau du site plutôt qu'au niveau page/conteneur. MediaFiles=Répertoire de médias EditCss=Editer l'en-tête HTML ou Style/CSS EditMenu=Modifier menu @@ -50,17 +50,17 @@ PageIsANewTranslation=La nouvelle page est une traduction de la page en cours ? LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page. ParentPageId=Id de la page parent WebsiteId=ID site web -CreateByFetchingExternalPage=Create page/container by fetching page from external URL... +CreateByFetchingExternalPage=Créer une page / un conteneur en récupérant une page à partir d'une URL externe ... OrEnterPageInfoManually=Ou créer une nouvelle page FetchAndCreate=Récupérer et Créer ExportSite=Exporter site IDOfPage=Id de page Banner=Bandeau BlogPost=Article de Blog -WebsiteAccount=Web site account -WebsiteAccounts=Comptes du site web +WebsiteAccount=Compte de site Web +WebsiteAccounts=Comptes de site web AddWebsiteAccount=Créer un compte sur le site web BackToListOfThirdParty=Retour à la liste pour le Tiers -DisableSiteFirst=Disable website first -MyContainerTitle=My web site title -AnotherContainer=Another container +DisableSiteFirst=Désactiver le site Web d'abord +MyContainerTitle=Titre de mon site web +AnotherContainer=Un autre conteneur diff --git a/htdocs/langs/he_IL/accountancy.lang b/htdocs/langs/he_IL/accountancy.lang index 9dbf911a820..c4189507f60 100644 --- a/htdocs/langs/he_IL/accountancy.lang +++ b/htdocs/langs/he_IL/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Piece number TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=List of the accounting accounts UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal 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 Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution Modelcsv_quadratus=Export towards Quadratus QuadraCompta Modelcsv_ebp=Export towards EBP Modelcsv_cogilog=Export towards Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang index 7a2976172ae..a0bdd390569 100644 --- a/htdocs/langs/he_IL/admin.lang +++ b/htdocs/langs/he_IL/admin.lang @@ -539,7 +539,7 @@ Module320Desc=הוסף עדכון RSS בתוך דפי Dolibarr מסך Module330Name=הסימניות Module330Desc=Bookmarks management Module400Name=Projects/Opportunities/Leads -Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=לוח השנה Module410Desc=שילוב לוח השנה Module500Name=Special expenses @@ -890,7 +890,7 @@ DictionaryStaff=סגל DictionaryAvailability=עיכוב משלוח DictionaryOrderMethods=הזמנת שיטות DictionarySource=מקור הצעות / הזמנות -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Models for chart of accounts DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=Emails templates @@ -904,6 +904,7 @@ SetupSaved=הגדרת הציל SetupNotSaved=Setup not saved BackToModuleList=חזרה לרשימת מודולים BackToDictionaryList=חזרה לרשימת המילונים +TypeOfRevenueStamp=Type of revenue stamp VATManagement=מע"מ ניהול VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is VAT=0. End of rule. VATIsNotUsedDesc=כברירת מחדל המע"מ המוצע הוא 0 אשר ניתן להשתמש בהם במקרים כמו עמותות, אנשים ou חברות קטנות. @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/he_IL/banks.lang b/htdocs/langs/he_IL/banks.lang index 40b76f8c64c..be8f75d172b 100644 --- a/htdocs/langs/he_IL/banks.lang +++ b/htdocs/langs/he_IL/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Number LineRecord=Transaction AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Reconciled ConciliatedBy=Reconciled by DateConciliating=Reconcile date BankLineConciliated=Entry reconciled diff --git a/htdocs/langs/he_IL/bills.lang b/htdocs/langs/he_IL/bills.lang index f925a431e32..34fe6c7273a 100644 --- a/htdocs/langs/he_IL/bills.lang +++ b/htdocs/langs/he_IL/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s BillsLate=Late payments BillsStatistics=Customers invoices statistics BillsStatisticsSuppliers=Suppliers invoices statistics +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Disabled because cannot be erased InvoiceStandard=Standard invoice InvoiceStandardAsk=Standard invoice @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer diff --git a/htdocs/langs/he_IL/compta.lang b/htdocs/langs/he_IL/compta.lang index 8ff51eccfe4..0ad0ea3e202 100644 --- a/htdocs/langs/he_IL/compta.lang +++ b/htdocs/langs/he_IL/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to PaymentsNotLinkedToUser=Payments not linked to any user Profit=Profit AccountingResult=Accounting result +BalanceBefore=Balance (before) Balance=Balance Debit=Debit Credit=Credit diff --git a/htdocs/langs/he_IL/donations.lang b/htdocs/langs/he_IL/donations.lang index 1d2244510a9..6936e94040a 100644 --- a/htdocs/langs/he_IL/donations.lang +++ b/htdocs/langs/he_IL/donations.lang @@ -31,3 +31,4 @@ 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 +DonationValidated=Donation %s validated diff --git a/htdocs/langs/he_IL/errors.lang b/htdocs/langs/he_IL/errors.lang index b02b70c9c9f..cff89a71d98 100644 --- a/htdocs/langs/he_IL/errors.lang +++ b/htdocs/langs/he_IL/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Empty expression ErrorPriceExpression21=Empty result '%s' ErrorPriceExpression22=Negative result '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs diff --git a/htdocs/langs/he_IL/install.lang b/htdocs/langs/he_IL/install.lang index 645423e3534..e2f9a806269 100644 --- a/htdocs/langs/he_IL/install.lang +++ b/htdocs/langs/he_IL/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtua UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Fix for denormalized data @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Update entity field value of llx_societe_remise MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except MigrationReloadModule=Reload module %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Show not available options HideNotAvailableOptions=Hide not available options ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. diff --git a/htdocs/langs/he_IL/languages.lang b/htdocs/langs/he_IL/languages.lang index 3befbd16053..fa083f02e1f 100644 --- a/htdocs/langs/he_IL/languages.lang +++ b/htdocs/langs/he_IL/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=ספרדית (פרגוואי) Language_es_PE=ספרדית (פרו) Language_es_PR=ספרדית (פורטו ריקו) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Spanish (Venezuela) Language_et_EE=אסטונית Language_eu_ES=הבסקים diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang index a3b4fc0c5fd..369fa1d0e5f 100644 --- a/htdocs/langs/he_IL/main.lang +++ b/htdocs/langs/he_IL/main.lang @@ -548,6 +548,18 @@ MonthShort09=Sep MonthShort10=Oct MonthShort11=Nov MonthShort12=Dec +MonthVeryShort01=J +MonthVeryShort02=F +MonthVeryShort03=M +MonthVeryShort04=A +MonthVeryShort05=M +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=S +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Attached files and documents JoinMainDoc=Join main document DateFormatYYYYMM=YYYY-MM @@ -762,7 +774,7 @@ SetBankAccount=Define Bank Account AccountCurrency=Account currency ViewPrivateNote=View notes XMoreLines=%s line(s) hidden -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=Public URL AddBox=Add box SelectElementAndClick=Select an element and click %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=Everybody +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/he_IL/other.lang b/htdocs/langs/he_IL/other.lang index 3aa2a34fd95..2126d03bede 100644 --- a/htdocs/langs/he_IL/other.lang +++ b/htdocs/langs/he_IL/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=If amount higher than %s SourcesRepository=Repository for sources Chart=Chart PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=Exports area diff --git a/htdocs/langs/he_IL/products.lang b/htdocs/langs/he_IL/products.lang index 589bbb35ce8..55f4d1a722e 100644 --- a/htdocs/langs/he_IL/products.lang +++ b/htdocs/langs/he_IL/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Current price AlwaysUseNewPrice=Always use current price of product/service AlwaysUseFixedPrice=Use the fixed price PriceByQuantity=Different prices by quantity +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Quantity range MultipriceRules=Price segment rules UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/he_IL/projects.lang b/htdocs/langs/he_IL/projects.lang index abbfa081664..c8b4890691f 100644 --- a/htdocs/langs/he_IL/projects.lang +++ b/htdocs/langs/he_IL/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=Pending OppStatusWON=Won OppStatusLOST=Lost Budget=Budget +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/he_IL/website.lang b/htdocs/langs/he_IL/website.lang index 3902febbfb7..6b4e2ada84a 100644 --- a/htdocs/langs/he_IL/website.lang +++ b/htdocs/langs/he_IL/website.lang @@ -3,15 +3,17 @@ Shortname=Code WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them. DeleteWebsite=Delete website ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Page name/alias -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL of external CSS file WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Media library EditCss=Edit Style/CSS or HTML header EditMenu=Edit menu @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/hr_HR/accountancy.lang b/htdocs/langs/hr_HR/accountancy.lang index 7ff8b208d0a..29462bb5162 100644 --- a/htdocs/langs/hr_HR/accountancy.lang +++ b/htdocs/langs/hr_HR/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Broj komada TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=Popis obračunskih računa UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal 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 Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution Modelcsv_quadratus=Export towards Quadratus QuadraCompta Modelcsv_ebp=Export towards EBP Modelcsv_cogilog=Export towards Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang index 2fab0586003..1618f28f5ed 100644 --- a/htdocs/langs/hr_HR/admin.lang +++ b/htdocs/langs/hr_HR/admin.lang @@ -539,7 +539,7 @@ Module320Desc=Dodaj RSS feed unutar Dolibar stranica Module330Name=Oznake Module330Desc=Upravljanje oznakama Module400Name=Projekti/Mogućnosti/Vodiči -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. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Web kalendar Module410Desc=Integracija web kalendara Module500Name=Specijalni troškovi @@ -890,7 +890,7 @@ DictionaryStaff=Zaposlenici DictionaryAvailability=Kašnjenje isporuke DictionaryOrderMethods=Metode naručivanja DictionarySource=Porjeklo ponuda/narudžbi -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Modeli za grafikone računa DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=Predlošci e-pošte @@ -904,6 +904,7 @@ SetupSaved=Postavi spremljeno SetupNotSaved=Setup not saved BackToModuleList=Povratak na popis modula BackToDictionaryList=Povratak na popis definicija +TypeOfRevenueStamp=Type of revenue stamp VATManagement=Upravljanje PDV VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is 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. @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/hr_HR/banks.lang b/htdocs/langs/hr_HR/banks.lang index 5d055549f91..ff7d470dc91 100644 --- a/htdocs/langs/hr_HR/banks.lang +++ b/htdocs/langs/hr_HR/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Broj LineRecord=Transakcija AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Reconciled ConciliatedBy=Uskladio DateConciliating=Datum usklađenja BankLineConciliated=Entry reconciled diff --git a/htdocs/langs/hr_HR/bills.lang b/htdocs/langs/hr_HR/bills.lang index f4096449c7c..e9d3a9086f8 100644 --- a/htdocs/langs/hr_HR/bills.lang +++ b/htdocs/langs/hr_HR/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s BillsLate=Zakašnjela plaćanja BillsStatistics=Statistika računa kupaca BillsStatisticsSuppliers=Statistika računa dobavljača +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Onemogućeno jer ne može biti obrisano InvoiceStandard=Običan račun InvoiceStandardAsk=Običan račun @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? ConfirmClassifyPaidPartiallyReasonAvoir=Preostali neplaćeni (%s %s) je garantirani popust zato što je plaćanje izvršeno prije valute plaćanja. Reguliramo PDV putem odobrenja. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Preostali neplaćeni (%s %s) je garantirani popust zato što je plaćanje izvršeno prije valute plaćanja. Prihvaćam gubitak iznos PDV-a na ovom popustu. ConfirmClassifyPaidPartiallyReasonDiscountVat=Preostali neplaćeni (%s %s) je garantirani popust zato što je plaćanje izvršeno prije valute plaćanja. Potražujem povrat poreza na popustu bez odobrenja. ConfirmClassifyPaidPartiallyReasonBadCustomer=Loš kupac diff --git a/htdocs/langs/hr_HR/compta.lang b/htdocs/langs/hr_HR/compta.lang index 340764cf18f..fbce28e3ff9 100644 --- a/htdocs/langs/hr_HR/compta.lang +++ b/htdocs/langs/hr_HR/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Plaćanja nisu povezana s niti jednim računom, tako PaymentsNotLinkedToUser=Plaćanja nisu povezana s niti jednim korisnikom Profit=Profit AccountingResult=Rezultati računovodstvo +BalanceBefore=Balance (before) Balance=Stanje Debit=Zaduženje Credit=Kredit diff --git a/htdocs/langs/hr_HR/donations.lang b/htdocs/langs/hr_HR/donations.lang index 5ff72579b1c..c2d8cd40d04 100644 --- a/htdocs/langs/hr_HR/donations.lang +++ b/htdocs/langs/hr_HR/donations.lang @@ -31,3 +31,4 @@ DONATION_ART200=Prikaži članak 200 iz CGI ako ste zabrinuti DONATION_ART238=Prikaži članak 238 iz CGI ako ste zabrinuti DONATION_ART885=Prikaži članak 885 iz CGI ako ste zabrinuti DonationPayment=Isplata donacije +DonationValidated=Donation %s validated diff --git a/htdocs/langs/hr_HR/errors.lang b/htdocs/langs/hr_HR/errors.lang index 88436672776..e79fb19fed5 100644 --- a/htdocs/langs/hr_HR/errors.lang +++ b/htdocs/langs/hr_HR/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Empty expression ErrorPriceExpression21=Empty result '%s' ErrorPriceExpression22=Negative result '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs diff --git a/htdocs/langs/hr_HR/install.lang b/htdocs/langs/hr_HR/install.lang index 55c2e2780d0..b2c8a485723 100644 --- a/htdocs/langs/hr_HR/install.lang +++ b/htdocs/langs/hr_HR/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtua UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Fix for denormalized data @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Update entity field value of llx_societe_remise MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except MigrationReloadModule=Reload module %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Show not available options HideNotAvailableOptions=Hide not available options ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. diff --git a/htdocs/langs/hr_HR/languages.lang b/htdocs/langs/hr_HR/languages.lang index adf6b0c79f4..d03b0feac48 100644 --- a/htdocs/langs/hr_HR/languages.lang +++ b/htdocs/langs/hr_HR/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Španjolski (Paragvaj) Language_es_PE=Španjolski (Peru) Language_es_PR=Španjolski (Puerto Rico) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Španjolski (Venezuela) Language_et_EE=Estonski Language_eu_ES=Baskijski diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang index e374e04970d..61a55385826 100644 --- a/htdocs/langs/hr_HR/main.lang +++ b/htdocs/langs/hr_HR/main.lang @@ -548,6 +548,18 @@ MonthShort09=Ruj MonthShort10=Lis MonthShort11=Stu MonthShort12=Pro +MonthVeryShort01=J +MonthVeryShort02=P +MonthVeryShort03=P +MonthVeryShort04=A +MonthVeryShort05=P +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=N +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Priložene datoteke i dokumenti JoinMainDoc=Join main document DateFormatYYYYMM=YYYY-MM @@ -762,7 +774,7 @@ SetBankAccount=Postavi bankovni račun AccountCurrency=Valuta računa ViewPrivateNote=Vidi napomene XMoreLines=%s stavaka(e) skriveno -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=Javni URL AddBox=Dodaj blok SelectElementAndClick=Select an element and click %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=Svi +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/hr_HR/other.lang b/htdocs/langs/hr_HR/other.lang index 5ee970c7504..23f3257eb89 100644 --- a/htdocs/langs/hr_HR/other.lang +++ b/htdocs/langs/hr_HR/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=If amount higher than %s SourcesRepository=Repository for sources Chart=Chart PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=Exports area diff --git a/htdocs/langs/hr_HR/products.lang b/htdocs/langs/hr_HR/products.lang index 1ff9ec531cd..d17677bc1f5 100644 --- a/htdocs/langs/hr_HR/products.lang +++ b/htdocs/langs/hr_HR/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Trenutna cijena AlwaysUseNewPrice=Uvijek koristi trenutnu cijenu za proizvod/uslugu AlwaysUseFixedPrice=Koristi fiksnu cijenu PriceByQuantity=Različite cijene prema količini +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Raspon količine MultipriceRules=Pravila odjelnih cijena UseMultipriceRules=Koristite pravila odjelova cijena (definiranih u postavkama modula proizvoda) za automatski izračun cijena ostalih dijelova sukladno prema prvom dijelu diff --git a/htdocs/langs/hr_HR/projects.lang b/htdocs/langs/hr_HR/projects.lang index ed7361abdcf..d0ac2f943c3 100644 --- a/htdocs/langs/hr_HR/projects.lang +++ b/htdocs/langs/hr_HR/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=Čekanje OppStatusWON=Dobio OppStatusLOST=Izgubljeno Budget=Proračun +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/hr_HR/website.lang b/htdocs/langs/hr_HR/website.lang index 418516e3447..abbeb4e2c00 100644 --- a/htdocs/langs/hr_HR/website.lang +++ b/htdocs/langs/hr_HR/website.lang @@ -3,15 +3,17 @@ Shortname=Kod WebsiteSetupDesc=Kreirajte različitih unosa koliko god to želite ovisno koliko web mjesta želite. Nakon toga idite na Websites izbornik za uređivanje istih. DeleteWebsite=Obriši Web mjesto ConfirmDeleteWebsite=Jeste li sigurni da želite obrisati ovo web mjesto. Sve stranice i sadržaj biti će isto obrisan. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Naziv stranice/alias -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL vanjske CSS datoteke WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Mediji EditCss=Edit Style/CSS or HTML header EditMenu=Uredi izbornik @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/hu_HU/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang index 045264b19a7..f90d3e64079 100644 --- a/htdocs/langs/hu_HU/accountancy.lang +++ b/htdocs/langs/hu_HU/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Piece number TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=List of the accounting accounts UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal Modelcsv=Model of export -OptionsDeactivatedForThisExportModel=For this export model, options are deactivated Selectmodelcsv=Select a model of export Modelcsv_normal=Klasszikus export Modelcsv_CEGID=Export towards CEGID Expert Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution Modelcsv_quadratus=Export towards Quadratus QuadraCompta Modelcsv_ebp=Export towards EBP Modelcsv_cogilog=Export towards Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang index 6f99aad2464..2b4d6ea7437 100644 --- a/htdocs/langs/hu_HU/admin.lang +++ b/htdocs/langs/hu_HU/admin.lang @@ -539,7 +539,7 @@ Module320Desc=Add RSS feed belül Dolibarr képernyőre Module330Name=Könyvjelzők Module330Desc=Könyvjelző kezelés 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. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=WebCalendar Module410Desc=WebCalendar integráció Module500Name=Különleges költségek @@ -890,7 +890,7 @@ DictionaryStaff=Személyzet DictionaryAvailability=Szállítási késedelem DictionaryOrderMethods=Rendelés módjai DictionarySource=Származási javaslatok / megrendelések -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Models for chart of accounts DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=E-mail sablonok @@ -904,6 +904,7 @@ SetupSaved=Beállítás mentett SetupNotSaved=Setup not saved BackToModuleList=Visszalép a modulok listáját BackToDictionaryList=Visszalép a szótárak listája +TypeOfRevenueStamp=Type of revenue stamp VATManagement=ÁFA kezelés VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is VAT=0. End of rule. VATIsNotUsedDesc=Alapértelmezésben a tervezett áfa 0, amelyet fel lehet használni olyan esetekre, mint az egyesületek, magánszemélyek ou kis cégek. @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/hu_HU/banks.lang b/htdocs/langs/hu_HU/banks.lang index 295f2f4cdb6..e1d3398353c 100644 --- a/htdocs/langs/hu_HU/banks.lang +++ b/htdocs/langs/hu_HU/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Szám LineRecord=Tranzakció AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Reconciled ConciliatedBy=Egyeztetésenként DateConciliating=Összeegyeztetés dátuma BankLineConciliated=Entry reconciled diff --git a/htdocs/langs/hu_HU/bills.lang b/htdocs/langs/hu_HU/bills.lang index e03484c0308..f8edf0dd28d 100644 --- a/htdocs/langs/hu_HU/bills.lang +++ b/htdocs/langs/hu_HU/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Fizetetlen beszállítói számla: %s BillsLate=Késedelmes fizetések BillsStatistics=Vevőszámla statisztika BillsStatisticsSuppliers=Beszállítói számlák statisztikája +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Disabled because cannot be erased InvoiceStandard=Normál számla InvoiceStandardAsk=Normál számla @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? ConfirmClassifyPaidPartiallyReasonAvoir=Maradék egyenleg (%s %s) elengedésre kerül kedvezményként, mivel a kifizetés a határidő előtt történt. Az ÁFA-t korrigálom jóváírás készítésével. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Maradék egyenleg (%s %s) elengedésre kerül kedvezményként, mivel a kifizetés a hatridő elött történt. Az ÁFA-t nem korrigálm, a jóváírás áfája elvesztésre kerül. ConfirmClassifyPaidPartiallyReasonDiscountVat=Maradék egyenleg (%s %s) elengedésre kerül kedvezményként, mivel a kifizetés a határidő előtt történt. Az ÁFA-t visszaigénylem jóváírás készítése nélkül. ConfirmClassifyPaidPartiallyReasonBadCustomer=Rossz ügyfél diff --git a/htdocs/langs/hu_HU/compta.lang b/htdocs/langs/hu_HU/compta.lang index 683655904c4..ebbba836a50 100644 --- a/htdocs/langs/hu_HU/compta.lang +++ b/htdocs/langs/hu_HU/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Kifizetések nem kapcsolódik semmilyen számlát, í PaymentsNotLinkedToUser=Kifizetések nem kapcsolódnak egyetlen felhasználó Profit=Nyereség AccountingResult=Accounting result +BalanceBefore=Balance (before) Balance=Egyenleg Debit=Tartozik Credit=Hitel diff --git a/htdocs/langs/hu_HU/donations.lang b/htdocs/langs/hu_HU/donations.lang index a3968859f97..84aac702dfd 100644 --- a/htdocs/langs/hu_HU/donations.lang +++ b/htdocs/langs/hu_HU/donations.lang @@ -31,3 +31,4 @@ 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 +DonationValidated=Donation %s validated diff --git a/htdocs/langs/hu_HU/errors.lang b/htdocs/langs/hu_HU/errors.lang index ddac8457e11..b8cd6b014b1 100644 --- a/htdocs/langs/hu_HU/errors.lang +++ b/htdocs/langs/hu_HU/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Empty expression ErrorPriceExpression21=Empty result '%s' ErrorPriceExpression22=Negative result '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs diff --git a/htdocs/langs/hu_HU/install.lang b/htdocs/langs/hu_HU/install.lang index eabadc7c70c..d02add80516 100644 --- a/htdocs/langs/hu_HU/install.lang +++ b/htdocs/langs/hu_HU/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=Ön használja az Dolibarr Setup Wizard egy Proxmox vir UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Fix denormalizált adatra @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Üres mező érték frissítése: llx_societe_remise MigrationRemiseExceptEntity=Üres mező érték frissítése: llx_societe_remise_except MigrationReloadModule=Modul újratöltése %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Nem elérhető opciók mutatása HideNotAvailableOptions=Nem elérhető opciók elrejtése ErrorFoundDuringMigration=Migráció alatt hiba történt, így nem lehet végrehajtani a következő lépést. A hibák elvetéséhez, végrehajthatja a kattintson ide, de az alkalmazás egyes lehetőségei nem fognak megfelelően működni a hibajavítás nélkül. diff --git a/htdocs/langs/hu_HU/languages.lang b/htdocs/langs/hu_HU/languages.lang index 25ee7124bb5..e09f9f89b31 100644 --- a/htdocs/langs/hu_HU/languages.lang +++ b/htdocs/langs/hu_HU/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spanyol (Panama) Language_es_PY=Spanyol (Paraguay) Language_es_PE=Spanyol (Peru) Language_es_PR=Spanyol (Puerto Rico) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Spanyol (Venezuela) Language_et_EE=Észt Language_eu_ES=Baszk diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang index 205d3b248be..26badd1c200 100644 --- a/htdocs/langs/hu_HU/main.lang +++ b/htdocs/langs/hu_HU/main.lang @@ -548,6 +548,18 @@ MonthShort09=szept MonthShort10=okt MonthShort11=nov MonthShort12=dec +MonthVeryShort01=J +MonthVeryShort02=P +MonthVeryShort03=H +MonthVeryShort04=A +MonthVeryShort05=H +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=V +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Csatolt fájlok és dokumentumok JoinMainDoc=Join main document DateFormatYYYYMM=YYYY-MM @@ -762,7 +774,7 @@ SetBankAccount=Bankszámla megadása AccountCurrency=Bankszámla pénzneme ViewPrivateNote=Megjegyzések XMoreLines=%s sor rejtve maradt -ShowMoreLines=Több sor megjelenítése +ShowMoreLines=Show more/less lines PublicUrl=Nyílvános URL AddBox=Add box SelectElementAndClick=Select an element and click %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=Mindenki +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/hu_HU/other.lang b/htdocs/langs/hu_HU/other.lang index db6d821b841..94622626a78 100644 --- a/htdocs/langs/hu_HU/other.lang +++ b/htdocs/langs/hu_HU/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=If amount higher than %s SourcesRepository=Repository for sources Chart=Chart PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=Az export területén diff --git a/htdocs/langs/hu_HU/products.lang b/htdocs/langs/hu_HU/products.lang index 06cefdba843..b6fc36340b5 100644 --- a/htdocs/langs/hu_HU/products.lang +++ b/htdocs/langs/hu_HU/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Aktuális ár AlwaysUseNewPrice=Mindig a termék/szolgáltatás aktuális árát használja AlwaysUseFixedPrice=Használja a fix árat PriceByQuantity=Mennyiségtől függő ár +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Mennyiségi intervallum MultipriceRules=Árazási szabályok UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/hu_HU/projects.lang b/htdocs/langs/hu_HU/projects.lang index 8bb44872744..6f1ca47124d 100644 --- a/htdocs/langs/hu_HU/projects.lang +++ b/htdocs/langs/hu_HU/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=Folyamatban OppStatusWON=Won OppStatusLOST=Lost Budget=Budget +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/hu_HU/website.lang b/htdocs/langs/hu_HU/website.lang index 3f5c8b0c79a..6fbbcee6a19 100644 --- a/htdocs/langs/hu_HU/website.lang +++ b/htdocs/langs/hu_HU/website.lang @@ -3,15 +3,17 @@ Shortname=Kód WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them. DeleteWebsite=A honlap törlése ConfirmDeleteWebsite=Biztos benne, hogy le akarja törölni a honlapot? Az összes oldal és tartalom el fog veszni! +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Page name/alias -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL of external CSS file WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Media library EditCss=Edit Style/CSS or HTML header EditMenu=Edit menu @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/id_ID/accountancy.lang b/htdocs/langs/id_ID/accountancy.lang index 79a608c9667..49bc5c7852f 100644 --- a/htdocs/langs/id_ID/accountancy.lang +++ b/htdocs/langs/id_ID/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Jumlah potongan TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=Daftar akun-akun akunting UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal Modelcsv=Model Ekspor -OptionsDeactivatedForThisExportModel=Untuk model ekspor ini , opsi dinonaktifkan Selectmodelcsv=Pilih satu model Ekspor Modelcsv_normal=Ekspor Klasik Modelcsv_CEGID=Ekspor terhadap CEGID Ahli komtabilitas @@ -254,7 +254,7 @@ Modelcsv_ciel=Ekspor terhadap Sage Ceil Compta atau Compta Evolution Modelcsv_quadratus=Ekspor terhadap Quadratus QuadraCompta Modelcsv_ebp=Ekspor terhadap EBP Modelcsv_cogilog=Export towards Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang index fd93b8e3a6b..cd2afbf53f1 100644 --- a/htdocs/langs/id_ID/admin.lang +++ b/htdocs/langs/id_ID/admin.lang @@ -539,7 +539,7 @@ Module320Desc=Add RSS feed inside Dolibarr screen pages Module330Name=Bookmarks Module330Desc=Bookmarks management Module400Name=Projects/Opportunities/Leads -Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar integration Module500Name=Special expenses @@ -890,7 +890,7 @@ DictionaryStaff=Staff DictionaryAvailability=Delivery delay DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Models for chart of accounts DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=Emails templates @@ -904,6 +904,7 @@ SetupSaved=Setup saved SetupNotSaved=Setup not saved BackToModuleList=Kembali Ke Daftar Modul BackToDictionaryList=Back to dictionaries list +TypeOfRevenueStamp=Type of revenue stamp VATManagement=VAT Management VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is 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. @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/id_ID/banks.lang b/htdocs/langs/id_ID/banks.lang index 911a19456d2..b7fb7eec92c 100644 --- a/htdocs/langs/id_ID/banks.lang +++ b/htdocs/langs/id_ID/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Number LineRecord=Transaction AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Reconciled ConciliatedBy=Reconciled by DateConciliating=Reconcile date BankLineConciliated=Entry reconciled diff --git a/htdocs/langs/id_ID/bills.lang b/htdocs/langs/id_ID/bills.lang index c57860656e7..29c6431d787 100644 --- a/htdocs/langs/id_ID/bills.lang +++ b/htdocs/langs/id_ID/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s BillsLate=Pembayaran - pembayaran yang terlambat BillsStatistics=Customers invoices statistics BillsStatisticsSuppliers=Suppliers invoices statistics +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Disabled because cannot be erased InvoiceStandard=Tagihan standar InvoiceStandardAsk=Taghian standar @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer diff --git a/htdocs/langs/id_ID/compta.lang b/htdocs/langs/id_ID/compta.lang index b5368b9e276..cfdb5ed195c 100644 --- a/htdocs/langs/id_ID/compta.lang +++ b/htdocs/langs/id_ID/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to PaymentsNotLinkedToUser=Payments not linked to any user Profit=Profit AccountingResult=Accounting result +BalanceBefore=Balance (before) Balance=Balance Debit=Debet Credit=Kredit diff --git a/htdocs/langs/id_ID/donations.lang b/htdocs/langs/id_ID/donations.lang index 69c03236135..503432517ad 100644 --- a/htdocs/langs/id_ID/donations.lang +++ b/htdocs/langs/id_ID/donations.lang @@ -31,3 +31,4 @@ 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 +DonationValidated=Donation %s validated diff --git a/htdocs/langs/id_ID/errors.lang b/htdocs/langs/id_ID/errors.lang index b02b70c9c9f..cff89a71d98 100644 --- a/htdocs/langs/id_ID/errors.lang +++ b/htdocs/langs/id_ID/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Empty expression ErrorPriceExpression21=Empty result '%s' ErrorPriceExpression22=Negative result '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs diff --git a/htdocs/langs/id_ID/install.lang b/htdocs/langs/id_ID/install.lang index e115f277d9c..1e81d853df5 100644 --- a/htdocs/langs/id_ID/install.lang +++ b/htdocs/langs/id_ID/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtua UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Fix for denormalized data @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Update entity field value of llx_societe_remise MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except MigrationReloadModule=Reload module %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Show not available options HideNotAvailableOptions=Hide not available options ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. diff --git a/htdocs/langs/id_ID/languages.lang b/htdocs/langs/id_ID/languages.lang index 8d2ee04aa43..a4c159fb7ef 100644 --- a/htdocs/langs/id_ID/languages.lang +++ b/htdocs/langs/id_ID/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Spanyol (Paraguay) Language_es_PE=Spanyol (Peru) Language_es_PR=Spanyol (Puerto Rico) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Spanish (Venezuela) Language_et_EE=Estonia Language_eu_ES=Basque diff --git a/htdocs/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang index 2423f8718e9..f0e4e9ac5be 100644 --- a/htdocs/langs/id_ID/main.lang +++ b/htdocs/langs/id_ID/main.lang @@ -548,6 +548,18 @@ MonthShort09=Sep MonthShort10=Oct MonthShort11=Nov MonthShort12=Dec +MonthVeryShort01=J +MonthVeryShort02=F +MonthVeryShort03=M +MonthVeryShort04=A +MonthVeryShort05=M +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=S +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Attached files and documents JoinMainDoc=Join main document DateFormatYYYYMM=YYYY-MM @@ -762,7 +774,7 @@ SetBankAccount=Define Bank Account AccountCurrency=Account currency ViewPrivateNote=View notes XMoreLines=%s line(s) hidden -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=Public URL AddBox=Add box SelectElementAndClick=Select an element and click %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=Everybody +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/id_ID/other.lang b/htdocs/langs/id_ID/other.lang index b7a3fba2665..652a1a4c9db 100644 --- a/htdocs/langs/id_ID/other.lang +++ b/htdocs/langs/id_ID/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=If amount higher than %s SourcesRepository=Repository for sources Chart=Chart PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=Exports area diff --git a/htdocs/langs/id_ID/products.lang b/htdocs/langs/id_ID/products.lang index 25460b1955e..6f4499d565e 100644 --- a/htdocs/langs/id_ID/products.lang +++ b/htdocs/langs/id_ID/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Current price AlwaysUseNewPrice=Always use current price of product/service AlwaysUseFixedPrice=Use the fixed price PriceByQuantity=Different prices by quantity +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Quantity range MultipriceRules=Price segment rules UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/id_ID/projects.lang b/htdocs/langs/id_ID/projects.lang index d3c7156fdbe..2280edbf6ab 100644 --- a/htdocs/langs/id_ID/projects.lang +++ b/htdocs/langs/id_ID/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=Pending OppStatusWON=Won OppStatusLOST=Lost Budget=Budget +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/id_ID/website.lang b/htdocs/langs/id_ID/website.lang index 3902febbfb7..6b4e2ada84a 100644 --- a/htdocs/langs/id_ID/website.lang +++ b/htdocs/langs/id_ID/website.lang @@ -3,15 +3,17 @@ Shortname=Code WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them. DeleteWebsite=Delete website ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Page name/alias -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL of external CSS file WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Media library EditCss=Edit Style/CSS or HTML header EditMenu=Edit menu @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/is_IS/accountancy.lang b/htdocs/langs/is_IS/accountancy.lang index c2e6c394f81..16532eadc45 100644 --- a/htdocs/langs/is_IS/accountancy.lang +++ b/htdocs/langs/is_IS/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Piece number TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=List of the accounting accounts UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal 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 Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution Modelcsv_quadratus=Export towards Quadratus QuadraCompta Modelcsv_ebp=Export towards EBP Modelcsv_cogilog=Export towards Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang index b983b43092b..0c476982705 100644 --- a/htdocs/langs/is_IS/admin.lang +++ b/htdocs/langs/is_IS/admin.lang @@ -539,7 +539,7 @@ Module320Desc=Bæta við RSS straum inni Dolibarr skjár síður Module330Name=Bókamerki Module330Desc=Bókamerki stjórnun 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. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar sameining Module500Name=Special expenses @@ -890,7 +890,7 @@ DictionaryStaff=Starfsfólk DictionaryAvailability=Afhending töf DictionaryOrderMethods=Röðun aðferðir DictionarySource=Uppruni tillögur / pantanir -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Models for chart of accounts DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=Emails templates @@ -904,6 +904,7 @@ SetupSaved=Skipulag vistuð SetupNotSaved=Setup not saved BackToModuleList=Til baka í mát lista BackToDictionaryList=Til baka orðabækur lista +TypeOfRevenueStamp=Type of revenue stamp VATManagement=VSK Stjórn VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is VAT=0. End of rule. VATIsNotUsedDesc=Sjálfgefið er fyrirhuguð VSK er 0 sem hægt er að nota til tilvikum eins og samtökum, einstaklingum OU lítil fyrirtæki. @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/is_IS/banks.lang b/htdocs/langs/is_IS/banks.lang index 57bc597765b..5d463123b6a 100644 --- a/htdocs/langs/is_IS/banks.lang +++ b/htdocs/langs/is_IS/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Fjöldi LineRecord=Færsla AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Reconciled ConciliatedBy=Sáttir við DateConciliating=Samræmdu dagsetningu BankLineConciliated=Entry reconciled diff --git a/htdocs/langs/is_IS/bills.lang b/htdocs/langs/is_IS/bills.lang index 925f52e7d87..2326e647827 100644 --- a/htdocs/langs/is_IS/bills.lang +++ b/htdocs/langs/is_IS/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s BillsLate=Vanskil BillsStatistics=Customers invoices statistics BillsStatisticsSuppliers=Suppliers invoices statistics +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Disabled because cannot be erased InvoiceStandard=Standard Reikningar InvoiceStandardAsk=Standard Reikningar @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad viðskiptavina diff --git a/htdocs/langs/is_IS/compta.lang b/htdocs/langs/is_IS/compta.lang index 9a7a62ae9a9..4eb49da55f7 100644 --- a/htdocs/langs/is_IS/compta.lang +++ b/htdocs/langs/is_IS/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Greiðslur ekki tengd við hvaða nótum svo ekki ten PaymentsNotLinkedToUser=Greiðslur tengist ekki allir notandi Profit=Hagnaður AccountingResult=Accounting result +BalanceBefore=Balance (before) Balance=Jafnvægi Debit=Debit Credit=Greiðslukort diff --git a/htdocs/langs/is_IS/donations.lang b/htdocs/langs/is_IS/donations.lang index f33d754053c..bc1a2f2d943 100644 --- a/htdocs/langs/is_IS/donations.lang +++ b/htdocs/langs/is_IS/donations.lang @@ -31,3 +31,4 @@ 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 +DonationValidated=Donation %s validated diff --git a/htdocs/langs/is_IS/errors.lang b/htdocs/langs/is_IS/errors.lang index 6c7e2048ea5..2d36993af48 100644 --- a/htdocs/langs/is_IS/errors.lang +++ b/htdocs/langs/is_IS/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Empty expression ErrorPriceExpression21=Empty result '%s' ErrorPriceExpression22=Negative result '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs diff --git a/htdocs/langs/is_IS/install.lang b/htdocs/langs/is_IS/install.lang index 593205df4a3..e05e4421800 100644 --- a/htdocs/langs/is_IS/install.lang +++ b/htdocs/langs/is_IS/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=Þú notar Dolibarr uppsetningarhjálpina frá Proxmox UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Festa fyrir denormalized gögn @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Update entity field value of llx_societe_remise MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except MigrationReloadModule=Reload module %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Show not available options HideNotAvailableOptions=Hide not available options ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. diff --git a/htdocs/langs/is_IS/languages.lang b/htdocs/langs/is_IS/languages.lang index 2ec109ad32f..3949a5c98d8 100644 --- a/htdocs/langs/is_IS/languages.lang +++ b/htdocs/langs/is_IS/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Spænska (Paraguay) Language_es_PE=Spænska (Peru) Language_es_PR=Spænska (Puerto Rico) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Spanish (Venezuela) Language_et_EE=Eistneska Language_eu_ES=Basque diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang index 7a04870bd51..09e0f9e3ae3 100644 --- a/htdocs/langs/is_IS/main.lang +++ b/htdocs/langs/is_IS/main.lang @@ -548,6 +548,18 @@ MonthShort09=September MonthShort10=Október MonthShort11=Nóvember MonthShort12=Desember +MonthVeryShort01=J +MonthVeryShort02=F +MonthVeryShort03=M +MonthVeryShort04=A +MonthVeryShort05=M +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=S +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Meðfylgjandi skrár og skjöl JoinMainDoc=Join main document DateFormatYYYYMM=ÁÁÁÁ-MM @@ -762,7 +774,7 @@ SetBankAccount=Define Bank Account AccountCurrency=Account currency ViewPrivateNote=View notes XMoreLines=%s line(s) hidden -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=Public URL AddBox=Add box SelectElementAndClick=Select an element and click %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=Allir +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/is_IS/other.lang b/htdocs/langs/is_IS/other.lang index 917a8cb94d1..67a7b1ad4ea 100644 --- a/htdocs/langs/is_IS/other.lang +++ b/htdocs/langs/is_IS/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=If amount higher than %s SourcesRepository=Repository for sources Chart=Chart PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=Útflutningur area diff --git a/htdocs/langs/is_IS/products.lang b/htdocs/langs/is_IS/products.lang index b1a20de43a9..5c21c8b2225 100644 --- a/htdocs/langs/is_IS/products.lang +++ b/htdocs/langs/is_IS/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Núverandi verð AlwaysUseNewPrice=Always use current price of product/service AlwaysUseFixedPrice=Use the fixed price PriceByQuantity=Different prices by quantity +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Quantity range MultipriceRules=Price segment rules UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/is_IS/projects.lang b/htdocs/langs/is_IS/projects.lang index 47899f264dc..c976d5c8845 100644 --- a/htdocs/langs/is_IS/projects.lang +++ b/htdocs/langs/is_IS/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=Pending OppStatusWON=Won OppStatusLOST=Lost Budget=Budget +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/is_IS/website.lang b/htdocs/langs/is_IS/website.lang index 3902febbfb7..6b4e2ada84a 100644 --- a/htdocs/langs/is_IS/website.lang +++ b/htdocs/langs/is_IS/website.lang @@ -3,15 +3,17 @@ Shortname=Code WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them. DeleteWebsite=Delete website ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Page name/alias -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL of external CSS file WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Media library EditCss=Edit Style/CSS or HTML header EditMenu=Edit menu @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/it_IT/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang index 77e36421d3e..1d2e0a7915a 100644 --- a/htdocs/langs/it_IT/accountancy.lang +++ b/htdocs/langs/it_IT/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Numero del pezzo TransactionNumShort=Num. transazione AccountingCategory=Personalized groups GroupByAccountAccounting=Raggruppamento piano dei conti -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=Gruppi personalizzati @@ -191,6 +191,7 @@ DescThirdPartyReport=Consulta la lista dei clienti e fornitori e dei contatti co ListAccounts=Lista delle voci del piano dei conti UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Gruppo di conto Pcgsubtype=Sottogruppo di conto @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=Questo giornale è già in uso ## Export ExportDraftJournal=Export draft journal Modelcsv=Modello di esportazione -OptionsDeactivatedForThisExportModel=Per questo modello di esportazione, le opzioni sono disattivate Selectmodelcsv=Seleziona un modello di esportazione Modelcsv_normal=Esportazione classica Modelcsv_CEGID=Esportazione per CEGID Expert Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Esportazione per Sage Ciel Compta o Compta Evolution Modelcsv_quadratus=Esportazione per Quadratus QuadraCompta Modelcsv_ebp=Esportazione per EBP Modelcsv_cogilog=Esporta per Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Id Piano dei Conti diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang index bd088d9496f..f9bf58c9948 100644 --- a/htdocs/langs/it_IT/admin.lang +++ b/htdocs/langs/it_IT/admin.lang @@ -131,7 +131,7 @@ HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on thi Box=Widget Boxes=Widgets MaxNbOfLinesForBoxes=Massimo numero di righe per componente -AllWidgetsWereEnabled=All available widgets are enabled +AllWidgetsWereEnabled=Tutti i widget disponibili sono abilitati PositionByDefault=Per impostazione predefinita Position=Posizione MenusDesc=Gestione del contenuto delle 2 barre dei menu (barra orizzontale e barra verticale). @@ -206,9 +206,9 @@ CompatibleUpTo=Compatible with version %s NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s - Max %s). CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s). SeeInMarkerPlace=See in Market place -Updated=Updated +Updated=Aggiornato Nouveauté=Novelty -AchatTelechargement=Buy / Download +AchatTelechargement=Aquista / Scarica GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at %s. DoliStoreDesc=DoliStore, il mercato ufficiale dei moduli esterni per Dolibarr ERP/CRM DoliPartnersDesc=Elenco di aziende che forniscono moduli e funzionalità sviluppate su misura (Nota: chiunque sia esperto in programmazione PHP è in grado di fornire un contributo allo sviluppo per un progetto open source) @@ -330,7 +330,7 @@ GenericMaskCodes3=Tutti gli altri caratteri nello schema rimarranno inalterati. GenericMaskCodes4a=Esempio sulla novantanovesima %s del contatto, con la data il 31/01/2007:
    GenericMaskCodes4b=Esempio : il 99esimo cliente/fornitore viene creato 31/01/2007:
    GenericMaskCodes4c=Esempio su prodotto creato il 2007-03-01:
    -GenericMaskCodes5=ABC{yy}{mm}-{000000} will give ABC0701-000099
    {0000+100@1}-ZZZ/{dd}/XXX will give 0199-ZZZ/31/XXX
    IN{yy}{mm}-{0000}-{t} will give IN0701-0099-A if the type of company is 'Responsable Inscripto' with code for type that is 'A_RI' +GenericMaskCodes5=ABC{yy}{mm}-{000000} restituirà ABC0701-000099
    {0000+100@1}-ZZZ/{dd}/XXX restituirà 0199-ZZZ/31/XXX
    IN{yy}{mm}-{0000}-{t} restituirà IN0701-0099-A se la tipologia di società è a 'Responsabile iscritto' con codice 'A_RI' GenericNumRefModelDesc=Restituisce un numero personalizzabile in base allo schema definito dalla maschera. ServerAvailableOnIPOrPort=Il server è disponibile all'indirizzo %s sulla porta %s ServerNotAvailableOnIPOrPort=Il server non è disponibile all'indirizzo %s sulla porta %s @@ -465,8 +465,8 @@ ProductDocumentTemplates=Document templates to generate product document FreeLegalTextOnExpenseReports=Testo libero sul report di spesa WatermarkOnDraftExpenseReports=Watermark on draft expense reports AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable) -FilesAttachedToEmail=Attach file -SendEmailsReminders=Send agenda reminders by emails +FilesAttachedToEmail=Allega file +SendEmailsReminders=Invia promemoria agenda via email # Modules Module0Name=Utenti e gruppi Module0Desc=Gestione utenti/impiegati e gruppi @@ -539,7 +539,7 @@ Module320Desc=Aggiungi feed RSS alle pagine di Dolibarr Module330Name=Segnalibri Module330Desc=Gestione segnalibri Module400Name=Projects/Opportunities/Leads -Module400Desc=Gestione di progetti ed opportunità. Puoi assegnare ogni elemento (fattura, ordini, proposte commerciali, interventi, ...) ad un progetto ed avere una vista trasversale dalla scheda del progetto +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Calendario web Module410Desc=Integrazione calendario web Module500Name=Spese speciali @@ -890,7 +890,7 @@ DictionaryStaff=Personale DictionaryAvailability=Tempi di consegna DictionaryOrderMethods=Metodi di ordinazione DictionarySource=Origine delle proposte/ordini -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Modelli per piano dei conti DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=Modelli email @@ -904,6 +904,7 @@ SetupSaved=Impostazioni salvate SetupNotSaved=Impostazioni non salvate BackToModuleList=Torna alla lista moduli BackToDictionaryList=Torna alla lista dei dizionari +TypeOfRevenueStamp=Type of revenue stamp VATManagement=Gestione IVA VATIsUsedDesc=Per impostazione predefinita l'aliquota IVA usata per la creazione di prospetti, fatture, ordini, ecc. segue la regola attiva:
    - Se il venditore non è un soggetto IVA, l'aliquota IVA è pari a 0.
    - Se i paesi di vendita e di acquisto coincidono, il valore predefinito dell'aliquota IVA è quello del prodotto nel paese di vendita.
    - Se il venditore e l'acquirente si trovano entrambi all'interno della Comunità Europea ed i beni consistono in servizi di trasporto (auto, nave, aereo), il valore predefinito dell'aliquota IVA è 0 (L'IVA dovrebbe essere pagata dall'acquirente all'ufficio doganale del suo paese e non al venditore).
    - Se il venditore e l'acquirente si trovano entrambi all'interno della Comunità Europea e l'acquirente non è una società, l'aliquota IVA predefinita è quella del prodotto venduto.
    - Se il venditore e l'acquirente si trovano entrambi all'interno della Comunità Europea e l'acquirente è una società, l'aliquota IVA predefinita è 0.
    In tutti gli altri casi l'aliquota IVA predefinita è 0. VATIsNotUsedDesc=Impostazione predefinita in cui l'aliquota IVA è pari a 0. Adatto a soggetti come associazioni, persone fisiche o piccole imprese con regime semplificato o a forfait. @@ -983,7 +984,7 @@ DefaultMaxSizeList=Lunghezza massima predefinita elenchi DefaultMaxSizeShortList=Massima lunghezza di default per le liste brevi (es in scheda cliente) MessageOfDay=Messaggio del giorno MessageLogin=Messaggio per la pagina di login -LoginPage=Login page +LoginPage=Pagina di login BackgroundImageLogin=Immagine di sfondo PermanentLeftSearchForm=Modulo di ricerca permanente nel menu di sinistra DefaultLanguage=La lingua da impostare come predefinita (codice lingua) @@ -1096,9 +1097,9 @@ TranslationUncomplete=Traduzione incompleta MAIN_DISABLE_METEO=Disabilita visualizzazione meteo MeteoStdMod=Standard mode MeteoStdModEnabled=Standard mode enabled -MeteoPercentageMod=Percentage mode +MeteoPercentageMod=Modalità percentuale MeteoPercentageModEnabled=Percentage mode enabled -MeteoUseMod=Click to use %s +MeteoUseMod=Clicca per usare %s TestLoginToAPI=Test login per API ProxyDesc=Dolibarr deve disporre di un accesso a Internet per alcune funzi. Definire qui i parametri per permettere a Dolibarr l'accesso ad internet attraverso un server proxy. ExternalAccess=Accesso esterno @@ -1409,7 +1410,7 @@ CompressionOfResourcesDesc=For exemple using the Apache directive "AddOutputFilt TestNotPossibleWithCurrentBrowsers=Con i browser attuali l'individuazione automatica non è possibile DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or sort order when your list record. DefaultCreateForm=Default values (on forms to create) -DefaultSearchFilters=Default search filters +DefaultSearchFilters=Filtri di ricerca predefiniti DefaultSortOrder=Default sort orders DefaultFocus=Default focus fields ##### Products ##### @@ -1724,7 +1725,7 @@ MultiPriceRuleDesc=When option "Several level of prices per product/service" is ModelModulesProduct=Modelli per documenti prodotto ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number. SeeSubstitutionVars=See * note for list of possible substitution variables -SeeChangeLog=See ChangeLog file (english only) +SeeChangeLog=Guarda ChangeLog file (in inglese) AllPublishers=Tutti gli editori UnknownPublishers=Editore sconosciuto AddRemoveTabs=Aggiungi o elimina schede @@ -1759,9 +1760,10 @@ WarningInstallationMayBecomeNotCompliantWithLaw=You try to install the module %s MAIN_PDF_MARGIN_LEFT=Left margin on PDF MAIN_PDF_MARGIN_RIGHT=Right margin on PDF MAIN_PDF_MARGIN_TOP=Top margin on PDF -MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF +MAIN_PDF_MARGIN_BOTTOM=Margine inferiore su PDF ##### Resource #### ResourceSetup=Configurazione del modulo Risorse UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/it_IT/banks.lang b/htdocs/langs/it_IT/banks.lang index 11289d478f5..aa615c2de37 100644 --- a/htdocs/langs/it_IT/banks.lang +++ b/htdocs/langs/it_IT/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Numero di conto LineRecord=Transazione AddBankRecord=Aggiungi operazione AddBankRecordLong=Aggiungi operazione manualmente +Conciliated=Conciliata ConciliatedBy=Transazione conciliata da DateConciliating=Data di conciliazione BankLineConciliated=Transazione conciliata diff --git a/htdocs/langs/it_IT/bills.lang b/htdocs/langs/it_IT/bills.lang index dff7527d879..b28b1c44e69 100644 --- a/htdocs/langs/it_IT/bills.lang +++ b/htdocs/langs/it_IT/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Fatture passive non pagate per %s BillsLate=Ritardi nei pagamenti BillsStatistics=Statistiche fatture attive BillsStatisticsSuppliers=Statistiche fatture passive +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Disabilitata perché impossibile da cancellare InvoiceStandard=Fattura Standard InvoiceStandardAsk=Fattura Standard @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Perché vuoi classificare questa fattura come "abbando ConfirmClassifyPaidPartially=Vuoi davvero cambiare lo stato della fattura %s in "pagato"? ConfirmClassifyPaidPartiallyQuestion=La fattura non è stata pagata completamente. Per quale ragione vuoi chiudere questa fattura? ConfirmClassifyPaidPartiallyReasonAvoir=Il restante da pagare (%s %s) viene scontato perché il pagamento è stato eseguito entro il termine. L'IVA sarà regolarizzata mediante nota di credito. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Il restante da pagare (%s %s) viene scontato perché il pagamento è stato eseguito entro il termine. Accetto di perdere l'IVA sullo sconto. ConfirmClassifyPaidPartiallyReasonDiscountVat=Il restante da pagare (%s %s) viene scontato perché il pagamento è stato eseguito entro il termine. L'IVA sullo sconto sarà recuperata senza nota di credito. ConfirmClassifyPaidPartiallyReasonBadCustomer=Cliente moroso diff --git a/htdocs/langs/it_IT/cashdesk.lang b/htdocs/langs/it_IT/cashdesk.lang index 322a8323e00..f5dfa66bce0 100644 --- a/htdocs/langs/it_IT/cashdesk.lang +++ b/htdocs/langs/it_IT/cashdesk.lang @@ -14,7 +14,7 @@ ShoppingCart=Carrello NewSell=Nuova vendita AddThisArticle=Aggiungi questo articolo RestartSelling=Rimetti in vendita -SellFinished=Sale complete +SellFinished=Vendita completata PrintTicket=Stampa biglietto NoProductFound=Nessun articolo trovato ProductFound=Prodotto trovato @@ -25,7 +25,7 @@ Difference=Differenza TotalTicket=Totale del biglietto NoVAT=L'IVA non si applica alla vendita Change=Merce in eccesso ricevuta -BankToPay=Account for payment +BankToPay=Conto per il pagamento ShowCompany=Mostra società ShowStock=Mostra magazzino DeleteArticle=Clicca per rimuovere l'articolo diff --git a/htdocs/langs/it_IT/companies.lang b/htdocs/langs/it_IT/companies.lang index d8bbc5db774..cd403d8ef1b 100644 --- a/htdocs/langs/it_IT/companies.lang +++ b/htdocs/langs/it_IT/companies.lang @@ -29,7 +29,7 @@ AliasNameShort=Pseudonimo Companies=Società CountryIsInEEC=Paese appartenente alla Comunità Economica Europea ThirdPartyName=Nome soggetto terzo -ThirdPartyEmail=Third party email +ThirdPartyEmail=Posta elettronica soggetto terzo ThirdParty=Soggetto terzo ThirdParties=Soggetti terzi ThirdPartyProspects=Clienti potenziali @@ -267,7 +267,7 @@ CustomerAbsoluteDiscountShort=Sconto assoluto CompanyHasRelativeDiscount=Il cliente ha uno sconto del %s%% CompanyHasNoRelativeDiscount=Il cliente non ha alcuno sconto relativo impostato CompanyHasAbsoluteDiscount=Questo cliente ha degli sconti disponibili (note di crediti o anticipi) per un totale di %s%s -CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for %s %s +CompanyHasDownPaymentOrCommercialDiscount=Questo cliente ha uno sconto disponibile (commerciale, nota d'accredito) per %s%s CompanyHasCreditNote=Il cliente ha ancora note di credito per %s %s CompanyHasNoAbsoluteDiscount=Il cliente non ha disponibile alcuno sconto assoluto per credito CustomerAbsoluteDiscountAllUsers=Sconti assoluti (concessi a tutti gli utenti) diff --git a/htdocs/langs/it_IT/compta.lang b/htdocs/langs/it_IT/compta.lang index 41c3d92dd7b..5c52a7def40 100644 --- a/htdocs/langs/it_IT/compta.lang +++ b/htdocs/langs/it_IT/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=I pagamenti non legati ad una fattura, quindi non leg PaymentsNotLinkedToUser=Pagamenti non legati ad alcun utente Profit=Utile AccountingResult=Risultato contabile +BalanceBefore=Balance (before) Balance=Saldo Debit=Debito Credit=Credito diff --git a/htdocs/langs/it_IT/donations.lang b/htdocs/langs/it_IT/donations.lang index 47d0be96fcc..e3c07603975 100644 --- a/htdocs/langs/it_IT/donations.lang +++ b/htdocs/langs/it_IT/donations.lang @@ -31,3 +31,4 @@ 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 +DonationValidated=Donation %s validated diff --git a/htdocs/langs/it_IT/ecm.lang b/htdocs/langs/it_IT/ecm.lang index 1b9aa975d3d..35698cfbde9 100644 --- a/htdocs/langs/it_IT/ecm.lang +++ b/htdocs/langs/it_IT/ecm.lang @@ -6,7 +6,7 @@ ECMSectionAuto=Directory automatica ECMSectionsManual=Gerarchia manuale ECMSectionsAuto=Gerarchia automatica ECMSections=Directory -ECMRoot=ECM Root +ECMRoot=ECM Radice ECMNewSection=Nuova sezione ECMAddSection=Aggiungi directory ECMCreationDate=Data di creazione @@ -18,7 +18,7 @@ ECMArea=EDM area ECMAreaDesc=L'area EDM (Gestione elettronica dei documenti) ti permette di salvare, condividere e cercare rapidamente tutti i tipi di documenti presenti. ECMAreaDesc2=* Le directory vengono riempite automaticamente quando si aggiungono dei documenti dalla scheda di un elemento.
    * Per salvare documenti non legati ad un elemento si può usare l'aggiunta manuale. ECMSectionWasRemoved=La directory%s è stata eliminata. -ECMSectionWasCreated=Directory %s has been created. +ECMSectionWasCreated=Cartella %s è stata creata. ECMSearchByKeywords=Ricerca per parole chiave ECMSearchByEntity=Ricerca per oggetto ECMSectionOfDocuments=Directory dei documenti @@ -47,4 +47,4 @@ ReSyncListOfDir=Aggiorna la lista delle cartelle HashOfFileContent=Hash contenuto file FileNotYetIndexedInDatabase=File non indicizzato nel database (prova a caricarlo di nuovo) FileSharedViaALink=File condiviso con un link -NoDirectoriesFound=No directories found +NoDirectoriesFound=Nessuna cartella trovata diff --git a/htdocs/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang index 0d4706edfc8..598246e4249 100644 --- a/htdocs/langs/it_IT/errors.lang +++ b/htdocs/langs/it_IT/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Espressione vuota ErrorPriceExpression21=Risultato vuoto '%s' ErrorPriceExpression22=Risultato negativo '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Errore interno '%s' ErrorPriceExpressionUnknown=Errore sconosciuto '%s' ErrorSrcAndTargetWarehouseMustDiffers=I magazzini di origine e di destinazione devono essere diversi diff --git a/htdocs/langs/it_IT/hrm.lang b/htdocs/langs/it_IT/hrm.lang index e181bb87614..e6859e26b18 100644 --- a/htdocs/langs/it_IT/hrm.lang +++ b/htdocs/langs/it_IT/hrm.lang @@ -9,8 +9,8 @@ ConfirmDeleteEstablishment=Sei sicuro di voler cancellare questa azienda? OpenEtablishment=Apri azienda CloseEtablishment=Chiudi azienda # Dictionary -DictionaryDepartment=HRM - Department list -DictionaryFunction=HRM - Function list +DictionaryDepartment=HRM - Lista dipartimenti +DictionaryFunction=HRM - Lista funzioni # Module Employees=Dipendenti Employee=Dipendente diff --git a/htdocs/langs/it_IT/install.lang b/htdocs/langs/it_IT/install.lang index a0de18ec126..abd02017cd8 100644 --- a/htdocs/langs/it_IT/install.lang +++ b/htdocs/langs/it_IT/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=Si sta utilizzando la configurazione guidata di una vir UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Fix per i dati denormalizzati @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Update entity field value of llx_societe_remise MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except MigrationReloadModule=Ricarica modulo %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Mostra opzioni non disponibili HideNotAvailableOptions=Nascondi opzioni non disponibili ErrorFoundDuringMigration=L'errore si è verificato durante il processo di migrazione quindi il prossimo step non sarà disponibile. Per ignorare gli errori puoi cliccare qui, ma l'applicazione o qualche funzionalità potrebbe non funzionare correttamente fino alla correzione dell'errore. diff --git a/htdocs/langs/it_IT/languages.lang b/htdocs/langs/it_IT/languages.lang index 5f8b85a6b43..3a7ac126910 100644 --- a/htdocs/langs/it_IT/languages.lang +++ b/htdocs/langs/it_IT/languages.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - languages Language_ar_AR=Arabo -Language_ar_EG=Arabic (Egypt) +Language_ar_EG=Arabo (Egitto) Language_ar_SA=Arabo Language_bn_BD=Bengalese Language_bg_BG=Bulgaro @@ -35,6 +35,7 @@ Language_es_PA=Spagnolo (Panama) Language_es_PY=Spagnolo (Paraguay) Language_es_PE=Spagnolo (Perù) Language_es_PR=Spagnolo (Portorico) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Spagnolo (Venezuela) Language_et_EE=Estone Language_eu_ES=Basco diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang index 339f0f4763a..3b0ca028ad6 100644 --- a/htdocs/langs/it_IT/main.lang +++ b/htdocs/langs/it_IT/main.lang @@ -24,7 +24,7 @@ FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p FormatDateHourTextShort=%d %b %Y %H.%M FormatDateHourText=%d %B %Y %H:%M DatabaseConnection=Connessione al database -NoTemplateDefined=No template available for this email type +NoTemplateDefined=Nessun tema disponibile per questo tipo di email AvailableVariables=Available substitution variables NoTranslation=Nessuna traduzione Translation=Traduzione @@ -44,7 +44,7 @@ ErrorConstantNotDefined=Parametro %s non definito ErrorUnknown=Errore sconosciuto ErrorSQL=Errore di SQL ErrorLogoFileNotFound=Impossibile trovare il file %s per il logo -ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this +ErrorGoToGlobalSetup=Vai su impostazioni "Azienda/Organizzazione" per sistemare ErrorGoToModuleSetup=Vai alle impostazioni del modulo per risolvere il problema ErrorFailedToSendMail=Impossibile inviare l'email (mittente=%s, destinatario=%s) ErrorFileNotUploaded=Upload fallito. Controllare che la dimensione del file non superi il numero massimo consentito, che lo spazio libero su disco sia sufficiente e che non esista già un file con lo stesso nome nella directory. @@ -74,10 +74,10 @@ Apply=Applica BackgroundColorByDefault=Colore di sfondo predefinito FileRenamed=Il file è stato rinominato con successo FileGenerated=Il file è stato generato con successo -FileSaved=The file was successfully saved +FileSaved=Il file è stato salvato con successo FileUploaded=Il file è stato caricato con successo -FileTransferComplete=File(s) was uploaded successfully -FilesDeleted=File(s) successfully deleted +FileTransferComplete=I File sono stati caricati correttamente +FilesDeleted=File cancellati con successo FileWasNotUploaded=Il file selezionato per l'upload non è stato ancora caricato. Clicca su Allega file per farlo NbOfEntries=Numero di voci GoToWikiHelpPage=Leggi l'aiuto online (è richiesto un collegamento internet) @@ -105,7 +105,7 @@ ReturnCodeLastAccessInError=Codice di ritorno per l'ultimo accesso errato al dat InformationLastAccessInError=Informazioni sull'ultimo accesso errato al database DolibarrHasDetectedError=Dolibarr ha rilevato un errore tecnico YouCanSetOptionDolibarrMainProdToZero=You can read log file or set option $dolibarr_main_prod to '0' in your config file to get more information. -InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to remove such notices) +InformationToHelpDiagnose=Quest'informazione può essere utile per fini diagnostici (puoi settare l'opzione $dolibarr_main_prod su "1" per rimuovere questa notifica) MoreInformation=Maggiori informazioni TechnicalInformation=Informazioni tecniche TechnicalID=Technical ID @@ -131,8 +131,8 @@ Never=Mai Under=sotto Period=Periodo PeriodEndDate=Data scadenza periodo -SelectedPeriod=Selected period -PreviousPeriod=Previous period +SelectedPeriod=Periodo selezionato +PreviousPeriod=Periodo precedente Activate=Attiva Activated=Attivato Closed=Chiuso @@ -160,7 +160,7 @@ Edit=Modifica Validate=Convalida ValidateAndApprove=Convalida e approva ToValidate=Convalidare -NotValidated=Not validated +NotValidated=Non valido Save=Salva SaveAs=Salva con nome TestConnection=Test connessione @@ -201,7 +201,7 @@ Parameter=Parametro Parameters=Parametri Value=Valore PersonalValue=Valore personalizzato -NewObject=New %s +NewObject=Nuovo %s NewValue=Nuovo valore CurrentValue=Valore attuale Code=Codice @@ -263,7 +263,7 @@ DateBuild=Data di creazione del report DatePayment=Data pagamento DateApprove=Approvato in data DateApprove2=Data di approvazione (seconda approvazione) -RegistrationDate=Registration date +RegistrationDate=Data registrazione UserCreation=Creazione utente UserModification=Modifica utente UserValidation=Validation user @@ -323,7 +323,7 @@ Copy=Copia Paste=Incolla Default=Predefinito DefaultValue=Valore predefinito -DefaultValues=Default values +DefaultValues=Valori predefiniti Price=Prezzo UnitPrice=Prezzo unitario UnitPriceHT=Prezzo unitario (netto) @@ -370,31 +370,31 @@ TotalLT1=Totale tassa 2 TotalLT2=Totale tassa 3 TotalLT1ES=Totale RE TotalLT2ES=Totale IRPF -TotalLT1IN=Total CGST -TotalLT2IN=Total SGST +TotalLT1IN=Totale CGST +TotalLT2IN=Totale SGST HT=Al netto delle imposte TTC=IVA inclusa INCVATONLY=Inc. VAT -INCT=Inc. all taxes +INCT=Inc. tutte le tasse VAT=IVA VATIN=IGST VATs=IVA -VATINs=IGST taxes -LT1=Sales tax 2 -LT1Type=Sales tax 2 type -LT2=Sales tax 3 -LT2Type=Sales tax 3 type +VATINs=Tassa IGST +LT1=Tassa locale 2 +LT1Type=Tipo tassa locale 2 +LT2=Tassa locale 3 +LT2Type=Tipo tassa locale 3 LT1ES=RE LT2ES=IRPF LT1IN=CGST LT2IN=SGST VATRate=Aliquota IVA -DefaultTaxRate=Default tax rate +DefaultTaxRate=Valore base tassa Average=Media Sum=Somma Delta=Delta -Module=Module/Application -Modules=Modules/Applications +Module=Moduli/Applicazioni +Modules=Moduli/Applicazioni Option=Opzione List=Elenco FullList=Elenco completo @@ -438,7 +438,7 @@ Generate=Genera Duration=Durata TotalDuration=Durata totale Summary=Riepilogo -DolibarrStateBoard=Database statistics +DolibarrStateBoard=Statistiche Database DolibarrWorkBoard=Open items dashboard NoOpenedElementToProcess=No opened element to process Available=Disponibile @@ -548,6 +548,18 @@ MonthShort09=set MonthShort10=ott MonthShort11=nov MonthShort12=dic +MonthVeryShort01=J +MonthVeryShort02=Ven +MonthVeryShort03=Lun +MonthVeryShort04=A +MonthVeryShort05=Lun +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=Dom +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=File e documenti allegati JoinMainDoc=Join main document DateFormatYYYYMM=AAAA-MM @@ -602,7 +614,7 @@ Undo=Annulla Redo=Ripeti ExpandAll=Mostra tutto UndoExpandAll=Annulla mostra tutto -SeeAll=See all +SeeAll=Vedi tutto Reason=Ragione FeatureNotYetSupported=Funzionalità non ancora supportata CloseWindow=Chiudi finestra @@ -629,7 +641,7 @@ ValueIsNotValid=Il valore non è valido RecordCreatedSuccessfully=Record creato con success0 RecordModifiedSuccessfully=Record modificati con successo RecordsModified=%s record modificati -RecordsDeleted=%s record deleted +RecordsDeleted=%s record cancellato AutomaticCode=Codice automatico FeatureDisabled=Funzionalità disabilitata MoveBox=Sposta widget @@ -645,8 +657,8 @@ PartialWoman=Parziale TotalWoman=Totale NeverReceived=Mai ricevuto Canceled=Annullato -YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu Setup - Dictionaries -YouCanChangeValuesForThisListFrom=You can change values for this list from menu %s +YouCanChangeValuesForThisListFromDictionarySetup=Puoi cambiare i valori di questa lista dal menù Impostazioni - Dizionari +YouCanChangeValuesForThisListFrom=Puoi cambiare i valori di questa lista dal menu %s YouCanSetDefaultValueInModuleSetup=Puoi definire il valore predefinito durante la creazione di un nuovo record nella configurazione del modulo Color=Colore Documents=Documenti @@ -678,12 +690,12 @@ Page=Pagina Notes=Note AddNewLine=Aggiungi una nuova riga AddFile=Aggiungi file -FreeZone=Not a predefined product/service +FreeZone=Non è un prodotto/servizio predefinito FreeLineOfType=Not a predefined entry of type CloneMainAttributes=Clona oggetto con i suoi principali attributi PDFMerge=Unisci PDF Merge=Unisci -DocumentModelStandardPDF=Standard PDF template +DocumentModelStandardPDF=Tema PDF Standard PrintContentArea=Mostra una pagina per stampare l'area principale MenuManager=Gestore dei menu WarningYouAreInMaintenanceMode=Attenzione, si è in modalità manutenzione. Solo %s ha il permesso di usare l'applicazione. @@ -726,9 +738,9 @@ LinkToIntervention=Collega a intervento CreateDraft=Crea bozza SetToDraft=Ritorna a bozza ClickToEdit=Clicca per modificare -EditWithEditor=Edit with CKEditor -EditWithTextEditor=Edit with Text editor -EditHTMLSource=Edit HTML Source +EditWithEditor=Modifica con CKEditor +EditWithTextEditor=Modifica con editor di testo +EditHTMLSource=Modifica codice HTML ObjectDeleted=Oggetto %s eliminato ByCountry=Per paese ByTown=Per città @@ -762,18 +774,18 @@ SetBankAccount=Definisci un numero di Conto Corrente Bancario AccountCurrency=Account currency ViewPrivateNote=Vedi note XMoreLines=%s linea(e) nascoste -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=URL pubblico AddBox=Aggiungi box -SelectElementAndClick=Select an element and click %s +SelectElementAndClick=Seleziona un elemento e clicca %s PrintFile=Stampa il file %s -ShowTransaction=Show entry on bank account +ShowTransaction=Mostra entrate conto bancario ShowIntervention=Mostra intervento ShowContract=Visualizza contratto GoIntoSetupToChangeLogo=Vai in Home -> Impostazioni -> Società per cambiare il logo o in Home - Setup -> display per nasconderlo. Deny=Rifiuta Denied=Rifiutata -ListOf=List of %s +ListOf=Lista di %s ListOfTemplates=Elenco dei modelli Gender=Genere Genderman=Uomo @@ -781,13 +793,13 @@ Genderwoman=Donna ViewList=Vista elenco Mandatory=Obbligatorio Hello=Ciao -GoodBye=GoodBye +GoodBye=Addio Sincerely=Cordialmente DeleteLine=Elimina riga ConfirmDeleteLine=Vuoi davvero eliminare questa riga? NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record. -NoRecordSelected=No record selected +NoRecordSelected=Nessun record selezionato MassFilesArea=File creati da azioni di massa ShowTempMassFilesArea=Mostra i file creati da azioni di massa ConfirmMassDeletion=Bulk delete confirmation @@ -816,20 +828,20 @@ Download=Download DownloadDocument=Download document ActualizeCurrency=Aggiorna tasso di cambio Fiscalyear=Anno fiscale -ModuleBuilder=Module Builder +ModuleBuilder=Mudulo programmatore SetMultiCurrencyCode=Set currency BulkActions=Bulk actions ClickToShowHelp=Click to show tooltip help WebSite=Sito web -WebSites=Web sites +WebSites=Siti web WebSiteAccounts=Web site accounts ExpenseReport=Nota spese ExpenseReports=Nota spese HR=HR -HRAndBank=HR and Bank -AutomaticallyCalculated=Automatically calculated -TitleSetToDraft=Go back to draft -ConfirmSetToDraft=Are you sure you want to go back to Draft status ? +HRAndBank=HR e Banca +AutomaticallyCalculated=Calcolato automaticamente +TitleSetToDraft=Torna a Bozza +ConfirmSetToDraft=Sei sicuro che vuoi tornare allo stato di Bozza? ImportId=Import id Events=Eventi EMailTemplates=Modelli email @@ -866,9 +878,9 @@ ShortThursday=Gio ShortFriday=Ven ShortSaturday=Sab ShortSunday=Dom -SelectMailModel=Select an email template +SelectMailModel=Seleziona un tema email SetRef=Set ref -Select2ResultFoundUseArrows=Some results found. Use arrows to select. +Select2ResultFoundUseArrows=Alcuni risultati trovati. Usa le frecce per selezionare. Select2NotFound=Nessun risultato trovato Select2Enter=Immetti Select2MoreCharacter=or more character @@ -895,8 +907,10 @@ SearchIntoCustomerShipments=Spedizioni cliente SearchIntoExpenseReports=Nota spese SearchIntoLeaves=Assenze CommentLink=Commenti -NbComments=Number of comments +NbComments=Numero dei commenti CommentPage=Comments space -CommentAdded=Comment added -CommentDeleted=Comment deleted +CommentAdded=Commento aggiunto +CommentDeleted=Commento cancellato Everybody=Progetto condiviso +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/it_IT/opensurvey.lang b/htdocs/langs/it_IT/opensurvey.lang index 205575ed52c..40781c799aa 100644 --- a/htdocs/langs/it_IT/opensurvey.lang +++ b/htdocs/langs/it_IT/opensurvey.lang @@ -57,4 +57,4 @@ ErrorInsertingComment=Si è verificato un errore nel salvataggio del tuo comment MoreChoices=Aggiungi altre opzioni SurveyExpiredInfo=Il sondaggio è stato chiuso o è scaduto il tempo a disposizione. EmailSomeoneVoted=%s ha compilato una riga.\nTrovi l'indagine all'indirizzo: \n%s -ShowSurvey=Show survey +ShowSurvey=Mostra indagine diff --git a/htdocs/langs/it_IT/other.lang b/htdocs/langs/it_IT/other.lang index f824f58a895..281f27c9b42 100644 --- a/htdocs/langs/it_IT/other.lang +++ b/htdocs/langs/it_IT/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=Se l'importo è superiore a %s SourcesRepository=Repository for sources Chart=Chart PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=Area esportazioni diff --git a/htdocs/langs/it_IT/paybox.lang b/htdocs/langs/it_IT/paybox.lang index 6b41b4e0485..75932d7168d 100644 --- a/htdocs/langs/it_IT/paybox.lang +++ b/htdocs/langs/it_IT/paybox.lang @@ -10,7 +10,7 @@ ToComplete=Per completare YourEMail=Email per la conferma del pagamento Creditor=Creditore PaymentCode=Codice pagamento -PayBoxDoPayment=Pay with Credit or Debit Card (Paybox) +PayBoxDoPayment=Paga con Carta di Credito o Debito (Paybox) ToPay=Registra pagamento YouWillBeRedirectedOnPayBox=Verrai reindirizzato alla pagina sicura di Paybox per inserire le informazioni della carta di credito. Continue=Successivo @@ -33,6 +33,6 @@ CSSUrlForPaymentForm=URL del foglio di stile CSS per il modulo di pagamento NewPayboxPaymentReceived=Nuovo pagamento Paybox ricevuto NewPayboxPaymentFailed=Nuovo tentativo di pagamento Paybox ma fallito PAYBOX_PAYONLINE_SENDEMAIL=Email di avviso dopo il pagamento (a buon fine o no) -PAYBOX_PBX_SITE=Value for PBX SITE -PAYBOX_PBX_RANG=Value for PBX Rang -PAYBOX_PBX_IDENTIFIANT=Value for PBX ID +PAYBOX_PBX_SITE=Valore per PBX SITE +PAYBOX_PBX_RANG=Valore per PBX Rang +PAYBOX_PBX_IDENTIFIANT=Valore per PBX ID diff --git a/htdocs/langs/it_IT/paypal.lang b/htdocs/langs/it_IT/paypal.lang index 8b1ba74a82a..207f1b5f227 100644 --- a/htdocs/langs/it_IT/paypal.lang +++ b/htdocs/langs/it_IT/paypal.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - paypal PaypalSetup=Impostazioni Paypal PaypalDesc=Questo modulo permette al cliente di pagare tramite PayPal. Può essere usato per un pagamento generico o di uno specifico documento (fattura, ordine, ...) -PaypalOrCBDoPayment=Pay with Paypal (Credit Card or Paypal) +PaypalOrCBDoPayment=Paga con Paypal (Carta di Credito o Paypal) PaypalDoPayment=Paga con Paypal PAYPAL_API_SANDBOX=Modalità di test/sandbox PAYPAL_API_USER=Nome utente API @@ -16,17 +16,17 @@ ThisIsTransactionId=L'id di transazione è: %s PAYPAL_ADD_PAYMENT_URL=Aggiungere l'URL di pagamento Paypal quando si invia un documento per posta PredefinedMailContentLink=Per completare il pagamento PayPal, puoi cliccare sul link qui sotto.\n\n%s YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode -NewOnlinePaymentReceived=New online payment received -NewOnlinePaymentFailed=New online payment tried but failed +NewOnlinePaymentReceived=Nuovo pagamento online ricevuto +NewOnlinePaymentFailed=Nuovo tentativo di pagamento online fallito ONLINE_PAYMENT_SENDEMAIL=Email di avviso dopo un pagamento (a buon fine o no) ReturnURLAfterPayment=URL di ritorno dopo il pagamento -ValidationOfOnlinePaymentFailed=Validation of online payment failed +ValidationOfOnlinePaymentFailed=Validazione del pagamento online fallita PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error SetExpressCheckoutAPICallFailed=SetExpressCheckout API call failed. DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API call failed. DetailedErrorMessage=Messaggio di Errore dettagliato ShortErrorMessage=Messaggio di errore breve -ErrorCode=Error Code +ErrorCode=Codice errore ErrorSeverityCode=Error Severity Code -OnlinePaymentSystem=Online payment system +OnlinePaymentSystem=Sistema di pagamento online PaypalLiveEnabled=Paypal live enabled (otherwise test/sandbox mode) diff --git a/htdocs/langs/it_IT/productbatch.lang b/htdocs/langs/it_IT/productbatch.lang index 5b32f2fc4ae..24c1d1ceed3 100644 --- a/htdocs/langs/it_IT/productbatch.lang +++ b/htdocs/langs/it_IT/productbatch.lang @@ -21,4 +21,4 @@ ProductDoesNotUseBatchSerial=Questo prodotto non usa lotto/numero di serie ProductLotSetup=Configurazione del modulo lotto/numero di serie ShowCurrentStockOfLot=Mostra la scorta disponibile per la coppia prodotto/lotto ShowLogOfMovementIfLot=Mostra il log dei movimenti per la coppia prodotto/lotto -StockDetailPerBatch=Stock detail per lot +StockDetailPerBatch=Dettagli magazzino per lotto diff --git a/htdocs/langs/it_IT/products.lang b/htdocs/langs/it_IT/products.lang index 5ff480873b5..40da50bf79f 100644 --- a/htdocs/langs/it_IT/products.lang +++ b/htdocs/langs/it_IT/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Prezzo corrente AlwaysUseNewPrice=Usa sempre il prezzo corrente di un prodotto/servizio AlwaysUseFixedPrice=Usa prezzo non negoziabile PriceByQuantity=Prezzi diversi in base alla quantità +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Intervallo della quantità MultipriceRules=Price segment rules UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/it_IT/projects.lang b/htdocs/langs/it_IT/projects.lang index 28b07f2152a..d6e322880fa 100644 --- a/htdocs/langs/it_IT/projects.lang +++ b/htdocs/langs/it_IT/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=In attesa OppStatusWON=Vinto OppStatusLOST=Perso Budget=Budget +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Ultimi %s progetti LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Permetti agli utenti di commentare queste attività AllowCommentOnProject=Permetti agli utenti di commentare questi progetti + diff --git a/htdocs/langs/it_IT/resource.lang b/htdocs/langs/it_IT/resource.lang index a75d8df6242..20762d821f3 100644 --- a/htdocs/langs/it_IT/resource.lang +++ b/htdocs/langs/it_IT/resource.lang @@ -30,7 +30,7 @@ DictionaryResourceType=Tipo di risorse SelectResource=Seleziona risorsa -IdResource=Id resource -AssetNumber=Serial number -ResourceTypeCode=Resource type code +IdResource=ID risorsa +AssetNumber=Numero seriale +ResourceTypeCode=Codice tipo risorsa ImportDataset_resource_1=Risorse diff --git a/htdocs/langs/it_IT/users.lang b/htdocs/langs/it_IT/users.lang index 0f6399abf8b..7c96a9d3bcd 100644 --- a/htdocs/langs/it_IT/users.lang +++ b/htdocs/langs/it_IT/users.lang @@ -96,8 +96,8 @@ HierarchicView=Vista gerarchica UseTypeFieldToChange=cambia usando il campo Tipo OpenIDURL=URL OpenID LoginUsingOpenID=URL OpenID per il login -WeeklyHours=Hours worked (per week) -ExpectedWorkedHours=Expected worked hours per week +WeeklyHours=Ore lavorate (per settimana) +ExpectedWorkedHours=Ore lavorative ideali per settimana ColorUser=Colore dell'utente DisabledInMonoUserMode=Disabilitato in modalità manutenzione UserAccountancyCode=Codice contabile utente diff --git a/htdocs/langs/it_IT/website.lang b/htdocs/langs/it_IT/website.lang index 6faa262b922..ec27d7e209f 100644 --- a/htdocs/langs/it_IT/website.lang +++ b/htdocs/langs/it_IT/website.lang @@ -3,15 +3,17 @@ Shortname=Codice WebsiteSetupDesc=Crea qui tante voci quante il numero di siti ti servono. Vai poi nel menu Websites per modificarli DeleteWebsite=Cancella sito web ConfirmDeleteWebsite=Sei sicuro di vole cancellare questo sito web? Anche tutte le pagine e contenuti saranno cancellati. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Titolo/alias della pagina -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=Indirizzo URL del file CSS esterno WEBSITE_CSS_INLINE=contenuto file CSS (comune a tutte le pagine) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Libreria media EditCss=Edita Header Style/CSS o HTML EditMenu=Modifica menu @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang index 4aeefd798da..8e095548da9 100644 --- a/htdocs/langs/ja_JP/accountancy.lang +++ b/htdocs/langs/ja_JP/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Piece number TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=List of the accounting accounts UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal 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 Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution Modelcsv_quadratus=Export towards Quadratus QuadraCompta Modelcsv_ebp=Export towards EBP Modelcsv_cogilog=Export towards Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang index 1b486e04760..ebc4e343dc0 100644 --- a/htdocs/langs/ja_JP/admin.lang +++ b/htdocs/langs/ja_JP/admin.lang @@ -539,7 +539,7 @@ Module320Desc=Dolibarr画面のページ内でRSSフィードを追加 Module330Name=ブックマーク Module330Desc=ブックマークの管理 Module400Name=Projects/Opportunities/Leads -Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=のwebcalendar Module410Desc=のwebcalendar統合 Module500Name=Special expenses @@ -890,7 +890,7 @@ DictionaryStaff=スタッフ DictionaryAvailability=配達遅延 DictionaryOrderMethods=注文方法 DictionarySource=提案/受注の起源 -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Models for chart of accounts DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=Emails templates @@ -904,6 +904,7 @@ SetupSaved=セットアップは、保存された SetupNotSaved=Setup not saved BackToModuleList=モジュールリストに戻る BackToDictionaryList=辞書リストに戻る +TypeOfRevenueStamp=Type of revenue stamp VATManagement=付加価値税管理 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is VAT=0. End of rule. VATIsNotUsedDesc=デフォルトでは、提案されたVATが0団体のような場合に使用することができますされ、個人が小さな会社をOU。 @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/ja_JP/banks.lang b/htdocs/langs/ja_JP/banks.lang index 735a713b6b9..3fb79a88461 100644 --- a/htdocs/langs/ja_JP/banks.lang +++ b/htdocs/langs/ja_JP/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=数 LineRecord=トランザクション AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Reconciled ConciliatedBy=による和解 DateConciliating=日付を調整する BankLineConciliated=Entry reconciled diff --git a/htdocs/langs/ja_JP/bills.lang b/htdocs/langs/ja_JP/bills.lang index 8e2c14ed2b0..020e58814b8 100644 --- a/htdocs/langs/ja_JP/bills.lang +++ b/htdocs/langs/ja_JP/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s BillsLate=支払い遅延 BillsStatistics=Customers invoices statistics BillsStatisticsSuppliers=Suppliers invoices statistics +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Disabled because cannot be erased InvoiceStandard=標準の請求書 InvoiceStandardAsk=標準の請求書 @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=悪い顧客 diff --git a/htdocs/langs/ja_JP/compta.lang b/htdocs/langs/ja_JP/compta.lang index e6576dbc7d5..be4ef94e3c1 100644 --- a/htdocs/langs/ja_JP/compta.lang +++ b/htdocs/langs/ja_JP/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=任意の請求書にリンクされていない支 PaymentsNotLinkedToUser=すべてのユーザーにリンクされていない支払い Profit=利益 AccountingResult=Accounting result +BalanceBefore=Balance (before) Balance=バランス Debit=借方 Credit=クレジット diff --git a/htdocs/langs/ja_JP/donations.lang b/htdocs/langs/ja_JP/donations.lang index e61ec8f388d..c3841279a47 100644 --- a/htdocs/langs/ja_JP/donations.lang +++ b/htdocs/langs/ja_JP/donations.lang @@ -31,3 +31,4 @@ 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 +DonationValidated=Donation %s validated diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang index 30f564d4740..15767e246e2 100644 --- a/htdocs/langs/ja_JP/errors.lang +++ b/htdocs/langs/ja_JP/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Empty expression ErrorPriceExpression21=Empty result '%s' ErrorPriceExpression22=Negative result '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs diff --git a/htdocs/langs/ja_JP/install.lang b/htdocs/langs/ja_JP/install.lang index 38a4987ab7b..f3cb83a4c95 100644 --- a/htdocs/langs/ja_JP/install.lang +++ b/htdocs/langs/ja_JP/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=あなたがProxmox仮想アプライアンスからDol UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=非正規化データを修正 @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=llx_societe_remise のエンティティフィールド値を更新 MigrationRemiseExceptEntity=llx_societe_remise_except のエンティティフィールド値を更新 MigrationReloadModule=モジュール %s を再読み込み +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=利用できないオプションを表示しない HideNotAvailableOptions=利用できないオプションを非表示 ErrorFoundDuringMigration=移行プロセス中にエラーが報告されたので、次のステップは利用できません。 エラーを無視するには、ここをクリック してください。ただし、修正されるまでアプリケーションまたは一部の機能が正しく動作しない場合があります。 diff --git a/htdocs/langs/ja_JP/languages.lang b/htdocs/langs/ja_JP/languages.lang index d74115fd254..1e0538b29a7 100644 --- a/htdocs/langs/ja_JP/languages.lang +++ b/htdocs/langs/ja_JP/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=スペイン語 (パナマ) Language_es_PY=スペイン語（パラグアイ） Language_es_PE=スペイン語（ペルー） Language_es_PR=スペイン語（プエルトリコ） +Language_es_UY=Spanish (Uruguay) Language_es_VE=スペイン語 (ベネズエラ) Language_et_EE=エストニア語 Language_eu_ES=バスク diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang index 94f92322683..d4840efade3 100644 --- a/htdocs/langs/ja_JP/main.lang +++ b/htdocs/langs/ja_JP/main.lang @@ -548,6 +548,18 @@ MonthShort09=9月 MonthShort10=10月 MonthShort11=11月 MonthShort12=12月 +MonthVeryShort01=J +MonthVeryShort02=F +MonthVeryShort03=M +MonthVeryShort04=A +MonthVeryShort05=M +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=S +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=添付ファイルとドキュメント JoinMainDoc=Join main document DateFormatYYYYMM=YYYY-MM @@ -762,7 +774,7 @@ SetBankAccount=Define Bank Account AccountCurrency=Account currency ViewPrivateNote=View notes XMoreLines=%s line(s) hidden -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=Public URL AddBox=Add box SelectElementAndClick=Select an element and click %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=皆 +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/ja_JP/other.lang b/htdocs/langs/ja_JP/other.lang index 975358090fe..8f484b9085b 100644 --- a/htdocs/langs/ja_JP/other.lang +++ b/htdocs/langs/ja_JP/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=If amount higher than %s SourcesRepository=Repository for sources Chart=Chart PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=輸出地域 diff --git a/htdocs/langs/ja_JP/products.lang b/htdocs/langs/ja_JP/products.lang index 6b996870e45..5db06a75529 100644 --- a/htdocs/langs/ja_JP/products.lang +++ b/htdocs/langs/ja_JP/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=現行価格 AlwaysUseNewPrice=Always use current price of product/service AlwaysUseFixedPrice=Use the fixed price PriceByQuantity=Different prices by quantity +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Quantity range MultipriceRules=Price segment rules UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/ja_JP/projects.lang b/htdocs/langs/ja_JP/projects.lang index 174b796e435..679a002ea8b 100644 --- a/htdocs/langs/ja_JP/projects.lang +++ b/htdocs/langs/ja_JP/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=Pending OppStatusWON=Won OppStatusLOST=Lost Budget=Budget +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/ja_JP/website.lang b/htdocs/langs/ja_JP/website.lang index da39fc86f6d..a14de40a518 100644 --- a/htdocs/langs/ja_JP/website.lang +++ b/htdocs/langs/ja_JP/website.lang @@ -3,15 +3,17 @@ Shortname=コー​​ド WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them. DeleteWebsite=ウェブサイトを削除 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Page name/alias -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL of external CSS file WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Media library EditCss=Edit Style/CSS or HTML header EditMenu=Edit menu @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/ka_GE/accountancy.lang b/htdocs/langs/ka_GE/accountancy.lang index 9dbf911a820..c4189507f60 100644 --- a/htdocs/langs/ka_GE/accountancy.lang +++ b/htdocs/langs/ka_GE/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Piece number TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=List of the accounting accounts UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal 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 Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution Modelcsv_quadratus=Export towards Quadratus QuadraCompta Modelcsv_ebp=Export towards EBP Modelcsv_cogilog=Export towards Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id diff --git a/htdocs/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang index 4f3d25c4eb1..9dce46ab295 100644 --- a/htdocs/langs/ka_GE/admin.lang +++ b/htdocs/langs/ka_GE/admin.lang @@ -539,7 +539,7 @@ Module320Desc=Add RSS feed inside Dolibarr screen pages Module330Name=Bookmarks Module330Desc=Bookmarks management Module400Name=Projects/Opportunities/Leads -Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar integration Module500Name=Special expenses @@ -890,7 +890,7 @@ DictionaryStaff=Staff DictionaryAvailability=Delivery delay DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Models for chart of accounts DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=Emails templates @@ -904,6 +904,7 @@ SetupSaved=Setup saved SetupNotSaved=Setup not saved BackToModuleList=Back to modules list BackToDictionaryList=Back to dictionaries list +TypeOfRevenueStamp=Type of revenue stamp VATManagement=VAT Management VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is 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. @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/ka_GE/banks.lang b/htdocs/langs/ka_GE/banks.lang index 40b76f8c64c..be8f75d172b 100644 --- a/htdocs/langs/ka_GE/banks.lang +++ b/htdocs/langs/ka_GE/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Number LineRecord=Transaction AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Reconciled ConciliatedBy=Reconciled by DateConciliating=Reconcile date BankLineConciliated=Entry reconciled diff --git a/htdocs/langs/ka_GE/bills.lang b/htdocs/langs/ka_GE/bills.lang index b865c00be9d..eeafc56bf1c 100644 --- a/htdocs/langs/ka_GE/bills.lang +++ b/htdocs/langs/ka_GE/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s BillsLate=Late payments BillsStatistics=Customers invoices statistics BillsStatisticsSuppliers=Suppliers invoices statistics +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Disabled because cannot be erased InvoiceStandard=Standard invoice InvoiceStandardAsk=Standard invoice @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer diff --git a/htdocs/langs/ka_GE/compta.lang b/htdocs/langs/ka_GE/compta.lang index 4082b9fa9b7..df4942cf234 100644 --- a/htdocs/langs/ka_GE/compta.lang +++ b/htdocs/langs/ka_GE/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to PaymentsNotLinkedToUser=Payments not linked to any user Profit=Profit AccountingResult=Accounting result +BalanceBefore=Balance (before) Balance=Balance Debit=Debit Credit=Credit diff --git a/htdocs/langs/ka_GE/donations.lang b/htdocs/langs/ka_GE/donations.lang index f4578fa9fc3..5edc8d62033 100644 --- a/htdocs/langs/ka_GE/donations.lang +++ b/htdocs/langs/ka_GE/donations.lang @@ -31,3 +31,4 @@ 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 +DonationValidated=Donation %s validated diff --git a/htdocs/langs/ka_GE/errors.lang b/htdocs/langs/ka_GE/errors.lang index b02b70c9c9f..cff89a71d98 100644 --- a/htdocs/langs/ka_GE/errors.lang +++ b/htdocs/langs/ka_GE/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Empty expression ErrorPriceExpression21=Empty result '%s' ErrorPriceExpression22=Negative result '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs diff --git a/htdocs/langs/ka_GE/install.lang b/htdocs/langs/ka_GE/install.lang index 7a93fd20799..e602c54640c 100644 --- a/htdocs/langs/ka_GE/install.lang +++ b/htdocs/langs/ka_GE/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtua UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Fix for denormalized data @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Update entity field value of llx_societe_remise MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except MigrationReloadModule=Reload module %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Show not available options HideNotAvailableOptions=Hide not available options ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. diff --git a/htdocs/langs/ka_GE/languages.lang b/htdocs/langs/ka_GE/languages.lang index 05288a888eb..a062883d667 100644 --- a/htdocs/langs/ka_GE/languages.lang +++ b/htdocs/langs/ka_GE/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Spanish (Paraguay) Language_es_PE=Spanish (Peru) Language_es_PR=Spanish (Puerto Rico) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Spanish (Venezuela) Language_et_EE=Estonian Language_eu_ES=Basque diff --git a/htdocs/langs/ka_GE/main.lang b/htdocs/langs/ka_GE/main.lang index d5c9fc6ce34..f1f1628af27 100644 --- a/htdocs/langs/ka_GE/main.lang +++ b/htdocs/langs/ka_GE/main.lang @@ -548,6 +548,18 @@ MonthShort09=Sep MonthShort10=Oct MonthShort11=Nov MonthShort12=Dec +MonthVeryShort01=J +MonthVeryShort02=F +MonthVeryShort03=M +MonthVeryShort04=A +MonthVeryShort05=M +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=S +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Attached files and documents JoinMainDoc=Join main document DateFormatYYYYMM=YYYY-MM @@ -762,7 +774,7 @@ SetBankAccount=Define Bank Account AccountCurrency=Account currency ViewPrivateNote=View notes XMoreLines=%s line(s) hidden -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=Public URL AddBox=Add box SelectElementAndClick=Select an element and click %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=Everybody +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/ka_GE/other.lang b/htdocs/langs/ka_GE/other.lang index 0d9d1cfbd85..1a5314a24d9 100644 --- a/htdocs/langs/ka_GE/other.lang +++ b/htdocs/langs/ka_GE/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=If amount higher than %s SourcesRepository=Repository for sources Chart=Chart PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=Exports area diff --git a/htdocs/langs/ka_GE/products.lang b/htdocs/langs/ka_GE/products.lang index 43c74c9b877..53835bd7f06 100644 --- a/htdocs/langs/ka_GE/products.lang +++ b/htdocs/langs/ka_GE/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Current price AlwaysUseNewPrice=Always use current price of product/service AlwaysUseFixedPrice=Use the fixed price PriceByQuantity=Different prices by quantity +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Quantity range MultipriceRules=Price segment rules UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/ka_GE/projects.lang b/htdocs/langs/ka_GE/projects.lang index f33a950acff..c69302deecb 100644 --- a/htdocs/langs/ka_GE/projects.lang +++ b/htdocs/langs/ka_GE/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=Pending OppStatusWON=Won OppStatusLOST=Lost Budget=Budget +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/ka_GE/website.lang b/htdocs/langs/ka_GE/website.lang index 3902febbfb7..6b4e2ada84a 100644 --- a/htdocs/langs/ka_GE/website.lang +++ b/htdocs/langs/ka_GE/website.lang @@ -3,15 +3,17 @@ Shortname=Code WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them. DeleteWebsite=Delete website ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Page name/alias -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL of external CSS file WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Media library EditCss=Edit Style/CSS or HTML header EditMenu=Edit menu @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/km_KH/main.lang b/htdocs/langs/km_KH/main.lang index 1d41be98d26..0c591b53990 100644 --- a/htdocs/langs/km_KH/main.lang +++ b/htdocs/langs/km_KH/main.lang @@ -23,3 +23,894 @@ FormatDateHourShort=%m/%d/%Y %I:%M %p FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p FormatDateHourTextShort=%b %d, %Y, %I:%M %p FormatDateHourText=%B %d, %Y, %I:%M %p +DatabaseConnection=Database connection +NoTemplateDefined=No template available for this email type +AvailableVariables=Available substitution variables +NoTranslation=No translation +Translation=Translation +NoRecordFound=No record found +NoRecordDeleted=No record deleted +NotEnoughDataYet=Not enough data +NoError=No error +Error=Error +Errors=Errors +ErrorFieldRequired=Field '%s' is required +ErrorFieldFormat=Field '%s' has a bad value +ErrorFileDoesNotExists=File %s does not exist +ErrorFailedToOpenFile=Failed to open file %s +ErrorCanNotCreateDir=Cannot create dir %s +ErrorCanNotReadDir=Cannot read dir %s +ErrorConstantNotDefined=Parameter %s not defined +ErrorUnknown=Unknown error +ErrorSQL=SQL Error +ErrorLogoFileNotFound=Logo file '%s' was not found +ErrorGoToGlobalSetup=Go to 'Company/Organisation' setup to fix this +ErrorGoToModuleSetup=Go to Module setup to fix this +ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s) +ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory. +ErrorInternalErrorDetected=Error detected +ErrorWrongHostParameter=Wrong host parameter +ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post again the form. +ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child records. +ErrorWrongValue=Wrong value +ErrorWrongValueForParameterX=Wrong value for parameter %s +ErrorNoRequestInError=No request in error +ErrorServiceUnavailableTryLater=Service not available for the moment. Try again later. +ErrorDuplicateField=Duplicate value in a unique field +ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. We rollback changes. +ErrorConfigParameterNotDefined=Parameter %s is not defined inside Dolibarr config file conf.php. +ErrorCantLoadUserFromDolibarrDatabase=Failed to find user %s in Dolibarr database. +ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'. +ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'. +ErrorFailedToSaveFile=Error, failed to save file. +ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of current one +MaxNbOfRecordPerPage=Max nb of record per page +NotAuthorized=You are not authorized to do that. +SetDate=Set date +SelectDate=Select a date +SeeAlso=See also %s +SeeHere=See here +Apply=Apply +BackgroundColorByDefault=Default background color +FileRenamed=The file was successfully renamed +FileGenerated=The file was successfully generated +FileSaved=The file was successfully saved +FileUploaded=The file was successfully uploaded +FileTransferComplete=File(s) was uploaded successfully +FilesDeleted=File(s) successfully deleted +FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this. +NbOfEntries=Nb of entries +GoToWikiHelpPage=Read online help (Internet access needed) +GoToHelpPage=Read help +RecordSaved=Record saved +RecordDeleted=Record deleted +LevelOfFeature=Level of features +NotDefined=Not defined +DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is set to %s in configuration file conf.php.
    This means that the password database is external to Dolibarr, so changing this field may have no effect. +Administrator=Administrator +Undefined=Undefined +PasswordForgotten=Password forgotten? +SeeAbove=See above +HomeArea=Home area +LastConnexion=Latest connection +PreviousConnexion=Previous connection +PreviousValue=Previous value +ConnectedOnMultiCompany=Connected on environment +ConnectedSince=Connected since +AuthenticationMode=Authentication mode +RequestedUrl=Requested URL +DatabaseTypeManager=Database type manager +RequestLastAccessInError=Latest database access request error +ReturnCodeLastAccessInError=Return code for latest database access request error +InformationLastAccessInError=Information for latest database access request error +DolibarrHasDetectedError=Dolibarr has detected a technical error +YouCanSetOptionDolibarrMainProdToZero=You can read log file or set option $dolibarr_main_prod to '0' in your config file to get more information. +InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to remove such notices) +MoreInformation=More information +TechnicalInformation=Technical information +TechnicalID=Technical ID +NotePublic=Note (public) +NotePrivate=Note (private) +PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to %s decimals. +DoTest=Test +ToFilter=Filter +NoFilter=No filter +WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance delay. +yes=yes +Yes=Yes +no=no +No=No +All=All +Home=Home +Help=Help +OnlineHelp=Online help +PageWiki=Wiki page +MediaBrowser=Media browser +Always=Always +Never=Never +Under=under +Period=Period +PeriodEndDate=End date for period +SelectedPeriod=Selected period +PreviousPeriod=Previous period +Activate=Activate +Activated=Activated +Closed=Closed +Closed2=Closed +NotClosed=Not closed +Enabled=Enabled +Deprecated=Deprecated +Disable=Disable +Disabled=Disabled +Add=Add +AddLink=Add link +RemoveLink=Remove link +AddToDraft=Add to draft +Update=Update +Close=Close +CloseBox=Remove widget from your dashboard +Confirm=Confirm +ConfirmSendCardByMail=Do you really want to send content of this card by mail to %s? +Delete=Delete +Remove=Remove +Resiliate=Terminate +Cancel=Cancel +Modify=Modify +Edit=Edit +Validate=Validate +ValidateAndApprove=Validate and Approve +ToValidate=To validate +NotValidated=Not validated +Save=Save +SaveAs=Save As +TestConnection=Test connection +ToClone=Clone +ConfirmClone=Choose data you want to clone : +NoCloneOptionsSpecified=No data to clone defined. +Of=of +Go=Go +Run=Run +CopyOf=Copy of +Show=Show +Hide=Hide +ShowCardHere=Show card +Search=Search +SearchOf=Search +Valid=Valid +Approve=Approve +Disapprove=Disapprove +ReOpen=Re-Open +Upload=Send file +ToLink=Link +Select=Select +Choose=Choose +Resize=Resize +Recenter=Recenter +Author=Author +User=User +Users=Users +Group=Group +Groups=Groups +NoUserGroupDefined=No user group defined +Password=Password +PasswordRetype=Retype your password +NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration. +Name=Name +Person=Person +Parameter=Parameter +Parameters=Parameters +Value=Value +PersonalValue=Personal value +NewObject=New %s +NewValue=New value +CurrentValue=Current value +Code=Code +Type=Type +Language=Language +MultiLanguage=Multi-language +Note=Note +Title=Title +Label=Label +RefOrLabel=Ref. or label +Info=Log +Family=Family +Description=Description +Designation=Description +Model=Doc template +DefaultModel=Default doc template +Action=Event +About=About +Number=Number +NumberByMonth=Number by month +AmountByMonth=Amount by month +Numero=Number +Limit=Limit +Limits=Limits +Logout=Logout +NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode %s +Connection=Connection +Setup=Setup +Alert=Alert +MenuWarnings=Alerts +Previous=Previous +Next=Next +Cards=Cards +Card=Card +Now=Now +HourStart=Start hour +Date=Date +DateAndHour=Date and hour +DateToday=Today's date +DateReference=Reference date +DateStart=Start date +DateEnd=End date +DateCreation=Creation date +DateCreationShort=Creat. date +DateModification=Modification date +DateModificationShort=Modif. date +DateLastModification=Latest modification date +DateValidation=Validation date +DateClosing=Closing date +DateDue=Due date +DateValue=Value date +DateValueShort=Value date +DateOperation=Operation date +DateOperationShort=Oper. Date +DateLimit=Limit date +DateRequest=Request date +DateProcess=Process date +DateBuild=Report build date +DatePayment=Date of payment +DateApprove=Approving date +DateApprove2=Approving date (second approval) +RegistrationDate=Registration date +UserCreation=Creation user +UserModification=Modification user +UserValidation=Validation user +UserCreationShort=Creat. user +UserModificationShort=Modif. user +UserValidationShort=Valid. user +DurationYear=year +DurationMonth=month +DurationWeek=week +DurationDay=day +DurationYears=years +DurationMonths=months +DurationWeeks=weeks +DurationDays=days +Year=Year +Month=Month +Week=Week +WeekShort=Week +Day=Day +Hour=Hour +Minute=Minute +Second=Second +Years=Years +Months=Months +Days=Days +days=days +Hours=Hours +Minutes=Minutes +Seconds=Seconds +Weeks=Weeks +Today=Today +Yesterday=Yesterday +Tomorrow=Tomorrow +Morning=Morning +Afternoon=Afternoon +Quadri=Quadri +MonthOfDay=Month of the day +HourShort=H +MinuteShort=mn +Rate=Rate +CurrencyRate=Currency conversion rate +UseLocalTax=Include tax +Bytes=Bytes +KiloBytes=Kilobytes +MegaBytes=Megabytes +GigaBytes=Gigabytes +TeraBytes=Terabytes +UserAuthor=User of creation +UserModif=User of last update +b=b. +Kb=Kb +Mb=Mb +Gb=Gb +Tb=Tb +Cut=Cut +Copy=Copy +Paste=Paste +Default=Default +DefaultValue=Default value +DefaultValues=Default values +Price=Price +UnitPrice=Unit price +UnitPriceHT=Unit price (net) +UnitPriceTTC=Unit price +PriceU=U.P. +PriceUHT=U.P. (net) +PriceUHTCurrency=U.P (currency) +PriceUTTC=U.P. (inc. tax) +Amount=Amount +AmountInvoice=Invoice amount +AmountPayment=Payment amount +AmountHTShort=Amount (net) +AmountTTCShort=Amount (inc. tax) +AmountHT=Amount (net of tax) +AmountTTC=Amount (inc. tax) +AmountVAT=Amount tax +MulticurrencyAlreadyPaid=Already payed, original currency +MulticurrencyRemainderToPay=Remain to pay, original currency +MulticurrencyPaymentAmount=Payment amount, original currency +MulticurrencyAmountHT=Amount (net of tax), original currency +MulticurrencyAmountTTC=Amount (inc. of tax), original currency +MulticurrencyAmountVAT=Amount tax, original currency +AmountLT1=Amount tax 2 +AmountLT2=Amount tax 3 +AmountLT1ES=Amount RE +AmountLT2ES=Amount IRPF +AmountTotal=Total amount +AmountAverage=Average amount +PriceQtyMinHT=Price quantity min. (net of tax) +Percentage=Percentage +Total=Total +SubTotal=Subtotal +TotalHTShort=Total (net) +TotalHTShortCurrency=Total (net in currency) +TotalTTCShort=Total (inc. tax) +TotalHT=Total (net of tax) +TotalHTforthispage=Total (net of tax) for this page +Totalforthispage=Total for this page +TotalTTC=Total (inc. tax) +TotalTTCToYourCredit=Total (inc. tax) to your credit +TotalVAT=Total tax +TotalVATIN=Total IGST +TotalLT1=Total tax 2 +TotalLT2=Total tax 3 +TotalLT1ES=Total RE +TotalLT2ES=Total IRPF +TotalLT1IN=Total CGST +TotalLT2IN=Total SGST +HT=Net of tax +TTC=Inc. tax +INCVATONLY=Inc. VAT +INCT=Inc. all taxes +VAT=Sales tax +VATIN=IGST +VATs=Sales taxes +VATINs=IGST taxes +LT1=Sales tax 2 +LT1Type=Sales tax 2 type +LT2=Sales tax 3 +LT2Type=Sales tax 3 type +LT1ES=RE +LT2ES=IRPF +LT1IN=CGST +LT2IN=SGST +VATRate=Tax Rate +DefaultTaxRate=Default tax rate +Average=Average +Sum=Sum +Delta=Delta +Module=Module/Application +Modules=Modules/Applications +Option=Option +List=List +FullList=Full list +Statistics=Statistics +OtherStatistics=Other statistics +Status=Status +Favorite=Favorite +ShortInfo=Info. +Ref=Ref. +ExternalRef=Ref. extern +RefSupplier=Ref. supplier +RefPayment=Ref. payment +CommercialProposalsShort=Commercial proposals +Comment=Comment +Comments=Comments +ActionsToDo=Events to do +ActionsToDoShort=To do +ActionsDoneShort=Done +ActionNotApplicable=Not applicable +ActionRunningNotStarted=To start +ActionRunningShort=In progress +ActionDoneShort=Finished +ActionUncomplete=Uncomplete +LatestLinkedEvents=Latest %s linked events +CompanyFoundation=Company/Organisation +ContactsForCompany=Contacts for this third party +ContactsAddressesForCompany=Contacts/addresses for this third party +AddressesForCompany=Addresses for this third party +ActionsOnCompany=Events about this third party +ActionsOnMember=Events about this member +ActionsOnProduct=Events about this product +NActionsLate=%s late +RequestAlreadyDone=Request already recorded +Filter=Filter +FilterOnInto=Search criteria '%s' into fields %s +RemoveFilter=Remove filter +ChartGenerated=Chart generated +ChartNotGenerated=Chart not generated +GeneratedOn=Build on %s +Generate=Generate +Duration=Duration +TotalDuration=Total duration +Summary=Summary +DolibarrStateBoard=Database statistics +DolibarrWorkBoard=Open items dashboard +NoOpenedElementToProcess=No opened element to process +Available=Available +NotYetAvailable=Not yet available +NotAvailable=Not available +Categories=Tags/categories +Category=Tag/category +By=By +From=From +to=to +and=and +or=or +Other=Other +Others=Others +OtherInformations=Other informations +Quantity=Quantity +Qty=Qty +ChangedBy=Changed by +ApprovedBy=Approved by +ApprovedBy2=Approved by (second approval) +Approved=Approved +Refused=Refused +ReCalculate=Recalculate +ResultKo=Failure +Reporting=Reporting +Reportings=Reporting +Draft=Draft +Drafts=Drafts +StatusInterInvoiced= +Validated=Validated +Opened=Open +New=New +Discount=Discount +Unknown=Unknown +General=General +Size=Size +OriginalSize=Original size +Received=Received +Paid=Paid +Topic=Subject +ByCompanies=By third parties +ByUsers=By users +Links=Links +Link=Link +Rejects=Rejects +Preview=Preview +NextStep=Next step +Datas=Data +None=None +NoneF=None +NoneOrSeveral=None or several +Late=Late +LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts. +Photo=Picture +Photos=Pictures +AddPhoto=Add picture +DeletePicture=Picture delete +ConfirmDeletePicture=Confirm picture deletion? +Login=Login +CurrentLogin=Current login +EnterLoginDetail=Enter login details +January=January +February=February +March=March +April=April +May=May +June=June +July=July +August=August +September=September +October=October +November=November +December=December +JanuaryMin=Jan +FebruaryMin=Feb +MarchMin=Mar +AprilMin=Apr +MayMin=May +JuneMin=Jun +JulyMin=Jul +AugustMin=Aug +SeptemberMin=Sep +OctoberMin=Oct +NovemberMin=Nov +DecemberMin=Dec +Month01=January +Month02=February +Month03=March +Month04=April +Month05=May +Month06=June +Month07=July +Month08=August +Month09=September +Month10=October +Month11=November +Month12=December +MonthShort01=Jan +MonthShort02=Feb +MonthShort03=Mar +MonthShort04=Apr +MonthShort05=May +MonthShort06=Jun +MonthShort07=Jul +MonthShort08=Aug +MonthShort09=Sep +MonthShort10=Oct +MonthShort11=Nov +MonthShort12=Dec +MonthVeryShort01=J +MonthVeryShort02=F +MonthVeryShort03=M +MonthVeryShort04=A +MonthVeryShort05=M +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=S +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D +AttachedFiles=Attached files and documents +JoinMainDoc=Join main document +DateFormatYYYYMM=YYYY-MM +DateFormatYYYYMMDD=YYYY-MM-DD +DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS +ReportName=Report name +ReportPeriod=Report period +ReportDescription=Description +Report=Report +Keyword=Keyword +Origin=Origin +Legend=Legend +Fill=Fill +Reset=Reset +File=File +Files=Files +NotAllowed=Not allowed +ReadPermissionNotAllowed=Read permission not allowed +AmountInCurrency=Amount in %s currency +Example=Example +Examples=Examples +NoExample=No example +FindBug=Report a bug +NbOfThirdParties=Number of third parties +NbOfLines=Number of lines +NbOfObjects=Number of objects +NbOfObjectReferers=Number of related items +Referers=Related items +TotalQuantity=Total quantity +DateFromTo=From %s to %s +DateFrom=From %s +DateUntil=Until %s +Check=Check +Uncheck=Uncheck +Internal=Internal +External=External +Internals=Internal +Externals=External +Warning=Warning +Warnings=Warnings +BuildDoc=Build Doc +Entity=Environment +Entities=Entities +CustomerPreview=Customer preview +SupplierPreview=Supplier preview +ShowCustomerPreview=Show customer preview +ShowSupplierPreview=Show supplier preview +RefCustomer=Ref. customer +Currency=Currency +InfoAdmin=Information for administrators +Undo=Undo +Redo=Redo +ExpandAll=Expand all +UndoExpandAll=Undo expand +SeeAll=See all +Reason=Reason +FeatureNotYetSupported=Feature not yet supported +CloseWindow=Close window +Response=Response +Priority=Priority +SendByMail=Send by EMail +MailSentBy=Email sent by +TextUsedInTheMessageBody=Email body +SendAcknowledgementByMail=Send confirmation email +SendMail=Send email +EMail=E-mail +NoEMail=No email +Email=Email +NoMobilePhone=No mobile phone +Owner=Owner +FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value. +Refresh=Refresh +BackToList=Back to list +GoBack=Go back +CanBeModifiedIfOk=Can be modified if valid +CanBeModifiedIfKo=Can be modified if not valid +ValueIsValid=Value is valid +ValueIsNotValid=Value is not valid +RecordCreatedSuccessfully=Record created successfully +RecordModifiedSuccessfully=Record modified successfully +RecordsModified=%s record modified +RecordsDeleted=%s record deleted +AutomaticCode=Automatic code +FeatureDisabled=Feature disabled +MoveBox=Move widget +Offered=Offered +NotEnoughPermissions=You don't have permission for this action +SessionName=Session name +Method=Method +Receive=Receive +CompleteOrNoMoreReceptionExpected=Complete or nothing more expected +ExpectedValue=Expected Value +CurrentValue=Current value +PartialWoman=Partial +TotalWoman=Total +NeverReceived=Never received +Canceled=Canceled +YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu Setup - Dictionaries +YouCanChangeValuesForThisListFrom=You can change values for this list from menu %s +YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup +Color=Color +Documents=Linked files +Documents2=Documents +UploadDisabled=Upload disabled +MenuAccountancy=Accountancy +MenuECM=Documents +MenuAWStats=AWStats +MenuMembers=Members +MenuAgendaGoogle=Google agenda +ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb +NoFileFound=No documents saved in this directory +CurrentUserLanguage=Current language +CurrentTheme=Current theme +CurrentMenuManager=Current menu manager +Browser=Browser +Layout=Layout +Screen=Screen +DisabledModules=Disabled modules +For=For +ForCustomer=For customer +Signature=Signature +DateOfSignature=Date of signature +HidePassword=Show command with password hidden +UnHidePassword=Show real command with clear password +Root=Root +Informations=Informations +Page=Page +Notes=Notes +AddNewLine=Add new line +AddFile=Add file +FreeZone=Not a predefined product/service +FreeLineOfType=Not a predefined entry of type +CloneMainAttributes=Clone object with its main attributes +PDFMerge=PDF Merge +Merge=Merge +DocumentModelStandardPDF=Standard PDF template +PrintContentArea=Show page to print main content area +MenuManager=Menu manager +WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only login %s is allowed to use application at the moment. +CoreErrorTitle=System error +CoreErrorMessage=Sorry, an error occurred. Contact your system administrator to check the logs or disable $dolibarr_main_prod=1 to get more information. +CreditCard=Credit card +FieldsWithAreMandatory=Fields with %s are mandatory +FieldsWithIsForPublic=Fields with %s are shown on public list of members. If you don't want this, check off the "public" box. +AccordingToGeoIPDatabase=(according to GeoIP convertion) +Line=Line +NotSupported=Not supported +RequiredField=Required field +Result=Result +ToTest=Test +ValidateBefore=Card must be validated before using this feature +Visibility=Visibility +Private=Private +Hidden=Hidden +Resources=Resources +Source=Source +Prefix=Prefix +Before=Before +After=After +IPAddress=IP address +Frequency=Frequency +IM=Instant messaging +NewAttribute=New attribute +AttributeCode=Attribute code +URLPhoto=URL of photo/logo +SetLinkToAnotherThirdParty=Link to another third party +LinkTo=Link to +LinkToProposal=Link to proposal +LinkToOrder=Link to order +LinkToInvoice=Link to invoice +LinkToSupplierOrder=Link to supplier order +LinkToSupplierProposal=Link to supplier proposal +LinkToSupplierInvoice=Link to supplier invoice +LinkToContract=Link to contract +LinkToIntervention=Link to intervention +CreateDraft=Create draft +SetToDraft=Back to draft +ClickToEdit=Click to edit +EditWithEditor=Edit with CKEditor +EditWithTextEditor=Edit with Text editor +EditHTMLSource=Edit HTML Source +ObjectDeleted=Object %s deleted +ByCountry=By country +ByTown=By town +ByDate=By date +ByMonthYear=By month/year +ByYear=By year +ByMonth=By month +ByDay=By day +BySalesRepresentative=By sales representative +LinkedToSpecificUsers=Linked to a particular user contact +NoResults=No results +AdminTools=Admin tools +SystemTools=System tools +ModulesSystemTools=Modules tools +Test=Test +Element=Element +NoPhotoYet=No pictures available yet +Dashboard=Dashboard +MyDashboard=ផ្ទៃតាប្លូរបស់ខ្ញុំ +Deductible=Deductible +from=from +toward=toward +Access=Access +SelectAction=Select action +SelectTargetUser=Select target user/employee +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 +ShowMoreLines=Show more/less lines +PublicUrl=Public URL +AddBox=Add box +SelectElementAndClick=Select an element and click %s +PrintFile=Print File %s +ShowTransaction=Show entry on bank account +ShowIntervention=Show intervention +ShowContract=Show contract +GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide. +Deny=Deny +Denied=Denied +ListOf=List of %s +ListOfTemplates=List of templates +Gender=Gender +Genderman=Man +Genderwoman=Woman +ViewList=List view +Mandatory=Mandatory +Hello=Hello +GoodBye=GoodBye +Sincerely=Sincerely +DeleteLine=Delete line +ConfirmDeleteLine=Are you sure you want to delete this line? +NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked record +TooManyRecordForMassAction=Too many record selected for mass action. The action is restricted to a list of %s record. +NoRecordSelected=No record selected +MassFilesArea=Area for files built by mass actions +ShowTempMassFilesArea=Show area of files built by mass actions +ConfirmMassDeletion=Bulk delete confirmation +ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ? +RelatedObjects=Related Objects +ClassifyBilled=Classify billed +Progress=Progress +ClickHere=Click here +FrontOffice=Front office +BackOffice=Back office +View=View +Export=Export +Exports=Exports +ExportFilteredList=Export filtered list +ExportList=Export list +ExportOptions=Export Options +Miscellaneous=Miscellaneous +Calendar=Calendar +GroupBy=Group by... +ViewFlatList=View flat list +RemoveString=Remove string '%s' +SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to https://transifex.com/projects/p/dolibarr/. +DirectDownloadLink=Direct download link (public/external) +DirectDownloadInternalLink=Direct download link (need to be logged and need permissions) +Download=Download +DownloadDocument=Download document +ActualizeCurrency=Update currency rate +Fiscalyear=Fiscal year +ModuleBuilder=Module Builder +SetMultiCurrencyCode=Set currency +BulkActions=Bulk actions +ClickToShowHelp=Click to show tooltip help +WebSite=Web site +WebSites=Web sites +WebSiteAccounts=Web site accounts +ExpenseReport=Expense report +ExpenseReports=Expense reports +HR=HR +HRAndBank=HR and Bank +AutomaticallyCalculated=Automatically calculated +TitleSetToDraft=Go back to draft +ConfirmSetToDraft=Are you sure you want to go back to Draft status ? +ImportId=Import id +Events=Events +EMailTemplates=Emails templates +FileNotShared=File not shared to exernal public +Project=Project +Projects=Projects +Rights=Permissions +# Week day +Monday=Monday +Tuesday=Tuesday +Wednesday=Wednesday +Thursday=Thursday +Friday=Friday +Saturday=Saturday +Sunday=Sunday +MondayMin=Mo +TuesdayMin=Tu +WednesdayMin=We +ThursdayMin=Th +FridayMin=Fr +SaturdayMin=Sa +SundayMin=Su +Day1=Monday +Day2=Tuesday +Day3=Wednesday +Day4=Thursday +Day5=Friday +Day6=Saturday +Day0=Sunday +ShortMonday=M +ShortTuesday=T +ShortWednesday=W +ShortThursday=T +ShortFriday=F +ShortSaturday=S +ShortSunday=S +SelectMailModel=Select an email template +SetRef=Set ref +Select2ResultFoundUseArrows=Some results found. Use arrows to select. +Select2NotFound=No result found +Select2Enter=Enter +Select2MoreCharacter=or more character +Select2MoreCharacters=or more characters +Select2MoreCharactersMore=Search syntax:
    | OR (a|b)
    * Any character (a*b)
    ^ Start with (^ab)
    $ End with (ab$)
    +Select2LoadingMoreResults=Loading more results... +Select2SearchInProgress=Search in progress... +SearchIntoThirdparties=Thirdparties +SearchIntoContacts=Contacts +SearchIntoMembers=Members +SearchIntoUsers=Users +SearchIntoProductsOrServices=Products or services +SearchIntoProjects=Projects +SearchIntoTasks=Tasks +SearchIntoCustomerInvoices=Customer invoices +SearchIntoSupplierInvoices=Supplier invoices +SearchIntoCustomerOrders=Customer orders +SearchIntoSupplierOrders=Supplier orders +SearchIntoCustomerProposals=Customer proposals +SearchIntoSupplierProposals=Supplier proposals +SearchIntoInterventions=Interventions +SearchIntoContracts=Contracts +SearchIntoCustomerShipments=Customer shipments +SearchIntoExpenseReports=Expense reports +SearchIntoLeaves=Leaves +CommentLink=Comments +NbComments=Number of comments +CommentPage=Comments space +CommentAdded=Comment added +CommentDeleted=Comment deleted +Everybody=Everybody +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/kn_IN/accountancy.lang b/htdocs/langs/kn_IN/accountancy.lang index 9dbf911a820..c4189507f60 100644 --- a/htdocs/langs/kn_IN/accountancy.lang +++ b/htdocs/langs/kn_IN/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Piece number TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=List of the accounting accounts UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal 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 Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution Modelcsv_quadratus=Export towards Quadratus QuadraCompta Modelcsv_ebp=Export towards EBP Modelcsv_cogilog=Export towards Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id diff --git a/htdocs/langs/kn_IN/admin.lang b/htdocs/langs/kn_IN/admin.lang index 84e57a2b932..b96e4814364 100644 --- a/htdocs/langs/kn_IN/admin.lang +++ b/htdocs/langs/kn_IN/admin.lang @@ -539,7 +539,7 @@ Module320Desc=Add RSS feed inside Dolibarr screen pages Module330Name=Bookmarks Module330Desc=Bookmarks management Module400Name=Projects/Opportunities/Leads -Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar integration Module500Name=Special expenses @@ -890,7 +890,7 @@ DictionaryStaff=ನೌಕರರು DictionaryAvailability=Delivery delay DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Models for chart of accounts DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=Emails templates @@ -904,6 +904,7 @@ SetupSaved=Setup saved SetupNotSaved=Setup not saved BackToModuleList=Back to modules list BackToDictionaryList=Back to dictionaries list +TypeOfRevenueStamp=Type of revenue stamp VATManagement=VAT Management VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is 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. @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/kn_IN/banks.lang b/htdocs/langs/kn_IN/banks.lang index 8a2558540c4..f68ca427503 100644 --- a/htdocs/langs/kn_IN/banks.lang +++ b/htdocs/langs/kn_IN/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Number LineRecord=Transaction AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Reconciled ConciliatedBy=Reconciled by DateConciliating=Reconcile date BankLineConciliated=Entry reconciled diff --git a/htdocs/langs/kn_IN/bills.lang b/htdocs/langs/kn_IN/bills.lang index 5f3d5d3fbdd..8e8a5b3fce4 100644 --- a/htdocs/langs/kn_IN/bills.lang +++ b/htdocs/langs/kn_IN/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s BillsLate=Late payments BillsStatistics=Customers invoices statistics BillsStatisticsSuppliers=Suppliers invoices statistics +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Disabled because cannot be erased InvoiceStandard=Standard invoice InvoiceStandardAsk=Standard invoice @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer diff --git a/htdocs/langs/kn_IN/compta.lang b/htdocs/langs/kn_IN/compta.lang index 4082b9fa9b7..df4942cf234 100644 --- a/htdocs/langs/kn_IN/compta.lang +++ b/htdocs/langs/kn_IN/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to PaymentsNotLinkedToUser=Payments not linked to any user Profit=Profit AccountingResult=Accounting result +BalanceBefore=Balance (before) Balance=Balance Debit=Debit Credit=Credit diff --git a/htdocs/langs/kn_IN/donations.lang b/htdocs/langs/kn_IN/donations.lang index f4578fa9fc3..5edc8d62033 100644 --- a/htdocs/langs/kn_IN/donations.lang +++ b/htdocs/langs/kn_IN/donations.lang @@ -31,3 +31,4 @@ 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 +DonationValidated=Donation %s validated diff --git a/htdocs/langs/kn_IN/errors.lang b/htdocs/langs/kn_IN/errors.lang index b02b70c9c9f..cff89a71d98 100644 --- a/htdocs/langs/kn_IN/errors.lang +++ b/htdocs/langs/kn_IN/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Empty expression ErrorPriceExpression21=Empty result '%s' ErrorPriceExpression22=Negative result '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs diff --git a/htdocs/langs/kn_IN/install.lang b/htdocs/langs/kn_IN/install.lang index 7a93fd20799..e602c54640c 100644 --- a/htdocs/langs/kn_IN/install.lang +++ b/htdocs/langs/kn_IN/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtua UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Fix for denormalized data @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Update entity field value of llx_societe_remise MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except MigrationReloadModule=Reload module %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Show not available options HideNotAvailableOptions=Hide not available options ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. diff --git a/htdocs/langs/kn_IN/languages.lang b/htdocs/langs/kn_IN/languages.lang index 05288a888eb..a062883d667 100644 --- a/htdocs/langs/kn_IN/languages.lang +++ b/htdocs/langs/kn_IN/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Spanish (Paraguay) Language_es_PE=Spanish (Peru) Language_es_PR=Spanish (Puerto Rico) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Spanish (Venezuela) Language_et_EE=Estonian Language_eu_ES=Basque diff --git a/htdocs/langs/kn_IN/main.lang b/htdocs/langs/kn_IN/main.lang index c9644d35443..e743f2e0382 100644 --- a/htdocs/langs/kn_IN/main.lang +++ b/htdocs/langs/kn_IN/main.lang @@ -548,6 +548,18 @@ MonthShort09=Sep MonthShort10=Oct MonthShort11=Nov MonthShort12=Dec +MonthVeryShort01=J +MonthVeryShort02=F +MonthVeryShort03=M +MonthVeryShort04=A +MonthVeryShort05=M +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=S +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Attached files and documents JoinMainDoc=Join main document DateFormatYYYYMM=YYYY-MM @@ -762,7 +774,7 @@ SetBankAccount=Define Bank Account AccountCurrency=Account currency ViewPrivateNote=View notes XMoreLines=%s line(s) hidden -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=Public URL AddBox=Add box SelectElementAndClick=Select an element and click %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=Everybody +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/kn_IN/other.lang b/htdocs/langs/kn_IN/other.lang index 86326b5da20..5242f77a2c1 100644 --- a/htdocs/langs/kn_IN/other.lang +++ b/htdocs/langs/kn_IN/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=If amount higher than %s SourcesRepository=Repository for sources Chart=Chart PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=Exports area diff --git a/htdocs/langs/kn_IN/products.lang b/htdocs/langs/kn_IN/products.lang index 6b50bcd8a65..3721d35f084 100644 --- a/htdocs/langs/kn_IN/products.lang +++ b/htdocs/langs/kn_IN/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Current price AlwaysUseNewPrice=Always use current price of product/service AlwaysUseFixedPrice=Use the fixed price PriceByQuantity=Different prices by quantity +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Quantity range MultipriceRules=Price segment rules UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/kn_IN/projects.lang b/htdocs/langs/kn_IN/projects.lang index f33a950acff..c69302deecb 100644 --- a/htdocs/langs/kn_IN/projects.lang +++ b/htdocs/langs/kn_IN/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=Pending OppStatusWON=Won OppStatusLOST=Lost Budget=Budget +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/kn_IN/website.lang b/htdocs/langs/kn_IN/website.lang index 3902febbfb7..6b4e2ada84a 100644 --- a/htdocs/langs/kn_IN/website.lang +++ b/htdocs/langs/kn_IN/website.lang @@ -3,15 +3,17 @@ Shortname=Code WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them. DeleteWebsite=Delete website ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Page name/alias -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL of external CSS file WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Media library EditCss=Edit Style/CSS or HTML header EditMenu=Edit menu @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/ko_KR/accountancy.lang b/htdocs/langs/ko_KR/accountancy.lang index 9dbf911a820..5de5e061b97 100644 --- a/htdocs/langs/ko_KR/accountancy.lang +++ b/htdocs/langs/ko_KR/accountancy.lang @@ -18,7 +18,7 @@ CantSuggest=Can't suggest AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s ConfigAccountingExpert=Configuration of the module accounting expert Journalization=Journalization -Journaux=Journals +Journaux=분개장 JournalFinancial=Financial journals BackToChartofaccounts=Return chart of accounts Chartofaccounts=Chart of accounts @@ -94,25 +94,25 @@ ExpenseReportsVentilation=Expense report binding CreateMvts=Create new transaction UpdateMvts=Modification of a transaction ValidTransaction=Validate transaction -WriteBookKeeping=Journalize transactions in Ledger -Bookkeeping=Ledger +WriteBookKeeping=원장에 이동 기록하기 +Bookkeeping=원장 AccountBalance=Account balance ObjectsRef=Source object ref CAHTF=Total purchase supplier before tax TotalExpenseReport=Total expense report -InvoiceLines=Lines of invoices to bind -InvoiceLinesDone=Bound lines of invoices +InvoiceLines=묶음 처리할 청구서 항목 +InvoiceLinesDone=묶음 처리된 청구서 항목 ExpenseReportLines=Lines of expense reports to bind ExpenseReportLinesDone=Bound lines of expense reports -IntoAccount=Bind line with the accounting account +IntoAccount=회계계좌로 연결 -Ventilate=Bind +Ventilate=묶음 처리 LineId=Id line -Processing=Processing -EndProcessing=Process terminated. -SelectedLines=Selected lines -Lineofinvoice=Line of invoice +Processing=처리중 +EndProcessing=처리종결 +SelectedLines=선택된 항목 +Lineofinvoice=청구서 항목 LineOfExpenseReport=Line of expense report NoAccountSelected=No accounting account selected VentilatedinAccount=Binded successfully to the accounting account @@ -131,8 +131,8 @@ ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts (If you ACCOUNTING_MANAGE_ZERO=Allow to manage different number of zero at the end of an accounting account. Needed by some countries (like switzerland). If keep to off (default), you can set the 2 following parameters to ask application to add virtual zero. BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank account -ACCOUNTING_SELL_JOURNAL=Sell journal -ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_SELL_JOURNAL=매출분개장 +ACCOUNTING_PURCHASE_JOURNAL=구매분개장 ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal ACCOUNTING_SOCIAL_JOURNAL=Social journal @@ -147,9 +147,9 @@ ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought serv ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (used if not defined in the service sheet) Doctype=Type of document -Docdate=Date +Docdate=날짜 Docref=Reference -Code_tiers=Thirdparty +Code_tiers=거래처 LabelAccount=Label account LabelOperation=Label operation Sens=Sens @@ -158,7 +158,7 @@ NumPiece=Piece number TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=List of the accounting accounts UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal 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 Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution Modelcsv_quadratus=Export towards Quadratus QuadraCompta Modelcsv_ebp=Export towards EBP Modelcsv_cogilog=Export towards Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang index 4e35837549e..aa7de12ed66 100644 --- a/htdocs/langs/ko_KR/admin.lang +++ b/htdocs/langs/ko_KR/admin.lang @@ -3,12 +3,12 @@ Foundation=Foundation Version=버전 Publisher=Publisher VersionProgram=버전 프로그램 -VersionLastInstall=Initial install version -VersionLastUpgrade=Latest version upgrade -VersionExperimental=Experimental -VersionDevelopment=Development +VersionLastInstall=초기설치버전 +VersionLastUpgrade=최종버전업그레이드 +VersionExperimental=실험용 +VersionDevelopment=개발 VersionUnknown=알 수 없음 -VersionRecommanded=Recommended +VersionRecommanded=권장 FileCheck=Files integrity checker FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. Value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker for example. FileIntegrityIsStrictlyConformedWithReference=Files integrity is strictly conformed with the reference. @@ -25,11 +25,11 @@ FilesAdded=Added Files FileCheckDolibarr=Check integrity of application files AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package XmlNotFound=Xml Integrity File of application not found -SessionId=Session ID -SessionSaveHandler=Handler to save sessions -SessionSavePath=Storage session localization -PurgeSessions=Purge of sessions -ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself). +SessionId=세션ID +SessionSaveHandler=세션저장구동기 +SessionSavePath=저장세션로컬라이제이션 +PurgeSessions=세션제거 +ConfirmPurgeSessions=모든 세션을 제거하겠습니까? (당신을 제외한) 모든 다른 사용자의 연결이 중단됩니다. NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow to list all running sessions. LockNewSessions=Lock new connections ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself. Only user %s will be able to connect after that. @@ -46,13 +46,13 @@ WarningModuleNotActive=Module %s must be enabled WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page. DolibarrSetup=Dolibarr install or upgrade InternalUser=Internal user -ExternalUser=External user -InternalUsers=Internal users -ExternalUsers=External users -GUISetup=Display -SetupArea=Setup area +ExternalUser=외부사용자 +InternalUsers=내부사용자\n +ExternalUsers=외부사용자 +GUISetup=화면 +SetupArea=설정지역 UploadNewTemplate=Upload new template(s) -FormToTestFileUploadForm=Form to test file upload (according to setup) +FormToTestFileUploadForm=파일업로드테스트용 양식 IfModuleEnabled=Note: yes is effective only if module %s is enabled RemoveLock=Remove file %s if it exists to allow usage of the update tool. RestoreLock=Restore file %s, with read permission only, to disable any usage of update tool. @@ -81,18 +81,18 @@ ThemeCurrentlyActive=Theme currently active CurrentTimeZone=TimeZone PHP (server) MySQLTimeZone=TimeZone MySql (database) TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered). -Space=Space -Table=Table -Fields=Fields -Index=Index +Space=공간 +Table=테이블 +Fields=필드 +Index=목록 Mask=Mask -NextValue=Next value -NextValueForInvoices=Next value (invoices) -NextValueForCreditNotes=Next value (credit notes) +NextValue=다음 값 +NextValueForInvoices=다음 값(청구서) +NextValueForCreditNotes=다음 값(크레딧 기록) NextValueForDeposit=Next value (down payment) NextValueForReplacements=Next value (replacements) MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to %s %s, whatever this parameter's value is -NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration +NoMaxSizeByPHPLimit=PHP 설정에서 한도가 설정되어 있지 않습니다. MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload) UseCaptchaCode=Use graphical code (CAPTCHA) on login page AntiVirusCommand= Full path to antivirus command @@ -143,45 +143,45 @@ SystemInfo=System information SystemToolsArea=System tools area SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for. Purge=Purge -PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in %s directory). Using this feature is not necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server. -PurgeDeleteLogFile=Delete log files, including %s defined for Syslog module (no risk of losing data) -PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data) +PurgeAreaDesc=이 페이즈는 %s에 돌리바에 의해 생성되거나 저장된 모든 파일을 삭제할 수 있습니다. 이 기능을 사용하는 것이 필수는 아닙니다. 이 기능은 돌리바가 웹서버에 의해 생성된 파일의 삭제가 허용되지 않는 호스팅 업체를 이용중인 사용자를 위해 제공된 기능입니다. +PurgeDeleteLogFile=Syslog 모듈(데이타 손실 위험 없음) %s에 의해 정읜된 돌리바 로그파일 +PurgeDeleteTemporaryFiles=모든 임시파일 삭제(데이터손실위험 없음) PurgeDeleteTemporaryFilesShort=Delete temporary files PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory %s. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted. -PurgeRunNow=Purge now -PurgeNothingToDelete=No directory or files to delete. -PurgeNDirectoriesDeleted=%s files or directories deleted. +PurgeRunNow=지금 제거하기 +PurgeNothingToDelete=삭제할 디렉토리나 파일이 없음 +PurgeNDirectoriesDeleted=%s개의 파일 또는 경로가 삭제되었음 PurgeNDirectoriesFailed=Failed to delete %s files or directories. -PurgeAuditEvents=Purge all security events -ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed. -GenerateBackup=Generate backup -Backup=Backup -Restore=Restore -RunCommandSummary=Backup has been launched with the following command -BackupResult=Backup result -BackupFileSuccessfullyCreated=Backup file successfully generated -YouCanDownloadBackupFile=Generated files can now be downloaded -NoBackupFileAvailable=No backup files available. -ExportMethod=Export method -ImportMethod=Import method -ToBuildBackupFileClickHere=To build a backup file, click here. -ImportMySqlDesc=To import a backup file, you must use mysql command from command line: -ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line: -ImportMySqlCommand=%s %s < mybackupfile.sql -ImportPostgreSqlCommand=%s %s mybackupfile.sql -FileNameToGenerate=File name to generate -Compression=Compression -CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import -CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later -ExportCompatibility=Compatibility of generated export file -MySqlExportParameters=MySQL export parameters -PostgreSqlExportParameters= PostgreSQL export parameters -UseTransactionnalMode=Use transactional mode -FullPathToMysqldumpCommand=Full path to mysqldump command -FullPathToPostgreSQLdumpCommand=Full path to pg_dump command +PurgeAuditEvents=모든 보안 이벤트 제거 +ConfirmPurgeAuditEvents=모든 보안 이벤트를 제거합니까? 모든 보안 로그가 지워지며, 다른 데이터는 삭제되지 않습니다. +GenerateBackup=백업 생성 +Backup=백업 +Restore=복구 +RunCommandSummary=백업이 다음의 명령으로 실행되었음 +BackupResult=백업결과 +BackupFileSuccessfullyCreated=백업파일이 성공적으로 생성되었습니다. +YouCanDownloadBackupFile=생성된 파일을 다운로드 할 수 있습니다. +NoBackupFileAvailable=사용가능한 백업파일 없음 +ExportMethod=내보내기 방법 +ImportMethod=가져오기 방법 +ToBuildBackupFileClickHere=백업파일을 만드려면 여기를클릭하세요 +ImportMySqlDesc=백업파일을 가져오려면 명령줄에서 mysql명령어를 사용해야 합니다. +ImportPostgreSqlDesc=백업파일을 가져오려면 명령줄에서 pg_restore명령어를 사용해야 합니다. +ImportMySqlCommand=%s%s< mybackupfile.sql +ImportPostgreSqlCommand=%s%smybackupfile.sql +FileNameToGenerate=생성할 파일명 +Compression=압축 +CommandsToDisableForeignKeysForImport=가져오기에서 foreign 키를 사용할 수 없도록 합니다. +CommandsToDisableForeignKeysForImportWarning=나중에sql덤프를 저장하려면 필수입니다. +ExportCompatibility=생성된 내보내기 파일 호환성 +MySqlExportParameters=MySQL 내보내기 변수 +PostgreSqlExportParameters= PostgreSQL내보내기 변수 +UseTransactionnalMode=전송 모드를 사용 +FullPathToMysqldumpCommand=mysqldump명령어 전체경로 +FullPathToPostgreSQLdumpCommand=pg_dump 명령어 전체경로  AddDropDatabase=Add DROP DATABASE command AddDropTable=Add DROP TABLE command -ExportStructure=Structure +ExportStructure=구조 NameColumn=Name columns ExtendedInsert=Extended INSERT NoLockBeforeInsert=No lock commands around INSERT @@ -539,7 +539,7 @@ Module320Desc=Add RSS feed inside Dolibarr screen pages Module330Name=Bookmarks Module330Desc=Bookmarks management Module400Name=Projects/Opportunities/Leads -Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar integration Module500Name=Special expenses @@ -561,7 +561,7 @@ Module1200Name=Mantis Module1200Desc=Mantis integration Module1520Name=Document Generation Module1520Desc=Mass mail document generation -Module1780Name=Tags/Categories +Module1780Name=분류/범주 Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members) Module2000Name=WYSIWYG editor Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor) @@ -890,7 +890,7 @@ DictionaryStaff=직원 DictionaryAvailability=Delivery delay DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Models for chart of accounts DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=Emails templates @@ -904,6 +904,7 @@ SetupSaved=Setup saved SetupNotSaved=Setup not saved BackToModuleList=Back to modules list BackToDictionaryList=Back to dictionaries list +TypeOfRevenueStamp=Type of revenue stamp VATManagement=VAT Management VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is 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. @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/ko_KR/banks.lang b/htdocs/langs/ko_KR/banks.lang index 9731729dbdb..73b3d4776e2 100644 --- a/htdocs/langs/ko_KR/banks.lang +++ b/htdocs/langs/ko_KR/banks.lang @@ -89,13 +89,14 @@ AccountIdShort=번호 LineRecord=Transaction AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Reconciled ConciliatedBy=Reconciled by DateConciliating=Reconcile date BankLineConciliated=Entry reconciled Reconciled=Reconciled NotReconciled=Not reconciled CustomerInvoicePayment=Customer payment -SupplierInvoicePayment=Supplier payment +SupplierInvoicePayment=공급업체결제 SubscriptionPayment=Subscription payment WithdrawalPayment=Withdrawal payment SocialContributionPayment=Social/fiscal tax payment diff --git a/htdocs/langs/ko_KR/bills.lang b/htdocs/langs/ko_KR/bills.lang index d35f40e11e7..3a968b76f30 100644 --- a/htdocs/langs/ko_KR/bills.lang +++ b/htdocs/langs/ko_KR/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s BillsLate=Late payments BillsStatistics=Customers invoices statistics BillsStatisticsSuppliers=Suppliers invoices statistics +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Disabled because cannot be erased InvoiceStandard=Standard invoice InvoiceStandardAsk=Standard invoice @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer diff --git a/htdocs/langs/ko_KR/categories.lang b/htdocs/langs/ko_KR/categories.lang index 41e5f4e4c13..84a576c0f7f 100644 --- a/htdocs/langs/ko_KR/categories.lang +++ b/htdocs/langs/ko_KR/categories.lang @@ -1,9 +1,9 @@ # Dolibarr language file - Source file is en_US - categories -Rubrique=Tag/Category -Rubriques=Tags/Categories +Rubrique=분류/범주 +Rubriques=분류/범주 RubriquesTransactions=Tags/Categories of transactions -categories=tags/categories -NoCategoryYet=No tag/category of this type created +categories=분류/범주 +NoCategoryYet=해당 분류/범주가 없습니다. In=In AddIn=Add in modify=modify diff --git a/htdocs/langs/ko_KR/compta.lang b/htdocs/langs/ko_KR/compta.lang index 177ddb2542b..a9f0c90fe77 100644 --- a/htdocs/langs/ko_KR/compta.lang +++ b/htdocs/langs/ko_KR/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to PaymentsNotLinkedToUser=Payments not linked to any user Profit=Profit AccountingResult=Accounting result +BalanceBefore=Balance (before) Balance=Balance Debit=Debit Credit=Credit diff --git a/htdocs/langs/ko_KR/donations.lang b/htdocs/langs/ko_KR/donations.lang index 5be4a5ceaa8..e141edd12e3 100644 --- a/htdocs/langs/ko_KR/donations.lang +++ b/htdocs/langs/ko_KR/donations.lang @@ -31,3 +31,4 @@ 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 +DonationValidated=Donation %s validated diff --git a/htdocs/langs/ko_KR/errors.lang b/htdocs/langs/ko_KR/errors.lang index b02b70c9c9f..cff89a71d98 100644 --- a/htdocs/langs/ko_KR/errors.lang +++ b/htdocs/langs/ko_KR/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Empty expression ErrorPriceExpression21=Empty result '%s' ErrorPriceExpression22=Negative result '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs diff --git a/htdocs/langs/ko_KR/install.lang b/htdocs/langs/ko_KR/install.lang index b35b6616610..e8c77bdd2ca 100644 --- a/htdocs/langs/ko_KR/install.lang +++ b/htdocs/langs/ko_KR/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtua UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Fix for denormalized data @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Update entity field value of llx_societe_remise MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except MigrationReloadModule=Reload module %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Show not available options HideNotAvailableOptions=Hide not available options ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. diff --git a/htdocs/langs/ko_KR/languages.lang b/htdocs/langs/ko_KR/languages.lang index 33a09ed936a..3e1191ca224 100644 --- a/htdocs/langs/ko_KR/languages.lang +++ b/htdocs/langs/ko_KR/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=스페인어 (파나마) Language_es_PY=스페인어 (파라과이) Language_es_PE=스페인어 (페루) Language_es_PR=스페인어 (푸에르토 리코) +Language_es_UY=Spanish (Uruguay) Language_es_VE=스페인어 (베네수엘라) Language_et_EE=에스토니아어 Language_eu_ES=바스크어 diff --git a/htdocs/langs/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang index a8e64102254..5d1deffe723 100644 --- a/htdocs/langs/ko_KR/main.lang +++ b/htdocs/langs/ko_KR/main.lang @@ -548,6 +548,18 @@ MonthShort09=9 월 MonthShort10=10 월 MonthShort11=11 월 MonthShort12=12 월 +MonthVeryShort01=J +MonthVeryShort02=금 +MonthVeryShort03=월 +MonthVeryShort04=A +MonthVeryShort05=월 +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=일 +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=첨부 파일 및 문서 JoinMainDoc=Join main document DateFormatYYYYMM=YYYY-MM @@ -762,7 +774,7 @@ SetBankAccount=은행 계좌 정의 AccountCurrency=Account currency ViewPrivateNote=노트보기 XMoreLines=%s 행 숨김 -ShowMoreLines=더 많은 라인보기 +ShowMoreLines=Show more/less lines PublicUrl=공개 URL AddBox=상자 추가 SelectElementAndClick=요소를 선택하고 %s을 클릭하십시오. @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=Everybody +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/ko_KR/orders.lang b/htdocs/langs/ko_KR/orders.lang index 095ccfcafa5..4750ca9e599 100644 --- a/htdocs/langs/ko_KR/orders.lang +++ b/htdocs/langs/ko_KR/orders.lang @@ -7,8 +7,8 @@ Order=Order PdfOrderTitle=Order Orders=명령 OrderLine=Order line -OrderDate=Order date -OrderDateShort=Order date +OrderDate=주문일 +OrderDateShort=주문일 OrderToProcess=Order to process NewOrder=New order ToOrder=Make order diff --git a/htdocs/langs/ko_KR/other.lang b/htdocs/langs/ko_KR/other.lang index 07972aaebeb..5ade2b0d38f 100644 --- a/htdocs/langs/ko_KR/other.lang +++ b/htdocs/langs/ko_KR/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=If amount higher than %s SourcesRepository=Repository for sources Chart=Chart PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=Exports area diff --git a/htdocs/langs/ko_KR/productbatch.lang b/htdocs/langs/ko_KR/productbatch.lang index c42e405b208..8f86948fd42 100644 --- a/htdocs/langs/ko_KR/productbatch.lang +++ b/htdocs/langs/ko_KR/productbatch.lang @@ -1,24 +1,24 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use lot/serial number -ProductStatusOnBatch=Yes (lot/serial required) -ProductStatusNotOnBatch=No (lot/serial not used) +ManageLotSerial=생산일련번호 사용 +ProductStatusOnBatch=예(생산일련번호필요) +ProductStatusNotOnBatch=아니오(생산일련번호사용안함) ProductStatusOnBatchShort=예 ProductStatusNotOnBatchShort=아니 -Batch=Lot/Serial -atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number -batch_number=Lot/Serial number -BatchNumberShort=Lot/Serial -EatByDate=Eat-by date -SellByDate=Sell-by date -DetailBatchNumber=Lot/Serial details -printBatch=Lot/Serial: %s -printEatby=Eat-by: %s -printSellby=Sell-by: %s -printQty=Qty: %d -AddDispatchBatchLine=Add a line for Shelf Life dispatching -WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want. -ProductDoesNotUseBatchSerial=This product does not use lot/serial number -ProductLotSetup=Setup of module lot/serial -ShowCurrentStockOfLot=Show current stock for couple product/lot -ShowLogOfMovementIfLot=Show log of movements for couple product/lot -StockDetailPerBatch=Stock detail per lot +Batch=생산일련번호 +atleast1batchfield=소비기한 날짜 또는 판매기한 날짜 또는 일련번호 +batch_number=생산일련번호 +BatchNumberShort=일련번호 +EatByDate=소비기한 날짜 +SellByDate=판매기한 날짜 +DetailBatchNumber=생산일련번호 상세 +printBatch=생산일련번호: %s +printEatby=소비기한: %s +printSellby=판매기한: %s +printQty=수량: %d +AddDispatchBatchLine=Shelf Life 처리를 위한 줄 추가 +WhenProductBatchModuleOnOptionAreForced=일련번호모듈을 사용하면 운송허가 및 제품 수령시에 자동 재고증가감소수량모드가 강제되며, 수정이 불가합니다. 다른 옵션은 원하는대로 지정이 가능합니다. +ProductDoesNotUseBatchSerial=이제품은 일련번호를 사용하지 않음 +ProductLotSetup=일련번호 모듈 설정 +ShowCurrentStockOfLot=묶음제품 또는 일련번호별제품 현 재고보기 +ShowLogOfMovementIfLot=묶음제품 또는 일련번호별제품 이동기록 보기 +StockDetailPerBatch=일련번호별 재고내역 diff --git a/htdocs/langs/ko_KR/products.lang b/htdocs/langs/ko_KR/products.lang index 9d523a29b7a..57822b629d9 100644 --- a/htdocs/langs/ko_KR/products.lang +++ b/htdocs/langs/ko_KR/products.lang @@ -151,7 +151,7 @@ NewRefForClone=Ref. of new product/service SellingPrices=Selling prices BuyingPrices=Buying prices CustomerPrices=Customer prices -SuppliersPrices=Supplier prices +SuppliersPrices=공급업체 가격 SuppliersPricesOfProductsOrServices=Supplier prices (of products or services) CustomCode=Customs/Commodity/HS code CountryOrigin=Origin country @@ -196,6 +196,7 @@ CurrentProductPrice=Current price AlwaysUseNewPrice=Always use current price of product/service AlwaysUseFixedPrice=Use the fixed price PriceByQuantity=Different prices by quantity +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Quantity range MultipriceRules=Price segment rules UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/ko_KR/projects.lang b/htdocs/langs/ko_KR/projects.lang index 99205963b28..59d80da95b3 100644 --- a/htdocs/langs/ko_KR/projects.lang +++ b/htdocs/langs/ko_KR/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=Pending OppStatusWON=Won OppStatusLOST=Lost Budget=Budget +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/ko_KR/suppliers.lang b/htdocs/langs/ko_KR/suppliers.lang index 0697f8751d2..630ee5728c8 100644 --- a/htdocs/langs/ko_KR/suppliers.lang +++ b/htdocs/langs/ko_KR/suppliers.lang @@ -1,47 +1,47 @@ # Dolibarr language file - Source file is en_US - suppliers -Suppliers=공급 업체 -SuppliersInvoice=Suppliers invoice -ShowSupplierInvoice=Show Supplier Invoice -NewSupplier=신규 공급업체 -History=History -ListOfSuppliers=공급 업체 목록 -ShowSupplier=Show supplier -OrderDate=Order date -BuyingPriceMin=Best buying price -BuyingPriceMinShort=Best buying price -TotalBuyingPriceMinShort=Total of subproducts buying prices -TotalSellingPriceMinShort=Total of subproducts selling prices +Suppliers=납품업체 +SuppliersInvoice=대금 청구서 +ShowSupplierInvoice=공급업체청구서보기 +NewSupplier=신규납품처 +History=기록보기 +ListOfSuppliers=남품처목록 +ShowSupplier=남품처보기 +OrderDate=주문일 +BuyingPriceMin=최저구매가 +BuyingPriceMinShort=최저구매가 +TotalBuyingPriceMinShort=구성제품구매총액 +TotalSellingPriceMinShort=구성제품판매총액 SomeSubProductHaveNoPrices=Some sub-products have no price defined -AddSupplierPrice=Add buying price -ChangeSupplierPrice=Change buying price -SupplierPrices=Supplier prices +AddSupplierPrice=구매가등록 +ChangeSupplierPrice=구매가변경 +SupplierPrices=공급업체 가격 ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s -NoRecordedSuppliers=No suppliers recorded -SupplierPayment=Supplier payment -SuppliersArea=Suppliers area +NoRecordedSuppliers=남품처 기록없음 +SupplierPayment=납품업체대금결제 +SuppliersArea=납품업체지역 RefSupplierShort=참조 공급자 -Availability=Availability -ExportDataset_fournisseur_1=Supplier invoices list and invoice lines -ExportDataset_fournisseur_2=Supplier invoices and payments -ExportDataset_fournisseur_3=Supplier orders and order lines -ApproveThisOrder=Approve this order +Availability=이용가능여부 +ExportDataset_fournisseur_1=공급업체 대금결제청구목록 및 상세내역 +ExportDataset_fournisseur_2=공급업체 청구서 및 결제내역 +ExportDataset_fournisseur_3=공급업체 주문 및 상세내역 +ApproveThisOrder=주문 승인 ConfirmApproveThisOrder=Are you sure you want to approve order %s? -DenyingThisOrder=Deny this order +DenyingThisOrder=주문 거절 ConfirmDenyingThisOrder=Are you sure you want to deny this order %s? ConfirmCancelThisOrder=Are you sure you want to cancel this order %s? -AddSupplierOrder=Create supplier order -AddSupplierInvoice=Create supplier invoice +AddSupplierOrder=공급업체 주문생성 +AddSupplierInvoice=공급업체청구서생성 ListOfSupplierProductForSupplier=List of products and prices for supplier %s SentToSuppliers=Sent to suppliers -ListOfSupplierOrders=List of supplier orders -MenuOrdersSupplierToBill=Supplier orders to invoice -NbDaysToDelivery=Delivery delay in days -DescNbDaysToDelivery=The biggest deliver delay of the products from this order -SupplierReputation=Supplier reputation -DoNotOrderThisProductToThisSupplier=Do not order +ListOfSupplierOrders=최근 공급 업체 주문 목록 +MenuOrdersSupplierToBill=청구서생성용 공급업체주문목록 +NbDaysToDelivery=배송지체기간 +DescNbDaysToDelivery=최대배송지체기간 +SupplierReputation=공급업체평가 +DoNotOrderThisProductToThisSupplier=주문불가 NotTheGoodQualitySupplier=Wrong quality -ReputationForThisProduct=Reputation -BuyerName=Buyer name -AllProductServicePrices=All product / service prices -AllProductReferencesOfSupplier=All product / service references of supplier -BuyingPriceNumShort=Supplier prices +ReputationForThisProduct=평가 +BuyerName=구매자 +AllProductServicePrices=제품목록 및 서비스목록 +AllProductReferencesOfSupplier=공급업체 제품 및 서비스 목록 +BuyingPriceNumShort=공급업체 가격 diff --git a/htdocs/langs/ko_KR/website.lang b/htdocs/langs/ko_KR/website.lang index 02e0e43aabf..5a41ee81dab 100644 --- a/htdocs/langs/ko_KR/website.lang +++ b/htdocs/langs/ko_KR/website.lang @@ -3,15 +3,17 @@ Shortname=암호 WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them. DeleteWebsite=Delete website ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Page name/alias -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL of external CSS file WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Media library EditCss=Edit Style/CSS or HTML header EditMenu=Edit menu @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/lo_LA/accountancy.lang b/htdocs/langs/lo_LA/accountancy.lang index 9456f4ee383..8faa373a9e0 100644 --- a/htdocs/langs/lo_LA/accountancy.lang +++ b/htdocs/langs/lo_LA/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Piece number TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=List of the accounting accounts UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal 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 Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution Modelcsv_quadratus=Export towards Quadratus QuadraCompta Modelcsv_ebp=Export towards EBP Modelcsv_cogilog=Export towards Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang index caa896f5d48..ee775ff5cf9 100644 --- a/htdocs/langs/lo_LA/admin.lang +++ b/htdocs/langs/lo_LA/admin.lang @@ -539,7 +539,7 @@ Module320Desc=Add RSS feed inside Dolibarr screen pages Module330Name=Bookmarks Module330Desc=Bookmarks management Module400Name=Projects/Opportunities/Leads -Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar integration Module500Name=Special expenses @@ -890,7 +890,7 @@ DictionaryStaff=Staff DictionaryAvailability=Delivery delay DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Models for chart of accounts DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=Emails templates @@ -904,6 +904,7 @@ SetupSaved=Setup saved SetupNotSaved=Setup not saved BackToModuleList=Back to modules list BackToDictionaryList=Back to dictionaries list +TypeOfRevenueStamp=Type of revenue stamp VATManagement=VAT Management VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is 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. @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/lo_LA/banks.lang b/htdocs/langs/lo_LA/banks.lang index 4d9990afa3a..5209201d38f 100644 --- a/htdocs/langs/lo_LA/banks.lang +++ b/htdocs/langs/lo_LA/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Number LineRecord=Transaction AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Reconciled ConciliatedBy=Reconciled by DateConciliating=Reconcile date BankLineConciliated=Entry reconciled diff --git a/htdocs/langs/lo_LA/bills.lang b/htdocs/langs/lo_LA/bills.lang index b865c00be9d..eeafc56bf1c 100644 --- a/htdocs/langs/lo_LA/bills.lang +++ b/htdocs/langs/lo_LA/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s BillsLate=Late payments BillsStatistics=Customers invoices statistics BillsStatisticsSuppliers=Suppliers invoices statistics +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Disabled because cannot be erased InvoiceStandard=Standard invoice InvoiceStandardAsk=Standard invoice @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer diff --git a/htdocs/langs/lo_LA/compta.lang b/htdocs/langs/lo_LA/compta.lang index 92f0909fe96..615e9d2c1f8 100644 --- a/htdocs/langs/lo_LA/compta.lang +++ b/htdocs/langs/lo_LA/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to PaymentsNotLinkedToUser=Payments not linked to any user Profit=Profit AccountingResult=Accounting result +BalanceBefore=Balance (before) Balance=Balance Debit=Debit Credit=Credit diff --git a/htdocs/langs/lo_LA/donations.lang b/htdocs/langs/lo_LA/donations.lang index f4578fa9fc3..5edc8d62033 100644 --- a/htdocs/langs/lo_LA/donations.lang +++ b/htdocs/langs/lo_LA/donations.lang @@ -31,3 +31,4 @@ 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 +DonationValidated=Donation %s validated diff --git a/htdocs/langs/lo_LA/errors.lang b/htdocs/langs/lo_LA/errors.lang index b02b70c9c9f..cff89a71d98 100644 --- a/htdocs/langs/lo_LA/errors.lang +++ b/htdocs/langs/lo_LA/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Empty expression ErrorPriceExpression21=Empty result '%s' ErrorPriceExpression22=Negative result '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs diff --git a/htdocs/langs/lo_LA/install.lang b/htdocs/langs/lo_LA/install.lang index 7a93fd20799..e602c54640c 100644 --- a/htdocs/langs/lo_LA/install.lang +++ b/htdocs/langs/lo_LA/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtua UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Fix for denormalized data @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Update entity field value of llx_societe_remise MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except MigrationReloadModule=Reload module %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Show not available options HideNotAvailableOptions=Hide not available options ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. diff --git a/htdocs/langs/lo_LA/languages.lang b/htdocs/langs/lo_LA/languages.lang index 05288a888eb..a062883d667 100644 --- a/htdocs/langs/lo_LA/languages.lang +++ b/htdocs/langs/lo_LA/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Spanish (Paraguay) Language_es_PE=Spanish (Peru) Language_es_PR=Spanish (Puerto Rico) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Spanish (Venezuela) Language_et_EE=Estonian Language_eu_ES=Basque diff --git a/htdocs/langs/lo_LA/main.lang b/htdocs/langs/lo_LA/main.lang index 314b468e559..c08e26bc2e6 100644 --- a/htdocs/langs/lo_LA/main.lang +++ b/htdocs/langs/lo_LA/main.lang @@ -548,6 +548,18 @@ MonthShort09=Sep MonthShort10=Oct MonthShort11=Nov MonthShort12=Dec +MonthVeryShort01=J +MonthVeryShort02=F +MonthVeryShort03=M +MonthVeryShort04=A +MonthVeryShort05=M +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=S +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Attached files and documents JoinMainDoc=Join main document DateFormatYYYYMM=YYYY-MM @@ -762,7 +774,7 @@ SetBankAccount=Define Bank Account AccountCurrency=Account currency ViewPrivateNote=View notes XMoreLines=%s line(s) hidden -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=Public URL AddBox=Add box SelectElementAndClick=Select an element and click %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=Everybody +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/lo_LA/other.lang b/htdocs/langs/lo_LA/other.lang index 02575b18d26..1bf6e5849f5 100644 --- a/htdocs/langs/lo_LA/other.lang +++ b/htdocs/langs/lo_LA/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=If amount higher than %s SourcesRepository=Repository for sources Chart=Chart PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=Exports area diff --git a/htdocs/langs/lo_LA/products.lang b/htdocs/langs/lo_LA/products.lang index b51d96e7286..dfc4ce7630a 100644 --- a/htdocs/langs/lo_LA/products.lang +++ b/htdocs/langs/lo_LA/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Current price AlwaysUseNewPrice=Always use current price of product/service AlwaysUseFixedPrice=Use the fixed price PriceByQuantity=Different prices by quantity +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Quantity range MultipriceRules=Price segment rules UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/lo_LA/projects.lang b/htdocs/langs/lo_LA/projects.lang index 4fc8c0a52c4..196e421ffae 100644 --- a/htdocs/langs/lo_LA/projects.lang +++ b/htdocs/langs/lo_LA/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=Pending OppStatusWON=Won OppStatusLOST=Lost Budget=Budget +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/lo_LA/website.lang b/htdocs/langs/lo_LA/website.lang index 3902febbfb7..6b4e2ada84a 100644 --- a/htdocs/langs/lo_LA/website.lang +++ b/htdocs/langs/lo_LA/website.lang @@ -3,15 +3,17 @@ Shortname=Code WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them. DeleteWebsite=Delete website ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Page name/alias -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL of external CSS file WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Media library EditCss=Edit Style/CSS or HTML header EditMenu=Edit menu @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/lt_LT/accountancy.lang b/htdocs/langs/lt_LT/accountancy.lang index 85fe36d5d21..9dc64cbc79d 100644 --- a/htdocs/langs/lt_LT/accountancy.lang +++ b/htdocs/langs/lt_LT/accountancy.lang @@ -1,11 +1,11 @@ # Dolibarr language file - en_US - Accounting Expert -ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file -ACCOUNTING_EXPORT_DATE=Date format for export file -ACCOUNTING_EXPORT_PIECE=Export the number of piece -ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account -ACCOUNTING_EXPORT_LABEL=Export label -ACCOUNTING_EXPORT_AMOUNT=Export amount -ACCOUNTING_EXPORT_DEVISE=Export currency +ACCOUNTING_EXPORT_SEPARATORCSV=Stulpelių atskyriklis eksportuojamam failui +ACCOUNTING_EXPORT_DATE=Datos formatas exportuojam failui +ACCOUNTING_EXPORT_PIECE=Exportuoti vienetų skaičių +ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Eksportuoti su pagrindinę parkyra +ACCOUNTING_EXPORT_LABEL=Eksporto etiketė +ACCOUNTING_EXPORT_AMOUNT=Eksporto suma +ACCOUNTING_EXPORT_DEVISE=Eksporto valiuta Selectformat=Select the format for the file ACCOUNTING_EXPORT_FORMAT=Select the format for the file ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type @@ -70,7 +70,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future. TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts) -Selectchartofaccounts=Select active chart of accounts +Selectchartofaccounts=Pasirinkite aktyvia sąskaitų planą ChangeAndLoad=Change and load Addanaccount=Pridėti apskaitos sąskaitą AccountAccounting=Apskaitos sąskaita @@ -78,7 +78,7 @@ AccountAccountingShort=Sąskaita SubledgerAccount=Subledger Account ShowAccountingAccount=Show accounting account ShowAccountingJournal=Show accounting journal -AccountAccountingSuggest=Accounting account suggested +AccountAccountingSuggest=Siūloma apskaitos sąskaita MenuDefaultAccounts=Default accounts MenuBankAccounts=Banko sąskaitos MenuVatAccounts=Vat accounts @@ -110,7 +110,7 @@ IntoAccount=Bind line with the accounting account Ventilate=Bind LineId=Id line Processing=Apdorojimas -EndProcessing=Process terminated. +EndProcessing=Apdorojimas nutrauktas SelectedLines=Pasirinktos eilutės Lineofinvoice=Sąskaitos-faktūros eilutė LineOfExpenseReport=Line of expense report @@ -158,7 +158,7 @@ NumPiece=Piece number TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -181,7 +181,7 @@ FeeAccountNotDefined=Account for fee not defined BankAccountNotDefined=Account for bank not defined CustomerInvoicePayment=Kliento sąskaitos-faktūros apmokėjimas ThirdPartyAccount=Trečios šalies sąskaita -NewAccountingMvt=New transaction +NewAccountingMvt=Naujas sandoris NumMvts=Numero of transaction ListeMvts=List of movements ErrorDebitCredit=Debetas ir Kreditas negali turėti reikšmę tuo pačiu metu, @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=Apskaitos sąskaitų sąrašas UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,17 +245,16 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal Modelcsv=Eksporto modelis -OptionsDeactivatedForThisExportModel=Šiam eksporto modeliui opcijos išjungtos Selectmodelcsv=Pasirinkite eksporto modelį Modelcsv_normal=Klasikinis eksportas -Modelcsv_CEGID=Export towards CEGID Expert Comptabilité +Modelcsv_CEGID=Eksportas į CEGID Expert Comptabilité Modelcsv_COALA=Export towards Sage Coala Modelcsv_bob50=Export towards Sage BOB 50 Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution Modelcsv_quadratus=Export towards Quadratus QuadraCompta Modelcsv_ebp=Export towards EBP Modelcsv_cogilog=Export towards Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang index 2f9d9825bbc..ce263464b7e 100644 --- a/htdocs/langs/lt_LT/admin.lang +++ b/htdocs/langs/lt_LT/admin.lang @@ -3,8 +3,8 @@ Foundation=Organizacija Version=Versija Publisher=Publisher VersionProgram=Programos versija -VersionLastInstall=Initial install version -VersionLastUpgrade=Latest version upgrade +VersionLastInstall=Pradinė įdiegimo versija +VersionLastUpgrade=Paskutinės versijos naujinimas VersionExperimental=Ekspermentinis VersionDevelopment=Plėtojimas VersionUnknown=Nežinomas @@ -539,7 +539,7 @@ Module320Desc=Pridėti RSS mechanizmą Dolibarr ekrano puslapių viduje Module330Name=Žymekliai Module330Desc=Žymeklių valdymas 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. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also 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=Specialios išlaidos @@ -890,7 +890,7 @@ DictionaryStaff=Personalas DictionaryAvailability=Pristatymo vėlavimas DictionaryOrderMethods=Užsakymų metodai DictionarySource=Pasiūlymų/užsakymų kilmė -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Sąskaitų plano modeliai DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=El.pašto pranešimų šablonai @@ -904,6 +904,7 @@ SetupSaved=Nustatymai išsaugoti SetupNotSaved=Setup not saved BackToModuleList=Atgal į modulių sąrašą BackToDictionaryList=Atgal į žodynų sąrašą +TypeOfRevenueStamp=Type of revenue stamp VATManagement=PVM valdymas VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is VAT=0. End of rule. VATIsNotUsedDesc=Pagal nutylėjimą siūloma PVM yra 0, kuris gali būti naudojamas kai kuriais atvejais, pvz.: asociacijoms, fiziniams asmenims ar mažoms įmonėms. @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/lt_LT/banks.lang b/htdocs/langs/lt_LT/banks.lang index d9950555833..cfc001c7f9b 100644 --- a/htdocs/langs/lt_LT/banks.lang +++ b/htdocs/langs/lt_LT/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Skaičius LineRecord=Operacija/Sandoris AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Reconciled ConciliatedBy=Suderintas DateConciliating=Suderinimo data BankLineConciliated=Entry reconciled diff --git a/htdocs/langs/lt_LT/bills.lang b/htdocs/langs/lt_LT/bills.lang index 29e85411f5c..cab17e0629f 100644 --- a/htdocs/langs/lt_LT/bills.lang +++ b/htdocs/langs/lt_LT/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s BillsLate=Pavėluoti mokėjimai BillsStatistics=Customers invoices statistics BillsStatisticsSuppliers=Suppliers invoices statistics +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Disabled because cannot be erased InvoiceStandard=Standartinė sąskaita-faktūra InvoiceStandardAsk=Standartinė sąskaita-faktūra @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=Blogas klientas diff --git a/htdocs/langs/lt_LT/compta.lang b/htdocs/langs/lt_LT/compta.lang index 82c508e0969..b1bc37ac085 100644 --- a/htdocs/langs/lt_LT/compta.lang +++ b/htdocs/langs/lt_LT/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Mokėjimai nėra susiję su jokia sąskaita-faktūra, PaymentsNotLinkedToUser=Mokėjimai nėra susieti su jokiu Vartotoju Profit=Pelnas AccountingResult=Accounting result +BalanceBefore=Balance (before) Balance=Balansas Debit=Debetas Credit=Kreditas diff --git a/htdocs/langs/lt_LT/donations.lang b/htdocs/langs/lt_LT/donations.lang index e4c315607ef..e23b0061f4c 100644 --- a/htdocs/langs/lt_LT/donations.lang +++ b/htdocs/langs/lt_LT/donations.lang @@ -31,3 +31,4 @@ 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 +DonationValidated=Donation %s validated diff --git a/htdocs/langs/lt_LT/errors.lang b/htdocs/langs/lt_LT/errors.lang index 1697da6af7b..475faf1eba3 100644 --- a/htdocs/langs/lt_LT/errors.lang +++ b/htdocs/langs/lt_LT/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Empty expression ErrorPriceExpression21=Empty result '%s' ErrorPriceExpression22=Negative result '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Šaltinio ir paskirties sandėliai privalo skirtis diff --git a/htdocs/langs/lt_LT/install.lang b/htdocs/langs/lt_LT/install.lang index dfcbae629ff..a0d76667593 100644 --- a/htdocs/langs/lt_LT/install.lang +++ b/htdocs/langs/lt_LT/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=Naudojate Dolibarr vedlį iš Proxmox virtualaus prieta UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Fiksuoti pažeistus duomenis @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Update entity field value of llx_societe_remise MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except MigrationReloadModule=Perkrauti modulį %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Parodyti negalimas opcijas HideNotAvailableOptions=Paslėpti negalimas opcijas ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. diff --git a/htdocs/langs/lt_LT/languages.lang b/htdocs/langs/lt_LT/languages.lang index d28cfcef4ac..9bbf1f2671f 100644 --- a/htdocs/langs/lt_LT/languages.lang +++ b/htdocs/langs/lt_LT/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Ispanų (Paragvajus) Language_es_PE=Ispanų (Peru) Language_es_PR=Ispanų (Puerto Rikas) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Spanish (Venezuela) Language_et_EE=Estijos Language_eu_ES=Baskų diff --git a/htdocs/langs/lt_LT/mailmanspip.lang b/htdocs/langs/lt_LT/mailmanspip.lang index 2a46efcb2d7..5127f2e280a 100644 --- a/htdocs/langs/lt_LT/mailmanspip.lang +++ b/htdocs/langs/lt_LT/mailmanspip.lang @@ -3,8 +3,8 @@ MailmanSpipSetup=Paštininkas SPIP ir Nustatymų modulis MailmanTitle=Paštininko pašto sistemos sąrašas TestSubscribe=Bandyti prisijungimą prie Paštininko sąrašų TestUnSubscribe=Bandyti atsijungimą iš Paštininko sąrašų -MailmanCreationSuccess=Subscription test was executed successfully -MailmanDeletionSuccess=Unsubscription test was executed successfully +MailmanCreationSuccess=Prenumeratos testas buvo sėkmingai atliktas +MailmanDeletionSuccess=Atsisakymo testas buvo sėkmingai atliktas SynchroMailManEnabled=Paštininko atnaujinimas bus atliekamas SynchroSpipEnabled=SPIP atnaujinimas bus atliekamas DescADHERENT_MAILMAN_ADMINPW=Paštininko administratoriaus slaptažodis @@ -23,5 +23,5 @@ DeleteIntoSpip=Pašalinti iš SPIP DeleteIntoSpipConfirmation=Ar tikrai norite pašalinti šį narį iš SPIP ? DeleteIntoSpipError=Nepavyko sustabdyti vartotojo iš SPIP SPIPConnectionFailed=Nepavyko prisijungti prie SPIP -SuccessToAddToMailmanList=%s successfully added to mailman list %s or SPIP database -SuccessToRemoveToMailmanList=%s successfully removed from mailman list %s or SPIP database +SuccessToAddToMailmanList=%ssėkmingai įtraukta į paštininko sąrašą %s arba SPIP duomenų bazę +SuccessToRemoveToMailmanList=%ssėkmingai pašalinta iš paštininko sąrašo %s arba SPIP duomenų bazės diff --git a/htdocs/langs/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang index e8c882e9dd6..df98d246fa5 100644 --- a/htdocs/langs/lt_LT/main.lang +++ b/htdocs/langs/lt_LT/main.lang @@ -548,6 +548,18 @@ MonthShort09=Rgs MonthShort10=Spa MonthShort11=Lap MonthShort12=Grd +MonthVeryShort01=J +MonthVeryShort02=Pe +MonthVeryShort03=Pi +MonthVeryShort04=A +MonthVeryShort05=Pi +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=Se +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Prikabinti failus ir dokumentus JoinMainDoc=Join main document DateFormatYYYYMM=YYYY-MM @@ -762,7 +774,7 @@ SetBankAccount=Nustatykite banko sąskaitą AccountCurrency=Account currency ViewPrivateNote=Peržiūrėti pastabas XMoreLines=%s paslėptos eilutės -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=Viešas URL AddBox=Pridėti langelį SelectElementAndClick=Select an element and click %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=Visi +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/lt_LT/opensurvey.lang b/htdocs/langs/lt_LT/opensurvey.lang index 19cdd7f2f63..90fe3ff0c20 100644 --- a/htdocs/langs/lt_LT/opensurvey.lang +++ b/htdocs/langs/lt_LT/opensurvey.lang @@ -55,6 +55,6 @@ ErrorOpenSurveyFillFirstSection=Jūs neužpildėte apklausos kūrimo pirmos sekc ErrorOpenSurveyOneChoice=Įveskite bent vieną pasirinkimą ErrorInsertingComment=Įterpiant komentarą įvyko klaida MoreChoices=Įveskite daugiau pasirinkimų balsuotojams -SurveyExpiredInfo=The poll has been closed or voting delay has expired. +SurveyExpiredInfo=Apklausa uždaryta arba baigiasi balsavimo laikas. EmailSomeoneVoted=%s užpildė eilutę.\nJūs galite rasti savo apklausą:\n%s -ShowSurvey=Show survey +ShowSurvey=Rodyti apklausą diff --git a/htdocs/langs/lt_LT/other.lang b/htdocs/langs/lt_LT/other.lang index b156c0448ef..b6c21a8bf3f 100644 --- a/htdocs/langs/lt_LT/other.lang +++ b/htdocs/langs/lt_LT/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=If amount higher than %s SourcesRepository=Repository for sources Chart=Chart PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=Eksporto sritis diff --git a/htdocs/langs/lt_LT/products.lang b/htdocs/langs/lt_LT/products.lang index 7039bb92578..22670ec6e2f 100644 --- a/htdocs/langs/lt_LT/products.lang +++ b/htdocs/langs/lt_LT/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Dabartinė kaina AlwaysUseNewPrice=Visada naudokite dabartinę produkto/paslaugos kainą AlwaysUseFixedPrice=Naudokite fiksuotą kainą PriceByQuantity=Different prices by quantity +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Kiekio diapazonas MultipriceRules=Price segment rules UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/lt_LT/projects.lang b/htdocs/langs/lt_LT/projects.lang index 2eee8312609..bb050f158e2 100644 --- a/htdocs/langs/lt_LT/projects.lang +++ b/htdocs/langs/lt_LT/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=Laukiantis OppStatusWON=Won OppStatusLOST=Lost Budget=Budget +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/lt_LT/website.lang b/htdocs/langs/lt_LT/website.lang index bd82a94e2a6..e2cd790717f 100644 --- a/htdocs/langs/lt_LT/website.lang +++ b/htdocs/langs/lt_LT/website.lang @@ -3,15 +3,17 @@ Shortname=Kodas WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them. DeleteWebsite=Delete website ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Page name/alias -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL of external CSS file WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Media library EditCss=Edit Style/CSS or HTML header EditMenu=Edit menu @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang index 33f08bfc8a8..1c58af4f7b7 100644 --- a/htdocs/langs/lv_LV/accountancy.lang +++ b/htdocs/langs/lv_LV/accountancy.lang @@ -14,7 +14,7 @@ ThisService=Šis pakalpojums ThisProduct=Šis produkts DefaultForService=Default for service DefaultForProduct=Default for product -CantSuggest=Can't suggest +CantSuggest=Nevar ieteikt AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s ConfigAccountingExpert=Configuration of the module accounting expert Journalization=Journalization @@ -108,7 +108,7 @@ IntoAccount=Bind line with the accounting account Ventilate=Bind -LineId=Id line +LineId=Id līnija Processing=Apstrādā EndProcessing=Process terminated. SelectedLines=Selected lines @@ -158,7 +158,7 @@ NumPiece=Gabala numurs TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -183,7 +183,7 @@ CustomerInvoicePayment=Payment of invoice customer ThirdPartyAccount=Trešās personas konts NewAccountingMvt=Jauna transakcija NumMvts=Numero of transaction -ListeMvts=List of movements +ListeMvts=Pārvietošanas saraksts ErrorDebitCredit=Debit and Credit cannot have a value at the same time AddCompteFromBK=Add accounting accounts to the group ReportThirdParty=Trešo personu kontu saraksts @@ -191,9 +191,10 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=List of the accounting accounts UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error -Pcgtype=Group of account -Pcgsubtype=Subgroup of account +Pcgtype=Kontu grupa +Pcgsubtype=Konta apakšgrupa PcgtypeDesc=Group and subgroup of account are used as predefined 'filter' and 'grouping' criterias for some accounting reports. For example, 'INCOME' or 'EXPENSE' are used as groups for accounting accounts of products to build the expense/income report. TotalVente=Total turnover before tax @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal Modelcsv=Eksporta modulis -OptionsDeactivatedForThisExportModel=For this export model, options are deactivated Selectmodelcsv=Select a model of export Modelcsv_normal=Klasiskais eksports Modelcsv_CEGID=Export towards CEGID Expert Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution Modelcsv_quadratus=Export towards Quadratus QuadraCompta Modelcsv_ebp=Export towards EBP Modelcsv_cogilog=Export towards Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id @@ -284,7 +284,7 @@ SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries) ExportNotSupported=The export format setuped is not supported into this page BookeppingLineAlreayExists=Lines already existing into bookeeping -NoJournalDefined=No journal defined +NoJournalDefined=Nav definēts žurnāls Binded=Lines bound ToBind=Lines to bind UseMenuToSetBindindManualy=Autodection not possible, use menu %s to make the binding manually diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang index 5bcb547d430..33e0557888a 100644 --- a/htdocs/langs/lv_LV/admin.lang +++ b/htdocs/langs/lv_LV/admin.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - admin Foundation=Organizācija Version=Versija -Publisher=Publisher +Publisher=Izdevējs VersionProgram=Programmas versija VersionLastInstall=Sākotnējās instalētā versija VersionLastUpgrade=Jaunākās versijas jauninājums @@ -26,7 +26,7 @@ FileCheckDolibarr=Pārbaudīt aplikācijas failu veselumu AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from an official package XmlNotFound=Xml Integrity File of application not found SessionId=Sesijas ID -SessionSaveHandler=Handler, lai saglabātu sesijas +SessionSaveHandler=Pārdevējs, lai saglabātu sesijas SessionSavePath=Uzglabāšanas sesijas lokalizācija PurgeSessions=Iztīrīt sesijas ConfirmPurgeSessions=Vai jūs tiešām vēlaties iztīrītu visas sesijas? Tas atvienos katru lietotāju (izņemot sevi). @@ -190,7 +190,7 @@ EncodeBinariesInHexa=Šifrēt bināro datu heksadecimālo IgnoreDuplicateRecords=Ignorēt dubulto ierakstu kļūdas (INSERT IGNORE) AutoDetectLang=Automātiski noteikt (pārlūka valoda) FeatureDisabledInDemo=Iespēja bloķēta demo versijā -FeatureAvailableOnlyOnStable=Feature only available on official stable versions +FeatureAvailableOnlyOnStable=Funkcija ir pieejama tikai oficiālajā stabilā versijā BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it. OnlyActiveElementsAreShown=Tikai elementus no iespējotu moduļi tiek parādīts. ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application. @@ -201,22 +201,22 @@ ModulesDevelopYourModule=Develop your own app/modules ModulesDevelopDesc=You can develop or find a partner to develop for you, your personalised module DOLISTOREdescriptionLong=Instead of switching on www.dolistore.com web site to find an external module, you can use this embedded tool that will make the seach on the external market place for you (may be slow, need an internet access)... NewModule=Jauns -FreeModule=Free +FreeModule=Bezmaksas CompatibleUpTo=Compatible with version %s NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s - Max %s). CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s). SeeInMarkerPlace=See in Market place -Updated=Updated +Updated=Atjaunots Nouveauté=Novelty -AchatTelechargement=Buy / Download +AchatTelechargement=Pirkt / lejupielādēt GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at %s. DoliStoreDesc=DoliStore ir oficiālā mājaslapa Dolibarr ERP / CRM papildus moduļiem DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project) WebSiteDesc=Reference websites to find more modules... DevelopYourModuleDesc=Some solutions to develop your own module... URL=Saite -BoxesAvailable=Widgets available -BoxesActivated=Widgets activated +BoxesAvailable=Pieejami logrīki +BoxesActivated=Logrīki aktivizēti ActivateOn=Aktivizēt ActiveOn=Aktivizēts SourceFile=Avota fails @@ -241,14 +241,14 @@ OfficialDemo=Dolibarr tiešsaistes demo OfficialMarketPlace=Oficiālais tirgus vieta ārējiem moduļiem/papildinājumiem OfficialWebHostingService=Referenced web hosting services (Cloud hosting) ReferencedPreferredPartners=Preferred Partners -OtherResources=Other resources +OtherResources=Citi resursi ExternalResources=Ārējie resursi SocialNetworks=Sociālie tīkli ForDocumentationSeeWiki=Par lietotāju vai attīstītājs dokumentācijas (Doc, FAQ ...),
    ieskatieties uz Dolibarr Wiki:
    %s ForAnswersSeeForum=Attiecībā uz jebkuru citu jautājumu / palīdzēt, jūs varat izmantot Dolibarr forumu:
    %s HelpCenterDesc1=Šī sadaļa var palīdzēt jums, lai saņemtu palīdzības dienesta atbalstu Dolibarr programmai. HelpCenterDesc2=Daži no šo pakalpojumu daļa ir pieejama tikai angļu valodā. -CurrentMenuHandler=Pašreizējais izvēlne kopējs +CurrentMenuHandler=Pašreizējais izvēlnes apstrādātājs MeasuringUnit=Mērvienības LeftMargin=Left margin TopMargin=Top margin @@ -319,7 +319,7 @@ YouCanSubmitFile=For this step, you can submit the .zip file of module package h CurrentVersion=Dolibarr pašreizējā versija CallUpdatePage=Go to the page that updates the database structure and data: %s. LastStableVersion=Jaunākā stabilā versija -LastActivationDate=Latest activation date +LastActivationDate=Jaunākais aktivizācijas datums LastActivationAuthor=Latest activation author LastActivationIP=Latest activation IP UpdateServerOffline=Update server offline @@ -349,7 +349,7 @@ AddCRIfTooLong=Nav automātiska iesaiņošanas, tādēļ, ja līnija ir no lapas ConfirmPurge=Vai jūs tiešām vēlaties, lai izpildītu šo attīrīta?
    Tas izdzēsīs noteikti visus savus datu failus ar nekādi atjaunot to (ECM failus, pievienotos failus ...). MinLength=Minimālais garums LanguageFilesCachedIntoShmopSharedMemory=Faili .lang ielādēti kopējā atmiņā -LanguageFile=Language file +LanguageFile=Valodas fails ExamplesWithCurrentSetup=Piemēri ar pašreizējiem iestatījumiem ListOfDirectories=Saraksts OpenDocument veidnes katalogi 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 or .ods. @@ -408,7 +408,7 @@ ExtrafieldRadio=Radio pogas (tikai izvēlei) ExtrafieldCheckBox=Izvēles rūtiņas ExtrafieldCheckBoxFromList=Checkboxes from table ExtrafieldLink=Link to an object -ComputedFormula=Computed field +ComputedFormula=Aprēķinātais lauks ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: $db, $conf, $langs, $mysoc, $user, $object.
    WARNING: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.
    Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.

    Example of formula:
    $object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)

    Example to reload object
    (($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'

    Other example of formula to force load of object and its parent object:
    (($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found' ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')

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

    In order to have the list depending on another complementary attribute list :
    1,value1|options_parent_list_code:parent_key
    2,value2|options_parent_list_code:parent_key

    In order to have the list depending on another list :
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')

    for example :
    1,value1
    2,value2
    3,value3
    ... @@ -465,7 +465,7 @@ ProductDocumentTemplates=Document templates to generate product document FreeLegalTextOnExpenseReports=Free legal text on expense reports WatermarkOnDraftExpenseReports=Watermark on draft expense reports AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable) -FilesAttachedToEmail=Attach file +FilesAttachedToEmail=Pievienot failu SendEmailsReminders=Send agenda reminders by emails # Modules Module0Name=Lietotāji un grupas @@ -500,7 +500,7 @@ Module52Name=Krājumi Module52Desc=Krājumu pārvaldīšana (produkti) Module53Name=Pakalpojumi Module53Desc=Pakalpojumu vadība -Module54Name=Līgumi/Subscriptions +Module54Name=Līgumi / Abonementi Module54Desc=Management of contracts (services or reccuring subscriptions) Module55Name=Svītrkodi Module55Desc=Svītrkodu vadība @@ -513,7 +513,7 @@ Module58Desc=Integrācija ar ClickToDial sistēmas (zvaigznīte, ...) Module59Name=Bookmark4u Module59Desc=Pievienot funkciju, lai radītu Bookmark4u kontu no Dolibarr konta Module70Name=Iejaukšanās -Module70Desc=Intervences pārvaldība +Module70Desc=Intervences vadība Module75Name=Izdevumi un ceļojumu piezīmes Module75Desc=Izdevumi un ceļojumu piezīmju vadība Module80Name=Sūtījumi @@ -533,13 +533,13 @@ Module240Desc=Tool to export Dolibarr data (with assistants) Module250Name=Datu imports Module250Desc=Tool to import data in Dolibarr (with assistants) Module310Name=Dalībnieki -Module310Desc=Fonds biedri vadība +Module310Desc=Fonda biedru vadība Module320Name=RSS barotne Module320Desc=Pievienot RSS plūsmu Dolibarr lapās Module330Name=Grāmatzīmes Module330Desc=Grāmatzīmju vadība Module400Name=Projekti/Iespējas/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. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Vebkalendārs Module410Desc=Web kalendāra integrācija Module500Name=Special expenses @@ -548,7 +548,7 @@ Module510Name=Payment of employee wages Module510Desc=Record and follow payment of your employee wages Module520Name=Loan Module520Desc=Management of loans -Module600Name=Notifications on business events +Module600Name=Paziņojumi par biznesa pasākumiem Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), to third-party contacts (setup defined on each third party) or to fixed emails Module600Long=Note that this module is dedicated to send real time emails when a dedicated business event occurs. If you are looking for a feature to send reminders by email of your agenda events, go into setup of module Agenda. Module700Name=Ziedojumi @@ -557,7 +557,7 @@ Module770Name=Expense reports Module770Desc=Management and claim expense reports (transportation, meal, ...) Module1120Name=Supplier commercial proposal Module1120Desc=Request supplier commercial proposal and prices -Module1200Name=Dievlūdzējs +Module1200Name=Mantis Module1200Desc=Mantis integrācija Module1520Name=Document Generation Module1520Desc=Mass mail document generation @@ -567,7 +567,7 @@ Module2000Name=WYSIWYG redaktors Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor) Module2200Name=Dinamiskas cenas Module2200Desc=Enable the usage of math expressions for prices -Module2300Name=Scheduled jobs +Module2300Name=Plānotie darbi Module2300Desc=Scheduled jobs management (alias cron or chrono table) Module2400Name=Pasākumi / darba kārtība Module2400Desc=Sekojiet notikušiem un gaidāmiem notikumiem. Ļaujiet programmai reģistrēt automātiskus notikumus izsekošanas nolūkos vai ierakstiet manuāli notikumus vai sarunas. @@ -683,7 +683,7 @@ Permission126=Eksportēt trešās puses Permission141=Read all projects and tasks (also private projects i am not contact for) Permission142=Create/modify all projects and tasks (also private projects i am not contact for) Permission144=Delete all projects and tasks (also private projects i am not contact for) -Permission146=Lasīt sniedzējiem +Permission146=Lasīt pakalpojumu sniedzējus Permission147=Lasīt statistiku Permission151=Read direct debit payment orders Permission152=Create/modify a direct debit payment orders @@ -776,7 +776,7 @@ Permission404=Dzēst atlaides Permission501=Read employee contracts/salaries Permission502=Create/modify employee contracts/salaries Permission511=Read payment of salaries -Permission512=Create/modify payment of salaries +Permission512=Izveidojiet / labojiet algu izmaksu Permission514=Dzēst algas Permission517=Eksportēt algas Permission520=Read Loans @@ -890,7 +890,7 @@ DictionaryStaff=Personāls DictionaryAvailability=Piegādes kavēšanās DictionaryOrderMethods=Pasūtījumu veidi DictionarySource=Origin of proposals/orders -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Models for chart of accounts DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=E-pastu paraugi @@ -904,6 +904,7 @@ SetupSaved=Iestatījumi saglabāti SetupNotSaved=Iestatīšana nav saglabāta BackToModuleList=Atpakaļ uz moduļu sarakstu BackToDictionaryList=Atpakaļ uz vārdnīcu sarakstu +TypeOfRevenueStamp=Type of revenue stamp VATManagement=PVN Vadība VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is VAT=0. End of rule. VATIsNotUsedDesc=Pēc noklusējuma piedāvātais PVN ir 0, ko var izmantot gadījumos, piemēram, asociācijās, idnividuālie komersanti. @@ -1046,11 +1047,11 @@ SystemInfoDesc=Sistēmas informācija ir dažādi tehniskā informācija jums ti SystemAreaForAdminOnly=Šī joma ir pieejama administratora lietotājiem. Neviens no Dolibarr atļauju var samazināt šo robežu. CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page) DisplayDesc=Jūs varat izvēlēties katru parametru, kas saistīts ar Dolibarr izskatu un justies šeit -AvailableModules=Available app/modules +AvailableModules=Pieejamās progrmma / moduļi ToActivateModule=Lai aktivizētu moduļus, dodieties uz iestatīšanas zonas (Home->Setup->Moduļi). SessionTimeOut=Sesijas pārtraukums SessionExplanation=Šis numurs garantiju, ka sesija nekad beidzas pirms šī kavēšanās, ja sesija tīrītājs tiek darīts ar Iekšējā PHP sesijas tīrāku (un nekas cits). Iekšējā PHP sesijas tīrītājs nav garantija, ka sesija beigsies tikai pēc šīs kavēšanās. Tas beigsies, pēc šī kavēšanās, un, kad sesija tīrītājs ir ilga, tāpēc ik %s / %s piekļuves, bet tikai laikā piekļūt dokumentiem, ko citās sēdēs.
    Piezīme: par dažiem ar ārēju sesijas tīrīšanas mehānisma (cron zem Debian, Ubuntu ...) serveriem, sesijas var tikt iznīcināti pēc posmā, kas noteikts pēc noklusējuma session.gc_maxlifetime, vienalga kāds vērtību ieraksta šeit. -TriggersAvailable=Pieejamie slēdži +TriggersAvailable=Pieejamie aktivizētāji TriggersDesc=Palaide ir faili, kas mainīs uz Dolibarr darbplūsmas uzvedību, kad nokopēto uz direktoriju htdocs / core / izraisa. Viņi saprata, jaunas darbības, aktivizēta Dolibarr notikumiem (jauns uzņēmums radīšana, rēķinu apstiprināšanu, ...). TriggerDisabledByName=Trigeri Šajā failā ir invalīdi ar-NORUN piedēkli savu vārdu. TriggerDisabledAsModuleDisabled=Trigeri Šajā failā ir invalīdi, kā modulis %s ir atspējots. @@ -1083,7 +1084,7 @@ RestoreDesc2=Atjaunot dokumentu direktorijas arhīva failu (piemēram zip fails) RestoreDesc3=Atjaunot datus no rezerves kopijas faila, datu bāzē jaunā Dolibarr instalācijā vai datu bāzē pašreizējajai instalācijai (%s). Brīdinājums, kad atjaunošana ir pabeigta, jums ir jāizmanto lietotāja vārds / parole, kas bija tad, kad tika veikta rezerves kopija, lai pieslēgtos atkal. Lai atjaunotu rezerves kopiju datubāzei esošajā instalācijā, jūs varat sekot šim palīgam. RestoreMySQL=MySQL imports ForcedToByAModule= Šis noteikums ir spiests %s ar aktivēto modulis -PreviousDumpFiles=Generated database backup files +PreviousDumpFiles=Izveidotie datubāzes rezerves kopijas faili WeekStartOnDay=Pirmā nedēļas diena RunningUpdateProcessMayBeRequired=Running jaunināšanas procesu, šķiet, ir nepieciešams (Programmas versija %s atšķiras no bāzes versijas %s) YouMustRunCommandFromCommandLineAfterLoginToUser=Jums ir palaist šo komandu no komandrindas pēc pieteikšanās uz apvalks ar lietotāju %s, vai jums ir pievienot-W iespēju beigās komandrindas, lai sniegtu %s paroli. @@ -1094,11 +1095,11 @@ ShowProfIdInAddress=Rādīt professionnal id ar adresēm par dokumentu ShowVATIntaInAddress=Slēpt PVN maksātāja numuru un adreses uz dokumentiem TranslationUncomplete=Daļējs tulkojums MAIN_DISABLE_METEO=Atslēgt Meteo skatu -MeteoStdMod=Standard mode +MeteoStdMod=Standarta režīms MeteoStdModEnabled=Standard mode enabled MeteoPercentageMod=Percentage mode MeteoPercentageModEnabled=Percentage mode enabled -MeteoUseMod=Click to use %s +MeteoUseMod=Noklikšķiniet, lai izmantotu %s TestLoginToAPI=Tests pieteikties API ProxyDesc=Dažas Dolibarr funkcijas ir nepieciešama piekļuve internetam, lai strādātu. Noteikt šeit parametrus par to. Ja Dolibarr serveris ir aiz proxy serveri, šie parametri stāsta Dolibarr, kā piekļūt internetam, izmantojot to. ExternalAccess=Ārējā piekļuve @@ -1510,7 +1511,7 @@ TreeMenuPersonalized=Personalizētas izvēlnes NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry NewMenu=Jauna izvēlne Menu=Izvēlnes izvēlēšanās -MenuHandler=Izvēlne kopējs +MenuHandler=Izvēlnes apstrādātājs MenuModule=Avota modulis HideUnauthorizedMenu= Slēpt neatļautās izvēlnes (pelēkas) DetailId=Id izvēlne @@ -1532,7 +1533,7 @@ ConfirmDeleteMenu=Are you sure you want to delete menu entry %s? FailedToInitializeMenu=Failed to initialize menu ##### Tax ##### TaxSetup=Taxes, social or fiscal taxes and dividends module setup -OptionVatMode=Maksājamais PVN +OptionVatMode=PVN jāmaksā OptionVATDefault=Cash basis OptionVATDebitOption=Accrual basis OptionVatDefaultDesc=PVN ir jāmaksā:
    - Piegādes laikā precēm (mēs izmantojam rēķina datumu)
    - Par maksājumiem par pakalpojumiem @@ -1547,7 +1548,7 @@ Buy=Pirkt Sell=Pārdot InvoiceDateUsed=Rēķina izmantotais datums YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Organisation), so there is no VAT options to setup. -AccountancyCode=Accounting Code +AccountancyCode=Grāmatvedības kods AccountancyCodeSell=Tirdzniecība kontu. kods AccountancyCodeBuy=Iegādes konta. kods ##### Agenda ##### @@ -1658,7 +1659,7 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules ExpenseReportNumberingModules=Expense reports numbering module 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". -ListOfNotificationsPerUser=List of notifications per user* +ListOfNotificationsPerUser=Paziņojumu saraksts katram lietotājam * ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact** ListOfFixedNotifications=List of fixed notifications GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users @@ -1695,7 +1696,7 @@ OpportunityPercent=When you create an opportunity, you will defined an estimated TemplateForElement=This template record is dedicated to which element TypeOfTemplate=Type of template TemplateIsVisibleByOwnerOnly=Template is visible by owner only -VisibleEverywhere=Visible everywhere +VisibleEverywhere=Redzams visur VisibleNowhere=Visible nowhere FixTZ=Laika zonas labojums FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced) @@ -1711,11 +1712,11 @@ MailToSendSupplierRequestForQuotation=To send quotation request to supplier MailToSendSupplierOrder=To send supplier order MailToSendSupplierInvoice=To send supplier invoice MailToSendContract=To send a contract -MailToThirdparty=To send email from third party page +MailToThirdparty=Sūtīt e-pastu no trešās puses lapas MailToMember=To send email from member page MailToUser=To send email from user page ByDefaultInList=Show by default on list view -YouUseLastStableVersion=You use the latest stable version +YouUseLastStableVersion=Jūs izmantojat pēdējo stabilo versiju TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites) TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites) ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read ChangeLog for complete list of changes. @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/lv_LV/agenda.lang b/htdocs/langs/lv_LV/agenda.lang index 1c4d9a3ba1b..b364c186059 100644 --- a/htdocs/langs/lv_LV/agenda.lang +++ b/htdocs/langs/lv_LV/agenda.lang @@ -12,7 +12,7 @@ Event=Notikums Events=Notikumi EventsNb=Notikumu skaits ListOfActions=Notikumu saraksts -EventReports=Event reports +EventReports=Pasākumu atskaites Location=Atrašanās vieta ToUserOfGroup=To any user in group EventOnFullDay=Notikums visu -ām dienu -ām diff --git a/htdocs/langs/lv_LV/banks.lang b/htdocs/langs/lv_LV/banks.lang index 9f41fb3f675..2dad43b332d 100644 --- a/htdocs/langs/lv_LV/banks.lang +++ b/htdocs/langs/lv_LV/banks.lang @@ -67,7 +67,7 @@ RemoveFromRubrique=Noņemt saiti ar sadaļu RemoveFromRubriqueConfirm=Vai esat pārliecināts, ka vēlaties noņemt saiti starp darījumu un kategoriju? ListBankTransactions=List of bank entries IdTransaction=Darījuma ID -BankTransactions=Bank entries +BankTransactions=Bankas ieraksti BankTransaction=Bankas darījums ListTransactions=List entries ListTransactionsByCategory=List entries/category @@ -89,6 +89,7 @@ AccountIdShort=Numurs LineRecord=Darījums AddBankRecord=Pievienot ierakstu AddBankRecordLong=Pievienot ierakstu manuāli +Conciliated=Reconciled ConciliatedBy=Jāsaskaņo ar DateConciliating=Izvērtējiet datumu BankLineConciliated=Entry reconciled diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang index 2096e3aea32..e0c93128e74 100644 --- a/htdocs/langs/lv_LV/bills.lang +++ b/htdocs/langs/lv_LV/bills.lang @@ -11,7 +11,9 @@ BillsSuppliersUnpaidForCompany=Neapmaksātie piegādātāja -u rēķini %s BillsLate=Kavētie maksājumi BillsStatistics=Klientu rēķinu statistika BillsStatisticsSuppliers=Piegādātāju rēķinu statistika -DisabledBecauseNotErasable=Bloķēts, jo nevar izdzēst +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. +DisabledBecauseNotErasable=Bloķēts, jo nedrīkst dzēst InvoiceStandard=Standarta rēķins InvoiceStandardAsk=Standarta rēķins InvoiceStandardDesc=Šis rēķins veids ir kopīgs rēķins. @@ -60,7 +62,7 @@ PaymentBack=Maksājumu atpakaļ CustomerInvoicePaymentBack=Maksājumu atpakaļ Payments=Maksājumi PaymentsBack=Maksājumi atpakaļ -paymentInInvoiceCurrency=in invoices currency +paymentInInvoiceCurrency=rēķinu valūtā PaidBack=Atmaksāts atpakaļ DeletePayment=Izdzēst maksājumu ConfirmDeletePayment=Vai tiešām vēlaties dzēst šo maksājumu? @@ -113,12 +115,12 @@ EnterPaymentDueToCustomer=Veikt maksājumu dēļ klientam DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero PriceBase=Bāzes cena BillStatus=Rēķina statuss -StatusOfGeneratedInvoices=Status of generated invoices +StatusOfGeneratedInvoices=Izveidoto rēķinu statuss BillStatusDraft=Melnraksts (jāapstiprina) BillStatusPaid=Apmaksāts BillStatusPaidBackOrConverted=Credit note refund or converted into discount BillStatusConverted=Apmaksātais (gatavas pēdējo rēķinu) -BillStatusCanceled=Pamests +BillStatusCanceled=Pamesti BillStatusValidated=Apstiprināts (jāapmaksā) BillStatusStarted=Sākts BillStatusNotPaid=Nav samaksāts @@ -129,7 +131,7 @@ BillShortStatusDraft=Melnraksts BillShortStatusPaid=Apmaksāts BillShortStatusPaidBackOrConverted=Refund or converted BillShortStatusConverted=Apmaksāts -BillShortStatusCanceled=Pamests +BillShortStatusCanceled=Pamesti BillShortStatusValidated=Pārbaudīts BillShortStatusStarted=Sākts BillShortStatusNotPaid=Nav samaksāts @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Kāpēc jūs vēlaties, lai klasificētu šo rēķinu ConfirmClassifyPaidPartially=Vai esat pārliecināts, ka vēlaties mainīt rēķina %s, statusu uz samaksāts? ConfirmClassifyPaidPartiallyQuestion=Šis rēķins nav samaksāts pilnībā. Kādi ir iemesli, lai aizvērtu šo rēķinu? ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=Slikts klients @@ -368,7 +371,7 @@ PaymentConditionShortPT_5050=50-50 PaymentConditionPT_5050=50%% priekšapmaksa, 50%% piegādes laikā PaymentConditionShort10D=10 dienas PaymentCondition10D=10 dienas -PaymentConditionShort10DENDMONTH=10 days of month-end +PaymentConditionShort10DENDMONTH=10 dienas mēneša beigas PaymentCondition10DENDMONTH=Within 10 days following the end of the month PaymentConditionShort14D=14 dienas PaymentCondition14D=14 dienas @@ -409,7 +412,7 @@ ExtraInfos=Papildu info RegulatedOn=Regulēta uz ChequeNumber=Pārbaudiet N ° ChequeOrTransferNumber=Pārbaudiet / Transfer N ° -ChequeBordereau=Check schedule +ChequeBordereau=Pārbaudīt grafiku ChequeMaker=Check/Transfer transmitter ChequeBank=Čeka izsniegšanas banka CheckBank=Check diff --git a/htdocs/langs/lv_LV/boxes.lang b/htdocs/langs/lv_LV/boxes.lang index 88351fefa9d..77f8ce739b5 100644 --- a/htdocs/langs/lv_LV/boxes.lang +++ b/htdocs/langs/lv_LV/boxes.lang @@ -1,11 +1,11 @@ # Dolibarr language file - Source file is en_US - boxes -BoxLoginInformation=Login information +BoxLoginInformation=Pieteikšanās informācija BoxLastRssInfos=RSS informācija BoxLastProducts=Pēdējie %s produkti/pakalpojumi BoxProductsAlertStock=Produktu krājumu brīdinājums BoxLastProductsInContract=Pēdējie %s darījumi produktiem/servisiem BoxLastSupplierBills=Latest supplier invoices -BoxLastCustomerBills=Latest customer invoices +BoxLastCustomerBills=Pēdējie klientu rēķini BoxOldestUnpaidCustomerBills=Oldest unpaid customer invoices BoxOldestUnpaidSupplierBills=Oldest unpaid supplier invoices BoxLastProposals=Latest commercial proposals @@ -82,5 +82,5 @@ ForCustomersInvoices=Klientu rēķini ForCustomersOrders=Klientu pasūtījumi ForProposals=Priekšlikumi LastXMonthRolling=The latest %s month rolling -ChooseBoxToAdd=Add widget to your dashboard -BoxAdded=Widget was added in your dashboard +ChooseBoxToAdd=Pievienojiet logrīku savam informācijas panelim +BoxAdded=Jūsu vadības panelī ir pievienots logrīks diff --git a/htdocs/langs/lv_LV/categories.lang b/htdocs/langs/lv_LV/categories.lang index fbdd6259519..20d6b736367 100644 --- a/htdocs/langs/lv_LV/categories.lang +++ b/htdocs/langs/lv_LV/categories.lang @@ -44,7 +44,7 @@ NotCategorized=Without tag/category CategoryExistsAtSameLevel=Šī sadaļa jau pastāv ar šo ref ContentsVisibleByAllShort=Saturs redzams visiem ContentsNotVisibleByAllShort=Saturu visi neredz -DeleteCategory=Delete tag/category +DeleteCategory=Dzēst atzīmi / sadaļu ConfirmDeleteCategory=Are you sure you want to delete this tag/category? NoCategoriesDefined=No tag/category defined SuppliersCategoryShort=Suppliers tag/category diff --git a/htdocs/langs/lv_LV/companies.lang b/htdocs/langs/lv_LV/companies.lang index c7cd0be41fe..c2a9d8ef8f6 100644 --- a/htdocs/langs/lv_LV/companies.lang +++ b/htdocs/langs/lv_LV/companies.lang @@ -29,7 +29,7 @@ AliasNameShort=Alias name Companies=Uzņēmumi CountryIsInEEC=Valsts ir Eiropas Ekonomikas kopienas dalībvalsts ThirdPartyName=Trešās puses nosaukums -ThirdPartyEmail=Third party email +ThirdPartyEmail=Trešās puses e-pasts ThirdParty=Trešā puse ThirdParties=Trešās personas ThirdPartyProspects=Perspektīvas diff --git a/htdocs/langs/lv_LV/compta.lang b/htdocs/langs/lv_LV/compta.lang index 83a9e448d72..4e433c294be 100644 --- a/htdocs/langs/lv_LV/compta.lang +++ b/htdocs/langs/lv_LV/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Maksājumi, kas nav saistīti ar kādu rēķinu, tāp PaymentsNotLinkedToUser=Maksājumi, kas nav saistīti ar jebkuru lietotāju Profit=Peļņa AccountingResult=Accounting result +BalanceBefore=Balance (before) Balance=Bilance Debit=Debets Credit=Kredīts @@ -31,9 +32,9 @@ Piece=Accounting Doc. AmountHTVATRealReceived=Neto iekasēto AmountHTVATRealPaid=Neto samaksāts VATToPay=PVN pārdod -VATReceived=Tax received +VATReceived=Saņemti nodokļi VATToCollect=Tax purchases -VATSummary=Tax Balance +VATSummary=Nodokļu bilance VATPaid=Samaksātie nodokļi LT1Summary=Tax 2 summary LT2Summary=Tax 3 summary @@ -73,7 +74,7 @@ MenuTaxAndDividends=Nodokļi un dividendes MenuSocialContributions=Social/fiscal taxes MenuNewSocialContribution=New social/fiscal tax NewSocialContribution=New social/fiscal tax -AddSocialContribution=Add social/fiscal tax +AddSocialContribution=Pievienot sociālo / fiskālo nodokli ContributionsToPay=Social/fiscal taxes to pay AccountancyTreasuryArea=Grāmatvedība / kase laukums NewPayment=Jauns maksājums @@ -101,14 +102,14 @@ LT2PaymentES=IRPF Maksājumu LT2PaymentsES=IRPF Maksājumi VATPayment=Sales tax payment VATPayments=Sales tax payments -VATRefund=Sales tax refund +VATRefund=PVN atmaksa Refund=Atmaksa SocialContributionsPayments=Social/fiscal taxes payments ShowVatPayment=Rādīt PVN maksājumu TotalToPay=Summa BalanceVisibilityDependsOnSortAndFilters=Balance is visible in this list only if table is sorted ascending on %s and filtered for 1 bank account -CustomerAccountancyCode=Customer accounting code -SupplierAccountancyCode=Supplier accounting code +CustomerAccountancyCode=Klienta grāmatvedības kods +SupplierAccountancyCode=Piegādātāja grāmatvedības kods CustomerAccountancyCodeShort=Cust. account. code SupplierAccountancyCodeShort=Sup. account. code AccountNumber=Konta numurs diff --git a/htdocs/langs/lv_LV/dict.lang b/htdocs/langs/lv_LV/dict.lang index d0234ca7e9b..0112a62171f 100644 --- a/htdocs/langs/lv_LV/dict.lang +++ b/htdocs/langs/lv_LV/dict.lang @@ -240,7 +240,7 @@ CountryEH=Rietumsahāra CountryYE=Jemena CountryZM=Zambija CountryZW=Zimbabve -CountryGG=Guernsey +CountryGG=Gērnsija CountryIM=Menas sala CountryJE=Džērsija CountryME=Melnkalne diff --git a/htdocs/langs/lv_LV/donations.lang b/htdocs/langs/lv_LV/donations.lang index 47543915e19..39a74a2b356 100644 --- a/htdocs/langs/lv_LV/donations.lang +++ b/htdocs/langs/lv_LV/donations.lang @@ -31,3 +31,4 @@ 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 +DonationValidated=Donation %s validated diff --git a/htdocs/langs/lv_LV/ecm.lang b/htdocs/langs/lv_LV/ecm.lang index 1afa1896616..0865a0becfb 100644 --- a/htdocs/langs/lv_LV/ecm.lang +++ b/htdocs/langs/lv_LV/ecm.lang @@ -47,4 +47,4 @@ ReSyncListOfDir=Resync list of directories HashOfFileContent=Hash of file content FileNotYetIndexedInDatabase=File not yet indexed into database (try to re-upload it) FileSharedViaALink=File shared via a link -NoDirectoriesFound=No directories found +NoDirectoriesFound=Nav atrastas direktorijas diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang index 708ee9150ef..6f378752f3b 100644 --- a/htdocs/langs/lv_LV/errors.lang +++ b/htdocs/langs/lv_LV/errors.lang @@ -104,7 +104,7 @@ ErrorForbidden2=Atļaujas šajā lapā var definēt Dolibarr administrators no i ErrorForbidden3=Šķiet, ka Dolibarr netiek izmantota, izmantojot autentiskums sesiju. Ieskatieties Dolibarr uzstādīšanas dokumentācijas zināt, kā pārvaldīt apstiprinājumi (Htaccess, mod_auth vai citu ...). ErrorNoImagickReadimage=Klases Imagick nav atrodams šajā PHP. Priekšskatījums nav, var būt pieejamas. Administratori var atspējot šo uzlīmi no izvēlnes Setup - displejs. ErrorRecordAlreadyExists=Ieraksts jau eksistē -ErrorLabelAlreadyExists=This label already exists +ErrorLabelAlreadyExists=Šis nosaukums jau pastāv ErrorCantReadFile=Neizdevās nolasīt failu '%s' ErrorCantReadDir=Neizdevās nolasīt katalogu '%s' ErrorBadLoginPassword=Nepareiza vērtība lietotājvārdam vai parolei @@ -156,6 +156,7 @@ ErrorPriceExpression20=Empty expression ErrorPriceExpression21=Nav rezultāta '%s' ErrorPriceExpression22=Negatīvs rezultāts '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Iekšēja kļūda '%s' ErrorPriceExpressionUnknown=Nezināma kļūda '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs @@ -194,7 +195,7 @@ ErrorTaskAlreadyAssigned=Task already assigned to user ErrorModuleFileSeemsToHaveAWrongFormat=The module package seems to have a wrong format. ErrorFilenameDosNotMatchDolibarrPackageRules=The name of the module package (%s) does not match expected name syntax: %s ErrorDuplicateTrigger=Error, duplicate trigger name %s. Already loaded from %s. -ErrorNoWarehouseDefined=Error, no warehouses defined. +ErrorNoWarehouseDefined=Kļūda, noliktavas nav definētas. ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid. ErrorTooManyErrorsProcessStopped=Too many errors. Process was stopped. ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Mass validation is not possible when option to increase/decrease stock is set on this action (you must validate one by one so you can define the warehouse to increase/decrease) diff --git a/htdocs/langs/lv_LV/exports.lang b/htdocs/langs/lv_LV/exports.lang index d10838ac5ae..fd40a128e1c 100644 --- a/htdocs/langs/lv_LV/exports.lang +++ b/htdocs/langs/lv_LV/exports.lang @@ -120,7 +120,7 @@ SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for UpdateNotYetSupportedForThisImport=Update is not supported for this type of import (only insert) NoUpdateAttempt=No update attempt was performed, only insert ImportDataset_user_1=Users (employees or not) and properties -ComputedField=Computed field +ComputedField=Aprēķinātais lauks ## filters SelectFilterFields=Ja jūs vēlaties filtrēt dažas vērtības, vienkārši ievadi vērtības šeit. FilteredFields=Filtrētie lauki diff --git a/htdocs/langs/lv_LV/install.lang b/htdocs/langs/lv_LV/install.lang index e672c5719f4..58420856577 100644 --- a/htdocs/langs/lv_LV/install.lang +++ b/htdocs/langs/lv_LV/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=Jūs izmantojat Dolibarr iestatīšanas vedni no Proxmo UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Noteikt, denormalized datiem @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Update entity field value of llx_societe_remise MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except MigrationReloadModule=Reload module %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Rādīt nepieejamās iespējas HideNotAvailableOptions=Slēpt nepieejamās iespējas ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. diff --git a/htdocs/langs/lv_LV/languages.lang b/htdocs/langs/lv_LV/languages.lang index 747c27fff98..92a06d4465a 100644 --- a/htdocs/langs/lv_LV/languages.lang +++ b/htdocs/langs/lv_LV/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spāņu (Panama) Language_es_PY=Spāņu (Paragvaja) Language_es_PE=Spāņu (Peru) Language_es_PR=Spāņu (Puertoriko) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Spāņu (Venecuēla) Language_et_EE=Igauņu Language_eu_ES=Basku diff --git a/htdocs/langs/lv_LV/loan.lang b/htdocs/langs/lv_LV/loan.lang index 56e07af099c..652665b682d 100644 --- a/htdocs/langs/lv_LV/loan.lang +++ b/htdocs/langs/lv_LV/loan.lang @@ -22,7 +22,7 @@ LoanCalc=Bank Loans Calculator PurchaseFinanceInfo=Purchase & Financing Information SalePriceOfAsset=Sale Price of Asset PercentageDown=Percentage Down -LengthOfMortgage=Duration of loan +LengthOfMortgage=Aizdevuma ilgums AnnualInterestRate=Annual Interest Rate ExplainCalculations=Explain Calculations ShowMeCalculationsAndAmortization=Show me the calculations and amortization @@ -42,7 +42,7 @@ MonthlyPayment=Monthly Payment LoanCalcDesc=This mortgage calculator can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.
    This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.
    GoToInterest=%s will go towards INTEREST GoToPrincipal=%s will go towards PRINCIPAL -YouWillSpend=You will spend %s in year %s +YouWillSpend=Jūs iztērēsiet %s gadā %s ListLoanAssociatedProject=List of loan associated with the project AddLoan=Create loan # Admin diff --git a/htdocs/langs/lv_LV/mails.lang b/htdocs/langs/lv_LV/mails.lang index 3eb97867ec0..256a4f5b60b 100644 --- a/htdocs/langs/lv_LV/mails.lang +++ b/htdocs/langs/lv_LV/mails.lang @@ -83,9 +83,9 @@ MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters MailingModuleDescContactsByCompanyCategory=Contacts by third party category MailingModuleDescContactsByCategory=Contacts by categories MailingModuleDescContactsByFunction=Contacts by position -MailingModuleDescEmailsFromFile=Emails from file +MailingModuleDescEmailsFromFile=E-pasti no faila MailingModuleDescEmailsFromUser=Emails input by user -MailingModuleDescDolibarrUsers=Users with Emails +MailingModuleDescDolibarrUsers=Lietotāji ar e-pastu MailingModuleDescThirdPartiesByCategories=Third parties (by categories) # Libelle des modules de liste de destinataires mailing @@ -150,7 +150,7 @@ RemoveAll=Dzēst visu ItemsCount=Vienība(-s) AdvTgtNameTemplate=Filtra nosaukums AdvTgtAddContact=Add emails according to criterias -AdvTgtLoadFilter=Load filter +AdvTgtLoadFilter=Ielādēt filtru AdvTgtDeleteFilter=Dzēst filtru AdvTgtSaveFilter=Saglabāt filtru AdvTgtCreateFilter=Izveidot filtru diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang index 396bdfe1142..6bd4976798b 100644 --- a/htdocs/langs/lv_LV/main.lang +++ b/htdocs/langs/lv_LV/main.lang @@ -76,7 +76,7 @@ FileRenamed=The file was successfully renamed FileGenerated=The file was successfully generated FileSaved=The file was successfully saved FileUploaded=The file was successfully uploaded -FileTransferComplete=File(s) was uploaded successfully +FileTransferComplete=Fails(i) tika augšupielādēts veiksmīgi FilesDeleted=File(s) successfully deleted FileWasNotUploaded=Fails ir izvēlēts pielikumam, bet vēl nav augšupielādēti. Noklikšķiniet uz "Pievienot failu", lai to pievienotu. NbOfEntries=Ierakstu sk @@ -125,7 +125,7 @@ Home=Mājās Help=Palīdzība OnlineHelp=Tiešsaistes palīdzība PageWiki=Wiki lapa -MediaBrowser=Media browser +MediaBrowser=Multivides pārlūks Always=Vienmēr Never=Nekad Under=saskaņā ar @@ -160,7 +160,7 @@ Edit=Rediģēt Validate=Pārbaudīt ValidateAndApprove=Validate and Approve ToValidate=Jāpārbauda -NotValidated=Not validated +NotValidated=Nav apstiprināts Save=Saglabāt SaveAs=Saglabāt kā TestConnection=Savienojuma pārbaude @@ -201,7 +201,7 @@ Parameter=Parametrs Parameters=Parametri Value=Vērtība PersonalValue=Personīgā vērtība -NewObject=New %s +NewObject=Jauns %s NewValue=Jaunā vērtība CurrentValue=Pašreizējā vērtība Code=Kods @@ -263,9 +263,9 @@ DateBuild=Ziņojuma veidošanas datums DatePayment=Maksājuma datums DateApprove=Approving date DateApprove2=Approving date (second approval) -RegistrationDate=Registration date -UserCreation=Creation user -UserModification=Modification user +RegistrationDate=Reģistrācijas datums +UserCreation=Izveidošanas lietotājs +UserModification=Labošanas lietotājs UserValidation=Validation user UserCreationShort=Izveidot lietotāju UserModificationShort=Labot lietotāju @@ -323,7 +323,7 @@ Copy=Kopēt Paste=Ielīmēt Default=Noklusējums DefaultValue=Noklusējuma vērtība -DefaultValues=Default values +DefaultValues=Noklusējuma vērtības Price=Cena UnitPrice=Vienības cena UnitPriceHT=Vienības cena (neto) @@ -374,7 +374,7 @@ TotalLT1IN=Total CGST TotalLT2IN=Total SGST HT=Bez PVN TTC=Ar PVN -INCVATONLY=Inc. VAT +INCVATONLY=ar PVN INCT=Inc. all taxes VAT=PVN VATIN=IGST @@ -548,6 +548,18 @@ MonthShort09=Sep MonthShort10=Okt MonthShort11=Nov MonthShort12=Dec +MonthVeryShort01=J +MonthVeryShort02=P +MonthVeryShort03=P +MonthVeryShort04=A +MonthVeryShort05=P +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=Sv +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Pievienotie faili un dokumenti JoinMainDoc=Join main document DateFormatYYYYMM=MM.YYYY @@ -602,7 +614,7 @@ Undo=Atcelt Redo=Atcelt ExpandAll=Izvērst visu UndoExpandAll=Paplašināt -SeeAll=See all +SeeAll=Apskatīt visu Reason=Iemesls FeatureNotYetSupported=Funkcija netiek atbalstīta CloseWindow=Aizvērt logu @@ -683,7 +695,7 @@ FreeLineOfType=Not a predefined entry of type CloneMainAttributes=Klonēt objektu ar tā galvenajiem atribūtiem PDFMerge=Apvienot PDF Merge=Apvienot -DocumentModelStandardPDF=Standard PDF template +DocumentModelStandardPDF=Standarta PDF veidne PrintContentArea=Rādīt lapu drukāt galveno satura jomā MenuManager=Izvēlnes iestatīšana WarningYouAreInMaintenanceMode=Uzmanību, jūs esat uzturēšanas režīmā, t.i. tikai pieteikšanās %s ir atļauts lietot programmu. @@ -762,7 +774,7 @@ SetBankAccount=Definēt bankas kontu AccountCurrency=Account currency ViewPrivateNote=Apskatīt piezīmes XMoreLines=%s līnija(as) slēptas -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=Publiskā saite AddBox=Pievienot info logu SelectElementAndClick=Select an element and click %s @@ -781,7 +793,7 @@ Genderwoman=Sieviete ViewList=List view Mandatory=Mandatory Hello=Hello -GoodBye=GoodBye +GoodBye=Uz redzēšanos Sincerely=Sincerely DeleteLine=Delete line ConfirmDeleteLine=Vai Jūs tiešām vēlaties izdzēst šo līniju? @@ -791,12 +803,12 @@ NoRecordSelected=No record selected MassFilesArea=Area for files built by mass actions ShowTempMassFilesArea=Show area of files built by mass actions ConfirmMassDeletion=Bulk delete confirmation -ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record ? +ConfirmMassDeletionQuestion=Vai tiešām vēlaties dzēst izvēlēto ierakstu %s? RelatedObjects=Saistītie objekti ClassifyBilled=Klasificēt apmaksāts Progress=Progress ClickHere=Noklikšķiniet šeit -FrontOffice=Front office +FrontOffice=birojs BackOffice=Back office View=Izskats Export=Eksportēt @@ -808,12 +820,12 @@ Miscellaneous=Dažādi Calendar=Kalendārs GroupBy=Kārtot pēc... ViewFlatList=View flat list -RemoveString=Remove string '%s' +RemoveString=Noņemt virkni '%s' SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to https://transifex.com/projects/p/dolibarr/. DirectDownloadLink=Tiešā lejupielādes saite (publiska / ārēja) DirectDownloadInternalLink=Direct download link (need to be logged and need permissions) Download=Lejupielādēt -DownloadDocument=Download document +DownloadDocument=Lejupielādēt dokumentu ActualizeCurrency=Atjaunināt valūtas kursu Fiscalyear=Fiskālais gads ModuleBuilder=Module Builder @@ -821,13 +833,13 @@ SetMultiCurrencyCode=Iestatīt valūtu BulkActions=Bulk actions ClickToShowHelp=Click to show tooltip help WebSite=Mājas lapa -WebSites=Web sites -WebSiteAccounts=Web site accounts +WebSites=Tīmekļa vietnes +WebSiteAccounts=Vietnes konti ExpenseReport=Expense report ExpenseReports=Izdevumu atskaites HR=HR HRAndBank=HR and Bank -AutomaticallyCalculated=Automatically calculated +AutomaticallyCalculated=Automātiski aprēķināts TitleSetToDraft=Atgriezties uz melnrakstu ConfirmSetToDraft=Are you sure you want to go back to Draft status ? ImportId=Import id @@ -895,8 +907,10 @@ SearchIntoCustomerShipments=Klientu sūtījumi SearchIntoExpenseReports=Izdevumu atskaites SearchIntoLeaves=Leaves CommentLink=Komentāri -NbComments=Number of comments +NbComments=Komentāru skaits CommentPage=Comments space -CommentAdded=Comment added -CommentDeleted=Comment deleted +CommentAdded=Komentārs pievienots +CommentDeleted=Komentārs dzēsts Everybody=Visi +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/lv_LV/modulebuilder.lang b/htdocs/langs/lv_LV/modulebuilder.lang index 1af681324ac..8fbcf227df7 100644 --- a/htdocs/langs/lv_LV/modulebuilder.lang +++ b/htdocs/langs/lv_LV/modulebuilder.lang @@ -6,7 +6,7 @@ ModuleBuilderDesc2=Path where modules are generated/edited (first alternative di ModuleBuilderDesc3=Generated/editable modules found: %s ModuleBuilderDesc4=A module is detected as 'editable' when the file %s exists in root of module directory NewModule=Jauns modulis -NewObject=New object +NewObject=Jauns objekts ModuleKey=Module key ObjectKey=Object key ModuleInitialized=Modulis inicializēts @@ -49,17 +49,17 @@ ConfirmDeleteProperty=Are you sure you want to delete the property %s     on the top right menu AddLanguageFile=Add language file YouCanUseTranslationKey=You can use here a key that is the translation key found into language file (see tab "Languages") DropTableIfEmpty=(Delete table if empty) -TableDoesNotExists=The table %s does not exists -TableDropped=Table %s deleted +TableDoesNotExists=Tabula %s nepastāv +TableDropped=Tabula %s dzēsta diff --git a/htdocs/langs/lv_LV/multicurrency.lang b/htdocs/langs/lv_LV/multicurrency.lang index 7c6c9edb3ed..563a180c762 100644 --- a/htdocs/langs/lv_LV/multicurrency.lang +++ b/htdocs/langs/lv_LV/multicurrency.lang @@ -10,7 +10,7 @@ CurrencyLayerAccount=CurrencyLayer API CurrencyLayerAccount_help_to_synchronize=You sould create an account on their website to use this functionnality
    Get your API key
    If you use a free account you can't change the currency source (USD by default)
    But if your main currency isn't USD you can use the alternate currency source to force you main currency

    You are limited at 1000 synchronizations per month multicurrency_appId=API atslēga multicurrency_appCurrencySource=Valūtas avots -multicurrency_alternateCurrencySource=Alternate currency source +multicurrency_alternateCurrencySource=Alternatīvs valūtas avots CurrenciesUsed=Izmantotās valūtas CurrenciesUsed_help_to_add=Add the differents currencies and rates you need to use on you proposals, orders, etc. rate=likme diff --git a/htdocs/langs/lv_LV/oauth.lang b/htdocs/langs/lv_LV/oauth.lang index cafca379f6f..b67aac6cba1 100644 --- a/htdocs/langs/lv_LV/oauth.lang +++ b/htdocs/langs/lv_LV/oauth.lang @@ -14,7 +14,7 @@ DeleteAccess=Click here to delete token UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider: ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication. OAuthSetupForLogin=Page to generate an OAuth token -SeePreviousTab=See previous tab +SeePreviousTab=Skatīt iepriekšējo cilni OAuthIDSecret=OAuth ID and Secret TOKEN_REFRESH=Token Refresh Present TOKEN_EXPIRED=Token expired diff --git a/htdocs/langs/lv_LV/orders.lang b/htdocs/langs/lv_LV/orders.lang index f944bf574cd..ae19bc254ea 100644 --- a/htdocs/langs/lv_LV/orders.lang +++ b/htdocs/langs/lv_LV/orders.lang @@ -20,7 +20,7 @@ CustomerOrder=Klienta rīkojums CustomersOrders=Klienta pasūtījumi CustomersOrdersRunning=Current customer orders CustomersOrdersAndOrdersLines=Customer orders and order lines -OrdersDeliveredToBill=Customer orders delivered to bill +OrdersDeliveredToBill=Klienta pasūtījumi piegādāti rēķinam OrdersToBill=Customer orders delivered OrdersInProcess=Klientu pasūtījumi apstrādē OrdersToProcess=Klientu pasūtījumi, kas jāapstrādā diff --git a/htdocs/langs/lv_LV/other.lang b/htdocs/langs/lv_LV/other.lang index f00d75ff2c5..5625fe22c78 100644 --- a/htdocs/langs/lv_LV/other.lang +++ b/htdocs/langs/lv_LV/other.lang @@ -24,7 +24,7 @@ MessageOK=Ziņu kopā ar apstiprinātu maksājuma atgriešanās lapā MessageKO=Ziņa par atcelto maksājumu atgriešanās lapā YearOfInvoice=Rēķina datums -PreviousYearOfInvoice=Previous year of invoice date +PreviousYearOfInvoice=Iepriekšējā rēķina datuma gads NextYearOfInvoice=Following year of invoice date DateNextInvoiceBeforeGen=Date of next invoice (before generation) DateNextInvoiceAfterGen=Date of next invoice (after generation) @@ -225,6 +225,8 @@ IfAmountHigherThan=If amount higher than %s SourcesRepository=Repository for sources Chart=Diagramma PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=Eksportēšanas sadaļa diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang index a95e1a122c9..7152dbd616f 100644 --- a/htdocs/langs/lv_LV/products.lang +++ b/htdocs/langs/lv_LV/products.lang @@ -65,8 +65,8 @@ SellingPriceHT=Pārdošanas cena (bez PVN) SellingPriceTTC=Pārdošanas cena (ar PVN) CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost. CostPriceUsage=This value could be used for margin calculation. -SoldAmount=Sold amount -PurchasedAmount=Purchased amount +SoldAmount=Pārdošanas apjoms +PurchasedAmount=Iegādātā summa NewPrice=Jaunā cena MinPrice=Min. pārdošanas cena CantBeLessThanMinPrice=Pārdošanas cena nevar būt zemāka par minimālo pieļaujamo šī produkta (%s bez PVN). Šis ziņojums var būt arī parādās, ja esat ievadījis pārāk lielu atlaidi. @@ -99,14 +99,14 @@ AssociatedProductsAbility=Activate the feature to manage virtual products AssociatedProducts=Virtuāls produkts AssociatedProductsNumber=Produktu skaits kas veido šo virtuālo produktu ParentProductsNumber=Number of parent packaging product -ParentProducts=Parent products +ParentProducts=Mātes produkti IfZeroItIsNotAVirtualProduct=Ja 0, šis produkts ir ne virtuālā produkts IfZeroItIsNotUsedByVirtualProduct=Ja 0, šis produkts netiek izmantots ar jebkuru virtuālo produkta KeywordFilter=Atslēgvārda filtru CategoryFilter=Sadaļu filtrs ProductToAddSearch=Meklēt produktu, lai pievienotu NoMatchFound=Nekas netika atrasts -ListOfProductsServices=List of products/services +ListOfProductsServices=Produktu / pakalpojumu saraksts ProductAssociationList=List of products/services that are component of this virtual product/package ProductParentList=Saraksts virtuālo produktu / pakalpojumu ar šo produktu kā sastāvdaļu ErrorAssociationIsFatherOfThis=Viens no izvēlētā produkta mātes ar pašreizējo produktu @@ -196,6 +196,7 @@ CurrentProductPrice=Pašreizējā cena AlwaysUseNewPrice=Vienmēr izmantot pašreizējo cenu produktam / pakalpojumam AlwaysUseFixedPrice=Izmantot fiksētu cenu PriceByQuantity=Different prices by quantity +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Daudzuma diapazons MultipriceRules=Price segment rules UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment @@ -203,7 +204,7 @@ PercentVariationOver=%% variation over %s PercentDiscountOver=%% discount over %s KeepEmptyForAutoCalculation=Keep empty to have this calculated automatically from weight or volume of products VariantRefExample=Example: COL -VariantLabelExample=Example: Color +VariantLabelExample=Piemērs: Krāsa ### composition fabrication Build=Ražot ProductsMultiPrice=Products and prices for each price segment @@ -263,7 +264,7 @@ 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 for request is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data", "to": "send"}} UpdateInterval=Atjaunošanās intervāls (minūtes) -LastUpdated=Latest update +LastUpdated=Pēdējo reizi atjaunots CorrectlyUpdated=Correctly updated PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is PropalMergePdfProductChooseFile=Izvēlieties PDF failus @@ -299,15 +300,15 @@ ProductAttributeDeleteDialog=Are you sure you want to delete this attribute? All ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with reference "%s" of this attribute? ProductCombinationDeleteDialog=Are you sure want to delete the variant of the product "%s"? ProductCombinationAlreadyUsed=There was an error while deleting the variant. Please check it is not being used in any object -ProductCombinations=Variants +ProductCombinations=Varianti PropagateVariant=Propagate variants HideProductCombinations=Hide products variant in the products selector ProductCombination=Variants -NewProductCombination=New variant -EditProductCombination=Editing variant -NewProductCombinations=New variants -EditProductCombinations=Editing variants -SelectCombination=Select combination +NewProductCombination=Jauns variants +EditProductCombination=Rediģēšanas variants +NewProductCombinations=Jauni varianti +EditProductCombinations=Rediģēšanas varianti +SelectCombination=Izvēlieties kombināciju ProductCombinationGenerator=Variants generator Features=Iespējas PriceImpact=Price impact @@ -321,8 +322,8 @@ DoNotRemovePreviousCombinations=Do not remove previous variants UsePercentageVariations=Use percentage variations PercentageVariation=Percentage variation ErrorDeletingGeneratedProducts=There was an error while trying to delete existing product variants -NbOfDifferentValues=Nb of different values -NbProducts=Nb. of products +NbOfDifferentValues=Sk dažādu vērtību +NbProducts=Produktu sk. ParentProduct=Parent product HideChildProducts=Hide variant products ConfirmCloneProductCombinations=Would you like to copy all the product variants to the other parent product with the given reference? diff --git a/htdocs/langs/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang index 7a0402e321e..8ca77ad154e 100644 --- a/htdocs/langs/lv_LV/projects.lang +++ b/htdocs/langs/lv_LV/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=Pending OppStatusWON=Won OppStatusLOST=Lost Budget=Budžets +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/lv_LV/sendings.lang b/htdocs/langs/lv_LV/sendings.lang index cd8da5f98a5..d8fb165b1c2 100644 --- a/htdocs/langs/lv_LV/sendings.lang +++ b/htdocs/langs/lv_LV/sendings.lang @@ -22,7 +22,7 @@ QtyShippedShort=Qty ship. QtyPreparedOrShipped=Sagatavotais vai nosūtītais daudzums QtyToShip=Daudzums, kas jānosūta QtyReceived=Saņemtais daudzums -QtyInOtherShipments=Qty in other shipments +QtyInOtherShipments=Daudz. citi sūtījumi KeepToShip=Vēl jāpiegādā KeepToShipShort=Remain OtherSendingsForSameOrder=Citas sūtījumiem uz šo rīkojumu diff --git a/htdocs/langs/lv_LV/stocks.lang b/htdocs/langs/lv_LV/stocks.lang index 838e3175007..724129c2406 100644 --- a/htdocs/langs/lv_LV/stocks.lang +++ b/htdocs/langs/lv_LV/stocks.lang @@ -16,13 +16,13 @@ DeleteSending=Dzēst nosūtot Stock=Krājums Stocks=Krājumi StocksByLotSerial=Stocks by lot/serial -LotSerial=Lots/Serials -LotSerialList=List of lot/serials +LotSerial=Daudz / sērijas nr +LotSerialList=Partijas saraksts / sērijas nr Movements=Kustības ErrorWarehouseRefRequired=Noliktava nosaukums ir obligāts ListOfWarehouses=Saraksts noliktavās ListOfStockMovements=Krājumu pārvietošanas saraksts -MovementId=Movement ID +MovementId=Pārvietošanas ID StockMovementForId=Movement ID %d ListMouvementStockProject=List of stock movements associated to project StocksArea=Noliktavas platība @@ -134,7 +134,7 @@ MovementLabel=Label of movement DateMovement=Date of movement InventoryCode=Movement or inventory code IsInPackage=Contained into package -WarehouseAllowNegativeTransfer=Stock can be negative +WarehouseAllowNegativeTransfer=Krājumi var būt negatīvi qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse and your setup does not allow negative stocks. ShowWarehouse=Rādīt noliktavu MovementCorrectStock=Stock correction for product %s @@ -142,7 +142,7 @@ MovementTransferStock=Stock transfer of product %s into another warehouse InventoryCodeShort=Inv./Mov. code NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order ThisSerialAlreadyExistWithDifferentDate=This lot/serial number (%s) already exists but with different eatby or sellby date (found %s but you enter %s). -OpenAll=Open for all actions +OpenAll=Atvērt visām darbībām OpenInternal=Open only for internal actions UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on supplier order reception OptionMULTIPRICESIsOn=Option "several prices per segment" is on. It means a product has several selling price so value for sell can't be calculated diff --git a/htdocs/langs/lv_LV/supplier_proposal.lang b/htdocs/langs/lv_LV/supplier_proposal.lang index 41a730589fa..31aecb739f7 100644 --- a/htdocs/langs/lv_LV/supplier_proposal.lang +++ b/htdocs/langs/lv_LV/supplier_proposal.lang @@ -7,7 +7,7 @@ CommRequests=Cenas pieprasījumi SearchRequest=Atrast pieprasījumu DraftRequests=Pieprasījuma melnraksts SupplierProposalsDraft=Draft supplier proposals -LastModifiedRequests=Latest %s modified price requests +LastModifiedRequests=Pēdējie %s labotie cenu pieprasījumi RequestsOpened=Atvērt cenas pieprasījumu SupplierProposalArea=Supplier proposals area SupplierProposalShort=Supplier proposal diff --git a/htdocs/langs/lv_LV/trips.lang b/htdocs/langs/lv_LV/trips.lang index e48e082f2a4..37b2bf29474 100644 --- a/htdocs/langs/lv_LV/trips.lang +++ b/htdocs/langs/lv_LV/trips.lang @@ -54,19 +54,19 @@ EX_FUE=Fuel CV EX_HOT=Viesnīca EX_PAR=Parking CV EX_TOL=Toll CV -EX_TAX=Various Taxes +EX_TAX=Dažādi nodokļi EX_IND=Indemnity transportation subscription EX_SUM=Maintenance supply EX_SUO=Office supplies -EX_CAR=Car rental -EX_DOC=Documentation +EX_CAR=Autonoma +EX_DOC=Dokumentācija EX_CUR=Customers receiving EX_OTR=Other receiving EX_POS=Postage EX_CAM=CV maintenance and repair EX_EMM=Employees meal EX_GUM=Guests meal -EX_BRE=Breakfast +EX_BRE=Brokastis EX_FUE_VP=Fuel PV EX_TOL_VP=Toll PV EX_PAR_VP=Parking PV @@ -100,7 +100,7 @@ ValidatedWaitingApproval=Validated (waiting for approval) NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. ConfirmRefuseTrip=Vai jūs tiešām vēlaties bloķēt šo izdevumu pārskatu? ValideTrip=Approve expense report -ConfirmValideTrip=Are you sure you want to approve this expense report? +ConfirmValideTrip=Vai tiešām vēlaties apstiprināt šo izdevumu atskaiti? PaidTrip=Pay an expense report ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid"? ConfirmCancelTrip=Are you sure you want to cancel this expense report? @@ -122,7 +122,7 @@ expenseReportOffset=Kompensācija expenseReportCoef=Coefficient expenseReportTotalForFive=Example with d = 5 expenseReportRangeFromTo=from %d to %d -expenseReportRangeMoreThan=more than %d +expenseReportRangeMoreThan=vairāk nekā %d expenseReportCoefUndefined=(value not defined) expenseReportCatDisabled=Category disabled - see the c_exp_tax_cat dictionary expenseReportRangeDisabled=Range disabled - see the c_exp_tax_range dictionay @@ -137,7 +137,7 @@ ExpenseReportRestrictive=Restrictive AllExpenseReport=All type of expense report OnExpense=Expense line ExpenseReportRuleSave=Expense report rule saved -ExpenseReportRuleErrorOnSave=Error: %s +ExpenseReportRuleErrorOnSave=Kļūda: %s RangeNum=Range %d ExpenseReportConstraintViolationError=Constraint violation id [%s]: %s is superior to %s %s diff --git a/htdocs/langs/lv_LV/website.lang b/htdocs/langs/lv_LV/website.lang index 95687378160..9485987fc03 100644 --- a/htdocs/langs/lv_LV/website.lang +++ b/htdocs/langs/lv_LV/website.lang @@ -3,57 +3,64 @@ Shortname=Kods WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them. DeleteWebsite=Dzēst mājaslapu ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Lapas nosaukums / pseidonīms -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL of external CSS file WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) -WEBSITE_HTACCESS=Web site .htaccess file +WEBSITE_HTACCESS=Tīmekļa vietne .htaccess fails +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. -MediaFiles=Media library +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. +MediaFiles=Mediju bibliotēka EditCss=Edit Style/CSS or HTML header EditMenu=Labot izvēlni -EditMedias=Edit medias +EditMedias=Rediģēt medijus EditPageMeta=Edit Meta -AddWebsite=Add website +AddWebsite=Pievienot vietni Webpage=Web page/container AddPage=Pievienot lapu / konteineru -HomePage=Home Page +HomePage=Mājas lapa PageContainer=Page/container PreviewOfSiteNotYetAvailable=Jūsu tīmekļa vietnes priekšskatījums %svēl nav pieejams. Vispirms jāpievieno lapa. RequestedPageHasNoContentYet=Requested page with id %s has no content yet, or cache file .tpl.php was removed. Edit content of the page to solve this. PageContent=Page/Contenair PageDeleted=Page/Contenair '%s' of website %s deleted PageAdded=Page/Contenair '%s' added -ViewSiteInNewTab=View site in new tab -ViewPageInNewTab=View page in new tab -SetAsHomePage=Set as Home page +ViewSiteInNewTab=Skatīt vietni jaunā cilnē +ViewPageInNewTab=Skatīt lapu jaunā cilnē +SetAsHomePage=Iestatīt kā mājas lapu RealURL=Reāls URL ViewWebsiteInProduction=View web site using home URLs SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on %s
    then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server. PreviewSiteServedByWebServer=Preview %s in a new tab.

    The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory:
    %s
    URL served by external server:
    %s PreviewSiteServedByDolibarr=Preview %s in a new tab.

    The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.
    The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr.
    URL served by Dolibarr:
    %s

    To use your own external web server to serve this web site, create a virtual host on your web server that point on directory
    %s
    then enter the name of this virtual server and click on the other preview button. VirtualHostUrlNotDefined=URL of the virtual host served by external web server not defined -NoPageYet=No pages yet +NoPageYet=Vēl nav nevienas lapas SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container -CloneSite=Clone site -SiteAdded=Web site added +CloneSite=Klonēt vietni +SiteAdded=Pievienota vietne ConfirmClonePage=Please enter code/alias of new page and if it is a translation of the cloned page. PageIsANewTranslation=The new page is a translation of the current page ? LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The language of the new page must be different than language of source page. ParentPageId=Parent page ID -WebsiteId=Website ID +WebsiteId=Vietnes ID CreateByFetchingExternalPage=Create page/container by fetching page from external URL... OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site -IDOfPage=Id of page -WebsiteAccount=Web site account -WebsiteAccounts=Web site accounts +IDOfPage=Lapas ID +Banner=Bandeau +BlogPost=Blog post +WebsiteAccount=Vietnes konts +WebsiteAccounts=Vietnes konti AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/lv_LV/withdrawals.lang b/htdocs/langs/lv_LV/withdrawals.lang index 53b1dd6ef9b..45776cfb891 100644 --- a/htdocs/langs/lv_LV/withdrawals.lang +++ b/htdocs/langs/lv_LV/withdrawals.lang @@ -76,7 +76,7 @@ WithdrawalFile=Izstāšanās fails SetToStatusSent=Nomainīt uz statusu "Fails nosūtīts" ThisWillAlsoAddPaymentOnInvoice=This will also record payments to invoices and will classify them as "Paid" if remain to pay is null StatisticsByLineStatus=Statistics by status of lines -RUM=UMR +RUM=RUM RUMLong=Unique Mandate Reference RUMWillBeGenerated=UMR number will be generated once bank account information are saved WithdrawMode=Direct debit mode (FRST or RECUR) @@ -97,7 +97,7 @@ ModeRECUR=Atkārtotais maksājums ModeFRST=One-off payment PleaseCheckOne=Lūdzu izvēlaties tikai vienu DirectDebitOrderCreated=Direct debit order %s created -AmountRequested=Amount requested +AmountRequested=Pieprasītais daudzums ### Notifications InfoCreditSubject=Payment of direct debit payment order %s by the bank diff --git a/htdocs/langs/lv_LV/workflow.lang b/htdocs/langs/lv_LV/workflow.lang index b313eadc4a3..a419d4729e6 100644 --- a/htdocs/langs/lv_LV/workflow.lang +++ b/htdocs/langs/lv_LV/workflow.lang @@ -16,5 +16,5 @@ descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer ord # Autoclassify supplier order descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals) descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders) -AutomaticCreation=Automatic creation +AutomaticCreation=Automātiska veidošana AutomaticClassification=Automātiskā klasifikācija diff --git a/htdocs/langs/mk_MK/accountancy.lang b/htdocs/langs/mk_MK/accountancy.lang index 9dbf911a820..c4189507f60 100644 --- a/htdocs/langs/mk_MK/accountancy.lang +++ b/htdocs/langs/mk_MK/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Piece number TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=List of the accounting accounts UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal 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 Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution Modelcsv_quadratus=Export towards Quadratus QuadraCompta Modelcsv_ebp=Export towards EBP Modelcsv_cogilog=Export towards Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang index 8e1cb04867b..d020a9a085e 100644 --- a/htdocs/langs/mk_MK/admin.lang +++ b/htdocs/langs/mk_MK/admin.lang @@ -539,7 +539,7 @@ Module320Desc=Add RSS feed inside Dolibarr screen pages Module330Name=Bookmarks Module330Desc=Bookmarks management Module400Name=Projects/Opportunities/Leads -Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar integration Module500Name=Special expenses @@ -890,7 +890,7 @@ DictionaryStaff=Staff DictionaryAvailability=Delivery delay DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Models for chart of accounts DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=Emails templates @@ -904,6 +904,7 @@ SetupSaved=Setup saved SetupNotSaved=Setup not saved BackToModuleList=Back to modules list BackToDictionaryList=Back to dictionaries list +TypeOfRevenueStamp=Type of revenue stamp VATManagement=VAT Management VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is 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. @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/mk_MK/banks.lang b/htdocs/langs/mk_MK/banks.lang index 40b76f8c64c..be8f75d172b 100644 --- a/htdocs/langs/mk_MK/banks.lang +++ b/htdocs/langs/mk_MK/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Number LineRecord=Transaction AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Reconciled ConciliatedBy=Reconciled by DateConciliating=Reconcile date BankLineConciliated=Entry reconciled diff --git a/htdocs/langs/mk_MK/bills.lang b/htdocs/langs/mk_MK/bills.lang index b865c00be9d..eeafc56bf1c 100644 --- a/htdocs/langs/mk_MK/bills.lang +++ b/htdocs/langs/mk_MK/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s BillsLate=Late payments BillsStatistics=Customers invoices statistics BillsStatisticsSuppliers=Suppliers invoices statistics +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Disabled because cannot be erased InvoiceStandard=Standard invoice InvoiceStandardAsk=Standard invoice @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer diff --git a/htdocs/langs/mk_MK/compta.lang b/htdocs/langs/mk_MK/compta.lang index 4082b9fa9b7..df4942cf234 100644 --- a/htdocs/langs/mk_MK/compta.lang +++ b/htdocs/langs/mk_MK/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to PaymentsNotLinkedToUser=Payments not linked to any user Profit=Profit AccountingResult=Accounting result +BalanceBefore=Balance (before) Balance=Balance Debit=Debit Credit=Credit diff --git a/htdocs/langs/mk_MK/donations.lang b/htdocs/langs/mk_MK/donations.lang index f4578fa9fc3..5edc8d62033 100644 --- a/htdocs/langs/mk_MK/donations.lang +++ b/htdocs/langs/mk_MK/donations.lang @@ -31,3 +31,4 @@ 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 +DonationValidated=Donation %s validated diff --git a/htdocs/langs/mk_MK/errors.lang b/htdocs/langs/mk_MK/errors.lang index b02b70c9c9f..cff89a71d98 100644 --- a/htdocs/langs/mk_MK/errors.lang +++ b/htdocs/langs/mk_MK/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Empty expression ErrorPriceExpression21=Empty result '%s' ErrorPriceExpression22=Negative result '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs diff --git a/htdocs/langs/mk_MK/install.lang b/htdocs/langs/mk_MK/install.lang index 7a93fd20799..e602c54640c 100644 --- a/htdocs/langs/mk_MK/install.lang +++ b/htdocs/langs/mk_MK/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtua UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Fix for denormalized data @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Update entity field value of llx_societe_remise MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except MigrationReloadModule=Reload module %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Show not available options HideNotAvailableOptions=Hide not available options ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. diff --git a/htdocs/langs/mk_MK/languages.lang b/htdocs/langs/mk_MK/languages.lang index 2af36a21699..df6945fb5eb 100644 --- a/htdocs/langs/mk_MK/languages.lang +++ b/htdocs/langs/mk_MK/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Шпански (Парагвај) Language_es_PE=Шпански (Перу) Language_es_PR=Шпански (Порто Рико) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Spanish (Venezuela) Language_et_EE=Естонскиот Language_eu_ES=Баскиската diff --git a/htdocs/langs/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang index 6053f1aa646..fb35714c63b 100644 --- a/htdocs/langs/mk_MK/main.lang +++ b/htdocs/langs/mk_MK/main.lang @@ -548,6 +548,18 @@ MonthShort09=Sep MonthShort10=Oct MonthShort11=Nov MonthShort12=Dec +MonthVeryShort01=J +MonthVeryShort02=F +MonthVeryShort03=M +MonthVeryShort04=A +MonthVeryShort05=M +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=S +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Attached files and documents JoinMainDoc=Join main document DateFormatYYYYMM=YYYY-MM @@ -762,7 +774,7 @@ SetBankAccount=Define Bank Account AccountCurrency=Account currency ViewPrivateNote=View notes XMoreLines=%s line(s) hidden -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=Public URL AddBox=Add box SelectElementAndClick=Select an element and click %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=Everybody +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/mk_MK/other.lang b/htdocs/langs/mk_MK/other.lang index 0d9d1cfbd85..1a5314a24d9 100644 --- a/htdocs/langs/mk_MK/other.lang +++ b/htdocs/langs/mk_MK/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=If amount higher than %s SourcesRepository=Repository for sources Chart=Chart PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=Exports area diff --git a/htdocs/langs/mk_MK/products.lang b/htdocs/langs/mk_MK/products.lang index 43c74c9b877..53835bd7f06 100644 --- a/htdocs/langs/mk_MK/products.lang +++ b/htdocs/langs/mk_MK/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Current price AlwaysUseNewPrice=Always use current price of product/service AlwaysUseFixedPrice=Use the fixed price PriceByQuantity=Different prices by quantity +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Quantity range MultipriceRules=Price segment rules UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/mk_MK/projects.lang b/htdocs/langs/mk_MK/projects.lang index f33a950acff..c69302deecb 100644 --- a/htdocs/langs/mk_MK/projects.lang +++ b/htdocs/langs/mk_MK/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=Pending OppStatusWON=Won OppStatusLOST=Lost Budget=Budget +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/mk_MK/website.lang b/htdocs/langs/mk_MK/website.lang index 3902febbfb7..6b4e2ada84a 100644 --- a/htdocs/langs/mk_MK/website.lang +++ b/htdocs/langs/mk_MK/website.lang @@ -3,15 +3,17 @@ Shortname=Code WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them. DeleteWebsite=Delete website ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Page name/alias -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL of external CSS file WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Media library EditCss=Edit Style/CSS or HTML header EditMenu=Edit menu @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/mn_MN/accountancy.lang b/htdocs/langs/mn_MN/accountancy.lang index 9dbf911a820..c4189507f60 100644 --- a/htdocs/langs/mn_MN/accountancy.lang +++ b/htdocs/langs/mn_MN/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Piece number TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=List of the accounting accounts UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal 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 Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution Modelcsv_quadratus=Export towards Quadratus QuadraCompta Modelcsv_ebp=Export towards EBP Modelcsv_cogilog=Export towards Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id diff --git a/htdocs/langs/mn_MN/admin.lang b/htdocs/langs/mn_MN/admin.lang index 4f3d25c4eb1..9dce46ab295 100644 --- a/htdocs/langs/mn_MN/admin.lang +++ b/htdocs/langs/mn_MN/admin.lang @@ -539,7 +539,7 @@ Module320Desc=Add RSS feed inside Dolibarr screen pages Module330Name=Bookmarks Module330Desc=Bookmarks management Module400Name=Projects/Opportunities/Leads -Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar integration Module500Name=Special expenses @@ -890,7 +890,7 @@ DictionaryStaff=Staff DictionaryAvailability=Delivery delay DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Models for chart of accounts DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=Emails templates @@ -904,6 +904,7 @@ SetupSaved=Setup saved SetupNotSaved=Setup not saved BackToModuleList=Back to modules list BackToDictionaryList=Back to dictionaries list +TypeOfRevenueStamp=Type of revenue stamp VATManagement=VAT Management VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is 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. @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/mn_MN/banks.lang b/htdocs/langs/mn_MN/banks.lang index 40b76f8c64c..be8f75d172b 100644 --- a/htdocs/langs/mn_MN/banks.lang +++ b/htdocs/langs/mn_MN/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Number LineRecord=Transaction AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Reconciled ConciliatedBy=Reconciled by DateConciliating=Reconcile date BankLineConciliated=Entry reconciled diff --git a/htdocs/langs/mn_MN/bills.lang b/htdocs/langs/mn_MN/bills.lang index b865c00be9d..eeafc56bf1c 100644 --- a/htdocs/langs/mn_MN/bills.lang +++ b/htdocs/langs/mn_MN/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s BillsLate=Late payments BillsStatistics=Customers invoices statistics BillsStatisticsSuppliers=Suppliers invoices statistics +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Disabled because cannot be erased InvoiceStandard=Standard invoice InvoiceStandardAsk=Standard invoice @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer diff --git a/htdocs/langs/mn_MN/compta.lang b/htdocs/langs/mn_MN/compta.lang index 4082b9fa9b7..df4942cf234 100644 --- a/htdocs/langs/mn_MN/compta.lang +++ b/htdocs/langs/mn_MN/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to PaymentsNotLinkedToUser=Payments not linked to any user Profit=Profit AccountingResult=Accounting result +BalanceBefore=Balance (before) Balance=Balance Debit=Debit Credit=Credit diff --git a/htdocs/langs/mn_MN/donations.lang b/htdocs/langs/mn_MN/donations.lang index f4578fa9fc3..5edc8d62033 100644 --- a/htdocs/langs/mn_MN/donations.lang +++ b/htdocs/langs/mn_MN/donations.lang @@ -31,3 +31,4 @@ 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 +DonationValidated=Donation %s validated diff --git a/htdocs/langs/mn_MN/errors.lang b/htdocs/langs/mn_MN/errors.lang index b02b70c9c9f..cff89a71d98 100644 --- a/htdocs/langs/mn_MN/errors.lang +++ b/htdocs/langs/mn_MN/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Empty expression ErrorPriceExpression21=Empty result '%s' ErrorPriceExpression22=Negative result '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs diff --git a/htdocs/langs/mn_MN/install.lang b/htdocs/langs/mn_MN/install.lang index 7a93fd20799..e602c54640c 100644 --- a/htdocs/langs/mn_MN/install.lang +++ b/htdocs/langs/mn_MN/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtua UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Fix for denormalized data @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Update entity field value of llx_societe_remise MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except MigrationReloadModule=Reload module %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Show not available options HideNotAvailableOptions=Hide not available options ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. diff --git a/htdocs/langs/mn_MN/languages.lang b/htdocs/langs/mn_MN/languages.lang index 05288a888eb..a062883d667 100644 --- a/htdocs/langs/mn_MN/languages.lang +++ b/htdocs/langs/mn_MN/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Spanish (Paraguay) Language_es_PE=Spanish (Peru) Language_es_PR=Spanish (Puerto Rico) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Spanish (Venezuela) Language_et_EE=Estonian Language_eu_ES=Basque diff --git a/htdocs/langs/mn_MN/main.lang b/htdocs/langs/mn_MN/main.lang index 1bf46c12402..be3c8169bda 100644 --- a/htdocs/langs/mn_MN/main.lang +++ b/htdocs/langs/mn_MN/main.lang @@ -548,6 +548,18 @@ MonthShort09=Sep MonthShort10=Oct MonthShort11=Nov MonthShort12=Dec +MonthVeryShort01=J +MonthVeryShort02=F +MonthVeryShort03=M +MonthVeryShort04=A +MonthVeryShort05=M +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=S +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Attached files and documents JoinMainDoc=Join main document DateFormatYYYYMM=YYYY-MM @@ -762,7 +774,7 @@ SetBankAccount=Define Bank Account AccountCurrency=Account currency ViewPrivateNote=View notes XMoreLines=%s line(s) hidden -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=Public URL AddBox=Add box SelectElementAndClick=Select an element and click %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=Everybody +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/mn_MN/other.lang b/htdocs/langs/mn_MN/other.lang index 0d9d1cfbd85..1a5314a24d9 100644 --- a/htdocs/langs/mn_MN/other.lang +++ b/htdocs/langs/mn_MN/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=If amount higher than %s SourcesRepository=Repository for sources Chart=Chart PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=Exports area diff --git a/htdocs/langs/mn_MN/products.lang b/htdocs/langs/mn_MN/products.lang index 43c74c9b877..53835bd7f06 100644 --- a/htdocs/langs/mn_MN/products.lang +++ b/htdocs/langs/mn_MN/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Current price AlwaysUseNewPrice=Always use current price of product/service AlwaysUseFixedPrice=Use the fixed price PriceByQuantity=Different prices by quantity +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Quantity range MultipriceRules=Price segment rules UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/mn_MN/projects.lang b/htdocs/langs/mn_MN/projects.lang index f33a950acff..c69302deecb 100644 --- a/htdocs/langs/mn_MN/projects.lang +++ b/htdocs/langs/mn_MN/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=Pending OppStatusWON=Won OppStatusLOST=Lost Budget=Budget +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/mn_MN/website.lang b/htdocs/langs/mn_MN/website.lang index 3902febbfb7..6b4e2ada84a 100644 --- a/htdocs/langs/mn_MN/website.lang +++ b/htdocs/langs/mn_MN/website.lang @@ -3,15 +3,17 @@ Shortname=Code WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them. DeleteWebsite=Delete website ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Page name/alias -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL of external CSS file WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Media library EditCss=Edit Style/CSS or HTML header EditMenu=Edit menu @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang index 5e36e288036..c182b0d84ef 100644 --- a/htdocs/langs/nb_NO/accountancy.lang +++ b/htdocs/langs/nb_NO/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Del nummer TransactionNumShort=Transaksjonsnummer AccountingCategory=Personlige grupper GroupByAccountAccounting=Grupper etter regnskapskonto -AccountingAccountGroupsDesc=Her kan du definere noen grupper av regnskapskontoer. Den blir brukt i rapporten %s for å vise inntekt/utgift med data gruppert i henhold til disse gruppene. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=Etter kontoer ByPredefinedAccountGroups=Etter forhåndsdefinerte grupper ByPersonalizedAccountGroups=Etter personlige grupper @@ -191,6 +191,7 @@ DescThirdPartyReport=Liste over kunder og leverandører og deres regnskapskontoe ListAccounts=Liste over regnskapskontoer UnknownAccountForThirdparty=Ukjent tredjepartskonto. Vi vil bruke %s UnknownAccountForThirdpartyBlocking=Ukjent tredjepartskonto. Blokkeringsfeil +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Kontogruppe Pcgsubtype=Konto-undergruppe @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=Denne journalen er allerede i bruk ## Export ExportDraftJournal=Eksporter utkastjournal Modelcsv=Eksportmodell -OptionsDeactivatedForThisExportModel=For denne eksportmodellen er opsjoner deaktivert Selectmodelcsv=Velg eksportmodell Modelcsv_normal=Klassisk eksport Modelcsv_CEGID=Eksport til CEGID Expert Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Eksport til Sage Ciel Compta eller Compta Evolution Modelcsv_quadratus=Eksport til Quadratus QuadraCompta Modelcsv_ebp=Eksporter mot EBP Modelcsv_cogilog=Eksport mot Cogilog -Modelcsv_agiris=Eksport mot Agiris (Test) +Modelcsv_agiris=Export mot Agiris Modelcsv_configurable=Eksport konfigurerbar ChartofaccountsId=Kontoplan ID diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang index a67fb49fe86..0b2953f739a 100644 --- a/htdocs/langs/nb_NO/admin.lang +++ b/htdocs/langs/nb_NO/admin.lang @@ -131,7 +131,7 @@ HoursOnThisPageAreOnServerTZ=Advarsel, i motsetning til andre skjermer, er timer Box=Widget Boxes=Widgeter MaxNbOfLinesForBoxes=Maks. antall linjer for widgeter -AllWidgetsWereEnabled=All available widgets are enabled +AllWidgetsWereEnabled=Alle tilgjengelige widgeter er aktivert PositionByDefault=Gjeldende rekkefølge Position=Posisjon MenusDesc=Menyeditor for å velge innhold i den horisontale og vertikale menyen. @@ -539,7 +539,7 @@ Module320Desc=Legg til RSS nyhetsstrøm på Dolibarrsider Module330Name=Bookmerker Module330Desc=Bokmerkebehandling Module400Name=Prosjekter/Muligheter -Module400Desc=Behandling av prosjekter og muligheter. Du kan deretter tildele elementer (faktura, ordre, tilbud, intervensjon, ...) til et prosjekt og få en bedre prosjekt-visning. +Module400Desc=Håndtering av prosjekter, muligheter og/eller oppgaver. Du kan også tildele et element (faktura, rekkefølge, forslag, intervensjon, ...) til et prosjekt og få en tverrgående visning fra prosjektvisningen. Module410Name=Webkalender Module410Desc=Integrasjon med webkalender Module500Name=Spesielle utgifter @@ -890,7 +890,7 @@ DictionaryStaff=Stab DictionaryAvailability=Leveringsforsinkelse DictionaryOrderMethods=Ordremetoder DictionarySource=Tilbud/ordre-opprinnelse -DictionaryAccountancyCategory=Personlige grupper +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Diagram-modeller for kontoer DictionaryAccountancyJournal=Regnskapsjournaler DictionaryEMailTemplates=E-postmaler @@ -904,6 +904,7 @@ SetupSaved=Innstillinger lagret SetupNotSaved=Oppsettet er ikke lagret BackToModuleList=Tilbake til moduloversikt BackToDictionaryList=Tilbake til ordliste +TypeOfRevenueStamp=Type inntektsstempel VATManagement=MVA-håndtering VATIsUsedDesc=Som standard når du oppretter muligheter, fakturaer, bestillinger osv, følger MVA-satsen aktivt standard regel:
    Dersom selgeren ikke utsettes for MVA, settes MVA til 0. Slutt på regelen
    Hvis (selgerland = kjøperland), settes merverdiavgift som standard lik MVA for produktet i selgerandet. Slutt på regelen.
    Hvis både selger og kjøper er i EU og varene er transportprodukter (bil, båt, fly), er standard MVA 0 (MVA skal betales til tollen i sitt land og ikke til selger). Slutt på regelen.
    Hvis både selgeren og kjøperen er i EU og kjøper er ikke et selskap, settes MVA til MVA på produktet som selges. Slutt på regelen.
    Hvis både selgeren og kjøperen er i EU og kjøper er et selskap, settes MVA til 0 som standard. Slutt på regelen.
    I alle andre tilfeller er standard MVA=0. Slutt på regelen. VATIsNotUsedDesc=Som standard er den foreslåtte MVA 0 som kan brukes for tilfeller som foreninger, enkeltpersoner og små selskaper. @@ -1408,7 +1409,7 @@ CompressionOfResources=Undertrykkelse av HTTP-respons CompressionOfResourcesDesc=For eksempel ved bruk av Apache-direktivet "AddOutputFilterByType DEFLATE" TestNotPossibleWithCurrentBrowsers=En slik automatisk deteksjon er ikke mulig med nåværende nettlesere DefaultValuesDesc=Her kan du definere/tvinge standardverdien du vil ha når du oppretter en ny post, og/eller standardfiltre eller sorteringsrekkefølge når du lister poster. -DefaultCreateForm=Default values (on forms to create) +DefaultCreateForm=Standardverdier (ved opprettelse av skjema) DefaultSearchFilters=Standard søkefiltre DefaultSortOrder=Standard sorteringsorden DefaultFocus=Standard fokusfelt @@ -1765,3 +1766,4 @@ ResourceSetup=Oppsett av Ressursmodulen UseSearchToSelectResource=Bruk et søkeskjema for å velge en ressurs (i stedet for en nedtrekksliste). DisabledResourceLinkUser=Deaktivert ressurslink til bruker DisabledResourceLinkContact=Deaktivert ressurslink til kontakt +ConfirmUnactivation=Bekreft nullstilling av modul diff --git a/htdocs/langs/nb_NO/banks.lang b/htdocs/langs/nb_NO/banks.lang index 3a775219323..c57518f8e1c 100644 --- a/htdocs/langs/nb_NO/banks.lang +++ b/htdocs/langs/nb_NO/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Nummer LineRecord=Transaksjon AddBankRecord=Legg til oppføringer AddBankRecordLong=Legg til oppføring manuelt +Conciliated=Slått sammen ConciliatedBy=Avstemt av DateConciliating=Avstemt den BankLineConciliated=Oppføring avstemt diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang index e2dd13e04e4..4056c55e811 100644 --- a/htdocs/langs/nb_NO/bills.lang +++ b/htdocs/langs/nb_NO/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Ubetalte leverandørfakturaer for %s BillsLate=Forfalte betalinger BillsStatistics=Kunde fakturastatistikker BillsStatisticsSuppliers=Leverandør fakturastatistikker +DisabledBecauseDispatchedInBookkeeping=Deaktivert fordi fakturaen ble sendt inn til bokføring +DisabledBecauseNotLastInvoice=Deaktivert fordi fakturaen ikke kan slettes. Noen fakturaer ble registrert etter denne, og det vil skape hull i telleren. DisabledBecauseNotErasable=Deaktivert fordi den ikke kan slettes InvoiceStandard=Standardfaktura InvoiceStandardAsk=Standardfaktura @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Hvorfor vil du klassifisere denne fakturaen til "forla ConfirmClassifyPaidPartially=Er du sikker på at du vil endre fakturaen %s til status "betalt"? ConfirmClassifyPaidPartiallyQuestion=Denne fakturaen er ikke fullt ut betalt. Hvorfor lukker du denne fakturaen? ConfirmClassifyPaidPartiallyReasonAvoir=Restbeløpet (%s %s) er rabatt innrømmet fordi betalingen ble gjort før forfall. Jeg ønsker å rette opp MVA med en kreditnota. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Restbeløpet (%s %s) er rabatt innrømmet fordi betalingen ble gjort før forfall. Jeg aksepterer å miste MVA på denne rabatten. ConfirmClassifyPaidPartiallyReasonDiscountVat=Restebløpet (%s %s) er rabatt innrømmet fordi betalingen ble gjort før forfall. Jeg skriver av MVA på denne rabatten uten kreditnota. ConfirmClassifyPaidPartiallyReasonBadCustomer=Dårlig kunde diff --git a/htdocs/langs/nb_NO/compta.lang b/htdocs/langs/nb_NO/compta.lang index f0b3d972cb1..793eb11d0c3 100644 --- a/htdocs/langs/nb_NO/compta.lang +++ b/htdocs/langs/nb_NO/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Betalinger ikke knyttet til noen faktura, er heller i PaymentsNotLinkedToUser=Betalinger ikke knyttet til noen bruker Profit=Profit AccountingResult=Regnskapsresultat +BalanceBefore=Balance (before) Balance=Balanse Debit=Debet Credit=Kreditt diff --git a/htdocs/langs/nb_NO/donations.lang b/htdocs/langs/nb_NO/donations.lang index 630fe8c3bbc..6ca535f13f1 100644 --- a/htdocs/langs/nb_NO/donations.lang +++ b/htdocs/langs/nb_NO/donations.lang @@ -31,3 +31,4 @@ DONATION_ART200=Vis artikkel 200 fra CGI hvis du er bekymret DONATION_ART238=Vis artikkel 238 fra CGI hvis du er bekymret DONATION_ART885=Vis artikkel 885 fra CGI hvis du er bekymret DonationPayment=Donasjonsbetaling +DonationValidated=Donation %s validated diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang index 49d58fc470b..b12795e3aea 100644 --- a/htdocs/langs/nb_NO/errors.lang +++ b/htdocs/langs/nb_NO/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Tomt uttrykk ErrorPriceExpression21=Tomt resultat '%s' ErrorPriceExpression22=Negativt resultat '%s' ErrorPriceExpression23=Ukjent eller ikke-satt variabel '%s' i %s +ErrorPriceExpression24=Variabel '%s' eksisterer men har ingen verdi ErrorPriceExpressionInternal=Intern feil '%s' ErrorPriceExpressionUnknown=Ukjent feil '%s' ErrorSrcAndTargetWarehouseMustDiffers=Kilde- og mållager må være ulik @@ -205,7 +206,7 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=Du må velge om artikkelen er et ErrorDiscountLargerThanRemainToPaySplitItBefore=Rabatten du prøver å legge til er større enn restbeløp. Del rabatten i 2 mindre rabatter. ErrorFileNotFoundWithSharedLink=Filen ble ikke funnet. Kanskje delingsnøkkelen ble endret eller filen ble fjernet nylig. ErrorProductBarCodeAlreadyExists=Vare-strekkoden %s finnes allerede i en annen produktreferanse. -ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using virtual product to have auto increase/decrease of subproducts is not possible when at least one subproduct (or subproduct of subproducts) needs a serial/lot number. +ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Vær også oppmerksom på at bruk av virtuelle varer som har automatisk økning/reduksjon av undervarer, ikke er mulig når minst en undervare (eller undervare av undervarer) trenger et serienummer/lotnummer. # Warnings WarningPasswordSetWithNoAccount=Et passord ble satt for dette medlemmet, men ingen brukerkonto ble opprettet. Det fører til at passordet ikke kan benyttes for å logge inn på Dolibarr. Det kan brukes av en ekstern modul/grensesnitt, men hvis du ikke trenger å definere noen innlogging eller passord for et medlem, kan du deaktivere alternativet "opprett en pålogging for hvert medlem" fra medlemsmodul-oppsettet. Hvis du trenger å administrere en pålogging, men ikke trenger noe passord, kan du holde dette feltet tomt for å unngå denne advarselen. Merk: E-post kan også brukes som en pålogging dersom medlemmet er knyttet til en bruker. diff --git a/htdocs/langs/nb_NO/install.lang b/htdocs/langs/nb_NO/install.lang index c1fb67064a2..6cbe5ee9160 100644 --- a/htdocs/langs/nb_NO/install.lang +++ b/htdocs/langs/nb_NO/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=Du bruker Dolibarrs konfigureringsveiviser fra en Proxm UpgradeExternalModule=Kjør dedikert oppgradering av eksterne moduler SetAtLeastOneOptionAsUrlParameter=Angi minst ett alternativ som et parameter i URL. For eksempel: '... repair.php?standard=confirmed' NothingToDelete=Ingenting å rengjøre/slette +NothingToDo=Ingenting å gjøre ######### # upgrade MigrationFixData=Reparasjon av ødelagte data @@ -196,6 +197,7 @@ MigrationEventsContact=Overføring av hendelser for å legge til hendelseskontak MigrationRemiseEntity=Oppdater verdien i enhetsfeltet llx_societe_remise MigrationRemiseExceptEntity=Oppdater verdien i enhetsfeltet llx_societe_remise_except MigrationReloadModule=Last inn modulen %s på nytt +MigrationResetBlockedLog=Tilbakestill modul BlockedLog for v7 algoritme ShowNotAvailableOptions=Vis utilgjengelige opsjoner HideNotAvailableOptions=Gjem utilgjengelige opsjoner ErrorFoundDuringMigration=Feil ble rapportert under migrasjonsprosessen, så neste steg er ikke tilgjengelig. For å overse feil, kan du klikke her, men applikasjoner eller noen funksjoner kanskje ikke fungerer som de skal før de er fikset. diff --git a/htdocs/langs/nb_NO/languages.lang b/htdocs/langs/nb_NO/languages.lang index 6c6c8eaef13..e7c2900def5 100644 --- a/htdocs/langs/nb_NO/languages.lang +++ b/htdocs/langs/nb_NO/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spansk (Panama) Language_es_PY=Spansk (Paraguay) Language_es_PE=Spansk (Peru) Language_es_PR=Spansk (Puerto Rico) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Spansk (Venezuela) Language_et_EE=Estonsk Language_eu_ES=Baskisk diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang index 7dfd9c693df..3017a36357c 100644 --- a/htdocs/langs/nb_NO/main.lang +++ b/htdocs/langs/nb_NO/main.lang @@ -548,6 +548,18 @@ MonthShort09=sep MonthShort10=okt MonthShort11=nov MonthShort12=des +MonthVeryShort01=J +MonthVeryShort02=F +MonthVeryShort03=M +MonthVeryShort04=A +MonthVeryShort05=M +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=S +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Vedlagte filer og dokumenter JoinMainDoc=Koble hoveddokument DateFormatYYYYMM=ÅÅÅÅ-MM @@ -762,7 +774,7 @@ SetBankAccount=Definer Bankkonto AccountCurrency=Konto valuta ViewPrivateNote=Vis notater XMoreLines=%s linje(r) skjult -ShowMoreLines=Vis flere linjer +ShowMoreLines=Vis flere/færre linjer PublicUrl=Offentlig URL AddBox=Legg til boks SelectElementAndClick=Velg et element og klikk %s @@ -900,3 +912,5 @@ CommentPage=Kommentarfelt CommentAdded=Kommentar lagt til CommentDeleted=Kommentar slettet Everybody=Alle +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/nb_NO/other.lang b/htdocs/langs/nb_NO/other.lang index fe5a1a6119d..d9e7d9e3078 100644 --- a/htdocs/langs/nb_NO/other.lang +++ b/htdocs/langs/nb_NO/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=Hvis beløpet er høyere enn%s SourcesRepository=Oppbevaring av kilder Chart=Diagram PassEncoding=Passordkoding +PermissionsAdd=Tillatelser lagt til +PermissionsDelete=Tillatelser fjernet ##### Export ##### ExportsArea=Eksportområde diff --git a/htdocs/langs/nb_NO/products.lang b/htdocs/langs/nb_NO/products.lang index af5b5ca2c6c..7b060827c42 100644 --- a/htdocs/langs/nb_NO/products.lang +++ b/htdocs/langs/nb_NO/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Gjeldende pris AlwaysUseNewPrice=Bruk alltid gjeldende pris på vare/tjeneste AlwaysUseFixedPrice=Bruk den faste prisen PriceByQuantity=Prisen varierer med mengde +DisablePriceByQty=Deaktiver mengderabatt PriceByQuantityRange=Kvantumssatser MultipriceRules=Prissegment-regler UseMultipriceRules=Bruk prissegment-regler (definert i oppsettet i Varemodulen) for automatisk å kalkulere prisene til alle andre segmenter i forhold til første segment diff --git a/htdocs/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang index 47d7be767a2..c32ab359d5d 100644 --- a/htdocs/langs/nb_NO/projects.lang +++ b/htdocs/langs/nb_NO/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=Venter OppStatusWON=Vunnet OppStatusLOST=Tapt Budget=Budsjett +AllowToLinkFromOtherCompany=Tillat å koble prosjekt fra annet firma

    Støttede verdier:
    - Hold tom: Kan lenke eventuelle prosjekt fra selskapet (standard)
    - "alle": Kan lenke eventuelle prosjekter, selv prosjekt fra andre selskaper
    - En liste over tredjeparts ID, separert med kommaer: Kan lenke alle definerte prosjekter fra disse tredjepartene (Eksempel: 123,4795,53)
    LatestProjects=Siste %s prosjekter LatestModifiedProjects=Siste %s endrede prosjekter OtherFilteredTasks=Andre filtrerte oppgaver +NoAssignedTasks=Ingen tildelte oppgaver (tilordne deg prosjekt/oppgaver fra toppvalgsruten for å legge inn tid på det) # Comments trans AllowCommentOnTask=Tillat brukerkommentarer på oppgaver AllowCommentOnProject=Tillat brukerkommentarer på prosjekter + diff --git a/htdocs/langs/nb_NO/website.lang b/htdocs/langs/nb_NO/website.lang index 340abdcf180..6da640dd322 100644 --- a/htdocs/langs/nb_NO/website.lang +++ b/htdocs/langs/nb_NO/website.lang @@ -3,15 +3,17 @@ Shortname=Kode WebsiteSetupDesc=Sett inn antall ulike websider du ønsker. Deretter kan du redigere dem under menyen Websider DeleteWebsite=Slett wedside ConfirmDeleteWebsite=Er du sikker på at du vil slette denne websiden? Alle sider og innhold vil bli slettet. +WEBSITE_TYPE_CONTAINER=Type side/container WEBSITE_PAGENAME=Sidenavn/alias -WEBSITE_HTML_HEADER=HTML-header(felles for alle sider) -HtmlHeaderPage=HTML-spesifikk header for side WEBSITE_CSS_URL=URL til ekstern CSS-fil WEBSITE_CSS_INLINE=CSS-filinnhold (vanlig for alle sider) WEBSITE_JS_INLINE=Javascript-filinnhold (felles for alle sider) +WEBSITE_HTML_HEADER=Tillegg nederst på HTML-header(felles for alle sider) WEBSITE_ROBOT=Robotfil (robots.txt) WEBSITE_HTACCESS=Webområde. Htaccess-fil +HtmlHeaderPage=HTML-header (kun for denne siden) PageNameAliasHelp=Navn eller alias på siden.
    Dette aliaset brukes også til å lage en SEO-URL når nettsiden blir kjørt fra en virtuell vert til en webserver (som Apacke, Nginx, ...). Bruk knappen "%s" for å redigere dette aliaset. +EditTheWebSiteForACommonHeader=Merk: Hvis du vil definere en personlig topptekst for alle sider, redigerer du overskriften på nettstedsnivå i stedet for på siden/containeren. MediaFiles=Mediabibliotek EditCss=Rediger stil/CSS eller HTML-header EditMenu=Rediger meny @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL til ekstern webserver ikke definert NoPageYet=Ingen sider ennå SyntaxHelp=Hjelp med spesifikke syntakstips YouCanEditHtmlSourceckeditor=Du kan redigere HTML kildekode ved hjelp av "Kilde" -knappen i redigeringsprogrammet. -YouCanEditHtmlSource=
    Du kan inkludere PHP-kode i denne kilden ved hjelp av tagger <?php?. Følgende globale variabler er tilgjengelige: $conf, $langs, $db, $mysoc, $user, $website.

    Du kan også inkludere innhold fra en annen side/beholder med følgende syntaks:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php');?

    For å inkludere en lenke for å laste ned en fil som er lagret i dokument katalog, brukdocument.php wrapper:
    Eksempel, for en fil i dokumenter/ecm (må logges), er syntaks:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"
    For en fil delt med en delkobling (åpen tilgang ved hjelp av delings hash-nøkkelen til filen), er syntaksen:
    <a href="/document.php?hashp=publicsharekeyoffile"
    For en fil i dokumenter/medias (åpen mappe for offentlig tilgang), er syntaksen:
    <a href="/document.php? Modulepart=media&file=[relative_dir/]filnavn.ext"

    For å ta med etbilde som er lagret i dokumenter -katalogen, brukviewimage.php wrapper:
    Eksempel, for et bilde i dokumenter/medias (åpen tilgang), er syntaks:
    <a href="/viewimage.php? modulepart=medias&file=[relative_dir/] filnavn.ext"
    +YouCanEditHtmlSource=
    Du kan inkludere PHP-kode i denne kilden ved hjelp av tagger <?php ?> . Følgende globale variabler er tilgjengelige: $conf, $langs, $db, $mysoc, $user, $website.

    Du kan også inkludere innhold av en annen side/container med følgende syntaks:
    <?php includeContainer('alias_of_container_to_include'); ?>

    For å inkludere en lenke for å laste ned en fil som er lagret i dokument katalog, bruk document.php wrapper:
    Eksempel, for en fil i documents/ecm (må logges), er syntaks:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For en fil i documents/medias (åpen mappe for offentlig tilgang) er syntaksen:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For en fil delt med en delkobling (åpen tilgang ved hjelp av delings-hashnøkkelen til filen), er syntaks:
    <a href="/document.php?hashp=publicsharekeyoffile">

    For å inkludere et bilde som er lagret i dokument -katalogen, bruk viewimage.php wrapper:
    Eksempel, for et bilde i documents/medias (åpen tilgang), er syntaks:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Klon side/container CloneSite=Klon side SiteAdded=Nettsted lagt til @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Eller opprett en tom side fra grunnen av... FetchAndCreate=Hent og opprett ExportSite=Eksporter nettside IDOfPage=Side-ID +Banner=Banner +BlogPost=Blogg post WebsiteAccount=Nettstedskonto WebsiteAccounts=Nettstedskontoer AddWebsiteAccount=Opprett nettsidekonto BackToListOfThirdParty=Tilbake til listen over tredjeparter +DisableSiteFirst=Deaktiver nettsted først +MyContainerTitle=Mitt nettsteds tittel +AnotherContainer=En annen container diff --git a/htdocs/langs/nl_BE/accountancy.lang b/htdocs/langs/nl_BE/accountancy.lang index 7a77a57e757..871020df87f 100644 --- a/htdocs/langs/nl_BE/accountancy.lang +++ b/htdocs/langs/nl_BE/accountancy.lang @@ -29,6 +29,5 @@ TotalVente=Totaal omzet voor belastingen AccountingJournalType2=Verkoop AccountingJournalType3=Inkoop Modelcsv=Model van een export -OptionsDeactivatedForThisExportModel=Voor dit export model zijn de opties gedeactiveerd. Selectmodelcsv=Selecteer een model van export Modelcsv_CEGID=Exporteer naar CEGID Expert Comptabilité diff --git a/htdocs/langs/nl_BE/admin.lang b/htdocs/langs/nl_BE/admin.lang index 836bda26845..30b69a1f7c4 100644 --- a/htdocs/langs/nl_BE/admin.lang +++ b/htdocs/langs/nl_BE/admin.lang @@ -1,22 +1,36 @@ # Dolibarr language file - Source file is en_US - admin VersionLastInstall=Versie van eerste installatie ConfirmPurgeSessions=Ben je zeker dat je alle sessies wil wissen? De connectie van elke gebruiker zal worden verbroken (uitgezonderd jezelf). +DBStoringCharset=Databasekarakterset voor het opslaan van gegevens +DBSortingCharset=Databasekarakterset voor het sorteren van gegevens +UserSetup=Gebruikersbeheerinstellingen NotConfigured=Module/Applicatie is niet geconfigureerd +CurrentSessionTimeOut=Huidige sessietimeout MaxNbOfLinesForBoxes=Max aantal lijnen voor widgets +PositionByDefault=Standaardvolgorde MenusDesc=Menubeheerders stellen de inhoud van de 2 menubalken in (horizontaal en verticaal) MenusEditorDesc=De menu editor laat je toe om aangepaste menu-invoer te definiëren. Wees voorzichtig bij het gebruik van deze functionaliteit, om instabiele en permanent onvindbare menus te voorkomen.
    Sommige modules voegen menu-meldingen toe (in menu Alles meestal). Indien u per ongeluk sommige van deze meldingen zou verwijderen, dan kan u deze herstellen door de module eerst uit te schakelen en opnieuw in te schakelen. +SystemToolsArea=Systeemwerksetoverzicht PurgeAreaDesc=De pagina laat je toe om alle gegenereerde of opgeslagen bestanden door Dolibarr te verwijderen (tijdelijke of alle bestanden  in %s folder). Het gebruik van deze functie is niet nodig. Het is een tool die het mogelijk maakt voor gebruikers, waarvan de website gehost wordt door derden en die geen toestemming geven om gegenereerde bestanden te verwijderen op hun webserver, om via een andere weg het toch mogelijk te maken om deze bestanden te verwijderen. PurgeDeleteLogFile=Verwijder logbestanden, inclusief %s  gedefinieerd voor Syslog module (geen risico om gegevens te verliezen) PurgeDeleteTemporaryFiles=Verwijder alle tijdelijke bestanden (geen risico op verlies van gegevens) PurgeNothingToDelete=Geen map of bestanden om te verwijderen. +PurgeAuditEvents=Verwijder alle gebeurtenisen ConfirmPurgeAuditEvents=Ben je zeker dat je alle veiligheidsgebeurtenissen wil verwijderen? Alle veiligheidslogboeken zullen worden verwijderd, en geen andere bestanden worden verwijderd -IgnoreDuplicateRecords=Negeer fouten van dubbele tabelregels (INSERT negeren) +NoBackupFileAvailable=Geen backupbestanden beschikbaar. +ToBuildBackupFileClickHere=Om een backupbestand te maken, klik hier. +ImportMySqlDesc=Voor de invoer van een backupbestand, voert u het mysql-commando vanaf de opdrachtregel uit: +CommandsToDisableForeignKeysForImportWarning=Verplicht als je je sql neerslag later wil gebruiken +ExportStructure=Struktuur +NameColumn=Kollomennaam BoxesDesc=Widgets ( grafisch object of element) zijn componenten om specifieke informatie toe te voegen om bepaalde pagina's te personaliseren. Je hebt de keuze om al dan niet de widget te laten zien door de doelpagina te selecteren en te klikken op 'Activeren', of te klikken op het vuilbakje om het uit te schakelen. ModulesMarketPlaceDesc=Je kan meer modules vinden door te zoeken op andere externe websites, waar je ze kan downloaden ModulesMarketPlaces=Zoek externe app / modules +DoliStoreDesc=DoliStore, de officiële markt voor externe Dolibarr ERP / CRM modules WebSiteDesc=Linken naar websites om naar extra modules te zoeken  BoxesActivated=Geactiveerde widgets ProtectAndEncryptPdfFilesDesc=Een beveiligd PDF document kan gelezen en afgedrukt worden met elke PDF browser of lezer. Echter, bewerken en kopiëren van gegevens in een beveiligd document is niet meer mogelijk. Door het gebruik van deze functionaliteit, is het niet mogelijk om een globaal samengevoegd PDF document te maken van meerdere beveiligde PDF documenten. +MeasuringUnit=Maateenheid EMailsSetup=Email instellingen SubmitTranslation=Indien de vertaling voor deze taal niet compleet is of fouten bevat in de vertaling, dan kan u die verbeteren door de bestanden in de folder langs/%s aan te passen en uw aanpassingen in te dienen bij www.transifex.com/dolibarr-association/dolibarr/ of via op het forum van Dolibarr : www.dolibarr.org SubmitTranslationENUS=Als de vertaling voor deze taal niet volledig is of een fout bevat, dan kunt u dit corrigeren door het bewuste taalbestand in de map Langs/%s te wijzigen en de wijzigingen op het Dolibarr forum te delen met anderen: www.dolibarr.org. diff --git a/htdocs/langs/nl_BE/install.lang b/htdocs/langs/nl_BE/install.lang index 88a29bb1687..ec636adcb1b 100644 --- a/htdocs/langs/nl_BE/install.lang +++ b/htdocs/langs/nl_BE/install.lang @@ -1,7 +1,27 @@ # Dolibarr language file - Source file is en_US - install +MiscellaneousChecks=Vereisten controle +PHPSupportPOSTGETOk=Deze PHP installatie ondersteund POST en GET. +PHPSupportPOSTGETKo=Mogelijk ondersteund uw PHP installatie geen POST en / of GET variabelen. Controleer deze instelling variables_order in php.ini. +PHPSupportGD=Deze PHP installatie ondersteund GD grafische functies. +PHPSupportUTF8=Deze PHP installatie ondersteund UTF8 functies. +Recheck=Klik hier voor een significantere test +ErrorPHPDoesNotSupportSessions=Uw PHP installatie ondersteund geen sessies. Dit is vereist voor een goede werking van Dolibarr. Controleer uw PHP instellingen. +ErrorPHPDoesNotSupportGD=Uw PHP installatie ondersteund geen grafische functies. Grafieken zullen niet beschikbaar zijn. +ErrorPHPDoesNotSupportUTF8=Uw PHP installatie ondersteund geen UTF8 functies. Dolibarr kan daardoor niet goed werken. Los dit op voordat u verder gaat met de installatie van Dolibarr. +ErrorFailedToConnectToDatabase=Er kon niet verbonden worden met de database '%s'. +ErrorDatabaseVersionTooLow=Databankversie (%s) te oud. Versie %s of hoger is vereist. +ErrorConnectedButDatabaseNotFound=De verbinding met de server kon succesvol worden opgezet, maar de database '%s' is niet gevonden. +PasswordAgain=Geef uw wachtwoord opnieuw +CreateOtherKeysForTable=Creëer foreign keys en indexes voor de tabel %s +SystemIsInstalled=De installatie is voltooid +GoToDolibarr=Ga naar Dolibarr +GoToSetupArea=Ga naar Dolibarr (instellingsomgeving) +GoToUpgradePage=Ga opnieuw naar de upgrade pagina +WithNoSlashAtTheEnd=Zonder toevoeging van de slash "/" 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. ShowEditTechnicalParameters=Klik hier om verder gevorderde parameters te zien of aan te passen. (expert instellingen) 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). +MigrationUpdateFailed=Upgrade mislukt MigrationDeliveryAddress=Werk de afleveringsadressen voor verzending bij MigrationCategorieAssociation=Overzetten van categoriën MigrationReloadModule=Herladen van de module %s diff --git a/htdocs/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang index a279446c4e5..3f2b77564ab 100644 --- a/htdocs/langs/nl_NL/accountancy.lang +++ b/htdocs/langs/nl_NL/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Piece number TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=List of the accounting accounts UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal Modelcsv=Export model -OptionsDeactivatedForThisExportModel=Voor dit export model zijn de opties uitgezet Selectmodelcsv=Selecteer een export model Modelcsv_normal=Klassieke export Modelcsv_CEGID=Export towards CEGID Expert Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution Modelcsv_quadratus=Export towards Quadratus QuadraCompta Modelcsv_ebp=Export towards EBP Modelcsv_cogilog=Export towards Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang index 57d3e75359e..7fbb02d58c0 100644 --- a/htdocs/langs/nl_NL/admin.lang +++ b/htdocs/langs/nl_NL/admin.lang @@ -29,7 +29,7 @@ SessionId=Sessie-ID SessionSaveHandler=Wijze van sessieopslag SessionSavePath=Sessie opslaglocatie PurgeSessions=Verwijderen van sessies -ConfirmPurgeSessions=Wilt u werkelijk alle sessies sluiten? Dit wil elke gebruikerssessie afbreken (behalve uzelf). +ConfirmPurgeSessions=Wilt u werkelijk alle sessies sluiten? Dit zal elke gebruikerssessie afbreken (behalve die van uzelf). NoSessionListWithThisHandler=De waarde van 'save session handler' ingesteld in uw PHP instellingen staat het niet toe een lijst van alle lopende sessies weer te geven. LockNewSessions=Blokkeer nieuwe sessies ConfirmLockNewSessions=Weet u zeker dat u alle sessies wilt beperken tot uzelf? Alleen de gebruiker %s kan dan nog met Dolibarr verbinden. @@ -38,10 +38,10 @@ YourSession=Uw sessie Sessions=Gebruikers-sessies WebUserGroup=Webserver gebruiker / groep NoSessionFound=Uw PHP installatie lijkt het niet toe te staan een lijst van actieve sessies weer te geven. De map waarin sessies worden opgeslagen (%s) zou afgeschermd kunnen zijn (bijvoorbeeld, door OS rechten of via de PHP instelling open_basedir). -DBStoringCharset=Databasekarakterset voor het opslaan van gegevens -DBSortingCharset=Databasekarakterset voor het sorteren van gegevens -ClientCharset=Client charset -ClientSortingCharset=Client collation +DBStoringCharset=Database karakterset voor het opslaan van gegevens +DBSortingCharset=Database karakterset voor het sorteren van gegevens +ClientCharset=Cliënt tekenset +ClientSortingCharset=Cliënt vergelijking WarningModuleNotActive=Module %s dient te worden ingeschakeld WarningOnlyPermissionOfActivatedModules=Hier worden alleen de rechten van geactiveerde modules weergegeven. U kunt andere modules in het menu Home->Instellingen->Modules activeren. DolibarrSetup=Installatie of upgrade van Dolibarr @@ -100,7 +100,7 @@ AntiVirusCommandExample= Voorbeeld voor ClamWin: c:\\Program Files (x86)\\ClamWi AntiVirusParam= Aanvullende parameters op de opdrachtregel AntiVirusParamExample= Voorbeeld voor ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib" ComptaSetup=Instellingen van de boekhoudkundige module -UserSetup=Gebruikersbeheerinstellingen +UserSetup=Gebruikersbeheer instellingen MultiCurrencySetup=Multi-currency setup MenuLimits=Limieten en nauwkeurigheid MenuIdParent=ID van het bovenliggende menu @@ -125,35 +125,35 @@ OSTZ=Server OS Time Zone PHPTZ=Tijdzone binnen de PHP server DaylingSavingTime=Zomertijd (gebruiker) CurrentHour=Huidige tijd op server -CurrentSessionTimeOut=Huidige sessietimeout +CurrentSessionTimeOut=Huidige sessie timeout YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htaccess with a line like this "SetEnv TZ Europe/Paris" HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server. Box=Widget Boxes=Widgets MaxNbOfLinesForBoxes=Maximaal aantal regels voor widgets -AllWidgetsWereEnabled=All available widgets are enabled -PositionByDefault=Standaardvolgorde +AllWidgetsWereEnabled=Alle beschikbare widgets zijn geactiveerd +PositionByDefault=Standaard volgorde Position=Positie -MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical). -MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.
    Some modules add menu entries (in menu All mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module. +MenusDesc=Menu-managers bepalen de inhoud van de twee menubalken in (horizontaal en verticaal). +MenusEditorDesc=Met behulp van de menu-editor kunt u gepersonaliseerde items in menu's instellen. Gebruik deze functionaliteit zorgvuldig om te vermijden dat Dolibarr instabiel wordt en menu-items permanent onbereikbaar worden.
    Sommige modules voegen items toe in de menu's (in de meeste gevallen in het menu Alle). Als u sommige van deze items abusievelijk verwijderd, dan kunt u ze herstellen door de module eerst uit te schakelen en daarna opnieuw in te schakelen. MenuForUsers=Gebruikersmenu LangFile=.lang bestand System=Systeem SystemInfo=Systeeminformatie -SystemToolsArea=Systeemwerksetoverzicht +SystemToolsArea=Systeem werkset overzicht SystemToolsAreaDesc=Dit gedeelte biedt administratieve functionaliteit. Gebruik het menu om de functionaliteit in te stellen die u nodig heeft. Purge=Leegmaken -PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in %s directory). Using this feature is not necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server. -PurgeDeleteLogFile=Delete log files, including %s defined for Syslog module (no risk of losing data) -PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data) +PurgeAreaDesc=Deze pagina maakt het mogelijk dat u alle bestanden gemaakt of opgeslagen door Dolibarr te verwijderen (tijdelijke bestanden en / of alle bestanden in de map %s). Het gebruik van deze functie is niet noodzakelijk. Deze is slechts bedoeld voor gebruikers waarbij Dolibarr gehost wordt door een provider die geen rechten geeft voor het verwijderen van bestanden gemaakt door de webserver. +PurgeDeleteLogFile=Verwijder logbestanden %s aangemaakt door de Syslog module (Geen risico op verlies van gegevens) +PurgeDeleteTemporaryFiles=Verwijder alle tijdelijke bestanden (Geen risico op verlies van gegevens) PurgeDeleteTemporaryFilesShort=Delete temporary files PurgeDeleteAllFilesInDocumentsDir=Verwijder alle bestanden in de map %s.. Tijdelijke bestanden, maar ook databasebackupbestanden, bijlagen van elementen (derde partijen, facturen, etc) en bestanden geüpload naar de ECM-module zullen verwijderd worden. PurgeRunNow=Nu opschonen -PurgeNothingToDelete=No directory or files to delete. +PurgeNothingToDelete=Geen directory of bestanden om te verwijderen. PurgeNDirectoriesDeleted=%s bestanden of mappen verwijderd. PurgeNDirectoriesFailed=Failed to delete %s files or directories. -PurgeAuditEvents=Verwijder alle gebeurtenisen -ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed. +PurgeAuditEvents=Verwijder alle beveiligingsgerelateerde gebeurtenissen +ConfirmPurgeAuditEvents=Weet u zeker dat u alle beveiligingsgerelateerde gebeurtenissen wilt verwijderen? Alle beveiligingsgerelateerde logbestanden zullen worden verwijderd. Er zullen geen andere gegevens worden verwijderd. GenerateBackup=Genereer backup Backup=Backup Restore=Herstellen @@ -161,18 +161,18 @@ RunCommandSummary=Backup geïnitieerd met het volgende commando BackupResult=Resultaat backup BackupFileSuccessfullyCreated=Backupbestand succesvol gegenereerd YouCanDownloadBackupFile=De gegenereerde bestanden kunnen nu gedownload worden -NoBackupFileAvailable=Geen backupbestanden beschikbaar. +NoBackupFileAvailable=Geen back-up bestanden beschikbaar. ExportMethod=Exporteer methode ImportMethod=Importeer methode -ToBuildBackupFileClickHere=Om een backupbestand te maken, klik hier. -ImportMySqlDesc=Voor de invoer van een backupbestand, voert u het mysql-commando vanaf de opdrachtregel uit: +ToBuildBackupFileClickHere=Om een back-up bestand te maken, klik hier. +ImportMySqlDesc=Voor de invoer van een back-up bestand, voert u het My SQL-commando vanaf de opdrachtregel uit: ImportPostgreSqlDesc=Om een backupbestand te importeren, dient u het 'pg_restore' commando vanaf de opdrachtregel uit te voeren: ImportMySqlCommand=%s %s < mijnbackupbestand.sql ImportPostgreSqlCommand=%s %s mijnbackupbestand.sql FileNameToGenerate=Te creëren bestandsnaam Compression=Compressie CommandsToDisableForeignKeysForImport=Commando om 'foreign keys' bij importeren uit te schakelen -CommandsToDisableForeignKeysForImportWarning=Verplicht als je je sql neerslag later wil gebruiken +CommandsToDisableForeignKeysForImportWarning=Verplicht als je je SQL dump later wil gebruiken ExportCompatibility=Uitwisselbaarheid (compatibiliteit) van het gegenereerde exportbestand MySqlExportParameters=MySQL exporteer instellingen PostgreSqlExportParameters= PostgreSQL uitvoer parameters @@ -181,22 +181,22 @@ FullPathToMysqldumpCommand=Het volledige pad naar het 'MySQL dump' commando FullPathToPostgreSQLdumpCommand=Volledige pad naar het 'pg_dump' commando AddDropDatabase=Voeg 'DROP DATABASE' commando toe AddDropTable=Voeg 'DROP TABLE' commando toe -ExportStructure=Struktuur -NameColumn=Kollomennaam +ExportStructure=Structuur +NameColumn=Naam kolommen ExtendedInsert=Uitgebreide (extended) INSERT NoLockBeforeInsert=Geen lock-opdrachten rond INSERT DelayedInsert=Vertraagde (delayed) INSERT EncodeBinariesInHexa=Codeer binaire data in hexadecimalen -IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE) +IgnoreDuplicateRecords=Negeer fouten van dubbele tabelregels (INSERT negeren) AutoDetectLang=Automatisch detecteren (taal van de browser) FeatureDisabledInDemo=Functionaliteit uitgeschakeld in de demonstratie FeatureAvailableOnlyOnStable=Feature only available on official stable versions -BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it. +BoxesDesc=Vakken zijn delen op het scherm die bepaalde informatie tonen op geselecteerde pagina's. U kunt een vak in- of uitschakelen door de doelpagina te selecteren en op "activeren" te klikken of door op de prullenbak te klikken om het vak uit te schakelen. OnlyActiveElementsAreShown=Alleen elementen van ingeschakelde modules worden getoond. -ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application. -ModulesMarketPlaceDesc=U kunt meer modules downloaden van externe website op het internet... +ModulesDesc=Dolibarr modules bepalen welke functionaliteit is ingeschakeld in de software. Voor enkele applicatiemodules is het noodzakelijk, zodra de module is ingeschakeld, rechten te verlenen aan de gebruikers. Klik op de knop uit / aan in de kolom "Status" om een module / functionaliteit in of uit te schakelen. +ModulesMarketPlaceDesc=U kunt meer modules downloaden van externe websites op het internet... ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab %s. -ModulesMarketPlaces=Find external app/modules +ModulesMarketPlaces=Vind externe apps of modules ModulesDevelopYourModule=Develop your own app/modules ModulesDevelopDesc=You can develop or find a partner to develop for you, your personalised module DOLISTOREdescriptionLong=Instead of switching on www.dolistore.com web site to find an external module, you can use this embedded tool that will make the seach on the external market place for you (may be slow, need an internet access)... @@ -210,9 +210,9 @@ Updated=Updated Nouveauté=Novelty AchatTelechargement=Buy / Download GoModuleSetupArea=To deploy/install a new module, go onto the Module setup area at %s. -DoliStoreDesc=DoliStore, de officiële markt voor externe Dolibarr ERP / CRM modules +DoliStoreDesc=DoliStore, de officiële markt voor externe Dolibarr ERP / CRM modules. DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project) -WebSiteDesc=Reference websites to find more modules... +WebSiteDesc=Websiteaanbieders waarop u naar meer modules kunt zoeken DevelopYourModuleDesc=Some solutions to develop your own module... URL=Link BoxesAvailable=Beschikbare widgets @@ -230,7 +230,7 @@ MainDbPasswordFileConfEncrypted=Databasewachtwoord versleuteld opslaan in conf.p InstrucToEncodePass=Om je paswoord versleuteld (gecodeerd) te krijgen in dit bestand conf.php , vervang de regel
    $dolibarr_main_db_pass="...";
    door
    $dolibarr_main_db_pass="crypted:%s"; InstrucToClearPass=Om je paswoord gedecodeerd te verkrijgen in dit bestand conf.php, vervang de regel
    $dolibarr_main_db_pass="crypted:...";
    door
    $dolibarr_main_db_pass="%s"; ProtectAndEncryptPdfFiles=Bescherming van gecreëerde PDF files. (Activering NIET aanbevolen, omdat dit de aanmaak van meerdere bestanden onmogelijk maakt) -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 makes building of a global merged PDFs not working. +ProtectAndEncryptPdfFilesDesc=Bescherming van PDF files, deze kunnen nog gelezen en afgedrukt worden met behulp van een PDF-lezer. Echter, het bewerken en kopiëren is niet meer mogelijk. Let op dat door het gebruik van deze functionaliteit, de bouw van een globale samengevoegde PDF niet werkt zoals bij onbetaalde facturen. Feature=Functionaliteit DolibarrLicense=Licentie Developpers=Ontwikkelaars / mensen die bijgedragen hebben @@ -249,7 +249,7 @@ ForAnswersSeeForum=Voor alle andere vragen / hulp, kunt u gebruik maken van het HelpCenterDesc1=Dit scherm kan u helpen om ondersteuning voor Dolibarr te krijgen. HelpCenterDesc2=Kies de ondersteuning die overeenkomt met uw behoeften door te klikken op de betreffende link (Sommige van deze diensten zijn alleen beschikbaar in het Engels). CurrentMenuHandler=Huidige menuverwerker -MeasuringUnit=Maateenheid +MeasuringUnit=Meeteenheid LeftMargin=Left margin TopMargin=Top margin PaperSize=Paper type @@ -260,18 +260,18 @@ FontSize=Font size Content=Content NoticePeriod=Notice period NewByMonth=New by month -Emails=Emails -EMailsSetup=Emails setup -EMailsDesc=This page allows you to overwrite your PHP parameters for emails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless. -EmailSenderProfiles=Emails sender profiles +Emails=E-mails +EMailsSetup=E-mail instellingen +EMailsDesc=Met behulp van deze pagina kunt u PHP instellingen om e-mails te verzenden overschrijven. Op Unix / Linux besturingssystemen zijn deze in de meeste gevallen goed ingesteld en zijn deze instellingen nutteloos. +EmailSenderProfiles=Verzender e-mails profielen MAIN_MAIL_SMTP_PORT=SMTP / SMTPS-poort (standaard in php.ini: %s) MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS Host (standaard in php.ini: %s) MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP / SMTPS-poort (niet gedefinieerd in PHP op Unix-achtige systemen) MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS-host (Niet gedefinieerd in PHP op Unix-achtige systemen) -MAIN_MAIL_EMAIL_FROM=Sender email for automatic emails (By default in php.ini: %s) -MAIN_MAIL_ERRORS_TO=Sender email used for error returns emails sent +MAIN_MAIL_EMAIL_FROM=E-mail afzender voor automatische e-mails (Standaard in php.ini: %s) +MAIN_MAIL_ERRORS_TO=Afzender e-mailadres gebruikt voor foutrapporten e-mails verzonden MAIN_MAIL_AUTOCOPY_TO= Stuur systematisch een verborgen zogenoemde 'Carbon-Copy' van alle verzonden e-mails naar -MAIN_DISABLE_ALL_MAILS=Disable all emails sendings (for test purposes or demos) +MAIN_DISABLE_ALL_MAILS=Schakel het versturen van alle e-mails 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 MAIN_MAIL_SMTPS_PW=SMTP-wachtwoord indien verificatie vereist @@ -287,7 +287,7 @@ FeatureNotAvailableOnLinux=Functionaliteit niet beschikbaar op Unix-achtige syst SubmitTranslation=Indien de vertaling voor deze taal nog niet volledig is of je vindt fouten, dan kan je dit verbeteren door de bestanden te editeren in de volgende directory langs/%s en stuur uw wijzigingen door naar www.transifex.com/dolibarr-association/dolibarr/ SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory langs/%s and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr. ModuleSetup=Module-instellingen -ModulesSetup=Modules/Application setup +ModulesSetup=Instellingen van modules & applicatie ModuleFamilyBase=Systeem ModuleFamilyCrm=Customer Relation Management (CRM) ModuleFamilySrm=Supplier Relation Management (SRM) @@ -304,16 +304,16 @@ ModuleFamilyInterface=Interfaces with external systems MenuHandlers=Menuverwerkers MenuAdmin=Menu wijzigen DoNotUseInProduction=Niet in productie gebruiken -ThisIsProcessToFollow=This is steps to process: +ThisIsProcessToFollow=Dit zijn de stappen om te verwerken: ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually: 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 het pakket (voorbeeld vanaf de officiële web site %s). -UnpackPackageInDolibarrRoot=Unpack the packaged files into server directory dedicated to Dolibarr: %s +UnpackPackageInDolibarrRoot=Pak bestand uit op de Dolibarr server directory toegewezen aan de externe modules: %s UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: %s SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going on the page to setup modules: %s. -NotExistsDirect=The alternative root directory is not defined to an existing directory.
    -InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.
    Just create a directory at the root of Dolibarr (eg: custom).
    +NotExistsDirect=De alternatieve hoofdmap is niet gedefinieerd in een bestaande map.
    +InfDirAlt=Vanaf versie 3 is het mogelijk om een alternatieve root directory te definiëren. Dit stelt je in staat 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).
    InfDirExample=
    Then declare it in the file conf.php
    $dolibarr_main_url_root_alt='/custom'
    $dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'
    If these lines are commented with "#", to enable them, just uncomment by removing the "#" character. YouCanSubmitFile=For this step, you can submit the .zip file of module package here : CurrentVersion=Huidige versie van Dolibarr @@ -464,9 +464,9 @@ Field=veld ProductDocumentTemplates=Document templates to generate product document FreeLegalTextOnExpenseReports=Free legal text on expense reports WatermarkOnDraftExpenseReports=Watermark on draft expense reports -AttachMainDocByDefault=Set this to 1 if you want to attach main document to email by default (if applicable) -FilesAttachedToEmail=Attach file -SendEmailsReminders=Send agenda reminders by emails +AttachMainDocByDefault=Zet dit op 1 als u het hoofddocument als standaard aan e-mail wilt toevoegen (indien van toepassing) +FilesAttachedToEmail=Voeg een bestand toe +SendEmailsReminders=Stuur agendaherinneringen per e-mail # Modules Module0Name=Gebruikers & groepen Module0Desc=Groepenbeheer gebruikers/werknemers @@ -539,7 +539,7 @@ Module320Desc=Voeg een RSS feed toe in de informatieschermen van Dolibarr Module330Name=Weblinks (Favouriete internetpagina's in het menu weergeven) Module330Desc=Internetfavorietenbeheer Module400Name=Projecten/Kansen/Leads -Module400Desc=Beheer van projecten, kansen of leads. U kunt elk willekeurig element (factuur, order, offerte, interventie, ...) toewijzen aan een project en een transversale weergave krijgen van de projectweergave. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webkalender Module410Desc=Integratie van een webkalender Module500Name=Speciale uitgaven @@ -890,7 +890,7 @@ DictionaryStaff=Personeel DictionaryAvailability=Leverings vertraging DictionaryOrderMethods=Bestel methodes DictionarySource=Oorsprong van offertes / bestellingen -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Modellen voor rekeningschema DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=Email documentensjablonen @@ -904,6 +904,7 @@ SetupSaved=Instellingen opgeslagen SetupNotSaved=Installatie niet opgeslagen BackToModuleList=Terug naar moduleoverzicht BackToDictionaryList=Terug naar de woordenboeken lijst +TypeOfRevenueStamp=Type of revenue stamp VATManagement=BTW-beheer VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is VAT=0. End of rule. VATIsNotUsedDesc=Standaard is de voorgestelde BTW 0. Dit kan gebruikt worden in situaties zoals verenigingen, particulieren of kleine bedrijven. @@ -1094,9 +1095,9 @@ ShowProfIdInAddress=Toon in het adresgedeelte van documenten het 'professioneel ShowVATIntaInAddress=Verberg BTW Intra num met adressen op documenten TranslationUncomplete=Onvolledige vertaling MAIN_DISABLE_METEO=Schakel "Meteo"-weergave uit -MeteoStdMod=Standard mode -MeteoStdModEnabled=Standard mode enabled -MeteoPercentageMod=Percentage mode +MeteoStdMod=Standaard mode +MeteoStdModEnabled=Standaard mode geactiveerd +MeteoPercentageMod=Percentage modus MeteoPercentageModEnabled=Percentage mode enabled MeteoUseMod=Click to use %s TestLoginToAPI=Test inloggen op API @@ -1271,7 +1272,7 @@ LDAPSynchronizeUsers=Organisatie van gebruikers in LDAP LDAPSynchronizeGroups=Organisatie van groepen in LDAP LDAPSynchronizeContacts=Organisatie van contactpersonen in LDAP LDAPSynchronizeMembers=Organisatie van verenigingsleden in LDAP -LDAPSynchronizeMembersTypes=Organization of foundation's members types in LDAP +LDAPSynchronizeMembersTypes=Organisatie van de ledentypes van de stichting in LDAP LDAPPrimaryServer=Primaire server LDAPSecondaryServer=Secundaire server LDAPServerPort=Serverpoort @@ -1318,7 +1319,7 @@ LDAPTestSynchroContact=Test contactpersonensynchronisatie LDAPTestSynchroUser=Test gebruikersynchronisatie LDAPTestSynchroGroup=Test groepsynchronisatie LDAPTestSynchroMember=Test ledensynchronisatie -LDAPTestSynchroMemberType=Test member type synchronization +LDAPTestSynchroMemberType=Test type lid synchronisatie LDAPTestSearch= Test een LDAP-zoekopdracht LDAPSynchroOK=Synchronisatietest succesvol LDAPSynchroKO=Synchronisatietest mislukt @@ -1384,7 +1385,7 @@ LDAPDescContact=Deze pagina maakt het u mogelijk LDAP-waarden in de LDAP structu LDAPDescUsers=Deze pagina maakt het u mogelijk LDAP-waarden in de LDAP structuur te koppelen aan elk gegeven in de Dolibarr gebruikers LDAPDescGroups=Deze pagina maakt het u mogelijk LDAP-waarden in de LDAP structuur te koppelen aan elk gegeven in de Dolibarr groepen LDAPDescMembers=Deze pagina maakt het u mogelijk LDAP-waarden in de LDAP structuur te koppelen aan elk gegeven in de Dolibarr ledenmodule -LDAPDescMembersTypes=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members types. +LDAPDescMembersTypes=Op deze pagina kunt u de LDAP kenmerknaam in de LDAP structuur definiëren voor alle gegevens die op Dolibarr -ledentypen worden gevonden. 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=Prestaties setup / optimaliseren rapport @@ -1712,7 +1713,7 @@ MailToSendSupplierOrder=To send supplier order MailToSendSupplierInvoice=To send supplier invoice MailToSendContract=To send a contract MailToThirdparty=To send email from third party page -MailToMember=To send email from member page +MailToMember=Om e-mail van lid pagina te verzenden MailToUser=To send email from user page ByDefaultInList=Show by default on list view YouUseLastStableVersion=You use the latest stable version @@ -1724,7 +1725,7 @@ MultiPriceRuleDesc=When option "Several level of prices per product/service" is ModelModulesProduct=Templates for product documents ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number. SeeSubstitutionVars=See * note for list of possible substitution variables -SeeChangeLog=See ChangeLog file (english only) +SeeChangeLog=Zie ChangeLog bestand (alleen in het Engels) AllPublishers=All publishers UnknownPublishers=Unknown publishers AddRemoveTabs=Add or remove tabs @@ -1756,12 +1757,13 @@ BaseCurrency=Reference currency of the company (go into setup of company to chan WarningNoteModuleInvoiceForFrenchLaw=This module %s is compliant with french laws (Loi Finance 2016). WarningNoteModulePOSForFrenchLaw=This module %s is compliant with french laws (Loi Finance 2016) because module Non Reversible Logs is automatically activated. WarningInstallationMayBecomeNotCompliantWithLaw=You try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software. -MAIN_PDF_MARGIN_LEFT=Left margin on PDF -MAIN_PDF_MARGIN_RIGHT=Right margin on PDF -MAIN_PDF_MARGIN_TOP=Top margin on PDF +MAIN_PDF_MARGIN_LEFT=Linker marge op PDF +MAIN_PDF_MARGIN_RIGHT=Rechter marge op PDF +MAIN_PDF_MARGIN_TOP=Bovenmarge op PDF MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF ##### Resource #### ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/nl_NL/banks.lang b/htdocs/langs/nl_NL/banks.lang index c41035cb4f5..46cef9a112f 100644 --- a/htdocs/langs/nl_NL/banks.lang +++ b/htdocs/langs/nl_NL/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Aantal LineRecord=Transactie AddBankRecord=Item toevoegen AddBankRecordLong=Item handmatig toevoegen +Conciliated=Reconciled ConciliatedBy=Afgestemd door DateConciliating=Afgestemd op BankLineConciliated=Item afgestemd diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang index 7b86125ad05..4b342bc77dc 100644 --- a/htdocs/langs/nl_NL/bills.lang +++ b/htdocs/langs/nl_NL/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Onbetaalde leveranciers facturen voor %s BillsLate=Betalingsachterstand BillsStatistics=Statistieken afnemersfacturen BillsStatisticsSuppliers=Statistieken leveranciersfacturen +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Uitgeschakeld om dat het niet verwijderd kan worden InvoiceStandard=Standaardfactuur InvoiceStandardAsk=Standaardfactuur @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Wilt u deze factuur classificeren als 'verlaten'? ConfirmClassifyPaidPartially=Weet u zeker dat u de status van factuur %s wilt wijzigen naar betaald? ConfirmClassifyPaidPartiallyQuestion=Deze factuur is niet volledig betaald. Wat zijn de redenen om deze factuur te sluiten? 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. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. 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 diff --git a/htdocs/langs/nl_NL/compta.lang b/htdocs/langs/nl_NL/compta.lang index 31958a36849..bc6b7514631 100644 --- a/htdocs/langs/nl_NL/compta.lang +++ b/htdocs/langs/nl_NL/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Betalingen niet gekoppeld aan een factuur, dus niet g PaymentsNotLinkedToUser=Betalingen niet gekoppeld aan een gebruiker Profit=Winst AccountingResult=Boekhoudkundig resultaat +BalanceBefore=Balance (before) Balance=Saldo Debit=Debet Credit=Credit diff --git a/htdocs/langs/nl_NL/donations.lang b/htdocs/langs/nl_NL/donations.lang index 80ed87ecc96..7c77b4a2300 100644 --- a/htdocs/langs/nl_NL/donations.lang +++ b/htdocs/langs/nl_NL/donations.lang @@ -31,3 +31,4 @@ DONATION_ART200=Toon artikel 200 van CGI als u bezorgt bent DONATION_ART238=Toon artikel 238 als u bezorgt bent DONATION_ART885=Toon artikel 885 als u bezorgt bent DonationPayment=Donatie betaling +DonationValidated=Donation %s validated diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang index a77f28e39b5..a905f89839e 100644 --- a/htdocs/langs/nl_NL/errors.lang +++ b/htdocs/langs/nl_NL/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Empty expression ErrorPriceExpression21=Empty result '%s' ErrorPriceExpression22=Negative result '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Bron en doel magazijnen moeten verschillend zijn diff --git a/htdocs/langs/nl_NL/install.lang b/htdocs/langs/nl_NL/install.lang index 549c27f1137..dcb350abb4a 100644 --- a/htdocs/langs/nl_NL/install.lang +++ b/htdocs/langs/nl_NL/install.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - install InstallEasy=Volg simpelweg stap voor stap de instructies -MiscellaneousChecks=Vereisten controle +MiscellaneousChecks=Vereisten controleren ConfFileExists=Configuratiebestand %s bestaat. ConfFileDoesNotExistsAndCouldNotBeCreated=Configuratiebestand %s bestaat niet en kon ook niet worden gecreëerd ! ConfFileCouldBeCreated=Configuratiebestand %s kon worden gecreëerd. @@ -8,26 +8,26 @@ ConfFileIsNotWritable=Configuratie bestand %s is niet voor schrijven te o ConfFileIsWritable=Configuratiebestand %s kan voor schrijven geopend worden. ConfFileReload=Reload alle informatie van configuratiebestand. PHPSupportSessions=Deze PHP installatie ondersteund sessies. -PHPSupportPOSTGETOk=Deze PHP installatie ondersteund POST en GET. -PHPSupportPOSTGETKo=Mogelijk ondersteund uw PHP installatie geen POST en / of GET variabelen. Controleer deze instelling variables_order in php.ini. -PHPSupportGD=Deze PHP installatie ondersteund GD grafische functies. +PHPSupportPOSTGETOk=Deze PHP installatie ondersteunt POST en GET. +PHPSupportPOSTGETKo=Mogelijk ondersteunt uw PHP installatie geen POST en / of GET variabelen. Controleer deze instelling variables_order in php.ini. +PHPSupportGD=Deze PHP installatie ondersteunt GD grafische functies. PHPSupportCurl=PHP ondersteunt Curl. -PHPSupportUTF8=Deze PHP installatie ondersteund UTF8 functies. +PHPSupportUTF8=Deze PHP installatie ondersteunt UTF8 functies. PHPMemoryOK=Het maximale sessiegeheugen van deze PHP installatie is ingesteld op %s. Dit zou genoeg moeten zijn. PHPMemoryTooLow=Het maximale sessiegeheugen van deze PHP installatie is ingesteld op %s bytes. Dit zou te weinig kunnen zijn. Verander uw php.ini om de memory_limit instelling op minimaal %s bytes te zetten. -Recheck=Klik hier voor een significantere test -ErrorPHPDoesNotSupportSessions=Uw PHP installatie ondersteund geen sessies. Dit is vereist voor een goede werking van Dolibarr. Controleer uw PHP instellingen. -ErrorPHPDoesNotSupportGD=Uw PHP installatie ondersteund geen grafische functies. Grafieken zullen niet beschikbaar zijn. -ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl. -ErrorPHPDoesNotSupportUTF8=Uw PHP installatie ondersteund geen UTF8 functies. Dolibarr kan daardoor niet goed werken. Los dit op voordat u verder gaat met de installatie van Dolibarr. +Recheck=Klik hier voor een meer significantere test +ErrorPHPDoesNotSupportSessions=Uw PHP installatie ondersteunt geen sessies. Dit is vereist voor een goede werking van Dolibarr. Controleer uw PHP instellingen. +ErrorPHPDoesNotSupportGD=Uw PHP installatie ondersteunt geen grafische functies. Grafieken zullen niet beschikbaar zijn. +ErrorPHPDoesNotSupportCurl=Uw PHP versie ondersteunt geen Curl. +ErrorPHPDoesNotSupportUTF8=Uw PHP installatie ondersteunt geen UTF8 functies. Dolibarr kan daardoor niet goed werken. Los dit op voordat u verder gaat met de installatie van Dolibarr. ErrorDirDoesNotExists=De map %s bestaat niet. ErrorGoBackAndCorrectParameters=Ga terug en corrigeer de foutief ingestelde waarden. ErrorWrongValueForParameter=U heeft de parameter '%s' mogelijk verkeerd ingesteld. ErrorFailedToCreateDatabase=De database '%s' kon niet worden gecreëerd. -ErrorFailedToConnectToDatabase=Er kon niet verbonden worden met de database '%s'. -ErrorDatabaseVersionTooLow=Databankversie (%s) te oud. Versie %s of hoger is vereist. +ErrorFailedToConnectToDatabase=Het is niet gelukt om een verbinding met de database '%s' te maken. +ErrorDatabaseVersionTooLow=Database versie (%s) is te oud. Versie %s of hoger is vereist. ErrorPHPVersionTooLow=De geïnstalleerde PHP versie is te oud. Versie %s is nodig. -ErrorConnectedButDatabaseNotFound=De verbinding met de server kon succesvol worden opgezet, maar de database '%s' is niet gevonden. +ErrorConnectedButDatabaseNotFound=De verbinding met de server kon succesvol worden gemaakt, maar de database '%s' is niet gevonden. ErrorDatabaseAlreadyExists=Database '%s' bestaat al. IfDatabaseNotExistsGoBackAndUncheckCreate=Wanneer de database niet bestaat, ga dan terug en vink de optie "Creëer database" aan. IfDatabaseExistsGoBackAndCheckCreate=Wanneer de database al bestaat, ga dan terug en vink "Creëer database" uit. @@ -50,13 +50,13 @@ DatabaseServer=Databaseserver DatabaseName=Databasenaam DatabasePrefix=Database prefix tafel AdminLogin=Gebruikersnaam voor Dolibarr database eigenaar. -PasswordAgain=Geef uw wachtwoord opnieuw +PasswordAgain=Voer uw wachtwoord opnieuw in. AdminPassword=Wachtwoord voor de database eigenaar. CreateDatabase=Creëer database -CreateUser=Create owner or grant him permission on database +CreateUser=Creëer eigenaar en geef deze permissies op de database. DatabaseSuperUserAccess=Databaseserver - Superuser toegang (root toegang) CheckToCreateDatabase=Vink deze optie aan wanneer de database nog niet bestaat en gecreëerd moet worden.
    In dit geval, moet u de velden gebruikersnaam en wachtwoord voor het superuser (root) account onderaan deze pagina ook invullen. -CheckToCreateUser=Check box if database owner does not exist and must be created, or if it exists but database does not exists and permissions must be granted.
    In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists. +CheckToCreateUser=Schakel het selectievakje in als de database-eigenaar niet bestaat en moet worden gemaakt, of als deze bestaat maar de database niet bestaat en machtigingen moeten worden verleend.
    In dit geval moet u de login en het wachtwoord kiezen en ook de login / het wachtwoord voor het superuser-account onderaan deze pagina invullen. Als dit selectievakje niet is aangevinkt, moeten de eigenaarsdatabase en de bijbehorende wachtwoorden aanwezig zijn. DatabaseRootLoginDescription=Gebruikersnaam van de gebruiker die gemachtigd is om nieuwe databases of gebruikers aan te maken, nutteloos wanneer uw database en gebruiker al bestaan (zoals het geval wanneer u een webhosting provider gebruikt). KeepEmptyIfNoPassword=Laat dit veld leeg wanneer de gebruiker geen wachtwoord heeft (vermijd dit) SaveConfigurationFile=Waarden opslaan @@ -66,7 +66,7 @@ CreateDatabaseObjects=Creatie van databaseobjecten ReferenceDataLoading=Referentiegegevens worden geladen TablesAndPrimaryKeysCreation=Creatie van tabellen en primary keys CreateTableAndPrimaryKey=Creëer tabel %s -CreateOtherKeysForTable=Creëer foreign keys en indexes voor de tabel %s +CreateOtherKeysForTable=Creëer foreign keys en indexes voor tabel %s OtherKeysCreation=Creatie van Foreign keys en indexes FunctionsCreation=Creatie van functies AdminAccountCreation=Creatie van beheerdersaccount @@ -74,15 +74,15 @@ PleaseTypePassword=Vul een wachtwoord in a.u.b., lege wachtwoorden zijn niet toe PleaseTypeALogin=Typ een gebruikersnaam in ! PasswordsMismatch=Wachtwoorden komen niet overeen, probeert u het opnieuw ! SetupEnd=Einde van de installatie -SystemIsInstalled=De installatie is voltooid +SystemIsInstalled=De installatie is voltooid. SystemIsUpgraded=Dolibarr is succesvol bijgewerkt. YouNeedToPersonalizeSetup=U dient Dolibarr naar eigen behoefte in te richten (uiterlijk, functionaliteit, etc). Volgt u om dit te doen de onderstaande link: AdminLoginCreatedSuccessfuly=Dolibarr beheerdersaccount '%s' succesvol gecreëerd. -GoToDolibarr=Ga naar Dolibarr -GoToSetupArea=Ga naar Dolibarr (instellingsomgeving) +GoToDolibarr=Ga naar Dolibarr. +GoToSetupArea=Ga naar Dolibarr (instellingsomgeving). MigrationNotFinished=De versie van uw database is niet helemaal actueel, daarom moet u de upgrade opnieuw uitvoeren. -GoToUpgradePage=Ga opnieuw naar de upgrade pagina -WithNoSlashAtTheEnd=Zonder toevoeging van de slash "/" +GoToUpgradePage=Ga opnieuw naar de upgrade pagina. +WithNoSlashAtTheEnd=Zonder toevoeging van de slash "/" aan het eind DirectoryRecommendation=Aanbevolen wordt een map te gebruiken buiten uw webpagina map LoginAlreadyExists=Bestaat al DolibarrAdminLogin=Login van de Dolibarr beheerder @@ -132,15 +132,16 @@ MigrationFinished=Migratie voltooid LastStepDesc=Laatste stap: Definieer hier de login en het wachtwoord die u wilt gebruiken om verbinding te maken met de software. Raak deze gegevens niet kwijt omdat dit account bedoelt is om alle andere gebruikers te beheren. ActivateModule=Activeer module %s ShowEditTechnicalParameters=Klik hier om geavanceerde parameters te zien of te wijzigen. (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/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +WarningUpgrade=Waarschuwing:\nHeeft u eerst een database back-up gemaakt?\nDit wordt ten zeerste aanbevolen. Bijvoorbeeld door bugs in databasesystemen (bijvoorbeeld in MySQL versie 5.5.40 / 41/42/43), kunnen sommige gegevens of tabellen tijdens dit proces verloren gaan, dus het wordt sterk aanbevolen om een complete dump van uw database te maken voordat u met de migratie begint.\n\nKlik op OK om het migratieproces te starten ... ErrorDatabaseVersionForbiddenForMigration=Uw database versie is %s en heeft een kritieke bug die gegevensverlies veroorzaakt als u structuur veranderingen uitvoert op uw database, welke gedaan worden door het migratieproces. Vanwege deze reden, zal de migratie niet worden toegestaan ​​totdat u uw database upgrade naar een hogere versie (lijst van gekende versies met bug: %s). KeepDefaultValuesWamp=U gebruikt de Dolibarr installatiewizard van DoliWamp, dus de hier voorgestelde waarden zijn al geoptimaliseerd. Wijzig ze alleen wanneer u weet wat u doet. KeepDefaultValuesDeb=U gebruikt de Dolibarr installatiewizard uit een Ubuntu of Debian pakket, dus de hier voorgestelde waarden zijn al geoptimaliseerd. Alleen het wachtwoord van de te creëren database-eigenaar moeten worden ingevuld. Wijzig de andere waarden alleen als u weet wat u doet. KeepDefaultValuesMamp=U gebruikt de Dolibarr installatiewizard van DoliMamp, dus de hier voorgestelde waarden zijn al geoptimaliseerd. Wijzig ze alleen wanneer u weet wat u doet. KeepDefaultValuesProxmox=U gebruikt de Dolibarr installatiewizard van een Proxmox virtueel systeem, dus de hier voorgestelde waarden zijn al geoptimaliseerd. Wijzig ze alleen wanneer u weet wat u doet. -UpgradeExternalModule=Run dedicated upgrade process of external modules -SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' -NothingToDelete=Nothing to clean/delete +UpgradeExternalModule=Voer een specifiek upgradeproces uit voor externe modules +SetAtLeastOneOptionAsUrlParameter=Stel ten minste één optie in als parameter in de URL. Bijvoorbeeld: '... repair.php? Standard = confirmed' +NothingToDelete=Niets om op te ruimen / verwijderen +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Reparatie voor gedenormaliseerde gegevens @@ -150,7 +151,7 @@ MigrationProposal=Gegevensmigratie van zakelijke voorstellen MigrationInvoice=Gegevensmigratie van afnemersfacturen MigrationContract=Gegevensmigratie van contracten MigrationSuccessfullUpdate=Dolibarr is succesvol bijgewerkt. -MigrationUpdateFailed=Upgrade mislukt +MigrationUpdateFailed=Het upgrade proces is mislukt MigrationRelationshipTables=Gegevensmigratie van de relatietabellen (%s) MigrationPaymentsUpdate=Correctie betalingsgegevens MigrationPaymentsNumberToUpdate=%s betaling(en) bij te werken @@ -163,7 +164,7 @@ MigrationContractsLineCreation=Creëer contract regel voor contract %s MigrationContractsNothingToUpdate=Niets meer te doen MigrationContractsFieldDontExist=Het veld fk_facture bestaat niet meer. Niets te doen. MigrationContractsEmptyDatesUpdate=Contract lege datum correctie -MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully +MigrationContractsEmptyDatesUpdateSuccess=Contract lege datumcorrectie met succes uitgevoerd MigrationContractsEmptyDatesNothingToUpdate=Geen contract lege datum te corrigieren MigrationContractsEmptyCreationDatesNothingToUpdate=Geen contract creatiedatum te corrigeren MigrationContractsInvalidDatesUpdate=Ongeldige datum contract waarde correctie @@ -192,10 +193,11 @@ MigrationActioncommElement=Bijwerken van gegevens over acties MigrationPaymentMode=Data migratie voor de betaling mode MigrationCategorieAssociation=Migratie van categoriën MigrationEvents=Migratie van taken om taak eigenaar toe te voegen in toekennings tabel -MigrationEventsContact=Migration of events to add event contact into assignement table -MigrationRemiseEntity=Update entity field value of llx_societe_remise -MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except +MigrationEventsContact=Migratie van evenementen om afspraakcontact toe te voegen aan de toewijzingstabel +MigrationRemiseEntity=Aanpassen entity veld waarde van llx_societe_remise +MigrationRemiseExceptEntity=Aanpassen entity veld waarde van llx_societe_remise_except MigrationReloadModule=Herlaad module %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Toon niet beschikbare opties HideNotAvailableOptions=Verberg niet beschikbare opties -ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. +ErrorFoundDuringMigration=Er is een fout gemeld tijdens het migratieproces, dus de volgende stap is niet beschikbaar. Om fouten te negeren kunt u hier klikken, maar sommige functies van de applicatie werken mogelijk pas goed als deze zijn opgelost. diff --git a/htdocs/langs/nl_NL/languages.lang b/htdocs/langs/nl_NL/languages.lang index d626f5a7007..af0ffe76ae3 100644 --- a/htdocs/langs/nl_NL/languages.lang +++ b/htdocs/langs/nl_NL/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Spaans (Paraguay) Language_es_PE=Spaans (Peru) Language_es_PR=Spaans (Puerto Rico) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Spanish (Venezuela) Language_et_EE=Estlands Language_eu_ES=Bask diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang index 9751174fa74..7d160493a31 100644 --- a/htdocs/langs/nl_NL/main.lang +++ b/htdocs/langs/nl_NL/main.lang @@ -548,6 +548,18 @@ MonthShort09=sep MonthShort10=okt MonthShort11=nov MonthShort12=dec +MonthVeryShort01=J +MonthVeryShort02=Vr +MonthVeryShort03=Ma +MonthVeryShort04=A +MonthVeryShort05=Ma +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=Zo +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Bijgevoegde bestanden en documenten JoinMainDoc=Join main document DateFormatYYYYMM=JJJJ-MM @@ -762,7 +774,7 @@ SetBankAccount=Definieer Bank Rekening AccountCurrency=Account currency ViewPrivateNote=Notities bekijken XMoreLines=%s regel(s) verborgen -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=Openbare URL AddBox=Box toevoegen SelectElementAndClick=Select an element and click %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=Iedereen +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/nl_NL/other.lang b/htdocs/langs/nl_NL/other.lang index e36f1d2e086..8cfd1a9d931 100644 --- a/htdocs/langs/nl_NL/other.lang +++ b/htdocs/langs/nl_NL/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=If amount higher than %s SourcesRepository=Repository for sources Chart=Chart PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=Uitvoeroverzicht diff --git a/htdocs/langs/nl_NL/products.lang b/htdocs/langs/nl_NL/products.lang index 60ca4ff55e9..4d060ee8360 100644 --- a/htdocs/langs/nl_NL/products.lang +++ b/htdocs/langs/nl_NL/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Huidige prijs AlwaysUseNewPrice=Gebruik altijd huidige product/diensten prijs AlwaysUseFixedPrice=Gebruik vaste prijs PriceByQuantity=Verschillende prijzen per hoeveelheid +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Aantal bereik MultipriceRules=Price segment rules UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang index 78fa3f52c4e..71d8420c96a 100644 --- a/htdocs/langs/nl_NL/projects.lang +++ b/htdocs/langs/nl_NL/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=Hangende OppStatusWON=Won OppStatusLOST=Lost Budget=Budget +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/nl_NL/website.lang b/htdocs/langs/nl_NL/website.lang index 3902febbfb7..6b4e2ada84a 100644 --- a/htdocs/langs/nl_NL/website.lang +++ b/htdocs/langs/nl_NL/website.lang @@ -3,15 +3,17 @@ Shortname=Code WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them. DeleteWebsite=Delete website ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Page name/alias -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL of external CSS file WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Media library EditCss=Edit Style/CSS or HTML header EditMenu=Edit menu @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/pl_PL/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang index 792f73e20e1..648efab6e5b 100644 --- a/htdocs/langs/pl_PL/accountancy.lang +++ b/htdocs/langs/pl_PL/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=ilość sztuk TransactionNumShort=Numer transakcji AccountingCategory=Personalized groups GroupByAccountAccounting=Grupuj według konta księgowego -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=Według kont ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=Lista kont księgowych UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=Ten dziennik jest już w użytku ## Export ExportDraftJournal=Export dziennika projektu Modelcsv=Model eksportu -OptionsDeactivatedForThisExportModel=Dla tego modelu eksportu opcje są wyłączone Selectmodelcsv=Wybierz model eksportu Modelcsv_normal=Standardowy eksport Modelcsv_CEGID=Export towards CEGID Expert Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution Modelcsv_quadratus=Export towards Quadratus QuadraCompta Modelcsv_ebp=Export towards EBP Modelcsv_cogilog=Export towards Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang index b8b5ebbfbea..28a698da201 100644 --- a/htdocs/langs/pl_PL/admin.lang +++ b/htdocs/langs/pl_PL/admin.lang @@ -539,7 +539,7 @@ Module320Desc=Dodaj kanał RSS Dolibarr wewnątrz stron Module330Name=Zakładki 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. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Integracja Webcalendar Module500Name=Special expenses @@ -890,7 +890,7 @@ DictionaryStaff=Personel DictionaryAvailability=Opóźnienie dostawy DictionaryOrderMethods=Sposoby zamawiania DictionarySource=Pochodzenie wniosków / zleceń -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Modele dla planu kont DictionaryAccountancyJournal=Dzienniki kont księgowych DictionaryEMailTemplates=Szablony wiadomości e-mail @@ -904,6 +904,7 @@ SetupSaved=Konfiguracja zapisana SetupNotSaved=Setup not saved BackToModuleList=Powrót do listy modułów BackToDictionaryList=Powrót do listy słowników +TypeOfRevenueStamp=Type of revenue stamp VATManagement=Zarządzanie VAT VATIsUsedDesc=Domyślnie kiedy tworzysz perspektywy, faktury, zamówienia itd. stawka VAT pobiera z aktywnej reguły standardowej:
    Jeżeli sprzedawca nie jest płatnikiem VAT, wówczas stawka VAT domyślnie jest równa 0. Koniec reguły.
    Jeżeli kraj sprzedaży jest taki sam jak kraj zakupu, wówczas stawka VAT jest równa stawce VAT na produkt w kraju sprzedaży. Koniec reguły.
    Jeżeli sprzedawca i kupujący należą do Unii Europejskiej i dobra są środkami transportu (samochody, statki, samoloty...), domyślna stawka VAT wynosi 0% (VAT powinien być zapłacony przez kupującego w jego kraju w odpowiednim urzędzie skarbowym). Koniec reguły.
    Jeżeli sprzedawca i kupujący należą do Unii Europejskiej i kupujący jest osobą prywatną, wówczas stawka VAT jest równa stawce obowiązującej w kraju sprzedaży.Koniec reguły.
    Jeżeli sprzedawca i kupujący należą do Unii Europejskiej i kupujący jest firmą, wówczas stawka VAT jest równa 0%. Koniec reguły.
    W każdym innym przypadku domyślna stawka VAT jest równa 0%. Koniec reguły. VATIsNotUsedDesc=Domyślnie proponowany VAT wynosi 0. Może być wykorzystany w przypadku takich stowarzyszeń, osób fizycznych lub małych firm. @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/pl_PL/banks.lang b/htdocs/langs/pl_PL/banks.lang index 380add53831..ae818cf96af 100644 --- a/htdocs/langs/pl_PL/banks.lang +++ b/htdocs/langs/pl_PL/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Liczba LineRecord=Transakcja AddBankRecord=Dodaj wpis AddBankRecordLong=Dodaj wpis ręcznie +Conciliated=Reconciled ConciliatedBy=Rekoncyliowany przez DateConciliating=Data rekoncyliacji BankLineConciliated=Transakcje zaksięgowane diff --git a/htdocs/langs/pl_PL/bills.lang b/htdocs/langs/pl_PL/bills.lang index b2444f6a377..0d961034001 100644 --- a/htdocs/langs/pl_PL/bills.lang +++ b/htdocs/langs/pl_PL/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Niezapłacone faktury dostawcy dla %s BillsLate=Opóźnienia w płatnościach BillsStatistics=Statystyki faktur klientów BillsStatisticsSuppliers=Statystyki faktur dostawców +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Disabled because cannot be erased InvoiceStandard=Standardowa faktura InvoiceStandardAsk=Standardowa faktura @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Dlaczego chcesz sklasyfikować tę fakturę jako „po ConfirmClassifyPaidPartially=Czy jesteś pewien, że chcesz zmienić status faktury %s na zapłaconą? ConfirmClassifyPaidPartiallyQuestion=Ta faktura nie została zapłacona w całości. Jaka jest przyczyna, że chcesz 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. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. 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 diff --git a/htdocs/langs/pl_PL/boxes.lang b/htdocs/langs/pl_PL/boxes.lang index 82c6bd30780..49d1d4f4811 100644 --- a/htdocs/langs/pl_PL/boxes.lang +++ b/htdocs/langs/pl_PL/boxes.lang @@ -77,7 +77,7 @@ BoxTitleLastModifiedSupplierBills=Ostatnie %s zmodyfikowanych rachunków dostawc BoxTitleLatestModifiedSupplierOrders=Ostatnie %s zmodyfikowanych zamówień dostawców BoxTitleLastModifiedCustomerBills=Ostatnie %s zmodyfikowanych rachunków klientów BoxTitleLastModifiedCustomerOrders=Ostatnich %s modyfikowanych zamówień klientów -BoxTitleLastModifiedPropals=Latest %s modified proposals +BoxTitleLastModifiedPropals=Ostatnich %s zmodyfikowanych ofert ForCustomersInvoices=Faktury Klientów ForCustomersOrders=Zamówienia klientów ForProposals=Oferty diff --git a/htdocs/langs/pl_PL/companies.lang b/htdocs/langs/pl_PL/companies.lang index 6f09e25f5a9..9743ab8dad0 100644 --- a/htdocs/langs/pl_PL/companies.lang +++ b/htdocs/langs/pl_PL/companies.lang @@ -29,7 +29,7 @@ AliasNameShort=Alias Companies=Firmy CountryIsInEEC=Kraj należy do Europejskiej Strefy Ekonomicznej ThirdPartyName=Nazwa kontrahenta -ThirdPartyEmail=Third party email +ThirdPartyEmail=Email kontrahenta ThirdParty=Kontrahent ThirdParties=Kontrahenci ThirdPartyProspects=Potencjalni klienci @@ -51,7 +51,7 @@ Lastname=Nazwisko Firstname=Imię PostOrFunction=Stanowisko UserTitle=Tytuł -NatureOfThirdParty=Nature of Third party +NatureOfThirdParty=Rodzaj kontrahenta Address=Adres State=Województwo StateShort=Województwo @@ -267,7 +267,7 @@ CustomerAbsoluteDiscountShort=Bezwzględny rabat CompanyHasRelativeDiscount=Ten klient ma standardowy rabat %s%% CompanyHasNoRelativeDiscount=Ten klient domyślnie nie posiada względnego rabatu CompanyHasAbsoluteDiscount=Ten klient ma dostępny rabat (kredyty lub zaliczki) dla %s%s -CompanyHasDownPaymentOrCommercialDiscount=This customer has discount available (commercial, down payments) for %s %s +CompanyHasDownPaymentOrCommercialDiscount=Ten klient ma dostępny rabat (komercyjny, zaliczki) dla %s%s CompanyHasCreditNote=Ten klient nadal posiada noty kredytowe dla %s %s CompanyHasNoAbsoluteDiscount=Ten klient nie posiada punktów rabatowych CustomerAbsoluteDiscountAllUsers=Bezwzględne rabaty (przyznawane przez wszystkich użytkowników) diff --git a/htdocs/langs/pl_PL/compta.lang b/htdocs/langs/pl_PL/compta.lang index 769a891212e..ed4c7b9569a 100644 --- a/htdocs/langs/pl_PL/compta.lang +++ b/htdocs/langs/pl_PL/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Płatność nie dowiązana do żadnej faktury, więc PaymentsNotLinkedToUser=Płatnośc nie dowiązana do żadnego użytkownika Profit=Zysk AccountingResult=Wynik księgowy +BalanceBefore=Balance (before) Balance=Saldo Debit=Rozchody Credit=Kredyt diff --git a/htdocs/langs/pl_PL/donations.lang b/htdocs/langs/pl_PL/donations.lang index 74c207490d5..787d44a37e2 100644 --- a/htdocs/langs/pl_PL/donations.lang +++ b/htdocs/langs/pl_PL/donations.lang @@ -31,3 +31,4 @@ DONATION_ART200=Pokaż artykuł 200 z CGI, jeśli obawiasz DONATION_ART238=Pokaż artykuł 238 z CGI, jeśli obawiasz DONATION_ART885=Pokaż artykuł 885 z CGI, jeśli obawiasz DonationPayment=Płatności Darowizna +DonationValidated=Donation %s validated diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang index f843519a575..62ebe49f726 100644 --- a/htdocs/langs/pl_PL/errors.lang +++ b/htdocs/langs/pl_PL/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Puste wyrażenie ErrorPriceExpression21=Pusty wynik '%s' ErrorPriceExpression22=Wynik negatywny '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Wewnętrzny błąd '%s' ErrorPriceExpressionUnknown=Nieznany błąd '%s' ErrorSrcAndTargetWarehouseMustDiffers=Magazyn źródłowy i docelowy musi być różny diff --git a/htdocs/langs/pl_PL/holiday.lang b/htdocs/langs/pl_PL/holiday.lang index 1e80d8c5f89..164418c393c 100644 --- a/htdocs/langs/pl_PL/holiday.lang +++ b/htdocs/langs/pl_PL/holiday.lang @@ -79,8 +79,8 @@ HolidaysCancelation=Anulowanie wniosku urlopowego EmployeeLastname=Nazwisko pracownika EmployeeFirstname=Imię pracownika TypeWasDisabledOrRemoved=Typ urlopu (id %s) zostało wyłączone lub usunięte -LastHolidays=Latest %s leave requests -AllHolidays=All leave requests +LastHolidays=Ostatnie %s wnioski urlopowe +AllHolidays=Wszystkie wnioski urlopowe ## Configuration du Module ## LastUpdateCP=Ostatnia automatyczna aktualizacja alokacji urlopów diff --git a/htdocs/langs/pl_PL/install.lang b/htdocs/langs/pl_PL/install.lang index 0032debd1ca..062a4bf2f0a 100644 --- a/htdocs/langs/pl_PL/install.lang +++ b/htdocs/langs/pl_PL/install.lang @@ -139,8 +139,9 @@ KeepDefaultValuesDeb=Używasz kreatora instalacji Dolibarr z pakietu Linux (Ubut KeepDefaultValuesMamp=Używasz kreatora instalacji, więc zaproponowane wartości są zoptymalizowane. Zmieniaj je tylko jeśli wiesz co robisz. KeepDefaultValuesProxmox=Możesz skorzystać z kreatora konfiguracji Dolibarr z urządzeniem wirtualnym Proxmox, więc wartości zaproponowane tutaj są już zoptymalizowane. Zmieniaj je tylko jeśli wiesz co robisz. UpgradeExternalModule=Uruchom dedykowany proces uaktualniania modułów zewnętrznych -SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' -NothingToDelete=Nothing to clean/delete +SetAtLeastOneOptionAsUrlParameter=Ustaw przynajmniej jedną opcję jako parametr w adresie URL. Na przykład: '...repair.php?standard=confirmed' +NothingToDelete=Nic do wyczyszczenia/usunięcia +NothingToDo=Nic do zrobienia ######### # upgrade MigrationFixData=Napraw nieznormalizowane dane @@ -192,10 +193,11 @@ MigrationActioncommElement=Aktualizacja danych na temat działań MigrationPaymentMode=Migracji danych w trybie płatności MigrationCategorieAssociation=Migracja kategorii MigrationEvents=Przenieś wydarzenie by dodać nowego właściciela do przypisanej tabeli. -MigrationEventsContact=Migration of events to add event contact into assignement table +MigrationEventsContact=Migracja zdarzeń w celu dodania kontaktu zdarzenia do tabeli przydziału MigrationRemiseEntity=Zaktualizuj wartość pola podmiotu llx_societe_remise MigrationRemiseExceptEntity=Zaktualizuj wartość pola podmiotu llx_societe_remise_except MigrationReloadModule=Odśwież moduł %s +MigrationResetBlockedLog=Zresetuj moduł BlockedLog dla algorytmu v7 ShowNotAvailableOptions=Pokaż niedostępne opcje. HideNotAvailableOptions=Ukryj niedostępne opcje. ErrorFoundDuringMigration=Wystąpiły błędy podczas procesu migracji więc następny krok jest nie dostępny. Żeby zignorować błędy, możesz kliknąć tutaj, ale aplikacja bądź jakieś jej funkcje mogą działać niepoprawnie do póki nie zostaną naprawione. diff --git a/htdocs/langs/pl_PL/languages.lang b/htdocs/langs/pl_PL/languages.lang index 584dd33153f..b229b2f9a98 100644 --- a/htdocs/langs/pl_PL/languages.lang +++ b/htdocs/langs/pl_PL/languages.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - languages Language_ar_AR=Arabski -Language_ar_EG=Arabic (Egypt) +Language_ar_EG=Arabski (Egipt) Language_ar_SA=Arabski Language_bn_BD=Bengalski Language_bg_BG=Bułgarski @@ -35,6 +35,7 @@ Language_es_PA=Hiszpański (Panama) Language_es_PY=Hiszpański (Paragwaj) Language_es_PE=Hiszpański (Peru) Language_es_PR=Hiszpański (Portoryko) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Hiszpański (Wenezuela) Language_et_EE=Estoński Language_eu_ES=Baskijski diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang index eb16933ba82..1aef6729019 100644 --- a/htdocs/langs/pl_PL/main.lang +++ b/htdocs/langs/pl_PL/main.lang @@ -548,6 +548,18 @@ MonthShort09=wrz MonthShort10=paź MonthShort11=lis MonthShort12=gru +MonthVeryShort01=J +MonthVeryShort02=Pi +MonthVeryShort03=Po +MonthVeryShort04=A +MonthVeryShort05=Po +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=Ni +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Dołączone pliki i dokumenty JoinMainDoc=Join main document DateFormatYYYYMM=RRRR-MM @@ -762,7 +774,7 @@ SetBankAccount=Przypisz konto bankowe AccountCurrency=Account currency ViewPrivateNote=Wyświetl notatki XMoreLines=%s lini(e) ukryte -ShowMoreLines=Pokaż więcej lini +ShowMoreLines=Show more/less lines PublicUrl=Publiczny URL AddBox=Dodaj skrzynke SelectElementAndClick=Wybierz element i kliknij %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=Wszyscy +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/pl_PL/opensurvey.lang b/htdocs/langs/pl_PL/opensurvey.lang index 50ef898a115..ab6b46ecbc6 100644 --- a/htdocs/langs/pl_PL/opensurvey.lang +++ b/htdocs/langs/pl_PL/opensurvey.lang @@ -57,4 +57,4 @@ ErrorInsertingComment=Wystąpił błąd podczas wstawiania twojego komentarza MoreChoices=Wprowadź więcej możliwości dla głosujących SurveyExpiredInfo=Ankieta została zamknięta lub upłynął termin ważności oddawania głosów. EmailSomeoneVoted=% S napełnił linię. Możesz znaleźć ankietę na link:% s -ShowSurvey=Show survey +ShowSurvey=Pokaż ankietę diff --git a/htdocs/langs/pl_PL/other.lang b/htdocs/langs/pl_PL/other.lang index 53216d966b4..92d183684c1 100644 --- a/htdocs/langs/pl_PL/other.lang +++ b/htdocs/langs/pl_PL/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=Jeśli kwota wyższa niż %s SourcesRepository=Źródła dla repozytorium Chart=Chart PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=Wywóz obszarze diff --git a/htdocs/langs/pl_PL/products.lang b/htdocs/langs/pl_PL/products.lang index 0e93ce8fe0b..130ec3d6a02 100644 --- a/htdocs/langs/pl_PL/products.lang +++ b/htdocs/langs/pl_PL/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Aktualna cena AlwaysUseNewPrice=Zawsze używaj aktualnej ceny produktu/usługi AlwaysUseFixedPrice=Zastosuj stałą cenę PriceByQuantity=Różne ceny według ilości +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Zakres ilości MultipriceRules=Price segment rules UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/pl_PL/projects.lang b/htdocs/langs/pl_PL/projects.lang index c3f0603cceb..a8355c6572e 100644 --- a/htdocs/langs/pl_PL/projects.lang +++ b/htdocs/langs/pl_PL/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=W oczekiwaniu OppStatusWON=Won OppStatusLOST=Zagubiony Budget=Budżet +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/pl_PL/propal.lang b/htdocs/langs/pl_PL/propal.lang index 33a35e25845..4dd74e785cb 100644 --- a/htdocs/langs/pl_PL/propal.lang +++ b/htdocs/langs/pl_PL/propal.lang @@ -16,7 +16,7 @@ AddProp=Utwórz wniosek ConfirmDeleteProp=Are you sure you want to delete this commercial proposal? ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name %s? LastPropals=Latest %s proposals -LastModifiedProposals=Latest %s modified proposals +LastModifiedProposals=Ostatnich %s zmodyfikowanych ofert AllPropals=Wszystkie oferty SearchAProposal=Szukaj oferty NoProposal=No proposal diff --git a/htdocs/langs/pl_PL/sms.lang b/htdocs/langs/pl_PL/sms.lang index 15cc7e492da..c221e3acb35 100644 --- a/htdocs/langs/pl_PL/sms.lang +++ b/htdocs/langs/pl_PL/sms.lang @@ -48,4 +48,4 @@ SmsInfoNumero= (W formacie międzynarodowym np.: +33899701761) DelayBeforeSending=Opóźnienie przed wysłaniem (w minutach) SmsNoPossibleSenderFound=Brak nadawcy. Sprawdź ustawienia dostawcy usług SMS. SmsNoPossibleRecipientFound=Odbiorca niedostępny. Sprawdź konfigurację dostawcy SMS. -DisableStopIfSupported=Disable STOP message (if supported) +DisableStopIfSupported=Wyłącz komunikat STOP (jeśli jest obsługiwany) diff --git a/htdocs/langs/pl_PL/website.lang b/htdocs/langs/pl_PL/website.lang index 463a25f2ecb..e47b9d00f02 100644 --- a/htdocs/langs/pl_PL/website.lang +++ b/htdocs/langs/pl_PL/website.lang @@ -3,15 +3,17 @@ Shortname=Kod WebsiteSetupDesc=Stwórz tyle stron ile potrzebujesz. Następnie przejść do menu Strony WWW by je edytować DeleteWebsite=Skasuj stronę ConfirmDeleteWebsite=Jesteś pewny że chcesz skasować stronę? Całą jej zawartość zostanie usunięta. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Nazwa strony -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL zewnętrznego pliku CSS WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Biblioteka mediów EditCss=Edytuj styl / CSS lub nagłówek HTML EditMenu=Edytuj Menu @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=Brak stron SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Duplikuj stronę SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/pt_BR/accountancy.lang b/htdocs/langs/pt_BR/accountancy.lang index 4888ed7f9ac..26cb9f5fc17 100644 --- a/htdocs/langs/pt_BR/accountancy.lang +++ b/htdocs/langs/pt_BR/accountancy.lang @@ -106,7 +106,6 @@ ListOfProductsWithoutAccountingAccount=Lista de produtos não vinculados a qualq ChangeBinding=Alterar a vinculação AccountingJournals=Relatórios da contabilidade AccountingJournalType2=De vendas -OptionsDeactivatedForThisExportModel=Para este modelo de exportação, as opções são desativadas Selectmodelcsv=Escolha um modelo de exportação Modelcsv_CEGID=Exportação em direção CEGID Especialista em Contabilidade Modelcsv_COALA=Exportar para Sage Coala diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang index 4c12fbb803b..13a39d6bb8b 100644 --- a/htdocs/langs/pt_BR/admin.lang +++ b/htdocs/langs/pt_BR/admin.lang @@ -449,7 +449,6 @@ Module320Desc=Adiciona um RSS feed dentro das páginas de tela do Dolibarr Module330Name=Marcadores de Página Module330Desc=Gerenciamento de agendamentos Module400Name=Projetos -Module400Desc=Gestor de Projetos dentro de outros módulos Module410Desc=Integração do Webcalendar Module500Name=Taxas, Contribuições Sociais e Dividendos Module500Desc=Gestor Taxas, Contribuições Sociais e Dividentos diff --git a/htdocs/langs/pt_BR/banks.lang b/htdocs/langs/pt_BR/banks.lang index 5675ffd28f2..187347403bc 100644 --- a/htdocs/langs/pt_BR/banks.lang +++ b/htdocs/langs/pt_BR/banks.lang @@ -69,6 +69,7 @@ StatusAccountClosed=Inativa LineRecord=Transação AddBankRecord=Adicionar transação AddBankRecordLong=Adicionar manualmente uma transação +Conciliated=Conciliada ConciliatedBy=Reconciliado por DateConciliating=Data da reconciliação BankLineConciliated=Transação reconciliada diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang index 5361051f88c..98631a08797 100644 --- a/htdocs/langs/pt_PT/accountancy.lang +++ b/htdocs/langs/pt_PT/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Número da peça TransactionNumShort=Núm. de transação AccountingCategory=Grupos personalizados GroupByAccountAccounting=Agrupar por conta contabilística -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=Por contas ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consulte aqui a lista de clientes e fornecedores e as suas ListAccounts=Lista de contas contabilísticas UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=Este diário já está a ser utilizado ## Export ExportDraftJournal=Exportar o diário rascunho Modelcsv=Modelo de exportação -OptionsDeactivatedForThisExportModel=Para este modelo de exportação, as opções estão desativadas Selectmodelcsv=Selecione um modelo de exportação Modelcsv_normal=Exportação clássica Modelcsv_CEGID=Exportar relativamente a CEGID Expert Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Exportar relativamente a Sage Ciel Compta ou Compta Evolution Modelcsv_quadratus=Exportar relativamente a Quadratus QuadraCompta Modelcsv_ebp=Exportar relativamente a EBP Modelcsv_cogilog=Exportar relativamente a Cogilog -Modelcsv_agiris=Exportar para Agiris (Teste) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=ID de plano de contas diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang index 8ed20c97c98..682978c48e6 100644 --- a/htdocs/langs/pt_PT/admin.lang +++ b/htdocs/langs/pt_PT/admin.lang @@ -10,7 +10,7 @@ VersionDevelopment=Desenvolvimento VersionUnknown=Desconhecida VersionRecommanded=Recomendada FileCheck=Verificador da integridade dos ficheiros -FileCheckDesc=This tool allows you to check the integrity of files and setup of your application, comparing each files with the official ones. Value of some setup constants may also be checked. You can use this tool to detect if some files were modified by a hacker for example. +FileCheckDesc=Esta ferramenta permite que você verifique a integridade dos arquivos e a configuração do seu aplicativo, comparando cada arquivo com o oficial. O valor de algumas constantes de configuração também pode ser verificado. Você pode usar essa ferramenta para detectar se alguns arquivos foram modificados por um hacker, por exemplo. FileIntegrityIsStrictlyConformedWithReference=A integridade dos ficheiros é ajustada rigorosamente conforme a referência. FileIntegrityIsOkButFilesWereAdded=A verificação da integridade dos arquivos passou, no entanto, alguns arquivos novos foram adicionados. FileIntegritySomeFilesWereRemovedOrModified=A verificação da integridade dos ficheiros falhou. Alguns ficheiros foram modificados, removidos ou adicionados. @@ -40,8 +40,8 @@ WebUserGroup=Utilizador/grupo do servidor da Web NoSessionFound=O seu PHP parece não permitir a listagem das sessões ativas. A diretoria utilizada para guardar as sessões (%s) poderá estar protegida (por exemplo, pelas permissões do SO ou pela diretiva open_basedir PHP ). DBStoringCharset=Conjunto de carateres da base de dados para guardar os dados DBSortingCharset=Conjunto de carateres da base de dados para ordenar os dados -ClientCharset=Client charset -ClientSortingCharset=Client collation +ClientCharset=Jogo de caráter Cliente +ClientSortingCharset=Colação de clientes WarningModuleNotActive=O módulo %s deve estar ativado WarningOnlyPermissionOfActivatedModules=Só são mostradas aqui as permissões relacionadas com os módulos ativados. Pode ativar outros módulos em Início->Configuração->Módulos. DolibarrSetup=Instalar ou atualizar o Dolibarr @@ -127,11 +127,11 @@ DaylingSavingTime=Horário de verão CurrentHour=Hora do PHP (servidor) CurrentSessionTimeOut=Sessão atual expirou YouCanEditPHPTZ=Para definir um fuso horário diferente do PHP (não é necessário), você pode tentar adicionar um ficheiro .htaccess contendo uma linha como esta "SetEnv TZ Europe/Paris" -HoursOnThisPageAreOnServerTZ=Warning, in contrary of other screens, hours on this page are not in your local timezone, but for the timezone of the server. +HoursOnThisPageAreOnServerTZ=Aviso, ao contrário de outras ecrans, as horas nesta página não estão no seu fuso horário local, mas para o fuso horário do servidor. Box=Widget Boxes=Widgets MaxNbOfLinesForBoxes=Número máximo de linhas para os widgets -AllWidgetsWereEnabled=All available widgets are enabled +AllWidgetsWereEnabled=Todos os widgets disponíveis estão habilitados PositionByDefault=Ordem predefinida Position=Posição MenusDesc=Os gestores de menu definem o conteúdo das duas barras de menu (horizontal e vertical) @@ -199,13 +199,13 @@ ModulesDeployDesc=Se as permissões no seu sistema de ficheiros o permitir, voc ModulesMarketPlaces=Procurar aplicações/módulos externos ModulesDevelopYourModule=Desenvolva as suas próprias aplicações/módulos ModulesDevelopDesc=Pode desenvolver ou encontrar um parceiro para desenvolver por você, o seu módulo personalizado -DOLISTOREdescriptionLong=Instead of switching on www.dolistore.com web site to find an external module, you can use this embedded tool that will make the seach on the external market place for you (may be slow, need an internet access)... +DOLISTOREdescriptionLong=Em vez de ligar o site www.dolistore.com para encontrar um módulo externo, você pode usar esta ferramenta incorporada que tornará a procura no mercado externo para você (pode ser lento, precisa de um acesso à internet) ... NewModule=Novo FreeModule=Livre CompatibleUpTo=Compatível com a versão %s -NotCompatible=This module does not seem compatible with your Dolibarr %s (Min %s - Max %s). -CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s - Max %s). -SeeInMarkerPlace=See in Market place +NotCompatible=Este módulo não parece compatível com o seu Dolibarr %s (Min%s - Max%s). +CompatibleAfterUpdate=Este módulo requer uma atualização para o seu Dolibarr %s(Min%s-Max%s). +SeeInMarkerPlace=Veja no mercado de modulos Updated=Atualizado Nouveauté=Novidade AchatTelechargement=Comprar / Download @@ -213,7 +213,7 @@ GoModuleSetupArea=Para implementar/instalar um novo módulo, vá para a área de DoliStoreDesc=DoliStore, o mercado oficial para módulos externos Dolibarr ERP/CRM DoliPartnersDesc=Lista de empresas que desenvolvem módulos ou funcionalidades personalizadas (Nota: qualquer pessoa com experiência em programação PHP pode proporcionar o desenvolvimento personalizado para um projeto open source) WebSiteDesc=Indique sites de referência para encontrar mais módulos... -DevelopYourModuleDesc=Some solutions to develop your own module... +DevelopYourModuleDesc=Algumas soluções para desenvolver seu próprio módulo ... URL=Hiperligação BoxesAvailable=Aplicativos disponíveis BoxesActivated=Aplicativos ativados @@ -263,7 +263,7 @@ NewByMonth=Novo por mês Emails=Emails EMailsSetup=Configuração de emails EMailsDesc=Esta página permite substituir os parâmetros PHP relacionados com o envio de emails. Na maioria dos casos em sistemas operativos Unix/Linux, a configuração PHP está correta e estes parâmetros são inúteis. -EmailSenderProfiles=Emails sender profiles +EmailSenderProfiles=Perfis do remetente de e-mails MAIN_MAIL_SMTP_PORT=Porta de SMTP/SMTPS (Por predefinição no php.ini: %s) MAIN_MAIL_SMTP_SERVER=Servidor SMTP/SMTPS (Por predefinição no php.ini: %s) MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Porta do servidor SMTP (Não definido em PHP em sistemas de tipo Unix) @@ -285,7 +285,7 @@ UserEmail=Email do utilizador CompanyEmail=E-mail da empresa FeatureNotAvailableOnLinux=Funcionalidade não disponivel em sistemas Unix. Teste parâmetros sendmail localmente. SubmitTranslation=Se a tradução para esta lingua não estiver completa ou se encontrar erros, pode corrigi-los editando os ficheiros no diretório langs/%s e submetendo-os em www.transifex.com/dolibarr-association/dolibarr/ -SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory langs/%s and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr. +SubmitTranslationENUS=Se a tradução para este idioma não estiver completa ou você encontrar erros, você pode corrigir isso editando arquivos em idiomas de diretório langs/ %s e enviar arquivos modificados em dolibarr.org/forum ou para desenvolvedores em github.com/Dolibarr/dolibarr. ModuleSetup=Configuração do módulo ModulesSetup=Módulos/Aplicação - Configuração ModuleFamilyBase=Sistema @@ -310,7 +310,7 @@ StepNb=Passo %s FindPackageFromWebSite=Encontre um pacote que fornece a funcionalidade desejada (por exemplo, na página oficial %s). DownloadPackageFromWebSite=Descarregue o pacote (por exemplo, da página oficial %s). UnpackPackageInDolibarrRoot=Descompactar os ficheiros para a raiz da instalação Dolibarr: %s -UnpackPackageInModulesRoot=To deploy/install an external module, unpack the packaged files into the server directory dedicated to modules: %s +UnpackPackageInModulesRoot=Para implantar / instalar um módulo externo, descompacte os arquivos empacotados no diretório do servidor dedicado aos módulos:%s SetupIsReadyForUse=A instalação do módulo terminou. No entanto você deve ativar e configurar o módulo na sua aplicação, indo à página de configuração de módulos: %s. NotExistsDirect=O diretório raiz alternativo não está definido para um diretório existente.
    InfDirAlt=Desde a versão 3 do Dolibarr que é possível definir um diretório raiz alternativo. Isto permite que você consiga armazenar plug-ins e templates, num diretório dedicado.
    Para tal basta criar um dirétorio na raiz do Dolibarr (ex: dedicado).
    @@ -409,12 +409,12 @@ ExtrafieldCheckBox=Caixas de marcação ExtrafieldCheckBoxFromList=Caixas de marcação da tabela ExtrafieldLink=Vincular a um objeto ComputedFormula=Campo calculado -ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: $db, $conf, $langs, $mysoc, $user, $object.
    WARNING: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.
    Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.

    Example of formula:
    $object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)

    Example to reload object
    (($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'

    Other example of formula to force load of object and its parent object:
    (($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Parent project not found' +ComputedFormulaDesc=Você pode inserir aqui uma fórmula usando outras propriedades do objeto ou qualquer codificação PHP para obter um valor calculado dinâmico. Você pode usar todas as fórmulas compatíveis com PHP, incluindo o "?" operador de condição e seguinte objeto global: $db, $conf, $langs, $mysoc, $user, $object.
    AVISO: Somente algumas propriedades de $object podem estar disponíveis. Se você precisa de propriedades não carregadas, basta buscar o objeto na sua fórmula, como no segundo exemplo.
    Usando um campo calculado significa que você não pode entrar qualquer valor da interface. Além disso, se houver um erro de sintaxe, a fórmula pode retornar nada.

    Exemplo de fórmula:
    $object-> id <10? round ($object-> id / 2, 2): ($object-> id + 2 * $user-> id) * (int) substr($mysoc-> zip, 1, 2)

    Exemplo para recarregar o objeto
    (($reloadedobj = new Societe ($db)) && ($reloadedobj->fetch($obj-> id? $obj-> id: ($obj-> rowid? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options ['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'

    Outro exemplo de fórmula para forçar a carga do objeto e seu objeto pai:
    (($reloadedobj = new Task ($db)) && ($reloadedobj->fetch ($object-> id)> 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj-> fetch($reloadedobj->fk_project)> 0)) ? $secondloadedobj->ref: 'Projeto pai não encontrado' ExtrafieldParamHelpselect=A lista de parâmetros tem seguir o seguinte esquema chave,valor (no qual a chave não pode ser '0')

    por exemplo:
    1,value1
    2,value2
    3,value3
    ...

    Para que a lista dependa noutra lista de atributos complementares:
    1,value1|options_parent_list_code:parent_key
    2,value2|options_parent_list_code:parent_key

    Para que a lista dependa doutra lista:
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key ExtrafieldParamHelpcheckbox=A lista de valores tem de seguir o seguinte esquema chave,valor (onde a chave não pode ser '0')

    por exemplo:
    1,value1
    2,value2
    3,value3
    ... ExtrafieldParamHelpradio=A lista de valores tem de seguir o seguinte esquema chave,valor (onde a chave não pode ser '0')

    por exemplo:
    1,value1
    2,value2
    3,value3
    ... -ExtrafieldParamHelpsellist=List of values comes from a table
    Syntax : table_name:label_field:id_field::filter
    Example : c_typent:libelle:id::filter

    - idfilter is necessarly a primary int key
    - filter can be a simple test (eg active=1) to display only active value
    You can also use $ID$ in filter witch is the current id of current object
    To do a SELECT in filter use $SEL$
    if you want to filter on extrafields use syntax extra.fieldcode=... (where field code is the code of extrafield)

    In order to have the list depending on another complementary attribute list:
    c_typent:libelle:id:options_parent_list_code|parent_column:filter

    In order to have the list depending on another list:
    c_typent:libelle:id:parent_list_code|parent_column:filter -ExtrafieldParamHelpchkbxlst=List of values 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
    You can also use $ID$ in filter witch is the current id of current object
    To do a SELECT in filter use $SEL$
    if you want to filter on extrafields use syntax extra.fieldcode=... (where field code is the code of extrafield)

    In order to have the list depending on another complementary attribute list :
    c_typent:libelle:id:options_parent_list_code|parent_column:filter

    In order to have the list depending on another list:
    c_typent:libelle:id:parent_list_code|parent_column:filter +ExtrafieldParamHelpsellist=Lista dos valores da tabela
    sintaxe : table_name:label_field:id_field::filter
    Exemplo : c_typent:libelle:id::filter

    -idfilter é necessariamente uma chave primaria enteira
    -filter (filtro) é um simples teste (ex active=1) para mostrar somente os valores activos
    tem somente de usar $ID$ no filtro como corente id do objecto
    Para fazer um SELECT no filtro use $SEL$
    se quizer um filtro com extrafields use a sintax extra.fiedlcode=... (donde field code é o codigo do extrafield)

    Para que a lista dependa de outra lista de atributos complementares:
    c_typent:libelle:id:options_ parent_list_code |parent_column:filter

    Para ter a lista dependendo de outra lista:
    c_typent:libelle:id: parent_list_code |parent_column:filter +ExtrafieldParamHelpchkbxlst=Lista dos valores da tabela
    sintaxe : table_name:label_field:id_field::filter
    Exemplo : c_typent:libelle:id::filter

    filter (filtro) é um simples teste (ex active=1) para mostrar somente os valores activos
    tem somente de usar $ID$ no filtro como corente id do objecto
    Para fazer um SELECT no filtro use $SEL$
    se quizer um filtro com extrafields use a sintax extra.fiedlcode=... (donde field code é o codigo do extrafield)

    Para que a lista dependa de outra lista de atributos complementares:
    c_typent:libelle:id:options_ parent_list_code |parent_column:filter

    Para ter a lista dependendo de outra lista:
    c_typent:libelle:id: parent_list_code |parent_column:filter ExtrafieldParamHelplink=Os parâmetros devem ser ObjectName:Classpath
    Syntax: ObjectName:Classpath
    Exemplo: Societe:societe/class/societe.class.php LibraryToBuildPDF=Biblioteca utilizada para gerar PDF WarningUsingFPDF=Aviso: O seu ficheiro conf.php contém a diretiva dolibarr_pdf_force_fpdf=1. Isto significa que utiliza a biblioteca FPDF para gerar ficheiros PDF. Esta biblioteca está desatualizada e não suporta muitas funcionalidades (Unicode, transparência de imagens, línguas asiáticas, árabes ou cirílicas, ...), por isso você pode experienciar alguns erros durante a produção de PDFs.
    Para resolver isto e para ter suporte completo para produção de PDF, por favor descarregue a biblioteca TCPDF, comente ou remova a linha $dolibarr_pdf_force_fpdf=1, e adicione $dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir' @@ -442,31 +442,31 @@ NoDetails=Sem mais detalhes no rodapé DisplayCompanyInfo=Exibir morada da empresa DisplayCompanyManagers=Mostrar nomes dos gestores DisplayCompanyInfoAndManagers=Exibir a morada da empresa e menus de gestor -EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible. -ModuleCompanyCodeAquarium=Return an accounting code built by:
    %s followed by third party supplier code for a supplier accounting code,
    %s followed by third party customer code for a customer accounting code. +EnableAndSetupModuleCron=Se você deseja que esta fatura periódica seja gerada automaticamente, o módulo *1 %s* deve ser habilitado e configurado corretamente. Caso contrário, a geração de faturas deve ser feita manualmente a partir deste modelo com o botão * Criar *. Observe que, mesmo que você tenha ativado a geração automática, você ainda pode iniciar com segurança a geração manual. A geração de duplicatas para o mesmo período não é possível. +ModuleCompanyCodeAquarium=Retorno de um código de contabilidade construído por:
    %s seguido do código de fornecedor de terceiros para um código de contabilidade do fornecedor,
    %s seguido do código de cliente de terceiros para um código de contabilidade do cliente. ModuleCompanyCodePanicum=Retornar um código de contabilidade vazio. -ModuleCompanyCodeDigitaria=Accounting 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. -Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).
    Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required. +ModuleCompanyCodeDigitaria=O código de contabilidade depende do código de terceiros. O código é composto pelo caractere "C" na primeira posição seguida pelos primeiros 5 caracteres do código de terceiros. +Use3StepsApproval=Por padrão, as ordens de compra precisam ser criadas e aprovadas por 2 usuários diferentes (um passo / usuário para criar e um passo / usuário para aprovar. Note que, se o usuário tiver permissão para criar e aprovar, um passo / usuário será suficiente) . Você pode solicitar esta opção para introduzir uma terceira etapa / aprovação do usuário, se o valor for superior a um valor dedicado (então serão necessárias 3 etapas: 1 = validação, 2 = primeira aprovação e 3 = segunda aprovação se a quantidade for suficiente). 1
    Defina isto como vazio se uma aprovação (2 etapas) for suficiente, ajuste-o para um valor muito baixo (0,1) se uma segunda aprovação (3 etapas) for sempre necessária. UseDoubleApproval=Utilizar uma aprovação de 3 etapas quando o valor (sem impostos) for superior a... -WarningPHPMail=WARNING: Some email providers (like Yahoo) does not allow you to send an email from another server than the Yahoo server if the email address used as a sender is your Yahoo email (like myemail@yahoo.com, myemail@yahoo.fr, ...). Your current setup use the server of the application to send email, so some recipients (the one compatible with the restrictive DMARC protocol), will ask Yahoo if they can accept your email and Yahoo will respond "no" because the server is not a server owned by Yahoo, so few of your sent Emails may not be accepted.
    If your Email provider (like Yahoo) has this restriction, you must change Email setup to choose the other method "SMTP server" and enter the SMTP server and credentials provided by your Email provider (ask your EMail provider to get SMTP credentials for your account). +WarningPHPMail=AVISO: alguns provedores de e-mail (como o Yahoo) não permitem que você envie um e-mail de outro servidor que o servidor Yahoo se o endereço de e-mail usado como remetente é seu e-mail do Yahoo (como myemail@yahoo.com, myemail@yahoo.fr, ...). A sua configuração atual usa o servidor do aplicativo para enviar e-mail, de modo que alguns destinatários (o compatível com o protocolo DMARC restritivo) perguntarão ao Yahoo se eles podem aceitar seu e-mail e o Yahoo responderá "não" porque o servidor não é um servidor Propriedade do Yahoo, então poucos de seus e-mails enviados podem não ser aceitos.
    Se o seu provedor de e-mail (como o Yahoo) tiver essa restrição, você deve alterar a configuração de e-mail para escolher o outro método "Servidor SMTP" e digitar o servidor SMTP e as credenciais fornecidas por seu provedor de e-mail (peça ao seu provedor de E-mail para obter credenciais SMTP para sua conta). ClickToShowDescription=Clique para mostrar a descrição DependsOn=Este módulo depende do(s) módulo(s) RequiredBy=Este módulo é necessário para o(s) módulo(s) -TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. This need to have technical knowledges to read the content of the HTML page to get the key name of a field. -PageUrlForDefaultValues=You must enter here the relative url of the page. If you include parameters in URL, the default values will be effective if all parameters are set to same value. Examples: -PageUrlForDefaultValuesCreate=
    For form to create a new thirdparty, it is %s,
    If you want default value only if url has some parameter, you can use %s -PageUrlForDefaultValuesList=
    For page that list thirdparties, it is %s,
    If you want default value only if url has some parameter, you can use %s +TheKeyIsTheNameOfHtmlField=Este é o nome do campo HTML. Esta necessidade de ter conhecimentos técnicos para ler o conteúdo da página HTML para obter o nome-chave de um campo. +PageUrlForDefaultValues=Você deve inserir aqui a URL relativa da página. Se você incluir parâmetros em URL, os valores padrão serão efetivos se todos os parâmetros estiverem configurados para o mesmo valor. Exemplos: +PageUrlForDefaultValuesCreate=
    Para que o formulário crie um novo treceiro, é%s,
    se você quiser o valor padrão somente se url tiver algum parâmetro, você pode usar%s +PageUrlForDefaultValuesList=
    Para a página que lista terceiros, é%s,
    se você quiser o valor padrão somente se url tiver algum parâmetro, você pode usar%s EnableDefaultValues=Permitir o uso de valores predefinidos personalizados EnableOverwriteTranslation=Permitir o uso da tradução substituída -GoIntoTranslationMenuToChangeThis=A translation has been found for the key with this code, so to change this value, you must edit it fom Home-Setup-translation. -WarningSettingSortOrder=Warning, setting a default sort order may result in a technical error when going on the list page if field is an unknown field. If you experience such an error, come back to this page to remove the default sort order and restore default behavior. +GoIntoTranslationMenuToChangeThis=Uma tradução foi encontrada para a chave com este código, então, para alterar esse valor, você deve editá-lo para a tradução do Home-Setup. +WarningSettingSortOrder=Aviso, definir uma ordem de classificação padrão pode resultar em um erro técnico ao entrar na página da lista se o campo for um campo desconhecido. Se você tiver um erro desse tipo, volte para esta página para remover a ordem de classificação padrão e restaurar o comportamento padrão. Field=Campo ProductDocumentTemplates=Modelos de documento para gerar documento do produto FreeLegalTextOnExpenseReports=Texto legal livre nos relatórios de despesas WatermarkOnDraftExpenseReports=Marca d'água nos rascunhos de relatórios de despesa AttachMainDocByDefault=Defina isto como 1 se desejar anexar o documento principal ao email por defeito (se aplicável) FilesAttachedToEmail=Anexar ficheiro -SendEmailsReminders=Send agenda reminders by emails +SendEmailsReminders=Envie lembretes da agenda por e-mails # Modules Module0Name=Utilizadores e grupos Module0Desc=Gestão de Utilizadores / Funcionários e Grupos @@ -539,7 +539,7 @@ Module320Desc=Adicionar feed RSS às páginas Dolibarr Module330Name=Marcadores Module330Desc=Gestão de marcadores Module400Name=Projetos/Oportunidades/Leads -Module400Desc=Gestão de projetos, oportunidades ou leads. Depois você pode atribuir qualquer elemento (fatura, encomenda, proposta, intervenção, ...) a um projeto e obter uma vista transversal do mesmo. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Integração com Webcalendar Module500Name=Despesas especiais @@ -549,8 +549,8 @@ Module510Desc=Registe o seguinte pagamento dos ordenados do seu funcionário Module520Name=Empréstimo Module520Desc=Gestão de empréstimos Module600Name=Notificações sobre eventos comerciais -Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), to third-party contacts (setup defined on each third party) or to fixed emails -Module600Long=Note that this module is dedicated to send real time emails when a dedicated business event occurs. If you are looking for a feature to send reminders by email of your agenda events, go into setup of module Agenda. +Module600Desc=Envio de Email de notificação (desactiva para alguns eventos de negocio) para utilisadores (na configuração define-se cada usuário), para os contactos dos terceiros (na configuração define-se os terceiros) ou os emails defenidos. +Module600Long=Observe que este módulo é dedicado a enviar emails em tempo real quando ocorre um evento comercial dedicado. Se você está procurando um recurso para enviar lembretes por e-mail de seus eventos da agenda, entre na configuração do módulo Agenda. Module700Name=Donativos Module700Desc=Gestão de donativos Module770Name=Relatórios de despesas @@ -587,7 +587,7 @@ Module2900Desc=Capacidades de conversões GeoIP Maxmind Module3100Name=Skype Module3100Desc=Adicionar um botão Skype nas fichas dos usuários/terceiros/contactos/membros Module3200Name=Registos irreversíveis -Module3200Desc=Activate log of some business events into a non reversible log. Events are archived in real-time. The log is a table of chained event that can be then read and exported. This module may be mandatory for some countries. +Module3200Desc=Active o log de alguns eventos comerciais em um registro não reversível. Os eventos são arquivados em tempo real. O log é uma tabela de eventos encadeados que podem ser lidos e exportados. Este módulo pode ser obrigatório para alguns países. Module4000Name=GRH Module4000Desc=Gestão de recursos humanos (gestão de departamento e contratos de funcionários) Module5000Name=Multiempresa @@ -595,17 +595,17 @@ Module5000Desc=Permite-lhe gerir várias empresas Module6000Name=Fluxo de trabalho Module6000Desc=Gestão do fluxo de trabalho Module10000Name=Sites da Web -Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server (Apache, Nginx, ...) to point to the dedicated Dolibarr directory to have it online on the Internet with your own domain name. +Module10000Desc=Crie sites públicos com um editor WYSIWYG. Basta configurar seu servidor web (Apache, Nginx, ...) para apontar para o diretório Dolibarr dedicado para tê-lo online na Internet com seu próprio nome de domínio. Module20000Name=Gestão de pedidos de licença Module20000Desc=Declarar e seguir os pedidos de licença dos funcionários Module39000Name=Lote do produto Module39000Desc=Gestão de produtos por lotes ou números de série Module50000Name=PayBox -Module50000Desc=Module to offer an online payment page accepting payments with Credit/Debit card via PayBox. This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...) +Module50000Desc=Modulo que permite pagina online de pagamento com cartões de crédito/débito via PayBox. Pode ser utilisado para permitir ao cliente para fazer pagamentos libre ou pagamentos ligados a objetos do Dolibarr (faturas, encomendas, ...) Module50100Name=Ponto de vendas Module50100Desc=Modúlo de ponto de vendas (POS). Module50200Name=Paypal -Module50200Desc=Module to offer an online payment page accepting payments using PayPal (credit card or PayPal credit). This can be used to allow your customers to make free payments or for a payment on a particular Dolibarr object (invoice, order, ...) +Module50200Desc=Modulo que permite pagina online de pagamento aceitando pagamentos utilisando PayPal (cartões de crédito ou crédito PayPal). Pode ser utilisado para permitir ao cliente para fazer pagamentos libre ou pagamentos ligados a objetos do Dolibarr (faturas, encomendas, ...) Module50400Name=Contabilidade (avançada) Module50400Desc=Gestão de contabilidade (dupla entrada, suporta registos gerais e auxiliares) Module54000Name=PrintIPP @@ -884,13 +884,13 @@ DictionaryTypeContact=Tipos de contacto/endereço DictionaryEcotaxe=Ecotax (WEEE) DictionaryPaperFormat=Formatos de Papel DictionaryFormatCards=Formatos das fichas -DictionaryFees=Expense report - Types of expense report lines +DictionaryFees=Relatório de despesas - Tipo de linhas no relatório de despesas DictionarySendingMethods=Métodos de expedição DictionaryStaff=Empregados DictionaryAvailability=Atraso na entrega DictionaryOrderMethods=Métodos de encomenda DictionarySource=Origem de orçamentos/encomendas -DictionaryAccountancyCategory=Grupos personalizados +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Modelos para o gráfíco de contas DictionaryAccountancyJournal=Diários contabilisticos DictionaryEMailTemplates=Modelos de emails @@ -898,12 +898,13 @@ DictionaryUnits=Unidades DictionaryProspectStatus=Estado da prospeção DictionaryHolidayTypes=Tipos de licença DictionaryOpportunityStatus=Estado da oportunidade para o projeto/lead -DictionaryExpenseTaxCat=Expense report - Transportation categories -DictionaryExpenseTaxRange=Expense report - Range by transportation category +DictionaryExpenseTaxCat=Relatório de despesas - categorias de transporte +DictionaryExpenseTaxRange=Relatório de despesas - Escala por categoria de transporte SetupSaved=Configuração guardada SetupNotSaved=A configuração não foi guardada BackToModuleList=Voltar à lista de módulos BackToDictionaryList=Voltar à lista de dicionários +TypeOfRevenueStamp=Type of revenue stamp VATManagement=Gestão de IVA VATIsUsedDesc=Por defeito, quando prospeções; faturas; encomendas; etc. são criadas, a taxa de IVA segue a seguinte regra:
    Se o vendedor não estiver sujeito a IVA, então este é igual a 0. Fim da regra.
    Se o país de venda for igual ao país de compra, então o valor do IVA passa a ser o aplicado no país de venda. Fim da regra.
    Se o vendedor e o comprador fizerem parte da União Europeia e os bens forem produtos de transporte (carro, navio, avião), o IVA é 0 (o IVA deverá ser pago pelo comprador à alfândega do seu país, e não ao vendedor). Fim da regra.
    Se o vendedor e o comprador fizerem parte da União Europeia e o comprador não for uma empresa, então o IVA é igual ao IVA aplicado no produto vendido. Fim da regra.
    Se o vendedor e o comprador fizerem parte da União Europeia e o comprador for uma empresa, então o IVA é igual a 0. Fim da regra.
    Noutros casos o IVA por defeito é igual a 0. Fim da regra. VATIsNotUsedDesc=O tipo de IVA proposto por defeito é 0, este pode ser usado em casos como associações, indivíduos ou pequenas empresas. @@ -1110,7 +1111,7 @@ MAIN_PROXY_PASS=Palavra-passe para utilizar o servidor proxy DefineHereComplementaryAttributes=Defina aqui todos os atributos complementares, que não estejam disponíveis por defeito, e que deseja que seja suportado por %s. ExtraFields=Atributos complementares ExtraFieldsLines=Atributos complementares (linhas) -ExtraFieldsLinesRec=Complementary attributes (templates invoices lines) +ExtraFieldsLinesRec=Atributos complementares (linhas de faturas de modelos) ExtraFieldsSupplierOrdersLines=Atributos complementares (linhas da encomenda) ExtraFieldsSupplierInvoicesLines=Atributos complementares (linhas da fatura) ExtraFieldsThirdParties=Atributos complementares (terceiro) @@ -1132,7 +1133,7 @@ SendmailOptionMayHurtBuggedMTA=Funcionalidade para enviar e-mails usando o méto TranslationSetup=Configuração da tradução TranslationKeySearch=Procurar uma chave ou texto de tradução TranslationOverwriteKey=Modificar o texto de uma tradução -TranslationDesc=How to set displayed application language :
    * Systemwide: menu Home - Setup - Display
    * Per user: Use the User display setup tab on user card (click on username at the top of the screen). +TranslationDesc=Como seleccionar os idiomas do aplicativo exibidos :
    * Sistema amplo : menu Inicio - Configuração - Display
    *Por usuário: use o usuário configuração display guia da ficha usuário (clic no nome do usuário no cima do écran). TranslationOverwriteDesc=Você pode substituir as traduções na seguinte tabela. Escolha o seu idioma na caixa de seleção "%s", insira a chave tradução rm "%s" e sua nova tradução em "%s" TranslationOverwriteDesc2=Você pode utilizar o outro separador para ajudá-lo a saber a chave de tradução que tem de usar TranslationString=Texto de tradução @@ -1140,7 +1141,7 @@ CurrentTranslationString=Texto de tradução atual WarningAtLeastKeyOrTranslationRequired=É necessário pelo menos um critério de pesquisa para a chave ou texto de tradução NewTranslationStringToShow=Novo texto de tradução a exibir OriginalValueWas=A tradução original foi alterada. O valor original era:

    %s -TransKeyWithoutOriginalValue=You forced a new translation for the translation key '%s' that does not exists in any language files +TransKeyWithoutOriginalValue=Você forçou uma nova tradução para a chave de tradução '%s' que não existe em nenhum arquivo de idioma TotalNumberOfActivatedModules=Aplicação/módulos ativados: %s / %s YouMustEnableOneModule=Deve ativar, pelo menos, 1 módulo ClassNotFoundIntoPathWarning=A classe %s não foi encontrada no caminho PHP @@ -1271,7 +1272,7 @@ LDAPSynchronizeUsers=Sincronização dos utilizadores com LDAP LDAPSynchronizeGroups=Sincronização dos grupos de utilizadores com LDAP LDAPSynchronizeContacts=Sincronização dos contactos com LDAP LDAPSynchronizeMembers=Sincronização dos membros da fundação com LDAP -LDAPSynchronizeMembersTypes=Organization of foundation's members types in LDAP +LDAPSynchronizeMembersTypes=Organização dos tipos de membros da fundação no LDAP LDAPPrimaryServer=Servidor primario LDAPSecondaryServer=Servidor secundario LDAPServerPort=Porta do servidor @@ -1295,7 +1296,7 @@ LDAPDnContactActive=Sincronização de contactos LDAPDnContactActiveExample=Sincronização ativada/desativada LDAPDnMemberActive=Sincronização de membros LDAPDnMemberActiveExample=Sincronização ativada/desativada -LDAPDnMemberTypeActive=Members types' synchronization +LDAPDnMemberTypeActive=Sincronização de tipos de membros LDAPDnMemberTypeActiveExample=Sincronização ativada/desativada LDAPContactDn=DN dos contactos Dolibarr LDAPContactDnExample=DN completo (ex: ou=contacts,dc=example,dc=com) @@ -1303,8 +1304,8 @@ LDAPMemberDn=DN dos membros Dolibarr LDAPMemberDnExample=DN completo (ex: ou=members,dc=example,dc=com) LDAPMemberObjectClassList=Lista de objectClass LDAPMemberObjectClassListExample=Lista de objectClass que definem os atributos de registo (ex: top,inetOrgPerson or top,user for active directory) -LDAPMemberTypeDn=Dolibarr members types DN -LDAPMemberTypepDnExample=Complete DN (ex: ou=memberstypes,dc=example,dc=com) +LDAPMemberTypeDn=Dolibarr membros tipos DN +LDAPMemberTypepDnExample=DN completo (ex: ou = memberstypes, dc = exemplo, dc = com) LDAPMemberTypeObjectClassList=Lista de objectClass LDAPMemberTypeObjectClassListExample=Lista de objectClass que definem os atributos de registo (ex: top,groupOfUniqueNames) LDAPUserObjectClassList=Lista de objectClass @@ -1318,7 +1319,7 @@ LDAPTestSynchroContact=Teste a sincronização de contactos LDAPTestSynchroUser=Testar a sincronização de utilizadores LDAPTestSynchroGroup=Testar a sincronização de grupos LDAPTestSynchroMember=Testar a sincronização de membros -LDAPTestSynchroMemberType=Test member type synchronization +LDAPTestSynchroMemberType=Sincronização do tipo de membro do teste LDAPTestSearch= Testar pesquisa LDAP LDAPSynchroOK=Teste de sincronização realizado com sucesso LDAPSynchroKO=O teste de sincronização falhou @@ -1384,7 +1385,7 @@ LDAPDescContact=Esta página permite definir o nome dos atributos da árvore LDA LDAPDescUsers=Esta página permite definir o nome dos atributos da árvore LDAP para cada utilizador registado no Dolibarr. LDAPDescGroups=Esta página permite definir o nome dos atributos da árvore LDAP para cada grupo registado no Dolibarr. LDAPDescMembers=Esta página permite definir o Nome dos atributos da árvore LDAP para cada membro registado no Dolibarr. -LDAPDescMembersTypes=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members types. +LDAPDescMembersTypes=Esta página permite que você defina o nome dos atributos LDAP na árvore LDAP para cada dado encontrado nos tipos de membros do Dolibarr. LDAPDescValues=Os valores de exemplo foram construídos para o OpenLDAP com os seguintes esquemas carregados: core.schema, cosine.schema, inetorgperson.schema. Se você utiliza esses valores e o OpenLDAP, então modifique o seu ficheiro de configuração LDAP, slapd.conf, para carregar todos esses esquemas. ForANonAnonymousAccess=Para um acesso autentificado PerfDolibarr=Relatório de configuração/otimização de desempenho @@ -1402,15 +1403,15 @@ FilesOfTypeNotCached=Ficheiros do tipo %s não são guardados na cache do servid FilesOfTypeCompressed=Ficheiros do tipo %s são comprimidos pelo servidor HTTP FilesOfTypeNotCompressed=Ficheiros do tipo %s não são comprimidos pelo servidor HTTP CacheByServer=Cache pelo servidor -CacheByServerDesc=For exemple using the Apache directive "ExpiresByType image/gif A2592000" +CacheByServerDesc=Por exemplo, usando a diretiva Apache "ExpiresByType image / gif A2592000" CacheByClient=Cache pelo navegador CompressionOfResources=Compressão das respostas HTTP CompressionOfResourcesDesc=Por exemplo, usando a diretiva Apache "AddOutputFilterByType DEFLATE" TestNotPossibleWithCurrentBrowsers=A detecção automática não é possível com os navegadores atuais -DefaultValuesDesc=You can define/force here the default value you want to get when your create a new record, and/or defaut filters or sort order when your list record. -DefaultCreateForm=Default values (on forms to create) +DefaultValuesDesc=Você pode definir / forçar aqui o valor padrão que deseja obter quando criar um novo registro e / ou defautar filtros ou ordem de classificação quando o registro da lista. +DefaultCreateForm=Valores padrão (nos formulários a serem criados) DefaultSearchFilters=Filtros de pesquisa predefinidos -DefaultSortOrder=Default sort orders +DefaultSortOrder=Pedidos de classificação padrão DefaultFocus=Campos de foco predefinidos ##### Products ##### ProductSetup=Configuração do módulo "Produtos" @@ -1559,8 +1560,8 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Definir este valor automaticamente como o valor pr AGENDA_DEFAULT_FILTER_TYPE=Definir automaticamente este tipo de evento no filtro de pesquisa da vista agenda AGENDA_DEFAULT_FILTER_STATUS=Definido automaticamente este estado para eventos no filtro de pesquisa da vista agenda AGENDA_DEFAULT_VIEW=Qual é o separador que você deseja abrir por defeito quando seleciona o menu "Agenda" -AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). Note: Module %s must be enabled and correctly setup to have reminder sent at the correct frequency. -AGENDA_REMINDER_BROWSER=Enable event reminder on users browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_EMAIL=Ativar lembrete de eventos por e-mails (lembrar opção / atraso pode ser definido em cada evento). Nota: O módulo %sdeve estar habilitado e configurado corretamente para que o lembrete seja enviado na freqüência correta. +AGENDA_REMINDER_BROWSER=Ativar lembrete de eventos no navegador de usuários (quando a data do evento é atingida, cada usuário pode recusar isso a partir da pergunta de confirmação do navegador) AGENDA_REMINDER_BROWSER_SOUND=Ativar notificação sonora AGENDA_SHOW_LINKED_OBJECT=Mostrar o objeto associado na vista de agenda ##### Clicktodial ##### @@ -1597,7 +1598,7 @@ ApiProductionMode=Ativar o modo de produção (isto irá ativar uso de uma cache ApiExporerIs=Você pode explorar e testar as APIs no URL OnlyActiveElementsAreExposed=Somente os elementos de módulos ativados é que estão expostos ApiKey=Chave para a API -WarningAPIExplorerDisabled=The API explorer has been disabled. API explorer is not required to provide API services. It is a tool for developer to find/test REST APIs. If you need this tool, go into setup of module API REST to activate it. +WarningAPIExplorerDisabled=O explorador da API foi desativado. O explorador da API não é necessário para fornecer serviços de API. É uma ferramenta para o desenvolvedor encontrar / testar APIs REST. Se você precisar desta ferramenta, entre na configuração do módulo API REST para ativá-la. ##### Bank ##### BankSetupModule=Configuração do módulo "Bancário" FreeLegalTextOnChequeReceipts=Texto livre em recibos de pagamento em cheque @@ -1628,7 +1629,7 @@ ProjectsSetup=Configuração do módulo "Projetos" ProjectsModelModule=Modelo de documento para relatórios de projeto TasksNumberingModules=Módulo de numeração de tarefas TaskModelModule=Modelo de documento dos relatórios de tarefasl -UseSearchToSelectProject=Wait you press a key before loading content of project combo list (This may increase performance if you have a large number of project, but it is less convenient) +UseSearchToSelectProject=Espere antes de presar a chave que carregue o conteúdo da lista de combinação de projetos (Isso pode aumentar o desempenho se você tiver um grande número de projetos, mas é menos conveniente) ##### ECM (GED) ##### ##### Fiscal Year ##### AccountingPeriods=Períodos de contabilidade @@ -1653,8 +1654,8 @@ TypePaymentDesc=0:Tipo de pagamento de cliente, 1:Tipo de pagamento de fornecedo IncludePath=Caminho para o dirétorio "include" (definido na variável %s) ExpenseReportsSetup=Configuração do módulo "Relatórios de Despesas" TemplatePDFExpenseReports=Modelos de documentos para a produção de relatórios de despesa -ExpenseReportsIkSetup=Setup of module Expense Reports - Milles index -ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules +ExpenseReportsIkSetup=Configuração do módulo Relatórios de despesas - Índice Milhas +ExpenseReportsRulesSetup=Configuração do módulo Relatórios de despesas - Regras ExpenseReportNumberingModules=Módulo de numeração de relatórios de despesas NoModueToManageStockIncrease=Não foi ativado nenhum módulo capaz de efetuar a gestão automática do acréscimo de stock. O acrescimo de stock será efetuado manualmente. YouMayFindNotificationsFeaturesIntoModuleNotification=Poderá encontrar as opções das notificações por email ao ativar e configurar o módulo "Notificação". @@ -1668,7 +1669,7 @@ BackupDumpWizard=Assistente para construir o ficheiro dump de backup da base de SomethingMakeInstallFromWebNotPossible=Instalação do módulo externo não é possível a partir da interface web pelo seguinte motivo: SomethingMakeInstallFromWebNotPossible2=Por este motivo, o processo de atualização descrito aqui é apenas manual que um utilizador privilegiado pode efetuar. InstallModuleFromWebHasBeenDisabledByFile=Instalação de um módulo externo da aplicação foi desativada pelo seu administrador. Você deve pedir-lhe para remover o ficheiro %s para permitir esta funcionalidade. -ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory %s. To have this directory processed by Dolibarr, you must setup your conf/conf.php to add the 2 directive lines:
    $dolibarr_main_url_root_alt='/custom';
    $dolibarr_main_document_root_alt='%s/custom'; +ConfFileMustContainCustom=Instalar ou construir um módulo externo do aplicativo precisa salvar os arquivos do módulo no diretório. %sPara que este diretório seja processado pelo Dolibarr, você deve configurar seu conf/conf.php para adicionar as 2 linhas diretivas:
    $dolibarr_main_url_root_alt ='/ custom';
    $dolibarr_main_document_root_alt='%s/ custom'; HighlightLinesOnMouseHover=Realçar as linhas da tabela quando o rato passar sobre elas HighlightLinesColor=Realçar a cor da linha quando o rato passa por cima (manter vazio para não realçar) TextTitleColor=Cor do título da página @@ -1689,7 +1690,7 @@ UnicodeCurrency=Digite aqui entre parêntesis retos, a lista de bytes que repre ColorFormat=As cores RGB está no formato HEX, por exemplo: FF0000 PositionIntoComboList=Posição da linha nas listas de seleção SellTaxRate=Taxa de imposto de venda -RecuperableOnly=Yes for VAT "Not Perceived but Recoverable" dedicated for some state in France. Keep value to "No" in all other cases. +RecuperableOnly=Sim para IVA "Não Percebido, mas Recuperável" dedicado a algum regiões ultramarinas da França. Mantenha o valor de "Não" em todos os outros casos.\n\n UrlTrackingDesc=Se a transportadora oferecer uma página da Internet para verificar o estado da sua encomenda, pode introduzi-lo aqui. Você pode usar a chave {TRACKID} nos parâmetros do URL para que o sistema possa substituí-lo na ficha de expedição. OpportunityPercent=Quando você cria uma oportunidade, você vai definir um valor estimado de projeto/lead. De acordo com o estado da oportunidade, este montante poderá ser multiplicado por esta taxa para avaliar o montante global que todas as suas oportunidades pode gerar. O valor é percentual (entre 0 e 100). TemplateForElement=Este registo modelo é dedicado a qual elemento @@ -1720,11 +1721,11 @@ TitleExampleForMajorRelease=Exemplo de mensagem que você pode usar para anuncia TitleExampleForMaintenanceRelease=Exemplo de mensagem que você pode usar para anunciar esta versão de manutenção (sinta-se livre para usá-la nas suas páginas da Internet) ExampleOfNewsMessageForMajorRelease=O Dolibarr ERP e CRM %s está disponível. A versão %s é um grande lançamento com várias funcionalidades novas. Você pode transferi-lo a partir da área de downloads do portal https://www.dolibarr.org (subdiretório: versões estáveis). Você pode ler o ChangeLog para consultar a lista completa de alterações. ExampleOfNewsMessageForMaintenanceRelease=O Dolibarr ERP e CRM %s está disponível. A versão %s é uma versão de manutenção, por isso contém apenas correções de bugs. Recomendamos que atualize para este. Como com qualquer versão de manutenção, não há novas funcionalidades, nem foi mudada a estrutura de dados presente nesta versão. Você pode transferi-lo a partir da área de downloads da página https://www.dolibarr.org (subdiretório: versões estáveis). Você pode consultar ChangeLog para a lista completa de alterações. -MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases. +MultiPriceRuleDesc=Quando a opção "Vários níveis de preços por produto / serviço" está ativada, você pode definir diferentes preços (um por nível de preço) para cada produto. Para economizar tempo, você pode inserir aqui uma regra para que o preço de cada nível seja calculado automaticamente de acordo com o preço do primeiro nível, então você terá que inserir apenas o preço do primeiro nível em cada produto. Esta página está aqui para poupar tempo e pode ser útil somente se seus preços para cada nível forem relativos ao primeiro nível. Você pode ignorar esta página na maioria dos casos. ModelModulesProduct=Modelos para documentos de produto ToGenerateCodeDefineAutomaticRuleFirst=Para ser possível criar códigos automaticamente, você deve primeiro definir um gestor para auto definir o número de código de barras. SeeSubstitutionVars=Veja a nota * para uma lista de possíveis variáveis ​​de substituição -SeeChangeLog=See ChangeLog file (english only) +SeeChangeLog=Consulte o arquivo ChangeLog (somente em inglês) AllPublishers=Todos os editores UnknownPublishers=Editores desconhecidos AddRemoveTabs=Adicionar ou remover separadores @@ -1743,19 +1744,19 @@ AddOtherPagesOrServices=Adicionar outras páginas ou serviços AddModels=Adicionar modelos de documento ou numeração AddSubstitutions=Adicionar substituições de chaves DetectionNotPossible=Deteção não é possível -UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved on database user table and must be provided on each API call) +UrlToGetKeyToUseAPIs=Url para obter token para usar API (uma vez que o token foi recebido é salvo na tabela de usuário do banco de dados e deve ser fornecido em cada chamada de API) ListOfAvailableAPIs=Lista de APIs disponíveis activateModuleDependNotSatisfied=O módulo "%s" depende do módulo "%s" que está em falta, então o módulo "%1$s" poderá não funcionar corretamente. Instale o módulo "%2$s" ou desabilite o módulo "%1$s" -CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter $dolibarr_main_restrict_os_commands into conf.php file. +CommandIsNotInsideAllowedCommands=O comando que você tenta executar não está dentro da lista de comandos permitidos definidos no parâmetro $dolibarr_main_restrict_os_commands no arquivo conf.php. LandingPage=Página Inicial SamePriceAlsoForSharedCompanies=Se utiliza a opção multi-empresa, com a escolha de "Preço único", o preço será igual em todas as empresas, se o produto for partilhado entre as empresas ModuleEnabledAdminMustCheckRights=O módulo foi ativado. As permissões para o(s) módulo(s) ativado(s) foram adicionadas apenas aos utilizadores administradores. Talvez seja necessário conceder permissões para outros utilizadores ou grupos manualmente. UserHasNoPermissions=Este utilizador não tem permissões definidas -TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")
    Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)
    Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days") +TypeCdr=Use "Nenhum" se a data do prazo de pagamento for a data da fatura mais um delta em dias (o delta é o campo "Nb de dias")
    Use "No final do mês", se, após o delta, a data deve ser aumentada para alcançar o fim de mês (+ opcional "Offset" em dias)
    Use "Current / Next" para que a data do prazo de pagamento seja o primeiro Nth do mês (N é armazenado no campo "Nb de dias") BaseCurrency=Moeda de referência da empresa (vá à configuração da empresa para alterar) WarningNoteModuleInvoiceForFrenchLaw=Este módulo %s está de acordo com as leis francesas (Loi Finance 2016). WarningNoteModulePOSForFrenchLaw=Este módulo %s está de acordo com as leis francesas (Loi Finance 2016) porque o módulo Registos Não Reversíveis é ativado automaticamente. -WarningInstallationMayBecomeNotCompliantWithLaw=You try to install the module %s that is an external module. Activating an external module means you trust the publisher of the module and you are sure that this module does not alterate negatively the behavior of your application and is compliant with laws of your country (%s). If the module bring a non legal feature, you become responsible for the use of a non legal software. +WarningInstallationMayBecomeNotCompliantWithLaw=Você tenta instalar o módulo %sque é um módulo externo. A ativação de um módulo externo significa que você confia na editora do módulo e tem certeza de que este módulo não altera negativamente o comportamento do seu aplicativo e está em conformidade com as leis do seu país (%s). Se o módulo traz uma característica não legal, você se torna responsável pelo uso de um software não legal. MAIN_PDF_MARGIN_LEFT=Margem esquerda do PDF MAIN_PDF_MARGIN_RIGHT=Margem direita do PDF MAIN_PDF_MARGIN_TOP=Margem superior do PDF @@ -1765,3 +1766,4 @@ ResourceSetup=Configuração do módulo Recursos UseSearchToSelectResource=Utilizar um formulário de pesquisa para escolher um recurso (em vez de uma lista) DisabledResourceLinkUser=Desativar o link do recurso para o utilizador DisabledResourceLinkContact=Desativar o link do recurso para o contacto +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/pt_PT/banks.lang b/htdocs/langs/pt_PT/banks.lang index bef5d7dd4ab..2462d79b52a 100644 --- a/htdocs/langs/pt_PT/banks.lang +++ b/htdocs/langs/pt_PT/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Número LineRecord=Registo AddBankRecord=Adicionar entrada AddBankRecordLong=Adicionar entrada manualmente +Conciliated=Reconciled ConciliatedBy=Conciliado por DateConciliating=Data Conciliação BankLineConciliated=Entrada reconciliada diff --git a/htdocs/langs/pt_PT/bills.lang b/htdocs/langs/pt_PT/bills.lang index bc33dee737e..6c84650674b 100644 --- a/htdocs/langs/pt_PT/bills.lang +++ b/htdocs/langs/pt_PT/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s BillsLate=Pagamentos em atraso BillsStatistics=Estatísticas das faturas de clientes BillsStatisticsSuppliers=Estatísticas das faturas de fornecedores +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Desativar porque não pode ser eliminado InvoiceStandard=Fatura Normal InvoiceStandardAsk=Fatura Normal @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Porque é que pretende classificar esta fatura como 'a ConfirmClassifyPaidPartially=Tem a certeza que pretende alterar a fatura %s para o estado de paga? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=Cliente devedor diff --git a/htdocs/langs/pt_PT/compta.lang b/htdocs/langs/pt_PT/compta.lang index 642deec7427..72dd3cef12a 100644 --- a/htdocs/langs/pt_PT/compta.lang +++ b/htdocs/langs/pt_PT/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Pagamentos vinculados a nenhuma factura, sem Terceiro PaymentsNotLinkedToUser=Pagamentos não vinculados a um utilizador Profit=Beneficio AccountingResult=Accounting result +BalanceBefore=Balance (before) Balance=Saldo Debit=Débito Credit=Crédito diff --git a/htdocs/langs/pt_PT/donations.lang b/htdocs/langs/pt_PT/donations.lang index 3713d63f75b..f9331e1eebf 100644 --- a/htdocs/langs/pt_PT/donations.lang +++ b/htdocs/langs/pt_PT/donations.lang @@ -31,3 +31,4 @@ DONATION_ART200=Mostrar artigo 200 de CGI se estiver preocupado DONATION_ART238=Mostrar artigo 238 de CGI se estiver preocupado DONATION_ART885=Mostrar artigo 885 de CGI se estiver preocupado DonationPayment=Pagamento do donativo +DonationValidated=Donation %s validated diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang index 2d2ed1a70a6..f45c07e51a9 100644 --- a/htdocs/langs/pt_PT/errors.lang +++ b/htdocs/langs/pt_PT/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Empty expression ErrorPriceExpression21=Empty result '%s' ErrorPriceExpression22=Negative result '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Os armazéns de origem e de destino não devem ser iguais diff --git a/htdocs/langs/pt_PT/install.lang b/htdocs/langs/pt_PT/install.lang index 846fbb2ab49..63279668b93 100644 --- a/htdocs/langs/pt_PT/install.lang +++ b/htdocs/langs/pt_PT/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=Você usa o assistente de configuração Dolibarr de um UpgradeExternalModule=Corra o processo de atualização dedicado dos módulos externos SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Correção para os dados não normalizados @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Atualize o valor do campo entity da tabela llx_societe_remise MigrationRemiseExceptEntity=Atualize o valor do campo entity da tabela llx_societe_remise_except MigrationReloadModule=Recarregar módulo %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Mostrar opções indisponíveis HideNotAvailableOptions=Ocultar opções indisponíveis ErrorFoundDuringMigration=Não pode proceder ao próximo passo porque foram reportados erros durante o processo de migração. Para ignorar os erros, pode clicar aqui, mas a aplicação ou algumas funcionalidades desta poderão não funcionar corretamente. diff --git a/htdocs/langs/pt_PT/languages.lang b/htdocs/langs/pt_PT/languages.lang index bb06e828349..1b8f69078eb 100644 --- a/htdocs/langs/pt_PT/languages.lang +++ b/htdocs/langs/pt_PT/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Espanhol (Panamá) Language_es_PY=Espanhol (Paraguai) Language_es_PE=Espanhol (Peru) Language_es_PR=Espanhol (Porto Rico) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Espanhol (Venezuela) Language_et_EE=Estónio Language_eu_ES=Basco diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang index 8f508ff6d50..3dcb706b8ce 100644 --- a/htdocs/langs/pt_PT/main.lang +++ b/htdocs/langs/pt_PT/main.lang @@ -548,6 +548,18 @@ MonthShort09=Sep. MonthShort10=Out. MonthShort11=Nov. MonthShort12=Dez. +MonthVeryShort01=J +MonthVeryShort02=Sex +MonthVeryShort03=Seg +MonthVeryShort04=A +MonthVeryShort05=Seg +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=Dom +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Ficheiros e Documentos Anexos JoinMainDoc=Unir ao documento principal DateFormatYYYYMM=YYYY-MM @@ -762,7 +774,7 @@ SetBankAccount=Definir Conta Bancária AccountCurrency=Moeda da conta ViewPrivateNote=Ver notas XMoreLines=%s linhas(s) ocultas -ShowMoreLines=Mostre mais linhas +ShowMoreLines=Show more/less lines PublicUrl=URL público AddBox=Adicionar Caixa SelectElementAndClick=Selecione um elemento e clique em %s @@ -900,3 +912,5 @@ CommentPage=Espaço de comentários CommentAdded=Comentário adicionado CommentDeleted=Comentário eliminado Everybody=Toda a Gente +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/pt_PT/other.lang b/htdocs/langs/pt_PT/other.lang index 80c90064149..b61e40de965 100644 --- a/htdocs/langs/pt_PT/other.lang +++ b/htdocs/langs/pt_PT/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=If amount higher than %s SourcesRepository=Repositório para fontes Chart=Gráfico PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=Área de Exportações diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang index 8165dd3c10a..b48dd7c034f 100644 --- a/htdocs/langs/pt_PT/products.lang +++ b/htdocs/langs/pt_PT/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Preço atual AlwaysUseNewPrice=Usar sempre o preço atual do produto/serviço AlwaysUseFixedPrice=Utilizar o preço fixo PriceByQuantity=Preços diferentes por quantidade +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Gama de quantidades MultipriceRules=Price segment rules UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang index c055a26d1f2..22be0a3f280 100644 --- a/htdocs/langs/pt_PT/projects.lang +++ b/htdocs/langs/pt_PT/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=Pendente OppStatusWON=Ganho OppStatusLOST=Perdido Budget=Orçamento +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/pt_PT/website.lang b/htdocs/langs/pt_PT/website.lang index 61b68d52800..a860b78f5c8 100644 --- a/htdocs/langs/pt_PT/website.lang +++ b/htdocs/langs/pt_PT/website.lang @@ -3,15 +3,17 @@ Shortname=Código WebsiteSetupDesc=Crie aqui as entradas e o número de diferentes sites da Web que precisar. Depois vá ao menu de Sites da Web para editá-los. DeleteWebsite=Eliminar site da Web ConfirmDeleteWebsite=Tem a certeza que deseja eliminar este site da Web. Também irão ser removidos todas as suas páginas e conteúdo. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Nome/pseudonimo da página -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL do ficheiro CSS externo WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Bliblioteca de Multimedia EditCss=Edit Style/CSS or HTML header EditMenu=Editar Menu @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang index b5cab1dc652..12520462065 100644 --- a/htdocs/langs/ro_RO/accountancy.lang +++ b/htdocs/langs/ro_RO/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Număr nota contabila TransactionNumShort=Numărul tranzacţiei AccountingCategory=Personalized groups GroupByAccountAccounting=Grupează după contul contabil -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consultați aici lista clienților și furnizorilor terță ListAccounts=Lista conturilor contabile UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=Acest jurnal este deja folosit ## Export ExportDraftJournal=Export draft journal Modelcsv=Model export -OptionsDeactivatedForThisExportModel=Pentru acest model de export, optiunile sunt dezactivate Selectmodelcsv=Selectează un model de export Modelcsv_normal=Export clasic Modelcsv_CEGID=Export către CEGID Expert Contabil @@ -254,7 +254,7 @@ Modelcsv_ciel=Export către Sage Ciel Compta sau Compta Evolution Modelcsv_quadratus=Export către Quadratus QuadraCompta Modelcsv_ebp=Export către EBP Modelcsv_cogilog=Export către Cogilog -Modelcsv_agiris=Export către Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Id-ul listei de conturi diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang index 2c099fa1859..326484e02c7 100644 --- a/htdocs/langs/ro_RO/admin.lang +++ b/htdocs/langs/ro_RO/admin.lang @@ -539,7 +539,7 @@ Module320Desc=Adauga RSS feed interiorul Dolibarr ecran pagini Module330Name=Marcaje Module330Desc=Management bookmark-uri Module400Name=Proiecte / Oportunitati / Prospecți -Module400Desc=Managementul de proiecte, oportunități sau potențiali. Puteți, apoi, atribui apoi orice element (factură, comandă, ofertă, intervenție, ...), la un proiect și a obține o vedere transversală din punctul de vedere al proiectului. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar integrare Module500Name=Cheltuieli speciale @@ -890,7 +890,7 @@ DictionaryStaff=Efectiv DictionaryAvailability=Livrare întârziere DictionaryOrderMethods=Metode de comandă DictionarySource=Originea ofertei / comenzi -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Model pentru plan de conturi DictionaryAccountancyJournal=Jurnalele contabile DictionaryEMailTemplates=Șabloane e-mailuri @@ -904,6 +904,7 @@ SetupSaved=Setup salvate SetupNotSaved=Setup not saved BackToModuleList=Inapoi la lista de module BackToDictionaryList=Inapoi la lista de dicţionare +TypeOfRevenueStamp=Type of revenue stamp VATManagement=TVA-ul de management VATIsUsedDesc=În mod implicit, când se creează perspective, facturi, comenzi etc., rata TVA respectă regula standard activă:
    Dacă vânzătorul nu este supus TVA, valoarea TVA este implicit 0. Sfârșitul regulii.
    Dacă (țara de vânzare = tara de cumpărare), atunci TVA-ul este implicit egal cu TVA-ul produsului în țara de vânzare. Sfârșitul regulii.
    Dacă vânzătorul și cumpărătorul sunt ambele în Comunitatea Europeană, iar bunurile sunt produse de transport (mașină, navă, avion), TVA-ul implicit este 0 (TVA trebuie plătit de cumpărător la vama țării sale și nu la vânzător). Sfârșitul regulii.
    Dacă vânzătorul și cumpărătorul sunt ambele în Comunitatea Europeană, iar cumpărătorul nu este o companie, atunci TVA-ul este implicit TVA-ul produsului vândut. Sfârșitul regulii.
    Dacă vânzătorul și cumpărătorul sunt ambii în Comunitatea Europeană, iar cumpărătorul este o companie, atunci TVA este 0 în mod prestabilit. Sfârșitul regulii.
    În orice alt caz, valoarea implicită propusă este TVA = 0. Sfârșitul regulii. VATIsNotUsedDesc=În mod implicit propuse de TVA este 0, care poate fi utilizat pentru cazuri ca asociaţiile, persoane fizice ou firme mici. @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/ro_RO/banks.lang b/htdocs/langs/ro_RO/banks.lang index 17646adf792..6a4ea505bc8 100644 --- a/htdocs/langs/ro_RO/banks.lang +++ b/htdocs/langs/ro_RO/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Cod LineRecord=Tranzacţie AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Reconciled ConciliatedBy=Decontat de DateConciliating=Data Decontare BankLineConciliated=Entry reconciled diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang index fab03536ef9..823fc37d7e3 100644 --- a/htdocs/langs/ro_RO/bills.lang +++ b/htdocs/langs/ro_RO/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s BillsLate=Plăţi întârziate BillsStatistics=Statistici Facturi Clienţi BillsStatisticsSuppliers=Statistici Facturi Furnizori +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Dezactivat pentru ca nu poate fi sters InvoiceStandard=Factură Standard InvoiceStandardAsk=Factură Standard @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=De ce doriți clasificarea acestei facturi ca "abandon ConfirmClassifyPaidPartially=Sigur doriţi să schimbaţi factura %sla statusul plătită ? ConfirmClassifyPaidPartiallyQuestion=Această factură nu a fost achitată complet. De ce doriți închiderea acestei facturi? ConfirmClassifyPaidPartiallyReasonAvoir=Restul de plată ( %s %s) este un discount acordat la plată, pentru că a fost făcută înainte de termen. Regularizarea TVA-ului, cu o nota de credit. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Restul de plată ( %s %s) este un discount acordat la plată, pentru că a fost făcută înainte de termen. Accept piarderea TVA-ului pentru această reducere. ConfirmClassifyPaidPartiallyReasonDiscountVat=Restul de plată ( %s %s) este un discount acordat la plată, pentru că a fost făcută înainte de termen. Recuperez TVA-ul de pe această reducere fără o notă de credit. ConfirmClassifyPaidPartiallyReasonBadCustomer=Client rău platnic diff --git a/htdocs/langs/ro_RO/compta.lang b/htdocs/langs/ro_RO/compta.lang index 9f959e6c28d..17adfbec89f 100644 --- a/htdocs/langs/ro_RO/compta.lang +++ b/htdocs/langs/ro_RO/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Plăţile nu sunt legate de orice factură, astfel î PaymentsNotLinkedToUser=Plăţile nu sunt legate de orice utilizator Profit=Profit AccountingResult=Rezultatl contabil +BalanceBefore=Balance (before) Balance=Sold Debit=Debit Credit=Credit diff --git a/htdocs/langs/ro_RO/donations.lang b/htdocs/langs/ro_RO/donations.lang index 31b34217316..fb515fd9943 100644 --- a/htdocs/langs/ro_RO/donations.lang +++ b/htdocs/langs/ro_RO/donations.lang @@ -31,3 +31,4 @@ DONATION_ART200=Afiseaza articolului 200 din CGI dacă sunteți îngrijorat DONATION_ART238=Afiseaza articolului 238 din CGI dacă sunteți îngrijorat DONATION_ART885=Afiseaza articol 885 din CGI dacă sunteți îngrijorat DonationPayment=Plată donaţie +DonationValidated=Donation %s validated diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang index 46e2534af44..b512aaee087 100644 --- a/htdocs/langs/ro_RO/errors.lang +++ b/htdocs/langs/ro_RO/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Expresie goală ErrorPriceExpression21=Rezultat gol '%s' ErrorPriceExpression22=Rezultat negativ '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Eroare internă '%s' ErrorPriceExpressionUnknown=Eroare Necunoscută '%s' ErrorSrcAndTargetWarehouseMustDiffers=Depozitul sursă și țintă trebuie să difere diff --git a/htdocs/langs/ro_RO/install.lang b/htdocs/langs/ro_RO/install.lang index c3202002bb3..c135f4e099e 100644 --- a/htdocs/langs/ro_RO/install.lang +++ b/htdocs/langs/ro_RO/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=Puteţi utiliza expertul de configurare Dolibarr de la UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Fix pentru date denormalized @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Update entity field value of llx_societe_remise MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except MigrationReloadModule=Reîncarcă modul %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Afişează opţiunile nedisponibile HideNotAvailableOptions=Acunde opţiunile nedisponibile ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. diff --git a/htdocs/langs/ro_RO/languages.lang b/htdocs/langs/ro_RO/languages.lang index 6f6fe6a6cb0..b1f5c118958 100644 --- a/htdocs/langs/ro_RO/languages.lang +++ b/htdocs/langs/ro_RO/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spaniolă (Panama) Language_es_PY=Spaniolă (Paraguay) Language_es_PE=Spaniolă (Peru) Language_es_PR=Spaniolă (Puerto Rico) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Spaniolă (Venezuela) Language_et_EE=Estoniană Language_eu_ES=Basc diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang index c6a582a1b25..6c2e1de887e 100644 --- a/htdocs/langs/ro_RO/main.lang +++ b/htdocs/langs/ro_RO/main.lang @@ -548,6 +548,18 @@ MonthShort09=sep MonthShort10=oct MonthShort11=nov MonthShort12=dec +MonthVeryShort01=J +MonthVeryShort02=V +MonthVeryShort03=L +MonthVeryShort04=A +MonthVeryShort05=L +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=D +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Fişiere şi documente ataşate JoinMainDoc=Join main document DateFormatYYYYMM=YYYY-MM @@ -762,7 +774,7 @@ SetBankAccount=Defineste Cont bancar AccountCurrency=Account currency ViewPrivateNote=Vezi notițe XMoreLines=%s linii(e) ascunse -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=URL Public AddBox=Adauga box SelectElementAndClick=Select an element and click %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=Toată lumea +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/ro_RO/other.lang b/htdocs/langs/ro_RO/other.lang index eec3397c1b6..f4f6900427c 100644 --- a/htdocs/langs/ro_RO/other.lang +++ b/htdocs/langs/ro_RO/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=Daca valoarea mai mare %s SourcesRepository=Repository for sources Chart=Chart PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=Export diff --git a/htdocs/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang index 514f5b8756e..4b16f51b2f6 100644 --- a/htdocs/langs/ro_RO/products.lang +++ b/htdocs/langs/ro_RO/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Preţ curent AlwaysUseNewPrice=Întotdeauna foloseşte preţul curent al produsului/serviciului AlwaysUseFixedPrice=Foloseşte preţul fix PriceByQuantity=Preţuri diferite pe cantitate +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Interval cantitate MultipriceRules=Price segment rules UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang index 3f040828383..3de56597c4d 100644 --- a/htdocs/langs/ro_RO/projects.lang +++ b/htdocs/langs/ro_RO/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=In asteptarea OppStatusWON=Castigat OppStatusLOST=Pierdut Budget=Budget +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/ro_RO/website.lang b/htdocs/langs/ro_RO/website.lang index b62dd645618..a5749898930 100644 --- a/htdocs/langs/ro_RO/website.lang +++ b/htdocs/langs/ro_RO/website.lang @@ -3,15 +3,17 @@ Shortname=Cod WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them. DeleteWebsite=Şterge website ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Pagina nume/alias -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL of external CSS file WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Media library EditCss=Edit Style/CSS or HTML header EditMenu=Edit meniu @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang index 957d80a819e..8b91e4428b7 100644 --- a/htdocs/langs/ru_RU/accountancy.lang +++ b/htdocs/langs/ru_RU/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Piece number TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=Список бухгалтерских счетов UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal Modelcsv=Модель экспорта -OptionsDeactivatedForThisExportModel=For this export model, options are deactivated Selectmodelcsv=Выбрать модель экспорта Modelcsv_normal=Классический экспорт Modelcsv_CEGID=Export towards CEGID Expert Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution Modelcsv_quadratus=Export towards Quadratus QuadraCompta Modelcsv_ebp=Export towards EBP Modelcsv_cogilog=Export towards Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang index 9ef0b618975..c579d01761a 100644 --- a/htdocs/langs/ru_RU/admin.lang +++ b/htdocs/langs/ru_RU/admin.lang @@ -242,7 +242,7 @@ OfficialMarketPlace=Официальный магазин внешних мод OfficialWebHostingService=Рекомендуемые сервисы веб-хостинга (облачный хостинг) ReferencedPreferredPartners=Предпочитаемые партнёры OtherResources=Other resources -ExternalResources=External resources +ExternalResources=Внешние ресурсы SocialNetworks=Social Networks ForDocumentationSeeWiki=Для получения документации пользователя или разработчика (документация, часто задаваемые вопросы...),
    посетите Dolibarr Wiki:
    %s ForAnswersSeeForum=Для любых других вопросов / помощи, вы можете использовать форум Dolibarr:
    %s @@ -539,7 +539,7 @@ Module320Desc=Добавление RSS-каналов на страницах Do Module330Name=Закладки Module330Desc=Управление закладками Module400Name=Проекты/Возможности/Потенциальные клиенты -Module400Desc=Управление проектами, возможностями или потенциальными клиентами. Вы можете назначить какой-либо элемент (счет, заказ, предложение, посредничество, ...) к проекту и видеть в срезе представления проекта. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Веб-календарь Module410Desc=Интеграция веб-календаря Module500Name=Специальные расходы @@ -866,16 +866,16 @@ Permission63001=Read resources Permission63002=Create/modify resources Permission63003=Delete resources Permission63004=Link resources to agenda events -DictionaryCompanyType=Types of thirdparties -DictionaryCompanyJuridicalType=Legal forms of thirdparties +DictionaryCompanyType= Тип компании +DictionaryCompanyJuridicalType= Организационно-правовая форма DictionaryProspectLevel=Потенциальный уровень предполагаемого клиента DictionaryCanton=Штат/Провинция DictionaryRegion=Регионы DictionaryCountry=Страны DictionaryCurrency=Валюты -DictionaryCivility=Personal and professional titles -DictionaryActions=Types of agenda events -DictionarySocialContributions=Social or fiscal taxes types +DictionaryCivility=Обращение +DictionaryActions=Тип мероприятия +DictionarySocialContributions=Типы налогов/сборов DictionaryVAT=Значения НДС или налога с продаж DictionaryRevenueStamp=Количество акцизных марок DictionaryPaymentConditions=Условия оплаты @@ -890,20 +890,21 @@ DictionaryStaff=Персонал DictionaryAvailability=Задержка доставки DictionaryOrderMethods=Методы заказов DictionarySource=Происхождение Коммерческих предложений / Заказов -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Модели для диаграммы счетов DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=Шаблоны электронных писем DictionaryUnits=Единицы -DictionaryProspectStatus=Prospection status +DictionaryProspectStatus=Статус контакта DictionaryHolidayTypes=Types of leaves -DictionaryOpportunityStatus=Opportunity status for project/lead +DictionaryOpportunityStatus=Статус предполагаемого проекта DictionaryExpenseTaxCat=Expense report - Transportation categories DictionaryExpenseTaxRange=Expense report - Range by transportation category SetupSaved=Настройки сохранены SetupNotSaved=Setup not saved BackToModuleList=Вернуться к списку модулей BackToDictionaryList=Назад к списку словарей +TypeOfRevenueStamp=Type of revenue stamp VATManagement=НДС менеджмент VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is VAT=0. End of rule. VATIsNotUsedDesc=По умолчанию, предлагаемый НДС 0, которая может быть использована как для дела ассоциаций, отдельных лиц или небольших компаний. @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/ru_RU/agenda.lang b/htdocs/langs/ru_RU/agenda.lang index 3c91b79b6fc..f845a490ac4 100644 --- a/htdocs/langs/ru_RU/agenda.lang +++ b/htdocs/langs/ru_RU/agenda.lang @@ -14,7 +14,7 @@ EventsNb=Количество событий ListOfActions=Список событий EventReports=Event reports Location=Местонахождение -ToUserOfGroup=To any user in group +ToUserOfGroup= пользователем из группы EventOnFullDay=Событие на весь день (все дни) MenuToDoActions=Все незавершенные события MenuDoneActions=Все прекращенные события diff --git a/htdocs/langs/ru_RU/banks.lang b/htdocs/langs/ru_RU/banks.lang index f1d40638e3d..65f7af0d824 100644 --- a/htdocs/langs/ru_RU/banks.lang +++ b/htdocs/langs/ru_RU/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Количество LineRecord=Транзакция AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Reconciled ConciliatedBy=Conciliated путем DateConciliating=Согласительную дата BankLineConciliated=Entry reconciled diff --git a/htdocs/langs/ru_RU/bills.lang b/htdocs/langs/ru_RU/bills.lang index 40c7c412d45..ea7bc52f2cb 100644 --- a/htdocs/langs/ru_RU/bills.lang +++ b/htdocs/langs/ru_RU/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s BillsLate=Просроченные платежи BillsStatistics=Статистика счетов клиентов BillsStatisticsSuppliers=Статистика счетов поставщиков +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Disabled because cannot be erased InvoiceStandard=Стандартный счёт InvoiceStandardAsk=Стандартный счёт @@ -137,7 +139,7 @@ BillShortStatusNotRefunded=Not refunded BillShortStatusClosedUnpaid=Закрыт BillShortStatusClosedPaidPartially=Оплачен (частично) PaymentStatusToValidShort=На подтверждении -ErrorVATIntraNotConfigured=Номер плательщика НДС еще не установлен +ErrorVATIntraNotConfigured=Размер ставки НДС еще не установлен ErrorNoPaiementModeConfigured=Режим оплаты по умолчанию не установлен. Перейдите в настройку модуля Счетов-фактур для исправления данной ситуации. ErrorCreateBankAccount=Создайт банковский счет, а затем перейдите к панели настройки модуля Счетов-фактур для установки способов оплаты ErrorBillNotFound=Счёт %s не существует @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? ConfirmClassifyPaidPartiallyReasonAvoir=Оставить неоплаченной (%s %s) предоставленную скидку, потому что платёж был сделан перед соглашением. Я уплачу НДС с помощью кредитного авизо. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Оставить неоплаченной (%s %s) предоставленную скидку, потому что платёж был сделан перед соглашением. Я подтверждаю потерю НДС на этой скидке. ConfirmClassifyPaidPartiallyReasonDiscountVat=Оставить неоплаченной (%s %s) предоставленную скидку, потому что платёж был сделан перед соглашением. Я восстановлю НДС на этой скидке без кредитного авизо. ConfirmClassifyPaidPartiallyReasonBadCustomer=Плохой Покупатель diff --git a/htdocs/langs/ru_RU/companies.lang b/htdocs/langs/ru_RU/companies.lang index 1c55029afae..3882b5906c1 100644 --- a/htdocs/langs/ru_RU/companies.lang +++ b/htdocs/langs/ru_RU/companies.lang @@ -254,8 +254,8 @@ ProfId1DZ=RC ProfId2DZ=Art. ProfId3DZ=NIF ProfId4DZ=NIS -VATIntra=Номер НДС -VATIntraShort=Номер НДС +VATIntra=Размер ставки НДС +VATIntraShort=Размер ставки НДС VATIntraSyntaxIsValid=Синтаксис корректен ProspectCustomer=Потенц. клиент / Покупатель Prospect=Потенц. клиент diff --git a/htdocs/langs/ru_RU/compta.lang b/htdocs/langs/ru_RU/compta.lang index 4b9517b924b..42df1c36359 100644 --- a/htdocs/langs/ru_RU/compta.lang +++ b/htdocs/langs/ru_RU/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Платежи, не связанные с какой PaymentsNotLinkedToUser=Платежи, не связанные с какой-либо пользователь Profit=Прибыль AccountingResult=Accounting result +BalanceBefore=Balance (before) Balance=Баланс Debit=Дебет Credit=Кредит diff --git a/htdocs/langs/ru_RU/donations.lang b/htdocs/langs/ru_RU/donations.lang index 0f39f6706dd..002b3d1b7b7 100644 --- a/htdocs/langs/ru_RU/donations.lang +++ b/htdocs/langs/ru_RU/donations.lang @@ -31,3 +31,4 @@ DONATION_ART200=Если вы обеспокоены, показывать вы DONATION_ART238=Если вы обеспокоены, показывать выдержку статьи 238 из CGI DONATION_ART885=Если вы обеспокоены, показывать выдержку статьи 885 из CGI DonationPayment=Платёж пожертвования +DonationValidated=Donation %s validated diff --git a/htdocs/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang index 16c54755db5..6527f5223e2 100644 --- a/htdocs/langs/ru_RU/errors.lang +++ b/htdocs/langs/ru_RU/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Пустое выражение ErrorPriceExpression21=Пустой результат '%s' ErrorPriceExpression22=Отрицательный результат '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Внутренняя ошибка '%s' ErrorPriceExpressionUnknown=Неизвестная ошибка '%s' ErrorSrcAndTargetWarehouseMustDiffers=Исходящий и входящий склад должны отличаться diff --git a/htdocs/langs/ru_RU/install.lang b/htdocs/langs/ru_RU/install.lang index 4d77f08cf19..adb1488423e 100644 --- a/htdocs/langs/ru_RU/install.lang +++ b/htdocs/langs/ru_RU/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=Вы можете использовать мастер UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Fastsette for denormalized data @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Update entity field value of llx_societe_remise MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except MigrationReloadModule=Перегрузите модуль %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Показать недоступные опции HideNotAvailableOptions=Скрыть недоступные опции ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. diff --git a/htdocs/langs/ru_RU/languages.lang b/htdocs/langs/ru_RU/languages.lang index 2def20ba36b..b235a53f6e4 100644 --- a/htdocs/langs/ru_RU/languages.lang +++ b/htdocs/langs/ru_RU/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Испанский (Парагвай) Language_es_PE=Испанский (Перу) Language_es_PR=Испанский (Пуэрто-Рико) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Spanish (Venezuela) Language_et_EE=Эстонский Language_eu_ES=Баскский diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang index 6737a3e3ab5..e3277d5c5d0 100644 --- a/htdocs/langs/ru_RU/main.lang +++ b/htdocs/langs/ru_RU/main.lang @@ -548,6 +548,18 @@ MonthShort09=сен MonthShort10=окт MonthShort11=ноя MonthShort12=дек +MonthVeryShort01=J +MonthVeryShort02=Пт +MonthVeryShort03=Пн +MonthVeryShort04=A +MonthVeryShort05=Пн +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=Вс +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Присоединенные файлы и документы JoinMainDoc=Join main document DateFormatYYYYMM=ГГГГ-ММ @@ -762,7 +774,7 @@ SetBankAccount=Задать счёт в банке AccountCurrency=Account currency ViewPrivateNote=Посмотреть заметки XMoreLines=%s строк(и) скрыто -ShowMoreLines=Показать больше строк +ShowMoreLines=Show more/less lines PublicUrl=Публичная ссылка AddBox=Добавить бокс SelectElementAndClick=Выберите элемент и нажмите %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=Общий проект +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/ru_RU/orders.lang b/htdocs/langs/ru_RU/orders.lang index 4083135c1d1..cb9069b12bd 100644 --- a/htdocs/langs/ru_RU/orders.lang +++ b/htdocs/langs/ru_RU/orders.lang @@ -10,7 +10,7 @@ OrderLine=Линия заказа OrderDate=Дата заказа OrderDateShort=Дата заказа OrderToProcess=Для обработки -NewOrder=Новый порядок +NewOrder=  Новый заказ ToOrder=Сделать заказ MakeOrder=Сделать заказ SupplierOrder=Для поставщиков diff --git a/htdocs/langs/ru_RU/other.lang b/htdocs/langs/ru_RU/other.lang index b7a323b0922..ef6bc22c397 100644 --- a/htdocs/langs/ru_RU/other.lang +++ b/htdocs/langs/ru_RU/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=Если количество более чем %s
    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/ru_RU/sendings.lang b/htdocs/langs/ru_RU/sendings.lang index 96c58d4288b..f002a1c5712 100644 --- a/htdocs/langs/ru_RU/sendings.lang +++ b/htdocs/langs/ru_RU/sendings.lang @@ -42,7 +42,7 @@ ConfirmCancelSending=Are you sure you want to cancel this shipment? DocumentModelMerou=Модель A5 WarningNoQtyLeftToSend=Внимание, нет товаров ожидающих отправки. StatsOnShipmentsOnlyValidated=Статистика собирается только на утверждённые поставки. Используемая дата - дата утверждения поставки (планируемая дата доставки не всегда известна) -DateDeliveryPlanned=Planned date of delivery +DateDeliveryPlanned=Планируемая дата доставки RefDeliveryReceipt=Ref delivery receipt StatusReceipt=Status delivery receipt DateReceived=Дата доставки получена diff --git a/htdocs/langs/ru_RU/supplier_proposal.lang b/htdocs/langs/ru_RU/supplier_proposal.lang index 8f7c63a104e..fafc5fd52fd 100644 --- a/htdocs/langs/ru_RU/supplier_proposal.lang +++ b/htdocs/langs/ru_RU/supplier_proposal.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - supplier_proposal SupplierProposal=Supplier commercial proposals supplier_proposalDESC=Manage price requests to suppliers -SupplierProposalNew=New price request +SupplierProposalNew= Новый запрос цены CommRequest=Price request CommRequests=Запросы цены SearchRequest=Find a request @@ -9,11 +9,11 @@ DraftRequests=Draft requests SupplierProposalsDraft=Draft supplier proposals LastModifiedRequests=Latest %s modified price requests RequestsOpened=Open price requests -SupplierProposalArea=Supplier proposals area +SupplierProposalArea=Статистика по поставщикам SupplierProposalShort=Supplier proposal SupplierProposals=Предложения поставщику SupplierProposalsShort=Предложения поставщику -NewAskPrice=New price request +NewAskPrice= Новый запрос цены ShowSupplierProposal=Show price request AddSupplierProposal=Create a price request SupplierProposalRefFourn=Supplier ref @@ -47,7 +47,7 @@ CommercialAsk=Price request DefaultModelSupplierProposalCreate=Создание модели по умолчанию DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted) DefaultModelSupplierProposalClosed=Default template when closing a price request (refused) -ListOfSupplierProposals=List of supplier proposal requests +ListOfSupplierProposals= Список запросов поставщику ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project SupplierProposalsToClose=Supplier proposals to close SupplierProposalsToProcess=Supplier proposals to process diff --git a/htdocs/langs/ru_RU/website.lang b/htdocs/langs/ru_RU/website.lang index 32d61c05010..c22c79309b8 100644 --- a/htdocs/langs/ru_RU/website.lang +++ b/htdocs/langs/ru_RU/website.lang @@ -3,15 +3,17 @@ Shortname=Код WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them. DeleteWebsite=Delete website ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Page name/alias -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL of external CSS file WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Media library EditCss=Edit Style/CSS or HTML header EditMenu=Edit menu @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/sk_SK/accountancy.lang b/htdocs/langs/sk_SK/accountancy.lang index d850ca0be35..9650ceb9915 100644 --- a/htdocs/langs/sk_SK/accountancy.lang +++ b/htdocs/langs/sk_SK/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Číslo kusu TransactionNumShort=Num. transakcie AccountingCategory=Personalized groups GroupByAccountAccounting=Skupinové účty -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Prečítajte si zoznam tretích zákazníkov a dodávateľo ListAccounts=Zoznam účtovných účtov UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal Modelcsv=Vzor exportu -OptionsDeactivatedForThisExportModel=Pre tento exportný model sú deaktivované možnosti Selectmodelcsv=Vyberte model exportu Modelcsv_normal=Klasický export Modelcsv_CEGID=Exportovať pre CEGID Expert @@ -254,7 +254,7 @@ Modelcsv_ciel=Exportovať pre Sage Ciel Compta alebo Compta Evolution Modelcsv_quadratus=Exportovať pre Quadratus QuadraCompta Modelcsv_ebp=Exportovať pre EBP Modelcsv_cogilog=Exportovať pre Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang index 1014040a750..331128b91ac 100644 --- a/htdocs/langs/sk_SK/admin.lang +++ b/htdocs/langs/sk_SK/admin.lang @@ -539,7 +539,7 @@ Module320Desc=Pridať RSS kanál vnútri obrazoviek Dolibarr Module330Name=Záložky Module330Desc=Správca záložiek 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. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=WebCalendar Module410Desc=WebCalendar integrácia Module500Name=špeciálne rozšírenia @@ -890,7 +890,7 @@ DictionaryStaff=Zamestnanec DictionaryAvailability=Oneskorenie doručenia DictionaryOrderMethods=Možnosti objednávky DictionarySource=Pôvod ponuky / objednávky -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Modely účtovných osnov DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=Šablóny emailov @@ -904,6 +904,7 @@ SetupSaved=Nastavenie uložené SetupNotSaved=Setup not saved BackToModuleList=Späť na zoznam modulov BackToDictionaryList=Napäť do zoznamu slovníkov +TypeOfRevenueStamp=Type of revenue stamp VATManagement=DPH riadenia VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is VAT=0. End of rule. VATIsNotUsedDesc=V predvolenom nastavení je navrhovaná DPH 0, ktorý možno použiť v prípadoch, ako je združenie jednotlivcov ou malých podnikov. @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/sk_SK/banks.lang b/htdocs/langs/sk_SK/banks.lang index aba14dbd484..70605295bbe 100644 --- a/htdocs/langs/sk_SK/banks.lang +++ b/htdocs/langs/sk_SK/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Číslo LineRecord=Transakcie AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Zlúčiť ConciliatedBy=Odsúhlasené DateConciliating=Synchronizovať dáta BankLineConciliated=Entry reconciled diff --git a/htdocs/langs/sk_SK/bills.lang b/htdocs/langs/sk_SK/bills.lang index 3a8e363749d..3361c1c020f 100644 --- a/htdocs/langs/sk_SK/bills.lang +++ b/htdocs/langs/sk_SK/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s BillsLate=Oneskorené platby BillsStatistics=Štatistiky zákazníckych faktúr BillsStatisticsSuppliers=Štatistiky dodávateľskych faktúr +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Vypnuté lebo nemôze byť zmazané InvoiceStandard=Štandardné faktúra InvoiceStandardAsk=Štandardné faktúra @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad zákazník diff --git a/htdocs/langs/sk_SK/compta.lang b/htdocs/langs/sk_SK/compta.lang index 66e0bffc375..f572b55c406 100644 --- a/htdocs/langs/sk_SK/compta.lang +++ b/htdocs/langs/sk_SK/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Platby nesúvisiace s akoukoľvek faktúru, takže ni PaymentsNotLinkedToUser=Platby nesúvisiace všetkých užívateľov Profit=Zisk AccountingResult=Accounting result +BalanceBefore=Balance (before) Balance=Zostatok Debit=Debet Credit=Úver diff --git a/htdocs/langs/sk_SK/donations.lang b/htdocs/langs/sk_SK/donations.lang index c14f1b31107..3cd6387dda7 100644 --- a/htdocs/langs/sk_SK/donations.lang +++ b/htdocs/langs/sk_SK/donations.lang @@ -31,3 +31,4 @@ 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 +DonationValidated=Donation %s validated diff --git a/htdocs/langs/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang index db578482925..3de9ca66b12 100644 --- a/htdocs/langs/sk_SK/errors.lang +++ b/htdocs/langs/sk_SK/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Empty expression ErrorPriceExpression21=Empty result '%s' ErrorPriceExpression22=Negative result '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Zdrojovej a cieľovej sklady musia sa líši diff --git a/htdocs/langs/sk_SK/install.lang b/htdocs/langs/sk_SK/install.lang index ed6746113fa..717fc92e081 100644 --- a/htdocs/langs/sk_SK/install.lang +++ b/htdocs/langs/sk_SK/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=Používate Dolibarr inštalátor z Proxmox čiže hodn UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Oprava pre denormalized dát @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Aktualizácia hodnoty llx_societe_remise MigrationRemiseExceptEntity=Aktualizácia hodnoty llx_societe_remise_except MigrationReloadModule=Znovu načítať modul %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Zobraziť nedostupné možnosti HideNotAvailableOptions=Skryť nedostupné možnosti ErrorFoundDuringMigration=Počas migrácies sa vyskytol problém preto nasledujúci krok nie je dostupný. Pre ignorovanie chýb môžete kliknúť tu, ale niektoré funkcie aplikácie nebudu fungovať správne pokial ich neopravíte. diff --git a/htdocs/langs/sk_SK/languages.lang b/htdocs/langs/sk_SK/languages.lang index 56d0c6e0fd6..fd870a4f8e8 100644 --- a/htdocs/langs/sk_SK/languages.lang +++ b/htdocs/langs/sk_SK/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Španielčina (Paraguaj) Language_es_PE=Španielčina (Peru) Language_es_PR=Španielčina (Puerto Rico) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Španielčina (Venezuela) Language_et_EE=Estónčina Language_eu_ES=Basque diff --git a/htdocs/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang index d39bd7bf433..8a59ce34a32 100644 --- a/htdocs/langs/sk_SK/main.lang +++ b/htdocs/langs/sk_SK/main.lang @@ -548,6 +548,18 @@ MonthShort09=septembra MonthShort10=október MonthShort11=november MonthShort12=decembra +MonthVeryShort01=J +MonthVeryShort02=F +MonthVeryShort03=M +MonthVeryShort04=A +MonthVeryShort05=M +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=S +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Priložené súbory a dokumenty JoinMainDoc=Join main document DateFormatYYYYMM=YYYY-MM @@ -762,7 +774,7 @@ SetBankAccount=Definovať bankový účet AccountCurrency=Account currency ViewPrivateNote=Zobraziť poznámky XMoreLines=%s riadk(y/ov) skrytých -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=Verejné URL AddBox=Pridať box SelectElementAndClick=Select an element and click %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=Všetci +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/sk_SK/other.lang b/htdocs/langs/sk_SK/other.lang index 498cf9b30e7..c4925be08c7 100644 --- a/htdocs/langs/sk_SK/other.lang +++ b/htdocs/langs/sk_SK/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=If amount higher than %s SourcesRepository=Repository for sources Chart=Chart PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=Vývoz plocha diff --git a/htdocs/langs/sk_SK/products.lang b/htdocs/langs/sk_SK/products.lang index 1124754ff6d..abd4f864cef 100644 --- a/htdocs/langs/sk_SK/products.lang +++ b/htdocs/langs/sk_SK/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Aktuálna cena AlwaysUseNewPrice=Vždy používajte aktuálnu cenu produktu / služby AlwaysUseFixedPrice=Použite pevnú cenu PriceByQuantity=Rozdielné ceny podľa quantity +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Množstvo rozsah MultipriceRules=Pravidlá cenových oblastí UseMultipriceRules=Použit cenové oblasti ( definované v nastavenia produktového modulu ) pre automatický výpočet ceny ostatných oblastí podľa prvej oblasti. diff --git a/htdocs/langs/sk_SK/projects.lang b/htdocs/langs/sk_SK/projects.lang index b53b742a1f4..2c350453439 100644 --- a/htdocs/langs/sk_SK/projects.lang +++ b/htdocs/langs/sk_SK/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=Až do OppStatusWON=Won OppStatusLOST=Lost Budget=Budget +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/sk_SK/website.lang b/htdocs/langs/sk_SK/website.lang index bb5b60f2ab3..c7da61cb981 100644 --- a/htdocs/langs/sk_SK/website.lang +++ b/htdocs/langs/sk_SK/website.lang @@ -3,15 +3,17 @@ Shortname=Kód WebsiteSetupDesc=Tu vytvorte toľko riadkov kolko rôzných webstránok potrebujete. Potom choďte do menu Webstránky pre ich upravovanie. DeleteWebsite=Zmazať webstránku ConfirmDeleteWebsite=Určite chcete zmazať túto web stránku. Všetky podstránka a obsah budú zmazané tiež. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Meno stránky -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL alebo externý CSS dokument WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Knižnica médií EditCss=Edit Style/CSS or HTML header EditMenu=Upraviť menu @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/sl_SI/accountancy.lang b/htdocs/langs/sl_SI/accountancy.lang index 48357a37520..431929dbd26 100644 --- a/htdocs/langs/sl_SI/accountancy.lang +++ b/htdocs/langs/sl_SI/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Piece number TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=Seznam računovodskih računov UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal Modelcsv=Model izvoza -OptionsDeactivatedForThisExportModel=Za ta izvozni model so opcije deaktivirane Selectmodelcsv=Izberite model izvoza Modelcsv_normal=Classic izvoz Modelcsv_CEGID=Export towards CEGID Expert Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution Modelcsv_quadratus=Export towards Quadratus QuadraCompta Modelcsv_ebp=Export towards EBP Modelcsv_cogilog=Export towards Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang index cbdf071e9ea..38c91d3c651 100644 --- a/htdocs/langs/sl_SI/admin.lang +++ b/htdocs/langs/sl_SI/admin.lang @@ -539,7 +539,7 @@ Module320Desc=Dodajanje vira RSS na prikazane Dolibarr strani Module330Name=Zaznamki Module330Desc=Urejanje zaznamkov Module400Name=Projekti/priložnosti/možnosti -Module400Desc=Upravljanje projektov, priložnosti ali potencialov. Nato lahko dodate vse druge elemente (račun, naročilo, ponudbo, intervencijo, ...) k tem projektom, da dobite transverzalni pogled iz projektnega pogleda. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Internetni koledar Module410Desc=Integracija internetnega koledarja Module500Name=Posebni stroški @@ -890,7 +890,7 @@ DictionaryStaff=Zaposleni DictionaryAvailability=Zakasnitev dobave DictionaryOrderMethods=Metode naročanja DictionarySource=Izvor ponudb/naročil -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Modeli kontnih planov DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=Predloge za elektronsko pošto @@ -904,6 +904,7 @@ SetupSaved=Nastavitve shranjene SetupNotSaved=Setup not saved BackToModuleList=Nazaj na seznam modulov BackToDictionaryList=Nazaj na seznam slovarjev +TypeOfRevenueStamp=Type of revenue stamp VATManagement=Upravljanje DDV VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is VAT=0. End of rule. VATIsNotUsedDesc=Privzeta predlagana stopnja DDV je 0, kar se lahko uporabi za primere kot so združenja, posamezniki ali majhna podjetja. @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/sl_SI/banks.lang b/htdocs/langs/sl_SI/banks.lang index 19b289902d8..4854dff6e9c 100644 --- a/htdocs/langs/sl_SI/banks.lang +++ b/htdocs/langs/sl_SI/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Številka LineRecord=Transakcija AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Reconciled ConciliatedBy=Uskladil DateConciliating=Datum uskladitve BankLineConciliated=Entry reconciled diff --git a/htdocs/langs/sl_SI/bills.lang b/htdocs/langs/sl_SI/bills.lang index 1af39828c76..ddc9557738c 100644 --- a/htdocs/langs/sl_SI/bills.lang +++ b/htdocs/langs/sl_SI/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s BillsLate=Zamujena plačila BillsStatistics=Statistika računov za kupce BillsStatisticsSuppliers=Statistika računov dobaviteljev +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Disabled because cannot be erased InvoiceStandard=Standardni račun InvoiceStandardAsk=Standardni račun @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? ConfirmClassifyPaidPartiallyReasonAvoir=Neplačan preostanek (%s %s) je popust zaradi predčasnega plačila. DDV je bil popravljen z dobropisom. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Neplačan preostanek (%s %s) je popust zaradi predčasnega plačila. Strinjam se z izgubo DDV zaradi tega popusta. ConfirmClassifyPaidPartiallyReasonDiscountVat=Neplačan preostanek (%s %s) je popust zaradi predčasnega plačila. DDV na ta popust bo vrnjen brez dobropisa. ConfirmClassifyPaidPartiallyReasonBadCustomer=Slab kupec diff --git a/htdocs/langs/sl_SI/compta.lang b/htdocs/langs/sl_SI/compta.lang index 151618e3e55..d6e69d1f7b8 100644 --- a/htdocs/langs/sl_SI/compta.lang +++ b/htdocs/langs/sl_SI/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Plačila niso vezana na noben račun, niti na partner PaymentsNotLinkedToUser=Plačila niso vezana na nobenega uporabnika Profit=Dobiček AccountingResult=Accounting result +BalanceBefore=Balance (before) Balance=Bilanca Debit=Debit Credit=Kredit diff --git a/htdocs/langs/sl_SI/donations.lang b/htdocs/langs/sl_SI/donations.lang index 68b091f6c5d..8e71e0b6a57 100644 --- a/htdocs/langs/sl_SI/donations.lang +++ b/htdocs/langs/sl_SI/donations.lang @@ -31,3 +31,4 @@ DONATION_ART200=Prikaži člen 200 iz CGI, če se vas tiče DONATION_ART238=Prikaži člen 238 iz CGI, če se vas tiče DONATION_ART885=Prikaži člen 885 iz CGI, če se vas tiče DonationPayment=Plačilo donacije +DonationValidated=Donation %s validated diff --git a/htdocs/langs/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang index 4996a6ae4ad..b408983d322 100644 --- a/htdocs/langs/sl_SI/errors.lang +++ b/htdocs/langs/sl_SI/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Empty expression ErrorPriceExpression21=Empty result '%s' ErrorPriceExpression22=Negative result '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs diff --git a/htdocs/langs/sl_SI/install.lang b/htdocs/langs/sl_SI/install.lang index 3509303d683..90c421c506c 100644 --- a/htdocs/langs/sl_SI/install.lang +++ b/htdocs/langs/sl_SI/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=Za namestitev Dolibarr uporabljate čarovnika Proxmox v UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Popravek denormaliziranih podatkov @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Update entity field value of llx_societe_remise MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except MigrationReloadModule=Ponovno naložite modul %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Prikaži opcije, ki niso na voljo HideNotAvailableOptions=Skrij opcije, ki niso na voljo ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. diff --git a/htdocs/langs/sl_SI/languages.lang b/htdocs/langs/sl_SI/languages.lang index ce0070d67fa..ae77c877ee5 100644 --- a/htdocs/langs/sl_SI/languages.lang +++ b/htdocs/langs/sl_SI/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Španski (Paragvaj) Language_es_PE=Španski (Peru) Language_es_PR=Španščina (Portoriko) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Spanish (Venezuela) Language_et_EE=Estonski Language_eu_ES=Basque diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang index ba15e6b58ee..c370af07422 100644 --- a/htdocs/langs/sl_SI/main.lang +++ b/htdocs/langs/sl_SI/main.lang @@ -548,6 +548,18 @@ MonthShort09=sep MonthShort10=okt MonthShort11=nov MonthShort12=dec +MonthVeryShort01=J +MonthVeryShort02=P +MonthVeryShort03=P +MonthVeryShort04=A +MonthVeryShort05=P +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=N +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Pripete datoteke in dokumenti JoinMainDoc=Join main document DateFormatYYYYMM=YYYY-MM @@ -762,7 +774,7 @@ SetBankAccount=Določi bančni račun AccountCurrency=Account currency ViewPrivateNote=Glej opombe XMoreLines=%s zasenčena(ih) vrstic -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=Javni URL AddBox=Dodaj okvir SelectElementAndClick=Select an element and click %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=Projekti v skupni rabi +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/sl_SI/other.lang b/htdocs/langs/sl_SI/other.lang index 4bf9fbaa3a1..943398e0513 100644 --- a/htdocs/langs/sl_SI/other.lang +++ b/htdocs/langs/sl_SI/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=Če je znesek večji od %s SourcesRepository=Shramba virov Chart=Chart PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=Področje izvoza diff --git a/htdocs/langs/sl_SI/products.lang b/htdocs/langs/sl_SI/products.lang index 307a2775c89..56819ced31e 100644 --- a/htdocs/langs/sl_SI/products.lang +++ b/htdocs/langs/sl_SI/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Trenutna cena AlwaysUseNewPrice=Vedno uporabi trenutno ceno proizvoda/storitve AlwaysUseFixedPrice=Uporabi fiksno ceno PriceByQuantity=Različne cene glede na količino +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Območje količin MultipriceRules=Price segment rules UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/sl_SI/projects.lang b/htdocs/langs/sl_SI/projects.lang index 286ea550930..0d07d3731d9 100644 --- a/htdocs/langs/sl_SI/projects.lang +++ b/htdocs/langs/sl_SI/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=Na čakanju OppStatusWON=Won OppStatusLOST=Lost Budget=Budget +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/sl_SI/website.lang b/htdocs/langs/sl_SI/website.lang index f3e940de8eb..584d10b78b9 100644 --- a/htdocs/langs/sl_SI/website.lang +++ b/htdocs/langs/sl_SI/website.lang @@ -3,15 +3,17 @@ Shortname=Koda WebsiteSetupDesc=Vnesite toliko zapisov, kot želite imeti spletnih strani. Za urejanje pojdite na Menu => Websites. DeleteWebsite=Izbriši spletno stran ConfirmDeleteWebsite=Ali ste prepričani, da želite izbrisati to spletno starn. Vse strani in vsebina bodo pobrisani. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Page name/alias -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL of external CSS file WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Media library EditCss=Edit Style/CSS or HTML header EditMenu=Edit menu @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/sq_AL/accountancy.lang b/htdocs/langs/sq_AL/accountancy.lang index bd7407c5389..9fd145812e8 100644 --- a/htdocs/langs/sq_AL/accountancy.lang +++ b/htdocs/langs/sq_AL/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Piece number TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=List of the accounting accounts UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal 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 Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution Modelcsv_quadratus=Export towards Quadratus QuadraCompta Modelcsv_ebp=Export towards EBP Modelcsv_cogilog=Export towards Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang index d2fe4b05507..f845d9b8063 100644 --- a/htdocs/langs/sq_AL/admin.lang +++ b/htdocs/langs/sq_AL/admin.lang @@ -44,7 +44,7 @@ ClientCharset=Client charset ClientSortingCharset=Client collation WarningModuleNotActive=Module %s must be enabled WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page. -DolibarrSetup=Dolibarr install or upgrade +DolibarrSetup=Instalo ose përditëso Dolibarr InternalUser=Përdorues i brendshëm ExternalUser=Përdorues i jashtëm InternalUsers=Përdorues të brendshëm @@ -71,7 +71,7 @@ UseSearchToSelectContactTooltip=Also if you have a large number of third parties 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, but it is less convenient) 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, but it is less convenient) NumberOfKeyToSearch=Nbr of characters to trigger search: %s -NotAvailableWhenAjaxDisabled=Not available when Ajax disabled +NotAvailableWhenAjaxDisabled=E padisponueshme ku Ajax është i çaktivizuar AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party JavascriptDisabled=JavaScrip i caktivizuar UsePreviewTabs=Use preview tabs @@ -138,8 +138,8 @@ MenusDesc=Menu managers set content of the two menu bars (horizontal and vertica MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.
    Some modules add menu entries (in menu All mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module. MenuForUsers=Menu for users LangFile=Skedari .lang -System=System -SystemInfo=System information +System=Sistemi +SystemInfo=Informacion rreth sistemit SystemToolsArea=System tools area SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for. Purge=Spastro @@ -162,8 +162,8 @@ BackupResult=Backup result BackupFileSuccessfullyCreated=Backup file successfully generated YouCanDownloadBackupFile=Generated files can now be downloaded NoBackupFileAvailable=No backup files available. -ExportMethod=Export method -ImportMethod=Import method +ExportMethod=Metoda e eksportit +ImportMethod=Metoda e importit ToBuildBackupFileClickHere=To build a backup file, click here. ImportMySqlDesc=To import a backup file, you must use mysql command from command line: ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line: @@ -288,7 +288,7 @@ SubmitTranslation=If translation for this language is not complete or you find e SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory langs/%s and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr. ModuleSetup=Konfigurimi i modulit ModulesSetup=Modules/Application setup -ModuleFamilyBase=System +ModuleFamilyBase=Sistemi ModuleFamilyCrm=Menaxhimi i lidhjes me klientёt (CRM) ModuleFamilySrm=Supplier Relation Management (SRM) ModuleFamilyProducts=Menaxhimi i produkteve (PM) @@ -302,7 +302,7 @@ ModuleFamilyECM=Electronic Content Management (ECM) ModuleFamilyPortal=Web sites and other frontal application ModuleFamilyInterface=Interfaces with external systems MenuHandlers=Menu handlers -MenuAdmin=Menu editor +MenuAdmin=Editimi i menuve DoNotUseInProduction=Do not use in production ThisIsProcessToFollow=This is steps to process: ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually: @@ -488,7 +488,7 @@ Module30Name=Faturat Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers Module40Name=Furnitorët Module40Desc=Supplier management and buying (orders and invoices) -Module42Name=Logs +Module42Name=Ngjarjet Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes. Module49Name=Editors Module49Desc=Editor management @@ -502,7 +502,7 @@ Module53Name=Services Module53Desc=Service management Module54Name=Contracts/Subscriptions Module54Desc=Management of contracts (services or reccuring subscriptions) -Module55Name=Barcodes +Module55Name=Barkod Module55Desc=Barcode management Module56Name=Telephony Module56Desc=Telephony integration @@ -525,9 +525,9 @@ Module100Desc=This module include an external web site or page into Dolibarr men Module105Name=Mailman and SPIP Module105Desc=Mailman or SPIP interface for member module Module200Name=LDAP -Module200Desc=LDAP directory synchronisation +Module200Desc=Sinkronizimi LDAP Module210Name=PostNuke -Module210Desc=PostNuke integration +Module210Desc=Integrimi PostNuke Module240Name=Data exports Module240Desc=Tool to export Dolibarr data (with assistants) Module250Name=Data imports @@ -539,7 +539,7 @@ Module320Desc=Add RSS feed inside Dolibarr screen pages Module330Name=Bookmarks Module330Desc=Bookmarks management Module400Name=Projects/Opportunities/Leads -Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar integration Module500Name=Special expenses @@ -563,7 +563,7 @@ Module1520Name=Document Generation Module1520Desc=Mass mail document generation Module1780Name=Tags/Categories Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members) -Module2000Name=WYSIWYG editor +Module2000Name=Editor WYSIWYG Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor) Module2200Name=Dynamic Prices Module2200Desc=Enable the usage of math expressions for prices @@ -581,7 +581,7 @@ Module2660Name=Call WebServices (SOAP client) Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) Module2700Name=Gravatar Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access -Module2800Desc=FTP Client +Module2800Desc=Klient FTP Module2900Name=GeoIPMaxmind Module2900Desc=GeoIP Maxmind conversions capabilities Module3100Name=Skype @@ -663,7 +663,7 @@ Permission91=Read social or fiscal taxes and vat Permission92=Create/modify social or fiscal taxes and vat Permission93=Delete social or fiscal taxes and vat Permission94=Export social or fiscal taxes -Permission95=Read reports +Permission95=Lexo raportet Permission101=Read sendings Permission102=Create/modify sendings Permission104=Validate sendings @@ -709,7 +709,7 @@ Permission185=Order or cancel supplier orders Permission186=Receive supplier orders Permission187=Close supplier orders Permission188=Cancel supplier orders -Permission192=Create lines +Permission192=Krijo Linja Permission193=Cancel lines Permission194=Read the bandwith lines Permission202=Create ADSL connections @@ -742,7 +742,7 @@ Permission254=Create/modify external users only Permission255=Modify other users password Permission256=Delete or disable other users Permission262=Extend access to all third parties (not only third parties that user is a sale representative).
    Not effective for external users (always limited to themselves for proposals, orders, invoices, contracts, etc).
    Not effective for projects (only rules on project permissions, visibility and assignement matters). -Permission271=Read CA +Permission271=Lexo CA Permission272=Read invoices Permission273=Issue invoices Permission281=Read contacts @@ -890,7 +890,7 @@ DictionaryStaff=Staff DictionaryAvailability=Delivery delay DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Models for chart of accounts DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=Emails templates @@ -904,6 +904,7 @@ SetupSaved=Setup saved SetupNotSaved=Setup not saved BackToModuleList=Back to modules list BackToDictionaryList=Back to dictionaries list +TypeOfRevenueStamp=Type of revenue stamp VATManagement=VAT Management VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is 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. @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/sq_AL/banks.lang b/htdocs/langs/sq_AL/banks.lang index 11cebb66b4d..2bd7c481885 100644 --- a/htdocs/langs/sq_AL/banks.lang +++ b/htdocs/langs/sq_AL/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Number LineRecord=Transaction AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Reconciled ConciliatedBy=Reconciled by DateConciliating=Reconcile date BankLineConciliated=Entry reconciled diff --git a/htdocs/langs/sq_AL/bills.lang b/htdocs/langs/sq_AL/bills.lang index 62f2838f4b3..7e730d02021 100644 --- a/htdocs/langs/sq_AL/bills.lang +++ b/htdocs/langs/sq_AL/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s BillsLate=Late payments BillsStatistics=Customers invoices statistics BillsStatisticsSuppliers=Suppliers invoices statistics +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Disabled because cannot be erased InvoiceStandard=Standard invoice InvoiceStandardAsk=Standard invoice @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer diff --git a/htdocs/langs/sq_AL/compta.lang b/htdocs/langs/sq_AL/compta.lang index 273ebe7896f..af71ca74471 100644 --- a/htdocs/langs/sq_AL/compta.lang +++ b/htdocs/langs/sq_AL/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to PaymentsNotLinkedToUser=Payments not linked to any user Profit=Profit AccountingResult=Accounting result +BalanceBefore=Balance (before) Balance=Balance Debit=Debit Credit=Credit diff --git a/htdocs/langs/sq_AL/deliveries.lang b/htdocs/langs/sq_AL/deliveries.lang index 49f39405766..0340bad5caa 100644 --- a/htdocs/langs/sq_AL/deliveries.lang +++ b/htdocs/langs/sq_AL/deliveries.lang @@ -18,11 +18,11 @@ StatusDeliveryCanceled=Anulluar StatusDeliveryDraft=Draft StatusDeliveryValidated=Received # merou PDF model -NameAndSignature=Name and Signature : -ToAndDate=To___________________________________ on ____/_____/__________ +NameAndSignature=Emri dhe Nënshkrimi +ToAndDate=Për___________________________________ në ____/_____/__________ GoodStatusDeclaration=Have received the goods above in good condition, Deliverer=Deliverer : -Sender=Sender +Sender=Dërguesi Recipient=Recipient ErrorStockIsNotEnough=There's not enough stock Shippable=Shippable diff --git a/htdocs/langs/sq_AL/donations.lang b/htdocs/langs/sq_AL/donations.lang index 2e796fce5ec..74887916bc0 100644 --- a/htdocs/langs/sq_AL/donations.lang +++ b/htdocs/langs/sq_AL/donations.lang @@ -31,3 +31,4 @@ 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 +DonationValidated=Donation %s validated diff --git a/htdocs/langs/sq_AL/ecm.lang b/htdocs/langs/sq_AL/ecm.lang index 03d3809e5f9..ca973fa493f 100644 --- a/htdocs/langs/sq_AL/ecm.lang +++ b/htdocs/langs/sq_AL/ecm.lang @@ -22,7 +22,7 @@ ECMSectionWasCreated=Directory %s has been created. ECMSearchByKeywords=Search by keywords ECMSearchByEntity=Search by object ECMSectionOfDocuments=Directories of documents -ECMTypeAuto=Automatic +ECMTypeAuto=Automatike ECMDocsBySocialContributions=Documents linked to social or fiscal taxes ECMDocsByThirdParties=Documents linked to third parties ECMDocsByProposals=Documents linked to proposals diff --git a/htdocs/langs/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang index b02b70c9c9f..cff89a71d98 100644 --- a/htdocs/langs/sq_AL/errors.lang +++ b/htdocs/langs/sq_AL/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Empty expression ErrorPriceExpression21=Empty result '%s' ErrorPriceExpression22=Negative result '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs diff --git a/htdocs/langs/sq_AL/install.lang b/htdocs/langs/sq_AL/install.lang index 20628972da9..d012acf8f3c 100644 --- a/htdocs/langs/sq_AL/install.lang +++ b/htdocs/langs/sq_AL/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtua UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Fix for denormalized data @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Update entity field value of llx_societe_remise MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except MigrationReloadModule=Reload module %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Show not available options HideNotAvailableOptions=Hide not available options ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. diff --git a/htdocs/langs/sq_AL/languages.lang b/htdocs/langs/sq_AL/languages.lang index ce995b6fb7a..0dcdec8064d 100644 --- a/htdocs/langs/sq_AL/languages.lang +++ b/htdocs/langs/sq_AL/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Spanish (Paraguay) Language_es_PE=Spanish (Peru) Language_es_PR=Spanish (Puerto Rico) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Spanish (Venezuela) Language_et_EE=Estonian Language_eu_ES=Basque diff --git a/htdocs/langs/sq_AL/mails.lang b/htdocs/langs/sq_AL/mails.lang index bee9ca1f74a..9929f546f59 100644 --- a/htdocs/langs/sq_AL/mails.lang +++ b/htdocs/langs/sq_AL/mails.lang @@ -7,7 +7,7 @@ MailCard=EMailing card MailRecipients=Recipients MailRecipient=Recipient MailTitle=Përshkrimi -MailFrom=Sender +MailFrom=Dërguesi MailErrorsTo=Errors to MailReply=Reply to MailTo=Receiver(s) diff --git a/htdocs/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang index 90272dc5dec..ec3ff1f8e81 100644 --- a/htdocs/langs/sq_AL/main.lang +++ b/htdocs/langs/sq_AL/main.lang @@ -548,6 +548,18 @@ MonthShort09=Sep MonthShort10=Oct MonthShort11=Nov MonthShort12=Dec +MonthVeryShort01=J +MonthVeryShort02=F +MonthVeryShort03=M +MonthVeryShort04=A +MonthVeryShort05=M +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=S +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Attached files and documents JoinMainDoc=Join main document DateFormatYYYYMM=YYYY-MM @@ -762,7 +774,7 @@ SetBankAccount=Define Bank Account AccountCurrency=Account currency ViewPrivateNote=View notes XMoreLines=%s line(s) hidden -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=Public URL AddBox=Add box SelectElementAndClick=Select an element and click %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=Everybody +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/sq_AL/oauth.lang b/htdocs/langs/sq_AL/oauth.lang index cafca379f6f..19277b81f2d 100644 --- a/htdocs/langs/sq_AL/oauth.lang +++ b/htdocs/langs/sq_AL/oauth.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - oauth -ConfigOAuth=Oauth Configuration -OAuthServices=OAuth services +ConfigOAuth=Konfigurimi Oauth +OAuthServices=Shërbimet OAuth ManualTokenGeneration=Manual token generation TokenManager=Token manager IsTokenGenerated=Is token generated ? @@ -15,14 +15,14 @@ UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when c ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication. OAuthSetupForLogin=Page to generate an OAuth token SeePreviousTab=See previous tab -OAuthIDSecret=OAuth ID and Secret +OAuthIDSecret=OAuth ID dhe Fjalëkalimi TOKEN_REFRESH=Token Refresh Present TOKEN_EXPIRED=Token expired TOKEN_EXPIRE_AT=Token expire at TOKEN_DELETE=Delete saved token OAUTH_GOOGLE_NAME=Oauth Google service OAUTH_GOOGLE_ID=Oauth Google Id -OAUTH_GOOGLE_SECRET=Oauth Google Secret +OAUTH_GOOGLE_SECRET=Fjalëkalimi Google Oauth OAUTH_GOOGLE_DESC=Go on this page then "Credentials" to create Oauth credentials OAUTH_GITHUB_NAME=Oauth GitHub service OAUTH_GITHUB_ID=Oauth GitHub Id diff --git a/htdocs/langs/sq_AL/other.lang b/htdocs/langs/sq_AL/other.lang index 9c5e58af64e..c8b877f90ad 100644 --- a/htdocs/langs/sq_AL/other.lang +++ b/htdocs/langs/sq_AL/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=If amount higher than %s SourcesRepository=Repository for sources Chart=Chart PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=Exports area diff --git a/htdocs/langs/sq_AL/products.lang b/htdocs/langs/sq_AL/products.lang index 42e49baab37..068855d2f84 100644 --- a/htdocs/langs/sq_AL/products.lang +++ b/htdocs/langs/sq_AL/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Current price AlwaysUseNewPrice=Always use current price of product/service AlwaysUseFixedPrice=Use the fixed price PriceByQuantity=Different prices by quantity +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Quantity range MultipriceRules=Price segment rules UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang index 0e493930831..56405d3f1f2 100644 --- a/htdocs/langs/sq_AL/projects.lang +++ b/htdocs/langs/sq_AL/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=Pending OppStatusWON=Won OppStatusLOST=Lost Budget=Buxheti +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/sq_AL/salaries.lang b/htdocs/langs/sq_AL/salaries.lang index d09814c62b2..387bf20e2d2 100644 --- a/htdocs/langs/sq_AL/salaries.lang +++ b/htdocs/langs/sq_AL/salaries.lang @@ -2,12 +2,12 @@ SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accounting account used for user third parties SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated accounting account defined on user card will be used for Subledger accouting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accouting account on user is not defined. SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accounting account by default for personnel expenses -Salary=Salary -Salaries=Salaries -NewSalaryPayment=New salary payment -SalaryPayment=Salary payment -SalariesPayments=Salaries payments -ShowSalaryPayment=Show salary payment +Salary=Rrogë +Salaries=Rrogat +NewSalaryPayment=Pagesë e re rroge +SalaryPayment=Pagesë rroge +SalariesPayments=Pagesat e rrogave +ShowSalaryPayment=Trego pagesën e rrogës THM=Average hourly rate TJM=Average daily rate CurrentSalary=Current salary diff --git a/htdocs/langs/sq_AL/sms.lang b/htdocs/langs/sq_AL/sms.lang index d48104260e3..f55791ff62d 100644 --- a/htdocs/langs/sq_AL/sms.lang +++ b/htdocs/langs/sq_AL/sms.lang @@ -8,7 +8,7 @@ SmsTargets=Targets SmsRecipients=Targets SmsRecipient=Target SmsTitle=Përshkrimi -SmsFrom=Sender +SmsFrom=Dërguesi SmsTo=Target SmsTopic=Topic of SMS SmsText=Message diff --git a/htdocs/langs/sq_AL/website.lang b/htdocs/langs/sq_AL/website.lang index 3902febbfb7..6b4e2ada84a 100644 --- a/htdocs/langs/sq_AL/website.lang +++ b/htdocs/langs/sq_AL/website.lang @@ -3,15 +3,17 @@ Shortname=Code WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them. DeleteWebsite=Delete website ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Page name/alias -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL of external CSS file WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Media library EditCss=Edit Style/CSS or HTML header EditMenu=Edit menu @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/sr_RS/accountancy.lang b/htdocs/langs/sr_RS/accountancy.lang index 0bff9e2ec37..1a609a4bcdf 100644 --- a/htdocs/langs/sr_RS/accountancy.lang +++ b/htdocs/langs/sr_RS/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Deo broj TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=Lista računovodstvenih naloga UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal Modelcsv=Model izvoza -OptionsDeactivatedForThisExportModel=Za ovaj model izvoza, opcije su deaktivirane Selectmodelcsv=Izaberite model izvoza Modelcsv_normal=Klasičan izvoz Modelcsv_CEGID=Export towards CEGID Expert Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution Modelcsv_quadratus=Export towards Quadratus QuadraCompta Modelcsv_ebp=Export towards EBP Modelcsv_cogilog=Export towards Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id diff --git a/htdocs/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang index 84364b4d5eb..37a53729ec0 100644 --- a/htdocs/langs/sr_RS/admin.lang +++ b/htdocs/langs/sr_RS/admin.lang @@ -539,7 +539,7 @@ Module320Desc=Add RSS feed inside Dolibarr screen pages Module330Name=Bookmarks Module330Desc=Uređivanje markera 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. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar integration Module500Name=Special expenses @@ -890,7 +890,7 @@ DictionaryStaff=Staff DictionaryAvailability=Delivery delay DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Models for chart of accounts DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=Emails templates @@ -904,6 +904,7 @@ SetupSaved=Setup saved SetupNotSaved=Setup not saved BackToModuleList=Back to modules list BackToDictionaryList=Back to dictionaries list +TypeOfRevenueStamp=Type of revenue stamp VATManagement=VAT Management VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is 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. @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/sr_RS/banks.lang b/htdocs/langs/sr_RS/banks.lang index eb429a1d131..4e91a93fefb 100644 --- a/htdocs/langs/sr_RS/banks.lang +++ b/htdocs/langs/sr_RS/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Broj LineRecord=Transakcija AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Reconciled ConciliatedBy=Poravnjaj sa DateConciliating=Datum poravnanja BankLineConciliated=Entry reconciled diff --git a/htdocs/langs/sr_RS/bills.lang b/htdocs/langs/sr_RS/bills.lang index 88546ba8597..d0785726837 100644 --- a/htdocs/langs/sr_RS/bills.lang +++ b/htdocs/langs/sr_RS/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Neplaćene fakture dobavljača %s BillsLate=Zakasnele uplate BillsStatistics=Statistika računa kupaca BillsStatisticsSuppliers=Statistika računa dobavljača +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Onemogućeno jer ne može biti izbrisano InvoiceStandard=Standardni račun InvoiceStandardAsk=Standardni račun @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Zašto želite da klasifikujete ovaj račun kao 'napu ConfirmClassifyPaidPartially=Da li ste sigurni da želite da promeni status računa %s u status plaćen? ConfirmClassifyPaidPartiallyQuestion=Ovaj račun nije plaćen u celosti. Iz kojih razloga želite da zatvorite ovaj račun? ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer diff --git a/htdocs/langs/sr_RS/compta.lang b/htdocs/langs/sr_RS/compta.lang index 56835a77061..c2d84f28db7 100644 --- a/htdocs/langs/sr_RS/compta.lang +++ b/htdocs/langs/sr_RS/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Uplate koje nisu vezane ni za jedan račun i ni za je PaymentsNotLinkedToUser=Uplate koje nisu vezane ni za jednog korisnika Profit=Profit AccountingResult=Računovodstveni rezultat +BalanceBefore=Balance (before) Balance=Stanje Debit=Izlaz Credit=Ulaz diff --git a/htdocs/langs/sr_RS/donations.lang b/htdocs/langs/sr_RS/donations.lang index b10421a2092..b4b9fabdf57 100644 --- a/htdocs/langs/sr_RS/donations.lang +++ b/htdocs/langs/sr_RS/donations.lang @@ -31,3 +31,4 @@ DONATION_ART200=Prikaži član 200 iz CGI ukoliko je neophodno DONATION_ART238=Prikaži član 238 iz CGI ukoliko je neophodno DONATION_ART885=Prikaži član 885 iz CGI ukoliko je neophodno DonationPayment=Uplata donacije +DonationValidated=Donation %s validated diff --git a/htdocs/langs/sr_RS/errors.lang b/htdocs/langs/sr_RS/errors.lang index ff901a0ac40..e670e5cab1a 100644 --- a/htdocs/langs/sr_RS/errors.lang +++ b/htdocs/langs/sr_RS/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Prazan izraz ErrorPriceExpression21=Prazan rezultat "%s" ErrorPriceExpression22=Negativan rezultat "%s" ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Interna greška "%s" ErrorPriceExpressionUnknown=Nepoznata greška "%s" ErrorSrcAndTargetWarehouseMustDiffers=Izvorni i ciljani magacini moraju biti različiti diff --git a/htdocs/langs/sr_RS/install.lang b/htdocs/langs/sr_RS/install.lang index 6d0b176f6cd..564fcb27e57 100644 --- a/htdocs/langs/sr_RS/install.lang +++ b/htdocs/langs/sr_RS/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtua UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Fix za denormalizovane podatke @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Update entity field value of llx_societe_remise MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except MigrationReloadModule=Ponovo učitavanje modula %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Prikaži nedostupne opcije HideNotAvailableOptions=Sakrij nedostupne opcije ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. diff --git a/htdocs/langs/sr_RS/languages.lang b/htdocs/langs/sr_RS/languages.lang index 41c99b95a60..5c6714ac738 100644 --- a/htdocs/langs/sr_RS/languages.lang +++ b/htdocs/langs/sr_RS/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Španski (Panama) Language_es_PY=Španski (Paragvaj) Language_es_PE=Španski (Peru) Language_es_PR=Španski (Porto Riko) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Španski (Venecuela) Language_et_EE=Estonski Language_eu_ES=Basque diff --git a/htdocs/langs/sr_RS/main.lang b/htdocs/langs/sr_RS/main.lang index 86ac7d007cd..e10ae337fbb 100644 --- a/htdocs/langs/sr_RS/main.lang +++ b/htdocs/langs/sr_RS/main.lang @@ -548,6 +548,18 @@ MonthShort09=Sep MonthShort10=Okt MonthShort11=Nov MonthShort12=Dec +MonthVeryShort01=J +MonthVeryShort02=P +MonthVeryShort03=P +MonthVeryShort04=A +MonthVeryShort05=P +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=N +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Fajlovi i dokumenti u prilogu JoinMainDoc=Join main document DateFormatYYYYMM=YYYY-MM @@ -762,7 +774,7 @@ SetBankAccount=Definiši bankovni nalog AccountCurrency=Account currency ViewPrivateNote=Pogledaj beleške XMoreLines=%s linija skrivena(o) -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=Javni UR AddBox=Dodaj box SelectElementAndClick=Select an element and click %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=Svi +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/sr_RS/other.lang b/htdocs/langs/sr_RS/other.lang index 0f66aab7f41..775cbffb550 100644 --- a/htdocs/langs/sr_RS/other.lang +++ b/htdocs/langs/sr_RS/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=Ukoliko je iznos veći od %s SourcesRepository=Repository koda Chart=Tabela PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=Oblast exporta diff --git a/htdocs/langs/sr_RS/products.lang b/htdocs/langs/sr_RS/products.lang index 18bd89759f4..e7628c10155 100644 --- a/htdocs/langs/sr_RS/products.lang +++ b/htdocs/langs/sr_RS/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Trenutna cena AlwaysUseNewPrice=Uvek koristi trenutnu cenu proizvoda/usluge AlwaysUseFixedPrice=Koristi fiksnu cenu PriceByQuantity=Različite cene po količini +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Raspon količina MultipriceRules=Price segment rules UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/sr_RS/projects.lang b/htdocs/langs/sr_RS/projects.lang index 40375568089..c536692b42e 100644 --- a/htdocs/langs/sr_RS/projects.lang +++ b/htdocs/langs/sr_RS/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=Na čekanju OppStatusWON=Dobijeno OppStatusLOST=Izgubljeno Budget=Budžet +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang index 0413b3b7eb2..6a6f7091a13 100644 --- a/htdocs/langs/sv_SE/accountancy.lang +++ b/htdocs/langs/sv_SE/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Piece number TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=Förteckning över redovisningskonton UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal Modelcsv=Modell av export -OptionsDeactivatedForThisExportModel=För denna exportmodell är tillval inaktiverade Selectmodelcsv=Välj en modell av export Modelcsv_normal=Klassisk export Modelcsv_CEGID=Export towards CEGID Expert Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution Modelcsv_quadratus=Export towards Quadratus QuadraCompta Modelcsv_ebp=Export towards EBP Modelcsv_cogilog=Export towards Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang index e0ec7461869..4ba1947eec3 100644 --- a/htdocs/langs/sv_SE/admin.lang +++ b/htdocs/langs/sv_SE/admin.lang @@ -539,7 +539,7 @@ Module320Desc=Lägg till RSS feed inne Dolibarr skärm sidor Module330Name=Bokmärken Module330Desc=Förvaltning av bokmärken förvaltning Module400Name=Projekt / Möjligheter / Leads -Module400Desc=Förvaltning av projekt, möjligheter eller leads. Du kan sedan tilldela varje element (faktura, beställning, förslag, ingripande, ...) till ett projekt och få ett övergripande vy från projekt vyn. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=WebCalendar Module410Desc=WebCalendar integration Module500Name=Särskilda kostnader @@ -890,7 +890,7 @@ DictionaryStaff=Personal DictionaryAvailability=Leveransförsening DictionaryOrderMethods=Beställningsmetoder DictionarySource=Ursprung av affärsförslag / beställning -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Modeller för kontoplan DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=E-postmeddelanden mallar @@ -904,6 +904,7 @@ SetupSaved=Setup sparas SetupNotSaved=Setup not saved BackToModuleList=Tillbaka till moduler lista BackToDictionaryList=Tillbaka till ordlistan +TypeOfRevenueStamp=Type of revenue stamp VATManagement=Moms Management VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is VAT=0. End of rule. VATIsNotUsedDesc=Som standard föreslås moms 0 som kan användas för de fall som föreningar, privatpersoner ou små företag. @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/sv_SE/banks.lang b/htdocs/langs/sv_SE/banks.lang index a11fe8cd369..a4a5ff3f36f 100644 --- a/htdocs/langs/sv_SE/banks.lang +++ b/htdocs/langs/sv_SE/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Antal LineRecord=Transaktion AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Reconciled ConciliatedBy=Förenas med DateConciliating=Reconcile datum BankLineConciliated=Entry reconciled diff --git a/htdocs/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang index 4f447ca3e73..0d519521178 100644 --- a/htdocs/langs/sv_SE/bills.lang +++ b/htdocs/langs/sv_SE/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s BillsLate=Sena betalningar BillsStatistics=Kundfakturor statistik BillsStatisticsSuppliers=Leverantörsfakturor statistik +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Disabled because cannot be erased InvoiceStandard=Standard faktura InvoiceStandardAsk=Standard faktura @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? ConfirmClassifyPaidPartiallyReasonAvoir=Återstående obetalt (%s %s) är en rabatt som beviljats ​​eftersom betalningen gjordes före villkoren. Jag reglerar momsen med en kreditnota. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Återstående obetalt (%s %s) är en rabatt som beviljats ​​eftersom betalningen gjordes före villkoren. Jag godkänner förlust av momsen på denna rabatt. ConfirmClassifyPaidPartiallyReasonDiscountVat=Återstående obetalt (%s %s) är en rabatt som beviljats ​​eftersom betalningen gjordes före villkoren. Jag återskapar momsen på denna rabatt med en kreditnota. ConfirmClassifyPaidPartiallyReasonBadCustomer=Dålig kund diff --git a/htdocs/langs/sv_SE/compta.lang b/htdocs/langs/sv_SE/compta.lang index d93650be32f..b9ae2f87819 100644 --- a/htdocs/langs/sv_SE/compta.lang +++ b/htdocs/langs/sv_SE/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Betalningar inte kopplade till någon faktura, så in PaymentsNotLinkedToUser=Betalningar inte är kopplade till alla användare Profit=Resultat AccountingResult=Bokföring resultat +BalanceBefore=Balance (before) Balance=Balans Debit=Debet Credit=Credit diff --git a/htdocs/langs/sv_SE/donations.lang b/htdocs/langs/sv_SE/donations.lang index 244458f0d6d..7d01404238c 100644 --- a/htdocs/langs/sv_SE/donations.lang +++ b/htdocs/langs/sv_SE/donations.lang @@ -31,3 +31,4 @@ DONATION_ART200=Visar artikel 200 från CGI om du är orolig DONATION_ART238=Visar artikel 238 från CGI om du är orolig DONATION_ART885=Visar artikel 885 från CGI om du är orolig DonationPayment=Donation payment +DonationValidated=Donation %s validated diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang index 4696d78e95f..399a7666788 100644 --- a/htdocs/langs/sv_SE/errors.lang +++ b/htdocs/langs/sv_SE/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Tomma uttryck ErrorPriceExpression21=Tomt resultat '%s' ErrorPriceExpression22=Negativt resultat '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Internt fel '%s' ErrorPriceExpressionUnknown=Okänt fel '%s' ErrorSrcAndTargetWarehouseMustDiffers=Källa och mål lager måste skiljer diff --git a/htdocs/langs/sv_SE/install.lang b/htdocs/langs/sv_SE/install.lang index 33312ee451b..47e52b0c4db 100644 --- a/htdocs/langs/sv_SE/install.lang +++ b/htdocs/langs/sv_SE/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=Du använder Dolibarr inställningsguiden från en Prox UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Fix för denormalized data @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Update entity field value of llx_societe_remise MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except MigrationReloadModule=Reload module %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Visa ej tillgängliga val HideNotAvailableOptions=Dölj ej tillgängliga val ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. diff --git a/htdocs/langs/sv_SE/languages.lang b/htdocs/langs/sv_SE/languages.lang index 86e160a7b03..471a9355824 100644 --- a/htdocs/langs/sv_SE/languages.lang +++ b/htdocs/langs/sv_SE/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Spanska (Paraguay) Language_es_PE=Spanska (Peru) Language_es_PR=Spanska (Puerto Rico) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Spanish (Venezuela) Language_et_EE=Estniska Language_eu_ES=Baskiska diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang index 31caedc4bc2..83164ec7a5f 100644 --- a/htdocs/langs/sv_SE/main.lang +++ b/htdocs/langs/sv_SE/main.lang @@ -548,6 +548,18 @@ MonthShort09=Sep MonthShort10=Okt MonthShort11=Nov MonthShort12=Dec +MonthVeryShort01=J +MonthVeryShort02=F +MonthVeryShort03=M +MonthVeryShort04=A +MonthVeryShort05=M +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=S +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Bifogade filer och dokument JoinMainDoc=Join main document DateFormatYYYYMM=ÅÅÅÅ-MM @@ -762,7 +774,7 @@ SetBankAccount=Definiera bankkonto AccountCurrency=Account currency ViewPrivateNote=Se noter XMoreLines=%s rader osynliga -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=Offentlig webbadress AddBox=Lägg till låda SelectElementAndClick=Select an element and click %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=Alla +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/sv_SE/other.lang b/htdocs/langs/sv_SE/other.lang index 23d8f8eab64..7cf73f506cd 100644 --- a/htdocs/langs/sv_SE/other.lang +++ b/htdocs/langs/sv_SE/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=If amount higher than %s SourcesRepository=Repository for sources Chart=Chart PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=Export område diff --git a/htdocs/langs/sv_SE/products.lang b/htdocs/langs/sv_SE/products.lang index 0a3a4714b95..dc0f90423ac 100644 --- a/htdocs/langs/sv_SE/products.lang +++ b/htdocs/langs/sv_SE/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Nuvarande pris AlwaysUseNewPrice=Använd alltid nuvarande pris för produkt / tjänst AlwaysUseFixedPrice=Använd fast pris PriceByQuantity=Olika priser m.a.p. mängd +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Pris för mängdgaffel MultipriceRules=Price segment rules UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang index 36e865f1162..15b6c11151d 100644 --- a/htdocs/langs/sv_SE/projects.lang +++ b/htdocs/langs/sv_SE/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=Avvaktande OppStatusWON=Won OppStatusLOST=Lost Budget=Budget +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/sv_SE/website.lang b/htdocs/langs/sv_SE/website.lang index 88290fd1225..630a62570b0 100644 --- a/htdocs/langs/sv_SE/website.lang +++ b/htdocs/langs/sv_SE/website.lang @@ -3,15 +3,17 @@ Shortname=Kod WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them. DeleteWebsite=Delete website ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Page name/alias -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL of external CSS file WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Media library EditCss=Edit Style/CSS or HTML header EditMenu=Edit menu @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/sw_SW/accountancy.lang b/htdocs/langs/sw_SW/accountancy.lang index 9dbf911a820..c4189507f60 100644 --- a/htdocs/langs/sw_SW/accountancy.lang +++ b/htdocs/langs/sw_SW/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Piece number TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=List of the accounting accounts UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal 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 Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution Modelcsv_quadratus=Export towards Quadratus QuadraCompta Modelcsv_ebp=Export towards EBP Modelcsv_cogilog=Export towards Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang index 4f3d25c4eb1..9dce46ab295 100644 --- a/htdocs/langs/sw_SW/admin.lang +++ b/htdocs/langs/sw_SW/admin.lang @@ -539,7 +539,7 @@ Module320Desc=Add RSS feed inside Dolibarr screen pages Module330Name=Bookmarks Module330Desc=Bookmarks management Module400Name=Projects/Opportunities/Leads -Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar integration Module500Name=Special expenses @@ -890,7 +890,7 @@ DictionaryStaff=Staff DictionaryAvailability=Delivery delay DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Models for chart of accounts DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=Emails templates @@ -904,6 +904,7 @@ SetupSaved=Setup saved SetupNotSaved=Setup not saved BackToModuleList=Back to modules list BackToDictionaryList=Back to dictionaries list +TypeOfRevenueStamp=Type of revenue stamp VATManagement=VAT Management VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is 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. @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/sw_SW/banks.lang b/htdocs/langs/sw_SW/banks.lang index 40b76f8c64c..be8f75d172b 100644 --- a/htdocs/langs/sw_SW/banks.lang +++ b/htdocs/langs/sw_SW/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Number LineRecord=Transaction AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Reconciled ConciliatedBy=Reconciled by DateConciliating=Reconcile date BankLineConciliated=Entry reconciled diff --git a/htdocs/langs/sw_SW/bills.lang b/htdocs/langs/sw_SW/bills.lang index b865c00be9d..eeafc56bf1c 100644 --- a/htdocs/langs/sw_SW/bills.lang +++ b/htdocs/langs/sw_SW/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s BillsLate=Late payments BillsStatistics=Customers invoices statistics BillsStatisticsSuppliers=Suppliers invoices statistics +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Disabled because cannot be erased InvoiceStandard=Standard invoice InvoiceStandardAsk=Standard invoice @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer diff --git a/htdocs/langs/sw_SW/compta.lang b/htdocs/langs/sw_SW/compta.lang index 4082b9fa9b7..df4942cf234 100644 --- a/htdocs/langs/sw_SW/compta.lang +++ b/htdocs/langs/sw_SW/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to PaymentsNotLinkedToUser=Payments not linked to any user Profit=Profit AccountingResult=Accounting result +BalanceBefore=Balance (before) Balance=Balance Debit=Debit Credit=Credit diff --git a/htdocs/langs/sw_SW/donations.lang b/htdocs/langs/sw_SW/donations.lang index f4578fa9fc3..5edc8d62033 100644 --- a/htdocs/langs/sw_SW/donations.lang +++ b/htdocs/langs/sw_SW/donations.lang @@ -31,3 +31,4 @@ 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 +DonationValidated=Donation %s validated diff --git a/htdocs/langs/sw_SW/errors.lang b/htdocs/langs/sw_SW/errors.lang index b02b70c9c9f..cff89a71d98 100644 --- a/htdocs/langs/sw_SW/errors.lang +++ b/htdocs/langs/sw_SW/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Empty expression ErrorPriceExpression21=Empty result '%s' ErrorPriceExpression22=Negative result '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs diff --git a/htdocs/langs/sw_SW/install.lang b/htdocs/langs/sw_SW/install.lang index 7a93fd20799..e602c54640c 100644 --- a/htdocs/langs/sw_SW/install.lang +++ b/htdocs/langs/sw_SW/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtua UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Fix for denormalized data @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Update entity field value of llx_societe_remise MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except MigrationReloadModule=Reload module %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Show not available options HideNotAvailableOptions=Hide not available options ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. diff --git a/htdocs/langs/sw_SW/languages.lang b/htdocs/langs/sw_SW/languages.lang index 00d79083b98..669ea674564 100644 --- a/htdocs/langs/sw_SW/languages.lang +++ b/htdocs/langs/sw_SW/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Kihispania (Paraguay) Language_es_PE=Spanish (Peru) Language_es_PR=Kihispania (Puerto Rico) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Spanish (Venezuela) Language_et_EE=Estonian Language_eu_ES=Basque diff --git a/htdocs/langs/sw_SW/main.lang b/htdocs/langs/sw_SW/main.lang index d5c9fc6ce34..f1f1628af27 100644 --- a/htdocs/langs/sw_SW/main.lang +++ b/htdocs/langs/sw_SW/main.lang @@ -548,6 +548,18 @@ MonthShort09=Sep MonthShort10=Oct MonthShort11=Nov MonthShort12=Dec +MonthVeryShort01=J +MonthVeryShort02=F +MonthVeryShort03=M +MonthVeryShort04=A +MonthVeryShort05=M +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=S +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Attached files and documents JoinMainDoc=Join main document DateFormatYYYYMM=YYYY-MM @@ -762,7 +774,7 @@ SetBankAccount=Define Bank Account AccountCurrency=Account currency ViewPrivateNote=View notes XMoreLines=%s line(s) hidden -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=Public URL AddBox=Add box SelectElementAndClick=Select an element and click %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=Everybody +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/sw_SW/other.lang b/htdocs/langs/sw_SW/other.lang index 0d9d1cfbd85..1a5314a24d9 100644 --- a/htdocs/langs/sw_SW/other.lang +++ b/htdocs/langs/sw_SW/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=If amount higher than %s SourcesRepository=Repository for sources Chart=Chart PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=Exports area diff --git a/htdocs/langs/sw_SW/products.lang b/htdocs/langs/sw_SW/products.lang index 43c74c9b877..53835bd7f06 100644 --- a/htdocs/langs/sw_SW/products.lang +++ b/htdocs/langs/sw_SW/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Current price AlwaysUseNewPrice=Always use current price of product/service AlwaysUseFixedPrice=Use the fixed price PriceByQuantity=Different prices by quantity +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Quantity range MultipriceRules=Price segment rules UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/sw_SW/projects.lang b/htdocs/langs/sw_SW/projects.lang index f33a950acff..c69302deecb 100644 --- a/htdocs/langs/sw_SW/projects.lang +++ b/htdocs/langs/sw_SW/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=Pending OppStatusWON=Won OppStatusLOST=Lost Budget=Budget +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/th_TH/accountancy.lang b/htdocs/langs/th_TH/accountancy.lang index d11bccb84a7..0bfacad98ef 100644 --- a/htdocs/langs/th_TH/accountancy.lang +++ b/htdocs/langs/th_TH/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Piece number TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=รายการบัญชีที่บัญชี UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal Modelcsv=รูปแบบของการส่งออก -OptionsDeactivatedForThisExportModel=สำหรับรูปแบบการส่งออกนี้ตัวเลือกที่จะปิดการใช้งาน Selectmodelcsv=เลือกรูปแบบของการส่งออก Modelcsv_normal=การส่งออกคลาสสิก Modelcsv_CEGID=Export towards CEGID Expert Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution Modelcsv_quadratus=Export towards Quadratus QuadraCompta Modelcsv_ebp=Export towards EBP Modelcsv_cogilog=Export towards Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang index f7aed9eeffc..a7475a0a188 100644 --- a/htdocs/langs/th_TH/admin.lang +++ b/htdocs/langs/th_TH/admin.lang @@ -539,7 +539,7 @@ Module320Desc=เพิ่มฟีด RSS ภายใน Dolibarr หน้า Module330Name=ที่คั่นหน้า Module330Desc=การจัดการที่คั่นหน้า Module400Name=โครงการ / โอกาส / นำ -Module400Desc=การบริหารจัดการของโครงการหรือนำไปสู่​​โอกาส จากนั้นคุณสามารถกำหนดองค์ประกอบใด ๆ (ใบแจ้งหนี้เพื่อข้อเสนอการแทรกแซง, ... ) กับโครงการและได้รับมุมมองจากมุมมองขวางโครงการ +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=บูรณาการ Webcalendar Module500Name=ค่าใช้จ่ายพิเศษ @@ -890,7 +890,7 @@ DictionaryStaff=บุคลากร DictionaryAvailability=ความล่าช้าในการจัดส่งสินค้า DictionaryOrderMethods=วิธีการสั่งซื้อ DictionarySource=แหล่งที่มาของข้อเสนอ / การสั่งซื้อ -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=รุ่นสำหรับผังบัญชี DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=แม่แบบอีเมล @@ -904,6 +904,7 @@ SetupSaved=การตั้งค่าที่บันทึกไว้ SetupNotSaved=Setup not saved BackToModuleList=กลับไปยังรายการโมดูล BackToDictionaryList=กลับไปยังรายการพจนานุกรม +TypeOfRevenueStamp=Type of revenue stamp VATManagement=การบริหารจัดการภาษีมูลค่าเพิ่ม VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is VAT=0. End of rule. VATIsNotUsedDesc=โดยเริ่มต้นภาษีมูลค่าเพิ่มเสนอเป็น 0 ซึ่งสามารถนำมาใช้สำหรับกรณีเช่นสมาคมบุคคลอู บริษัท ขนาดเล็ก @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/th_TH/banks.lang b/htdocs/langs/th_TH/banks.lang index e661c0aa0d6..999a4dbf66d 100644 --- a/htdocs/langs/th_TH/banks.lang +++ b/htdocs/langs/th_TH/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=จำนวน LineRecord=การซื้อขาย AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Reconciled ConciliatedBy=โดยคืนดี DateConciliating=วันที่ตกลงกัน BankLineConciliated=Entry reconciled diff --git a/htdocs/langs/th_TH/bills.lang b/htdocs/langs/th_TH/bills.lang index 54984f371c0..f55c8b1d563 100644 --- a/htdocs/langs/th_TH/bills.lang +++ b/htdocs/langs/th_TH/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s BillsLate=การชำระเงินล่าช้า BillsStatistics=สถิติใบแจ้งหนี้ลูกค้า BillsStatisticsSuppliers=สถิติใบแจ้งหนี้ซัพพลายเออร์ +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Disabled because cannot be erased InvoiceStandard=ใบแจ้งหนี้มาตรฐาน InvoiceStandardAsk=ใบแจ้งหนี้มาตรฐาน @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? ConfirmClassifyPaidPartiallyReasonAvoir=ที่เหลือยังไม่ได้ชำระ (% s% s) เป็นส่วนลดได้รับเนื่องจากการชำระเงินก่อนที่จะถูกสร้างขึ้นมาในระยะ ผมระเบียบภาษีมูลค่าเพิ่มที่มีใบลดหนี้ +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=ที่เหลือยังไม่ได้ชำระ (% s% s) เป็นส่วนลดได้รับเนื่องจากการชำระเงินก่อนที่จะถูกสร้างขึ้นมาในระยะ ฉันยอมรับที่จะสูญเสียภาษีมูลค่าเพิ่มในส่วนลดนี้ ConfirmClassifyPaidPartiallyReasonDiscountVat=ที่เหลือยังไม่ได้ชำระ (% s% s) เป็นส่วนลดได้รับเนื่องจากการชำระเงินก่อนที่จะถูกสร้างขึ้นมาในระยะ ฉันกู้คืนภาษีมูลค่าเพิ่มส่วนลดนี้โดยไม่มีใบลดหนี้ ConfirmClassifyPaidPartiallyReasonBadCustomer=ลูกค้าที่ไม่ดี diff --git a/htdocs/langs/th_TH/compta.lang b/htdocs/langs/th_TH/compta.lang index b5c649a10f9..f7e28036b66 100644 --- a/htdocs/langs/th_TH/compta.lang +++ b/htdocs/langs/th_TH/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=การชำระเงินไม่ได้ PaymentsNotLinkedToUser=การชำระเงินที่ไม่เชื่อมโยงกับผู้ใช้ใด ๆ Profit=กำไร AccountingResult=ผลการบัญชี +BalanceBefore=Balance (before) Balance=สมดุล Debit=หักบัญชี Credit=เครดิต diff --git a/htdocs/langs/th_TH/donations.lang b/htdocs/langs/th_TH/donations.lang index e947c76b243..e0b8d33217f 100644 --- a/htdocs/langs/th_TH/donations.lang +++ b/htdocs/langs/th_TH/donations.lang @@ -31,3 +31,4 @@ DONATION_ART200=แสดงบทความจาก 200 CGI ถ้าคุ DONATION_ART238=แสดงบทความจาก 238 CGI ถ้าคุณมีความกังวล DONATION_ART885=แสดงบทความจาก 885 CGI ถ้าคุณมีความกังวล DonationPayment=การชำระเงินที่บริจาค +DonationValidated=Donation %s validated diff --git a/htdocs/langs/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang index 2b42629117e..e3dc31a9461 100644 --- a/htdocs/langs/th_TH/errors.lang +++ b/htdocs/langs/th_TH/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=การแสดงออกที่ว่างเป ErrorPriceExpression21=ผลที่ว่างเปล่า '% s' ErrorPriceExpression22=ผลเชิงลบ '% s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=ข้อผิดพลาดภายใน '% s' ErrorPriceExpressionUnknown=ข้อผิดพลาดที่ไม่รู้จัก '% s' ErrorSrcAndTargetWarehouseMustDiffers=แหล่งที่มาและคลังสินค้าเป้าหมายต้องแตกต่าง diff --git a/htdocs/langs/th_TH/install.lang b/htdocs/langs/th_TH/install.lang index 6b28422509a..4f2373db06d 100644 --- a/htdocs/langs/th_TH/install.lang +++ b/htdocs/langs/th_TH/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=คุณสามารถใช้ตัวช่ว UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=แก้ไขข้อมูล denormalized @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Update entity field value of llx_societe_remise MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except MigrationReloadModule=Reload module %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=แสดงตัวเลือกที่มีอยู่ไม่ได้ HideNotAvailableOptions=ซ่อนตัวเลือกที่มีอยู่ไม่ได้ ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. diff --git a/htdocs/langs/th_TH/languages.lang b/htdocs/langs/th_TH/languages.lang index 61f620377ab..e10a2c02b96 100644 --- a/htdocs/langs/th_TH/languages.lang +++ b/htdocs/langs/th_TH/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=สเปน (ปารากวัย) Language_es_PE=เสปน (เปรู) Language_es_PR=สเปน (เปอร์โตริโก) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Spanish (Venezuela) Language_et_EE=เอสโตเนีย Language_eu_ES=ชาวแบสค์ diff --git a/htdocs/langs/th_TH/main.lang b/htdocs/langs/th_TH/main.lang index 2295ec29db4..b2938c6562a 100644 --- a/htdocs/langs/th_TH/main.lang +++ b/htdocs/langs/th_TH/main.lang @@ -548,6 +548,18 @@ MonthShort09=กันยายน MonthShort10=ตุลาคม MonthShort11=พฤศจิกายน MonthShort12=ธันวาคม +MonthVeryShort01=J +MonthVeryShort02=F +MonthVeryShort03=M +MonthVeryShort04=A +MonthVeryShort05=M +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=S +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=ไฟล์ที่แนบมาและเอกสาร JoinMainDoc=Join main document DateFormatYYYYMM=YYYY-MM @@ -762,7 +774,7 @@ SetBankAccount=กำหนดบัญชีธนาคาร AccountCurrency=Account currency ViewPrivateNote=ดูบันทึก XMoreLines=% s สาย (s) ซ่อน -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=URL ที่สาธารณะ AddBox=เพิ่มกล่อง SelectElementAndClick=Select an element and click %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=ทุกคน +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/th_TH/members.lang b/htdocs/langs/th_TH/members.lang index 7a06f2e530e..5427d6c2a86 100644 --- a/htdocs/langs/th_TH/members.lang +++ b/htdocs/langs/th_TH/members.lang @@ -23,7 +23,7 @@ MembersListToValid=รายชื่อสมาชิกร่าง (ที MembersListValid=รายชื่อสมาชิกที่ถูกต้อง MembersListUpToDate=รายชื่อสมาชิกที่ถูกต้องที่มีถึงวันที่สมัครสมาชิก MembersListNotUpToDate=รายชื่อสมาชิกที่ถูกต้องด้วยการสมัครสมาชิกออกจากวันที่ -MembersListResiliated=List of terminated members +MembersListResiliated=รายชื่อสมาชิกที่สิ้นสุดสมาชิกภาพ MembersListQualified=รายชื่อสมาชิกที่ผ่านการรับรอง MenuMembersToValidate=สมาชิกร่าง MenuMembersValidated=สมาชิกผ่านการตรวจสอบ diff --git a/htdocs/langs/th_TH/other.lang b/htdocs/langs/th_TH/other.lang index c818a4127f3..ec56a3485c2 100644 --- a/htdocs/langs/th_TH/other.lang +++ b/htdocs/langs/th_TH/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=หากจำนวนเงินที่สูงกว SourcesRepository=พื้นที่เก็บข้อมูลสำหรับแหล่งที่มา Chart=Chart PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=พื้นที่การส่งออก diff --git a/htdocs/langs/th_TH/productbatch.lang b/htdocs/langs/th_TH/productbatch.lang index c719c436ce9..9c26015eb51 100644 --- a/htdocs/langs/th_TH/productbatch.lang +++ b/htdocs/langs/th_TH/productbatch.lang @@ -4,7 +4,7 @@ ProductStatusOnBatch=ใช่ (มาก / อนุกรมที่จำเ ProductStatusNotOnBatch=ไม่ (มาก / อนุกรมไม่ได้ใช้) ProductStatusOnBatchShort=ใช่ ProductStatusNotOnBatchShort=ไม่ -Batch=จัดสรร / อนุกรม +Batch=ล็อต/ลำดับ atleast1batchfield=กินตามวันที่หรือขายโดยวันที่หรือ Lot / หมายเลข Serial batch_number=Lot / หมายเลข Serial BatchNumberShort=จัดสรร / อนุกรม @@ -16,7 +16,7 @@ printEatby=กินโดย:% s printSellby=ขายโดย:% s printQty=จำนวน:% d AddDispatchBatchLine=เพิ่มบรรทัดสำหรับอายุการเก็บรักษาการฝึกอบรม -WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, automatic increase/decrease stock mode is forced to shipping validate and manual dispatching for reception and can't be edited. Other options can be defined as you want. +WhenProductBatchModuleOnOptionAreForced=เมื่อโมดูล ล็อท/ลำดับ เปิดใช้งาน โหมดการเพิ่มขึ้น/ลดลงของสต็อคถูกบังคับให้ต้องเลือกยืนยันความถูกต้องในการขนส่ง และการจ่ายแบบทำเองไม่สามารถแก้ไขได้ ตัวเลือกอื่น ๆ สามารถกำหนดได้ตามที่คุณต้องการ ProductDoesNotUseBatchSerial=ผลิตภัณฑ์นี้ไม่ได้ใช้มาก / หมายเลขซีเรีย ProductLotSetup=Setup of module lot/serial ShowCurrentStockOfLot=Show current stock for couple product/lot diff --git a/htdocs/langs/th_TH/products.lang b/htdocs/langs/th_TH/products.lang index ac1c9f2edef..84bcfc60a70 100644 --- a/htdocs/langs/th_TH/products.lang +++ b/htdocs/langs/th_TH/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=ราคาปัจจุบัน AlwaysUseNewPrice=มักจะใช้ราคาปัจจุบันของสินค้า / บริการ AlwaysUseFixedPrice=ใช้ราคาคงที่ PriceByQuantity=ราคาที่แตกต่างกันตามปริมาณ +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=จำนวนช่วง MultipriceRules=Price segment rules UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/th_TH/projects.lang b/htdocs/langs/th_TH/projects.lang index 4492baa58cc..79aba76ab18 100644 --- a/htdocs/langs/th_TH/projects.lang +++ b/htdocs/langs/th_TH/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=ที่รอดำเนินการ OppStatusWON=Won OppStatusLOST=Lost Budget=Budget +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/th_TH/website.lang b/htdocs/langs/th_TH/website.lang index 74edc094476..e3abd9fef71 100644 --- a/htdocs/langs/th_TH/website.lang +++ b/htdocs/langs/th_TH/website.lang @@ -3,15 +3,17 @@ Shortname=รหัส WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them. DeleteWebsite=Delete website ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Page name/alias -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL of external CSS file WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Media library EditCss=Edit Style/CSS or HTML header EditMenu=Edit menu @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/tr_TR/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang index 4fe36e2772d..b060670cf7b 100644 --- a/htdocs/langs/tr_TR/accountancy.lang +++ b/htdocs/langs/tr_TR/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Parça sayısı TransactionNumShort=Num. transaction AccountingCategory=Kişiselleştirilmiş gruplar GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Burada üçüncü taraf müşterileri ve tedarikçileri ile ListAccounts=Muhasebe hesapları listesi UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal Modelcsv=Dışaaktarım modeli -OptionsDeactivatedForThisExportModel=Bu dışaaktarma modeli için seçenekler etkinleştirilmemiş Selectmodelcsv=Bir dışaaktarım modeli seç Modelcsv_normal=Klasik dışaaktarım Modelcsv_CEGID=CEGID Expert Comptabilité'ye doğru dışaaktar @@ -254,7 +254,7 @@ Modelcsv_ciel=Sage Ciel Compta ya da Compta Evolution'a doğru dışaaktar Modelcsv_quadratus=Quadratus QuadraCompta'ya doğru dışaaktar Modelcsv_ebp=EBP'ye yönelik dışaaktarım Modelcsv_cogilog=Cogilog'a dışaaktar -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Hesap planı Id diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang index 046296fa6e2..d6049f4808f 100644 --- a/htdocs/langs/tr_TR/admin.lang +++ b/htdocs/langs/tr_TR/admin.lang @@ -539,7 +539,7 @@ Module320Desc=Dolibarr ekran sayfaları içine RSS ekle Module330Name=Yerimleri Module330Desc=Yerimi yönetimi Module400Name=Projeler/Fırsatlar/Adaylar -Module400Desc=Projlerin, fırsatların ve adayların yönetimi. Daha sonra bir projeye herhangi bir unsur (fatura, sipariş, teklif, müdahale, ...) atayabilirsiniz ve proje görünümünde bir çapraz bir görünüm elde edebilirsiniz. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Web Takvimi Module410Desc=WebT akvimi entegrasyonu Module500Name=Özel giderler @@ -890,7 +890,7 @@ DictionaryStaff=Personel DictionaryAvailability=Teslimat süresi DictionaryOrderMethods=Sipariş yöntemleri DictionarySource=Teklifin/siparişin kökeni -DictionaryAccountancyCategory=Kişiselleştirilmiş gruplar +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Hesap planı modelleri DictionaryAccountancyJournal=Muhasebe günlükleri DictionaryEMailTemplates=Eposta şablonları @@ -904,6 +904,7 @@ SetupSaved=Kurulum kaydedildi SetupNotSaved=Kurulum kaydedilmedi BackToModuleList=Modül listesine geri git BackToDictionaryList=Sözlük listesine dön +TypeOfRevenueStamp=Type of revenue stamp VATManagement=KDV Yönetimi VATIsUsedDesc=Adaylar, faturalar, siparişler, v.b oluşturulurrken KDV oranı varsayılan olarak etkin standart kuralı izler:
    Eğer satıcı KDV ne tabii değilse varsayılan KDV 0 olur, kural sonu.
    Eğer (satıcı ülkesi=alıcı ülkesi)yse, varsayılan KDV satıcı ülkesindeki ürünün KDV dir. Kural sonu.
    Eğer satıcı ve alıcı Avrupa Birliğindeyse ve mallar taşıma ürünleriyse (araba, gemi, uçak) varsayılan KDV 0 dır (KDV alıcı tarafından kendi ülkesindeki gümrüğe ödenir, satıcıya değil). Kural sonu.
    Eğer satıcı ve alıcı Avrupa Birliğinde ise ve alıcı bir firma değilse, varsayılan KDV satılan ürünün KDV dir. Kural sonu.
    Eğer satıcı ve alıcı Avrupa Birliğindeyse ve alıcı bir firmaysa varsayılan KDV 0 dır. Kural sonu.
    Yoksa önerilen KDV=0 dır. Kural sonu. VATIsNotUsedDesc=Dernekler, şahıslar ve küçük firmalar durumunda varsayılan olarak kullanılması önerilen KDV 0 dır. @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/tr_TR/banks.lang b/htdocs/langs/tr_TR/banks.lang index 26ffb10f1e4..3d51aa4f2cd 100644 --- a/htdocs/langs/tr_TR/banks.lang +++ b/htdocs/langs/tr_TR/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Numarası LineRecord=İşlem AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Reconciled ConciliatedBy=Uzlaştıran DateConciliating=Uzlaştırma tarihi BankLineConciliated=Entry reconciled diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang index 437a0b122f0..52795d995fb 100644 --- a/htdocs/langs/tr_TR/bills.lang +++ b/htdocs/langs/tr_TR/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=%s için ödenmemiş tedarikçi faturaları BillsLate=Geç ödemeler BillsStatistics=Müşteri faturaları istatistikleri BillsStatisticsSuppliers=Tedarikçi faturaları istatistikleri +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Silinemediği için devre dışı bırakıldı InvoiceStandard=Standart fatura InvoiceStandardAsk=Standart fatura @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Neden bu faturayı ‘vazgeçilmiş’ olarak sınıfl ConfirmClassifyPaidPartially=%s faturasının durumunu ödenmiş olarak değiştirmek istediğinizden emin misiniz? ConfirmClassifyPaidPartiallyQuestion=Bu fatura tamamen ödenmemiş. Bu faturayı kapatmak için nedenler nelerdir? ConfirmClassifyPaidPartiallyReasonAvoir=Kalan bakiye (%s %s) ödeme vadesinden önce yapıldığından dolayı verilmiş bir indirimdr. KDV bir iade faturasıyla ayarIanır. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Kalan ödenmemiş tutar (%s %s) ödeme vadesinden önce ödendiğinden bir indirim olarak verilmiştir. Burada KDV sini kaybetmeyi kabul ediyorum. ConfirmClassifyPaidPartiallyReasonDiscountVat=Kalan bakiye (%s %s) ödeme vadesinden önce yapıldığından dolayı verilmiş bir indirimdr. KDV bir iade faturasıyla düzeltilir. ConfirmClassifyPaidPartiallyReasonBadCustomer=Kötü müşteri diff --git a/htdocs/langs/tr_TR/compta.lang b/htdocs/langs/tr_TR/compta.lang index 8af22e8ce66..85b3dfbc0b5 100644 --- a/htdocs/langs/tr_TR/compta.lang +++ b/htdocs/langs/tr_TR/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Herhangi bir faturaya bağlı olmayan ödemeler, herh PaymentsNotLinkedToUser=Herhangi bir kullanıcıya bağlı olmayan ödemeler Profit=Kar AccountingResult=Muhasebe sonucu +BalanceBefore=Balance (before) Balance=Bakiye Debit=Borç Credit=Alacak diff --git a/htdocs/langs/tr_TR/donations.lang b/htdocs/langs/tr_TR/donations.lang index a467260f479..39d502ac1c2 100644 --- a/htdocs/langs/tr_TR/donations.lang +++ b/htdocs/langs/tr_TR/donations.lang @@ -31,3 +31,4 @@ 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=Bağış ödemesi +DonationValidated=Donation %s validated diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang index 977c9719d84..322d239eb3d 100644 --- a/htdocs/langs/tr_TR/errors.lang +++ b/htdocs/langs/tr_TR/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Boş ifade ErrorPriceExpression21=Boş sonuç '%s' ErrorPriceExpression22=Eksi sonuç '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=İç hata '%s' ErrorPriceExpressionUnknown=Bilinmeyen hata '%s' ErrorSrcAndTargetWarehouseMustDiffers=Kaynak ve hedef depolar farklı olmalı diff --git a/htdocs/langs/tr_TR/install.lang b/htdocs/langs/tr_TR/install.lang index 31064ecca51..b41c5216537 100644 --- a/htdocs/langs/tr_TR/install.lang +++ b/htdocs/langs/tr_TR/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=Proxmox sanal aygıt üzerinden Dolibarr kurulum sihir UpgradeExternalModule=Harici modüllerin özel yükseltme işlemini çalıştırın SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Standart dışı veri onarımı @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=value of llx_societe_remise varlık alanını güncelle MigrationRemiseExceptEntity=llx_societe_remise_except varlık alanını güncelle MigrationReloadModule=Modülü yeniden yükle %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Kullanılamayacak seçenekler görüntülensin HideNotAvailableOptions=Kullanılamayacak seçenekler gizlensin ErrorFoundDuringMigration=Taşıma işlemi sırasında hata bildirildiğinden sonraki adıma geçilemeyecektir. Hataları gözardı etmek için, buraya tıklayabilirsiniz, ancak onarılana kadar uygulama ya da bazı özellikleri çalışmayabilecektir. diff --git a/htdocs/langs/tr_TR/languages.lang b/htdocs/langs/tr_TR/languages.lang index 13e1a9a3abe..46890d8d070 100644 --- a/htdocs/langs/tr_TR/languages.lang +++ b/htdocs/langs/tr_TR/languages.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - languages Language_ar_AR=Arapça -Language_ar_EG=Arabic (Egypt) +Language_ar_EG=Arabça (Mısır) Language_ar_SA=Arapça Language_bn_BD=Bengalce Language_bg_BG=Bulgarca @@ -35,6 +35,7 @@ Language_es_PA=İspanyolca (Panama) Language_es_PY=İspanyolca (Paraguay) Language_es_PE=İspanyolca (Peru) Language_es_PR=İspanyolca (Porto Riko) +Language_es_UY=Spanish (Uruguay) Language_es_VE=İspanyolca (Venezüella) Language_et_EE=Estonyaca Language_eu_ES=Baskça diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang index b69c15761d6..bff04a4eaff 100644 --- a/htdocs/langs/tr_TR/main.lang +++ b/htdocs/langs/tr_TR/main.lang @@ -548,6 +548,18 @@ MonthShort09=Eyl MonthShort10=Eki MonthShort11=Kas MonthShort12=Ara +MonthVeryShort01=J +MonthVeryShort02=Cu +MonthVeryShort03=Pt +MonthVeryShort04=A +MonthVeryShort05=Pt +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=Pa +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Ekli dosya ve belgeler JoinMainDoc=Join main document DateFormatYYYYMM=YYYY-AA @@ -762,7 +774,7 @@ SetBankAccount=Banka Hesabı Tanımla AccountCurrency=Account currency ViewPrivateNote=Notları izle XMoreLines=%s gizli satır -ShowMoreLines=Daha fazla satır göster +ShowMoreLines=Show more/less lines PublicUrl=Genel URL AddBox=Kutu ekle SelectElementAndClick=Bir öğe seçin ve %s tıklayın @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=Herkes +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/tr_TR/other.lang b/htdocs/langs/tr_TR/other.lang index 7057701cbd4..41d7ca33547 100644 --- a/htdocs/langs/tr_TR/other.lang +++ b/htdocs/langs/tr_TR/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=Eğer tutar %s den büyükse SourcesRepository=Kaynaklar için havuz Chart=Çizelge PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=Dışaaktar alanı diff --git a/htdocs/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang index c1b73ba9ffd..9c980e97fe0 100644 --- a/htdocs/langs/tr_TR/products.lang +++ b/htdocs/langs/tr_TR/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Geçerli fiyat AlwaysUseNewPrice=Ürün/hizmet için her zaman geçerli fiyatı kullan AlwaysUseFixedPrice=Sabit fiyatı kullan PriceByQuantity=Miktara göre değişen fiyatlar +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Miktar aralığı MultipriceRules=Fiyat seviyesi kuralları UseMultipriceRules=Birinci fiyata göre kendiliğinden fiyat hesaplaması için fiyat seviyesi kurallarını (ürün modülü ayarlarında tanımlanan) kullan diff --git a/htdocs/langs/tr_TR/projects.lang b/htdocs/langs/tr_TR/projects.lang index 45a15677d10..1e3d21c2d2d 100644 --- a/htdocs/langs/tr_TR/projects.lang +++ b/htdocs/langs/tr_TR/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=Beklemede OppStatusWON=Kazanç OppStatusLOST=Kayıp Budget=Bütçe +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Son %s proje LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/tr_TR/website.lang b/htdocs/langs/tr_TR/website.lang index 88a0a7a6447..8a58fe86108 100644 --- a/htdocs/langs/tr_TR/website.lang +++ b/htdocs/langs/tr_TR/website.lang @@ -3,15 +3,17 @@ Shortname=Kod WebsiteSetupDesc=Burada istediğiniz sayıda farklı websitesi oluşturun. Sonra Websitesi menüsüne giderek bunları düzenleyin. DeleteWebsite=Websitesi sil ConfirmDeleteWebsite=Bu websitesini silmek istediğinizden emin misiniz? Bütün sayfaları ve içeriği silinecektir. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Sayfa adı/rumuz -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=Dış CSS dosyası URL si WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Sayfanın adı veya takma adı.
    Bu takma ad, web sitesi bir web sunucusunun (Apacke, Nginx gibi ...) Sanal host'undan çalıştırıldığında bir SEO URL'si oluşturmak için de kullanılır. Bu takma adı düzenlemek için "%s" düşmesini kullanın. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Medya kütüphanesi EditCss=Stil/CSS veya HTML başlığı düzenle EditMenu=Menü düzenle @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=Harici web sunucusu tarafından sunulan sanal host URL' NoPageYet=Henüz hiç sayfa yok SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Sayfa/kapsayıcı kopyala CloneSite=Siteyi kopyala SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/uk_UA/accountancy.lang b/htdocs/langs/uk_UA/accountancy.lang index 9dbf911a820..c4189507f60 100644 --- a/htdocs/langs/uk_UA/accountancy.lang +++ b/htdocs/langs/uk_UA/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Piece number TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=List of the accounting accounts UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal 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 Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution Modelcsv_quadratus=Export towards Quadratus QuadraCompta Modelcsv_ebp=Export towards EBP Modelcsv_cogilog=Export towards Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang index 3cd0390e743..bfe9edad454 100644 --- a/htdocs/langs/uk_UA/admin.lang +++ b/htdocs/langs/uk_UA/admin.lang @@ -539,7 +539,7 @@ Module320Desc=Add RSS feed inside Dolibarr screen pages Module330Name=Bookmarks Module330Desc=Bookmarks management Module400Name=Projects/Opportunities/Leads -Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar integration Module500Name=Special expenses @@ -890,7 +890,7 @@ DictionaryStaff=Staff DictionaryAvailability=Delivery delay DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Models for chart of accounts DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=Emails templates @@ -904,6 +904,7 @@ SetupSaved=Setup saved SetupNotSaved=Setup not saved BackToModuleList=Back to modules list BackToDictionaryList=Back to dictionaries list +TypeOfRevenueStamp=Type of revenue stamp VATManagement=VAT Management VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is 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. @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/uk_UA/banks.lang b/htdocs/langs/uk_UA/banks.lang index 2b788f61774..d993f69e339 100644 --- a/htdocs/langs/uk_UA/banks.lang +++ b/htdocs/langs/uk_UA/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Number LineRecord=Transaction AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Reconciled ConciliatedBy=Reconciled by DateConciliating=Reconcile date BankLineConciliated=Entry reconciled diff --git a/htdocs/langs/uk_UA/bills.lang b/htdocs/langs/uk_UA/bills.lang index bf68ff07aa8..17ed0f8b7da 100644 --- a/htdocs/langs/uk_UA/bills.lang +++ b/htdocs/langs/uk_UA/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s BillsLate=Прострочені платежі BillsStatistics=Статистика рахунків клієнтів BillsStatisticsSuppliers=Статистика рахунків постачальників +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Disabled because cannot be erased InvoiceStandard=Стандартний рахунок-фактура InvoiceStandardAsk=Стандартний рахунок-фактура @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=Поганий Покупець diff --git a/htdocs/langs/uk_UA/compta.lang b/htdocs/langs/uk_UA/compta.lang index 1dd881352e7..469c3973f83 100644 --- a/htdocs/langs/uk_UA/compta.lang +++ b/htdocs/langs/uk_UA/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to PaymentsNotLinkedToUser=Payments not linked to any user Profit=Profit AccountingResult=Accounting result +BalanceBefore=Balance (before) Balance=Balance Debit=Debit Credit=Credit diff --git a/htdocs/langs/uk_UA/donations.lang b/htdocs/langs/uk_UA/donations.lang index 543681971de..db25a36744c 100644 --- a/htdocs/langs/uk_UA/donations.lang +++ b/htdocs/langs/uk_UA/donations.lang @@ -31,3 +31,4 @@ 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 +DonationValidated=Donation %s validated diff --git a/htdocs/langs/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang index b02b70c9c9f..cff89a71d98 100644 --- a/htdocs/langs/uk_UA/errors.lang +++ b/htdocs/langs/uk_UA/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Empty expression ErrorPriceExpression21=Empty result '%s' ErrorPriceExpression22=Negative result '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs diff --git a/htdocs/langs/uk_UA/install.lang b/htdocs/langs/uk_UA/install.lang index 7a93fd20799..e602c54640c 100644 --- a/htdocs/langs/uk_UA/install.lang +++ b/htdocs/langs/uk_UA/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtua UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Fix for denormalized data @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Update entity field value of llx_societe_remise MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except MigrationReloadModule=Reload module %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Show not available options HideNotAvailableOptions=Hide not available options ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. diff --git a/htdocs/langs/uk_UA/languages.lang b/htdocs/langs/uk_UA/languages.lang index 1f1633607bf..a26efa98ae3 100644 --- a/htdocs/langs/uk_UA/languages.lang +++ b/htdocs/langs/uk_UA/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Іспанська (Парагвай) Language_es_PE=Іспанська (Перу) Language_es_PR=Іспанська (Пуерто-Ріко) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Spanish (Venezuela) Language_et_EE=Естонська Language_eu_ES=Баскська diff --git a/htdocs/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang index 0fc58045416..568a37082a1 100644 --- a/htdocs/langs/uk_UA/main.lang +++ b/htdocs/langs/uk_UA/main.lang @@ -548,6 +548,18 @@ MonthShort09=Sep MonthShort10=Oct MonthShort11=Nov MonthShort12=Dec +MonthVeryShort01=J +MonthVeryShort02=F +MonthVeryShort03=M +MonthVeryShort04=A +MonthVeryShort05=M +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=S +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Attached files and documents JoinMainDoc=Join main document DateFormatYYYYMM=YYYY-MM @@ -762,7 +774,7 @@ SetBankAccount=Define Bank Account AccountCurrency=Account currency ViewPrivateNote=View notes XMoreLines=%s line(s) hidden -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=Public URL AddBox=Add box SelectElementAndClick=Select an element and click %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=Everybody +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/uk_UA/other.lang b/htdocs/langs/uk_UA/other.lang index 0d9d1cfbd85..1a5314a24d9 100644 --- a/htdocs/langs/uk_UA/other.lang +++ b/htdocs/langs/uk_UA/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=If amount higher than %s SourcesRepository=Repository for sources Chart=Chart PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=Exports area diff --git a/htdocs/langs/uk_UA/products.lang b/htdocs/langs/uk_UA/products.lang index 43c6b919de5..5ed4979e0a3 100644 --- a/htdocs/langs/uk_UA/products.lang +++ b/htdocs/langs/uk_UA/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Current price AlwaysUseNewPrice=Always use current price of product/service AlwaysUseFixedPrice=Use the fixed price PriceByQuantity=Different prices by quantity +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Quantity range MultipriceRules=Price segment rules UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/uk_UA/projects.lang b/htdocs/langs/uk_UA/projects.lang index 50b19375f26..ec57b412105 100644 --- a/htdocs/langs/uk_UA/projects.lang +++ b/htdocs/langs/uk_UA/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=В очікуванні OppStatusWON=Won OppStatusLOST=Lost Budget=Budget +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/uk_UA/website.lang b/htdocs/langs/uk_UA/website.lang index 3902febbfb7..6b4e2ada84a 100644 --- a/htdocs/langs/uk_UA/website.lang +++ b/htdocs/langs/uk_UA/website.lang @@ -3,15 +3,17 @@ Shortname=Code WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them. DeleteWebsite=Delete website ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Page name/alias -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL of external CSS file WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Media library EditCss=Edit Style/CSS or HTML header EditMenu=Edit menu @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/uz_UZ/accountancy.lang b/htdocs/langs/uz_UZ/accountancy.lang index 9dbf911a820..c4189507f60 100644 --- a/htdocs/langs/uz_UZ/accountancy.lang +++ b/htdocs/langs/uz_UZ/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Piece number TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=List of the accounting accounts UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal 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 Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution Modelcsv_quadratus=Export towards Quadratus QuadraCompta Modelcsv_ebp=Export towards EBP Modelcsv_cogilog=Export towards Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang index 4f3d25c4eb1..9dce46ab295 100644 --- a/htdocs/langs/uz_UZ/admin.lang +++ b/htdocs/langs/uz_UZ/admin.lang @@ -539,7 +539,7 @@ Module320Desc=Add RSS feed inside Dolibarr screen pages Module330Name=Bookmarks Module330Desc=Bookmarks management Module400Name=Projects/Opportunities/Leads -Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar integration Module500Name=Special expenses @@ -890,7 +890,7 @@ DictionaryStaff=Staff DictionaryAvailability=Delivery delay DictionaryOrderMethods=Ordering methods DictionarySource=Origin of proposals/orders -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Models for chart of accounts DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=Emails templates @@ -904,6 +904,7 @@ SetupSaved=Setup saved SetupNotSaved=Setup not saved BackToModuleList=Back to modules list BackToDictionaryList=Back to dictionaries list +TypeOfRevenueStamp=Type of revenue stamp VATManagement=VAT Management VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is 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. @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/uz_UZ/banks.lang b/htdocs/langs/uz_UZ/banks.lang index 40b76f8c64c..be8f75d172b 100644 --- a/htdocs/langs/uz_UZ/banks.lang +++ b/htdocs/langs/uz_UZ/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Number LineRecord=Transaction AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Reconciled ConciliatedBy=Reconciled by DateConciliating=Reconcile date BankLineConciliated=Entry reconciled diff --git a/htdocs/langs/uz_UZ/bills.lang b/htdocs/langs/uz_UZ/bills.lang index b865c00be9d..eeafc56bf1c 100644 --- a/htdocs/langs/uz_UZ/bills.lang +++ b/htdocs/langs/uz_UZ/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s BillsLate=Late payments BillsStatistics=Customers invoices statistics BillsStatisticsSuppliers=Suppliers invoices statistics +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Disabled because cannot be erased InvoiceStandard=Standard invoice InvoiceStandardAsk=Standard invoice @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer diff --git a/htdocs/langs/uz_UZ/compta.lang b/htdocs/langs/uz_UZ/compta.lang index 4082b9fa9b7..df4942cf234 100644 --- a/htdocs/langs/uz_UZ/compta.lang +++ b/htdocs/langs/uz_UZ/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to PaymentsNotLinkedToUser=Payments not linked to any user Profit=Profit AccountingResult=Accounting result +BalanceBefore=Balance (before) Balance=Balance Debit=Debit Credit=Credit diff --git a/htdocs/langs/uz_UZ/donations.lang b/htdocs/langs/uz_UZ/donations.lang index f4578fa9fc3..5edc8d62033 100644 --- a/htdocs/langs/uz_UZ/donations.lang +++ b/htdocs/langs/uz_UZ/donations.lang @@ -31,3 +31,4 @@ 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 +DonationValidated=Donation %s validated diff --git a/htdocs/langs/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang index b02b70c9c9f..cff89a71d98 100644 --- a/htdocs/langs/uz_UZ/errors.lang +++ b/htdocs/langs/uz_UZ/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Empty expression ErrorPriceExpression21=Empty result '%s' ErrorPriceExpression22=Negative result '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs diff --git a/htdocs/langs/uz_UZ/install.lang b/htdocs/langs/uz_UZ/install.lang index 7a93fd20799..e602c54640c 100644 --- a/htdocs/langs/uz_UZ/install.lang +++ b/htdocs/langs/uz_UZ/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtua UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Fix for denormalized data @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Update entity field value of llx_societe_remise MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except MigrationReloadModule=Reload module %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Show not available options HideNotAvailableOptions=Hide not available options ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. diff --git a/htdocs/langs/uz_UZ/languages.lang b/htdocs/langs/uz_UZ/languages.lang index 05288a888eb..a062883d667 100644 --- a/htdocs/langs/uz_UZ/languages.lang +++ b/htdocs/langs/uz_UZ/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Spanish (Paraguay) Language_es_PE=Spanish (Peru) Language_es_PR=Spanish (Puerto Rico) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Spanish (Venezuela) Language_et_EE=Estonian Language_eu_ES=Basque diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang index ad6e8da14ec..0bcd9585784 100644 --- a/htdocs/langs/uz_UZ/main.lang +++ b/htdocs/langs/uz_UZ/main.lang @@ -548,6 +548,18 @@ MonthShort09=Sep MonthShort10=Oct MonthShort11=Nov MonthShort12=Dec +MonthVeryShort01=J +MonthVeryShort02=F +MonthVeryShort03=M +MonthVeryShort04=A +MonthVeryShort05=M +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=S +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Attached files and documents JoinMainDoc=Join main document DateFormatYYYYMM=YYYY-MM @@ -762,7 +774,7 @@ SetBankAccount=Define Bank Account AccountCurrency=Account currency ViewPrivateNote=View notes XMoreLines=%s line(s) hidden -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=Public URL AddBox=Add box SelectElementAndClick=Select an element and click %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=Everybody +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/uz_UZ/other.lang b/htdocs/langs/uz_UZ/other.lang index 0d9d1cfbd85..1a5314a24d9 100644 --- a/htdocs/langs/uz_UZ/other.lang +++ b/htdocs/langs/uz_UZ/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=If amount higher than %s SourcesRepository=Repository for sources Chart=Chart PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=Exports area diff --git a/htdocs/langs/uz_UZ/products.lang b/htdocs/langs/uz_UZ/products.lang index 43c74c9b877..53835bd7f06 100644 --- a/htdocs/langs/uz_UZ/products.lang +++ b/htdocs/langs/uz_UZ/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Current price AlwaysUseNewPrice=Always use current price of product/service AlwaysUseFixedPrice=Use the fixed price PriceByQuantity=Different prices by quantity +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Quantity range MultipriceRules=Price segment rules UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/uz_UZ/projects.lang b/htdocs/langs/uz_UZ/projects.lang index f33a950acff..c69302deecb 100644 --- a/htdocs/langs/uz_UZ/projects.lang +++ b/htdocs/langs/uz_UZ/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=Pending OppStatusWON=Won OppStatusLOST=Lost Budget=Budget +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/vi_VN/accountancy.lang b/htdocs/langs/vi_VN/accountancy.lang index 93a8114e133..87c9be2af9c 100644 --- a/htdocs/langs/vi_VN/accountancy.lang +++ b/htdocs/langs/vi_VN/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Piece number TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=Danh sách các tài khoản kế toán UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal Modelcsv=Mô hình xuất khẩu -OptionsDeactivatedForThisExportModel=For this export model, options are deactivated Selectmodelcsv=Chọn một mô hình xuất khẩu Modelcsv_normal=Cổ điển xuất khẩu Modelcsv_CEGID=Export towards CEGID Expert Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution Modelcsv_quadratus=Export towards Quadratus QuadraCompta Modelcsv_ebp=Export towards EBP Modelcsv_cogilog=Export towards Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang index bc809007305..b7cbb7baf5e 100644 --- a/htdocs/langs/vi_VN/admin.lang +++ b/htdocs/langs/vi_VN/admin.lang @@ -539,7 +539,7 @@ Module320Desc=Thêm nguồn cấp dữ liệu RSS trong trang màn hình Dolibar Module330Name=Bookmarks Module330Desc=Quản lý bookmark 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. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Lịch trên web Module410Desc=Tích hợp lịch trên web Module500Name=Chi phí đặc biệt @@ -890,7 +890,7 @@ DictionaryStaff=Nhân viên 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 -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Kiểu biểu đồ tài khoản DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=Mẫu email @@ -904,6 +904,7 @@ SetupSaved=Cài đặt đã lưu SetupNotSaved=Setup not saved BackToModuleList=Trở lại danh sách module BackToDictionaryList=Trở lại danh sách từ điển +TypeOfRevenueStamp=Type of revenue stamp VATManagement=Quản lý thuế VAT VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is 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. @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/vi_VN/banks.lang b/htdocs/langs/vi_VN/banks.lang index dfd99ce786e..373503a9e81 100644 --- a/htdocs/langs/vi_VN/banks.lang +++ b/htdocs/langs/vi_VN/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=Số LineRecord=Giao dịch AddBankRecord=Thêm kê khai AddBankRecordLong=Thêm kê khai thủ công +Conciliated=Đã đối chiếu ConciliatedBy=Đối chiếu bởi DateConciliating=Ngày đối chiếu BankLineConciliated=Kê khai đã đối chiếu diff --git a/htdocs/langs/vi_VN/bills.lang b/htdocs/langs/vi_VN/bills.lang index 20a0a594707..31e513a3834 100644 --- a/htdocs/langs/vi_VN/bills.lang +++ b/htdocs/langs/vi_VN/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %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 +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Vô hiệu hóa vì không thể bị xóa InvoiceStandard=Hóa đơn chuẩn InvoiceStandardAsk=Hóa đơn chuẩn @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? ConfirmClassifyPaidPartiallyReasonAvoir=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ó +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. 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 diff --git a/htdocs/langs/vi_VN/compta.lang b/htdocs/langs/vi_VN/compta.lang index 12dc4b0bf84..01df6b3dbc0 100644 --- a/htdocs/langs/vi_VN/compta.lang +++ b/htdocs/langs/vi_VN/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=Thanh toán không liên quan đến bất kỳ hóa PaymentsNotLinkedToUser=Thanh toán không liên quan đến bất kỳ người dùng Profit=Lợi nhuận AccountingResult=Accounting result +BalanceBefore=Balance (before) Balance=Cân bằng Debit=Nợ Credit=Tín dụng diff --git a/htdocs/langs/vi_VN/donations.lang b/htdocs/langs/vi_VN/donations.lang index e6ce045395a..80c36550b76 100644 --- a/htdocs/langs/vi_VN/donations.lang +++ b/htdocs/langs/vi_VN/donations.lang @@ -31,3 +31,4 @@ 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 +DonationValidated=Donation %s validated diff --git a/htdocs/langs/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang index 94532cb71e8..1fe0e6743b4 100644 --- a/htdocs/langs/vi_VN/errors.lang +++ b/htdocs/langs/vi_VN/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Empty expression ErrorPriceExpression21=Empty result '%s' ErrorPriceExpression22=Negative result '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Nguồn và đích kho phải có khác nhau diff --git a/htdocs/langs/vi_VN/install.lang b/htdocs/langs/vi_VN/install.lang index 22fd775bf25..cfa71681caf 100644 --- a/htdocs/langs/vi_VN/install.lang +++ b/htdocs/langs/vi_VN/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=Bạn sử dụng các hướng dẫn cài đặt Dolib UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=Sửa chữa cho các dữ liệu denormalized @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Update entity field value of llx_societe_remise MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except MigrationReloadModule=Reload module %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=Hiển thị tùy chọn không có sẵn HideNotAvailableOptions=Ẩn các tùy chọn không có sẵn ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. diff --git a/htdocs/langs/vi_VN/languages.lang b/htdocs/langs/vi_VN/languages.lang index 15e778c394c..5ca04cfad55 100644 --- a/htdocs/langs/vi_VN/languages.lang +++ b/htdocs/langs/vi_VN/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Tây Ban Nha (Paraguay) Language_es_PE=Tây Ban Nha (Peru) Language_es_PR=Tây Ban Nha (Puerto Rico) +Language_es_UY=Spanish (Uruguay) Language_es_VE=Spanish (Venezuela) Language_et_EE=Estonia Language_eu_ES=Basque diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang index 5925f6cdb2e..245eed081a5 100644 --- a/htdocs/langs/vi_VN/main.lang +++ b/htdocs/langs/vi_VN/main.lang @@ -548,6 +548,18 @@ MonthShort09=Tháng Chín MonthShort10=Tháng Mười MonthShort11=Tháng Mười Một MonthShort12=Tháng Mười Hai +MonthVeryShort01=J +MonthVeryShort02=S +MonthVeryShort03=H +MonthVeryShort04=A +MonthVeryShort05=H +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=C +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=Được đính kèm tập tin và tài liệu JoinMainDoc=Join main document DateFormatYYYYMM=YYYY-MM @@ -762,7 +774,7 @@ SetBankAccount=Xác định tài khoản ngân hàng AccountCurrency=Account currency ViewPrivateNote=Xem ghi chú XMoreLines=%s dòng ẩn -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=URL công khai AddBox=Thêm hộp SelectElementAndClick=Select an element and click %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=Mọi người +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/vi_VN/other.lang b/htdocs/langs/vi_VN/other.lang index 8037219b4e7..869bf664f85 100644 --- a/htdocs/langs/vi_VN/other.lang +++ b/htdocs/langs/vi_VN/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=If amount higher than %s SourcesRepository=Repository for sources Chart=Chart PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=Khu vực xuất khẩu diff --git a/htdocs/langs/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang index 5182f931738..547ebcf03e3 100644 --- a/htdocs/langs/vi_VN/products.lang +++ b/htdocs/langs/vi_VN/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Giá hiện tại AlwaysUseNewPrice=Luôn sử dụng giá hiện tại của sản phẩm / dịch vụ AlwaysUseFixedPrice=Sử dụng giá cố định PriceByQuantity=Giá thay đổi theo số lượng +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Phạm vi số lượng MultipriceRules=Quy tắc giá thành phần UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/vi_VN/projects.lang b/htdocs/langs/vi_VN/projects.lang index 052829137e9..e36be7089f9 100644 --- a/htdocs/langs/vi_VN/projects.lang +++ b/htdocs/langs/vi_VN/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=Chờ xử lý OppStatusWON=Won OppStatusLOST=Lost Budget=Budget +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/vi_VN/website.lang b/htdocs/langs/vi_VN/website.lang index abd8a8690d0..48c4414a77b 100644 --- a/htdocs/langs/vi_VN/website.lang +++ b/htdocs/langs/vi_VN/website.lang @@ -3,15 +3,17 @@ Shortname=Mã WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them. DeleteWebsite=Delete website ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Page name/alias -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL of external CSS file WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Media library EditCss=Edit Style/CSS or HTML header EditMenu=Edit menu @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/zh_CN/accountancy.lang b/htdocs/langs/zh_CN/accountancy.lang index d927a2ca1e7..7bb1cf3e185 100644 --- a/htdocs/langs/zh_CN/accountancy.lang +++ b/htdocs/langs/zh_CN/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=件数 TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=会计账目清单 UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal Modelcsv=导出型号 -OptionsDeactivatedForThisExportModel=对于这种导出模式，选项被禁用 Selectmodelcsv=请选择一个导出模板 Modelcsv_normal=典型的导出 Modelcsv_CEGID=Export towards CEGID Expert Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=向 Sage Ciel Compta 或 Compta Evolution导出 Modelcsv_quadratus=向 Quadratus QuadraCompta导出 Modelcsv_ebp=向 EBP导出 Modelcsv_cogilog=导出到 Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang index 4a533775f98..7ad2f42be94 100644 --- a/htdocs/langs/zh_CN/admin.lang +++ b/htdocs/langs/zh_CN/admin.lang @@ -29,7 +29,7 @@ SessionId=会话 ID SessionSaveHandler=会话保存处理程序 SessionSavePath=存储会话本地化 PurgeSessions=清空会话 -ConfirmPurgeSessions=Do you really want to purge all sessions? This will disconnect every user (except yourself). +ConfirmPurgeSessions=您真的要清除所有会话吗？它将断开每个用户（您自己除外）。 NoSessionListWithThisHandler=你 PHP 中设置的保存会话处理程序不允许列出运行中的会话。 LockNewSessions=锁定新连接 ConfirmLockNewSessions=你确定要限制 Dolibarr 的所有新连接？这样做将只有当前用户 %s 可以连接。 @@ -107,7 +107,7 @@ MenuIdParent=父菜单ID DetailMenuIdParent=父菜单ID (空表示顶级菜单) DetailPosition=排序编号，以确定菜单位置 AllMenus=全部 -NotConfigured=Module/Application not configured +NotConfigured=模块或应用未配置 Active=启用 SetupShort=设置 OtherOptions=其他选项 @@ -153,7 +153,7 @@ PurgeNothingToDelete=未删除目录或文件 PurgeNDirectoriesDeleted=%s 个文件或目录删除。 PurgeNDirectoriesFailed=Failed to delete %s files or directories. PurgeAuditEvents=清空所有安全事件 -ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed. +ConfirmPurgeAuditEvents=您确定要清除所有安全事件吗？所有安全日志将被删除，但不会删除其他数据。 GenerateBackup=生成备份 Backup=备份 Restore=还原 @@ -187,16 +187,16 @@ ExtendedInsert=扩展 INSERT NoLockBeforeInsert=INSERT 命令前后没有锁定命令 DelayedInsert=延迟插入 EncodeBinariesInHexa=二进制数据以十六进制编码 -IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE) +IgnoreDuplicateRecords=忽略错误的重复记录(插入忽略) AutoDetectLang=自动检测(浏览器的语言) FeatureDisabledInDemo=功能在演示版中已禁用 FeatureAvailableOnlyOnStable=Feature only available on official stable versions BoxesDesc=小组件展示一些可以添加到您个人页面的信息。您可以通过选择目标页面点击“激活”或关闭按钮来选择显示或关闭这些小组件。 OnlyActiveElementsAreShown=仅显示 已启用模块 的元素。 -ModulesDesc=Dolibarr modules define which application/feature is enabled in software. Some application/modules require permissions you must grant to users, after activating it. Click on button on/off to enable a module/application. +ModulesDesc=Dolibarr 模块定义在软件中启用了哪些应用程序/功能。部分模块/应用在激活后必须授予用户使用权限。单击“状态”列中的开/关按钮来启用或禁用模块/功能。 ModulesMarketPlaceDesc=你能在外部互联网查找到并下载更多的功能模块... ModulesDeployDesc=If permissions on your file system allows it, you can use this tool to deploy an external module. The module wil then be visible on the tab %s. -ModulesMarketPlaces=Find external app/modules +ModulesMarketPlaces=更多应用/模块 ModulesDevelopYourModule=Develop your own app/modules ModulesDevelopDesc=You can develop or find a partner to develop for you, your personalised module DOLISTOREdescriptionLong=Instead of switching on www.dolistore.com web site to find an external module, you can use this embedded tool that will make the seach on the external market place for you (may be slow, need an internet access)... @@ -230,7 +230,7 @@ MainDbPasswordFileConfEncrypted=加密 conf.php 中的数据库密码(推荐启 InstrucToEncodePass=如果要在conf.php中使用明文密码，请将
    $dolibarr_main_db_pass="...";
    替换为br>$dolibarr_main_db_pass="crypted:%s"; InstrucToClearPass=如果要在conf.php中使用明文密码，请将
    $dolibarr_main_db_pass="crypted:...";
    替换为
    $dolibarr_main_db_pass="%s"; ProtectAndEncryptPdfFiles=保护生成的PDF文件(不推荐，影响PDF的批量生成) -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 makes building of a global merged PDFs not working. +ProtectAndEncryptPdfFilesDesc=PDF保护允许在PDF浏览器中阅读和打印PDF，但无法编辑和复制内容。请注意，使用此功能将导致生成全局多页合并PDF的功能无效(例如未支付账单)。 Feature=功能特色 DolibarrLicense=授权 Developpers=开发商/贡献者 @@ -260,8 +260,8 @@ FontSize=Font size Content=Content NoticePeriod=通知期限 NewByMonth=New by month -Emails=Emails -EMailsSetup=Emails setup +Emails=电子邮件 +EMailsSetup=电子邮件设置 EMailsDesc=This page allows you to overwrite your PHP parameters for emails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless. EmailSenderProfiles=Emails sender profiles MAIN_MAIL_SMTP_PORT=SMTP/SMTPS 端口 ( php.ini 文件中的默认值：%s) @@ -539,7 +539,7 @@ Module320Desc=添加 RSS 源至 Dolibarr 主屏幕页面 Module330Name=书签 Module330Desc=书签管理 Module400Name=项目/机会/线索 -Module400Desc=项目,机会和线索管理。您可以为项目创建 (发票, 订单, 询价, intervention, ...) 等，然后从项目视图查看详情。 +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar 整合 Module500Name=特殊开支 @@ -890,7 +890,7 @@ DictionaryStaff=员工 DictionaryAvailability=送货延迟 DictionaryOrderMethods=订单类型 DictionarySource=报价/订单来源方式 -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=账户图标模块 DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=电子邮件模板 @@ -904,6 +904,7 @@ SetupSaved=设置已经成功保存 SetupNotSaved=Setup not saved BackToModuleList=返回模块列表 BackToDictionaryList=回到字典库 +TypeOfRevenueStamp=Type of revenue stamp VATManagement=增值税管理 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is VAT=0. End of rule. VATIsNotUsedDesc=默认情况下，建议的营业税为0，可用于像机构、个人或小型公司。 @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/zh_CN/banks.lang b/htdocs/langs/zh_CN/banks.lang index 00721f593f4..22c618a00a8 100644 --- a/htdocs/langs/zh_CN/banks.lang +++ b/htdocs/langs/zh_CN/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=数字 LineRecord=交易 AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Reconciled ConciliatedBy=由调和 DateConciliating=核对日期 BankLineConciliated=Entry reconciled diff --git a/htdocs/langs/zh_CN/bills.lang b/htdocs/langs/zh_CN/bills.lang index 23fe060c73e..8df238c73bc 100644 --- a/htdocs/langs/zh_CN/bills.lang +++ b/htdocs/langs/zh_CN/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s BillsLate=逾期付款 BillsStatistics=客户发票统计 BillsStatisticsSuppliers=供应商发票统计 +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=禁止删除 InvoiceStandard=标准发票 InvoiceStandardAsk=标准发票 @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=坏顾客 diff --git a/htdocs/langs/zh_CN/compta.lang b/htdocs/langs/zh_CN/compta.lang index 1832a45d9f8..644b8e3ff97 100644 --- a/htdocs/langs/zh_CN/compta.lang +++ b/htdocs/langs/zh_CN/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=付款未链接到任何发票，所以无法与任 PaymentsNotLinkedToUser=付款不链接到任何用户 Profit=利润 AccountingResult=会计结果 +BalanceBefore=Balance (before) Balance=平衡 Debit=借方 Credit=贷方 diff --git a/htdocs/langs/zh_CN/donations.lang b/htdocs/langs/zh_CN/donations.lang index e59ad29c7cf..74050e572c2 100644 --- a/htdocs/langs/zh_CN/donations.lang +++ b/htdocs/langs/zh_CN/donations.lang @@ -31,3 +31,4 @@ DONATION_ART200=从CGI显示200笔 DONATION_ART238=从CGI显示238笔 DONATION_ART885=从CGI显示885笔 DonationPayment=捐赠付款 +DonationValidated=Donation %s validated diff --git a/htdocs/langs/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang index 3abef9c5815..8ec17498cca 100644 --- a/htdocs/langs/zh_CN/errors.lang +++ b/htdocs/langs/zh_CN/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=空白表达式 ErrorPriceExpression21=空白结果 '%s' ErrorPriceExpression22=负结果 '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=内部错误 '%s' ErrorPriceExpressionUnknown=未知错误 '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs diff --git a/htdocs/langs/zh_CN/install.lang b/htdocs/langs/zh_CN/install.lang index e36102cffd1..873de199770 100644 --- a/htdocs/langs/zh_CN/install.lang +++ b/htdocs/langs/zh_CN/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=您使用Proxmox的虚拟设备的Dolibarr安装向导 UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=修正了非规范化数据 @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=更新 llx_societe_remise 的实际栏位参数值 MigrationRemiseExceptEntity=更新 llx_societe_remise_except 的实际栏位参数值 MigrationReloadModule=重载模块%s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=显示不可用的选项 HideNotAvailableOptions=隐藏不可用的选项 ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. diff --git a/htdocs/langs/zh_CN/languages.lang b/htdocs/langs/zh_CN/languages.lang index 4b6db91c8d4..b1fe1101f16 100644 --- a/htdocs/langs/zh_CN/languages.lang +++ b/htdocs/langs/zh_CN/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=西班牙语（巴拉圭） Language_es_PE=西班牙语（秘鲁） Language_es_PR=西班牙语（波多黎各） +Language_es_UY=Spanish (Uruguay) Language_es_VE=Spanish (Venezuela) Language_et_EE=爱沙尼亚语 Language_eu_ES=巴斯克 diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang index a8596e83d5d..639d3b5701b 100644 --- a/htdocs/langs/zh_CN/main.lang +++ b/htdocs/langs/zh_CN/main.lang @@ -548,6 +548,18 @@ MonthShort09=9 MonthShort10=10 MonthShort11=11 MonthShort12=12 +MonthVeryShort01=J +MonthVeryShort02=F +MonthVeryShort03=M +MonthVeryShort04=A +MonthVeryShort05=M +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=S +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=附件 JoinMainDoc=Join main document DateFormatYYYYMM=为YYYY - MM @@ -762,7 +774,7 @@ SetBankAccount=定义银行账户 AccountCurrency=Account currency ViewPrivateNote=查看备注 XMoreLines=%s 明细(s) 隐藏 -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=公网URL AddBox=添加选项框 SelectElementAndClick=Select an element and click %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=全体同仁 +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/zh_CN/other.lang b/htdocs/langs/zh_CN/other.lang index 65e2b6d921c..7e5b7c4679f 100644 --- a/htdocs/langs/zh_CN/other.lang +++ b/htdocs/langs/zh_CN/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=如果数额高于 %s SourcesRepository=源库 Chart=图表 PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=导出区 diff --git a/htdocs/langs/zh_CN/products.lang b/htdocs/langs/zh_CN/products.lang index 468dcabc9ff..46bbaeb1c2f 100644 --- a/htdocs/langs/zh_CN/products.lang +++ b/htdocs/langs/zh_CN/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=当前价格 AlwaysUseNewPrice=始终使用产品/服务的当前价格 AlwaysUseFixedPrice=使用固定价格 PriceByQuantity=不同数量价格 +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=定量范围 MultipriceRules=市场价格规则 UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/zh_CN/projects.lang b/htdocs/langs/zh_CN/projects.lang index 5252e9c0082..cd9c97360b2 100644 --- a/htdocs/langs/zh_CN/projects.lang +++ b/htdocs/langs/zh_CN/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=待办 OppStatusWON=赢得 OppStatusLOST=失去 Budget=预算 +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/zh_CN/suppliers.lang b/htdocs/langs/zh_CN/suppliers.lang index e45d0e9195c..04f56c4ed84 100644 --- a/htdocs/langs/zh_CN/suppliers.lang +++ b/htdocs/langs/zh_CN/suppliers.lang @@ -7,13 +7,13 @@ History=历史 ListOfSuppliers=供应商列表 ShowSupplier=查看供应商 OrderDate=订购日期 -BuyingPriceMin=Best buying price -BuyingPriceMinShort=Best buying price -TotalBuyingPriceMinShort=Total of subproducts buying prices -TotalSellingPriceMinShort=Total of subproducts selling prices -SomeSubProductHaveNoPrices=Some sub-products have no price defined -AddSupplierPrice=Add buying price -ChangeSupplierPrice=Change buying price +BuyingPriceMin=最优采购价 +BuyingPriceMinShort=最优采购价 +TotalBuyingPriceMinShort=子产品采购价格总计 +TotalSellingPriceMinShort=子产品销售价格合计 +SomeSubProductHaveNoPrices=某些副产品没有定义价格 +AddSupplierPrice=添加采购价 +ChangeSupplierPrice=更改采购价 SupplierPrices=供应商价格 ReferenceSupplierIsAlreadyAssociatedWithAProduct=该参考供应商已经与一参考：%s的 NoRecordedSuppliers=空空如也——没有供应商记录 @@ -25,10 +25,10 @@ ExportDataset_fournisseur_1=供应商发票清单和发票的路线 ExportDataset_fournisseur_2=供应商发票和付款 ExportDataset_fournisseur_3=供应商订单和订单行 ApproveThisOrder=批准这一命令 -ConfirmApproveThisOrder=Are you sure you want to approve order %s? +ConfirmApproveThisOrder=是否确定要批准此订单 %s ? DenyingThisOrder=否认这笔订单 -ConfirmDenyingThisOrder=Are you sure you want to deny this order %s? -ConfirmCancelThisOrder=Are you sure you want to cancel this order %s? +ConfirmDenyingThisOrder=是否确定要拒绝此订单 %s？ +ConfirmCancelThisOrder=是否确定要取消此订单 %s？ AddSupplierOrder=创建供应商订单 AddSupplierInvoice=创建供应商发票 ListOfSupplierProductForSupplier=产品和供应商价格列表 %s @@ -36,12 +36,12 @@ SentToSuppliers=发送到供应商 ListOfSupplierOrders=供应商订单列表 MenuOrdersSupplierToBill=供应商订单发票 NbDaysToDelivery=交货延迟天数 -DescNbDaysToDelivery=The biggest deliver delay of the products from this order -SupplierReputation=Supplier reputation -DoNotOrderThisProductToThisSupplier=Do not order +DescNbDaysToDelivery=此订单产品的最长交货延迟 +SupplierReputation=供应商信誉 +DoNotOrderThisProductToThisSupplier=不订购 NotTheGoodQualitySupplier=劣质 -ReputationForThisProduct=Reputation +ReputationForThisProduct=信誉 BuyerName=买家名称 -AllProductServicePrices=All product / service prices -AllProductReferencesOfSupplier=All product / service references of supplier +AllProductServicePrices=全部 产品/服务 价格 +AllProductReferencesOfSupplier=供应商的所有 产品/服务 参考 BuyingPriceNumShort=供应商价格 diff --git a/htdocs/langs/zh_CN/website.lang b/htdocs/langs/zh_CN/website.lang index 4973e1b15d8..d8b6611b29c 100644 --- a/htdocs/langs/zh_CN/website.lang +++ b/htdocs/langs/zh_CN/website.lang @@ -3,15 +3,17 @@ Shortname=代码 WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them. DeleteWebsite=删除网址 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=页面名字/别名 -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=外部CSS文件的URL地址 WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=媒体库 EditCss=Edit Style/CSS or HTML header EditMenu=编辑菜单 @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container diff --git a/htdocs/langs/zh_CN/workflow.lang b/htdocs/langs/zh_CN/workflow.lang index 4d8ee0bc44a..5cde16c93c5 100644 --- a/htdocs/langs/zh_CN/workflow.lang +++ b/htdocs/langs/zh_CN/workflow.lang @@ -1,20 +1,20 @@ # Dolibarr language file - Source file is en_US - workflow -WorkflowSetup=工作流模块的设置 -WorkflowDesc=此模块的设计，以修改自动动作到应用程序的行为。默认情况下，工作流是打开的(你可以按你想要的顺序做事情)。你可以激活你感兴趣的自动动作。 +WorkflowSetup=工作流模块设置 +WorkflowDesc=本模块旨在将自动操作的行为修改为应用程序。默认情况下, 工作流处于打开状态 (您可以按所需顺序执行某些动作)。您还可以激活您感兴趣的自动操作。 ThereIsNoWorkflowToModify=没有工作流程，您可以修改你已激活的模块。 # Autocreate -descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed (new order will have same amount than proposal) -descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed (new invoice will have same amount than proposal) +descWORKFLOW_PROPAL_AUTOCREATE_ORDER=在商业方案签订后自动创建客户订单 (新订单的金额将与方案相同) +descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=在商业方案签订后自动创建客户账单 (新账单的金额与提案金额相) descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=在合同确认后自动创建客户发票 -descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed (new invoice will have same amount than order) +descWORKFLOW_ORDER_AUTOCREATE_INVOICE=在客户订单关闭后自动创建客户账单 (新账单的金额将大于订单) # Autoclassify customer proposal or order -descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer order is set to billed (and if amount of the order is same than total amount of signed linked proposals) -descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of signed linked proposals) -descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated (and if amount of the invoice is same than total amount of linked orders) -descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid (and if amount of the invoice is same than total amount of linked orders) -descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify linked source customer order to shipped when a shipment is validated (and if quantity shipped by all shipments is the same as in the order to update) +descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=将 "客户订单" 设置为 "记帐" 时对关联的源方案进行分类 (如果订单金额与已签名的关联方案总金额相同) +descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=当客户账单被确认时 ( 如果账单金额与已签订的关联方案总额相同 ) ，将关联源方案分类为账单。 +descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=当客户账单被确认时，将关联源客户订单分类为账单(如果账单金额与关联订单总额相同) +descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=当客户账单设定为支付时，将关联源客户订单分类为账单（如果账单金额与关联订单总额相同） +descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=将关联源客户订单分类为发货时进行验证 (如果所有装运的货物数量与更新的订单相同) # Autoclassify supplier order -descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Classify linked source supplier proposal(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked proposals) -descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Classify linked source supplier order(s) to billed when supplier invoice is validated (and if amount of the invoice is same than total amount of linked orders) -AutomaticCreation=Automatic creation -AutomaticClassification=Automatic classification +descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=对供应商发票进行验证时关联的源供应商方案进行分类 (如果发票金额与关联的方案总金额相同) +descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=在验证供应商发票时对关联的源供应商订单进行分类（如果发票金额与关联的订单总金额相同） +AutomaticCreation=自动创建 +AutomaticClassification=自动分类 diff --git a/htdocs/langs/zh_TW/accountancy.lang b/htdocs/langs/zh_TW/accountancy.lang index 48a07cc7077..9fdd5f5e31a 100644 --- a/htdocs/langs/zh_TW/accountancy.lang +++ b/htdocs/langs/zh_TW/accountancy.lang @@ -158,7 +158,7 @@ NumPiece=Piece number TransactionNumShort=Num. transaction AccountingCategory=Personalized groups GroupByAccountAccounting=Group by accounting account -AccountingAccountGroupsDesc=You can define here some groups of accounting account. It will be used in the report %s to show your income/expense with data grouped according to these groups. +AccountingAccountGroupsDesc=You can define here some groups of accounting account. They will be used for personalized accounting reports. ByAccounts=By accounts ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups @@ -191,6 +191,7 @@ DescThirdPartyReport=Consult here the list of the third party customers and supp ListAccounts=List of the accounting accounts UnknownAccountForThirdparty=Unknown third party account. We will use %s UnknownAccountForThirdpartyBlocking=Unknown third party account. Blocking error +UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third party account and waiting account not defined. Blocking error Pcgtype=Group of account Pcgsubtype=Subgroup of account @@ -244,7 +245,6 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use ## Export ExportDraftJournal=Export draft journal 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 Comptabilité @@ -254,7 +254,7 @@ Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution Modelcsv_quadratus=Export towards Quadratus QuadraCompta Modelcsv_ebp=Export towards EBP Modelcsv_cogilog=Export towards Cogilog -Modelcsv_agiris=Export towards Agiris (Test) +Modelcsv_agiris=Export towards Agiris Modelcsv_configurable=Export Configurable ChartofaccountsId=Chart of accounts Id diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang index 8e761f6166d..9f0e3243cdf 100644 --- a/htdocs/langs/zh_TW/admin.lang +++ b/htdocs/langs/zh_TW/admin.lang @@ -539,7 +539,7 @@ Module320Desc=添加RSS飼料內Dolibarr屏幕頁面 Module330Name=書籤 Module330Desc=書籤管理 Module400Name=Projects/Opportunities/Leads -Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. +Module400Desc=Management of projects, opportunities/leads and/or tasks. You can also assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar 整合 Module500Name=特別支出 @@ -890,7 +890,7 @@ DictionaryStaff=員工人數 DictionaryAvailability=遲延交付 DictionaryOrderMethods=排列方法 DictionarySource=訂單來源方式 -DictionaryAccountancyCategory=Personalized groups +DictionaryAccountancyCategory=Personalized groups for reports DictionaryAccountancysystem=Models for chart of accounts DictionaryAccountancyJournal=Accounting journals DictionaryEMailTemplates=Emails templates @@ -904,6 +904,7 @@ SetupSaved=設定值已儲存 SetupNotSaved=Setup not saved BackToModuleList=返回模組列表 BackToDictionaryList=回到設定選項列表 +TypeOfRevenueStamp=Type of revenue stamp VATManagement=營業稅管理 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:
    If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.
    If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule.
    If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.
    If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold. End of rule.
    If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.
    In any othe case the proposed default is VAT=0. End of rule. VATIsNotUsedDesc=預設情況下，建議的營業稅為0，可用於像協會的情況下才使用，個人歐小型公司。 @@ -1765,3 +1766,4 @@ ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). DisabledResourceLinkUser=Disabled resource link to user DisabledResourceLinkContact=Disabled resource link to contact +ConfirmUnactivation=Confirm module reset diff --git a/htdocs/langs/zh_TW/banks.lang b/htdocs/langs/zh_TW/banks.lang index be38087a453..db3fa13b574 100644 --- a/htdocs/langs/zh_TW/banks.lang +++ b/htdocs/langs/zh_TW/banks.lang @@ -89,6 +89,7 @@ AccountIdShort=數 LineRecord=交易 AddBankRecord=Add entry AddBankRecordLong=Add entry manually +Conciliated=Reconciled ConciliatedBy=由調和 DateConciliating=核對日期 BankLineConciliated=Entry reconciled diff --git a/htdocs/langs/zh_TW/bills.lang b/htdocs/langs/zh_TW/bills.lang index 2b837f301a0..8da5684e57c 100644 --- a/htdocs/langs/zh_TW/bills.lang +++ b/htdocs/langs/zh_TW/bills.lang @@ -11,6 +11,8 @@ BillsSuppliersUnpaidForCompany=Unpaid supplier invoices for %s BillsLate=逾期付款 BillsStatistics=客戶發票統計 BillsStatisticsSuppliers=供應商發票統計 +DisabledBecauseDispatchedInBookkeeping=Disabled because invoice was dispatched into bookkeeping +DisabledBecauseNotLastInvoice=Disabled because invoice is not erasable. Some invoices were recorded after this one and it will create holes in the counter. DisabledBecauseNotErasable=Disabled because cannot be erased InvoiceStandard=發票 InvoiceStandardAsk=發票 @@ -176,6 +178,7 @@ ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned'? ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid? ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice? ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscount=Remaining unpaid (%s %s) is a discount granted because payment was made before term. ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. ConfirmClassifyPaidPartiallyReasonBadCustomer=壞顧客 diff --git a/htdocs/langs/zh_TW/compta.lang b/htdocs/langs/zh_TW/compta.lang index 2412daecbd9..7e3b3618ca7 100644 --- a/htdocs/langs/zh_TW/compta.lang +++ b/htdocs/langs/zh_TW/compta.lang @@ -24,6 +24,7 @@ PaymentsNotLinkedToInvoice=付款不鏈接到任何發票，所以無法與任 PaymentsNotLinkedToUser=付款不鏈接到任何用戶 Profit=利潤 AccountingResult=Accounting result +BalanceBefore=Balance (before) Balance=平衡 Debit=借方 Credit=信用 diff --git a/htdocs/langs/zh_TW/donations.lang b/htdocs/langs/zh_TW/donations.lang index 2ba05dc552b..7f3d0be5d92 100644 --- a/htdocs/langs/zh_TW/donations.lang +++ b/htdocs/langs/zh_TW/donations.lang @@ -31,3 +31,4 @@ 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 +DonationValidated=Donation %s validated diff --git a/htdocs/langs/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang index 646dea8dc38..f41ee948296 100644 --- a/htdocs/langs/zh_TW/errors.lang +++ b/htdocs/langs/zh_TW/errors.lang @@ -156,6 +156,7 @@ ErrorPriceExpression20=Empty expression ErrorPriceExpression21=Empty result '%s' ErrorPriceExpression22=Negative result '%s' ErrorPriceExpression23=Unknown or non set variable '%s' in %s +ErrorPriceExpression24=Variable '%s' exists but has no value ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs diff --git a/htdocs/langs/zh_TW/install.lang b/htdocs/langs/zh_TW/install.lang index fa79cfa8b0e..b7909032b9a 100644 --- a/htdocs/langs/zh_TW/install.lang +++ b/htdocs/langs/zh_TW/install.lang @@ -141,6 +141,7 @@ KeepDefaultValuesProxmox=您使用Proxmox的虛擬設備的Dolibarr安裝向導 UpgradeExternalModule=Run dedicated upgrade process of external modules SetAtLeastOneOptionAsUrlParameter=Set at least one option as a parameter in URL. For example: '...repair.php?standard=confirmed' NothingToDelete=Nothing to clean/delete +NothingToDo=Nothing to do ######### # upgrade MigrationFixData=修正了非規範化數據 @@ -196,6 +197,7 @@ MigrationEventsContact=Migration of events to add event contact into assignement MigrationRemiseEntity=Update entity field value of llx_societe_remise MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except MigrationReloadModule=Reload module %s +MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm ShowNotAvailableOptions=顯示不可用的選項 HideNotAvailableOptions= 隱藏不可用的選項 ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can click here, but application or some features may not work correctly until fixed. diff --git a/htdocs/langs/zh_TW/languages.lang b/htdocs/langs/zh_TW/languages.lang index bd20a9f6c45..24039a92663 100644 --- a/htdocs/langs/zh_TW/languages.lang +++ b/htdocs/langs/zh_TW/languages.lang @@ -35,6 +35,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=西班牙语 (巴拉圭) Language_es_PE=西班牙语 (秘鲁) Language_es_PR=西班牙語（波多黎各） +Language_es_UY=Spanish (Uruguay) Language_es_VE=西班牙语（委內瑞拉） Language_et_EE=爱沙尼亚语 Language_eu_ES=巴斯克 diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang index 429c8cbe8ae..8704049b408 100644 --- a/htdocs/langs/zh_TW/main.lang +++ b/htdocs/langs/zh_TW/main.lang @@ -548,6 +548,18 @@ MonthShort09=九月 MonthShort10=十月 MonthShort11=十一月 MonthShort12=十二月 +MonthVeryShort01=J +MonthVeryShort02=Fr +MonthVeryShort03=Mo +MonthVeryShort04=A +MonthVeryShort05=Mo +MonthVeryShort06=J +MonthVeryShort07=J +MonthVeryShort08=A +MonthVeryShort09=Su +MonthVeryShort10=O +MonthVeryShort11=N +MonthVeryShort12=D AttachedFiles=附加檔案和文件 JoinMainDoc=Join main document DateFormatYYYYMM=為YYYY - MM @@ -762,7 +774,7 @@ SetBankAccount=定義銀行帳號 AccountCurrency=Account currency ViewPrivateNote=View notes XMoreLines=%s line(s) hidden -ShowMoreLines=Show more lines +ShowMoreLines=Show more/less lines PublicUrl=公開網址 AddBox=Add box SelectElementAndClick=Select an element and click %s @@ -900,3 +912,5 @@ CommentPage=Comments space CommentAdded=Comment added CommentDeleted=Comment deleted Everybody=每個人 +PayedBy=Payed by +PayedTo=Payed to diff --git a/htdocs/langs/zh_TW/other.lang b/htdocs/langs/zh_TW/other.lang index 689d1c1784c..bce547a2679 100644 --- a/htdocs/langs/zh_TW/other.lang +++ b/htdocs/langs/zh_TW/other.lang @@ -225,6 +225,8 @@ IfAmountHigherThan=If amount higher than %s SourcesRepository=Repository for sources Chart=Chart PassEncoding=Password encoding +PermissionsAdd=Permissions added +PermissionsDelete=Permissions removed ##### Export ##### ExportsArea=出口地區 diff --git a/htdocs/langs/zh_TW/products.lang b/htdocs/langs/zh_TW/products.lang index 5069f38f2e2..785cfdd5085 100644 --- a/htdocs/langs/zh_TW/products.lang +++ b/htdocs/langs/zh_TW/products.lang @@ -196,6 +196,7 @@ CurrentProductPrice=Current price AlwaysUseNewPrice=Always use current price of product/service AlwaysUseFixedPrice=Use the fixed price PriceByQuantity=Different prices by quantity +DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Quantity range MultipriceRules=Price segment rules UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment diff --git a/htdocs/langs/zh_TW/projects.lang b/htdocs/langs/zh_TW/projects.lang index c0162287ac8..9609b205361 100644 --- a/htdocs/langs/zh_TW/projects.lang +++ b/htdocs/langs/zh_TW/projects.lang @@ -211,9 +211,12 @@ OppStatusPENDING=Pending OppStatusWON=Won OppStatusLOST=Lost Budget=Budget +AllowToLinkFromOtherCompany=Allow to link project from other company

    Supported values :
    - Keep empty: Can link any project of the company (default)
    - "all" : Can link any projects, even project of other companies
    - A list of thirdparty id separated with commas : Can link all projects of these thirdparty defined (Example : 123,4795,53)
    LatestProjects=Latest %s projects LatestModifiedProjects=Latest %s modified projects OtherFilteredTasks=Other filtered tasks +NoAssignedTasks=No assigned tasks (assign yourself project/tasks from the top select box to enter time on it) # Comments trans AllowCommentOnTask=Allow user comments on tasks AllowCommentOnProject=Allow user comments on projects + diff --git a/htdocs/langs/zh_TW/website.lang b/htdocs/langs/zh_TW/website.lang index be33f903947..522d5abfc48 100644 --- a/htdocs/langs/zh_TW/website.lang +++ b/htdocs/langs/zh_TW/website.lang @@ -3,15 +3,17 @@ Shortname=碼 WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them. DeleteWebsite=Delete website ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed. +WEBSITE_TYPE_CONTAINER=Type of page/container WEBSITE_PAGENAME=Page name/alias -WEBSITE_HTML_HEADER=HTML Header (common to all pages) -HtmlHeaderPage=HTML specific header for page WEBSITE_CSS_URL=URL of external CSS file WEBSITE_CSS_INLINE=CSS file content (common to all pages) WEBSITE_JS_INLINE=Javascript file content (common to all pages) +WEBSITE_HTML_HEADER=Addition at bottom of HTML Header (common to all pages) WEBSITE_ROBOT=Robot file (robots.txt) WEBSITE_HTACCESS=Web site .htaccess file +HtmlHeaderPage=HTML header (specific to this page only) PageNameAliasHelp=Name or alias of the page.
    This alias is also used to forge a SEO URL when website is ran from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias. +EditTheWebSiteForACommonHeader=Note: If you want to define a personalized header for all pages, edit the header on the site level instead of on the page/container. MediaFiles=Media library EditCss=Edit Style/CSS or HTML header EditMenu=Edit menu @@ -39,7 +41,7 @@ VirtualHostUrlNotDefined=URL of the virtual host served by external web server n NoPageYet=No pages yet SyntaxHelp=Help on specific syntax tips YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor. -YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php dolIncludeHtmlContent($websitekey.'/alias_of_container_to_include.php'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    +YouCanEditHtmlSource=
    You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $langs, $db, $mysoc, $user, $website.

    You can also include content of another Page/Container with the following syntax:
    <?php includeContainer('alias_of_container_to_include'); ?>

    To include a link to download a file stored into the documents directory, use the document.php wrapper:
    Example, for a file into documents/ecm (need to be logged), syntax is:
    <a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
    For a file into documents/medias (open directory for public access), syntax is:
    <a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
    For a file shared with a share link (open access using the sharing hash key of file), syntax is:
    <a href="/document.php?hashp=publicsharekeyoffile">

    To include an image stored into the documents directory, use the viewimage.php wrapper:
    Example, for an image into documents/medias (open access), syntax is:
    <a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
    ClonePage=Clone page/container CloneSite=Clone site SiteAdded=Web site added @@ -53,7 +55,12 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page +Banner=Bandeau +BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts AddWebsiteAccount=Create web site account BackToListOfThirdParty=Back to list for Third Party +DisableSiteFirst=Disable website first +MyContainerTitle=My web site title +AnotherContainer=Another container From 25b455272ab2ea91c80d35ac9286c5c0cc789a80 Mon Sep 17 00:00:00 2001 From: fappels Date: Sun, 14 Jan 2018 15:31:31 +0100 Subject: [PATCH 0215/1074] Fix 0 is a valif value for a NOT NULL field --- htdocs/core/class/commonobject.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 55abcee5699..1a8f7bc7bb9 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -6221,7 +6221,7 @@ abstract class CommonObject if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key]=''; //var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1)); - if ($this->fields[$key]['notnull'] == 1 && empty($values[$key])) + if ($this->fields[$key]['notnull'] == 1 && ! isset($values[$key])) { $error++; $this->errors[]=$langs->trans("ErrorFieldRequired", $this->fields[$key]['label']); From d6ed968c516c6428aa7a0a6dd14d0abb55a643cb Mon Sep 17 00:00:00 2001 From: fappels Date: Sun, 14 Jan 2018 15:41:37 +0100 Subject: [PATCH 0216/1074] html modulebuilder type is a text type in database --- htdocs/core/lib/modulebuilder.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/modulebuilder.lib.php b/htdocs/core/lib/modulebuilder.lib.php index c437d47ce69..d14a60ab94f 100644 --- a/htdocs/core/lib/modulebuilder.lib.php +++ b/htdocs/core/lib/modulebuilder.lib.php @@ -254,7 +254,7 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir='', $type = $val['type']; $type = preg_replace('/:.*$/', '', $type); // For case type = 'integer:Societe:societe/class/societe.class.php' - + if ($type == 'html') $type = 'text'; // html modulebuilder type is a text type in database $texttoinsert.= "\t".$key." ".$type; if ($key == 'rowid') $texttoinsert.= ' AUTO_INCREMENT PRIMARY KEY'; if ($key == 'entity') $texttoinsert.= ' DEFAULT 1'; From 3c3402bc606e5b6cbd88e72668657650bea8f47d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 14 Jan 2018 15:58:04 +0100 Subject: [PATCH 0217/1074] Debug API for prices of products --- htdocs/api/index.php | 3 + htdocs/core/class/html.form.class.php | 6 +- htdocs/product/admin/product.php | 2 +- htdocs/product/class/api_products.class.php | 147 +++++++++++++++++++- htdocs/product/class/product.class.php | 20 ++- 5 files changed, 162 insertions(+), 16 deletions(-) diff --git a/htdocs/api/index.php b/htdocs/api/index.php index d588fbdad1d..99334880d3a 100644 --- a/htdocs/api/index.php +++ b/htdocs/api/index.php @@ -79,6 +79,9 @@ if (preg_match('/api\/index\.php\/explorer/', $_SERVER["PHP_SELF"]) && ! empty($ } +// This 2 lines are usefull only if we want to exclude some Urls from the explorer +//use Luracast\Restler\Explorer; +//Explorer::$excludedPaths = array('/categories'); // Analyze URLs diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index a3e1f73d74f..8230786c449 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -1931,11 +1931,11 @@ class Form if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) { $sql.= ", (SELECT pp.rowid FROM ".MAIN_DB_PREFIX."product_price as pp WHERE pp.fk_product = p.rowid"; - if ($price_level >= 1 && !empty($conf->global->PRODUIT_MULTIPRICES)) $sql.= " AND price_level=".$price_level; + if ($price_level >= 1 && !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) $sql.= " AND price_level=".$price_level; $sql.= " ORDER BY date_price"; $sql.= " DESC LIMIT 1) as price_rowid"; - $sql.= ", (SELECT pp.price_by_qty FROM ".MAIN_DB_PREFIX."product_price as pp WHERE pp.fk_product = p.rowid"; - if ($price_level >= 1 && !empty($conf->global->PRODUIT_MULTIPRICES)) $sql.= " AND price_level=".$price_level; + $sql.= ", (SELECT pp.price_by_qty FROM ".MAIN_DB_PREFIX."product_price as pp WHERE pp.fk_product = p.rowid"; // price_by_qty is 1 if some prices by qty exists in subtable + if ($price_level >= 1 && !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) $sql.= " AND price_level=".$price_level; $sql.= " ORDER BY date_price"; $sql.= " DESC LIMIT 1) as price_by_qty"; $selectFields.= ", price_rowid, price_by_qty"; diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php index e4b904b33b0..06cfc0e0eac 100644 --- a/htdocs/product/admin/product.php +++ b/htdocs/product/admin/product.php @@ -55,7 +55,7 @@ $select_pricing_rules=array( 'PRODUIT_CUSTOMER_PRICES'=>$langs->trans('PriceByCustomer'), // Different price for each customer ); $keyforparam='PRODUIT_CUSTOMER_PRICES_BY_QTY'; -if ($conf->global->MAIN_FEATURES_LEVEL >= 2 || ! empty($conf->global->$keyforparam)) $select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY'] = $langs->trans('PriceByQuantity').' ('.$langs->trans("VersionExperimental").')'; // TODO If this is enabled, price must be hidden when price by qty is enabled, also price for quantity must be used when adding product into order/propal/invoice +if ($conf->global->MAIN_FEATURES_LEVEL >= 1 || ! empty($conf->global->$keyforparam)) $select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY'] = $langs->trans('PriceByQuantity').' ('.$langs->trans("VersionExperimental").')'; // TODO If this is enabled, price must be hidden when price by qty is enabled, also price for quantity must be used when adding product into order/propal/invoice $keyforparam='PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES'; if ($conf->global->MAIN_FEATURES_LEVEL >= 2 || ! empty($conf->global->$keyforparam)) $select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES'] = $langs->trans('MultiPricesAbility') . '+' . $langs->trans('PriceByQuantity').' ('.$langs->trans("VersionExperimental").')'; diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php index 7b297fcbdc4..b21a6a34046 100644 --- a/htdocs/product/class/api_products.class.php +++ b/htdocs/product/class/api_products.class.php @@ -54,15 +54,18 @@ class Products extends DolibarrApi /** * Get properties of a product object * - * Return an array with product informations + * Return an array with product information. + * TODO implement getting a product by ref or by $ref_ext * - * @param int $id ID of product + * @param int $id ID of product + * @param int $includestockdata Load also information about stock (slower) * @return array|mixed data without useless information * - * @throws RestException - * TODO implement getting a product by ref or by $ref_ext + * @throws RestException + * @throws 401 + * @throws 404 */ - function get($id) + function get($id, $includestockdata=0) { if(! DolibarrApiAccess::$user->rights->produit->lire) { throw new RestException(401); @@ -77,7 +80,10 @@ class Products extends DolibarrApi throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); } - $this->product->load_stock(); + if ($includestockdata) + { + $this->product->load_stock(); + } return $this->_cleanObjectDatas($this->product); } @@ -196,6 +202,10 @@ class Products extends DolibarrApi * @param int $id Id of product to update * @param array $request_data Datas * @return int + * + * @throws RestException + * @throws 401 + * @throws 404 */ function put($id, $request_data = NULL) { @@ -250,6 +260,7 @@ class Products extends DolibarrApi return $this->product->delete(DolibarrApiAccess::$user); } + /** * Get categories for a product * @@ -284,6 +295,121 @@ class Products extends DolibarrApi return $result; } + /** + * Get prices per segment for a product + * + * @param int $id ID of product + * + * @return mixed + * + * @url GET {id}/selling_multiprices/per_segment + */ + function getCustomerPricesPerSegment($id) + { + global $conf; + + if (! DolibarrApiAccess::$user->rights->produit->lire) { + throw new RestException(401); + } + + if (empty($conf->global->PRODUIT_MULTIPRICES)) + { + throw new RestException(400, 'API not available: this mode of pricing is not enabled by setup'); + } + + $result = $this->product->fetch($id); + if ( ! $result ) { + throw new RestException(404, 'Product not found'); + } + + if ($result < 0) { + throw new RestException(503, 'Error when retrieve prices list : '.$categories->error); + } + + return array( + 'multiprices'=>$this->product->multiprices, + 'multiprices_inc_tax'=>$this->product->multiprices_ttc, + 'multiprices_min'=>$this->product->multiprices_min, + 'multiprices_min_inc_tax'=>$this->product->multiprices_min_ttc, + 'multiprices_vat'=>$this->product->multiprices_tva_tx, + 'multiprices_base_type'=>$this->product->multiprices_base_type, + //'multiprices_default_vat_code'=>$this->product->multiprices_default_vat_code + ); + } + + /** + * Get prices per customer for a product + * + * @param int $id ID of product + * + * @return mixed + * + * @url GET {id}/selling_multiprices/per_customer + */ + function getCustomerPricesPerCustomer($id) + { + global $conf; + + if (! DolibarrApiAccess::$user->rights->produit->lire) { + throw new RestException(401); + } + + if (empty($conf->global->PRODUIT_CUSTOMER_PRICES)) + { + throw new RestException(400, 'API not available: this mode of pricing is not enabled by setup'); + } + + $result = $this->product->fetch($id); + if ( ! $result ) { + throw new RestException(404, 'Product not found'); + } + + if ($result < 0) { + throw new RestException(503, 'Error when retrieve prices list : '.$categories->error); + } + + throw new RestException(501, 'Feature not yet available'); + //return $result; + } + + /** + * Get prices per quantity for a product + * + * @param int $id ID of product + * + * @return mixed + * + * @url GET {id}/selling_multiprices/per_quantity + */ + function getCustomerPricesPerQuantity($id) + { + global $conf; + + if (! DolibarrApiAccess::$user->rights->produit->lire) { + throw new RestException(401); + } + + if (empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) + { + throw new RestException(400, 'API not available: this mode of pricing is not enabled by setup'); + } + + $result = $this->product->fetch($id); + if ( ! $result ) { + throw new RestException(404, 'Product not found'); + } + + if ($result < 0) { + throw new RestException(503, 'Error when retrieve prices list : '.$categories->error); + } + + return array( + 'prices_by_qty'=>$this->product->prices_by_qty[0], // 1 if price by quantity was activated for the product + 'prices_by_qty_list'=>$this->product->prices_by_qty_list[0] + ); + } + + /** * Clean sensible object datas * @@ -295,6 +421,15 @@ class Products extends DolibarrApi $object = parent::_cleanObjectDatas($object); unset($object->regeximgext); + unset($object->price_by_qty); + unset($object->prices_by_qty_id); + unset($object->libelle); + unset($object->product_id_already_linked); + + unset($object->name); + unset($object->firstname); + unset($object->lastname); + unset($object->civility_id); return $object; } diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 02c3a1c139d..e6439031146 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -1963,7 +1963,7 @@ class Product extends CommonObject if (! empty($conf->global->MAIN_MULTILANGS)) $this->getMultiLangs(); // Load multiprices array - if (! empty($conf->global->PRODUIT_MULTIPRICES)) + if (! empty($conf->global->PRODUIT_MULTIPRICES)) // prices per segment { for ($i=1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) { @@ -1990,6 +1990,7 @@ class Product extends CommonObject $this->multiprices_recuperableonly[$i]=$result["recuperableonly"]; // Price by quantity + /* $this->prices_by_qty[$i]=$result["price_by_qty"]; $this->prices_by_qty_id[$i]=$result["rowid"]; // Récuperation de la liste des prix selon qty si flag positionné @@ -2022,7 +2023,7 @@ class Product extends CommonObject dol_print_error($this->db); return -1; } - } + }*/ } else { @@ -2031,7 +2032,11 @@ class Product extends CommonObject } } } - else if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) + elseif (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) // prices per customers + { + // Nothing loaded by default. List may be very long. + } + else if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) // prices per quantity { $sql = "SELECT price, price_ttc, price_min, price_min_ttc,"; $sql.= " price_base_type, tva_tx, default_vat_code, tosell, price_by_qty, rowid"; @@ -2066,7 +2071,7 @@ class Product extends CommonObject $resultat[$ii]["unitprice"]= $result["unitprice"]; $resultat[$ii]["quantity"]= $result["quantity"]; $resultat[$ii]["remise_percent"]= $result["remise_percent"]; - $resultat[$ii]["remise"]= $result["remise"]; // deprecated + //$resultat[$ii]["remise"]= $result["remise"]; // deprecated $resultat[$ii]["price_base_type"]= $result["price_base_type"]; $ii++; } @@ -2085,6 +2090,10 @@ class Product extends CommonObject return -1; } } + else if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) // prices per customer and quantity + { + // Not yet implemented + } if (!empty($conf->dynamicprices->enabled) && !empty($this->fk_price_expression) && empty($ignore_expression)) { @@ -2101,8 +2110,7 @@ class Product extends CommonObject } // We should not load stock during the fetch. If someone need stock of product, he must call load_stock after fetching product. - //$res=$this->load_stock(); - // instead we just init the stock_warehouse array + // Instead we just init the stock_warehouse array $this->stock_warehouse = array(); return 1; From c45e5c91b118dbd985c42c57d91ff898671149ea Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Sun, 14 Jan 2018 17:13:42 +0100 Subject: [PATCH 0218/1074] New hidden option MAIN_DISABLE_FREE_LINES --- htdocs/core/tpl/objectline_create.tpl.php | 80 +++++++++++++---------- 1 file changed, 46 insertions(+), 34 deletions(-) diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php index 2d6178ed79b..2ea5b6899d7 100644 --- a/htdocs/core/tpl/objectline_create.tpl.php +++ b/htdocs/core/tpl/objectline_create.tpl.php @@ -142,49 +142,54 @@ else { element == 'contrat') + + $freelines = false; + if(empty($conf->global->MAIN_DISABLE_FREE_LINES)) { - if (empty($conf->product->enabled) && empty($conf->service->enabled) && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $forceall=-1; // With contract, by default, no choice at all, except if CONTRACT_SUPPORT_PRODUCTS is set - else $forceall=0; - } - - // Free line - echo ''; - // Show radio free line - if ($forceall >= 0 && (! empty($conf->product->enabled) || ! empty($conf->service->enabled))) - { - echo ''; - echo ' '; - } - else - { - echo ''; - // Show type selector - if ($forceall >= 0) + $freelines = true; + $forceall=1; // We always force all type for free lines (module product or service means we use predefined product or service) + if ($object->element == 'contrat') { - if (empty($conf->product->enabled) || empty($conf->service->enabled)) echo $langs->trans("Type"); - else echo $langs->trans("FreeLineOfType"); + if (empty($conf->product->enabled) && empty($conf->service->enabled) && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $forceall=-1; // With contract, by default, no choice at all, except if CONTRACT_SUPPORT_PRODUCTS is set + else $forceall=0; + } + + // Free line + echo ''; + // Show radio free line + if ($forceall >= 0 && (! empty($conf->product->enabled) || ! empty($conf->service->enabled))) + { + echo ''; echo ' '; } + else + { + echo ''; + // Show type selector + if ($forceall >= 0) + { + if (empty($conf->product->enabled) || empty($conf->service->enabled)) echo $langs->trans("Type"); + else echo $langs->trans("FreeLineOfType"); + echo ' '; + } + } + + echo $form->select_type_of_lines(isset($_POST["type"])?GETPOST("type",'alpha',2):-1,'type',1,1,$forceall); + + echo ''; } - echo $form->select_type_of_lines(isset($_POST["type"])?GETPOST("type",'alpha',2):-1,'type',1,1,$forceall); - - echo ''; - // Predefined product/service if (! empty($conf->product->enabled) || ! empty($conf->service->enabled)) { - if ($forceall >= 0) echo '
    '; + if ($forceall >= 0 && $freelines) echo '
    '; echo ''; echo '