From 232f20100706b9d93c5e081f670d7daf44b892fd Mon Sep 17 00:00:00 2001 From: Francis Appels Date: Sun, 23 Feb 2020 17:02:08 +0100 Subject: [PATCH 001/297] Merge remote-tracking branch 'Dolibarr/11.0' into 11 --- htdocs/compta/facture/class/facture.class.php | 9 +++++++++ htdocs/core/lib/pdf.lib.php | 2 +- htdocs/cron/class/cronjob.class.php | 4 ++-- .../framework/Luracast/Restler/AutoLoader.php | 8 +------- .../framework/Luracast/Restler/CommentParser.php | 12 ++++++------ .../framework/Luracast/Restler/Format/XmlFormat.php | 2 +- .../restler/framework/Luracast/Restler/Resources.php | 6 +++--- .../restler/framework/Luracast/Restler/Restler.php | 4 ++-- .../restler/framework/Luracast/Restler/Routes.php | 6 +++--- .../restler/framework/Luracast/Restler/Scope.php | 2 +- .../restler/framework/Luracast/Restler/UI/Emmet.php | 4 ++-- htdocs/projet/element.php | 2 +- htdocs/theme/eldy/global.inc.php | 2 +- 13 files changed, 33 insertions(+), 30 deletions(-) diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index d4a7efd3cf4..99cc638c36f 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -1156,6 +1156,14 @@ class Facture extends CommonInvoice $line->date_start = $object->lines[$i]->date_start; $line->date_end = $object->lines[$i]->date_end; + // Multicurrency + $line->fk_multicurrency = $object->lines[$i]->fk_multicurrency; + $line->multicurrency_code = $object->lines[$i]->multicurrency_code; + $line->multicurrency_subprice = $object->lines[$i]->multicurrency_subprice; + $line->multicurrency_total_ht = $object->lines[$i]->multicurrency_total_ht; + $line->multicurrency_total_tva = $object->lines[$i]->multicurrency_total_tva; + $line->multicurrency_total_ttc = $object->lines[$i]->multicurrency_total_ttc; + $line->fk_fournprice = $object->lines[$i]->fk_fournprice; $marginInfos = getMarginInfos($object->lines[$i]->subprice, $object->lines[$i]->remise_percent, $object->lines[$i]->tva_tx, $object->lines[$i]->localtax1_tx, $object->lines[$i]->localtax2_tx, $object->lines[$i]->fk_fournprice, $object->lines[$i]->pa_ht); $line->pa_ht = $marginInfos[0]; @@ -1170,6 +1178,7 @@ class Facture extends CommonInvoice $this->socid = $object->socid; $this->fk_project = $object->fk_project; + $this->fk_account = $object->fk_account; $this->cond_reglement_id = $object->cond_reglement_id; $this->mode_reglement_id = $object->mode_reglement_id; $this->availability_id = $object->availability_id; diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index a5ba08bb139..59035258c74 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -1401,7 +1401,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0, foreach ($tblcateg as $cate) { // Adding the descriptions if they are filled - $desccateg = $cate->add_description; + $desccateg = $cate->description; if ($desccateg) $libelleproduitservice .= '__N__'.$desccateg; } diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php index 5cde792bbb5..6139f157f8a 100644 --- a/htdocs/cron/class/cronjob.class.php +++ b/htdocs/cron/class/cronjob.class.php @@ -1320,9 +1320,9 @@ class Cronjob extends CommonObject if ($processing) $moretext = ' ('.$langs->trans("Running").')'; elseif ($lastresult) $moretext .= ' ('.$langs->trans("Error").')'; - $this->labelStatus[self::STATUS_DISABLED] = $langs->trans('Draft').$moretext; + $this->labelStatus[self::STATUS_DISABLED] = $langs->trans('Disabled').$moretext; $this->labelStatus[self::STATUS_ENABLED] = $langs->trans('Enabled').$moretext; - $this->labelStatusShort[self::STATUS_DISABLED] = $langs->trans('Draft'); + $this->labelStatusShort[self::STATUS_DISABLED] = $langs->trans('Disabled'); $this->labelStatusShort[self::STATUS_ENABLED] = $langs->trans('Enabled'); } diff --git a/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php b/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php index eff8bb61f29..d8445fdc70c 100644 --- a/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php +++ b/htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php @@ -263,13 +263,7 @@ class AutoLoader * @return bool false unless className now exists */ private function loadLastResort($className, $loader = null) { - // @CHANGE LDR Add protection to avoid conflict with other autoloader - /*print 'Try to load '.$className."\n"; - if (in_array($className, array('Google_Client'))) - { - return false; - }*/ - $loaders = array_unique(static::$rogueLoaders); + $loaders = array_unique(static::$rogueLoaders); if (isset($loader)) { if (false === array_search($loader, $loaders)) static::$rogueLoaders[] = $loader; diff --git a/htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php b/htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php index e8248a385fa..2815f1f6c70 100644 --- a/htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php +++ b/htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php @@ -159,7 +159,7 @@ class CommentParser $addNewline = true; } continue; - } elseif ($line{0} == '@') { + } elseif ($line[0] == '@') { $mode = 2; $newParam = true; } @@ -353,7 +353,7 @@ class CommentParser $data = $format->decode($str); } } else { // auto detect - if ($str{0} == '{') { + if ($str[0] == '{') { $d = json_decode($str, true); if (json_last_error() != JSON_ERROR_NONE) { throw new Exception('Error parsing embedded JSON data' @@ -445,7 +445,7 @@ class CommentParser { $r = array(); $email = end($value); - if ($email{0} == '<') { + if ($email[0] == '<') { $email = substr($email, 1, -1); array_pop($value); $r['email'] = $email; @@ -470,7 +470,7 @@ class CommentParser $data = array_shift($value); if (empty($data)) { $r['type'] = 'mixed'; - } elseif ($data{0} == '$') { + } elseif ($data[0] == '$') { $r['name'] = substr($data, 1); $r['type'] = 'mixed'; } else { @@ -478,7 +478,7 @@ class CommentParser $r['type'] = count($data) == 1 ? $data[0] : $data; $data = array_shift($value); - if (!empty($data) && $data{0} == '$') { + if (!empty($data) && $data[0] == '$') { $r['name'] = substr($data, 1); } } @@ -498,7 +498,7 @@ class CommentParser $data = array_shift($value); if (empty($data)) { $r['type'] = 'mixed'; - } elseif ($data{0} == '$') { + } elseif ($data[0] == '$') { $r['name'] = substr($data, 1); $r['type'] = 'mixed'; } else { diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Format/XmlFormat.php b/htdocs/includes/restler/framework/Luracast/Restler/Format/XmlFormat.php index b51fa707a53..ceec32e4cb5 100644 --- a/htdocs/includes/restler/framework/Luracast/Restler/Format/XmlFormat.php +++ b/htdocs/includes/restler/framework/Luracast/Restler/Format/XmlFormat.php @@ -221,7 +221,7 @@ class XmlFormat extends Format $namespaces = $xml->getNamespaces(); if (count($namespaces)) { $p = strpos($data, $xml->getName()); - if ($p && $data{$p - 1} == ':') { + if ($p && $data[$p - 1] == ':') { $s = strpos($data, '<') + 1; $prefix = substr($data, $s, $p - $s - 1); static::$namespacedProperties[static::$rootName] = $prefix; diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Resources.php b/htdocs/includes/restler/framework/Luracast/Restler/Resources.php index 43e95fa02be..2986968a990 100644 --- a/htdocs/includes/restler/framework/Luracast/Restler/Resources.php +++ b/htdocs/includes/restler/framework/Luracast/Restler/Resources.php @@ -198,7 +198,7 @@ class Resources implements iUseAuthentication, iProvideMultiVersionApi } elseif (false !== ($pos = strpos($id, '-v'))) { //$version = intval(substr($id, $pos + 2)); $id = substr($id, 0, $pos); - } elseif ($id{0} == 'v' && is_numeric($v = substr($id, 1))) { + } elseif ($id[0] == 'v' && is_numeric($v = substr($id, 1))) { $id = ''; //$version = $v; } elseif ($id == 'root' || $id == 'index') { @@ -233,7 +233,7 @@ class Resources implements iUseAuthentication, iProvideMultiVersionApi if ($tSlash) { if ($fLen != $tLen && !Text::beginsWith($fullPath, $target . '/')) continue; - } elseif ($fLen > $tLen + 1 && $fullPath{$tLen + 1} != '{' && !Text::beginsWith($fullPath, '{')) { + } elseif ($fLen > $tLen + 1 && $fullPath[$tLen + 1] != '{' && !Text::beginsWith($fullPath, '{')) { //when mapped to root exclude paths that have static parts //they are listed else where under that static part name continue; @@ -275,7 +275,7 @@ class Resources implements iUseAuthentication, iProvideMultiVersionApi if (count($parts) == 1 && $httpMethod == 'GET') { } else { for ($i = 0; $i < count($parts); $i++) { - if (strlen($parts[$i]) && $parts[$i]{0} == '{') { + if (strlen($parts[$i]) && $parts[$i][0] == '{') { $pos = $i - 1; break; } diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Restler.php b/htdocs/includes/restler/framework/Luracast/Restler/Restler.php index c2e9b1acb73..fcb5388726c 100644 --- a/htdocs/includes/restler/framework/Luracast/Restler/Restler.php +++ b/htdocs/includes/restler/framework/Luracast/Restler/Restler.php @@ -533,7 +533,7 @@ class Restler extends EventDispatcher rtrim($path, '/') //remove trailing slash if found ); - if (Defaults::$useUrlBasedVersioning && strlen($path) && $path{0} == 'v') { + if (Defaults::$useUrlBasedVersioning && strlen($path) && $path[0] == 'v') { $version = intval(substr($path, 1)); if ($version && $version <= $this->apiVersion) { $this->requestedApiVersion = $version; @@ -1599,7 +1599,7 @@ class Restler extends EventDispatcher */ public function __get($name) { - if ($name{0} == '_') { + if ($name[0] == '_') { $hiddenProperty = substr($name, 1); if (isset($this->$hiddenProperty)) { return $this->$hiddenProperty; diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Routes.php b/htdocs/includes/restler/framework/Luracast/Restler/Routes.php index 73e78dc0039..999094dec4c 100644 --- a/htdocs/includes/restler/framework/Luracast/Restler/Routes.php +++ b/htdocs/includes/restler/framework/Luracast/Restler/Routes.php @@ -87,7 +87,7 @@ class Routes foreach ($methods as $method) { $methodUrl = strtolower($method->getName()); //method name should not begin with _ - if ($methodUrl{0} == '_') { + if ($methodUrl[0] == '_') { continue; } $doc = $method->getDocComment(); @@ -330,7 +330,7 @@ class Routes if (!$type) { return 's'; } - switch ($type{0}) { + switch ($type[0]) { case 'i': case 'f': return 'n'; @@ -428,7 +428,7 @@ class Routes } $index = intval(substr($k, 1)); $details = $value[$httpMethod]['metadata']['param'][$index]; - if ($k{0} == 's' || strpos($k, static::pathVarTypeOf($v)) === 0) { + if ($k[0] == 's' || strpos($k, static::pathVarTypeOf($v)) === 0) { //remove the newlines $data[$details['name']] = trim($v, PHP_EOL); } else { diff --git a/htdocs/includes/restler/framework/Luracast/Restler/Scope.php b/htdocs/includes/restler/framework/Luracast/Restler/Scope.php index 251262017c3..16ccdd33561 100644 --- a/htdocs/includes/restler/framework/Luracast/Restler/Scope.php +++ b/htdocs/includes/restler/framework/Luracast/Restler/Scope.php @@ -203,7 +203,7 @@ class Scope $divider = '\\'; $qualified = false; - if ($className{0} == $divider) { + if ($className[0] == $divider) { $qualified = trim($className, $divider); } elseif (array_key_exists($className, $scope)) { $qualified = $scope[$className]; diff --git a/htdocs/includes/restler/framework/Luracast/Restler/UI/Emmet.php b/htdocs/includes/restler/framework/Luracast/Restler/UI/Emmet.php index abd4a3a73ba..435804b4469 100644 --- a/htdocs/includes/restler/framework/Luracast/Restler/UI/Emmet.php +++ b/htdocs/includes/restler/framework/Luracast/Restler/UI/Emmet.php @@ -356,7 +356,7 @@ class Emmet $pos = strpos($string, $f, $start); $tokens = array(); for ($i = $start; $i < $pos; $i++) { - $token = $string{$i}; + $token = $string[$i]; if (('#' == $token || '.' == $token) && (!empty($tokens) || $i == 0) ) { @@ -368,7 +368,7 @@ class Emmet $r[] = $f; } while (false != ($f = strtok(static::DELIMITERS))); for ($i = $pos; $i < strlen($string); $i++) { - $token = $string{$i}; + $token = $string[$i]; $r[] = $tokens[] = $token; } return $r; diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 46cf12356c5..ffd083d2359 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -606,7 +606,7 @@ foreach ($listofreferent as $key => $value) $elementarray = $object->get_element_list($key, $tablename, $datefieldname, $dates, $datee, !empty($project_field)?$project_field:'fk_projet'); - if (count($elementarray)>0 && is_array($elementarray)) + if (is_array($elementarray) && count($elementarray) > 0) { $total_ht = 0; $total_ttc = 0; diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index fa4f751d6a6..2eebcb19a6b 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -1297,7 +1297,7 @@ div.fichetwothirdright { browser->layout == 'phone') { print "padding-bottom: 6px\n"; } ?> } div.fichetwothirdright div.ficheaddleft { - padding-left: 20px; + padding-: 20px; } div.fichehalfleft { browser->layout != 'phone') { print "float: ".$left.";\n"; } ?> From c7d886c918eb6b454017281396952800f76792db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Mon, 23 Nov 2020 23:25:09 +0100 Subject: [PATCH 002/297] fix status on tooltip in box last product --- htdocs/core/boxes/box_produits.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php index 38f9a73f57f..7f4b66f5f58 100644 --- a/htdocs/core/boxes/box_produits.php +++ b/htdocs/core/boxes/box_produits.php @@ -133,6 +133,8 @@ class box_produits extends ModeleBoxes $productstatic->type = $objp->fk_product_type; $productstatic->label = $objp->label; $productstatic->entity = $objp->entity; + $productstatic->status = $objp->tosell; + $productstatic->status_buy = $objp->tobuy; $this->info_box_contents[$line][] = array( 'td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"', From 69ea0ea791a4daa0e030aed894eae5b39eb37d80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Mon, 23 Nov 2020 23:44:15 +0100 Subject: [PATCH 003/297] Update box_produits.php --- htdocs/core/boxes/box_produits.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php index 7f4b66f5f58..5b490ac32f4 100644 --- a/htdocs/core/boxes/box_produits.php +++ b/htdocs/core/boxes/box_produits.php @@ -87,6 +87,11 @@ class box_produits extends ModeleBoxes if ($user->rights->produit->lire || $user->rights->service->lire) { $sql = "SELECT p.rowid, p.label, p.ref, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.fk_price_expression, p.entity"; + $sql .= ", p.accountancy_code_sell"; + $sql .= ", p.accountancy_code_sell_intra"; + $sql .= ", p.accountancy_code_sell_export"; + $sql .= ", p.accountancy_code_buy"; + $sql .= ', p.barcode'; $sql.= " FROM ".MAIN_DB_PREFIX."product as p"; $sql.= ' WHERE p.entity IN ('.getEntity($productstatic->element).')'; if (empty($user->rights->produit->lire)) $sql.=' AND p.fk_product_type != 0'; @@ -135,6 +140,11 @@ class box_produits extends ModeleBoxes $productstatic->entity = $objp->entity; $productstatic->status = $objp->tosell; $productstatic->status_buy = $objp->tobuy; + $productstatic->barcode = $objp->barcode; + $productstatic->accountancy_code_sell = $objp->accountancy_code_sell; + $productstatic->accountancy_code_sell_intra = $objp->accountancy_code_sell_intra; + $productstatic->accountancy_code_sell_export = $objp->accountancy_code_sell_export; + $productstatic->accountancy_code_buy = $objp->accountancy_code_buy; $this->info_box_contents[$line][] = array( 'td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"', From be7714be1c1fa9371428072c375e0cc459fc4dff Mon Sep 17 00:00:00 2001 From: Bernard Saulme Date: Wed, 25 Nov 2020 18:11:36 +0100 Subject: [PATCH 004/297] Use email model option to joint file for subscription Allow the adherent subscription to use the email model option to join or no joint file. --- htdocs/adherents/subscription.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php index 611542b8ebc..d1dfd836696 100644 --- a/htdocs/adherents/subscription.php +++ b/htdocs/adherents/subscription.php @@ -333,7 +333,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'subscription' && ! $listofpaths = array(); $listofnames = array(); $listofmimes = array(); - if (is_object($object->invoice)) { + if (is_object($object->invoice) && is_object($arraydefaultmessage) && intval($arraydefaultmessage->joinfiles)) { $invoicediroutput = $conf->facture->dir_output; $fileparams = dol_most_recent_file($invoicediroutput.'/'.$object->invoice->ref, preg_quote($object->invoice->ref, '/').'[^\-]+'); $file = $fileparams['fullname']; From b9bac939e69cd27fe2ea8948bfbe55b78cd48599 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Fri, 27 Nov 2020 09:11:30 +0100 Subject: [PATCH 005/297] doxygen --- htdocs/ecm/class/ecmdirectory.class.php | 213 +++++++++++++----------- htdocs/ecm/class/ecmfiles.class.php | 70 +++++--- htdocs/ecm/dir_add_card.php | 121 +++++++------- 3 files changed, 215 insertions(+), 189 deletions(-) diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php index f2b87382c76..ca2b9fec473 100644 --- a/htdocs/ecm/class/ecmdirectory.class.php +++ b/htdocs/ecm/class/ecmdirectory.class.php @@ -62,8 +62,19 @@ class EcmDirectory extends CommonObject */ public $description; + /** + * @var int cache nb of doc + */ public $cachenbofdoc = -1; // By default cache initialized with value 'not calculated' + + /** + * @var int date_c + */ public $date_c; + + /** + * @var int date_m + */ public $date_m; /** @@ -81,25 +92,31 @@ class EcmDirectory extends CommonObject */ public $ref; + /** + * @var array array of categories + */ public $cats = array(); + + /** + * @var array array of children categories + */ public $motherof = array(); + /** + * @var array array of forbidden chars + */ public $forbiddenchars = array('<', '>', ':', '/', '\\', '?', '*', '|', '"'); + + /** + * @var array array of forbidden chars for dir + */ public $forbiddencharsdir = array('<', '>', ':', '?', '*', '|', '"'); + /** + * @var int 1 if full arbo loaded + */ public $full_arbo_loaded; - /** - * @var string Error code (or message) - */ - public $error; - - /** - * @var string[] Error codes (or messages) - */ - public $errors = array(); - - /** * Constructor * @@ -131,13 +148,14 @@ class EcmDirectory extends CommonObject $this->description = trim($this->description); $this->date_c = $now; $this->fk_user_c = $user->id; - if ($this->fk_parent <= 0) $this->fk_parent = 0; + if ($this->fk_parent <= 0) { + $this->fk_parent = 0; + } // Check if same directory does not exists with this name $relativepath = $this->label; - if ($this->fk_parent) - { + if ($this->fk_parent) { $parent = new EcmDirectory($this->db); $parent->fetch($this->fk_parent); $relativepath = $parent->getRelativePath().$relativepath; @@ -148,19 +166,16 @@ class EcmDirectory extends CommonObject $cat = new EcmDirectory($this->db); $cate_arbo = $cat->get_full_arbo(1); $pathfound = 0; - foreach ($cate_arbo as $key => $categ) - { + foreach ($cate_arbo as $key => $categ) { $path = str_replace($this->forbiddencharsdir, '_', $categ['fullrelativename']); //print $relativepath.' - '.$path.'
'; - if ($path == $relativepath) - { + if ($path == $relativepath) { $pathfound = 1; break; } } - if ($pathfound) - { + if ($pathfound) { $this->error = "ErrorDirAlreadyExists"; dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING); return -1; @@ -188,21 +203,23 @@ class EcmDirectory extends CommonObject dol_syslog(get_class($this)."::create", LOG_DEBUG); $resql = $this->db->query($sql); - if ($resql) - { + if ($resql) { $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."ecm_directories"); $dir = $conf->ecm->dir_output.'/'.$this->getRelativePath(); $result = dol_mkdir($dir); - if ($result < 0) { $error++; $this->error = "ErrorFailedToCreateDir"; } + if ($result < 0) { + $error++; $this->error = "ErrorFailedToCreateDir"; + } // Call trigger $result = $this->call_trigger('MYECMDIR_CREATE', $user); - if ($result < 0) { $error++; } + if ($result < 0) { + $error++; + } // End call triggers - if (!$error) - { + if (!$error) { $this->db->commit(); return $this->id; } else { @@ -249,22 +266,21 @@ class EcmDirectory extends CommonObject dol_syslog(get_class($this)."::update", LOG_DEBUG); $resql = $this->db->query($sql); - if (!$resql) - { + if (!$resql) { $error++; $this->error = "Error ".$this->db->lasterror(); } - if (!$error && !$notrigger) - { + if (!$error && !$notrigger) { // Call trigger $result = $this->call_trigger('MYECMDIR_MODIFY', $user); - if ($result < 0) { $error++; } + if ($result < 0) { + $error++; + } // End call triggers } - if (!$error) - { + if (!$error) { $this->db->commit(); return 1; } else { @@ -284,20 +300,26 @@ class EcmDirectory extends CommonObject { // Update request $sql = "UPDATE ".MAIN_DB_PREFIX."ecm_directories SET"; - if (preg_match('/[0-9]+/', $value)) $sql .= " cachenbofdoc = ".(int) $value; - else $sql .= " cachenbofdoc = cachenbofdoc ".$value." 1"; + if (preg_match('/[0-9]+/', $value)) { + $sql .= " cachenbofdoc = ".(int) $value; + } else { + $sql .= " cachenbofdoc = cachenbofdoc ".$value." 1"; + } $sql .= " WHERE rowid = ".$this->id; dol_syslog(get_class($this)."::changeNbOfFiles", LOG_DEBUG); $resql = $this->db->query($sql); - if (!$resql) - { + if (!$resql) { $this->error = "Error ".$this->db->lasterror(); return -1; } else { - if (preg_match('/[0-9]+/', $value)) $this->cachenbofdoc = (int) $value; - elseif ($value == '+') $this->cachenbofdoc++; - elseif ($value == '-') $this->cachenbofdoc--; + if (preg_match('/[0-9]+/', $value)) { + $this->cachenbofdoc = (int) $value; + } elseif ($value == '+') { + $this->cachenbofdoc++; + } elseif ($value == '-') { + $this->cachenbofdoc--; + } } return 1; @@ -327,11 +349,9 @@ class EcmDirectory extends CommonObject dol_syslog(get_class($this)."::fetch", LOG_DEBUG); $resql = $this->db->query($sql); - if ($resql) - { + if ($resql) { $obj = $this->db->fetch_object($resql); - if ($obj) - { + if ($obj) { $this->id = $obj->rowid; $this->ref = $obj->rowid; @@ -374,7 +394,9 @@ class EcmDirectory extends CommonObject $error = 0; - if ($mode != 'databaseonly') $relativepath = $this->getRelativePath(1); // Ex: dir1/dir2/dir3 + if ($mode != 'databaseonly') { + $relativepath = $this->getRelativePath(1); // Ex: dir1/dir2/dir3 + } dol_syslog(get_class($this)."::delete remove directory id=".$this->id." mode=".$mode.(($mode == 'databaseonly') ? '' : ' relativepath='.$relativepath)); @@ -385,35 +407,30 @@ class EcmDirectory extends CommonObject dol_syslog(get_class($this)."::delete", LOG_DEBUG); $resql = $this->db->query($sql); - if (!$resql) - { + if (!$resql) { $this->db->rollback(); $this->error = "Error ".$this->db->lasterror(); return -2; } else { // Call trigger $result = $this->call_trigger('MYECMDIR_DELETE', $user); - if ($result < 0) - { + if ($result < 0) { $this->db->rollback(); return -2; } // End call triggers } - if ($mode != 'databaseonly') - { + if ($mode != 'databaseonly') { $file = $conf->ecm->dir_output."/".$relativepath; - if ($deletedirrecursive) - { + if ($deletedirrecursive) { $result = @dol_delete_dir_recursive($file, 0, 0); } else { $result = @dol_delete_dir($file, 0); } } - if ($result || !@is_dir(dol_osencode($file))) - { + if ($result || !@is_dir(dol_osencode($file))) { $this->db->commit(); } else { $this->error = 'ErrorFailToDeleteDir'; @@ -422,8 +439,11 @@ class EcmDirectory extends CommonObject $error++; } - if (!$error) return 1; - else return -1; + if (!$error) { + return 1; + } else { + return -1; + } } @@ -465,17 +485,27 @@ class EcmDirectory extends CommonObject $linkclose = '"'.($more ? ' '.$more : '').' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">'; $linkstart = 'picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1); - if ($withpicto != 2) $result .= ($max ?dol_trunc($newref, $max, 'middle') : $newref); + if ($withpicto) { + $result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1); + } + if ($withpicto != 2) { + $result .= ($max ?dol_trunc($newref, $max, 'middle') : $newref); + } $result .= $linkend; return $result; @@ -497,18 +527,15 @@ class EcmDirectory extends CommonObject do { // Get index cursor in this->cats for id_mere $cursorindex = -1; - foreach ($this->cats as $key => $val) - { - if ($this->cats[$key]['id'] == $idtosearch) - { + foreach ($this->cats as $key => $val) { + if ($this->cats[$key]['id'] == $idtosearch) { $cursorindex = $key; break; } } //print "c=".$idtosearch."-".$cursorindex; - if ($cursorindex >= 0) - { + if ($cursorindex >= 0) { // Path is label sanitized (no space and no special char) and concatenated $ret = dol_sanitizeFileName($this->cats[$cursorindex]['label']).'/'.$ret; @@ -541,11 +568,9 @@ class EcmDirectory extends CommonObject dol_syslog(get_class($this)."::load_motherof", LOG_DEBUG); $resql = $this->db->query($sql); - if ($resql) - { + if ($resql) { // This assignment in condition is not a bug. It allows walking the results. - while ($obj = $this->db->fetch_object($resql)) - { + while ($obj = $this->db->fetch_object($resql)) { $this->motherof[$obj->id_son] = $obj->id_parent; } return 1; @@ -608,8 +633,7 @@ class EcmDirectory extends CommonObject // phpcs:enable global $conf; - if (empty($force) && !empty($this->full_arbo_loaded)) - { + if (empty($force) && !empty($this->full_arbo_loaded)) { return $this->cats; } @@ -632,13 +656,11 @@ class EcmDirectory extends CommonObject dol_syslog(get_class($this)."::get_full_arbo", LOG_DEBUG); $resql = $this->db->query($sql); - if ($resql) - { + if ($resql) { $this->cats = array(); $i = 0; // This assignment in condition is not a bug. It allows walking the results. - while ($obj = $this->db->fetch_object($resql)) - { + while ($obj = $this->db->fetch_object($resql)) { $this->cats[$obj->rowid]['id'] = $obj->rowid; $this->cats[$obj->rowid]['id_mere'] = (isset($this->motherof[$obj->rowid]) ? $this->motherof[$obj->rowid] : ''); $this->cats[$obj->rowid]['label'] = $obj->label; @@ -648,10 +670,8 @@ class EcmDirectory extends CommonObject $this->cats[$obj->rowid]['fk_user_c'] = $obj->fk_user_c; $this->cats[$obj->rowid]['login_c'] = $obj->login_c; - if (!empty($obj->rowid_fille)) - { - if (isset($this->cats[$obj->rowid]['id_children']) && is_array($this->cats[$obj->rowid]['id_children'])) - { + if (!empty($obj->rowid_fille)) { + if (isset($this->cats[$obj->rowid]['id_children']) && is_array($this->cats[$obj->rowid]['id_children'])) { $newelempos = count($this->cats[$obj->rowid]['id_children']); //print "this->cats[$i]['id_children'] est deja un tableau de $newelem elements
"; $this->cats[$obj->rowid]['id_children'][$newelempos] = $obj->rowid_fille; @@ -668,9 +688,10 @@ class EcmDirectory extends CommonObject } // We add properties fullxxx to all elements - foreach ($this->cats as $key => $val) - { - if (isset($motherof[$key])) continue; + foreach ($this->cats as $key => $val) { + if (isset($motherof[$key])) { + continue; + } $this->build_path_from_id_categ($key, 0); } @@ -693,8 +714,7 @@ class EcmDirectory extends CommonObject { // phpcs:enable // Define fullpath - if (!empty($this->cats[$id_categ]['id_mere'])) - { + if (!empty($this->cats[$id_categ]['id_mere'])) { $this->cats[$id_categ]['fullpath'] = $this->cats[$this->cats[$id_categ]['id_mere']]['fullpath']; $this->cats[$id_categ]['fullpath'] .= '_'.$id_categ; $this->cats[$id_categ]['fullrelativename'] = $this->cats[$this->cats[$id_categ]['id_mere']]['fullrelativename']; @@ -711,11 +731,11 @@ class EcmDirectory extends CommonObject // Traite ces enfants $protection++; - if ($protection > 20) return; // On ne traite pas plus de 20 niveaux - if (isset($this->cats[$id_categ]['id_children']) && is_array($this->cats[$id_categ]['id_children'])) - { - foreach ($this->cats[$id_categ]['id_children'] as $key => $val) - { + if ($protection > 20) { + return; // On ne traite pas plus de 20 niveaux + } + if (isset($this->cats[$id_categ]['id_children']) && is_array($this->cats[$id_categ]['id_children'])) { + foreach ($this->cats[$id_categ]['id_children'] as $key => $val) { $this->build_path_from_id_categ($val, $protection); } } @@ -741,8 +761,7 @@ class EcmDirectory extends CommonObject // Update request $sql = "UPDATE ".MAIN_DB_PREFIX."ecm_directories SET"; $sql .= " cachenbofdoc = '".count($filelist)."'"; - if (empty($all)) // By default - { + if (empty($all)) { // By default $sql .= " WHERE rowid = ".$this->id; } else { $sql .= " WHERE entity = ".$conf->entity; @@ -750,8 +769,7 @@ class EcmDirectory extends CommonObject dol_syslog(get_class($this)."::refreshcachenboffile", LOG_DEBUG); $resql = $this->db->query($sql); - if ($resql) - { + if ($resql) { $this->cachenbofdoc = count($filelist); return $this->cachenbofdoc; } else { @@ -782,8 +800,7 @@ class EcmDirectory extends CommonObject $interface = new Interfaces($this->db); $result = $interface->run_triggers($triggerName, $this, $user, $langs, $conf); if ($result < 0) { - if (!empty($this->errors)) - { + if (!empty($this->errors)) { $this->errors = array_merge($this->errors, $interface->errors); } else { $this->errors = $interface->errors; diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php index 978b6e46d9e..4b0033cf5ec 100644 --- a/htdocs/ecm/class/ecmfiles.class.php +++ b/htdocs/ecm/class/ecmfiles.class.php @@ -94,7 +94,15 @@ class EcmFiles extends CommonObject * @var string keywords */ public $keywords; + + /** + * @var string cover + */ public $cover; + + /** + * @var int position + */ public $position; /** @@ -131,7 +139,15 @@ class EcmFiles extends CommonObject * @var string acl */ public $acl; + + /** + * @var string src object type + */ public $src_object_type; + + /** + * @var int src object id + */ public $src_object_id; @@ -233,8 +249,7 @@ class EcmFiles extends CommonObject $sql .= " WHERE filepath ='".$this->db->escape($this->filepath)."'"; $resql = $this->db->query($sql); - if ($resql) - { + if ($resql) { $obj = $this->db->fetch_object($resql); $maxposition = (int) $obj->maxposition; } else { @@ -247,13 +262,11 @@ class EcmFiles extends CommonObject } // Check parameters - if (empty($this->filename) || empty($this->filepath)) - { + if (empty($this->filename) || empty($this->filepath)) { $this->errors[] = 'Bad property filename or filepath'; return --$error; } - if (!isset($this->entity)) - { + if (!isset($this->entity)) { $this->entity = $conf->entity; } // Put here code to add control on parameters values @@ -317,11 +330,12 @@ class EcmFiles extends CommonObject $this->position = $maxposition; // Triggers - if (!$notrigger) - { + if (!$notrigger) { // Call triggers $result = $this->call_trigger(strtoupper(get_class($this)).'_CREATE', $user); - if ($result < 0) { $error++; } + if ($result < 0) { + $error++; + } // End call triggers } } @@ -401,8 +415,7 @@ class EcmFiles extends CommonObject } elseif (!empty($hashforshare)) { $sql .= " AND t.share = '".$this->db->escape($hashforshare)."'"; //$sql .= " AND t.entity = ".$conf->entity; // hashforshare already unique - } elseif ($src_object_type && $src_object_id) - { + } elseif ($src_object_type && $src_object_id) { // Warning: May return several record, and only first one is returned ! $sql .= " AND t.src_object_type ='".$this->db->escape($src_object_type)."' AND t.src_object_id = ".$this->db->escape($src_object_id); $sql .= " AND t.entity = ".$conf->entity; @@ -668,11 +681,12 @@ class EcmFiles extends CommonObject } // Triggers - if (!$error && !$notrigger) - { + if (!$error && !$notrigger) { // Call triggers $result = $this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $user); - if ($result < 0) { $error++; } //Do also here what you must do to rollback action if trigger fail + if ($result < 0) { + $error++; + } //Do also here what you must do to rollback action if trigger fail // End call triggers } @@ -705,11 +719,12 @@ class EcmFiles extends CommonObject $this->db->begin(); // Triggers - if (!$notrigger) - { + if (!$notrigger) { // Call triggers $result = $this->call_trigger(strtoupper(get_class($this)).'_DELETE', $user); - if ($result < 0) { $error++; } //Do also here what you must do to rollback action if trigger fail + if ($result < 0) { + $error++; + } //Do also here what you must do to rollback action if trigger fail // End call triggers } @@ -804,7 +819,9 @@ class EcmFiles extends CommonObject global $dolibarr_main_authentication, $dolibarr_main_demo; global $menumanager; - if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips + if (!empty($conf->dol_no_mouse_hover)) { + $notooltip = 1; // Force disable tooltips + } $result = ''; @@ -815,25 +832,26 @@ class EcmFiles extends CommonObject $url = DOL_URL_ROOT.'/ecm/'.$this->table_name.'_card.php?id='.$this->id; $linkclose = ''; - if (empty($notooltip)) - { - if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) - { + if (empty($notooltip)) { + if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { $label = $langs->trans("ShowProject"); $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"'; } $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"'; $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"'; - } else $linkclose = ($morecss ? ' class="'.$morecss.'"' : ''); + } else { + $linkclose = ($morecss ? ' class="'.$morecss.'"' : ''); + } $linkstart = ''; $linkend = ''; - if ($withpicto) - { + if ($withpicto) { $result .= ($linkstart.img_object(($notooltip ? '' : $label), 'label', ($notooltip ? '' : 'class="classfortooltip"')).$linkend); - if ($withpicto != 2) $result .= ' '; + if ($withpicto != 2) { + $result .= ' '; + } } $result .= $linkstart.$this->ref.$linkend; return $result; diff --git a/htdocs/ecm/dir_add_card.php b/htdocs/ecm/dir_add_card.php index a2726a1ba75..8c13c377bd6 100644 --- a/htdocs/ecm/dir_add_card.php +++ b/htdocs/ecm/dir_add_card.php @@ -41,20 +41,22 @@ $confirm = GETPOST('confirm', 'alpha'); $module = GETPOST('module', 'alpha'); $website = GETPOST('website', 'alpha'); $pageid = GETPOST('pageid', 'int'); -if (empty($module)) $module = 'ecm'; +if (empty($module)) { + $module = 'ecm'; +} // Security check -if ($user->socid > 0) -{ +if ($user->socid > 0) { $action = ''; $socid = $user->socid; } $section = $urlsection = GETPOST('section', 'alpha'); -if (empty($urlsection)) $urlsection = 'misc'; +if (empty($urlsection)) { + $urlsection = 'misc'; +} -if ($module == 'ecm') -{ +if ($module == 'ecm') { $upload_dir = $conf->ecm->dir_output.'/'.$urlsection; } else // For example $module == 'medias' { @@ -65,19 +67,23 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit; $sortfield = GETPOST("sortfield", 'alpha'); $sortorder = GETPOST("sortorder", 'alpha'); $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int'); -if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1 +if (empty($page) || $page == -1) { + $page = 0; +} // If $page is not defined, or '' or -1 $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -if (!$sortorder) $sortorder = "ASC"; -if (!$sortfield) $sortfield = "label"; +if (!$sortorder) { + $sortorder = "ASC"; +} +if (!$sortfield) { + $sortfield = "label"; +} $ecmdir = new EcmDirectory($db); -if (!empty($section)) -{ +if (!empty($section)) { $result = $ecmdir->fetch($section); - if (!$result > 0) - { + if (!$result > 0) { dol_print_error($db, $ecmdir->error); exit; } @@ -86,18 +92,18 @@ if (!empty($section)) // Permissions $permtoadd = 0; $permtoupload = 0; -if ($module == 'ecm') -{ +if ($module == 'ecm') { $permtoadd = $user->rights->ecm->setup; $permtoupload = $user->rights->ecm->upload; } -if ($module == 'medias') -{ +if ($module == 'medias') { $permtoadd = ($user->rights->mailing->creer || $user->rights->website->write); $permtoupload = ($user->rights->mailing->creer || $user->rights->website->write); } -if (!$permtoadd) accessforbidden(); +if (!$permtoadd) { + accessforbidden(); +} @@ -106,12 +112,9 @@ if (!$permtoadd) accessforbidden(); */ // Action ajout d'un produit ou service -if ($action == 'add' && $permtoadd) -{ - if ($cancel) - { - if (!empty($backtopage)) - { +if ($action == 'add' && $permtoadd) { + if ($cancel) { + if (!empty($backtopage)) { header("Location: ".$backtopage); exit; } else { @@ -120,33 +123,31 @@ if ($action == 'add' && $permtoadd) } } - $ref = GETPOST("ref", 'alpha'); - $label = GETPOST("label", 'alpha'); - $desc = GETPOST("desc", 'alpha'); + $ref = (string) GETPOST("ref", 'alpha'); + $label = (string) GETPOST("label", 'alpha'); + $desc = (string) GETPOST("desc", 'alpha'); $catParent = GETPOST("catParent", 'alpha'); // Can be an int (with ECM) or a string (with generic filemanager) - if ($catParent == '-1') $catParent = 0; + if ($catParent == '-1') { + $catParent = 0; + } $error = 0; - if (empty($label)) - { + if (empty($label)) { setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors'); $action = 'create'; $error++; } - if (!$error) - { - if ($module == 'ecm') - { + if (!$error) { + if ($module == 'ecm') { $ecmdir->ref = $ref; $ecmdir->label = $label; $ecmdir->description = $desc; $ecmdir->fk_parent = (int) $catParent; $id = $ecmdir->create($user); - if ($id <= 0) - { + if ($id <= 0) { $error++; $langs->load("errors"); setEventMessages($ecmdir->error, $ecmdir->errors, 'errors'); @@ -155,22 +156,18 @@ if ($action == 'add' && $permtoadd) } else // For example $module == 'medias' { $dirfornewdir = ''; - if ($module == 'medias') - { + if ($module == 'medias') { $dirfornewdir = $conf->medias->multidir_output[$conf->entity]; } - if (empty($dirfornewdir)) - { + if (empty($dirfornewdir)) { $error++; dol_print_error('', 'Bad value for module. Not supported.'); } - if (!$error) - { + if (!$error) { $fullpathofdir = $dirfornewdir.'/'.($catParent ? $catParent.'/' : '').$label; $result = dol_mkdir($fullpathofdir, DOL_DATA_ROOT); - if ($result < 0) - { + if ($result < 0) { setEventMessages($langs->trans('ErrorFailToCreateDir', $label), null, 'errors'); $error++; } else { @@ -180,10 +177,8 @@ if ($action == 'add' && $permtoadd) } } - if (!$error) - { - if (!empty($backtopage)) - { + if (!$error) { + if (!empty($backtopage)) { header("Location: ".$backtopage); exit; } else { @@ -194,8 +189,7 @@ if ($action == 'add' && $permtoadd) } // Deleting file -elseif ($action == 'confirm_deletesection' && $confirm == 'yes') -{ +elseif ($action == 'confirm_deletesection' && $confirm == 'yes') { $result = $ecmdir->delete($user); setEventMessages($langs->trans("ECMSectionWasRemoved", $ecmdir->label), null, 'mesgs'); } @@ -212,8 +206,7 @@ llxHeader('', $langs->trans("ECMNewSection")); $form = new Form($db); $formecm = new FormEcm($db); -if ($action == 'create') -{ +if ($action == 'create') { //*********************** // Create //*********************** @@ -222,8 +215,12 @@ if ($action == 'create') print ''; print ''; print ''; - if ($website) print ''; - if ($pageid) print ''; + if ($website) { + print ''; + } + if ($pageid) { + print ''; + } $title = $langs->trans("ECMNewSection"); print load_fiche_titre($title); @@ -240,8 +237,7 @@ if ($action == 'create') print ''."\n"; // Description - if ($module == 'ecm') - { + if ($module == 'ecm') { print ''.$langs->trans("Description").''; print ''."\n"; +// Zip print ''; -print ''."\n"; +print ''."\n"; print ''; -print ''."\n"; +print ''."\n"; // Country print ''; diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 444a44cdc34..a56402fddef 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -5102,19 +5102,21 @@ class Form $out .= ''; diff --git a/htdocs/theme/common/flags/unknown.png b/htdocs/theme/common/flags/unknown.png new file mode 100644 index 0000000000000000000000000000000000000000..08efc7b264d7eab8e1c4c13424342999084a4965 GIT binary patch literal 1595 zcmV-B2E_S^P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1b@lH)22{I65&5s-us90y}l^=|NvzYTUiXR?z_ zV#*elWvSgQ$P8`&|JUgc4hftnn&(tf3OHhkMJgsa>_?eb4sl+On{b-k`04xrX@kP* ze(Uv!ukhRDg;Nb)ZvB*xCz6jur_4t}9hC)>^%^Anvimt6iORN5QptV|b&=h+BXB}F z&gDot5rzGpt{u_A(rPHABAc>?dCfZl-OmaS<0@JZ$7+~IHG&!NcO)R>=JU=3hHHXu zNIuQzp8fOej(n+yU+=g~2S=EE`+)6x@+ZYth4qX`ZXeWgO7)fG-q+mwwtroX35=$r zqbAuWhDP85%5}b$FdV00?sF839BOEgd<`uu7>x@HRO!T#SFYT7o3?QS#3-9MtVk1` zzN{`q+7JdBVQ?4MqN`@;*JLAAxaEw6XWcUEHO{EKGD3xsjPc6DLH~OA%Anrcpol|0 za|K*7`Wi5Xa^s392*Ul)%_hO8amXL8`UkBF1#Qxt@qslgdy2*Q(px%pR>T?XzJ!>3 zJraN-)HZ;@5{MiUx}OsV7jb6rm?2OFa?vOY6ks!10aBuB5^~8hYU3T}87n49h8ug+ zSVfxDp-s^Wv0^mzkH?H2s-_mrESXy-D^`=Hm@K8_X>4-U)uWpych6qDX3a5MPT6zL zCD$TFu?Jd7#Y--w)GAa_s3KQIe1&I`MVGkPk``a`QkL4#J}owDsd>w-w7SZwE4GO> zt-j{9taW4Buv2Vtvn_4D<*jVBqu09j*sZ7TJ@?Yk7>BGx@CLt=n~?N zhMaTm(Ky=pxqHrHg)X-)3f{WCnC3f6@8P(>p!aZGEWL;0;-b&s`A4GXa9k{X2G5s7 zuj2Tn{68l8J&u>;f37{~JscnCqkB5&JsiL8qsOv*R{l>cTY6XalZ(EOxzu~MS?T4E zdSL1KFL~S~qa1x`Ut@X?$4_Mc!qR&F$XP9nS#OuUUo0iUbpE%44l0tk=JZjJdi66NxyZpvE@35a|hK*EmjyOy#l%*fJKN9Aft>86k#Dst44~6 zB<;sM{QZt!B$rIC4KQ-dqXZR_;|KqP-`$$IiE%e66a!jcZ2Myf2<`&4ifw-%+ji{) z2s{Hy9S$u4$q@<^0002CNkljtRAumcR0h)RMXsRoPV zVV)?Y6%BQ8%w*1-{F%vYbX}*`8eHNe$%8qyZL5@WiZdMc_6x3(Oq<@=?(4YLdV>k} zaa2k<$ByqB;2jsukHIdkt)NZ6)IVSifM$j4Gam7Y<7I#ehS=)+8SZeKWI7+LweBqf tjBt+wyd`;Ewoa1S!V{8w;OP&&@eAQ(DI!Dv(<1-?002ovPDHLkV1iO2_eTH# literal 0 HcmV?d00001 From beafcc7853573d7b95c04736e4e12ec8953a3c56 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 29 Nov 2020 16:06:03 +0100 Subject: [PATCH 041/297] Fix warning --- htdocs/core/modules/expedition/doc/pdf_rouget.modules.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php index c9a8ee3b602..8b0dd134d65 100644 --- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php @@ -712,8 +712,8 @@ class pdf_rouget extends ModelePdfExpedition if ($totalWeight != '') $totalWeighttoshow = showDimensionInBestUnit($totalWeight, 0, "weight", $outputlangs); if ($totalVolume != '') $totalVolumetoshow = showDimensionInBestUnit($totalVolume, 0, "volume", $outputlangs); - if ($object->trueWeight) $totalWeighttoshow = showDimensionInBestUnit($object->trueWeight, $object->weight_units, "weight", $outputlangs); - if ($object->trueVolume) $totalVolumetoshow = showDimensionInBestUnit($object->trueVolume, $object->volume_units, "volume", $outputlangs); + if (!empty($object->trueWeight)) $totalWeighttoshow = showDimensionInBestUnit($object->trueWeight, $object->weight_units, "weight", $outputlangs); + if (!empty($object->trueVolume)) $totalVolumetoshow = showDimensionInBestUnit($object->trueVolume, $object->volume_units, "volume", $outputlangs); $pdf->SetFillColor(255, 255, 255); $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index); From c963624f250b04154f6774315431de3b81a0f5e4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 29 Nov 2020 18:53:19 +0100 Subject: [PATCH 042/297] css --- htdocs/theme/eldy/global.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 86be13bab1f..e576b379a6c 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -1965,8 +1965,8 @@ div.statusrefbis { } img.photoref, div.photoref { /* border: 1px solid #DDD; */ - -webkit-box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2); - box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2); + -webkit-box-shadow: 1px 1px 8px rgba(0, 0, 0, 0.2); + box-shadow: 1px 1px 8px rgba(0, 0, 0, 0.2); padding: 4px; height: 80px; width: 80px; From 66381a4f4d035786dfdd0b92a8fdff09adb3653c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 29 Nov 2020 19:41:11 +0100 Subject: [PATCH 043/297] FIX #15558 --- htdocs/core/actions_extrafields.inc.php | 67 ++++++++++++++++++------- htdocs/langs/en_US/errors.lang | 2 + 2 files changed, 52 insertions(+), 17 deletions(-) diff --git a/htdocs/core/actions_extrafields.inc.php b/htdocs/core/actions_extrafields.inc.php index 9ad3ce1e92e..1557d156f03 100644 --- a/htdocs/core/actions_extrafields.inc.php +++ b/htdocs/core/actions_extrafields.inc.php @@ -40,7 +40,7 @@ if ($type == 'select') $extrasize = ''; // Add attribute if ($action == 'add') { - if ($_POST["button"] != $langs->trans("Cancel")) + if (GETPOST("button") != $langs->trans("Cancel")) { // Check values if (!$type) @@ -132,10 +132,28 @@ if ($action == 'add') } } - if (!$error) - { + if (!$error) { + if (strlen(GETPOST('attrname', 'aZ09')) < 3) { + $error++; + $langs->load("errors"); + $mesg[] = $langs->trans("ErrorValueLength", $langs->transnoentitiesnoconv("AttributeCode"), 3); + $action = 'create'; + } + } + + // Check reserved keyword with more than 3 characters + if (!$error) { + if (in_array(GETPOST('attrname', 'aZ09'), array('and', 'keyword', 'table', 'index', 'integer', 'float', 'double', 'position'))) { + $error++; + $langs->load("errors"); + $mesg[] = $langs->trans("ErrorReservedKeyword", GETPOST('attrname', 'aZ09')); + $action = 'create'; + } + } + + if (!$error) { // attrname must be alphabetical and lower case only - if (isset($_POST["attrname"]) && preg_match("/^[a-z0-9-_]+$/", $_POST['attrname']) && !is_numeric($_POST["attrname"])) + if (GETPOSISSET("attrname") && preg_match("/^[a-z0-9-_]+$/", GETPOST('attrname', 'aZ09')) && !is_numeric(GETPOST('attrname', 'aZ09'))) { // Construct array for parameter (value of select list) $default_value = GETPOST('default_value', 'alpha'); @@ -161,7 +179,7 @@ if ($action == 'add') if ($type == 'separate') $visibility = 3; $result = $extrafields->addExtraField( - GETPOST('attrname', 'alpha'), + GETPOST('attrname', 'aZ09'), GETPOST('label', 'alpha'), $type, GETPOST('pos', 'int'), @@ -208,7 +226,7 @@ if ($action == 'add') // Rename field if ($action == 'update') { - if ($_POST["button"] != $langs->trans("Cancel")) + if (GETPOST("button") != $langs->trans("Cancel")) { // Check values if (!$type) @@ -293,9 +311,28 @@ if ($action == 'update') } } + if (!$error) { + if (strlen(GETPOST('attrname', 'aZ09')) < 3 && empty($conf->global->MAIN_DISABLE_EXTRAFIELDS_CHECK_FOR_UPDATE)) { + $error++; + $langs->load("errors"); + $mesg[] = $langs->trans("ErrorValueLength", $langs->transnoentitiesnoconv("AttributeCode"), 3); + $action = 'edit'; + } + } + + // Check reserved keyword with more than 3 characters + if (!$error) { + if (in_array(GETPOST('attrname', 'aZ09'), array('and', 'keyword', 'table', 'index', 'integer', 'float', 'double', 'position')) && empty($conf->global->MAIN_DISABLE_EXTRAFIELDS_CHECK_FOR_UPDATE)) { + $error++; + $langs->load("errors"); + $mesg[] = $langs->trans("ErrorReservedKeyword", GETPOST('attrname', 'aZ09')); + $action = 'edit'; + } + } + if (!$error) { - if (isset($_POST["attrname"]) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $_POST['attrname'])) + if (GETPOSTISSET("attrname") && preg_match("/^\w[a-zA-Z0-9-_]*$/", GETPOST('attrname', 'aZ09')) && !is_numeric(GETPOST('attrname', 'aZ09'))) { $pos = GETPOST('pos', 'int'); // Construct array for parameter (value of select list) @@ -321,7 +358,7 @@ if ($action == 'update') if ($type == 'separate') $visibility = 3; $result = $extrafields->update( - GETPOST('attrname', 'alpha'), + GETPOST('attrname', 'aZ09'), GETPOST('label', 'alpha'), $type, $extrasize, @@ -342,8 +379,7 @@ if ($action == 'update') (GETPOST('totalizable', 'alpha') ? 1 : 0), GETPOST('printable', 'alpha') ); - if ($result > 0) - { + if ($result > 0) { setEventMessages($langs->trans('SetupSaved'), null, 'mesgs'); header("Location: ".$_SERVER["PHP_SELF"]); exit; @@ -365,13 +401,10 @@ if ($action == 'update') } // Delete attribute -if ($action == 'delete') -{ - if (isset($_GET["attrname"]) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $_GET["attrname"])) - { - $result = $extrafields->delete($_GET["attrname"], $elementtype); - if ($result >= 0) - { +if ($action == 'delete') { + if (GETPOSTISSET("attrname") && preg_match("/^\w[a-zA-Z0-9-_]*$/", GETPOST("attrname", 'aZ09'))) { + $result = $extrafields->delete(GETPOST("attrname", 'aZ09'), $elementtype); + if ($result >= 0) { header("Location: ".$_SERVER["PHP_SELF"]); exit; } else $mesg = $extrafields->error; diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang index 700a76e32a5..b13a229f10d 100644 --- a/htdocs/langs/en_US/errors.lang +++ b/htdocs/langs/en_US/errors.lang @@ -246,6 +246,8 @@ ErrorProductDoesNotNeedBatchNumber=Error, product '%s' does not accept a ErrorFailedToReadObject=Error, failed to read object of type %s ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter %s must be enabled into conf/conf.php to allow use of Command Line Interface by the internal job scheduler ErrorLoginDateValidity=Error, this login is outside the validity date range +ErrorValueLength=Length of field '%s' must be higher than '%s' +ErrorReservedKeyword=The word '%s' is a reserved keyword # Warnings WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup. WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user. From d3a2aa664fb5f67c76f5afddc4c9b7d34dca4f56 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 29 Nov 2020 20:27:40 +0100 Subject: [PATCH 044/297] FIX #15572 --- htdocs/comm/propal/stats/index.php | 6 +++--- htdocs/commande/card.php | 15 ++------------- htdocs/commande/stats/index.php | 8 ++++---- htdocs/compta/facture/stats/index.php | 4 ++-- htdocs/core/lib/functions.lib.php | 1 + htdocs/expensereport/stats/index.php | 8 ++++---- htdocs/fichinter/stats/index.php | 4 ++-- htdocs/ticket/stats/index.php | 6 +++--- test/phpunit/FunctionsLibTest.php | 6 ++++-- 9 files changed, 25 insertions(+), 33 deletions(-) diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php index add31f13f08..da3c24f6f01 100644 --- a/htdocs/comm/propal/stats/index.php +++ b/htdocs/comm/propal/stats/index.php @@ -37,11 +37,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; $WIDTH = DolGraph::getDefaultGraphSizeForStats('width'); $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height'); -$mode = GETPOST("mode") ?GETPOST("mode") : 'customer'; +$mode = GETPOSTISSET("mode") ? GETPOST("mode", 'aZ09') : 'customer'; if ($mode == 'customer' && !$user->rights->propale->lire) accessforbidden(); if ($mode == 'supplier' && !$user->rights->supplier_proposal->lire) accessforbidden(); -$object_status = GETPOST('object_status'); +$object_status = GETPOST('object_status', 'intcomma'); $typent_id = GETPOST('typent_id', 'int'); $categ_id = GETPOST('categ_id', 'categ_id'); @@ -55,7 +55,7 @@ if ($user->socid > 0) } $nowyear = strftime("%Y", dol_now()); -$year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear; +$year = GETPOST('year') > 0 ? GETPOST('year', 'int') : $nowyear; //$startyear=$year-2; $startyear = $year - 1; $endyear = $year; diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 4175509eb28..8ba4620b108 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -460,26 +460,15 @@ if (empty($reshook)) if (!$error) { $object_id = $object->create($user); - - // If some invoice's lines already known - $NBLINES = 8; - for ($i = 1; $i <= $NBLINES; $i++) { - if ($_POST['idprod'.$i]) { - $xid = 'idprod'.$i; - $xqty = 'qty'.$i; - $xremise = 'remise_percent'.$i; - $object->add_product($_POST[$xid], $_POST[$xqty], $_POST[$xremise]); - } - } } } // Insert default contacts if defined if ($object_id > 0) { - if (GETPOST('contactid')) + if (GETPOST('contactid', 'int')) { - $result = $object->add_contact(GETPOST('contactid'), 'CUSTOMER', 'external'); + $result = $object->add_contact(GETPOST('contactid', 'int'), 'CUSTOMER', 'external'); if ($result < 0) { setEventMessages($langs->trans("ErrorFailedToAddContact"), null, 'errors'); $error++; diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php index 4e7ed481882..d89559af113 100644 --- a/htdocs/commande/stats/index.php +++ b/htdocs/commande/stats/index.php @@ -38,11 +38,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php'; $WIDTH = DolGraph::getDefaultGraphSizeForStats('width'); $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height'); -$mode = GETPOST("mode") ?GETPOST("mode") : 'customer'; +$mode = GETPOSTISSET("mode") ? GETPOST("mode", 'aZ09') : 'customer'; if ($mode == 'customer' && !$user->rights->commande->lire) accessforbidden(); if ($mode == 'supplier' && !$user->rights->fournisseur->commande->lire) accessforbidden(); -$object_status = GETPOST('object_status'); +$object_status = GETPOST('object_status', 'intcomma'); $typent_id = GETPOST('typent_id', 'int'); $categ_id = GETPOST('categ_id', 'categ_id'); @@ -308,11 +308,11 @@ if ($mode == 'customer') Commande::STATUS_CLOSED=>$langs->trans("StatusOrderDelivered"), Commande::STATUS_CANCELED=>$langs->trans("StatusOrderCanceled") ); - print $form->selectarray('object_status', $liststatus, GETPOST('object_status', 'int'), -4); + print $form->selectarray('object_status', $liststatus, GETPOST('object_status', 'intcomma'), -4); } if ($mode == 'supplier') { - $formorder->selectSupplierOrderStatus((strstr($object_status, ',') ?-1 : $object_status), 0, 'object_status'); + $formorder->selectSupplierOrderStatus((strstr($object_status, ',') ? -1 : $object_status), 0, 'object_status'); } print ''; // Year diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php index 284186b73ce..49f9be88ac6 100644 --- a/htdocs/compta/facture/stats/index.php +++ b/htdocs/compta/facture/stats/index.php @@ -44,7 +44,7 @@ $mode = GETPOST("mode") ?GETPOST("mode") : 'customer'; if ($mode == 'customer' && !$user->rights->facture->lire) accessforbidden(); if ($mode == 'supplier' && !$user->rights->fournisseur->facture->lire) accessforbidden(); -$object_status = GETPOST('object_status'); +$object_status = GETPOST('object_status', 'intcomma'); $typent_id = GETPOST('typent_id', 'int'); $categ_id = GETPOST('categ_id', 'categ_id'); @@ -59,7 +59,7 @@ if ($user->socid > 0) } $nowyear = strftime("%Y", dol_now()); -$year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear; +$year = GETPOST('year') > 0 ? GETPOST('year', 'int') : $nowyear; if(!empty($conf->global->INVOICE_STATS_GRAPHS_SHOW_2_YEARS)) $startyear=$year-2; else $startyear=$year-1; $endyear = $year; diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 24ec5645ffd..02a78b87c92 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -4723,6 +4723,7 @@ function price2num($amount, $rounding = '', $option = 0) // Convert value to universal number format (no thousand separator, '.' as decimal separator) if ($option != 1) { // If not a PHP number or unknown, we change or clean format //print 'PP'.$amount.' - '.$dec.' - '.$thousand.' - '.intval($amount).'
'; + $amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>\-]/', '', $amount); if ($option == 2 && $thousand == '.' && preg_match('/\.(\d\d\d)$/', (string) $amount)) { // It means the . is used as a thousand separator and string come frominput data, so 1.123 is 1123 $amount = str_replace($thousand, '', $amount); diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php index 3b931bd4418..5a781942095 100644 --- a/htdocs/expensereport/stats/index.php +++ b/htdocs/expensereport/stats/index.php @@ -34,8 +34,8 @@ $langs->loadLangs(array('trips', 'companies')); $WIDTH = DolGraph::getDefaultGraphSizeForStats('width'); $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height'); -$mode = GETPOST("mode") ?GETPOST("mode") : 'customer'; -$object_status = GETPOST('object_status'); +$mode = GETPOSTISSET("mode") ? GETPOST("mode", 'aZ09') : 'customer'; +$object_status = GETPOST('object_status', 'intcomma'); $userid = GETPOST('userid', 'int'); $socid = GETPOST('socid', 'int'); if ($socid < 0) $socid = 0; @@ -51,7 +51,7 @@ if ($user->socid) $socid = $user->socid; $result = restrictedArea($user, 'expensereport', $id, ''); $nowyear = strftime("%Y", dol_now()); -$year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear; +$year = GETPOST('year') > 0 ? GETPOST('year', 'int') : $nowyear; //$startyear=$year-2; $startyear = $year - 1; $endyear = $year; @@ -231,7 +231,7 @@ print ''; // Status print ''.$langs->trans("Status").''; $liststatus = $tmpexpensereport->statuts; -print $form->selectarray('object_status', $liststatus, GETPOST('object_status', 'int'), -4, 0, 0, '', 1); +print $form->selectarray('object_status', $liststatus, GETPOST('object_status', 'intcomma'), -4, 0, 0, '', 1); print ''; // Year print ''; diff --git a/htdocs/fichinter/stats/index.php b/htdocs/fichinter/stats/index.php index 0ca948312c6..8e385ebb5d7 100644 --- a/htdocs/fichinter/stats/index.php +++ b/htdocs/fichinter/stats/index.php @@ -42,12 +42,12 @@ if ($user->socid > 0) } $nowyear = strftime("%Y", dol_now()); -$year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear; +$year = GETPOST('year') > 0 ? GETPOST('year', 'int') : $nowyear; //$startyear=$year-2; $startyear = $year - 1; $endyear = $year; -$object_status = GETPOST('object_status'); +$object_status = GETPOST('object_status', 'intcomma'); // Load translation files required by the page $langs->loadLangs(array('interventions', 'companies', 'other', 'suppliers')); diff --git a/htdocs/ticket/stats/index.php b/htdocs/ticket/stats/index.php index b39ba0fd366..e48c0147fad 100644 --- a/htdocs/ticket/stats/index.php +++ b/htdocs/ticket/stats/index.php @@ -32,7 +32,7 @@ $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height'); if (!$user->rights->ticket->read) accessforbidden(); -$object_status = GETPOST('object_status'); +$object_status = GETPOST('object_status', 'intcomma'); $userid = GETPOST('userid', 'int'); $socid = GETPOST('socid', 'int'); @@ -44,7 +44,7 @@ if ($user->socid > 0) } $nowyear = strftime("%Y", dol_now()); -$year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear; +$year = GETPOST('year') > 0 ? GETPOST('year', 'int') : $nowyear; //$startyear=$year-2; $startyear = $year - 1; $endyear = $year; @@ -241,7 +241,7 @@ print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0 // Status print ''.$langs->trans("Status").''; $liststatus = $object->fields['fk_statut']['arrayofkeyval']; -print $form->selectarray('object_status', $liststatus, GETPOST('object_status', 'int'), -4, 0, 0, '', 1); +print $form->selectarray('object_status', $liststatus, GETPOST('object_status', 'intcomma'), -4, 0, 0, '', 1); print ''; // Year print ''.$langs->trans("Year").''; diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php index a987f28c7ed..3d098131f21 100644 --- a/test/phpunit/FunctionsLibTest.php +++ b/test/phpunit/FunctionsLibTest.php @@ -1234,7 +1234,9 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase $newlangs->load("main"); $langs = $newlangs; - $this->assertEquals(1000, price2num('1 000.0')); + $this->assertEquals(150, price2num('(SELECT/**/CASE/**/WHEN/**/(0<1)/**/THEN/**/SLEEP(5)/**/ELSE/**/SLEEP(0)/**/END)')); + + $this->assertEquals(1000, price2num('1 000.0')); $this->assertEquals(1000, price2num('1 000', 'MT')); $this->assertEquals(1000, price2num('1 000', 'MU')); @@ -1252,7 +1254,7 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase // Text can't be converted $this->assertEquals('12.4$', price2num('12.4$')); - $this->assertEquals('12r.4$', price2num('12r.4$')); + $this->assertEquals('12.4$', price2num('12r.4$')); // For spanish language $newlangs2 = new Translate('', $conf); From d45fe6c17f6c93333aa3caf47056f9d01bcdec07 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 29 Nov 2020 20:39:11 +0100 Subject: [PATCH 045/297] FIx #15551 --- htdocs/install/mysql/migration/11.0.0-12.0.0.sql | 3 +++ 1 file changed, 3 insertions(+) diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql index 994e5d89495..a7cb8a4729f 100644 --- a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql +++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql @@ -335,3 +335,6 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (72 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active) values (722, 72, '18','0', '0.9', '1', 'VAT Rate 18+0.9', 1); ALTER TABLE llx_expedition ADD COLUMN billed smallint DEFAULT 0; + +-- VMYSQL4.3 ALTER TABLE llx_mrp_mo MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP; + From 6a8ddacb33a49403a7b1dd9f6abe3e3362555623 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 29 Nov 2020 21:01:57 +0100 Subject: [PATCH 046/297] Prepare database to allow to disconnect other session after a password change --- htdocs/install/mysql/tables/llx_user.sql | 2 +- htdocs/user/class/user.class.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql index e12b4e3c24e..8aa0d381e26 100644 --- a/htdocs/install/mysql/tables/llx_user.sql +++ b/htdocs/install/mysql/tables/llx_user.sql @@ -80,7 +80,7 @@ create table llx_user model_pdf varchar(255) DEFAULT NULL, datelastlogin datetime, datepreviouslogin datetime, - datelastpassvalidation datetime, + datelastpassvalidation datetime, -- last date we change password or we made a disconnect all datestartvalidity datetime, dateendvalidity datetime, iplastlogin varchar(250), diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 41e1d55ea7c..7a40af26ac0 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -412,6 +412,7 @@ class User extends CommonObject $sql .= " u.tms as datem,"; $sql .= " u.datelastlogin as datel,"; $sql .= " u.datepreviouslogin as datep,"; + $sql .= " u.datelastpassvalidation,"; $sql .= " u.datestartvalidity,"; $sql .= " u.dateendvalidity,"; $sql .= " u.photo as photo,"; From 58eaef37d28c3f6fa1578d301a6e6c68434d7756 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 29 Nov 2020 21:29:22 +0100 Subject: [PATCH 047/297] Fix regression --- htdocs/core/lib/functions.lib.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 02a78b87c92..2a9052d0916 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -4723,7 +4723,9 @@ function price2num($amount, $rounding = '', $option = 0) // Convert value to universal number format (no thousand separator, '.' as decimal separator) if ($option != 1) { // If not a PHP number or unknown, we change or clean format //print 'PP'.$amount.' - '.$dec.' - '.$thousand.' - '.intval($amount).'
'; - $amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>\-]/', '', $amount); + if (!is_numeric($amount)) { + $amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>\-]/', '', $amount); + } if ($option == 2 && $thousand == '.' && preg_match('/\.(\d\d\d)$/', (string) $amount)) { // It means the . is used as a thousand separator and string come frominput data, so 1.123 is 1123 $amount = str_replace($thousand, '', $amount); From 0046bfc53fd910ea7002eb65c4cc0fac76d710f1 Mon Sep 17 00:00:00 2001 From: Stephane Lesage Date: Sun, 29 Nov 2020 23:42:47 +0100 Subject: [PATCH 048/297] Fix Users list filter by gender --- htdocs/user/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/user/list.php b/htdocs/user/list.php index ef6e205fd0d..1f59656dcbd 100644 --- a/htdocs/user/list.php +++ b/htdocs/user/list.php @@ -231,7 +231,7 @@ if ($search_thirdparty != '') $sql .= natural_search(array('s.nom'), $search_thi if ($search_login != '') $sql .= natural_search("u.login", $search_login); if ($search_lastname != '') $sql .= natural_search("u.lastname", $search_lastname); if ($search_firstname != '') $sql .= natural_search("u.firstname", $search_firstname); -if ($search_gender != '' && $search_gender != '-1') $sql .= " AND u.gender = '".$search_gender."'"; +if ($search_gender != '' && $search_gender != '-1') $sql .= " AND u.gender = '".$db->escape($search_gender)."'"; // Cannot use natural_search as looking for %man% also includes woman if (is_numeric($search_employee) && $search_employee >= 0) { $sql .= ' AND u.employee = '.(int) $search_employee; } From b6ccfaf180c720cd2b44eb7ff416cb6cf2a6bf0d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 30 Nov 2020 07:50:14 +0100 Subject: [PATCH 049/297] css --- htdocs/core/lib/functions.lib.php | 6 ++++++ htdocs/website/index.php | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index f0d6ff9a53c..3ac22dd7e32 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -1273,6 +1273,12 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename = */ function dolButtonToOpenUrlInDialogPopup($name, $label, $buttonstring, $url, $disabled = '') { + if (strpos($url, '?') > 0) { + $url .= '&dol_hide_topmenu=1&dol_hide_leftmenu=1&dol_openinpopup=1'; + } else { + $url .= '?dol_hide_menuinpopup=1&dol_hide_leftmenu=1&dol_openinpopup=1'; + } + //print ''; $out = ''.$buttonstring.''; $out .= ' - -
- -
- -
- -

trans('TooMuchCombinationsWarning', $langs->transnoentitiesnoconv('DoNotRemovePreviousCombinations')) ?>

- > -
- > - -
-
- - trans('ProductCombinationGeneratorWarning') ?> -
-
- -
- -
- -
- -
-
- - - -

- - - -
- -
- - - close(); From 379bca0b61437262a61932f8af9f94a4ff924494 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 30 Nov 2020 13:18:23 +0100 Subject: [PATCH 065/297] Clean code --- htdocs/langs/en_US/admin.lang | 1 + htdocs/projet/tasks/contact.php | 12 +- htdocs/variants/admin/admin.php | 42 +++-- htdocs/variants/card.php | 2 +- htdocs/variants/combinations.php | 306 +++++++++++++++---------------- htdocs/variants/create.php | 3 +- 6 files changed, 189 insertions(+), 177 deletions(-) diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 235ffcd304c..1445de07d24 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -2083,3 +2083,4 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country) YouMayFindSecurityAdviceHere=You may find security advisory here ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it. ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment. +CombinationsSeparator=Separator character for product combinations \ No newline at end of file diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php index 9c71a6f7042..3f44422f158 100644 --- a/htdocs/projet/tasks/contact.php +++ b/htdocs/projet/tasks/contact.php @@ -80,13 +80,11 @@ if ($action == 'addcontact' && $user->rights->projet->creer) } } - if ($result >= 0) - { + if ($result >= 0) { header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id.($withproject ? '&withproject=1' : '')); exit; - } else {$nbofcontacts - if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') - { + } else { + if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') { $langs->load("errors"); setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors'); } else { @@ -98,8 +96,7 @@ if ($action == 'addcontact' && $user->rights->projet->creer) // bascule du statut d'un contact if ($action == 'swapstatut' && $user->rights->projet->creer) { - if ($object->fetch($id, $ref)) - { + if ($object->fetch($id, $ref)) { $result = $object->swapContactStatus(GETPOST('ligne')); } else { dol_print_error($db); @@ -408,7 +405,6 @@ if ($id > 0 || !empty($ref)) print ''; if ($withproject) print ''; - print ''; print ''; diff --git a/htdocs/variants/admin/admin.php b/htdocs/variants/admin/admin.php index 7e5683e710b..64209076916 100644 --- a/htdocs/variants/admin/admin.php +++ b/htdocs/variants/admin/admin.php @@ -22,44 +22,57 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; $langs->loadLangs(array("admin", "products")); +$action = GETPOST('action', 'alphanohtml'); + // Security check if (!$user->admin || (empty($conf->product->enabled) && empty($conf->service->enabled))) accessforbidden(); -if ($_POST) { +$error = 0; + + +/* + * Actions + */ + +if ($action) { $value = GETPOST('PRODUIT_ATTRIBUTES_HIDECHILD'); - if (dolibarr_set_const($db, 'PRODUIT_ATTRIBUTES_HIDECHILD', $value, 'chaine', 0, '', $conf->entity)) { - setEventMessages($langs->trans('RecordSaved'), null, 'mesgs'); - } else { + if (!dolibarr_set_const($db, 'PRODUIT_ATTRIBUTES_HIDECHILD', $value, 'chaine', 0, '', $conf->entity)) { setEventMessages($langs->trans('CoreErrorMessage'), null, 'errors'); + $error++; } - if (dolibarr_set_const($db, 'PRODUIT_ATTRIBUTES_SEPARATOR', GETPOST('PRODUIT_ATTRIBUTES_SEPARATOR'), 'chaine', 0, '', $conf->entity)) { - setEventMessages($langs->trans('RecordSaved'), null, 'mesgs'); - } else { + if (!dolibarr_set_const($db, 'PRODUIT_ATTRIBUTES_SEPARATOR', GETPOST('PRODUIT_ATTRIBUTES_SEPARATOR'), 'chaine', 0, '', $conf->entity)) { setEventMessages($langs->trans('CoreErrorMessage'), null, 'errors'); + $error++; + } + + if (!$error) { + setEventMessages($langs->trans('RecordSaved'), null, 'mesgs'); } } -$title = $langs->trans('ModuleSetup').' '.$langs->trans('ProductAttributes'); +$title = $langs->trans('ModuleSetup').' '.$langs->trans('Module610Name'); llxHeader('', $title); $linkback = ''.$langs->trans("BackToModuleList").''; print load_fiche_titre($title, $linkback, 'title_setup'); -print dol_get_fiche_head(array(), 'general', $tab, 0, 'product'); - print '
'; print ''; +print ''; print ''; + print ''; -print ''."\n"; +print ''."\n"; +print ''."\n"; +print ''."\n"; + print ''; + print ''; if (isset($conf->global->PRODUIT_ATTRIBUTES_SEPARATOR)) { $separator = $conf->global->PRODUIT_ATTRIBUTES_SEPARATOR; @@ -67,8 +80,11 @@ if (isset($conf->global->PRODUIT_ATTRIBUTES_SEPARATOR)) { $separator = "_"; } print ''; + print '
'.$langs->trans("Parameters").''."\n"; -print ''.$langs->trans("Value").''."\n"; -print ' 
'.$langs->trans("Parameters").''.$langs->trans("Value").'
'.$langs->trans('HideProductCombinations').''; print $form->selectyesno("PRODUIT_ATTRIBUTES_HIDECHILD", $conf->global->PRODUIT_ATTRIBUTES_HIDECHILD, 1).'
'.$langs->trans('CombinationsSeparator').'
'; + print '
'; + print '
'; // End of page diff --git a/htdocs/variants/card.php b/htdocs/variants/card.php index 057e184d184..6cda745056a 100644 --- a/htdocs/variants/card.php +++ b/htdocs/variants/card.php @@ -43,7 +43,7 @@ if ($object->fetch($id) < 1) { if ($cancel) $action = ''; -if ($_POST) { +if ($action) { if ($action == 'edit') { $object->ref = $ref; $object->label = $label; diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php index f690ec8e3f6..3a2936d0df5 100644 --- a/htdocs/variants/combinations.php +++ b/htdocs/variants/combinations.php @@ -72,7 +72,7 @@ $selectedvariant = $_SESSION['addvariant_'.$object->id]; if ($cancel) { $action = ''; - $massactions = ''; + $massaction = ''; unset($_SESSION['addvariant_'.$object->id]); } @@ -101,179 +101,177 @@ $prodcomb2val = new ProductCombination2ValuePair($db); $productCombination2ValuePairs1 = array(); -if ($_POST) { - if (($action == 'add' || $action == 'create') && empty($massaction) && !GETPOST('selectvariant', 'alpha')) // We click on Create all defined combinations - { - //$features = GETPOST('features', 'array'); - $features = $_SESSION['addvariant_'.$object->id]; +if (($action == 'add' || $action == 'create') && empty($massaction) && !GETPOST('selectvariant', 'alpha')) // We click on Create all defined combinations +{ + //$features = GETPOST('features', 'array'); + $features = $_SESSION['addvariant_'.$object->id]; - if (!$features) { - setEventMessages($langs->trans('ErrorFieldsRequired'), null, 'errors'); - } else { - $reference = trim($reference); - if (empty($reference)) { - $reference = false; - } - $weight_impact = price2num($weight_impact); - $price_impact = price2num($price_impact); - - // for conf PRODUIT_MULTIPRICES - if ($conf->global->PRODUIT_MULTIPRICES) { - $level_price_impact = array_map('price2num', $level_price_impact); - } - else { - $level_price_impact = array(1 => $price_impact); - $level_price_impact_percent = array(1 => $price_impact_percent); - } - - $sanit_features = array(); - - //First, sanitize - foreach ($features as $feature) { - $explode = explode(':', $feature); - - if ($prodattr->fetch($explode[0]) < 0) { - continue; - } - - if ($prodattr_val->fetch($explode[1]) < 0) { - continue; - } - - // Valuepair - $sanit_features[$explode[0]] = $explode[1]; - - $tmp = new ProductCombination2ValuePair($db); - $tmp->fk_prod_attr = $explode[0]; - $tmp->fk_prod_attr_val = $explode[1]; - - $productCombination2ValuePairs1[] = $tmp; - } - - $db->begin(); - - // sanit_feature is an array with 1 (and only 1) value per attribute. - // For example: Color->blue, Size->Small, Option->2 - //var_dump($sanit_features); - if (!$prodcomb->fetchByProductCombination2ValuePairs($id, $sanit_features)) - { - $result = $prodcomb->createProductCombination($user, $object, $sanit_features, array(), $level_price_impact_percent, $level_price_impact, $weight_impact, $reference); - if ($result > 0) - { - setEventMessages($langs->trans('RecordSaved'), null, 'mesgs'); - unset($_SESSION['addvariant_'.$object->id]); - - $db->commit(); - header('Location: '.dol_buildpath('/variants/combinations.php?id='.$id, 2)); - exit(); - } else { - $langs->load("errors"); - setEventMessages($prodcomb->error, $prodcomb->errors, 'errors'); - } - } else { - setEventMessages($langs->trans('ErrorRecordAlreadyExists'), null, 'errors'); - } - - $db->rollback(); + if (!$features) { + setEventMessages($langs->trans('ErrorFieldsRequired'), null, 'errors'); + } else { + $reference = trim($reference); + if (empty($reference)) { + $reference = false; } - } elseif (!empty($massaction)) - { - $bulkaction = $massaction; - $error = 0; - - - - $db->begin(); - - foreach ($toselect as $prodid) { - // need create new of Product to prevent rename dir behavior - $prodstatic = new Product($db); - - if ($prodstatic->fetch($prodid) < 0) { - continue; - } - - if ($bulkaction == 'on_sell') { - $prodstatic->status = 1; - $res = $prodstatic->update($prodstatic->id, $user); - } elseif ($bulkaction == 'on_buy') { - $prodstatic->status_buy = 1; - $res = $prodstatic->update($prodstatic->id, $user); - } elseif ($bulkaction == 'not_sell') { - $prodstatic->status = 0; - $res = $prodstatic->update($prodstatic->id, $user); - } elseif ($bulkaction == 'not_buy') { - $prodstatic->status_buy = 0; - $res = $prodstatic->update($prodstatic->id, $user); - } elseif ($bulkaction == 'delete') { - $res = $prodstatic->delete($user, $prodstatic->id); - } else { - break; - } - - if ($res <= 0) { - $error++; - break; - } - } - - if ($error) { - $db->rollback(); - - if ($prodstatic->error) { - setEventMessages($prodstatic->error, $prodstatic->errors, 'errors'); - } else { - setEventMessages($langs->trans('CoreErrorMessage'), null, 'errors'); - } - } else { - $db->commit(); - setEventMessages($langs->trans('RecordSaved'), null, 'mesgs'); - } - } elseif ($valueid > 0) { - if ($prodcomb->fetch($valueid) < 0) { - dol_print_error($db, $langs->trans('ErrorRecordNotFound')); - exit(); - } - - $prodcomb->variation_weight = $weight_impact; + $weight_impact = price2num($weight_impact); + $price_impact = price2num($price_impact); // for conf PRODUIT_MULTIPRICES if ($conf->global->PRODUIT_MULTIPRICES) { $level_price_impact = array_map('price2num', $level_price_impact); - - $prodcomb->variation_price = $level_price_impact[1]; - $prodcomb->variation_price_percentage = (bool) $level_price_impact_percent[1]; } else { $level_price_impact = array(1 => $price_impact); $level_price_impact_percent = array(1 => $price_impact_percent); - - $prodcomb->variation_price = $price_impact; - $prodcomb->variation_price_percentage = $price_impact_percent; } - if ($conf->global->PRODUIT_MULTIPRICES) { - $prodcomb->combination_price_levels = array(); - for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) { - $productCombinationLevel = new ProductCombinationLevel($db); - $productCombinationLevel->fk_product_attribute_combination = $prodcomb->id; - $productCombinationLevel->fk_price_level = $i; - $productCombinationLevel->variation_price = $level_price_impact[$i]; - $productCombinationLevel->variation_price_percentage = (bool) $level_price_impact_percent[$i]; - $prodcomb->combination_price_levels[$i] = $productCombinationLevel; + $sanit_features = array(); + + //First, sanitize + foreach ($features as $feature) { + $explode = explode(':', $feature); + + if ($prodattr->fetch($explode[0]) < 0) { + continue; } + + if ($prodattr_val->fetch($explode[1]) < 0) { + continue; + } + + // Valuepair + $sanit_features[$explode[0]] = $explode[1]; + + $tmp = new ProductCombination2ValuePair($db); + $tmp->fk_prod_attr = $explode[0]; + $tmp->fk_prod_attr_val = $explode[1]; + + $productCombination2ValuePairs1[] = $tmp; } - if ($prodcomb->update($user) > 0) { - setEventMessages($langs->trans('RecordSaved'), null, 'mesgs'); - header('Location: '.dol_buildpath('/variants/combinations.php?id='.$id, 2)); - exit(); + $db->begin(); + + // sanit_feature is an array with 1 (and only 1) value per attribute. + // For example: Color->blue, Size->Small, Option->2 + //var_dump($sanit_features); + if (!$prodcomb->fetchByProductCombination2ValuePairs($id, $sanit_features)) + { + $result = $prodcomb->createProductCombination($user, $object, $sanit_features, array(), $level_price_impact_percent, $level_price_impact, $weight_impact, $reference); + if ($result > 0) + { + setEventMessages($langs->trans('RecordSaved'), null, 'mesgs'); + unset($_SESSION['addvariant_'.$object->id]); + + $db->commit(); + header('Location: '.dol_buildpath('/variants/combinations.php?id='.$id, 2)); + exit(); + } else { + $langs->load("errors"); + setEventMessages($prodcomb->error, $prodcomb->errors, 'errors'); + } } else { - setEventMessages($prodcomb->error, $prodcomb->errors, 'errors'); + setEventMessages($langs->trans('ErrorRecordAlreadyExists'), null, 'errors'); + } + + $db->rollback(); + } +} elseif (!empty($massaction)) { + $bulkaction = $massaction; + $error = 0; + + + + $db->begin(); + + foreach ($toselect as $prodid) { + // need create new of Product to prevent rename dir behavior + $prodstatic = new Product($db); + + if ($prodstatic->fetch($prodid) < 0) { + continue; + } + + if ($bulkaction == 'on_sell') { + $prodstatic->status = 1; + $res = $prodstatic->update($prodstatic->id, $user); + } elseif ($bulkaction == 'on_buy') { + $prodstatic->status_buy = 1; + $res = $prodstatic->update($prodstatic->id, $user); + } elseif ($bulkaction == 'not_sell') { + $prodstatic->status = 0; + $res = $prodstatic->update($prodstatic->id, $user); + } elseif ($bulkaction == 'not_buy') { + $prodstatic->status_buy = 0; + $res = $prodstatic->update($prodstatic->id, $user); + } elseif ($bulkaction == 'delete') { + $res = $prodstatic->delete($user, $prodstatic->id); + } else { + break; + } + + if ($res <= 0) { + $error++; + break; } } + + if ($error) { + $db->rollback(); + + if ($prodstatic->error) { + setEventMessages($prodstatic->error, $prodstatic->errors, 'errors'); + } else { + setEventMessages($langs->trans('CoreErrorMessage'), null, 'errors'); + } + } else { + $db->commit(); + setEventMessages($langs->trans('RecordSaved'), null, 'mesgs'); + } +} elseif ($valueid > 0) { + if ($prodcomb->fetch($valueid) < 0) { + dol_print_error($db, $langs->trans('ErrorRecordNotFound')); + exit(); + } + + $prodcomb->variation_weight = $weight_impact; + + // for conf PRODUIT_MULTIPRICES + if ($conf->global->PRODUIT_MULTIPRICES) { + $level_price_impact = array_map('price2num', $level_price_impact); + + $prodcomb->variation_price = $level_price_impact[1]; + $prodcomb->variation_price_percentage = (bool) $level_price_impact_percent[1]; + } + else { + $level_price_impact = array(1 => $price_impact); + $level_price_impact_percent = array(1 => $price_impact_percent); + + $prodcomb->variation_price = $price_impact; + $prodcomb->variation_price_percentage = $price_impact_percent; + } + + if ($conf->global->PRODUIT_MULTIPRICES) { + $prodcomb->combination_price_levels = array(); + for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) { + $productCombinationLevel = new ProductCombinationLevel($db); + $productCombinationLevel->fk_product_attribute_combination = $prodcomb->id; + $productCombinationLevel->fk_price_level = $i; + $productCombinationLevel->variation_price = $level_price_impact[$i]; + $productCombinationLevel->variation_price_percentage = (bool) $level_price_impact_percent[$i]; + $prodcomb->combination_price_levels[$i] = $productCombinationLevel; + } + } + + if ($prodcomb->update($user) > 0) { + setEventMessages($langs->trans('RecordSaved'), null, 'mesgs'); + header('Location: '.dol_buildpath('/variants/combinations.php?id='.$id, 2)); + exit(); + } else { + setEventMessages($prodcomb->error, $prodcomb->errors, 'errors'); + } } + // Reload variants $productCombinations = $prodcomb->fetchAllByFkProductParent($object->id); diff --git a/htdocs/variants/create.php b/htdocs/variants/create.php index ce00ac51a1a..84530e01cb5 100644 --- a/htdocs/variants/create.php +++ b/htdocs/variants/create.php @@ -22,13 +22,14 @@ require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php'; $ref = GETPOST('ref', 'alpha'); $label = GETPOST('label', 'alpha'); $backtopage = GETPOST('backtopage', 'alpha'); +$action = GETPOST('action', 'alpha'); /* * Actions */ -if ($_POST) { +if ($action == 'create') { if (empty($ref) || empty($label)) { setEventMessages($langs->trans('ErrorFieldsRequired'), null, 'errors'); } else { From fa8b960520881a31b75f3e57ad27178806bb8955 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 30 Nov 2020 13:22:48 +0100 Subject: [PATCH 066/297] Clean code --- htdocs/product/admin/price_rules.php | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/htdocs/product/admin/price_rules.php b/htdocs/product/admin/price_rules.php index 94d2a658ecd..5b5743a742b 100644 --- a/htdocs/product/admin/price_rules.php +++ b/htdocs/product/admin/price_rules.php @@ -26,15 +26,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; // Load translation files required by the page $langs->loadLangs(array('admin', 'products')); +$action = GETPOST('action', 'aZ09'); + // Security check if (!$user->admin || (empty($conf->product->enabled) && empty($conf->service->enabled))) accessforbidden(); + /** * Actions */ -if ($_POST) { +if ($action == 'update') { $var_percent = GETPOST('var_percent', 'array'); $var_min_percent = GETPOST('var_min_percent', 'array'); $fk_level = GETPOST('fk_level', 'array'); @@ -70,19 +73,19 @@ if ($_POST) { if (!$check1 || !$check2) { //If the level is between range but percent fields are empty, then we ensure it does not exist in DB if ($check1) { - $db->query("DELETE FROM ".MAIN_DB_PREFIX."product_pricerules WHERE level = ".(int) $i); + $db->query("DELETE FROM ".MAIN_DB_PREFIX."product_pricerules WHERE level = ".((int) $i)); } continue; } - $sql = "INSERT INTO ".MAIN_DB_PREFIX."product_pricerules (level, fk_level, var_percent, var_min_percent) VALUES ( - ".(int) $i.", ".$db->escape($i_fk_level).", ".$i_var_percent.", ".$i_var_min_percent.")"; + $sql = "INSERT INTO ".MAIN_DB_PREFIX."product_pricerules (level, fk_level, var_percent, var_min_percent) VALUES ("; + $sql .= ((int) $i).", ".$db->escape($i_fk_level).", ".$i_var_percent.", ".$i_var_min_percent.")"; if (!$db->query($sql)) { //If we could not create, then we try updating - $sql = "UPDATE ".MAIN_DB_PREFIX."product_pricerules - SET fk_level = ".$db->escape($i_fk_level).", var_percent = ".$i_var_percent.", var_min_percent = ".$i_var_min_percent." WHERE level = ".$i; + $sql = "UPDATE ".MAIN_DB_PREFIX."product_pricerules"; + $sql .= " SET fk_level = ".$db->escape($i_fk_level).", var_percent = ".$i_var_percent.", var_min_percent = ".$i_var_min_percent." WHERE level = ".$i; if (!$db->query($sql)) { setEventMessages($langs->trans('ErrorSavingChanges'), null, 'errors'); @@ -93,6 +96,7 @@ if ($_POST) { setEventMessages($langs->trans("RecordSaved"), null, 'mesgs'); } + /* * View */ @@ -124,8 +128,9 @@ $linkback = ''; +print '
'; +print ''; +print ''; $head = product_admin_prepare_head(); print dol_get_fiche_head($head, 'generator', $tab, 0, 'product'); From 6e9a3c05f43fcc651c175ac64e880817b638a27d Mon Sep 17 00:00:00 2001 From: lmarcouiller Date: Mon, 30 Nov 2020 13:52:02 +0100 Subject: [PATCH 067/297] =?UTF-8?q?Close=20:=20Encours=20d=C3=A9pass=C3=A9?= =?UTF-8?q?=20#15307?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/boxes/box_customers_outstanding_bill_reached.php | 7 +------ htdocs/langs/en_US/boxes.lang | 1 + 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php index 2baa02a912c..49b9de88d03 100644 --- a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php +++ b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php @@ -82,7 +82,7 @@ class box_customers_outstanding_bill_reached extends ModeleBoxes include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; $thirdpartystatic = new Societe($this->db); - $this->info_box_head = array('text' => "Last Cutomers Outstanding Bill Reached"); + $this->info_box_head = array('text' => $langs->trans("BoxTitleLastOutstandingBillReached", $max)); if ($user->rights->societe->lire) { @@ -144,11 +144,6 @@ class box_customers_outstanding_bill_reached extends ModeleBoxes 'asis' => 1, ); - $this->info_box_contents[$line][] = array( - 'td' => 'class="right"', - 'text' => dol_print_date($datem, "day") - ); - $this->info_box_contents[$line][] = array( 'td' => 'class="right" width="18"', 'text' => $thirdpartystatic->LibStatut($objp->status, 3) diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang index 14db79809bc..75f8eb14f49 100644 --- a/htdocs/langs/en_US/boxes.lang +++ b/htdocs/langs/en_US/boxes.lang @@ -46,6 +46,7 @@ BoxTitleLastModifiedDonations=Latest %s modified donations BoxTitleLastModifiedExpenses=Latest %s modified expense reports BoxTitleLatestModifiedBoms=Latest %s modified BOMs BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders +BoxTitleLastOutstandingBillReached=Latest %s customers with maximum outstanding exceeded BoxGlobalActivity=Global activity (invoices, proposals, orders) BoxGoodCustomers=Good customers BoxTitleGoodCustomers=%s Good customers From 595bb893bec7c18dbf05e2481e764f51dd6a6f61 Mon Sep 17 00:00:00 2001 From: lmarcouiller Date: Mon, 30 Nov 2020 14:01:56 +0100 Subject: [PATCH 068/297] =?UTF-8?q?Close=20:=20Encours=20d=C3=A9pass=C3=A9?= =?UTF-8?q?=20#15307?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/core/boxes/box_customers_outstanding_bill_reached.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php index 49b9de88d03..f83ed7a663e 100644 --- a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php +++ b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php @@ -136,8 +136,8 @@ class box_customers_outstanding_bill_reached extends ModeleBoxes $nboutstandingbillreachedcustomers = 0; - if ($outstandingtotal >= $outstandinglimit) { - + if ($outstandingtotal >= $outstandinglimit) + { $this->info_box_contents[$line][] = array( 'td' => '', 'text' => $thirdpartystatic->getNomUrl(1), From 00ad6df3951e919919e2d404250adb6444a1a538 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 30 Nov 2020 14:47:07 +0100 Subject: [PATCH 069/297] Fight against $_POST --- htdocs/accountancy/admin/accountmodel.php | 2 +- htdocs/accountancy/admin/card.php | 4 +-- htdocs/accountancy/admin/categories_list.php | 2 +- htdocs/accountancy/bookkeeping/list.php | 2 +- htdocs/adherents/card.php | 18 +++++------ htdocs/admin/boxes.php | 13 ++++---- htdocs/admin/delais.php | 2 +- htdocs/admin/dict.php | 6 ++-- htdocs/admin/mails.php | 14 ++++----- htdocs/admin/mails_emailing.php | 14 ++++----- htdocs/admin/mails_templates.php | 2 +- htdocs/admin/mails_ticket.php | 14 ++++----- htdocs/admin/proxy.php | 2 +- htdocs/admin/syslog.php | 11 +++---- htdocs/admin/system/phpinfo.php | 2 +- htdocs/comm/action/card.php | 8 ++--- htdocs/comm/action/index.php | 2 +- htdocs/comm/action/pertype.php | 8 ++--- htdocs/comm/action/peruser.php | 8 ++--- htdocs/compta/bank/bankentries_list.php | 15 +++++---- htdocs/compta/bank/card.php | 31 +++++++++---------- htdocs/compta/bank/line.php | 18 +++++------ htdocs/compta/facture/card.php | 2 +- htdocs/compta/paiement_charge.php | 8 ++--- htdocs/contact/card.php | 2 +- htdocs/core/class/html.formmail.class.php | 4 +-- htdocs/core/class/html.formsms.class.php | 2 +- htdocs/core/class/html.formticket.class.php | 4 +-- htdocs/core/lib/functions.lib.php | 18 +++++------ .../core/modules/mailings/pomme.modules.php | 8 ++--- .../modules/mailings/thirdparties.modules.php | 20 +++++------- htdocs/core/tpl/extrafields_view.tpl.php | 4 +-- htdocs/core/tpl/objectline_create.tpl.php | 20 ++++++------ htdocs/core/tpl/objectline_edit.tpl.php | 4 +-- htdocs/core/tpl/resource_add.tpl.php | 4 +-- htdocs/don/card.php | 8 ++--- htdocs/install/check.php | 4 +-- htdocs/install/inc.php | 4 +-- htdocs/install/repair.php | 2 +- htdocs/opensurvey/results.php | 8 +++-- htdocs/opensurvey/wizard/choix_date.php | 26 +++++++++------- htdocs/opensurvey/wizard/create_survey.php | 4 +-- htdocs/product/card.php | 12 +++---- htdocs/product/stock/massstockmove.php | 2 +- htdocs/product/stock/replenish.php | 4 +-- .../product/stock/tpl/stockcorrection.tpl.php | 2 +- .../product/stock/tpl/stocktransfer.tpl.php | 2 +- htdocs/projet/element.php | 3 +- htdocs/public/members/new.php | 2 +- htdocs/public/opensurvey/studs.php | 25 ++++++--------- htdocs/public/test/test_arrays.php | 4 +-- 51 files changed, 199 insertions(+), 211 deletions(-) diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php index 2bd2a84841e..6d621a7e101 100644 --- a/htdocs/accountancy/admin/accountmodel.php +++ b/htdocs/accountancy/admin/accountmodel.php @@ -187,7 +187,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) $msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'
'; }*/ } - if (isset($_POST["country"]) && ($_POST["country"] == '0') && ($id != 2)) + if (GETPOSTISSET("country") && (GETPOST("country") == '0') && ($id != 2)) { $ok = 0; setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities("Country")), null, 'errors'); diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php index cd17e5a1538..d1cee5ff59d 100644 --- a/htdocs/accountancy/admin/card.php +++ b/htdocs/accountancy/admin/card.php @@ -247,7 +247,7 @@ if ($action == 'create') { // Chart of accounts type print ''.$langs->trans("Pcgtype").''; print ''; - print ''; + print ''; print ''; print ''; @@ -309,7 +309,7 @@ if ($action == 'create') { // Chart of accounts type print ''.$langs->trans("Pcgtype").''; print ''; - print ''; + print ''; print ''; print ''; diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php index 2e51d3d1b38..53dfb1cd5f9 100644 --- a/htdocs/accountancy/admin/categories_list.php +++ b/htdocs/accountancy/admin/categories_list.php @@ -168,7 +168,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors'); } } - if (isset($_POST["code"])) + if (GETPOSTISSET("code")) { if ($_POST["code"] == '0') { diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php index 097eb38b47f..418dcc18f73 100644 --- a/htdocs/accountancy/bookkeeping/list.php +++ b/htdocs/accountancy/bookkeeping/list.php @@ -108,7 +108,7 @@ $hookmanager->initHooks(array('bookkeepinglist')); $formaccounting = new FormAccounting($db); $form = new Form($db); -if (!in_array($action, array('export_file', 'delmouv', 'delmouvconfirm')) && !GETPOSTISSET('begin') && !isset($_POST['formfilteraction']) && GETPOST('page', 'int') == '' && !GETPOST('noreset', 'int') && $user->rights->accounting->mouvements->export) +if (!in_array($action, array('export_file', 'delmouv', 'delmouvconfirm')) && !GETPOSTISSET('begin') && !GETPOSTISSET('formfilteraction') && GETPOST('page', 'int') == '' && !GETPOST('noreset', 'int') && $user->rights->accounting->mouvements->export) { if (empty($search_date_start) && empty($search_date_end) && !GETPOSTISSET('restore_lastsearch_values')) { diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index edd553b0d1b..4a26b8ddb5e 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -382,14 +382,12 @@ if (empty($reshook)) { if ($action == 'add' && $user->rights->adherent->creer) { if ($canvas) $object->canvas = $canvas; $birthdate = ''; - if (isset($_POST["birthday"]) && $_POST["birthday"] - && isset($_POST["birthmonth"]) && $_POST["birthmonth"] - && isset($_POST["birthyear"]) && $_POST["birthyear"]) { - $birthdate = dol_mktime(12, 0, 0, $_POST["birthmonth"], $_POST["birthday"], $_POST["birthyear"]); + if (GETPOSTISSET("birthday") && GETPOST("birthday") && GETPOSTISSET("birthmonth") && GETPOST("birthmonth") && GETPOSTISSET("birthyear") && GETPOST("birthyear")) { + $birthdate = dol_mktime(12, 0, 0, GETPOST("birthmonth", 'int'), GETPOST("birthday", 'int'), GETPOST("birthyear", 'int')); } $datesubscription = ''; - if (isset($_POST["reday"]) && isset($_POST["remonth"]) && isset($_POST["reyear"])) { - $datesubscription = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]); + if (GETPOSTISSET("reday") && GETPOSTISSET("remonth") && GETPOSTISSET("reyear")) { + $datesubscription = dol_mktime(12, 0, 0, GETPOST("remonth", 'int'), GETPOST("reday", "int"), GETPOST("reyear", "int")); } $typeid = GETPOST("typeid", 'int'); @@ -1075,7 +1073,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { // Password if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) { - print ''.$langs->trans("Password").'pass).'">'; + print ''.$langs->trans("Password").'pass).'">'; } // Morphy $morphys["phy"] = $langs->trans("Physical"); @@ -1134,7 +1132,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { // EMail print ''.($conf->global->ADHERENT_MAIL_REQUIRED ? '' : '').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED ? '' : '').''; - print ''.img_picto('', 'object_email').' email).'">'; + print ''.img_picto('', 'object_email').' email).'">'; // Address print ''.$langs->trans("Address").''; @@ -1151,14 +1149,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { // Country //$object->country_id=$object->country_id?$object->country_id:$mysoc->country_id; // In edit mode we don't force to company country if not defined print ''.$langs->trans('Country').''; - print $form->select_country(isset($_POST["country_id"]) ? $_POST["country_id"] : $object->country_id, 'country_id'); + print $form->select_country(GETPOSTISSET("country_id") ? GETPOST("country_id", "alpha") : $object->country_id, 'country_id'); if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1); print ''; // State if (empty($conf->global->MEMBER_DISABLE_STATE)) { print ''.$langs->trans('State').''; - print $formcompany->select_state($object->state_id, isset($_POST["country_id"]) ?GETPOST("country_id") : $object->country_id); + print $formcompany->select_state($object->state_id, GETPOSTISSET("country_id") ? GETPOST("country_id", "alpha") : $object->country_id); print ''; } diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index 19450905c23..4fc1ad28da7 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -54,19 +54,18 @@ if ($action == 'addconst') if ($action == 'add') { $error = 0; + $boxids = GETPOST('boxid', 'array'); + $db->begin(); - if (isset($_POST['boxid']) && is_array($_POST['boxid'])) - { - foreach ($_POST['boxid'] as $boxid) - { + if (is_array($boxids)) { + foreach ($boxids as $boxid) { if (is_numeric($boxid['pos']) && $boxid['pos'] >= 0) // 0=Home, 1=... { $pos = $boxid['pos']; // Initialize distinct fk_user with all already existing values of fk_user (user that use a personalized view of boxes for page "pos") $distinctfkuser = array(); - if (!$error) - { + if (!$error) { $sql = "SELECT fk_user"; $sql .= " FROM ".MAIN_DB_PREFIX."user_param"; $sql .= " WHERE param = 'MAIN_BOXES_".$db->escape($pos)."' AND value = '1'"; @@ -146,7 +145,7 @@ if ($action == 'add') { if ($action == 'delete') { $sql = "SELECT box_id FROM ".MAIN_DB_PREFIX."boxes"; - $sql .= " WHERE rowid=".$rowid; + $sql .= " WHERE rowid=".((int) $rowid); $resql = $db->query($sql); $obj = $db->fetch_object($resql); diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php index 5ff7f022ba4..d605f75c511 100644 --- a/htdocs/admin/delais.php +++ b/htdocs/admin/delais.php @@ -188,7 +188,7 @@ if ($action == 'update') if (!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)) $plus = '_PERCENTAGE'; // Update values for ($i = 0; $i < 4; $i++) { - if (isset($_POST['MAIN_METEO'.$plus.'_LEVEL'.$i])) dolibarr_set_const($db, 'MAIN_METEO'.$plus.'_LEVEL'.$i, GETPOST('MAIN_METEO'.$plus.'_LEVEL'.$i, 'int'), 'chaine', 0, '', $conf->entity); + if (GETPOSTISSET('MAIN_METEO'.$plus.'_LEVEL'.$i)) dolibarr_set_const($db, 'MAIN_METEO'.$plus.'_LEVEL'.$i, GETPOST('MAIN_METEO'.$plus.'_LEVEL'.$i, 'int'), 'chaine', 0, '', $conf->entity); } } diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index a185071c227..3048625cd5f 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -690,7 +690,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) if ($value == 'formula' && empty($_POST['formula'])) continue; if ($value == 'dayrule' && empty($_POST['dayrule'])) continue; if ($value == 'sortorder') continue; // For a column name 'sortorder', we use the field name 'position' - if ((!isset($_POST[$value]) || $_POST[$value] == '') + if ((!GETPOSTISSET($value) || GETPOST($value) == '') && (!in_array($listfield[$f], array('decalage', 'module', 'accountancy_code', 'accountancy_code_sell', 'accountancy_code_buy', 'tracking', 'picto')) // Fields that are not mandatory && (!($id == 10 && $listfield[$f] == 'code')) // Code is mandatory fir table 10 ) @@ -719,7 +719,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) } } // Other checks - if (GETPOST('actionadd') && $tabname[$id] == MAIN_DB_PREFIX."c_actioncomm" && isset($_POST["type"]) && in_array($_POST["type"], array('system', 'systemauto'))) { + if (GETPOST('actionadd') && $tabname[$id] == MAIN_DB_PREFIX."c_actioncomm" && GETPOSTISSET("type") && in_array(GETPOST("type"), array('system', 'systemauto'))) { $ok = 0; setEventMessages($langs->transnoentities('ErrorReservedTypeSystemSystemAuto'), null, 'errors'); } @@ -757,7 +757,7 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) if ($_POST["accountancy_code"] <= 0) $_POST["accountancy_code"] = ''; // If empty, we force to null if ($_POST["accountancy_code_sell"] <= 0) $_POST["accountancy_code_sell"] = ''; // If empty, we force to null if ($_POST["accountancy_code_buy"] <= 0) $_POST["accountancy_code_buy"] = ''; // If empty, we force to null - if ($id == 10 && isset($_POST["code"])) // Spaces are not allowed into code + if ($id == 10 && GETPOSTISSET("code")) // Spaces are not allowed into code { $_POST["code"] = preg_replace('/\s/', '', $_POST["code"]); } diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index a89480314a6..e8b2b7bdc10 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -856,8 +856,8 @@ if ($action == 'edit') include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; $formmail = new FormMail($db); $formmail->trackid = (($action == 'testhtml') ? "testhtml" : "test"); - $formmail->fromname = (isset($_POST['fromname']) ? $_POST['fromname'] : $conf->global->MAIN_MAIL_EMAIL_FROM); - $formmail->frommail = (isset($_POST['frommail']) ? $_POST['frommail'] : $conf->global->MAIN_MAIL_EMAIL_FROM); + $formmail->fromname = (GETPOSTISSET('fromname') ? $_POST['fromname'] : $conf->global->MAIN_MAIL_EMAIL_FROM); + $formmail->frommail = (GETPOSTISSET('frommail') ? $_POST['frommail'] : $conf->global->MAIN_MAIL_EMAIL_FROM); $formmail->fromid = $user->id; $formmail->fromalsorobot = 1; $formmail->fromtype = (GETPOSTISSET('fromtype') ?GETPOST('fromtype', 'aZ09') : (!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE) ? $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE : 'user')); @@ -865,13 +865,13 @@ if ($action == 'edit') $formmail->withsubstit = 1; $formmail->withfrom = 1; $formmail->witherrorsto = 1; - $formmail->withto = (!empty($_POST['sendto']) ? $_POST['sendto'] : ($user->email ? $user->email : 1)); - $formmail->withtocc = (!empty($_POST['sendtocc']) ? $_POST['sendtocc'] : 1); // ! empty to keep field if empty - $formmail->withtoccc = (!empty($_POST['sendtoccc']) ? $_POST['sendtoccc'] : 1); // ! empty to keep field if empty - $formmail->withtopic = (isset($_POST['subject']) ? $_POST['subject'] : $langs->trans("Test")); + $formmail->withto = (!empty($_POST['sendto']) ? GETPOST('sendto', 'restricthtml') : ($user->email ? $user->email : 1)); + $formmail->withtocc = (!empty($_POST['sendtocc']) ? GETPOST('sendtocc', 'restricthtml') : 1); // ! empty to keep field if empty + $formmail->withtoccc = (!empty($_POST['sendtoccc']) ? GETPOST('sendtoccc', 'restricthtml') : 1); // ! empty to keep field if empty + $formmail->withtopic = (GETPOSTISSET('subject') ? GETPOST('subject') : $langs->trans("Test")); $formmail->withtopicreadonly = 0; $formmail->withfile = 2; - $formmail->withbody = (isset($_POST['message']) ? $_POST['message'] : ($action == 'testhtml' ? $langs->transnoentities("PredefinedMailTestHtml") : $langs->transnoentities("PredefinedMailTest"))); + $formmail->withbody = (GETPOSTISSET('message') ? GETPOST('message', 'restricthtml') : ($action == 'testhtml' ? $langs->transnoentities("PredefinedMailTestHtml") : $langs->transnoentities("PredefinedMailTest"))); $formmail->withbodyreadonly = 0; $formmail->withcancel = 1; $formmail->withdeliveryreceipt = 1; diff --git a/htdocs/admin/mails_emailing.php b/htdocs/admin/mails_emailing.php index faa72f4fc7c..84cc97d86d4 100644 --- a/htdocs/admin/mails_emailing.php +++ b/htdocs/admin/mails_emailing.php @@ -564,20 +564,20 @@ if ($action == 'edit') // Cree l'objet formulaire mail include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; $formmail = new FormMail($db); - $formmail->fromname = (isset($_POST['fromname']) ? $_POST['fromname'] : $conf->global->MAIN_MAIL_EMAIL_FROM); - $formmail->frommail = (isset($_POST['frommail']) ? $_POST['frommail'] : $conf->global->MAIN_MAIL_EMAIL_FROM); + $formmail->fromname = (GETPOSTISSET('fromname') ? GETPOST('fromname', 'restricthtml') : $conf->global->MAIN_MAIL_EMAIL_FROM); + $formmail->frommail = (GETPOSTISSET('frommail') ? GETPOST('frommail', 'restricthtml') : $conf->global->MAIN_MAIL_EMAIL_FROM); $formmail->trackid = (($action == 'testhtml') ? "testhtml" : "test"); $formmail->withfromreadonly = 0; $formmail->withsubstit = 0; $formmail->withfrom = 1; $formmail->witherrorsto = 1; - $formmail->withto = (!empty($_POST['sendto']) ? $_POST['sendto'] : ($user->email ? $user->email : 1)); - $formmail->withtocc = (!empty($_POST['sendtocc']) ? $_POST['sendtocc'] : 1); // ! empty to keep field if empty - $formmail->withtoccc = (!empty($_POST['sendtoccc']) ? $_POST['sendtoccc'] : 1); // ! empty to keep field if empty - $formmail->withtopic = (isset($_POST['subject']) ? $_POST['subject'] : $langs->trans("Test")); + $formmail->withto = (!GETPOST('sendto') ? GETPOST('sendto', 'restricthtml') : ($user->email ? $user->email : 1)); + $formmail->withtocc = (!GETPOST(['sendtocc']) ? GETPOST('sendtocc', 'restricthtml') : 1); // ! empty to keep field if empty + $formmail->withtoccc = (!GETPOST(['sendtoccc']) ? GETPOST('sendtoccc', 'restricthtml') : 1); // ! empty to keep field if empty + $formmail->withtopic = (GETPOSTISSET('subject') ? GETPOST('subject') : $langs->trans("Test")); $formmail->withtopicreadonly = 0; $formmail->withfile = 2; - $formmail->withbody = (isset($_POST['message']) ? $_POST['message'] : ($action == 'testhtml' ? $langs->transnoentities("PredefinedMailTestHtml") : $langs->transnoentities("PredefinedMailTest"))); + $formmail->withbody = (GETPOSTISSET('message') ? GETPOST('message', 'restricthtml') : ($action == 'testhtml' ? $langs->transnoentities("PredefinedMailTestHtml") : $langs->transnoentities("PredefinedMailTest"))); $formmail->withbodyreadonly = 0; $formmail->withcancel = 1; $formmail->withdeliveryreceipt = 1; diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php index 872c0d414eb..de98c42b35a 100644 --- a/htdocs/admin/mails_templates.php +++ b/htdocs/admin/mails_templates.php @@ -271,7 +271,7 @@ if (empty($reshook)) { // Rename some POST variables into a generic name if (GETPOST('actionmodify', 'alpha') && $value == 'topic') $_POST['topic'] = $_POST['topic-'.$rowid]; - if ((!isset($_POST[$value]) || $_POST[$value] == '' || $_POST[$value] == '-1') && $value != 'lang' && $value != 'fk_user' && $value != 'position') + if ((!GETPOSTISSET($value) || GETPOST($value) == '' || GETPOST($value) == '-1') && $value != 'lang' && $value != 'fk_user' && $value != 'position') { $ok = 0; $fieldnamekey = $listfield[$f]; diff --git a/htdocs/admin/mails_ticket.php b/htdocs/admin/mails_ticket.php index 49dc61a270a..1e1c3db3fad 100644 --- a/htdocs/admin/mails_ticket.php +++ b/htdocs/admin/mails_ticket.php @@ -530,20 +530,20 @@ if ($action == 'edit') // Cree l'objet formulaire mail include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; $formmail = new FormMail($db); - $formmail->fromname = (isset($_POST['fromname']) ? $_POST['fromname'] : $conf->global->MAIN_MAIL_EMAIL_FROM); - $formmail->frommail = (isset($_POST['frommail']) ? $_POST['frommail'] : $conf->global->MAIN_MAIL_EMAIL_FROM); + $formmail->fromname = (GETPOSTISSET('fromname') ? $_POST['fromname'] : $conf->global->MAIN_MAIL_EMAIL_FROM); + $formmail->frommail = (GETPOSTISSET('frommail') ? $_POST['frommail'] : $conf->global->MAIN_MAIL_EMAIL_FROM); $formmail->trackid = (($action == 'testhtml') ? "testhtml" : "test"); $formmail->withfromreadonly = 0; $formmail->withsubstit = 0; $formmail->withfrom = 1; $formmail->witherrorsto = 1; - $formmail->withto = (!empty($_POST['sendto']) ? $_POST['sendto'] : ($user->email ? $user->email : 1)); - $formmail->withtocc = (!empty($_POST['sendtocc']) ? $_POST['sendtocc'] : 1); // ! empty to keep field if empty - $formmail->withtoccc = (!empty($_POST['sendtoccc']) ? $_POST['sendtoccc'] : 1); // ! empty to keep field if empty - $formmail->withtopic = (isset($_POST['subject']) ? $_POST['subject'] : $langs->trans("Test")); + $formmail->withto = (!empty($_POST['sendto']) ? GETPOST('sendto', 'restricthtml') : ($user->email ? $user->email : 1)); + $formmail->withtocc = (!empty($_POST['sendtocc']) ? GETPOST('sendtocc', 'restricthtml') : 1); // ! empty to keep field if empty + $formmail->withtoccc = (!empty($_POST['sendtoccc']) ? GETPOST('sendtoccc', 'restricthtml') : 1); // ! empty to keep field if empty + $formmail->withtopic = (GETPOSTISSET('subject') ? GETPOST('subject') : $langs->trans("Test")); $formmail->withtopicreadonly = 0; $formmail->withfile = 2; - $formmail->withbody = (isset($_POST['message']) ? $_POST['message'] : ($action == 'testhtml' ? $langs->transnoentities("PredefinedMailTestHtml") : $langs->transnoentities("PredefinedMailTest"))); + $formmail->withbody = (GETPOSTISSET('message') ? GETPOST('message', 'restricthtml') : ($action == 'testhtml' ? $langs->transnoentities("PredefinedMailTestHtml") : $langs->transnoentities("PredefinedMailTest"))); $formmail->withbodyreadonly = 0; $formmail->withcancel = 1; $formmail->withdeliveryreceipt = 1; diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php index 71bd50ef5ce..0349f8a3435 100644 --- a/htdocs/admin/proxy.php +++ b/htdocs/admin/proxy.php @@ -135,7 +135,7 @@ print ''; print ''.$langs->trans("ConnectionTimeout").''; print ''; print ''; -print 'global->MAIN_USE_CONNECT_TIMEOUT).'">'; +print 'global->MAIN_USE_CONNECT_TIMEOUT).'">'; print ' '.strtolower($langs->trans("Seconds")); print ''; print ''; diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php index 6d84b4a0e2d..45500843aed 100644 --- a/htdocs/admin/syslog.php +++ b/htdocs/admin/syslog.php @@ -85,7 +85,7 @@ if ($action == 'set') $db->begin(); $newActiveModules = array(); - $selectedModules = (isset($_POST['SYSLOG_HANDLERS']) ? $_POST['SYSLOG_HANDLERS'] : array()); + $selectedModules = (GETPOSTISSET('SYSLOG_HANDLERS') ? GETPOST('SYSLOG_HANDLERS') : array()); // Save options of handler foreach ($syslogModules as $syslogHandler) @@ -97,11 +97,10 @@ if ($action == 'set') if (in_array($syslogHandler, $selectedModules)) $newActiveModules[] = $syslogHandler; foreach ($module->configure() as $option) { - if (isset($_POST[$option['constant']])) + if (GETPOSTISSET($option['constant'])) { - $_POST[$option['constant']] = trim($_POST[$option['constant']]); dolibarr_del_const($db, $option['constant'], -1); - dolibarr_set_const($db, $option['constant'], $_POST[$option['constant']], 'chaine', 0, '', 0); + dolibarr_set_const($db, $option['constant'], trim(GETPOST($option['constant'])), 'chaine', 0, '', 0); } } } @@ -229,7 +228,7 @@ foreach ($syslogModules as $moduleName) $tmpoption = $option['constant']; if (!empty($tmpoption)) { - if (isset($_POST[$tmpoption])) $value = $_POST[$tmpoption]; + if (GETPOSTISSET($tmpoption)) $value = GETPOST($tmpoption); elseif (!empty($conf->global->$tmpoption)) $value = $conf->global->$tmpoption; } else $value = (isset($option['default']) ? $option['default'] : ''); @@ -240,7 +239,7 @@ foreach ($syslogModules as $moduleName) { $filelogparam = ' ('; $filelogparam .= $langs->trans('Download'); - $filelogparam .= $filelog.')'; + $filelogparam .= ' '.basename($value).')'; print $filelogparam; } } diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php index a509cea32d3..03f5c60f607 100644 --- a/htdocs/admin/system/phpinfo.php +++ b/htdocs/admin/system/phpinfo.php @@ -93,7 +93,7 @@ if (versioncompare(versionphparray(), $arrayphpminversionerror) < 0) print ''; print 'GET and POST support'; -if (!isset($_GET["testget"]) && !isset($_POST["testpost"]) && !isset($_GET["mainmenu"])) +if (!isset($_GET["testget"]) && !isset($_POST["testpost"]) && !isset($_GET["mainmenu"])) // We must keep $_GET and $_POST here { print 'Warning '.$langs->trans("PHPSupportPOSTGETKo"); print ' ('.$langs->trans("Recheck").')'; diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 6dfdf41e679..1a61a4a0c82 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -280,7 +280,7 @@ if (empty($reshook) && $action == 'add') } } } - $object->fk_project = isset($_POST["projectid"]) ? $_POST["projectid"] : 0; + $object->fk_project = GETPOSTISSET("projectid") ? GETPOST("projectid", 'int') : 0; $taskid = GETPOST('taskid', 'int'); if (!empty($taskid)) { @@ -324,7 +324,7 @@ if (empty($reshook) && $action == 'add') $object->note_private = trim(GETPOST("note", "restricthtml")); - if (isset($_POST["contactid"])) $object->contact = $contact; + if (GETPOSTISSET("contactid")) $object->contact = $contact; if (GETPOST('socid', 'int') > 0) { @@ -1051,8 +1051,8 @@ if ($action == 'create') print ''.$langs->trans("Status").' / '.$langs->trans("Percentage").''; print ''; $percent = -1; - if (isset($_GET['status']) || isset($_POST['status'])) $percent = GETPOST('status'); - elseif (isset($_GET['percentage']) || isset($_POST['percentage'])) $percent = GETPOST('percentage'); + if (GETPOSTISSET('status')) $percent = GETPOST('status'); + elseif (GETPOSTISSET('percentage')) $percent = GETPOST('percentage'); else { if (GETPOST('complete') == '0' || GETPOST("afaire") == 1) $percent = '0'; elseif (GETPOST('complete') == 100 || GETPOST("afaire") == 2) $percent = 100; diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 313aaa0e2e4..f540a8d6e4e 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -336,7 +336,7 @@ if ($status == 'todo') $title = $langs->trans("ToDoActions"); */ $param = ''; -if ($actioncode || isset($_GET['search_actioncode']) || isset($_POST['search_actioncode'])) { +if ($actioncode || GETPOSTISSET('search_actioncode')) { if (is_array($actioncode)) { foreach ($actioncode as $str_action) $param .= "&search_actioncode[]=".urlencode($str_action); } else $param .= "&search_actioncode=".urlencode($actioncode); diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php index 4f292047700..c5f81e358cc 100644 --- a/htdocs/comm/action/pertype.php +++ b/htdocs/comm/action/pertype.php @@ -122,8 +122,8 @@ $tmparray = explode('-', $tmp); $begin_d = 1; $end_d = 53; -if ($status == '' && !isset($_GET['status']) && !isset($_POST['status'])) $status = (empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS); -if (empty($action) && !isset($_GET['action']) && !isset($_POST['action'])) $action = (empty($conf->global->AGENDA_DEFAULT_VIEW) ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW); +if ($status == '' && !GETPOSTISSET('status')) $status = (empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS); +if (empty($action) && !GETPOSTISSET('action')) $action = (empty($conf->global->AGENDA_DEFAULT_VIEW) ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW); if (GETPOST('viewcal', 'alpha') && $action != 'show_day' && $action != 'show_week' && $action != 'show_peruser') { $action = 'show_month'; $day = ''; @@ -227,13 +227,13 @@ if ($status == 'done') $title = $langs->trans("DoneActions"); if ($status == 'todo') $title = $langs->trans("ToDoActions"); $param = ''; -if ($actioncode || isset($_GET['search_actioncode']) || isset($_POST['search_actioncode'])) { +if ($actioncode || GETPOSTISSET('search_actioncode')) { if (is_array($actioncode)) { foreach ($actioncode as $str_action) $param .= "&search_actioncode[]=".urlencode($str_action); } else $param .= "&search_actioncode=".urlencode($actioncode); } if ($resourceid > 0) $param .= "&search_resourceid=".urlencode($resourceid); -if ($status || isset($_GET['status']) || isset($_POST['status'])) $param .= "&search_status=".urlencode($status); +if ($status || GETPOSTISSET('status')) $param .= "&search_status=".urlencode($status); if ($filter) $param .= "&search_filter=".urlencode($filter); if ($filtert) $param .= "&search_filtert=".urlencode($filtert); if ($usergroup) $param .= "&search_usergroup=".urlencode($usergroup); diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php index 8983dbff7f6..6161b6c820b 100644 --- a/htdocs/comm/action/peruser.php +++ b/htdocs/comm/action/peruser.php @@ -125,8 +125,8 @@ if ($begin_d < 1 || $begin_d > 7) $begin_d = 1; if ($end_d < 1 || $end_d > 7) $end_d = 7; if ($end_d < $begin_d) $end_d = $begin_d + 1; -if ($status == '' && !isset($_GET['status']) && !isset($_POST['status'])) $status = (empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS); -if (empty($action) && !isset($_GET['action']) && !isset($_POST['action'])) $action = (empty($conf->global->AGENDA_DEFAULT_VIEW) ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW); +if ($status == '' && !GETPOSTISSET('status')) $status = (empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS); +if (empty($action) && !GETPOSTISSET('action')) $action = (empty($conf->global->AGENDA_DEFAULT_VIEW) ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW); if (GETPOST('viewcal', 'alpha') && $action != 'show_day' && $action != 'show_week' && $action != 'show_peruser') { $action = 'show_month'; $day = ''; @@ -227,13 +227,13 @@ if ($status == 'done') $title = $langs->trans("DoneActions"); if ($status == 'todo') $title = $langs->trans("ToDoActions"); $param = ''; -if ($actioncode || isset($_GET['search_actioncode']) || isset($_POST['search_actioncode'])) { +if ($actioncode || GETPOSTISSET('search_actioncode')) { if (is_array($actioncode)) { foreach ($actioncode as $str_action) $param .= "&search_actioncode[]=".urlencode($str_action); } else $param .= "&search_actioncode=".urlencode($actioncode); } if ($resourceid > 0) $param .= "&search_resourceid=".urlencode($resourceid); -if ($status || isset($_GET['status']) || isset($_POST['status'])) $param .= "&search_status=".urlencode($status); +if ($status || GETPOSTISSET('status')) $param .= "&search_status=".urlencode($status); if ($filter) $param .= "&search_filter=".urlencode($filter); if ($filtert) $param .= "&search_filtert=".urlencode($filtert); if ($usergroup) $param .= "&search_usergroup=".urlencode($usergroup); diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php index 02c89772e94..902a96ec16c 100644 --- a/htdocs/compta/bank/bankentries_list.php +++ b/htdocs/compta/bank/bankentries_list.php @@ -225,17 +225,16 @@ if ((GETPOST('confirm_savestatement', 'alpha') || GETPOST('confirm_reconcile', ' if ($num_releve) { $bankline = new AccountLine($db); - if (isset($_POST['rowid']) && is_array($_POST['rowid'])) - { - foreach ($_POST['rowid'] as $row) - { - if ($row > 0) - { + + $rowids = GETPOST('rowid', 'array'); + + if (!empty($rowids) && is_array($rowids)) { + foreach ($rowids as $row) { + if ($row > 0) { $result = $bankline->fetch($row); $bankline->num_releve = $num_releve; //$_POST["num_releve"]; $result = $bankline->update_conciliation($user, GETPOST("cat"), GETPOST('confirm_reconcile', 'alpha') ? 1 : 0); // If we confirm_reconcile, we set flag 'rappro' to 1. - if ($result < 0) - { + if ($result < 0) { setEventMessages($bankline->error, $bankline->errors, 'errors'); $error++; break; diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php index a7841a72b22..813e0baa1b7 100644 --- a/htdocs/compta/bank/card.php +++ b/htdocs/compta/bank/card.php @@ -346,7 +346,7 @@ if ($action == 'create') // Type print ''.$langs->trans("AccountType").''; print ''; - $formbank->selectTypeOfBankAccount(isset($_POST["type"]) ? $_POST["type"] : Account::TYPE_CURRENT, "type"); + $formbank->selectTypeOfBankAccount(GETPOSTISSET("type") ? GETPOST("type") : Account::TYPE_CURRENT, "type"); print ''; // Currency @@ -354,7 +354,7 @@ if ($action == 'create') print ''; $selectedcode = $object->currency_code; if (!$selectedcode) $selectedcode = $conf->currency; - print $form->selectCurrency((isset($_POST["account_currency_code"]) ? $_POST["account_currency_code"] : $selectedcode), 'account_currency_code'); + print $form->selectCurrency((GETPOSTISSET("account_currency_code") ? GETPOST("account_currency_code") : $selectedcode), 'account_currency_code'); //print $langs->trans("Currency".$conf->currency); //print ''; print ''; @@ -367,9 +367,8 @@ if ($action == 'create') // Country $selectedcode = ''; - if (isset($_POST["account_country_id"])) - { - $selectedcode = $_POST["account_country_id"] ? $_POST["account_country_id"] : $object->country_code; + if (GETPOSTISSET("account_country_id")) { + $selectedcode = GETPOST("account_country_id") ? GETPOST("account_country_id") : $object->country_code; } elseif (empty($selectedcode)) $selectedcode = $mysoc->country_code; $object->country_code = getCountry($selectedcode, 2); // Force country code on account to have following field on bank fields matching country rules @@ -383,7 +382,7 @@ if ($action == 'create') print ''.$langs->trans('State').''; if ($selectedcode) { - $formcompany->select_departement(isset($_POST["account_state_id"]) ? $_POST["account_state_id"] : '', $selectedcode, 'account_state_id'); + $formcompany->select_departement(GETPOSTISSET("account_state_id") ? GETPOST("account_state_id") : '', $selectedcode, 'account_state_id'); } else { print $countrynotdefined; } @@ -818,16 +817,16 @@ if ($action == 'create') // Ref print ''.$langs->trans("Ref").''; - print 'ref).'">'; + print 'ref).'">'; // Label print ''.$langs->trans("Label").''; - print 'label).'">'; + print 'label).'">'; // Type print ''.$langs->trans("AccountType").''; print ''; - $formbank->selectTypeOfBankAccount((isset($_POST["type"]) ? $_POST["type"] : $object->type), "type"); + $formbank->selectTypeOfBankAccount((GETPOSTISSET("type") ? GETPOST("type") : $object->type), "type"); print ''; // Currency @@ -837,7 +836,7 @@ if ($action == 'create') print ''; $selectedcode = $object->currency_code; if (!$selectedcode) $selectedcode = $conf->currency; - print $form->selectCurrency((isset($_POST["account_currency_code"]) ? $_POST["account_currency_code"] : $selectedcode), 'account_currency_code'); + print $form->selectCurrency((GETPOSTISSET("account_currency_code") ? GETPOST("account_currency_code") : $selectedcode), 'account_currency_code'); //print $langs->trans("Currency".$conf->currency); //print ''; print ''; @@ -845,13 +844,13 @@ if ($action == 'create') // Status print ''.$langs->trans("Status").''; print ''; - print $form->selectarray("clos", $object->status, (isset($_POST["clos"]) ? $_POST["clos"] : $object->clos)); + print $form->selectarray("clos", $object->status, (GETPOSTISSET("clos") ? GETPOST("clos") : $object->clos)); print ''; // Country $object->country_id = $object->country_id ? $object->country_id : $mysoc->country_id; $selectedcode = $object->country_code; - if (isset($_POST["account_country_id"])) $selectedcode = $_POST["account_country_id"]; + if (GETPOSTISSET("account_country_id")) $selectedcode = GETPOST("account_country_id"); elseif (empty($selectedcode)) $selectedcode = $mysoc->country_code; $object->country_code = getCountry($selectedcode, 2); // Force country code on account to have following field on bank fields matching country rules @@ -865,7 +864,7 @@ if ($action == 'create') print ''.$langs->trans('State').''; if ($selectedcode) { - print $formcompany->select_state(isset($_POST["account_state_id"]) ? $_POST["account_state_id"] : $object->state_id, $selectedcode, 'account_state_id'); + print $formcompany->select_state(GETPOSTISSET("account_state_id") ? GETPOST("account_state_id") : $object->state_id, $selectedcode, 'account_state_id'); } else { print $countrynotdefined; } @@ -882,14 +881,14 @@ if ($action == 'create') // Balance print ''.$langs->trans("BalanceMinimalAllowed").''; - print 'min_allowed).'">'; + print 'min_allowed).'">'; print ''.$langs->trans("BalanceMinimalDesired").''; - print 'min_desired).'">'; + print 'min_desired).'">'; // Web print ''.$langs->trans("Web").''; - print 'url).'">'; + print 'url).'">'; print ''; // Tags-Categories diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php index 42bddce5d28..33f7f3a0352 100644 --- a/htdocs/compta/bank/line.php +++ b/htdocs/compta/bank/line.php @@ -139,17 +139,17 @@ if ($user->rights->banque->modifier && $action == "update") $sql = "UPDATE ".MAIN_DB_PREFIX."bank"; $sql .= " SET "; // Always opened - if (isset($_POST['value'])) $sql .= " fk_type='".$db->escape(GETPOST('value'))."',"; - if (isset($_POST['num_chq'])) $sql .= " num_chq='".$db->escape(GETPOST("num_chq"))."',"; - if (isset($_POST['banque'])) $sql .= " banque='".$db->escape(GETPOST("banque"))."',"; - if (isset($_POST['emetteur'])) $sql .= " emetteur='".$db->escape(GETPOST("emetteur"))."',"; + if (GETPOSTISSET('value')) $sql .= " fk_type='".$db->escape(GETPOST('value'))."',"; + if (GETPOSTISSET('num_chq')) $sql .= " num_chq='".$db->escape(GETPOST("num_chq"))."',"; + if (GETPOSTISSET('banque')) $sql .= " banque='".$db->escape(GETPOST("banque"))."',"; + if (GETPOSTISSET('emetteur')) $sql .= " emetteur='".$db->escape(GETPOST("emetteur"))."',"; // Blocked when conciliated if (!$acline->rappro) { - if (isset($_POST['label'])) $sql .= " label = '".$db->escape(GETPOST("label"))."',"; - if (isset($_POST['amount'])) $sql .= " amount= '".$db->escape($amount)."',"; - if (isset($_POST['dateomonth'])) $sql .= " dateo = '".$db->idate($dateop)."',"; - if (isset($_POST['datevmonth'])) $sql .= " datev = '".$db->idate($dateval)."',"; + if (GETPOSTISSET('label')) $sql .= " label = '".$db->escape(GETPOST("label"))."',"; + if (GETPOSTISSET('amount')) $sql .= " amount= '".$db->escape($amount)."',"; + if (GETPOSTISSET('dateomonth')) $sql .= " dateo = '".$db->idate($dateop)."',"; + if (GETPOSTISSET('datevmonth')) $sql .= " datev = '".$db->idate($dateval)."',"; } $sql .= " fk_account = ".$actarget->id; $sql .= " WHERE rowid = ".$acline->id; @@ -613,7 +613,7 @@ if ($result) if ($user->rights->banque->consolidate) { print ''; - print 'rappro ? ' checked="checked"' : '')).'">'; + print 'rappro ? ' checked="checked"' : '')).'">'; print ''; } else { print ''.yn($objp->rappro).''; diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index de5b64c28fe..01b5d4ea3a0 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -3415,7 +3415,7 @@ if ($action == 'create') // Payment mode print ''.$langs->trans('PaymentMode').''; - $form->select_types_paiements(isset($_POST['mode_reglement_id']) ? $_POST['mode_reglement_id'] : $mode_reglement_id, 'mode_reglement_id', 'CRDT'); + $form->select_types_paiements(GETPOSTISSET('mode_reglement_id') ? GETPOST('mode_reglement_id') : $mode_reglement_id, 'mode_reglement_id', 'CRDT'); print ''; // Bank Account diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php index b9aa625c06d..299cdf9a6c3 100644 --- a/htdocs/compta/paiement_charge.php +++ b/htdocs/compta/paiement_charge.php @@ -222,21 +222,21 @@ if ($action == 'create') print ''.$langs->trans("RemainderToPay").''.price($total-$sumpaid,0,$outputlangs,1,-1,-1,$conf->currency).'';*/ print ''.$langs->trans("Date").''; - $datepaye = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]); - $datepayment = empty($conf->global->MAIN_AUTOFILL_DATE) ? (empty($_POST["remonth"]) ?-1 : $datepaye) : 0; + $datepaye = dol_mktime(12, 0, 0, GETPOST("remonth", 'int'), GETPOST("reday", 'int'), GETPOST("reyear", 'int')); + $datepayment = empty($conf->global->MAIN_AUTOFILL_DATE) ? (GETPOSTISSET("remonth") ? $datepaye : -1) : 0; print $form->selectDate($datepayment, '', '', '', 0, "add_payment", 1, 1, 0, '', '', $charge->date_ech, '', 1, $langs->trans("DateOfSocialContribution")); print ""; print ''; print ''.$langs->trans("PaymentMode").''; - $form->select_types_paiements(isset($_POST["paiementtype"]) ? $_POST["paiementtype"] : $charge->paiementtype, "paiementtype"); + $form->select_types_paiements(GETPOSTISSET("paiementtype") ? GETPOST("paiementtype") : $charge->paiementtype, "paiementtype"); print "\n"; print ''; print ''; print ''.$langs->trans('AccountToDebit').''; print ''; - $form->select_comptes(isset($_POST["accountid"]) ? $_POST["accountid"] : $charge->accountid, "accountid", 0, '', 2); // Show opend bank account list + $form->select_comptes(GETPOSTISSET("accountid") ? GETPOST("accountid") : $charge->accountid, "accountid", 0, '', 2); // Show opend bank account list print ''; // Number diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php index bd97f88ff65..752bdc4d642 100644 --- a/htdocs/contact/card.php +++ b/htdocs/contact/card.php @@ -893,7 +893,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) */ // We set country_id, and country_code label of the chosen country - if (isset($_POST["country_id"]) || $object->country_id) + if (GETPOSTISSET("country_id") || $object->country_id) { $tmparray = getCountry($object->country_id, 'all'); $object->country_code = $tmparray['code']; diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php index 999a5866c22..a4f936cfca0 100644 --- a/htdocs/core/class/html.formmail.class.php +++ b/htdocs/core/class/html.formmail.class.php @@ -1133,7 +1133,7 @@ class FormMail extends Form if (!empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_SUPPLIER_PROPOSAL) && !empty($this->param['models']) && $this->param['models'] == 'supplier_proposal_send') $defaultvaluefordeliveryreceipt = 1; if (!empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_ORDER) && !empty($this->param['models']) && $this->param['models'] == 'order_send') $defaultvaluefordeliveryreceipt = 1; if (!empty($conf->global->MAIL_FORCE_DELIVERY_RECEIPT_INVOICE) && !empty($this->param['models']) && $this->param['models'] == 'facture_send') $defaultvaluefordeliveryreceipt = 1; - $out .= $form->selectyesno('deliveryreceipt', (isset($_POST["deliveryreceipt"]) ? $_POST["deliveryreceipt"] : $defaultvaluefordeliveryreceipt), 1); + $out .= $form->selectyesno('deliveryreceipt', (GETPOSTISSET("deliveryreceipt") ? GETPOST("deliveryreceipt") : $defaultvaluefordeliveryreceipt), 1); } $out .= "\n"; return $out; @@ -1170,7 +1170,7 @@ class FormMail extends Form $out .= $defaulttopic; $out .= ''; } else { - $out .= ''; + $out .= ''; } $out .= "\n"; return $out; diff --git a/htdocs/core/class/html.formsms.class.php b/htdocs/core/class/html.formsms.class.php index 2ef3545d335..96156ef3fd2 100644 --- a/htdocs/core/class/html.formsms.class.php +++ b/htdocs/core/class/html.formsms.class.php @@ -288,7 +288,7 @@ function limitChars(textarea, limit, infodiv) $defaultmessage = $this->withbody; } $defaultmessage = make_substitutions($defaultmessage, $this->substit); - if (isset($_POST["message"])) $defaultmessage = $_POST["message"]; + if (GETPOSTISSET("message")) $defaultmessage = GETPOST("message", 'restricthtml'); $defaultmessage = str_replace('\n', "\n", $defaultmessage); print ""; diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php index aa90ee7fa1c..60debed9f2d 100644 --- a/htdocs/core/class/html.formticket.class.php +++ b/htdocs/core/class/html.formticket.class.php @@ -999,8 +999,8 @@ class FormTicket } elseif (!dol_textishtml($defaultmessage) && dol_textishtml($this->substit['__USER_SIGNATURE__'])) { $defaultmessage = dol_nl2br($defaultmessage); } - if (isset($_POST["message"]) && !$_POST['modelselected']) { - $defaultmessage = GETPOST('message'); + if (GETPOSTISSET("message") && !$_POST['modelselected']) { + $defaultmessage = GETPOST('message', 'restricthtml'); } else { $defaultmessage = make_substitutions($defaultmessage, $this->substit); // Clean first \n and br (to avoid empty line when CONTACTCIVNAME is empty) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 3be5453c406..61360d66f51 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -224,14 +224,14 @@ function dol_shutdown() } /** - * Return true if we are in a context of submitting a parameter + * Return true if we are in a context of submitting the parameter $paramname * * @param string $paramname Name or parameter to test * @return boolean True if we have just submit a POST or GET request with the parameter provided (even if param is empty) */ function GETPOSTISSET($paramname) { - $isset = 0; + $isset = false; $relativepathstring = $_SERVER["PHP_SELF"]; // Clean $relativepathstring @@ -254,7 +254,7 @@ function GETPOSTISSET($paramname) { if ($key == $paramname) // We are on the requested parameter { - $isset = 1; + $isset = true; break; } } @@ -263,16 +263,16 @@ function GETPOSTISSET($paramname) // If there is saved contextpage, page or limit if ($paramname == 'contextpage' && !empty($_SESSION['lastsearch_contextpage_'.$relativepathstring])) { - $isset = 1; + $isset = true; } elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_'.$relativepathstring])) { - $isset = 1; + $isset = true; } elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_'.$relativepathstring])) { - $isset = 1; + $isset = true; } } else { - $isset = (isset($_POST[$paramname]) || isset($_GET[$paramname])); + $isset = (isset($_POST[$paramname]) || isset($_GET[$paramname])); // We must keep $_POST and $_GET here } return $isset; @@ -287,13 +287,13 @@ function GETPOSTISSET($paramname) * @param string $check Type of check * ''=no check (deprecated) * 'none'=no check (only for param that should have very rich content) + * 'array', 'array:restricthtml' or 'array:aZ09' to check it's an array * 'int'=check it's numeric (integer or float) * 'intcomma'=check it's integer+comma ('1,2,3,4...') * 'alpha'=Same than alphanohtml since v13 * 'alphanohtml'=check there is no html content and no " and no ../ * 'aZ'=check it's a-z only * 'aZ09'=check it's simple alpha string (recommended for keys) - * 'array'=check it's array * 'san_alpha'=Use filter_var with FILTER_SANITIZE_STRING (do not use this for free text string) * 'nohtml'=check there is no html content and no " and no ../ * 'restricthtml'=check html content is restricted to some tags only @@ -411,7 +411,6 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null } } } // Management of default search_filters and sort order - //elseif (preg_match('/list.php$/', $_SERVER["PHP_SELF"]) && ! empty($paramname) && ! isset($_GET[$paramname]) && ! isset($_POST[$paramname])) elseif (!empty($paramname) && !isset($_GET[$paramname]) && !isset($_POST[$paramname])) { if (!empty($user->default_values)) // $user->default_values defined from menu 'Setup - Default values' @@ -476,6 +475,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null if ($qualified) { + // We must keep $_POST and $_GET here if (isset($_POST['sall']) || isset($_POST['search_all']) || isset($_GET['sall']) || isset($_GET['search_all'])) { // We made a search from quick search menu, do we still use default filter ? diff --git a/htdocs/core/modules/mailings/pomme.modules.php b/htdocs/core/modules/mailings/pomme.modules.php index aea4158fb21..3f4431f3eb4 100644 --- a/htdocs/core/modules/mailings/pomme.modules.php +++ b/htdocs/core/modules/mailings/pomme.modules.php @@ -172,10 +172,10 @@ class mailing_pomme extends MailingTargets $sql .= " WHERE u.email <> ''"; // u.email IS NOT NULL est implicite dans ce test $sql .= " AND u.entity IN (0,".$conf->entity.")"; $sql .= " AND u.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")"; - if (isset($_POST["filter"]) && $_POST["filter"] == '1') $sql .= " AND u.statut=1"; - if (isset($_POST["filter"]) && $_POST["filter"] == '0') $sql .= " AND u.statut=0"; - if (isset($_POST["filteremployee"]) && $_POST["filteremployee"] == '1') $sql .= " AND u.employee=1"; - if (isset($_POST["filteremployee"]) && $_POST["filteremployee"] == '0') $sql .= " AND u.employee=0"; + if (GETPOSTISSET("filter") && GETPOST("filter") == '1') $sql .= " AND u.statut=1"; + if (GETPOSTISSET("filter") && GETPOST("filter") == '0') $sql .= " AND u.statut=0"; + if (GETPOSTISSET("filteremployee") && GETPOSt("filteremployee") == '1') $sql .= " AND u.employee=1"; + if (GETPOSTISSET("filteremployee") && GETPOST("filteremployee") == '0') $sql .= " AND u.employee=0"; $sql .= " ORDER BY u.email"; // Stocke destinataires dans cibles diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php index b2a082498c6..44b9d51bbf3 100644 --- a/htdocs/core/modules/mailings/thirdparties.modules.php +++ b/htdocs/core/modules/mailings/thirdparties.modules.php @@ -81,9 +81,8 @@ class mailing_thirdparties extends MailingTargets $sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")"; } else { $addFilter = ""; - if (isset($_POST["filter_client"]) && $_POST["filter_client"] <> '-1') - { - $addFilter .= " AND s.client=".$_POST["filter_client"]; + if (GETPOSTISSET("filter_client") && GETPOST("filter_client") <> '-1') { + $addFilter .= " AND s.client=".((int) GETPOST("filter_client", 'int')); $addDescription = $langs->trans('ProspectCustomer')."="; if ($_POST["filter_client"] == 0) { @@ -98,18 +97,15 @@ class mailing_thirdparties extends MailingTargets { $addDescription .= $langs->trans('ProspectCustomer'); } else { - $addDescription .= "Unknown status ".$_POST["filter_client"]; + $addDescription .= "Unknown status ".GETPOST("filter_client"); } } - if (isset($_POST["filter_status"])) - { - if (strlen($addDescription) > 0) - { + if (GETPOSTISSET("filter_status")) { + if (strlen($addDescription) > 0) { $addDescription .= ";"; } $addDescription .= $langs->trans("Status")."="; - if ($_POST["filter_status"] == '1') - { + if (GETPOST("filter_status") == '1') { $addFilter .= " AND s.status=1"; $addDescription .= $langs->trans("Enabled"); } else { @@ -124,7 +120,7 @@ class mailing_thirdparties extends MailingTargets $sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")"; $sql .= " AND cs.fk_soc = s.rowid"; $sql .= " AND c.rowid = cs.fk_categorie"; - $sql .= " AND c.rowid='".$this->db->escape($_POST['filter'])."'"; + $sql .= " AND c.rowid=".((int) GETPOST('filter', 'int')); $sql .= $addFilter; $sql .= " UNION "; $sql .= "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, c.label as label"; @@ -134,7 +130,7 @@ class mailing_thirdparties extends MailingTargets $sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")"; $sql .= " AND cs.fk_soc = s.rowid"; $sql .= " AND c.rowid = cs.fk_categorie"; - $sql .= " AND c.rowid='".$this->db->escape($_POST['filter'])."'"; + $sql .= " AND c.rowid=".((int) GETPOST('filter', 'int')); $sql .= $addFilter; } $sql .= " ORDER BY email"; diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php index c7035298beb..bc02e490c34 100644 --- a/htdocs/core/tpl/extrafields_view.tpl.php +++ b/htdocs/core/tpl/extrafields_view.tpl.php @@ -85,7 +85,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element] if (!empty($extrafields->attributes[$object->table_element]['langfile'][$tmpkeyextra])) $langs->load($extrafields->attributes[$object->table_element]['langfile'][$tmpkeyextra]); if ($action == 'edit_extras') { - $value = (isset($_POST["options_".$tmpkeyextra]) ? $_POST["options_".$tmpkeyextra] : $object->array_options["options_".$tmpkeyextra]); + $value = (GETPOSTISSET("options_".$tmpkeyextra) ? GETPOST("options_".$tmpkeyextra) : $object->array_options["options_".$tmpkeyextra]); } else { $value = $object->array_options["options_".$tmpkeyextra]; //var_dump($tmpkeyextra.' - '.$value); @@ -172,7 +172,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element] $datenotinstring = $db->jdate($datenotinstring); } //print 'x'.$object->array_options['options_' . $tmpkeyextra].'-'.$datenotinstring.' - '.dol_print_date($datenotinstring, 'dayhour'); - $value = isset($_POST["options_".$tmpkeyextra]) ? dol_mktime($_POST["options_".$tmpkeyextra."hour"], $_POST["options_".$tmpkeyextra."min"], 0, $_POST["options_".$tmpkeyextra."month"], $_POST["options_".$tmpkeyextra."day"], $_POST["options_".$tmpkeyextra."year"]) : $datenotinstring; + $value = GETPOSTISSET("options_".$tmpkeyextra) ? dol_mktime(GETPOST("options_".$tmpkeyextra."hour", 'int'), GETPOST("options_".$tmpkeyextra."min", 'int'), 0, GETPOST("options_".$tmpkeyextra."month", 'int'), GETPOST("options_".$tmpkeyextra."day", 'int'), GETPOST("options_".$tmpkeyextra."year", 'int')) : $datenotinstring; } //TODO Improve element and rights detection diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php index 52b50475744..bc6f3313168 100644 --- a/htdocs/core/tpl/objectline_create.tpl.php +++ b/htdocs/core/tpl/objectline_create.tpl.php @@ -324,17 +324,17 @@ if ($nolinesbefore) { { $coldisplay++; ?> - "> + "> '; $coldisplay++; if ($seller->tva_assuj == "0") echo ''.vatrate(0, true); - else echo $form->load_tva('tva_tx', (isset($_POST["tva_tx"]) ?GETPOST("tva_tx", 'alpha', 2) : -1), $seller, $buyer, 0, 0, '', false, 1); + else echo $form->load_tva('tva_tx', (GETPOSTISSET("tva_tx") ? GETPOST("tva_tx", 'alpha', 2) : -1), $seller, $buyer, 0, 0, '', false, 1); ?> - "> + "> - "> + "> - "> + "> - "> + "> global->PRODUCT_USE_UNITS)) { @@ -371,7 +371,7 @@ if ($nolinesbefore) { } $coldisplay++; ?> - ">% + ">% situation_cycle_ref) { $coldisplay++; @@ -389,17 +389,17 @@ if ($nolinesbefore) { - "> + "> global->DISPLAY_MARGIN_RATES)) { - echo '%'; + echo '%'; $coldisplay++; } if (!empty($conf->global->DISPLAY_MARK_RATES)) { - echo '%'; + echo '%'; $coldisplay++; } } diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php index 5f0073a57b2..bc6b87a3353 100644 --- a/htdocs/core/tpl/objectline_edit.tpl.php +++ b/htdocs/core/tpl/objectline_edit.tpl.php @@ -234,7 +234,7 @@ $coldisplay++; if ($user->rights->margins->creer) { if (!empty($conf->global->DISPLAY_MARGIN_RATES)) { - $margin_rate = (isset($_POST["np_marginRate"]) ?GETPOST("np_marginRate", "alpha", 2) : (($line->pa_ht == 0) ? '' : price($line->marge_tx))); + $margin_rate = (GETPOSTISSET("np_marginRate") ? GETPOST("np_marginRate", "alpha", 2) : (($line->pa_ht == 0) ? '' : price($line->marge_tx))); // if credit note, dont allow to modify margin if ($line->subprice < 0) echo ''.$margin_rate.'%'; @@ -242,7 +242,7 @@ $coldisplay++; $coldisplay++; } elseif (!empty($conf->global->DISPLAY_MARK_RATES)) { - $mark_rate = (isset($_POST["np_markRate"]) ?GETPOST("np_markRate", 'alpha', 2) : price($line->marque_tx)); + $mark_rate = (GETPOSTISSET("np_markRate") ? GETPOST("np_markRate", 'alpha', 2) : price($line->marque_tx)); // if credit note, dont allow to modify margin if ($line->subprice < 0) echo ''.$mark_rate.'%'; diff --git a/htdocs/core/tpl/resource_add.tpl.php b/htdocs/core/tpl/resource_add.tpl.php index 05b9d6fd50a..d1db4a819a5 100644 --- a/htdocs/core/tpl/resource_add.tpl.php +++ b/htdocs/core/tpl/resource_add.tpl.php @@ -32,8 +32,8 @@ $events = array(); $out .= $formresources->select_resource_list('', 'fk_resource', '', 1, 1, 0, $events, '', 2, null); $out .= ''; -$out .= '
'.$form->selectyesno('busy', (isset($_POST['busy']) ? $_POST['busy'] : 1), 1).'
'; -$out .= '
'.$form->selectyesno('mandatory', (isset($_POST['mandatory']) ? $_POST['mandatory'] : 0), 1).'
'; +$out .= '
'.$form->selectyesno('busy', (GETPOSTISSET('busy') ? GETPOST('busy') : 1), 1).'
'; +$out .= '
'.$form->selectyesno('mandatory', (GETPOSTISSET('mandatory') ? GETPOST('mandatory') : 0), 1).'
'; $out .= '
'; $out .= ''; diff --git a/htdocs/don/card.php b/htdocs/don/card.php index 0f4b2054619..c55751e913f 100644 --- a/htdocs/don/card.php +++ b/htdocs/don/card.php @@ -418,9 +418,9 @@ if ($action == 'create') // Zip / Town print ''.$langs->trans("Zip").' / '.$langs->trans("Town").''; - print $formcompany->select_ziptown((isset($_POST["zipcode"]) ? $_POST["zipcode"] : $object->zip), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6); + print $formcompany->select_ziptown((GETPOSTISSET("zipcode") ? GETPOST("zipcode") : $object->zip), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6); print ' '; - print $formcompany->select_ziptown((isset($_POST["town"]) ? $_POST["town"] : $object->town), 'town', array('zipcode', 'selectcountry_id', 'state_id')); + print $formcompany->select_ziptown((GETPOSTISSET("town") ? GETPOST("town") : $object->town), 'town', array('zipcode', 'selectcountry_id', 'state_id')); print ''; // Country @@ -560,9 +560,9 @@ if (!empty($id) && $action == 'edit') // Zip / Town print ''.$langs->trans("Zip").' / '.$langs->trans("Town").''; - print $formcompany->select_ziptown((isset($_POST["zipcode"]) ? $_POST["zipcode"] : $object->zip), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6); + print $formcompany->select_ziptown((GETPOSTISSET("zipcode") ? GETPOSTISSET("zipcode") : $object->zip), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6); print ' '; - print $formcompany->select_ziptown((isset($_POST["town"]) ? $_POST["town"] : $object->town), 'town', array('zipcode', 'selectcountry_id', 'state_id')); + print $formcompany->select_ziptown((GETPOSTISSET("town") ? GETPOST("town") : $object->town), 'town', array('zipcode', 'selectcountry_id', 'state_id')); print ''; // Country diff --git a/htdocs/install/check.php b/htdocs/install/check.php index bd34a0ac30c..93b99680b92 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -93,8 +93,8 @@ if (empty($force_install_nophpinfo)) print ' (\n"; -// Check PHP support for $_POST -if (!isset($_GET["testget"]) && !isset($_POST["testpost"])) +// Check PHP support for $_GET and $_POST +if (!isset($_GET["testget"]) && !isset($_POST["testpost"])) // We must keep $_GET and $_POST here { print 'Warning '.$langs->trans("PHPSupportPOSTGETKo"); print ' ('.$langs->trans("Recheck").')'; diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index a0890866b51..12bab777edb 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -177,7 +177,7 @@ if (preg_match('/install\.lock/i', $_SERVER["SCRIPT_FILENAME"])) print $langs->trans("YouTryInstallDisabledByDirLock"); if (!empty($dolibarr_main_url_root)) { - print 'Click on following link, '; + print 'Click on following link, '; print $langs->trans("ClickHereToGoToApp"); print ''; } @@ -202,7 +202,7 @@ if (@file_exists($lockfile)) if (!empty($dolibarr_main_url_root)) { print $langs->trans("ClickOnLinkOrRemoveManualy").'
'; - print ''; + print ''; print $langs->trans("ClickHereToGoToApp"); print ''; } else { diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php index 798eb4472e6..14138dc5664 100644 --- a/htdocs/install/repair.php +++ b/htdocs/install/repair.php @@ -1473,7 +1473,7 @@ if (empty($actiondone)) if ($oneoptionset) { - print '
'; + print '
'; print $langs->trans("GoToDolibarr"); print '
'; } else { diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php index 3c87b36dd82..ea07900ba67 100644 --- a/htdocs/opensurvey/results.php +++ b/htdocs/opensurvey/results.php @@ -204,7 +204,9 @@ if (isset($_POST["ajoutercolonne"]) && $object->format == "D") } } - if ($_POST["nouvelleheuredebut"] == "vide" || (isset($_POST["nouvelleheuredebut"]) && isset($_POST["nouvelleheurefin"]) && (($_POST["nouvelleheuredebut"] < $_POST["nouvelleheurefin"]) || (($_POST["nouvelleheuredebut"] == $_POST["nouvelleheurefin"]) && ($_POST["nouvelleminutedebut"] < $_POST["nouvelleminutefin"]))))) { + if (GETPOST("nouvelleheuredebut") == "vide" || (GETPOSTISSET("nouvelleheuredebut") && GETPOSTISSET("nouvelleheurefin") + && (GETPOST("nouvelleheuredebut") < GETPOST("nouvelleheurefin") || (GETPOST("nouvelleheuredebut") == GETPOST("nouvelleheurefin") + && (GETPOST("nouvelleminutedebut") < GETPOST("nouvelleminutefin")))))) { $erreur_ajout_date = false; } else { $erreur_ajout_date = "yes"; @@ -907,7 +909,7 @@ while ($compteur < $num) //demande de confirmation pour modification de ligne for ($i = 0; $i < $nblines; $i++) { - if (isset($_POST["modifierligne".$i])) + if (GETPOSTISSET("modifierligne".$i)) { if ($compteur == $i) { @@ -938,7 +940,7 @@ if (empty($testligneamodifier)) if (empty($listofanswers[$i]['format']) || !in_array($listofanswers[$i]['format'], array('yesno', 'foragainst'))) { print 'trans("MoreChoices"), null, 'errors'); $erreur = true; } diff --git a/htdocs/opensurvey/wizard/create_survey.php b/htdocs/opensurvey/wizard/create_survey.php index b295f007ca8..73413f3255d 100644 --- a/htdocs/opensurvey/wizard/create_survey.php +++ b/htdocs/opensurvey/wizard/create_survey.php @@ -175,11 +175,11 @@ if ($_SESSION["mailsonde"]) $cochemail = "checked"; print ' '.$langs->trans("ToReceiveEMailForEachVote").'
'."\n"; if ($_SESSION['allow_comments']) $allow_comments = 'checked'; -if (isset($_POST['allow_comments'])) $allow_comments = GETPOST('allow_comments') ? 'checked' : ''; +if (GETPOSTISSET('allow_comments')) $allow_comments = GETPOST('allow_comments') ? 'checked' : ''; print ' '.$langs->trans('CanComment').'
'."\n"; if ($_SESSION['allow_spy']) $allow_spy = 'checked'; -if (isset($_POST['allow_spy'])) $allow_spy = GETPOST('allow_spy') ? 'checked' : ''; +if (GETPOSTISSET('allow_spy')) $allow_spy = GETPOST('allow_spy') ? 'checked' : ''; print ' '.$langs->trans('CanSeeOthersVote').'
'."\n"; if (GETPOST('choix_sondage')) diff --git a/htdocs/product/card.php b/htdocs/product/card.php index 6fdfb82e354..ea0bc19eecb 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -1034,8 +1034,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) if ($showbarcode) { print ''.$langs->trans('BarcodeType').''; - if (isset($_POST['fk_barcode_type'])) - { + if (GETPOSTISSET('fk_barcode_type')) { $fk_barcode_type = GETPOST('fk_barcode_type'); } else { if (empty($fk_barcode_type) && !empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE; @@ -1046,7 +1045,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) print ''; if ($conf->browser->layout == 'phone') print ''; print ''.$langs->trans("BarcodeValue").''; - $tmpcode = isset($_POST['barcode']) ?GETPOST('barcode') : $object->barcode; + $tmpcode = GETPOSTISSET('barcode') ? GETPOST('barcode') : $object->barcode; if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto)) $tmpcode = $modBarCodeProduct->getNextValue($object, $type); print ''; print ''; @@ -1497,8 +1496,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) if ($showbarcode) { print ''.$langs->trans('BarcodeType').''; - if (isset($_POST['fk_barcode_type'])) - { + if (GETPOSTISSET('fk_barcode_type')) { $fk_barcode_type = GETPOST('fk_barcode_type'); } else { $fk_barcode_type = $object->barcode_type; @@ -1508,7 +1506,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) $formbarcode = new FormBarCode($db); print $formbarcode->selectBarcodeType($fk_barcode_type, 'fk_barcode_type', 1); print ''.$langs->trans("BarcodeValue").''; - $tmpcode = isset($_POST['barcode']) ?GETPOST('barcode') : $object->barcode; + $tmpcode = GETPOSTISSET('barcode') ? GETPOST('barcode') : $object->barcode; if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto)) $tmpcode = $modBarCodeProduct->getNextValue($object, $type); print ''; print ''; @@ -1853,7 +1851,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) print ''; if ($action == 'editbarcode') { - $tmpcode = isset($_POST['barcode']) ?GETPOST('barcode') : $object->barcode; + $tmpcode = GETPOSTISSET('barcode') ? GETPOST('barcode') : $object->barcode; if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto)) $tmpcode = $modBarCodeProduct->getNextValue($object, $type); print ''; diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php index 90721f8bfda..4e35d3832e5 100644 --- a/htdocs/product/stock/massstockmove.php +++ b/htdocs/product/stock/massstockmove.php @@ -428,7 +428,7 @@ print ''; print ''; // Button to record mass movement -$codemove = (isset($_POST["codemove"]) ? GETPOST("codemove", 'alpha') : dol_print_date(dol_now(), '%Y%m%d%H%M%S')); +$codemove = (GETPOSTISSET("codemove") ? GETPOST("codemove", 'alpha') : dol_print_date(dol_now(), '%Y%m%d%H%M%S')); $labelmovement = GETPOST("label") ? GETPOST('label') : $langs->trans("StockTransfer").' '.dol_print_date($now, '%Y-%m-%d %H:%M'); print '
'; diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php index 860044433d7..ed537f1bd4e 100644 --- a/htdocs/product/stock/replenish.php +++ b/htdocs/product/stock/replenish.php @@ -108,7 +108,7 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e * Actions */ -if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha') || isset($_POST['valid'])) // Both test are required to be compatible with all browsers +if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha') || GETPOST('valid')) // Both test are required to be compatible with all browsers { $search_ref = ''; $search_label = ''; @@ -120,7 +120,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x' if ($draftorder == 'on') $draftchecked = "checked"; // Create orders -if ($action == 'order' && isset($_POST['valid'])) +if ($action == 'order' && GETPOST('valid')) { $linecount = GETPOST('linecount', 'int'); $box = 0; diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php index 1b6fafe9994..0885e9ef777 100644 --- a/htdocs/product/stock/tpl/stockcorrection.tpl.php +++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php @@ -138,7 +138,7 @@ print ''.$langs->trans("MovementLabel").''; print ''; print ''; print ''; -print ''.$langs->trans("InventoryCode").''; +print ''.$langs->trans("InventoryCode").''; print ''; print ''; diff --git a/htdocs/product/stock/tpl/stocktransfer.tpl.php b/htdocs/product/stock/tpl/stocktransfer.tpl.php index dab7cd07b78..7e159a35b32 100644 --- a/htdocs/product/stock/tpl/stocktransfer.tpl.php +++ b/htdocs/product/stock/tpl/stocktransfer.tpl.php @@ -127,7 +127,7 @@ print ''.$langs->trans("MovementLabel").''; print ''; print ''; print ''; -print ''.$langs->trans("InventoryCode").''; +print ''.$langs->trans("InventoryCode").''; print ''; print ''; diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index d30f3bf846e..cf6b864cd72 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -79,8 +79,7 @@ $dates = dol_mktime(0, 0, 0, GETPOST('datesmonth'), GETPOST('datesday'), GETPOST $datee = dol_mktime(23, 59, 59, GETPOST('dateemonth'), GETPOST('dateeday'), GETPOST('dateeyear')); if (empty($dates) && !empty($datesrfc)) $dates = dol_stringtotime($datesrfc); if (empty($datee) && !empty($dateerfc)) $datee = dol_stringtotime($dateerfc); -if (!isset($_POST['datesrfc']) && !isset($_POST['datesday']) && !empty($conf->global->PROJECT_LINKED_ELEMENT_DEFAULT_FILTER_YEAR)) -{ +if (!GETPOSTISSET('datesrfc') && !GETPOSTISSET('datesday') && !empty($conf->global->PROJECT_LINKED_ELEMENT_DEFAULT_FILTER_YEAR)) { $new = dol_now(); $tmp = dol_getdate($new); //$datee=$now diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index c61ffd58819..1946125dbc2 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -182,7 +182,7 @@ if (empty($reshook) && $action == 'add') { $langs->load("errors"); $errmsg .= $langs->trans("ErrorLoginAlreadyExists")."
\n"; } - if (!isset($_POST["pass1"]) || !isset($_POST["pass2"]) || $_POST["pass1"] == '' || $_POST["pass2"] == '' || $_POST["pass1"] != $_POST["pass2"]) { + if (!GETPOSTISSET("pass1") || !GETPOSTISSET("pass2") || GETPOST("pass1", 'none') == '' || GETPOST("pass2", 'none') == '' || GETPOST("pass1", 'none') != GETPOST("pass2", 'none')) { $error++; $langs->load("errors"); $errmsg .= $langs->trans("ErrorPasswordsMustMatch")."
\n"; diff --git a/htdocs/public/opensurvey/studs.php b/htdocs/public/opensurvey/studs.php index 5ba3ce65ebd..95045d2e943 100644 --- a/htdocs/public/opensurvey/studs.php +++ b/htdocs/public/opensurvey/studs.php @@ -108,13 +108,11 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x")) // bout $nouveauchoix = ''; for ($i = 0; $i < $nbcolonnes; $i++) { - if (isset($_POST["choix$i"]) && $_POST["choix$i"] == '1') - { + if (GETPOSTISSET("choix$i") && GETPOST("choix$i") == '1') { $nouveauchoix .= "1"; - } elseif (isset($_POST["choix$i"]) && $_POST["choix$i"] == '2') - { + } elseif (GETPOSTISSET("choix$i") && GETPOST("choix$i") == '2') { $nouveauchoix .= "2"; - } else { // sinon c'est 0 + } else { $nouveauchoix .= "0"; } } @@ -182,14 +180,14 @@ $testligneamodifier = false; $ligneamodifier = -1; for ($i = 0; $i < $nblines; $i++) { - if (isset($_POST['modifierligne'.$i])) + if (GETPOSTISSET('modifierligne'.$i)) { $ligneamodifier = $i; $testligneamodifier = true; } //test to see if a line is to be modified - if (isset($_POST['validermodifier'.$i])) + if (GETPOSTISSET('validermodifier'.$i)) { $modifier = $i; $testmodifier = true; @@ -203,13 +201,11 @@ if ($testmodifier) for ($i = 0; $i < $nbcolonnes; $i++) { //var_dump($_POST["choix$i"]); - if (isset($_POST["choix".$i]) && $_POST["choix".$i] == '1') - { + if (GETPOSTISSET("choix".$i) && GETPOST("choix".$i) == '1') { $nouveauchoix .= "1"; - } elseif (isset($_POST["choix".$i]) && $_POST["choix".$i] == '2') - { + } elseif (GETPOSTISSET("choix".$i) && GETPOST("choix".$i) == '2') { $nouveauchoix .= "2"; - } else { // sinon c'est 0 + } else { $nouveauchoix .= "0"; } } @@ -545,7 +541,7 @@ while ($compteur < $num) //demande de confirmation pour modification de ligne for ($i = 0; $i < $nblines; $i++) { - if (isset($_POST["modifierligne".$i])) + if (GETPOSTISSET("modifierligne".$i)) { if ($compteur == $i) { @@ -581,8 +577,7 @@ if ($ligneamodifier < 0 && (!isset($_SESSION['nom']))) if (empty($listofanswers[$i]['format']) || !in_array($listofanswers[$i]['format'], array('yesno', 'foragainst'))) { print ''; diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php index ffa4b24fc59..95265831670 100644 --- a/htdocs/public/test/test_arrays.php +++ b/htdocs/public/test/test_arrays.php @@ -162,8 +162,8 @@ if (!empty($conf->use_javascript_ajax)) include DOL_DOCUMENT_ROOT.'/core/tpl/aja $nav = ''; $nav .= ''; -if ($actioncode || isset($_GET['actioncode']) || isset($_POST['actioncode'])) $nav .= ''; -if ($status || isset($_GET['status']) || isset($_POST['status'])) $nav .= ''; +if ($actioncode || GETPOSTISSET('actioncode')) $nav .= ''; +if ($status || GETPOSTISSET('status')) $nav .= ''; if ($filter) $nav .= ''; if ($filtert) $nav .= ''; if ($socid) $nav .= ''; From cee1b3cee44c2995ad23c529c4510449df9f2fdc Mon Sep 17 00:00:00 2001 From: lmarcouiller Date: Mon, 30 Nov 2020 14:52:27 +0100 Subject: [PATCH 070/297] =?UTF-8?q?=20Close=20:=20Encours=20d=C3=A9pass?= =?UTF-8?q?=C3=A9=20#15307?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/core/boxes/box_customers_outstanding_bill_reached.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php index f83ed7a663e..f3c358d2335 100644 --- a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php +++ b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php @@ -20,8 +20,8 @@ /** * \file htdocs/core/boxes/box_clients.php - * \ingroup societes - * \brief Module de generation de l'affichage de la box clients + * \ingroup Facture + * \brief Module d'affichage pour les encours dépassés */ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php'; From 958893228aab951b8445ff62d3d7ad712dd36a96 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 30 Nov 2020 15:18:58 +0100 Subject: [PATCH 071/297] Fix combo to add contact and status of contact on popup --- build/makepack-dolibarr.pl | 5 ++++- htdocs/comm/propal/card.php | 8 ++++---- htdocs/comm/propal/contact.php | 3 ++- htdocs/commande/card.php | 6 +++--- htdocs/commande/contact.php | 3 ++- htdocs/compta/facture/card.php | 3 ++- htdocs/compta/facture/contact.php | 3 ++- htdocs/contrat/card.php | 3 ++- htdocs/contrat/contact.php | 3 ++- htdocs/core/class/commonobject.class.php | 10 +++++----- htdocs/core/tpl/contacts.tpl.php | 2 +- htdocs/fichinter/card.php | 3 ++- htdocs/fichinter/contact.php | 3 ++- htdocs/fourn/commande/card.php | 3 ++- htdocs/fourn/commande/contact.php | 3 ++- htdocs/fourn/facture/card.php | 3 ++- htdocs/fourn/facture/contact.php | 3 ++- htdocs/projet/contact.php | 3 ++- htdocs/projet/tasks/contact.php | 12 +++++++----- htdocs/resource/contact.php | 3 ++- htdocs/societe/societecontact.php | 3 ++- htdocs/ticket/card.php | 3 ++- htdocs/ticket/contact.php | 3 ++- 23 files changed, 58 insertions(+), 36 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 85212d9c5ba..314aaff7177 100755 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -503,7 +503,10 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/mysql/README`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/install/pgsql/README`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/install/mssql`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/install/mssql`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/install/sqlite3`; + + $ret=`rm -fr $BUILDROOT/$PROJECT/node_modules`; $ret=`rm -fr $BUILDROOT/$PROJECT/dev/ansible`; $ret=`rm -fr $BUILDROOT/$PROJECT/dev/codesniffer`; diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index 90e779009de..4742aebfde0 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -547,9 +547,8 @@ if (empty($reshook)) if ($id > 0) { - // Insertion contact par defaut si defini - if (GETPOST('contactid') > 0) - { + // Insert default contacts if defined + if (GETPOST('contactid') > 0) { $result = $object->add_contact(GETPOST('contactid'), 'CUSTOMER', 'external'); if ($result < 0) { @@ -1344,7 +1343,8 @@ if (empty($reshook)) { if ($object->id > 0) { $contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid')); - $result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]); + $typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type')); + $result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09')); } if ($result >= 0) { diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php index 4d70b11cdfe..af3679de945 100644 --- a/htdocs/comm/propal/contact.php +++ b/htdocs/comm/propal/contact.php @@ -79,7 +79,8 @@ if ($action == 'addcontact' && $user->rights->propale->creer) if ($object->id > 0) { $contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int')); - $result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]); + $typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type')); + $result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09')); } if ($result >= 0) diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index c37f9eff99f..16e53e0a23b 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -459,8 +459,7 @@ if (empty($reshook)) // Insert default contacts if defined if ($object_id > 0) { - if (GETPOST('contactid', 'int')) - { + if (GETPOST('contactid', 'int')) { $result = $object->add_contact(GETPOST('contactid', 'int'), 'CUSTOMER', 'external'); if ($result < 0) { setEventMessages($langs->trans("ErrorFailedToAddContact"), null, 'errors'); @@ -1367,7 +1366,8 @@ if (empty($reshook)) { if ($object->id > 0) { $contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid')); - $result = $object->add_contact($contactid, GETPOST('type'), GETPOST('source')); + $typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type')); + $result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09')); } if ($result >= 0) { diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php index a3c31d4cf7b..7df7dbea130 100644 --- a/htdocs/commande/contact.php +++ b/htdocs/commande/contact.php @@ -56,7 +56,8 @@ if ($action == 'addcontact' && $user->rights->commande->creer) if ($result > 0 && $id > 0) { $contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int')); - $result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]); + $typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type')); + $result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09')); } if ($result >= 0) diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index 01b5d4ea3a0..def74e173a3 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -2664,7 +2664,8 @@ if (empty($reshook)) if ($result > 0 && $id > 0) { $contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid')); - $result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]); + $typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type')); + $result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09')); } if ($result >= 0) { diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php index 57532174db7..6b8758bc472 100644 --- a/htdocs/compta/facture/contact.php +++ b/htdocs/compta/facture/contact.php @@ -62,7 +62,8 @@ if ($action == 'addcontact' && $user->rights->facture->creer) if ($result > 0 && $id > 0) { $contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int')); - $result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]); + $typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type')); + $result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09')); } if ($result >= 0) diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index 68582d2fb33..a92ac8a1e73 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -946,7 +946,8 @@ if (empty($reshook)) if ($action == 'addcontact') { $contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid')); - $result = $object->add_contact($contactid, GETPOST('type'), GETPOST('source')); + $typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type')); + $result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09')); if ($result >= 0) { diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php index 24b0ff54bf6..c837769819a 100644 --- a/htdocs/contrat/contact.php +++ b/htdocs/contrat/contact.php @@ -63,7 +63,8 @@ if ($action == 'addcontact' && $user->rights->contrat->creer) if ($result > 0 && $id > 0) { $contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid')); - $result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]); + $typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type')); + $result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09')); } if ($result >= 0) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index bc1c17d417f..6127319d537 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -936,11 +936,11 @@ abstract class CommonObject /** * Add a link between element $this->element and a contact * - * @param int $fk_socpeople Id of thirdparty contact (if source = 'external') or id of user (if souce = 'internal') to link - * @param int $type_contact Type of contact (code or id). Must be id or code found into table llx_c_type_contact. For example: SALESREPFOLL - * @param string $source external=Contact extern (llx_socpeople), internal=Contact intern (llx_user) - * @param int $notrigger Disable all triggers - * @return int <0 if KO, >0 if OK + * @param int $fk_socpeople Id of thirdparty contact (if source = 'external') or id of user (if souce = 'internal') to link + * @param int|string $type_contact Type of contact (code or id). Must be id or code found into table llx_c_type_contact. For example: SALESREPFOLL + * @param string $source external=Contact extern (llx_socpeople), internal=Contact intern (llx_user) + * @param int $notrigger Disable all triggers + * @return int <0 if KO, >0 if OK */ public function add_contact($fk_socpeople, $type_contact, $source = 'external', $notrigger = 0) { diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php index 05f29acb109..fc24f1aa02a 100644 --- a/htdocs/core/tpl/contacts.tpl.php +++ b/htdocs/core/tpl/contacts.tpl.php @@ -155,7 +155,7 @@ if ($permission) element == 'shipping' || $object->element == 'reception') && is_object($objectsrc)) $tmpobject = $objectsrc; - $formcompany->selectTypeContact($tmpobject, $preselectedtypeofcontact, 'type', 'external', 'position', 0, 'minwidth100imp'); + $formcompany->selectTypeContact($tmpobject, $preselectedtypeofcontact, 'typecontact', 'external', 'position', 0, 'minwidth100imp'); ?>
 
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index 172455c2c35..07c0146c2a8 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -734,7 +734,8 @@ if (empty($reshook)) if ($result > 0 && $id > 0) { $contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int')); - $result = $object->add_contact($contactid, GETPOST('type', 'int'), GETPOST('source', 'alpha')); + $typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type')); + $result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09')); } if ($result >= 0) diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php index 9b617d06f1b..bace3d10231 100644 --- a/htdocs/fichinter/contact.php +++ b/htdocs/fichinter/contact.php @@ -59,7 +59,8 @@ if ($action == 'addcontact' && $user->rights->ficheinter->creer) if ($result > 0 && $id > 0) { $contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int')); - $result = $object->add_contact($contactid, GETPOST('type', 'int'), GETPOST('source', 'alpha')); + $typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type')); + $result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09')); } if ($result >= 0) diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index e03fae8857d..cf6543c96e0 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -1432,7 +1432,8 @@ if (empty($reshook)) if ($object->id > 0) { $contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid')); - $result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]); + $typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type')); + $result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09')); } if ($result >= 0) diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php index 08a40ad52b8..3e52f35d8bb 100644 --- a/htdocs/fourn/commande/contact.php +++ b/htdocs/fourn/commande/contact.php @@ -58,7 +58,8 @@ if ($action == 'addcontact' && $user->rights->fournisseur->commande->creer) if ($result > 0 && $id > 0) { $contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid')); - $result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]); + $typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type')); + $result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09')); } if ($result >= 0) diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index e2b939dd14a..b439e5cad45 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -1604,7 +1604,8 @@ if (empty($reshook)) if ($result > 0 && $id > 0) { $contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid')); - $result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]); + $typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type')); + $result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09')); } if ($result >= 0) diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php index 83f145c4c6b..99010c977dc 100644 --- a/htdocs/fourn/facture/contact.php +++ b/htdocs/fourn/facture/contact.php @@ -58,7 +58,8 @@ if ($action == 'addcontact' && $user->rights->fournisseur->facture->creer) if ($result > 0 && $id > 0) { $contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid')); - $result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]); + $typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type')); + $result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09')); } if ($result >= 0) diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php index 06a1d11955c..e298adcd40c 100644 --- a/htdocs/projet/contact.php +++ b/htdocs/projet/contact.php @@ -66,7 +66,8 @@ if ($action == 'addcontact' && $user->rights->projet->creer) if ($result > 0 && $id > 0) { $contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int')); - $result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]); + $typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type')); + $result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09')); } if ($result >= 0) diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php index 3f44422f158..253c2c787e4 100644 --- a/htdocs/projet/tasks/contact.php +++ b/htdocs/projet/tasks/contact.php @@ -72,11 +72,13 @@ if ($action == 'addcontact' && $user->rights->projet->creer) $contactsofproject = $projectstatic->getListContactId('internal'); foreach ($contactsofproject as $key => $val) { - $result = $object->add_contact($val, GETPOST("type"), GETPOST("source")); + $typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type')); + $result = $object->add_contact($val, $type, GETPOST("source", 'aZ09')); } } } else { - $result = $object->add_contact($idfortaskuser, GETPOST("type"), GETPOST("source")); + $typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type')); + $result = $object->add_contact($idfortaskuser, $typeid, GETPOST("source", 'aZ09')); } } @@ -449,6 +451,7 @@ if ($id > 0 || !empty($ref)) foreach (array('internal', 'external') as $source) { $tab = $object->liste_contact(-1, $source); + $num = count($tab); $i = 0; @@ -489,7 +492,7 @@ if ($id > 0 || !empty($ref)) $userstatic->photo = $tab[$i]['photo']; $userstatic->login = $tab[$i]['login']; $userstatic->email = $tab[$i]['email']; - $userstatic->statut = $tab[$i]['statucontact']; + $userstatic->statut = $tab[$i]['statuscontact']; print $userstatic->getNomUrl(-1); } @@ -499,8 +502,7 @@ if ($id > 0 || !empty($ref)) $contactstatic->lastname = $tab[$i]['lastname']; $contactstatic->firstname = $tab[$i]['firstname']; $contactstatic->email = $tab[$i]['email']; - $contactstatic->statut = $tab[$i]['statucontact']; - + $contactstatic->statut = $tab[$i]['statuscontact']; print $contactstatic->getNomUrl(1); } print ''; diff --git a/htdocs/resource/contact.php b/htdocs/resource/contact.php index afce3dd9947..0330579f06c 100644 --- a/htdocs/resource/contact.php +++ b/htdocs/resource/contact.php @@ -55,7 +55,8 @@ if ($action == 'addcontact' && $user->rights->resource->write) if ($result > 0 && $id > 0) { $contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int')); - $result = $object->add_contact($contactid, GETPOST('type', 'int'), GETPOST('source', 'alpha')); + $typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type')); + $result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09')); } if ($result >= 0) diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php index c40de9060ef..0d1ae48e9e3 100644 --- a/htdocs/societe/societecontact.php +++ b/htdocs/societe/societecontact.php @@ -71,7 +71,8 @@ if ($action == 'addcontact' && $user->rights->societe->creer) if ($result > 0 && $id > 0) { $contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int')); - $result = $object->add_contact($contactid, $_POST["type"], $_POST["source"]); + $typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type')); + $result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09')); } if ($result >= 0) diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php index a7bb7f0e955..c67476f8c00 100644 --- a/htdocs/ticket/card.php +++ b/htdocs/ticket/card.php @@ -194,7 +194,8 @@ if (empty($reshook)) { $type_contact = GETPOST("type", 'alpha'); if ($contactid > 0 && $type_contact) { - $result = $object->add_contact($contactid, GETPOST("type"), 'external'); + $typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type')); + $result = $object->add_contact($contactid, $typeid, 'external'); } // altairis: link ticket to project diff --git a/htdocs/ticket/contact.php b/htdocs/ticket/contact.php index dacac9f5225..13419cf795e 100644 --- a/htdocs/ticket/contact.php +++ b/htdocs/ticket/contact.php @@ -71,7 +71,8 @@ if ($action == 'addcontact' && $user->rights->ticket->write) { if ($result > 0 && ($id > 0 || (!empty($track_id)))) { $contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int')); - $result = $object->add_contact($contactid, $type, $source); + $typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type')); + $result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09')); } if ($result >= 0) { From 7870a33fd3de524674ad2dd919929cc89132ec06 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 30 Nov 2020 15:39:35 +0100 Subject: [PATCH 072/297] Update invoice.php --- htdocs/takepos/invoice.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php index 323b105caed..493202376a9 100644 --- a/htdocs/takepos/invoice.php +++ b/htdocs/takepos/invoice.php @@ -415,7 +415,11 @@ if ($action == "delete") { // We delete the lines $resdeletelines = 1; foreach($invoice->lines as $line){ - $resdeletelines *= $invoice->deleteline($line->id); + $tmpres = $invoice->deleteline($line->id); + if ($tmpres < 0) { + $resdeletelines = 0; + break; + } } $sql = "UPDATE ".MAIN_DB_PREFIX."facture set fk_soc=".$conf->global->{'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"]}; From 765df4191840b58a7776fb030793315a48ef85ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Mon, 30 Nov 2020 15:44:29 +0100 Subject: [PATCH 073/297] introduce GETPOSTINT --- htdocs/core/lib/functions.lib.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 61360d66f51..f594cdd052c 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -604,6 +604,22 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null return $out; } +/** + * Return value of a param into GET or POST supervariable. + * Use the property $user->default_values[path]['creatform'] and/or $user->default_values[path]['filters'] and/or $user->default_values[path]['sortorder'] + * Note: The property $user->default_values is loaded by main.php when loading the user. + * + * @param string $paramname Name of parameter to found + * @param int $method Type of method (0 = get then post, 1 = only get, 2 = only post, 3 = post then get) + * @param int $filter Filter to apply when $check is set to 'custom'. (See http://php.net/manual/en/filter.filters.php for détails) + * @param mixed $options Options to pass to filter_var when $check is set to 'custom' + * @param string $noreplace Force disable of replacement of __xxx__ strings. + * @return int Value found (int) + */ +function GETPOSTINT($paramname, $method = 0, $filter = null, $options = null, $noreplace = 0) +{ + return (int) GETPOST($paramname, 'int', $method, $filter, $options, $noreplace); +} /** * Return a value after checking on a rule. From ff30021d3588a9971f3c9e8613d4b1e79abe449c Mon Sep 17 00:00:00 2001 From: lmarcouiller Date: Mon, 30 Nov 2020 16:50:12 +0100 Subject: [PATCH 074/297] =?UTF-8?q?Close=20#15307=20Encours=20dpass=C3=A9?= =?UTF-8?q?=20with=20eldy=20suggestions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/core/boxes/box_customers_outstanding_bill_reached.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php index f3c358d2335..24690895ff5 100644 --- a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php +++ b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php @@ -103,6 +103,8 @@ class box_customers_outstanding_bill_reached extends ModeleBoxes $sql .= " AND s.entity IN (".getEntity('societe').")"; if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id; if ($user->socid) $sql .= " AND s.rowid = $user->socid"; + $sql .= " AND s.outstanding_limit > 0"; + $sql .= " AND s.rowid IN (SELECT fk_soc from ".MAIN_DB_PREFIX."facture as f WHERE f.fk_statut = 1 and f.fk_soc = s.rowid)"; $sql .= " ORDER BY s.tms DESC"; $sql .= $this->db->plimit($max, 0); From 3443174f67180421e4c736062fda9644afec3832 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 30 Nov 2020 18:28:04 +0100 Subject: [PATCH 075/297] Sync transifex --- htdocs/core/class/html.form.class.php | 2 +- htdocs/core/tpl/object_discounts.tpl.php | 4 +- htdocs/core/tpl/objectline_title.tpl.php | 4 +- htdocs/core/tpl/objectline_view.tpl.php | 2 +- htdocs/langs/am_ET/accountancy.lang | 37 +- htdocs/langs/am_ET/admin.lang | 9 +- htdocs/langs/am_ET/banks.lang | 4 + htdocs/langs/am_ET/categories.lang | 8 +- htdocs/langs/am_ET/companies.lang | 37 +- htdocs/langs/am_ET/hrm.lang | 1 + htdocs/langs/am_ET/languages.lang | 1 + htdocs/langs/am_ET/main.lang | 26 +- htdocs/langs/am_ET/mrp.lang | 1 + htdocs/langs/am_ET/website.lang | 4 +- htdocs/langs/ar_SA/accountancy.lang | 37 +- htdocs/langs/ar_SA/admin.lang | 9 +- htdocs/langs/ar_SA/banks.lang | 4 + htdocs/langs/ar_SA/categories.lang | 8 +- htdocs/langs/ar_SA/companies.lang | 37 +- htdocs/langs/ar_SA/hrm.lang | 1 + htdocs/langs/ar_SA/languages.lang | 1 + htdocs/langs/ar_SA/main.lang | 26 +- htdocs/langs/ar_SA/mrp.lang | 1 + htdocs/langs/ar_SA/website.lang | 4 +- htdocs/langs/az_AZ/accountancy.lang | 37 +- htdocs/langs/az_AZ/admin.lang | 9 +- htdocs/langs/az_AZ/banks.lang | 4 + htdocs/langs/az_AZ/categories.lang | 8 +- htdocs/langs/az_AZ/companies.lang | 37 +- htdocs/langs/az_AZ/hrm.lang | 1 + htdocs/langs/az_AZ/languages.lang | 1 + htdocs/langs/az_AZ/main.lang | 26 +- htdocs/langs/az_AZ/mrp.lang | 1 + htdocs/langs/az_AZ/website.lang | 4 +- htdocs/langs/bg_BG/accountancy.lang | 37 +- htdocs/langs/bg_BG/admin.lang | 9 +- htdocs/langs/bg_BG/banks.lang | 4 + htdocs/langs/bg_BG/categories.lang | 8 +- htdocs/langs/bg_BG/companies.lang | 37 +- htdocs/langs/bg_BG/hrm.lang | 1 + htdocs/langs/bg_BG/languages.lang | 1 + htdocs/langs/bg_BG/main.lang | 26 +- htdocs/langs/bg_BG/mrp.lang | 1 + htdocs/langs/bg_BG/website.lang | 4 +- htdocs/langs/bn_BD/accountancy.lang | 37 +- htdocs/langs/bn_BD/admin.lang | 9 +- htdocs/langs/bn_BD/banks.lang | 4 + htdocs/langs/bn_BD/categories.lang | 8 +- htdocs/langs/bn_BD/companies.lang | 37 +- htdocs/langs/bn_BD/hrm.lang | 1 + htdocs/langs/bn_BD/languages.lang | 1 + htdocs/langs/bn_BD/main.lang | 26 +- htdocs/langs/bn_BD/mrp.lang | 1 + htdocs/langs/bn_BD/website.lang | 4 +- htdocs/langs/bn_IN/accountancy.lang | 37 +- htdocs/langs/bn_IN/admin.lang | 9 +- htdocs/langs/bn_IN/banks.lang | 4 + htdocs/langs/bn_IN/categories.lang | 8 +- htdocs/langs/bn_IN/companies.lang | 37 +- htdocs/langs/bn_IN/hrm.lang | 1 + htdocs/langs/bn_IN/languages.lang | 1 + htdocs/langs/bn_IN/main.lang | 26 +- htdocs/langs/bn_IN/mrp.lang | 1 + htdocs/langs/bn_IN/website.lang | 4 +- htdocs/langs/bs_BA/accountancy.lang | 37 +- htdocs/langs/bs_BA/admin.lang | 9 +- htdocs/langs/bs_BA/banks.lang | 4 + htdocs/langs/bs_BA/categories.lang | 8 +- htdocs/langs/bs_BA/companies.lang | 37 +- htdocs/langs/bs_BA/hrm.lang | 1 + htdocs/langs/bs_BA/languages.lang | 1 + htdocs/langs/bs_BA/main.lang | 26 +- htdocs/langs/bs_BA/mrp.lang | 1 + htdocs/langs/bs_BA/website.lang | 4 +- htdocs/langs/ca_ES/accountancy.lang | 14 +- htdocs/langs/ca_ES/admin.lang | 175 ++++---- htdocs/langs/ca_ES/banks.lang | 15 +- htdocs/langs/ca_ES/categories.lang | 4 +- htdocs/langs/ca_ES/companies.lang | 47 ++- htdocs/langs/ca_ES/hrm.lang | 5 +- htdocs/langs/ca_ES/languages.lang | 1 + htdocs/langs/ca_ES/main.lang | 39 +- htdocs/langs/ca_ES/mrp.lang | 9 +- htdocs/langs/ca_ES/website.lang | 10 +- htdocs/langs/cs_CZ/accountancy.lang | 37 +- htdocs/langs/cs_CZ/admin.lang | 9 +- htdocs/langs/cs_CZ/banks.lang | 4 + htdocs/langs/cs_CZ/categories.lang | 8 +- htdocs/langs/cs_CZ/companies.lang | 37 +- htdocs/langs/cs_CZ/hrm.lang | 1 + htdocs/langs/cs_CZ/languages.lang | 1 + htdocs/langs/cs_CZ/main.lang | 26 +- htdocs/langs/cs_CZ/mrp.lang | 1 + htdocs/langs/cs_CZ/website.lang | 4 +- htdocs/langs/da_DK/accountancy.lang | 45 ++- htdocs/langs/da_DK/admin.lang | 201 ++++----- htdocs/langs/da_DK/banks.lang | 4 + htdocs/langs/da_DK/categories.lang | 8 +- htdocs/langs/da_DK/companies.lang | 37 +- htdocs/langs/da_DK/hrm.lang | 1 + htdocs/langs/da_DK/languages.lang | 3 +- htdocs/langs/da_DK/main.lang | 106 +++-- htdocs/langs/da_DK/mrp.lang | 7 +- htdocs/langs/da_DK/website.lang | 4 +- htdocs/langs/de_AT/main.lang | 1 + htdocs/langs/de_CH/accountancy.lang | 10 - htdocs/langs/de_CH/admin.lang | 2 - htdocs/langs/de_CH/companies.lang | 6 +- htdocs/langs/de_CH/main.lang | 2 + htdocs/langs/de_DE/accountancy.lang | 37 +- htdocs/langs/de_DE/admin.lang | 27 +- htdocs/langs/de_DE/banks.lang | 1 + htdocs/langs/de_DE/categories.lang | 8 +- htdocs/langs/de_DE/companies.lang | 33 +- htdocs/langs/de_DE/hrm.lang | 1 + htdocs/langs/de_DE/languages.lang | 3 +- htdocs/langs/de_DE/main.lang | 62 ++- htdocs/langs/de_DE/mrp.lang | 1 + htdocs/langs/de_DE/website.lang | 12 +- htdocs/langs/el_GR/accountancy.lang | 37 +- htdocs/langs/el_GR/admin.lang | 9 +- htdocs/langs/el_GR/banks.lang | 4 + htdocs/langs/el_GR/categories.lang | 8 +- htdocs/langs/el_GR/companies.lang | 37 +- htdocs/langs/el_GR/hrm.lang | 1 + htdocs/langs/el_GR/languages.lang | 1 + htdocs/langs/el_GR/main.lang | 26 +- htdocs/langs/el_GR/mrp.lang | 1 + htdocs/langs/el_GR/website.lang | 4 +- htdocs/langs/en_AU/main.lang | 1 - htdocs/langs/en_CA/main.lang | 1 - htdocs/langs/en_GB/accountancy.lang | 6 - htdocs/langs/en_GB/main.lang | 1 - htdocs/langs/en_IN/main.lang | 1 - htdocs/langs/en_SG/companies.lang | 2 - htdocs/langs/en_SG/main.lang | 1 - htdocs/langs/es_AR/accountancy.lang | 2 +- htdocs/langs/es_AR/companies.lang | 5 +- htdocs/langs/es_CL/accountancy.lang | 9 +- htdocs/langs/es_CL/admin.lang | 3 - htdocs/langs/es_CL/categories.lang | 1 - htdocs/langs/es_CL/companies.lang | 1 - htdocs/langs/es_CL/main.lang | 2 + htdocs/langs/es_CL/website.lang | 1 - htdocs/langs/es_CO/accountancy.lang | 7 - htdocs/langs/es_CO/admin.lang | 3 - htdocs/langs/es_CO/banks.lang | 1 + htdocs/langs/es_CO/categories.lang | 1 + htdocs/langs/es_CO/website.lang | 2 - htdocs/langs/es_EC/accountancy.lang | 9 +- htdocs/langs/es_EC/admin.lang | 3 - htdocs/langs/es_EC/categories.lang | 2 - htdocs/langs/es_EC/companies.lang | 3 +- htdocs/langs/es_EC/main.lang | 1 + htdocs/langs/es_EC/website.lang | 1 - htdocs/langs/es_ES/accountancy.lang | 2 + htdocs/langs/es_ES/admin.lang | 13 +- htdocs/langs/es_ES/banks.lang | 10 +- htdocs/langs/es_ES/categories.lang | 8 +- htdocs/langs/es_ES/companies.lang | 37 +- htdocs/langs/es_ES/hrm.lang | 1 + htdocs/langs/es_ES/languages.lang | 29 +- htdocs/langs/es_ES/main.lang | 5 + htdocs/langs/es_ES/mrp.lang | 3 +- htdocs/langs/es_ES/website.lang | 16 +- htdocs/langs/es_MX/accountancy.lang | 3 - htdocs/langs/es_MX/companies.lang | 23 +- htdocs/langs/es_MX/main.lang | 2 + htdocs/langs/es_MX/website.lang | 1 - htdocs/langs/es_PE/accountancy.lang | 2 +- htdocs/langs/es_VE/main.lang | 1 + htdocs/langs/es_VE/website.lang | 2 - htdocs/langs/et_EE/accountancy.lang | 37 +- htdocs/langs/et_EE/admin.lang | 9 +- htdocs/langs/et_EE/banks.lang | 4 + htdocs/langs/et_EE/categories.lang | 8 +- htdocs/langs/et_EE/companies.lang | 37 +- htdocs/langs/et_EE/hrm.lang | 1 + htdocs/langs/et_EE/languages.lang | 1 + htdocs/langs/et_EE/main.lang | 26 +- htdocs/langs/et_EE/mrp.lang | 1 + htdocs/langs/et_EE/website.lang | 4 +- htdocs/langs/eu_ES/accountancy.lang | 37 +- htdocs/langs/eu_ES/admin.lang | 9 +- htdocs/langs/eu_ES/banks.lang | 4 + htdocs/langs/eu_ES/categories.lang | 8 +- htdocs/langs/eu_ES/companies.lang | 37 +- htdocs/langs/eu_ES/hrm.lang | 1 + htdocs/langs/eu_ES/languages.lang | 1 + htdocs/langs/eu_ES/main.lang | 26 +- htdocs/langs/eu_ES/mrp.lang | 1 + htdocs/langs/eu_ES/website.lang | 4 +- htdocs/langs/fa_IR/accountancy.lang | 37 +- htdocs/langs/fa_IR/admin.lang | 9 +- htdocs/langs/fa_IR/banks.lang | 4 + htdocs/langs/fa_IR/categories.lang | 8 +- htdocs/langs/fa_IR/companies.lang | 37 +- htdocs/langs/fa_IR/hrm.lang | 1 + htdocs/langs/fa_IR/languages.lang | 1 + htdocs/langs/fa_IR/main.lang | 26 +- htdocs/langs/fa_IR/mrp.lang | 1 + htdocs/langs/fa_IR/website.lang | 4 +- htdocs/langs/fi_FI/accountancy.lang | 37 +- htdocs/langs/fi_FI/admin.lang | 9 +- htdocs/langs/fi_FI/banks.lang | 4 + htdocs/langs/fi_FI/categories.lang | 8 +- htdocs/langs/fi_FI/companies.lang | 37 +- htdocs/langs/fi_FI/hrm.lang | 1 + htdocs/langs/fi_FI/languages.lang | 1 + htdocs/langs/fi_FI/main.lang | 26 +- htdocs/langs/fi_FI/mrp.lang | 1 + htdocs/langs/fi_FI/website.lang | 4 +- htdocs/langs/fr_BE/accountancy.lang | 1 - htdocs/langs/fr_CA/accountancy.lang | 6 - htdocs/langs/fr_CH/companies.lang | 2 - htdocs/langs/fr_CH/main.lang | 24 +- htdocs/langs/fr_CI/companies.lang | 2 - htdocs/langs/fr_CM/companies.lang | 2 - htdocs/langs/fr_FR/accountancy.lang | 2 + htdocs/langs/fr_FR/admin.lang | 13 +- htdocs/langs/fr_FR/banks.lang | 4 + htdocs/langs/fr_FR/bills.lang | 2 +- htdocs/langs/fr_FR/categories.lang | 8 +- htdocs/langs/fr_FR/companies.lang | 37 +- htdocs/langs/fr_FR/cron.lang | 10 +- htdocs/langs/fr_FR/hrm.lang | 1 + htdocs/langs/fr_FR/languages.lang | 1 + htdocs/langs/fr_FR/main.lang | 7 +- htdocs/langs/fr_FR/mrp.lang | 1 + htdocs/langs/fr_FR/website.lang | 4 +- htdocs/langs/fr_GA/companies.lang | 1 - htdocs/langs/gl_ES/accountancy.lang | 37 +- htdocs/langs/gl_ES/admin.lang | 9 +- htdocs/langs/gl_ES/banks.lang | 4 + htdocs/langs/gl_ES/categories.lang | 8 +- htdocs/langs/gl_ES/companies.lang | 37 +- htdocs/langs/gl_ES/hrm.lang | 1 + htdocs/langs/gl_ES/languages.lang | 1 + htdocs/langs/gl_ES/main.lang | 26 +- htdocs/langs/gl_ES/mrp.lang | 1 + htdocs/langs/gl_ES/website.lang | 4 +- htdocs/langs/he_IL/accountancy.lang | 37 +- htdocs/langs/he_IL/admin.lang | 9 +- htdocs/langs/he_IL/banks.lang | 4 + htdocs/langs/he_IL/categories.lang | 8 +- htdocs/langs/he_IL/companies.lang | 37 +- htdocs/langs/he_IL/hrm.lang | 1 + htdocs/langs/he_IL/languages.lang | 1 + htdocs/langs/he_IL/main.lang | 26 +- htdocs/langs/he_IL/mrp.lang | 1 + htdocs/langs/he_IL/website.lang | 4 +- htdocs/langs/hi_IN/accountancy.lang | 37 +- htdocs/langs/hi_IN/admin.lang | 9 +- htdocs/langs/hi_IN/banks.lang | 4 + htdocs/langs/hi_IN/categories.lang | 8 +- htdocs/langs/hi_IN/companies.lang | 37 +- htdocs/langs/hi_IN/hrm.lang | 1 + htdocs/langs/hi_IN/languages.lang | 1 + htdocs/langs/hi_IN/main.lang | 26 +- htdocs/langs/hi_IN/mrp.lang | 1 + htdocs/langs/hi_IN/website.lang | 4 +- htdocs/langs/hr_HR/accountancy.lang | 37 +- htdocs/langs/hr_HR/admin.lang | 9 +- htdocs/langs/hr_HR/banks.lang | 4 + htdocs/langs/hr_HR/categories.lang | 8 +- htdocs/langs/hr_HR/companies.lang | 37 +- htdocs/langs/hr_HR/hrm.lang | 1 + htdocs/langs/hr_HR/languages.lang | 1 + htdocs/langs/hr_HR/main.lang | 5 + htdocs/langs/hr_HR/mrp.lang | 1 + htdocs/langs/hr_HR/website.lang | 4 +- htdocs/langs/hu_HU/accountancy.lang | 37 +- htdocs/langs/hu_HU/admin.lang | 9 +- htdocs/langs/hu_HU/banks.lang | 10 +- htdocs/langs/hu_HU/categories.lang | 8 +- htdocs/langs/hu_HU/companies.lang | 37 +- htdocs/langs/hu_HU/hrm.lang | 1 + htdocs/langs/hu_HU/languages.lang | 1 + htdocs/langs/hu_HU/main.lang | 146 ++++--- htdocs/langs/hu_HU/mrp.lang | 1 + htdocs/langs/hu_HU/website.lang | 4 +- htdocs/langs/id_ID/accountancy.lang | 37 +- htdocs/langs/id_ID/admin.lang | 9 +- htdocs/langs/id_ID/banks.lang | 4 + htdocs/langs/id_ID/categories.lang | 8 +- htdocs/langs/id_ID/companies.lang | 37 +- htdocs/langs/id_ID/hrm.lang | 1 + htdocs/langs/id_ID/languages.lang | 1 + htdocs/langs/id_ID/main.lang | 26 +- htdocs/langs/id_ID/mrp.lang | 1 + htdocs/langs/id_ID/website.lang | 4 +- htdocs/langs/is_IS/accountancy.lang | 37 +- htdocs/langs/is_IS/admin.lang | 9 +- htdocs/langs/is_IS/banks.lang | 4 + htdocs/langs/is_IS/categories.lang | 8 +- htdocs/langs/is_IS/companies.lang | 37 +- htdocs/langs/is_IS/hrm.lang | 1 + htdocs/langs/is_IS/languages.lang | 1 + htdocs/langs/is_IS/main.lang | 26 +- htdocs/langs/is_IS/mrp.lang | 1 + htdocs/langs/is_IS/website.lang | 4 +- htdocs/langs/it_CH/companies.lang | 2 - htdocs/langs/it_IT/accountancy.lang | 37 +- htdocs/langs/it_IT/admin.lang | 13 +- htdocs/langs/it_IT/banks.lang | 4 + htdocs/langs/it_IT/categories.lang | 8 +- htdocs/langs/it_IT/companies.lang | 35 +- htdocs/langs/it_IT/hrm.lang | 1 + htdocs/langs/it_IT/languages.lang | 1 + htdocs/langs/it_IT/main.lang | 5 + htdocs/langs/it_IT/mrp.lang | 1 + htdocs/langs/it_IT/website.lang | 4 +- htdocs/langs/ja_JP/accountancy.lang | 2 + htdocs/langs/ja_JP/admin.lang | 9 +- htdocs/langs/ja_JP/banks.lang | 1 + htdocs/langs/ja_JP/categories.lang | 2 + htdocs/langs/ja_JP/companies.lang | 31 +- htdocs/langs/ja_JP/hrm.lang | 15 +- htdocs/langs/ja_JP/languages.lang | 1 + htdocs/langs/ja_JP/main.lang | 5 + htdocs/langs/ja_JP/mrp.lang | 1 + htdocs/langs/ja_JP/website.lang | 262 ++++++------ htdocs/langs/ka_GE/accountancy.lang | 37 +- htdocs/langs/ka_GE/admin.lang | 9 +- htdocs/langs/ka_GE/banks.lang | 4 + htdocs/langs/ka_GE/categories.lang | 8 +- htdocs/langs/ka_GE/companies.lang | 37 +- htdocs/langs/ka_GE/hrm.lang | 1 + htdocs/langs/ka_GE/languages.lang | 1 + htdocs/langs/ka_GE/main.lang | 26 +- htdocs/langs/ka_GE/mrp.lang | 1 + htdocs/langs/ka_GE/website.lang | 4 +- htdocs/langs/km_KH/accountancy.lang | 37 +- htdocs/langs/km_KH/admin.lang | 9 +- htdocs/langs/km_KH/banks.lang | 4 + htdocs/langs/km_KH/categories.lang | 8 +- htdocs/langs/km_KH/companies.lang | 37 +- htdocs/langs/km_KH/hrm.lang | 1 + htdocs/langs/km_KH/languages.lang | 1 + htdocs/langs/km_KH/main.lang | 26 +- htdocs/langs/km_KH/mrp.lang | 1 + htdocs/langs/km_KH/website.lang | 4 +- htdocs/langs/kn_IN/accountancy.lang | 37 +- htdocs/langs/kn_IN/admin.lang | 9 +- htdocs/langs/kn_IN/banks.lang | 4 + htdocs/langs/kn_IN/categories.lang | 8 +- htdocs/langs/kn_IN/companies.lang | 37 +- htdocs/langs/kn_IN/hrm.lang | 1 + htdocs/langs/kn_IN/languages.lang | 1 + htdocs/langs/kn_IN/main.lang | 26 +- htdocs/langs/kn_IN/mrp.lang | 1 + htdocs/langs/kn_IN/website.lang | 4 +- htdocs/langs/ko_KR/accountancy.lang | 37 +- htdocs/langs/ko_KR/admin.lang | 9 +- htdocs/langs/ko_KR/banks.lang | 4 + htdocs/langs/ko_KR/categories.lang | 8 +- htdocs/langs/ko_KR/companies.lang | 37 +- htdocs/langs/ko_KR/hrm.lang | 1 + htdocs/langs/ko_KR/languages.lang | 1 + htdocs/langs/ko_KR/main.lang | 26 +- htdocs/langs/ko_KR/mrp.lang | 1 + htdocs/langs/ko_KR/website.lang | 4 +- htdocs/langs/lo_LA/accountancy.lang | 37 +- htdocs/langs/lo_LA/admin.lang | 9 +- htdocs/langs/lo_LA/banks.lang | 4 + htdocs/langs/lo_LA/categories.lang | 8 +- htdocs/langs/lo_LA/companies.lang | 37 +- htdocs/langs/lo_LA/hrm.lang | 1 + htdocs/langs/lo_LA/languages.lang | 1 + htdocs/langs/lo_LA/main.lang | 26 +- htdocs/langs/lo_LA/mrp.lang | 1 + htdocs/langs/lo_LA/website.lang | 4 +- htdocs/langs/lt_LT/accountancy.lang | 37 +- htdocs/langs/lt_LT/admin.lang | 9 +- htdocs/langs/lt_LT/banks.lang | 4 + htdocs/langs/lt_LT/categories.lang | 8 +- htdocs/langs/lt_LT/companies.lang | 37 +- htdocs/langs/lt_LT/hrm.lang | 1 + htdocs/langs/lt_LT/languages.lang | 1 + htdocs/langs/lt_LT/main.lang | 26 +- htdocs/langs/lt_LT/mrp.lang | 1 + htdocs/langs/lt_LT/website.lang | 4 +- htdocs/langs/lv_LV/accountancy.lang | 2 + htdocs/langs/lv_LV/admin.lang | 9 +- htdocs/langs/lv_LV/banks.lang | 4 + htdocs/langs/lv_LV/categories.lang | 8 +- htdocs/langs/lv_LV/companies.lang | 31 +- htdocs/langs/lv_LV/hrm.lang | 1 + htdocs/langs/lv_LV/languages.lang | 1 + htdocs/langs/lv_LV/main.lang | 5 + htdocs/langs/lv_LV/mrp.lang | 1 + htdocs/langs/lv_LV/website.lang | 4 +- htdocs/langs/mk_MK/accountancy.lang | 37 +- htdocs/langs/mk_MK/admin.lang | 9 +- htdocs/langs/mk_MK/banks.lang | 4 + htdocs/langs/mk_MK/categories.lang | 8 +- htdocs/langs/mk_MK/companies.lang | 37 +- htdocs/langs/mk_MK/hrm.lang | 1 + htdocs/langs/mk_MK/languages.lang | 1 + htdocs/langs/mk_MK/main.lang | 26 +- htdocs/langs/mk_MK/mrp.lang | 1 + htdocs/langs/mk_MK/website.lang | 4 +- htdocs/langs/mn_MN/accountancy.lang | 37 +- htdocs/langs/mn_MN/admin.lang | 9 +- htdocs/langs/mn_MN/banks.lang | 4 + htdocs/langs/mn_MN/categories.lang | 8 +- htdocs/langs/mn_MN/companies.lang | 37 +- htdocs/langs/mn_MN/hrm.lang | 1 + htdocs/langs/mn_MN/languages.lang | 1 + htdocs/langs/mn_MN/main.lang | 26 +- htdocs/langs/mn_MN/mrp.lang | 1 + htdocs/langs/mn_MN/website.lang | 4 +- htdocs/langs/nb_NO/accountancy.lang | 2 + htdocs/langs/nb_NO/admin.lang | 9 +- htdocs/langs/nb_NO/banks.lang | 1 + htdocs/langs/nb_NO/categories.lang | 2 + htdocs/langs/nb_NO/companies.lang | 31 +- htdocs/langs/nb_NO/hrm.lang | 1 + htdocs/langs/nb_NO/languages.lang | 3 +- htdocs/langs/nb_NO/main.lang | 5 + htdocs/langs/nb_NO/mrp.lang | 1 + htdocs/langs/nb_NO/website.lang | 1 + htdocs/langs/ne_NP/accountancy.lang | 37 +- htdocs/langs/ne_NP/admin.lang | 9 +- htdocs/langs/ne_NP/banks.lang | 4 + htdocs/langs/ne_NP/categories.lang | 8 +- htdocs/langs/ne_NP/companies.lang | 37 +- htdocs/langs/ne_NP/hrm.lang | 1 + htdocs/langs/ne_NP/languages.lang | 1 + htdocs/langs/ne_NP/main.lang | 26 +- htdocs/langs/ne_NP/mrp.lang | 1 + htdocs/langs/ne_NP/website.lang | 4 +- htdocs/langs/nl_BE/accountancy.lang | 2 +- htdocs/langs/nl_BE/banks.lang | 1 - htdocs/langs/nl_BE/companies.lang | 12 +- htdocs/langs/nl_BE/hrm.lang | 1 + htdocs/langs/nl_BE/languages.lang | 1 + htdocs/langs/nl_BE/main.lang | 4 +- htdocs/langs/nl_NL/accountancy.lang | 14 +- htdocs/langs/nl_NL/admin.lang | 53 +-- htdocs/langs/nl_NL/banks.lang | 12 +- htdocs/langs/nl_NL/categories.lang | 8 +- htdocs/langs/nl_NL/companies.lang | 31 +- htdocs/langs/nl_NL/hrm.lang | 1 + htdocs/langs/nl_NL/languages.lang | 19 +- htdocs/langs/nl_NL/main.lang | 34 +- htdocs/langs/nl_NL/mrp.lang | 1 + htdocs/langs/nl_NL/website.lang | 8 +- htdocs/langs/pl_PL/accountancy.lang | 37 +- htdocs/langs/pl_PL/admin.lang | 9 +- htdocs/langs/pl_PL/banks.lang | 4 + htdocs/langs/pl_PL/categories.lang | 8 +- htdocs/langs/pl_PL/companies.lang | 43 +- htdocs/langs/pl_PL/hrm.lang | 1 + htdocs/langs/pl_PL/languages.lang | 1 + htdocs/langs/pl_PL/main.lang | 56 ++- htdocs/langs/pl_PL/mrp.lang | 1 + htdocs/langs/pl_PL/website.lang | 4 +- htdocs/langs/pt_BR/accountancy.lang | 10 - htdocs/langs/pt_BR/admin.lang | 76 +--- htdocs/langs/pt_BR/banks.lang | 3 + htdocs/langs/pt_BR/categories.lang | 8 - htdocs/langs/pt_BR/companies.lang | 9 +- htdocs/langs/pt_BR/hrm.lang | 1 + htdocs/langs/pt_BR/main.lang | 25 +- htdocs/langs/pt_BR/website.lang | 2 - htdocs/langs/pt_PT/accountancy.lang | 37 +- htdocs/langs/pt_PT/admin.lang | 495 ++++++++++++----------- htdocs/langs/pt_PT/banks.lang | 22 +- htdocs/langs/pt_PT/categories.lang | 20 +- htdocs/langs/pt_PT/companies.lang | 85 ++-- htdocs/langs/pt_PT/hrm.lang | 1 + htdocs/langs/pt_PT/languages.lang | 1 + htdocs/langs/pt_PT/main.lang | 412 ++++++++++--------- htdocs/langs/pt_PT/mrp.lang | 1 + htdocs/langs/pt_PT/website.lang | 4 +- htdocs/langs/ro_RO/accountancy.lang | 2 + htdocs/langs/ro_RO/admin.lang | 9 +- htdocs/langs/ro_RO/banks.lang | 4 + htdocs/langs/ro_RO/categories.lang | 4 +- htdocs/langs/ro_RO/companies.lang | 37 +- htdocs/langs/ro_RO/hrm.lang | 1 + htdocs/langs/ro_RO/languages.lang | 1 + htdocs/langs/ro_RO/main.lang | 5 + htdocs/langs/ro_RO/mrp.lang | 1 + htdocs/langs/ro_RO/website.lang | 4 +- htdocs/langs/ru_RU/accountancy.lang | 37 +- htdocs/langs/ru_RU/admin.lang | 9 +- htdocs/langs/ru_RU/banks.lang | 4 + htdocs/langs/ru_RU/categories.lang | 8 +- htdocs/langs/ru_RU/companies.lang | 37 +- htdocs/langs/ru_RU/hrm.lang | 1 + htdocs/langs/ru_RU/languages.lang | 1 + htdocs/langs/ru_RU/main.lang | 26 +- htdocs/langs/ru_RU/mrp.lang | 1 + htdocs/langs/ru_RU/website.lang | 4 +- htdocs/langs/ru_UA/companies.lang | 2 - htdocs/langs/sk_SK/accountancy.lang | 37 +- htdocs/langs/sk_SK/admin.lang | 9 +- htdocs/langs/sk_SK/banks.lang | 4 + htdocs/langs/sk_SK/categories.lang | 8 +- htdocs/langs/sk_SK/companies.lang | 37 +- htdocs/langs/sk_SK/hrm.lang | 1 + htdocs/langs/sk_SK/languages.lang | 1 + htdocs/langs/sk_SK/main.lang | 26 +- htdocs/langs/sk_SK/mrp.lang | 1 + htdocs/langs/sk_SK/website.lang | 4 +- htdocs/langs/sl_SI/accountancy.lang | 37 +- htdocs/langs/sl_SI/admin.lang | 9 +- htdocs/langs/sl_SI/banks.lang | 4 + htdocs/langs/sl_SI/categories.lang | 8 +- htdocs/langs/sl_SI/companies.lang | 37 +- htdocs/langs/sl_SI/hrm.lang | 1 + htdocs/langs/sl_SI/languages.lang | 1 + htdocs/langs/sl_SI/main.lang | 26 +- htdocs/langs/sl_SI/mrp.lang | 1 + htdocs/langs/sl_SI/website.lang | 4 +- htdocs/langs/sq_AL/accountancy.lang | 37 +- htdocs/langs/sq_AL/admin.lang | 9 +- htdocs/langs/sq_AL/banks.lang | 4 + htdocs/langs/sq_AL/categories.lang | 8 +- htdocs/langs/sq_AL/companies.lang | 37 +- htdocs/langs/sq_AL/hrm.lang | 1 + htdocs/langs/sq_AL/languages.lang | 1 + htdocs/langs/sq_AL/main.lang | 26 +- htdocs/langs/sq_AL/mrp.lang | 1 + htdocs/langs/sq_AL/website.lang | 4 +- htdocs/langs/sr_RS/accountancy.lang | 37 +- htdocs/langs/sr_RS/admin.lang | 9 +- htdocs/langs/sr_RS/banks.lang | 4 + htdocs/langs/sr_RS/categories.lang | 8 +- htdocs/langs/sr_RS/companies.lang | 37 +- htdocs/langs/sr_RS/hrm.lang | 1 + htdocs/langs/sr_RS/languages.lang | 1 + htdocs/langs/sr_RS/main.lang | 26 +- htdocs/langs/sr_RS/mrp.lang | 1 + htdocs/langs/sr_RS/website.lang | 4 +- htdocs/langs/sv_SE/accountancy.lang | 37 +- htdocs/langs/sv_SE/admin.lang | 9 +- htdocs/langs/sv_SE/banks.lang | 4 + htdocs/langs/sv_SE/categories.lang | 8 +- htdocs/langs/sv_SE/companies.lang | 37 +- htdocs/langs/sv_SE/hrm.lang | 1 + htdocs/langs/sv_SE/languages.lang | 1 + htdocs/langs/sv_SE/main.lang | 26 +- htdocs/langs/sv_SE/mrp.lang | 1 + htdocs/langs/sv_SE/website.lang | 4 +- htdocs/langs/sw_SW/accountancy.lang | 37 +- htdocs/langs/sw_SW/admin.lang | 9 +- htdocs/langs/sw_SW/banks.lang | 4 + htdocs/langs/sw_SW/categories.lang | 8 +- htdocs/langs/sw_SW/companies.lang | 37 +- htdocs/langs/sw_SW/hrm.lang | 1 + htdocs/langs/sw_SW/languages.lang | 1 + htdocs/langs/sw_SW/main.lang | 26 +- htdocs/langs/sw_SW/mrp.lang | 1 + htdocs/langs/sw_SW/website.lang | 4 +- htdocs/langs/th_TH/accountancy.lang | 37 +- htdocs/langs/th_TH/admin.lang | 9 +- htdocs/langs/th_TH/banks.lang | 4 + htdocs/langs/th_TH/categories.lang | 8 +- htdocs/langs/th_TH/companies.lang | 37 +- htdocs/langs/th_TH/hrm.lang | 1 + htdocs/langs/th_TH/languages.lang | 1 + htdocs/langs/th_TH/main.lang | 26 +- htdocs/langs/th_TH/mrp.lang | 1 + htdocs/langs/th_TH/website.lang | 4 +- htdocs/langs/tr_TR/accountancy.lang | 37 +- htdocs/langs/tr_TR/admin.lang | 9 +- htdocs/langs/tr_TR/banks.lang | 4 + htdocs/langs/tr_TR/categories.lang | 8 +- htdocs/langs/tr_TR/companies.lang | 31 +- htdocs/langs/tr_TR/hrm.lang | 1 + htdocs/langs/tr_TR/languages.lang | 1 + htdocs/langs/tr_TR/main.lang | 26 +- htdocs/langs/tr_TR/mrp.lang | 1 + htdocs/langs/tr_TR/website.lang | 4 +- htdocs/langs/uk_UA/accountancy.lang | 37 +- htdocs/langs/uk_UA/admin.lang | 9 +- htdocs/langs/uk_UA/banks.lang | 4 + htdocs/langs/uk_UA/categories.lang | 8 +- htdocs/langs/uk_UA/companies.lang | 37 +- htdocs/langs/uk_UA/hrm.lang | 1 + htdocs/langs/uk_UA/languages.lang | 1 + htdocs/langs/uk_UA/main.lang | 26 +- htdocs/langs/uk_UA/mrp.lang | 1 + htdocs/langs/uk_UA/website.lang | 4 +- htdocs/langs/uz_UZ/accountancy.lang | 37 +- htdocs/langs/uz_UZ/admin.lang | 9 +- htdocs/langs/uz_UZ/banks.lang | 4 + htdocs/langs/uz_UZ/categories.lang | 8 +- htdocs/langs/uz_UZ/companies.lang | 37 +- htdocs/langs/uz_UZ/hrm.lang | 1 + htdocs/langs/uz_UZ/languages.lang | 1 + htdocs/langs/uz_UZ/main.lang | 26 +- htdocs/langs/uz_UZ/mrp.lang | 1 + htdocs/langs/uz_UZ/website.lang | 4 +- htdocs/langs/vi_VN/accountancy.lang | 37 +- htdocs/langs/vi_VN/admin.lang | 9 +- htdocs/langs/vi_VN/banks.lang | 4 + htdocs/langs/vi_VN/categories.lang | 8 +- htdocs/langs/vi_VN/companies.lang | 37 +- htdocs/langs/vi_VN/hrm.lang | 1 + htdocs/langs/vi_VN/languages.lang | 1 + htdocs/langs/vi_VN/main.lang | 26 +- htdocs/langs/vi_VN/mrp.lang | 1 + htdocs/langs/vi_VN/website.lang | 4 +- htdocs/langs/zh_CN/accountancy.lang | 37 +- htdocs/langs/zh_CN/admin.lang | 9 +- htdocs/langs/zh_CN/banks.lang | 4 + htdocs/langs/zh_CN/categories.lang | 8 +- htdocs/langs/zh_CN/companies.lang | 37 +- htdocs/langs/zh_CN/hrm.lang | 1 + htdocs/langs/zh_CN/languages.lang | 1 + htdocs/langs/zh_CN/main.lang | 26 +- htdocs/langs/zh_CN/mrp.lang | 1 + htdocs/langs/zh_CN/website.lang | 4 +- htdocs/langs/zh_HK/accountancy.lang | 37 +- htdocs/langs/zh_HK/admin.lang | 9 +- htdocs/langs/zh_HK/banks.lang | 4 + htdocs/langs/zh_HK/categories.lang | 8 +- htdocs/langs/zh_HK/companies.lang | 37 +- htdocs/langs/zh_HK/hrm.lang | 1 + htdocs/langs/zh_HK/languages.lang | 1 + htdocs/langs/zh_HK/main.lang | 26 +- htdocs/langs/zh_HK/mrp.lang | 1 + htdocs/langs/zh_HK/website.lang | 4 +- htdocs/langs/zh_TW/accountancy.lang | 41 +- htdocs/langs/zh_TW/admin.lang | 9 +- htdocs/langs/zh_TW/banks.lang | 4 + htdocs/langs/zh_TW/categories.lang | 8 +- htdocs/langs/zh_TW/companies.lang | 37 +- htdocs/langs/zh_TW/hrm.lang | 1 + htdocs/langs/zh_TW/languages.lang | 1 + htdocs/langs/zh_TW/main.lang | 114 +++--- htdocs/langs/zh_TW/mrp.lang | 1 + htdocs/langs/zh_TW/website.lang | 4 +- htdocs/theme/eldy/global.inc.php | 4 + htdocs/theme/md/style.css.php | 4 + 639 files changed, 6247 insertions(+), 3103 deletions(-) delete mode 100644 htdocs/langs/en_SG/companies.lang delete mode 100644 htdocs/langs/es_CO/website.lang delete mode 100644 htdocs/langs/es_VE/website.lang delete mode 100644 htdocs/langs/fr_CH/companies.lang delete mode 100644 htdocs/langs/fr_CI/companies.lang delete mode 100644 htdocs/langs/fr_CM/companies.lang delete mode 100644 htdocs/langs/it_CH/companies.lang delete mode 100644 htdocs/langs/ru_UA/companies.lang diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index ba491580efc..337234256be 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -4950,7 +4950,7 @@ class Form $nbqualifiedlines = $this->select_remises($selected, $htmlname, $newfilter, $socid, $maxvalue); if ($nbqualifiedlines > 0) { - print '   0) { $text .= ' ('.$addabsolutediscount.')'; } - print '
'.$text; + print '
'.$text.'
'; } else { // Discount available of type fixed amount (not credit note) $more = '('.$addabsolutediscount.')'; @@ -85,7 +85,7 @@ if ($absolute_creditnote > 0) { $text .= '('.$addabsolutediscount.')'; } - print '
'.$text; + print '
'.$text.'
'; } else { // We can add a credit note on a down payment or standard invoice or situation invoice // There is credit notes discounts available $more = $isInvoice && !$isNewObject ? ' ('.$viewabsolutediscount.')' : ''; diff --git a/htdocs/core/tpl/objectline_title.tpl.php b/htdocs/core/tpl/objectline_title.tpl.php index 495e0f6ad2b..bfced08e5c8 100644 --- a/htdocs/core/tpl/objectline_title.tpl.php +++ b/htdocs/core/tpl/objectline_title.tpl.php @@ -68,12 +68,12 @@ if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || !empty($conf->global->FA if (in_array($object->element, array('propal', 'commande', 'facture')) && $object->status == $object::STATUS_DRAFT) { global $mysoc; - print img_edit($langs->trans("UpdateForAllLines"), 0, 'class="clickvatforalllines opacitymedium paddingleft"'); + print img_edit($langs->trans("UpdateForAllLines"), 0, 'class="clickvatforalllines opacitymedium paddingleft cursorpointer"'); print ''; print ''; } print ''; diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php index c6ffe090c52..cba0b0b3e53 100644 --- a/htdocs/core/tpl/objectline_view.tpl.php +++ b/htdocs/core/tpl/objectline_view.tpl.php @@ -73,7 +73,7 @@ $coldisplay = 0; > global->MAIN_VIEW_LINE_NUMBER)) { ?> - +
%s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Export draft journal @@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Chart of accounts Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/am_ET/admin.lang b/htdocs/langs/am_ET/admin.lang index 0d3a7174232..f1c41a3b62b 100644 --- a/htdocs/langs/am_ET/admin.lang +++ b/htdocs/langs/am_ET/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=Edition of field %s FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=LDAP Setup LDAPGlobalParameters=Global parameters @@ -1670,7 +1672,7 @@ AdvancedEditor=Advanced editor ActivateFCKeditor=Activate advanced editor for: FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services) FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing) FCKeditorForUserSignature=WYSIWIG creation/edition of user signature FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting 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 user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup diff --git a/htdocs/langs/am_ET/banks.lang b/htdocs/langs/am_ET/banks.lang index 75f9549dca5..9500a5b8b2e 100644 --- a/htdocs/langs/am_ET/banks.lang +++ b/htdocs/langs/am_ET/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=Miscellaneous payments ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA mandate YourSEPAMandate=Your SEPA mandate FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/am_ET/categories.lang b/htdocs/langs/am_ET/categories.lang index 9bb71984ecf..ba37a43b4ec 100644 --- a/htdocs/langs/am_ET/categories.lang +++ b/htdocs/langs/am_ET/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup CategorieRecursiv=Link with parent tag/category automatically CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=Add the following product/service +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Show tag/category ByDefaultInList=By default in list ChooseCategory=Choose category -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/am_ET/companies.lang b/htdocs/langs/am_ET/companies.lang index 92674363ced..dadff6a7894 100644 --- a/htdocs/langs/am_ET/companies.lang +++ b/htdocs/langs/am_ET/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof Id 1 (Federal number) ProfId4CH=Prof Id 2 (Commercial Record number) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof Id 1 (R.U.T.) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr) ProfId2DE=Prof Id 2 (USt.-Nr) ProfId3DE=Prof Id 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof Id 1 (CIF/NIF) ProfId2ES=Prof Id 2 (Social security number) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (Collegiate number) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof Id 1 (SIREN) ProfId2FR=Prof Id 2 (SIRET) ProfId3FR=Prof Id 3 (NAF, old APE) ProfId4FR=Prof Id 4 (RCS/RM) -ProfId5FR=- +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Registration Number ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX) ProfId4IN=Prof Id 4 ProfId5IN=Prof Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Business permit) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (R.C.) ProfId2MA=Id prof. 2 (Patente) ProfId3MA=Id prof. 3 (I.F.) ProfId4MA=Id prof. 4 (C.N.S.S.) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof Id 1 (R.F.C). ProfId2MX=Prof Id 2 (R..P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK nummer ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof Id 2 (Social security number) ProfId3PT=Prof Id 3 (Commercial Record number) ProfId4PT=Prof Id 4 (Conservatory) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof Id 1 (OGRN) ProfId2RU=Prof Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s). NorProspectNorCustomer=Not prospect, nor customer JuridicalStatus=Legal Entity Type +Workforce=Workforce Staff=Employees ProspectLevelShort=Potential ProspectLevel=Prospect potential @@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor PaymentTypeBoth=Payment Type - Customer and Vendor MulticurrencyUsed=Use Multicurrency MulticurrencyCurrency=Currency +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/am_ET/hrm.lang b/htdocs/langs/am_ET/hrm.lang index 6cc7f6bef24..3b8f137e103 100644 --- a/htdocs/langs/am_ET/hrm.lang +++ b/htdocs/langs/am_ET/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=Employees Employee=Employee NewEmployee=New employee +ListOfEmployees=List of employees diff --git a/htdocs/langs/am_ET/languages.lang b/htdocs/langs/am_ET/languages.lang index cc80b9f1719..ba187326705 100644 --- a/htdocs/langs/am_ET/languages.lang +++ b/htdocs/langs/am_ET/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Spanish (Paraguay) Language_es_PE=Spanish (Peru) Language_es_PR=Spanish (Puerto Rico) +Language_es_US=Spanish (USA) Language_es_UY=Spanish (Uruguay) Language_es_GT=Spanish (Guatemala) Language_es_VE=Spanish (Venezuela) diff --git a/htdocs/langs/am_ET/main.lang b/htdocs/langs/am_ET/main.lang index 0af5c66f0e0..96c68cdcfa3 100644 --- a/htdocs/langs/am_ET/main.lang +++ b/htdocs/langs/am_ET/main.lang @@ -155,6 +155,7 @@ RemoveLink=Remove link AddToDraft=Add to draft Update=Update Close=Close +CloseAs=Set status to CloseBox=Remove widget from your dashboard Confirm=Confirm ConfirmSendCardByMail=Do you really want to send the content of this card by mail to %s? @@ -196,6 +197,7 @@ ReOpen=Re-Open Upload=Upload ToLink=Link Select=Select +SelectAll=Select all Choose=Choose Resize=Resize ResizeOrCrop=Resize or Crop @@ -256,6 +258,7 @@ Cards=Cards Card=Card Now=Now HourStart=Start hour +Deadline=Deadline Date=Date DateAndHour=Date and hour DateToday=Today's date @@ -264,8 +267,10 @@ DateStart=Start date DateEnd=End date DateCreation=Creation date DateCreationShort=Creat. date +IPCreation=Creation IP DateModification=Modification date DateModificationShort=Modif. date +IPModification=Modification IP DateLastModification=Latest modification date DateValidation=Validation date DateClosing=Closing date @@ -319,6 +324,7 @@ Morning=Morning Afternoon=Afternoon Quadri=Quadri MonthOfDay=Month of the day +DaysOfWeek=Days of week HourShort=H MinuteShort=mn Rate=Rate @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency MulticurrencyAmountHT=Amount (excl. tax), original currency MulticurrencyAmountTTC=Amount (inc. of tax), original currency MulticurrencyAmountVAT=Amount tax, original currency +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Amount tax 2 AmountLT2=Amount tax 3 AmountLT1ES=Amount RE @@ -487,6 +494,7 @@ By=By From=From FromDate=From FromLocation=From +at=at to=to To=to and=and @@ -509,6 +517,7 @@ Draft=Draft Drafts=Drafts StatusInterInvoiced=Invoiced Validated=Validated +ValidatedToProduce=Validated (To produce) Opened=Open OpenAll=Open (All) ClosedAll=Closed (All) @@ -655,6 +664,7 @@ Response=Response Priority=Priority SendByMail=Send by email MailSentBy=Email sent by +NotSent=Not sent TextUsedInTheMessageBody=Email body SendAcknowledgementByMail=Send confirmation email SendMail=Send email @@ -836,6 +846,7 @@ ListOfTemplates=List of templates Gender=Gender Genderman=Man Genderwoman=Woman +Genderother=Other ViewList=List view ViewGantt=Gantt view ViewKanban=Kanban view @@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous Calendar=Calendar GroupBy=Group by... ViewFlatList=View flat list +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Remove string '%s' SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at https://transifex.com/projects/p/dolibarr/ to add your improvements. DirectDownloadLink=Direct download link (public/external) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments SearchIntoExpenseReports=Expense reports SearchIntoLeaves=Leave SearchIntoTickets=Tickets +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Vendor payments +SearchIntoMiscPayments=Miscellaneous payments CommentLink=Comments NbComments=Number of comments CommentPage=Comments space @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Information Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Date of birth +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/am_ET/mrp.lang b/htdocs/langs/am_ET/mrp.lang index 863793063a0..f018be890cc 100644 --- a/htdocs/langs/am_ET/mrp.lang +++ b/htdocs/langs/am_ET/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/am_ET/website.lang b/htdocs/langs/am_ET/website.lang index 4b5294d5e43..03e042e4be6 100644 --- a/htdocs/langs/am_ET/website.lang +++ b/htdocs/langs/am_ET/website.lang @@ -31,7 +31,7 @@ AddWebsite=Add website Webpage=Web page/container AddPage=Add page/container HomePage=Home Page -PageContainer=Page/container +PageContainer=Page PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. 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. SiteDeleted=Web site '%s' deleted @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=RSS Feed RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/ar_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang index cf3e6a34fc5..0809eff3c9f 100644 --- a/htdocs/langs/ar_SA/accountancy.lang +++ b/htdocs/langs/ar_SA/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Default for service DefaultForProduct=Default for product CantSuggest=Can't suggest AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s -ConfigAccountingExpert=إعدادات وحدة الخبير المحاسبي +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Journalization -Journaux=دفاتر اليومية +Journals=دفاتر اليومية JournalFinancial=دفاتر اليومية المالية BackToChartofaccounts=العودة لشجرة الحسابات Chartofaccounts=جدول الحسابات +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Current dedicated account AssignDedicatedAccountingAccount=New account to assign InvoiceLabel=Invoice label @@ -33,8 +35,8 @@ OtherInfo=Other information DeleteCptCategory=Remove accounting account from group ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group? JournalizationInLedgerStatus=Status of journalization -AlreadyInGeneralLedger=Already journalized in ledgers -NotYetInGeneralLedger=Not yet journalized in ledgers +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group DetailByAccount=Show detail by account AccountWithNonZeroValues=Accounts with non zero values @@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC CountriesNotInEEC=Countries not in EEC CountriesInEECExceptMe=Countries in EEC except %s CountriesExceptMe=All countries except %s -AccountantFiles=Export accounting documents +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup @@ -79,7 +83,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) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Select active chart of accounts ChangeAndLoad=Change and load Addanaccount=إضافة حساب محاسبي @@ -89,6 +93,8 @@ SubledgerAccount=Subledger account SubledgerAccountLabel=Subledger account label ShowAccountingAccount=Show accounting account ShowAccountingJournal=Show accounting journal +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Accounting account suggested MenuDefaultAccounts=Default accounts MenuBankAccounts=الحسابات المصرفية @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding CreateMvts=Create new transaction UpdateMvts=Modification of a transaction ValidTransaction=Validate transaction -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=Ledger +BookkeepingSubAccount=Subledger AccountBalance=Account balance ObjectsRef=Source object ref CAHTF=Total purchase vendor before tax @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=دفتر البيع اليومي ACCOUNTING_PURCHASE_JOURNAL=دفتر الشراء اليومي @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups ByYear=بحلول العام NotMatch=Not Set -DeleteMvt=Delete Ledger lines +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=Year to delete DelJournal=Journal to delete -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=دفتر المالية اليومي ExpenseReportsJournal=Expense reports journal DescFinanceJournal=دفتر المالية اليومي المتضمن لجميع الدفعات عن طريق الحساب المصرفي -DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Account for VAT not defined ThirdpartyAccountNotDefined=Account for third party not defined ProductAccountNotDefined=Account for product not defined @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu %s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Export draft journal @@ -326,6 +339,8 @@ Modelcsv_configurable=Export Configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Chart of accounts Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang index e9b811a9b65..6b8e53c6c3b 100644 --- a/htdocs/langs/ar_SA/admin.lang +++ b/htdocs/langs/ar_SA/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=طبعة من ميدان%s FillThisOnlyIfRequired=مثال: +2 (ملء إلا إذا تعوض توقيت المشاكل من ذوي الخبرة) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member MemberSendInformationByMailByDefault=مربع لإرسال الرسائل للأعضاء تأكيدا على افتراضي VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=LDAP الإعداد LDAPGlobalParameters=المعايير العالمية @@ -1670,7 +1672,7 @@ AdvancedEditor=محرر متقدم ActivateFCKeditor=تفعيل محرر متقدم ل: FCKeditorForCompany=WYSIWIG إنشاء / الطبعة شركات ووصف المذكرة FCKeditorForProduct=WYSIWIG إنشاء / الطبعة المنتجات / الخدمات ووصف المذكرة -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG إنشاء / الطبعة بالبريد FCKeditorForUserSignature=إنشاء WYSIWIG / طبعة التوقيع المستعمل FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting 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 user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view ##### Clicktodial ##### ClickToDialSetup=انقر لإعداد وحدة الاتصال الهاتفي diff --git a/htdocs/langs/ar_SA/banks.lang b/htdocs/langs/ar_SA/banks.lang index 2c19df5172d..5b82860bea7 100644 --- a/htdocs/langs/ar_SA/banks.lang +++ b/htdocs/langs/ar_SA/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=مدفوعات متنوعة ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA mandate YourSEPAMandate=تفويض سيبا الخاص بك FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/ar_SA/categories.lang b/htdocs/langs/ar_SA/categories.lang index 88750f89628..fa97cbaba63 100644 --- a/htdocs/langs/ar_SA/categories.lang +++ b/htdocs/langs/ar_SA/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=إعداد العلامات / الفئات CategorieRecursiv=ربط مع العلامة / الفئة الاب تلقائيا CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=أضف المنتج / الخدمة التالية +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=إظهار العلامة / الفئة ByDefaultInList=افتراضيا في القائمة ChooseCategory=Choose category -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/ar_SA/companies.lang b/htdocs/langs/ar_SA/companies.lang index b033fe22e3b..a17eed9cf32 100644 --- a/htdocs/langs/ar_SA/companies.lang +++ b/htdocs/langs/ar_SA/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=البروفيسور رقم 1 (USt.-IdNr) ProfId2AT=البروفيسور رقم 2 (USt.-العدد) ProfId3AT=البروفيسور رقم 3 (Handelsregister-العدد). ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=الأستاذ عيد 1 (ايه. بي.) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=الأستاذ عيد 1 (عدد المهنية) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao المحلي) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=الأستاذ عيد 1 (عدد الاتحادية) ProfId4CH=الأستاذ عيد 2 (رقم السجل التجاري) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=الأستاذ رقم 1 (شبق) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=الأستاذ عيد 1 (USt. - IdNr) ProfId2DE=الأستاذ عيد 2 (رقم USt. -) ProfId3DE=الأستاذ عيد 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=(CNAE) ProfId2ES=(رقم الضمان الاجتماعي) ProfId3ES=(IAE) ProfId4ES=(عدد الجماعية) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=الأستاذ عيد 1 (صفارة إنذار) ProfId2FR=الأستاذ عيد 2 (SIRET) ProfId3FR=الأستاذ عيد 3 (NAF ، البالغ من العمر قرد) ProfId4FR=الأستاذ عيد 4 (نظام المنسقين المقيمين / لجمهورية مقدونيا) -ProfId5FR=الأستاذ رقم 5 +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=الأستاذ عيد 1 (رقم التسجيل) ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=معرف البروفيسور 3 ProfId4IN=معرف البروفيسور 4 ProfId5IN=الأستاذ رقم 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Business permit) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=الرقم أ. 1 (RC) ProfId2MA=الرقم أ. 2 (Patente) ProfId3MA=الرقم أ. 3 (إذا) ProfId4MA=الرقم أ. 4 (CNSS) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=الأستاذ رقم 1 (RFC). ProfId2MX=الأستاذ رقم 2 (ر. P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK نومير ProfId2NL=- ProfId3NL=- ProfId4NL=- -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=الأستاذ عيد 1 (NIPC) ProfId2PT=الأستاذ عيد 2 (رقم الضمان الاجتماعي) ProfId3PT=الأستاذ عيد 3 (رقم السجل التجاري) ProfId4PT=الأستاذ عيد 4 (يضم) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=الأستاذ رقم 1 (OGRN) ProfId2RU=الأستاذ رقم 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi ErrorVATCheckMS_UNAVAILABLE=وليس من الممكن التحقق. تأكد من خدمة لا تقدمها دولة عضو (في المائة). NorProspectNorCustomer=Not prospect, nor customer JuridicalStatus=Legal Entity Type +Workforce=Workforce Staff=الموظفين ProspectLevelShort=المحتملة ProspectLevel=آفاق محتملة @@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor PaymentTypeBoth=Payment Type - Customer and Vendor MulticurrencyUsed=Use Multicurrency MulticurrencyCurrency=العملة +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/ar_SA/hrm.lang b/htdocs/langs/ar_SA/hrm.lang index 8ba763a357b..0cfee9469dd 100644 --- a/htdocs/langs/ar_SA/hrm.lang +++ b/htdocs/langs/ar_SA/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=الموظفين Employee=الموظف NewEmployee=موظف جديد +ListOfEmployees=قائمة الموظفين diff --git a/htdocs/langs/ar_SA/languages.lang b/htdocs/langs/ar_SA/languages.lang index 065aec3d17b..e239913fec6 100644 --- a/htdocs/langs/ar_SA/languages.lang +++ b/htdocs/langs/ar_SA/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=الإسبانية (بنما) Language_es_PY=الأسبانية (باراغواي) Language_es_PE=الإسبانية (بيرو) Language_es_PR=الأسبانية (بورتو ريكو) +Language_es_US=Spanish (USA) Language_es_UY=Spanish (Uruguay) Language_es_GT=Spanish (Guatemala) Language_es_VE=الإسبانية (فنزويلا) diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang index aab36cc5808..7e4057e374a 100644 --- a/htdocs/langs/ar_SA/main.lang +++ b/htdocs/langs/ar_SA/main.lang @@ -155,6 +155,7 @@ RemoveLink=نلغي AddToDraft=Add to draft Update=تحديث Close=إغلاق +CloseAs=Set status to CloseBox=Remove widget from your dashboard Confirm=تأكيد ConfirmSendCardByMail=Do you really want to send the content of this card by mail to %s? @@ -196,6 +197,7 @@ ReOpen=إعادة فتح Upload=Upload ToLink=حلقة الوصل Select=اختار +SelectAll=Select all Choose=أختر Resize=تغيير ResizeOrCrop=Resize or Crop @@ -256,6 +258,7 @@ Cards=بطاقات Card=بطاقة Now=الآن HourStart=بدء ساعة +Deadline=Deadline Date=التاريخ DateAndHour=التاريخ و الساعة DateToday=Today's date @@ -264,8 +267,10 @@ DateStart=تاريخ البدء DateEnd=تاريخ الانتهاء DateCreation=تاريخ الإنشاء DateCreationShort=يخلق. التاريخ +IPCreation=Creation IP DateModification=تاريخ التعديل DateModificationShort=Modif. التاريخ +IPModification=Modification IP DateLastModification=Latest modification date DateValidation=تاريخ التحقق من الصحة DateClosing=الموعد النهائي @@ -319,6 +324,7 @@ Morning=صباح Afternoon=بعد الزوال Quadri=قادري MonthOfDay=شهر من اليوم +DaysOfWeek=Days of week HourShort=H MinuteShort=مليون Rate=معدل @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency MulticurrencyAmountHT=Amount (excl. tax), original currency MulticurrencyAmountTTC=Amount (inc. of tax), original currency MulticurrencyAmountVAT=Amount tax, original currency +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=مبلغ الضريبة 2 AmountLT2=مبلغ الضريبة 3 AmountLT1ES=كمية RE @@ -487,6 +494,7 @@ By=بواسطة From=من عند FromDate=من عند FromLocation=من عند +at=at to=إلى To=إلى and=و @@ -509,6 +517,7 @@ Draft=مسودة Drafts=الداما StatusInterInvoiced=Invoiced Validated=التحقق من صحة +ValidatedToProduce=Validated (To produce) Opened=فتح OpenAll=Open (All) ClosedAll=Closed (All) @@ -655,6 +664,7 @@ Response=رد Priority=الأولوية SendByMail=Send by email MailSentBy=البريد الإلكتروني التي بعث بها +NotSent=لم يرسل TextUsedInTheMessageBody=هيئة البريد الإلكتروني SendAcknowledgementByMail=Send confirmation email SendMail=إرسال بريد إلكتروني @@ -836,6 +846,7 @@ ListOfTemplates=قائمة القوالب Gender=جنس Genderman=رجل Genderwoman=امرأة +Genderother=الآخر ViewList=عرض القائمة ViewGantt=Gantt view ViewKanban=Kanban view @@ -877,6 +888,8 @@ Miscellaneous=متفرقات Calendar=التقويم GroupBy=Group by... ViewFlatList=View flat list +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Remove string '%s' SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at https://transifex.com/projects/p/dolibarr/ to add your improvements. DirectDownloadLink=Direct download link (public/external) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments SearchIntoExpenseReports=تقارير المصاريف SearchIntoLeaves=Leave SearchIntoTickets=Tickets +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Vendor payments +SearchIntoMiscPayments=مدفوعات متنوعة CommentLink=تعليقات NbComments=Number of comments CommentPage=Comments space @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=معلومات Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=تاريخ الميلاد +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/ar_SA/mrp.lang b/htdocs/langs/ar_SA/mrp.lang index 863793063a0..f018be890cc 100644 --- a/htdocs/langs/ar_SA/mrp.lang +++ b/htdocs/langs/ar_SA/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/ar_SA/website.lang b/htdocs/langs/ar_SA/website.lang index 2324aec419b..f271ef38fe8 100644 --- a/htdocs/langs/ar_SA/website.lang +++ b/htdocs/langs/ar_SA/website.lang @@ -31,7 +31,7 @@ AddWebsite=Add website Webpage=Web page/container AddPage=Add page/container HomePage=Home Page -PageContainer=Page/container +PageContainer=صفحة PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. 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. SiteDeleted=Web site '%s' deleted @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=تغذية RSS RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/az_AZ/accountancy.lang b/htdocs/langs/az_AZ/accountancy.lang index 7b59e33b296..3211a0b62df 100644 --- a/htdocs/langs/az_AZ/accountancy.lang +++ b/htdocs/langs/az_AZ/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Default for service DefaultForProduct=Default for product CantSuggest=Can't suggest AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s -ConfigAccountingExpert=Configuration of the module accounting expert +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Journalization -Journaux=Journals +Journals=Journals JournalFinancial=Financial journals BackToChartofaccounts=Return chart of accounts Chartofaccounts=Chart of accounts +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Current dedicated account AssignDedicatedAccountingAccount=New account to assign InvoiceLabel=Invoice label @@ -33,8 +35,8 @@ OtherInfo=Other information DeleteCptCategory=Remove accounting account from group ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group? JournalizationInLedgerStatus=Status of journalization -AlreadyInGeneralLedger=Already journalized in ledgers -NotYetInGeneralLedger=Not yet journalized in ledgers +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group DetailByAccount=Show detail by account AccountWithNonZeroValues=Accounts with non-zero values @@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC CountriesNotInEEC=Countries not in EEC CountriesInEECExceptMe=Countries in EEC except %s CountriesExceptMe=All countries except %s -AccountantFiles=Export accounting documents +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup @@ -79,7 +83,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) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Select active chart of accounts ChangeAndLoad=Change and load Addanaccount=Add an accounting account @@ -89,6 +93,8 @@ SubledgerAccount=Subledger account SubledgerAccountLabel=Subledger account label ShowAccountingAccount=Show accounting account ShowAccountingJournal=Show accounting journal +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Accounting account suggested MenuDefaultAccounts=Default accounts MenuBankAccounts=Bank accounts @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding CreateMvts=Create new transaction UpdateMvts=Modification of a transaction ValidTransaction=Validate transaction -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=Ledger +BookkeepingSubAccount=Subledger AccountBalance=Account balance ObjectsRef=Source object ref CAHTF=Total purchase vendor before tax @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Sell journal ACCOUNTING_PURCHASE_JOURNAL=Purchase journal @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups ByYear=By year NotMatch=Not Set -DeleteMvt=Delete Ledger lines +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=Year to delete DelJournal=Journal to delete -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Finance journal ExpenseReportsJournal=Expense reports journal DescFinanceJournal=Finance journal including all the types of payments by bank account -DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Account for VAT not defined ThirdpartyAccountNotDefined=Account for third party not defined ProductAccountNotDefined=Account for product not defined @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu %s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Export draft journal @@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Chart of accounts Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/az_AZ/admin.lang b/htdocs/langs/az_AZ/admin.lang index 0d3a7174232..f1c41a3b62b 100644 --- a/htdocs/langs/az_AZ/admin.lang +++ b/htdocs/langs/az_AZ/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=Edition of field %s FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=LDAP Setup LDAPGlobalParameters=Global parameters @@ -1670,7 +1672,7 @@ AdvancedEditor=Advanced editor ActivateFCKeditor=Activate advanced editor for: FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services) FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing) FCKeditorForUserSignature=WYSIWIG creation/edition of user signature FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting 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 user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup diff --git a/htdocs/langs/az_AZ/banks.lang b/htdocs/langs/az_AZ/banks.lang index 75f9549dca5..9500a5b8b2e 100644 --- a/htdocs/langs/az_AZ/banks.lang +++ b/htdocs/langs/az_AZ/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=Miscellaneous payments ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA mandate YourSEPAMandate=Your SEPA mandate FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/az_AZ/categories.lang b/htdocs/langs/az_AZ/categories.lang index 9bb71984ecf..ba37a43b4ec 100644 --- a/htdocs/langs/az_AZ/categories.lang +++ b/htdocs/langs/az_AZ/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup CategorieRecursiv=Link with parent tag/category automatically CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=Add the following product/service +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Show tag/category ByDefaultInList=By default in list ChooseCategory=Choose category -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/az_AZ/companies.lang b/htdocs/langs/az_AZ/companies.lang index 92674363ced..dadff6a7894 100644 --- a/htdocs/langs/az_AZ/companies.lang +++ b/htdocs/langs/az_AZ/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof Id 1 (Federal number) ProfId4CH=Prof Id 2 (Commercial Record number) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof Id 1 (R.U.T.) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr) ProfId2DE=Prof Id 2 (USt.-Nr) ProfId3DE=Prof Id 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof Id 1 (CIF/NIF) ProfId2ES=Prof Id 2 (Social security number) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (Collegiate number) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof Id 1 (SIREN) ProfId2FR=Prof Id 2 (SIRET) ProfId3FR=Prof Id 3 (NAF, old APE) ProfId4FR=Prof Id 4 (RCS/RM) -ProfId5FR=- +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Registration Number ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX) ProfId4IN=Prof Id 4 ProfId5IN=Prof Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Business permit) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (R.C.) ProfId2MA=Id prof. 2 (Patente) ProfId3MA=Id prof. 3 (I.F.) ProfId4MA=Id prof. 4 (C.N.S.S.) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof Id 1 (R.F.C). ProfId2MX=Prof Id 2 (R..P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK nummer ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof Id 2 (Social security number) ProfId3PT=Prof Id 3 (Commercial Record number) ProfId4PT=Prof Id 4 (Conservatory) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof Id 1 (OGRN) ProfId2RU=Prof Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s). NorProspectNorCustomer=Not prospect, nor customer JuridicalStatus=Legal Entity Type +Workforce=Workforce Staff=Employees ProspectLevelShort=Potential ProspectLevel=Prospect potential @@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor PaymentTypeBoth=Payment Type - Customer and Vendor MulticurrencyUsed=Use Multicurrency MulticurrencyCurrency=Currency +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/az_AZ/hrm.lang b/htdocs/langs/az_AZ/hrm.lang index 6cc7f6bef24..3b8f137e103 100644 --- a/htdocs/langs/az_AZ/hrm.lang +++ b/htdocs/langs/az_AZ/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=Employees Employee=Employee NewEmployee=New employee +ListOfEmployees=List of employees diff --git a/htdocs/langs/az_AZ/languages.lang b/htdocs/langs/az_AZ/languages.lang index cc80b9f1719..ba187326705 100644 --- a/htdocs/langs/az_AZ/languages.lang +++ b/htdocs/langs/az_AZ/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Spanish (Paraguay) Language_es_PE=Spanish (Peru) Language_es_PR=Spanish (Puerto Rico) +Language_es_US=Spanish (USA) Language_es_UY=Spanish (Uruguay) Language_es_GT=Spanish (Guatemala) Language_es_VE=Spanish (Venezuela) diff --git a/htdocs/langs/az_AZ/main.lang b/htdocs/langs/az_AZ/main.lang index 0af5c66f0e0..96c68cdcfa3 100644 --- a/htdocs/langs/az_AZ/main.lang +++ b/htdocs/langs/az_AZ/main.lang @@ -155,6 +155,7 @@ RemoveLink=Remove link AddToDraft=Add to draft Update=Update Close=Close +CloseAs=Set status to CloseBox=Remove widget from your dashboard Confirm=Confirm ConfirmSendCardByMail=Do you really want to send the content of this card by mail to %s? @@ -196,6 +197,7 @@ ReOpen=Re-Open Upload=Upload ToLink=Link Select=Select +SelectAll=Select all Choose=Choose Resize=Resize ResizeOrCrop=Resize or Crop @@ -256,6 +258,7 @@ Cards=Cards Card=Card Now=Now HourStart=Start hour +Deadline=Deadline Date=Date DateAndHour=Date and hour DateToday=Today's date @@ -264,8 +267,10 @@ DateStart=Start date DateEnd=End date DateCreation=Creation date DateCreationShort=Creat. date +IPCreation=Creation IP DateModification=Modification date DateModificationShort=Modif. date +IPModification=Modification IP DateLastModification=Latest modification date DateValidation=Validation date DateClosing=Closing date @@ -319,6 +324,7 @@ Morning=Morning Afternoon=Afternoon Quadri=Quadri MonthOfDay=Month of the day +DaysOfWeek=Days of week HourShort=H MinuteShort=mn Rate=Rate @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency MulticurrencyAmountHT=Amount (excl. tax), original currency MulticurrencyAmountTTC=Amount (inc. of tax), original currency MulticurrencyAmountVAT=Amount tax, original currency +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Amount tax 2 AmountLT2=Amount tax 3 AmountLT1ES=Amount RE @@ -487,6 +494,7 @@ By=By From=From FromDate=From FromLocation=From +at=at to=to To=to and=and @@ -509,6 +517,7 @@ Draft=Draft Drafts=Drafts StatusInterInvoiced=Invoiced Validated=Validated +ValidatedToProduce=Validated (To produce) Opened=Open OpenAll=Open (All) ClosedAll=Closed (All) @@ -655,6 +664,7 @@ Response=Response Priority=Priority SendByMail=Send by email MailSentBy=Email sent by +NotSent=Not sent TextUsedInTheMessageBody=Email body SendAcknowledgementByMail=Send confirmation email SendMail=Send email @@ -836,6 +846,7 @@ ListOfTemplates=List of templates Gender=Gender Genderman=Man Genderwoman=Woman +Genderother=Other ViewList=List view ViewGantt=Gantt view ViewKanban=Kanban view @@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous Calendar=Calendar GroupBy=Group by... ViewFlatList=View flat list +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Remove string '%s' SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at https://transifex.com/projects/p/dolibarr/ to add your improvements. DirectDownloadLink=Direct download link (public/external) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments SearchIntoExpenseReports=Expense reports SearchIntoLeaves=Leave SearchIntoTickets=Tickets +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Vendor payments +SearchIntoMiscPayments=Miscellaneous payments CommentLink=Comments NbComments=Number of comments CommentPage=Comments space @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Information Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Date of birth +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/az_AZ/mrp.lang b/htdocs/langs/az_AZ/mrp.lang index 863793063a0..f018be890cc 100644 --- a/htdocs/langs/az_AZ/mrp.lang +++ b/htdocs/langs/az_AZ/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/az_AZ/website.lang b/htdocs/langs/az_AZ/website.lang index 4b5294d5e43..03e042e4be6 100644 --- a/htdocs/langs/az_AZ/website.lang +++ b/htdocs/langs/az_AZ/website.lang @@ -31,7 +31,7 @@ AddWebsite=Add website Webpage=Web page/container AddPage=Add page/container HomePage=Home Page -PageContainer=Page/container +PageContainer=Page PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. 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. SiteDeleted=Web site '%s' deleted @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=RSS Feed RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/bg_BG/accountancy.lang b/htdocs/langs/bg_BG/accountancy.lang index 2841467f8c7..89ff86ac06d 100644 --- a/htdocs/langs/bg_BG/accountancy.lang +++ b/htdocs/langs/bg_BG/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=По подразбиране за услуга DefaultForProduct=По подразбиране за продукт CantSuggest=Не може да се предложи AccountancySetupDoneFromAccountancyMenu=Повечето настройки на счетоводството се извършват от менюто %s -ConfigAccountingExpert=Конфигурация на модул за експертно счетоводство +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Осчетоводяване -Journaux=Журнали +Journals=Журнали JournalFinancial=Финансови журнали BackToChartofaccounts=Връщане към сметкоплана Chartofaccounts=Сметкоплан +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Текуща специална сметка AssignDedicatedAccountingAccount=Нова сметка за присвояване InvoiceLabel=Име за фактура @@ -33,8 +35,8 @@ OtherInfo=Друга информация DeleteCptCategory=Премахване на счетоводна сметка от група ConfirmDeleteCptCategory=Сигурни ли сте, че искате да премахнете тази счетоводна сметка от групата счетоводни сметки? JournalizationInLedgerStatus=Статус на осчетоводяване -AlreadyInGeneralLedger=Вече осчетоводено в главната счетоводна книга -NotYetInGeneralLedger=Все още не е осчетоводено в главната счетоводна книга +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Групата е празна, проверете настройката на персонализираната счетоводна група DetailByAccount=Показване на детайли по сметка AccountWithNonZeroValues=Сметки с различни от нула стойности @@ -43,7 +45,9 @@ CountriesInEEC=Държави в ЕИО CountriesNotInEEC=Държави извън ЕИО CountriesInEECExceptMe=Държави в ЕИО, с изключение на %s CountriesExceptMe=Всички държави с изключение на %s -AccountantFiles=Експортиране на счетоводни документи +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Основна счетоводна сметка за клиенти, която не е дефинирана в настройката MainAccountForSuppliersNotDefined=Основна счетоводна сметка за доставчици, която не е дефинирана в настройката @@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=СТЪПКА %s: Добавете или промен AccountancyAreaDescClosePeriod=СТЪПКА %s: Приключете периода, за да не може да се правят промени в бъдеще. -TheJournalCodeIsNotDefinedOnSomeBankAccount=Задължителна стъпка в настройката не е завършена (счетоводен код на журнал не е определен за всички банкови сметки) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Изберете активен сметкоплан ChangeAndLoad=Променяне и зареждане Addanaccount=Добавяне на счетоводна сметка @@ -89,6 +93,8 @@ SubledgerAccount=Счетоводна сметка SubledgerAccountLabel=Име на счетоводна сметка ShowAccountingAccount=Показване на счетоводна сметка ShowAccountingJournal=Показване на счетоводен журнал +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Предложена счетоводна сметка MenuDefaultAccounts=Сметки по подразбиране MenuBankAccounts=Банкови сметки @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Обвързващ на разходен отчет CreateMvts=Създаване на нова транзакция UpdateMvts=Променяне на транзакция ValidTransaction=Валидиране на транзакция -WriteBookKeeping=Регистриране на транзакции в главната счетоводна книга +WriteBookKeeping=Register transactions in accounting Bookkeeping=Главна счетоводна книга +BookkeepingSubAccount=Subledger AccountBalance=Салдо по сметка ObjectsRef=Обект № CAHTF=Обща покупка от доставчик преди ДДС @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Деактивиране на директно доб ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Активиране на експортиране на журнали в състояние на чернова ACCOUNTANCY_COMBO_FOR_AUX=Активиране на комбиниран списък за дъщерна сметка (може да създаде забавяне, ако имате много контрагенти) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Журнал за продажби ACCOUNTING_PURCHASE_JOURNAL=Журнал за покупки @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Счетоводна сметка за изчакв DONATION_ACCOUNTINGACCOUNT=Счетоводна сметка за регистриране на дарения ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Счетоводен акаунт за регистриране на членски внос +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Счетоводна сметка по подразбиране за закупени продукти (използва се, ако не е определена в продуктовата карта) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Счетоводна сметка по подразбиране за закупени продукти в ЕИО (използва се, ако не е дефинирана в картата на продукта) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Счетоводна сметка по подразбиране за закупени продукти и внесени отвън ЕИО (използва се, ако не е дефинирана в картата на продукта) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=По предварително определени ByPersonalizedAccountGroups=По персонализирани групи ByYear=По година NotMatch=Не е зададено -DeleteMvt=Изтриване на редове от книгата +DeleteMvt=Delete some operation lines from accounting DelMonth=Месец за изтриване DelYear=Година за изтриване DelJournal=Журнал за изтриване -ConfirmDeleteMvt=Това ще изтрие всички редове в главната книгата за годината / месеца и / или от конкретен журнал (изисква се поне един критерий). Ще трябва да използвате повторно функцията „Регистриране в счетоводство“, за да върнете изтрития запис обратно в главната книга. -ConfirmDeleteMvtPartial=Това ще изтрие транзакцията от книгата (всички редове, свързани с една и съща транзакция ще бъдат изтрити) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Финансов журнал ExpenseReportsJournal=Журнал за разходни отчети DescFinanceJournal=Финансов журнал, включващ всички видове плащания по банкова сметка -DescJournalOnlyBindedVisible=Това е преглед на запис, който е свързан към счетоводна сметка и може да бъде добавен в книгата. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined= Не е определена сметка за ДДС ThirdpartyAccountNotDefined=Не е определена сметка за контрагент ProductAccountNotDefined=Не е определена сметка за продукт @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=Този журнал вече се изпо AccountingAccountForSalesTaxAreDefinedInto=Бележка: Счетоводната сметка за данък върху продажбите е дефинирана в меню %s - %s NumberOfAccountancyEntries=Брой записи NumberOfAccountancyMovements=Брой движения +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Експортиране на журнал в чернова @@ -326,6 +339,8 @@ Modelcsv_configurable=Експортиране в конфигурируем CSV Modelcsv_FEC=Експортиране за FEC Modelcsv_Sage50_Swiss=Експортиране за Sage 50 Швейцария Modelcsv_winfic=Експортиране за Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Идентификатор на сметкоплан ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang index c40295bbcf0..d40a4f22556 100644 --- a/htdocs/langs/bg_BG/admin.lang +++ b/htdocs/langs/bg_BG/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP компонент %s е зареден PreloadOPCode=Използва се предварително зареден OPCode AddRefInList=Показване на кода на клиента / доставчика в списъка (select list или combobox) и повечето от хипервръзките.
Контрагентите ще се появят с формат на името "CC12345 - SC45678 - Голяма фирма ЕООД", вместо "Голяма фирма ЕООД" AddAdressInList=Показване на списъка с информация за адреса на клиента / доставчика (изборен списък или комбиниран списък).
Контрагентите ще се появят с формат на името на "Име на фирма - Адрес Пощ. код Град - Държава", вместо "Име на фирма". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Запитване към контрагенти за предпочитан начин на доставка FieldEdition=Издание на поле %s FillThisOnlyIfRequired=Пример: +2 (попълнете само ако има проблеми с компенсирането на часовата зона) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Необходим е имейл при създаване MemberSendInformationByMailByDefault=По подразбиране е активирано изпращането на потвърждение, чрез имейл до членове (валидиране или нов абонамент) VisitorCanChooseItsPaymentMode=Посетителят може да избира от наличните начини на плащане MEMBER_REMINDER_EMAIL=Активиране на автоматично напомняне, чрез имейл за изтекли абонаменти. Забележка: Модул %s трябва да е активиран и правилно настроен за изпращане на напомняния. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=Настройка на LDAP LDAPGlobalParameters=Глобални параметри @@ -1670,7 +1672,7 @@ AdvancedEditor=Разширен редактор ActivateFCKeditor=Активиране на разширен редактор за: FCKeditorForCompany=WYSIWIG създаване / промяна на описание на елементите и бележки (с изключение на продукти / услуги) FCKeditorForProduct=WYSIWIG създаване / промяна на описание на продукти / услуги -FCKeditorForProductDetails=WYSIWIG създаване / променяне на продуктови редове за всички обекти (предложения, поръчки, фактури и др.). Внимание: Използването на тази опция не се препоръчва, тъй като може да създаде проблеми с някои специални символи и при форматиране на страниците, по време на генериране на PDF файловете. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG създаване / промяна на масови имейли (Инструменти -> Масови имейли) FCKeditorForUserSignature=WYSIWIG създаване / промяна на подпис на потребители FCKeditorForMail=WYSIWIG създаване / променяне на цялата поща (с изключение на Настройка -> Имейли) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Автоматично задаване на ст AGENDA_DEFAULT_FILTER_TYPE=Автоматично задаване на стойност по подразбиране за вид събитие във филтъра за търсене на календара AGENDA_DEFAULT_FILTER_STATUS=Автоматично задаване на стойност по подразбиране за статус на събитие във филтъра за търсене на календара AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda -AGENDA_REMINDER_EMAIL=Активиране на напомняне за събития, чрез имейли (опцията за напомняне / закъснение може да бъде определена за всяко събитие). Забележка: Модулът %s трябва да бъде активиран и правилно настроен, за да се изпращат напомняния в определеното време. -AGENDA_REMINDER_BROWSER=Активиране на напомняне за събития в браузъра на потребителя (когато бъде достигната датата на събитието, всеки потребител може да отхвърли известието от браузъра) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Активиране на звуково известяване +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Показване на свързания обект в календара ##### Clicktodial ##### ClickToDialSetup=Настройка на модула за набиране (ClickToDial) diff --git a/htdocs/langs/bg_BG/banks.lang b/htdocs/langs/bg_BG/banks.lang index 475fb7e6e5b..234d788aaa4 100644 --- a/htdocs/langs/bg_BG/banks.lang +++ b/htdocs/langs/bg_BG/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Разнородно плащане VariousPayments=Разнородни плащания ShowVariousPayment=Показване на разнородно плащане AddVariousPayment=Добавяне на разнородно плащане +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA нареждане YourSEPAMandate=Вашите SEPA нареждания FindYourSEPAMandate=Това е вашето SEPA нареждане, с което да упълномощите нашата фирма да направи поръчка за директен дебит към вашата банка. Върнете го подписано (сканиран подписан документ) или го изпратете по пощата на @@ -176,3 +179,4 @@ BankColorizeMovement=Оцветяване на движения BankColorizeMovementDesc=Ако тази функция е активирана може да изберете конкретен цвят на фона за дебитни или кредитни движения BankColorizeMovementName1=Цвят на фона за дебитно движение BankColorizeMovementName2=Цвят на фона за кредитно движение +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/bg_BG/categories.lang b/htdocs/langs/bg_BG/categories.lang index ea044ebf97a..717f1a5fadd 100644 --- a/htdocs/langs/bg_BG/categories.lang +++ b/htdocs/langs/bg_BG/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Настройка на тагове / категории CategorieRecursiv=Автоматично свързване с главния таг / категория CategorieRecursivHelp=Ако опцията е включена, когато добавите продукт в подкатегория, продуктът ще бъде добавен също и в главната категория. AddProductServiceIntoCategory=Добавяне на следния продукт / услуга +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Показване на таг / категория ByDefaultInList=По подразбиране в списъка ChooseCategory=Избиране на категория -StocksCategoriesArea=Секция с категории на складове -ActionCommCategoriesArea=Секция с категории за събития -WebsitePagesCategoriesArea=Секция с категории за контейнери за страници +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Използване или оператор за категории diff --git a/htdocs/langs/bg_BG/companies.lang b/htdocs/langs/bg_BG/companies.lang index f637b36087f..267abddeb98 100644 --- a/htdocs/langs/bg_BG/companies.lang +++ b/htdocs/langs/bg_BG/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof Id 1 (Federal number) ProfId4CH=Prof Id 2 (Commercial Record number) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof Id 1 (R.U.T.) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr) ProfId2DE=Prof Id 2 (USt.-Nr) ProfId3DE=Prof Id 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof Id 1 (CIF/NIF) ProfId2ES=Prof Id 2 (Social security number) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (Collegiate number) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof Id 1 (SIREN) ProfId2FR=Prof Id 2 (SIRET) ProfId3FR=Prof Id 3 (NAF, old APE) ProfId4FR=Prof Id 4 (RCS/RM) -ProfId5FR=- +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Registration Number ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX) ProfId4IN=Prof Id 4 ProfId5IN=Prof Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Business permit) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (R.C.) ProfId2MA=Id prof. 2 (Patente) ProfId3MA=Id prof. 3 (I.F.) ProfId4MA=Id prof. 4 (C.N.S.S.) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof Id 1 (R.F.C). ProfId2MX=Prof Id 2 (R..P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK nummer ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof Id 2 (Social security number) ProfId3PT=Prof Id 3 (Commercial Record number) ProfId4PT=Prof Id 4 (Conservatory) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof Id 1 (OGRN) ProfId2RU=Prof Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=Може да проверите също така ръчн ErrorVATCheckMS_UNAVAILABLE=Проверка не е възможна. Услугата за проверка не се предоставя от държавата-членка (%s). NorProspectNorCustomer=Нито потенциален клиент, нито клиент JuridicalStatus=Правна форма +Workforce=Workforce Staff=Служители ProspectLevelShort=Потенциал ProspectLevel=Потенциал @@ -456,3 +462,8 @@ PaymentTermsSupplier=Условия на плащане - Доставчик PaymentTypeBoth=Начин на плащане - клиент и доставчик MulticurrencyUsed=Използване на няколко валути MulticurrencyCurrency=Валута +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/bg_BG/hrm.lang b/htdocs/langs/bg_BG/hrm.lang index f9df9510e1b..0279096bd62 100644 --- a/htdocs/langs/bg_BG/hrm.lang +++ b/htdocs/langs/bg_BG/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=ЧР - Длъжности Employees=Служители Employee=Служител NewEmployee=Нов служител +ListOfEmployees=Списък на служителите diff --git a/htdocs/langs/bg_BG/languages.lang b/htdocs/langs/bg_BG/languages.lang index a6d388a20f9..110313b194e 100644 --- a/htdocs/langs/bg_BG/languages.lang +++ b/htdocs/langs/bg_BG/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Испански (Панама) Language_es_PY=Испански (Парагвай) Language_es_PE=Испански (Перу) Language_es_PR=Испански (Пуерто Рико) +Language_es_US=Spanish (USA) Language_es_UY=Испански (Уругвай) Language_es_GT=Spanish (Guatemala) Language_es_VE=Испански (Венецуела) diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang index f0cf63d6366..335801537fa 100644 --- a/htdocs/langs/bg_BG/main.lang +++ b/htdocs/langs/bg_BG/main.lang @@ -155,6 +155,7 @@ RemoveLink=Премахване на връзка AddToDraft=Добавяне към чернова Update=Актуализиране Close=Приключване +CloseAs=Предложението е CloseBox=Премахнете джаджата от таблото си за управление Confirm=Потвърждаване ConfirmSendCardByMail=Наистина ли искате да изпратите съдържанието на тази карта по имейл до %s ? @@ -196,6 +197,7 @@ ReOpen=Повторно отваряне Upload=Прикачи ToLink=Свържи Select=Изберете +SelectAll=Select all Choose=Избор Resize=Оразмеряване ResizeOrCrop=Оразмеряване или изрязване @@ -256,6 +258,7 @@ Cards=Карти Card=Карта Now=Сега HourStart=Начален час +Deadline=Deadline Date=Дата DateAndHour=Дата и час DateToday=Днешна дата @@ -264,8 +267,10 @@ DateStart=Начална дата DateEnd=Крайна дата DateCreation=Дата на създаване DateCreationShort=Създаване +IPCreation=Creation IP DateModification=Дата на промяна DateModificationShort=Промяна +IPModification=Modification IP DateLastModification=Дата на последна промяна DateValidation=Дата на валидиране DateClosing=Дата на приключване @@ -319,6 +324,7 @@ Morning=сутрин Afternoon=следобед Quadri=Quadri MonthOfDay=Месец на деня +DaysOfWeek=Days of week HourShort=ч MinuteShort=мин Rate=Курс @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Сума на плащане, оригинална в MulticurrencyAmountHT=Сума (без ДДС), оригинална валута MulticurrencyAmountTTC=Сума (с ДДС), оригинална валута MulticurrencyAmountVAT=Размер на ДДС, оригинална валута +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Размер на данък 2 AmountLT2=Размер на данък 3 AmountLT1ES=Размер на RE @@ -487,6 +494,7 @@ By=От From=От FromDate=От FromLocation=От +at=at to=за To=за and=и @@ -509,6 +517,7 @@ Draft=Чернова Drafts=Чернови StatusInterInvoiced=Фактурирано Validated=Валидирано +ValidatedToProduce=Validated (To produce) Opened=Активен OpenAll=Отворено (всички) ClosedAll=Затворено (всички) @@ -655,6 +664,7 @@ Response=Отговор Priority=Приоритет SendByMail=Изпращане по имейл MailSentBy=Изпратено по имейл от +NotSent=Неизпратен TextUsedInTheMessageBody=Текст на имейла SendAcknowledgementByMail=Изпращане на имейл потвърждение SendMail=Изпращане на имейл @@ -836,6 +846,7 @@ ListOfTemplates=Списък с шаблони Gender=Пол Genderman=Мъж Genderwoman=Жена +Genderother=Други ViewList=Списъчен изглед ViewGantt=Gantt изглед ViewKanban=Kanban изглед @@ -877,6 +888,8 @@ Miscellaneous=Разни Calendar=Календар GroupBy=Групиране по... ViewFlatList=Преглед на плосък списък +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Премахване на низ „%s“ SomeTranslationAreUncomplete=Някои от предлаганите езици могат да бъдат само частично преведени или да съдържат грешки. Моля, помогнете ни да коригираме езика ви като се регистрирате на адрес https://transifex.com/projects/p/dolibarr/ , за да добавите подобренията си. DirectDownloadLink=Директна връзка за изтегляне (публична / външна) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Клиентски пратки SearchIntoExpenseReports=Разходни отчети SearchIntoLeaves=Отпуск SearchIntoTickets=Тикети +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Плащания към доставчици +SearchIntoMiscPayments=Разнородни плащания CommentLink=Коментари NbComments=Брой коментари CommentPage=Място за коментари @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Информация Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Дата на раждане +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/bg_BG/mrp.lang b/htdocs/langs/bg_BG/mrp.lang index 16e4d94208c..f35119307bb 100644 --- a/htdocs/langs/bg_BG/mrp.lang +++ b/htdocs/langs/bg_BG/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Единична цена TotalCost=Обща цена BOMTotalCost=Разходите за производство на този списък с материали въз основа на разходите за всяко количество и продукт, които ще се използват (използвайте себестойност, ако е дефинирана, иначе средно претеглена цена, ако е определена, или най-добра покупна цена). GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/bg_BG/website.lang b/htdocs/langs/bg_BG/website.lang index 33ff2bd1922..7378ad1189a 100644 --- a/htdocs/langs/bg_BG/website.lang +++ b/htdocs/langs/bg_BG/website.lang @@ -31,7 +31,7 @@ AddWebsite=Добавяне на уебсайт Webpage=Уеб страница / контейнер AddPage=Добавяне на страница / контейнер HomePage=Начална страница -PageContainer=Страница / контейнер +PageContainer=Страница PreviewOfSiteNotYetAvailable=Преглед на вашия уебсайт %s все още не е наличен. Първо трябва да 'Импортирате пълен шаблон за уебсайт' или просто да 'Добавите страница / контейнер'. RequestedPageHasNoContentYet=Заявената страница с id %s все още няма съдържание или кеш файлът .tpl.php е бил премахнат. Редактирайте съдържанието на страницата, за да коригирате това. SiteDeleted=Уебсайта '%s' е изтрит @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=RSS емисия RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/bn_BD/accountancy.lang b/htdocs/langs/bn_BD/accountancy.lang index 7b59e33b296..3211a0b62df 100644 --- a/htdocs/langs/bn_BD/accountancy.lang +++ b/htdocs/langs/bn_BD/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Default for service DefaultForProduct=Default for product CantSuggest=Can't suggest AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s -ConfigAccountingExpert=Configuration of the module accounting expert +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Journalization -Journaux=Journals +Journals=Journals JournalFinancial=Financial journals BackToChartofaccounts=Return chart of accounts Chartofaccounts=Chart of accounts +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Current dedicated account AssignDedicatedAccountingAccount=New account to assign InvoiceLabel=Invoice label @@ -33,8 +35,8 @@ OtherInfo=Other information DeleteCptCategory=Remove accounting account from group ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group? JournalizationInLedgerStatus=Status of journalization -AlreadyInGeneralLedger=Already journalized in ledgers -NotYetInGeneralLedger=Not yet journalized in ledgers +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group DetailByAccount=Show detail by account AccountWithNonZeroValues=Accounts with non-zero values @@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC CountriesNotInEEC=Countries not in EEC CountriesInEECExceptMe=Countries in EEC except %s CountriesExceptMe=All countries except %s -AccountantFiles=Export accounting documents +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup @@ -79,7 +83,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) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Select active chart of accounts ChangeAndLoad=Change and load Addanaccount=Add an accounting account @@ -89,6 +93,8 @@ SubledgerAccount=Subledger account SubledgerAccountLabel=Subledger account label ShowAccountingAccount=Show accounting account ShowAccountingJournal=Show accounting journal +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Accounting account suggested MenuDefaultAccounts=Default accounts MenuBankAccounts=Bank accounts @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding CreateMvts=Create new transaction UpdateMvts=Modification of a transaction ValidTransaction=Validate transaction -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=Ledger +BookkeepingSubAccount=Subledger AccountBalance=Account balance ObjectsRef=Source object ref CAHTF=Total purchase vendor before tax @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Sell journal ACCOUNTING_PURCHASE_JOURNAL=Purchase journal @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups ByYear=By year NotMatch=Not Set -DeleteMvt=Delete Ledger lines +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=Year to delete DelJournal=Journal to delete -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Finance journal ExpenseReportsJournal=Expense reports journal DescFinanceJournal=Finance journal including all the types of payments by bank account -DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Account for VAT not defined ThirdpartyAccountNotDefined=Account for third party not defined ProductAccountNotDefined=Account for product not defined @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu %s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Export draft journal @@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Chart of accounts Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/bn_BD/admin.lang b/htdocs/langs/bn_BD/admin.lang index 0d3a7174232..f1c41a3b62b 100644 --- a/htdocs/langs/bn_BD/admin.lang +++ b/htdocs/langs/bn_BD/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=Edition of field %s FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=LDAP Setup LDAPGlobalParameters=Global parameters @@ -1670,7 +1672,7 @@ AdvancedEditor=Advanced editor ActivateFCKeditor=Activate advanced editor for: FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services) FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing) FCKeditorForUserSignature=WYSIWIG creation/edition of user signature FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting 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 user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup diff --git a/htdocs/langs/bn_BD/banks.lang b/htdocs/langs/bn_BD/banks.lang index caf3d4243c0..5cddfdaf30c 100644 --- a/htdocs/langs/bn_BD/banks.lang +++ b/htdocs/langs/bn_BD/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=Miscellaneous payments ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA mandate YourSEPAMandate=Your SEPA mandate FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/bn_BD/categories.lang b/htdocs/langs/bn_BD/categories.lang index 9349ecc5135..84e5796763e 100644 --- a/htdocs/langs/bn_BD/categories.lang +++ b/htdocs/langs/bn_BD/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup CategorieRecursiv=Link with parent tag/category automatically CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=Add the following product/service +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Show tag/category ByDefaultInList=By default in list ChooseCategory=Choose category -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/bn_BD/companies.lang b/htdocs/langs/bn_BD/companies.lang index ebc9f8f5ce2..ee3854f04f8 100644 --- a/htdocs/langs/bn_BD/companies.lang +++ b/htdocs/langs/bn_BD/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof Id 1 (Federal number) ProfId4CH=Prof Id 2 (Commercial Record number) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof Id 1 (R.U.T.) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr) ProfId2DE=Prof Id 2 (USt.-Nr) ProfId3DE=Prof Id 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof Id 1 (CIF/NIF) ProfId2ES=Prof Id 2 (Social security number) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (Collegiate number) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof Id 1 (SIREN) ProfId2FR=Prof Id 2 (SIRET) ProfId3FR=Prof Id 3 (NAF, old APE) ProfId4FR=Prof Id 4 (RCS/RM) -ProfId5FR=- +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Registration Number ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX) ProfId4IN=Prof Id 4 ProfId5IN=Prof Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Business permit) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (R.C.) ProfId2MA=Id prof. 2 (Patente) ProfId3MA=Id prof. 3 (I.F.) ProfId4MA=Id prof. 4 (C.N.S.S.) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof Id 1 (R.F.C). ProfId2MX=Prof Id 2 (R..P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK nummer ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof Id 2 (Social security number) ProfId3PT=Prof Id 3 (Commercial Record number) ProfId4PT=Prof Id 4 (Conservatory) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof Id 1 (OGRN) ProfId2RU=Prof Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s). NorProspectNorCustomer=Not prospect, nor customer JuridicalStatus=Legal Entity Type +Workforce=Workforce Staff=Employees ProspectLevelShort=Potential ProspectLevel=Prospect potential @@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor PaymentTypeBoth=Payment Type - Customer and Vendor MulticurrencyUsed=Use Multicurrency MulticurrencyCurrency=Currency +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/bn_BD/hrm.lang b/htdocs/langs/bn_BD/hrm.lang index 6cc7f6bef24..3b8f137e103 100644 --- a/htdocs/langs/bn_BD/hrm.lang +++ b/htdocs/langs/bn_BD/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=Employees Employee=Employee NewEmployee=New employee +ListOfEmployees=List of employees diff --git a/htdocs/langs/bn_BD/languages.lang b/htdocs/langs/bn_BD/languages.lang index cc80b9f1719..ba187326705 100644 --- a/htdocs/langs/bn_BD/languages.lang +++ b/htdocs/langs/bn_BD/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Spanish (Paraguay) Language_es_PE=Spanish (Peru) Language_es_PR=Spanish (Puerto Rico) +Language_es_US=Spanish (USA) Language_es_UY=Spanish (Uruguay) Language_es_GT=Spanish (Guatemala) Language_es_VE=Spanish (Venezuela) diff --git a/htdocs/langs/bn_BD/main.lang b/htdocs/langs/bn_BD/main.lang index 0149ae4d2ce..49a5986c0df 100644 --- a/htdocs/langs/bn_BD/main.lang +++ b/htdocs/langs/bn_BD/main.lang @@ -155,6 +155,7 @@ RemoveLink=Remove link AddToDraft=Add to draft Update=Update Close=Close +CloseAs=Set status to CloseBox=Remove widget from your dashboard Confirm=Confirm ConfirmSendCardByMail=Do you really want to send the content of this card by mail to %s? @@ -196,6 +197,7 @@ ReOpen=Re-Open Upload=Upload ToLink=Link Select=Select +SelectAll=Select all Choose=Choose Resize=Resize ResizeOrCrop=Resize or Crop @@ -256,6 +258,7 @@ Cards=Cards Card=Card Now=Now HourStart=Start hour +Deadline=Deadline Date=Date DateAndHour=Date and hour DateToday=Today's date @@ -264,8 +267,10 @@ DateStart=Start date DateEnd=End date DateCreation=Creation date DateCreationShort=Creat. date +IPCreation=Creation IP DateModification=Modification date DateModificationShort=Modif. date +IPModification=Modification IP DateLastModification=Latest modification date DateValidation=Validation date DateClosing=Closing date @@ -319,6 +324,7 @@ Morning=Morning Afternoon=Afternoon Quadri=Quadri MonthOfDay=Month of the day +DaysOfWeek=Days of week HourShort=H MinuteShort=mn Rate=Rate @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency MulticurrencyAmountHT=Amount (excl. tax), original currency MulticurrencyAmountTTC=Amount (inc. of tax), original currency MulticurrencyAmountVAT=Amount tax, original currency +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Amount tax 2 AmountLT2=Amount tax 3 AmountLT1ES=Amount RE @@ -487,6 +494,7 @@ By=By From=From FromDate=From FromLocation=From +at=at to=to To=to and=and @@ -509,6 +517,7 @@ Draft=Draft Drafts=Drafts StatusInterInvoiced=Invoiced Validated=Validated +ValidatedToProduce=Validated (To produce) Opened=Opened OpenAll=Open (All) ClosedAll=Closed (All) @@ -655,6 +664,7 @@ Response=Response Priority=Priority SendByMail=Send by email MailSentBy=Email sent by +NotSent=Not sent TextUsedInTheMessageBody=Email body SendAcknowledgementByMail=Send confirmation email SendMail=Send email @@ -836,6 +846,7 @@ ListOfTemplates=List of templates Gender=Gender Genderman=Man Genderwoman=Woman +Genderother=Other ViewList=List view ViewGantt=Gantt view ViewKanban=Kanban view @@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous Calendar=Calendar GroupBy=Group by... ViewFlatList=View flat list +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Remove string '%s' SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at https://transifex.com/projects/p/dolibarr/ to add your improvements. DirectDownloadLink=Direct download link (public/external) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments SearchIntoExpenseReports=Expense reports SearchIntoLeaves=Leave SearchIntoTickets=Tickets +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Vendor payments +SearchIntoMiscPayments=Miscellaneous payments CommentLink=Comments NbComments=Number of comments CommentPage=Comments space @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Information Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Date of birth +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/bn_BD/mrp.lang b/htdocs/langs/bn_BD/mrp.lang index 863793063a0..f018be890cc 100644 --- a/htdocs/langs/bn_BD/mrp.lang +++ b/htdocs/langs/bn_BD/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/bn_BD/website.lang b/htdocs/langs/bn_BD/website.lang index 4b5294d5e43..03e042e4be6 100644 --- a/htdocs/langs/bn_BD/website.lang +++ b/htdocs/langs/bn_BD/website.lang @@ -31,7 +31,7 @@ AddWebsite=Add website Webpage=Web page/container AddPage=Add page/container HomePage=Home Page -PageContainer=Page/container +PageContainer=Page PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. 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. SiteDeleted=Web site '%s' deleted @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=RSS Feed RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/bn_IN/accountancy.lang b/htdocs/langs/bn_IN/accountancy.lang index 7b59e33b296..3211a0b62df 100644 --- a/htdocs/langs/bn_IN/accountancy.lang +++ b/htdocs/langs/bn_IN/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Default for service DefaultForProduct=Default for product CantSuggest=Can't suggest AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s -ConfigAccountingExpert=Configuration of the module accounting expert +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Journalization -Journaux=Journals +Journals=Journals JournalFinancial=Financial journals BackToChartofaccounts=Return chart of accounts Chartofaccounts=Chart of accounts +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Current dedicated account AssignDedicatedAccountingAccount=New account to assign InvoiceLabel=Invoice label @@ -33,8 +35,8 @@ OtherInfo=Other information DeleteCptCategory=Remove accounting account from group ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group? JournalizationInLedgerStatus=Status of journalization -AlreadyInGeneralLedger=Already journalized in ledgers -NotYetInGeneralLedger=Not yet journalized in ledgers +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group DetailByAccount=Show detail by account AccountWithNonZeroValues=Accounts with non-zero values @@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC CountriesNotInEEC=Countries not in EEC CountriesInEECExceptMe=Countries in EEC except %s CountriesExceptMe=All countries except %s -AccountantFiles=Export accounting documents +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup @@ -79,7 +83,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) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Select active chart of accounts ChangeAndLoad=Change and load Addanaccount=Add an accounting account @@ -89,6 +93,8 @@ SubledgerAccount=Subledger account SubledgerAccountLabel=Subledger account label ShowAccountingAccount=Show accounting account ShowAccountingJournal=Show accounting journal +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Accounting account suggested MenuDefaultAccounts=Default accounts MenuBankAccounts=Bank accounts @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding CreateMvts=Create new transaction UpdateMvts=Modification of a transaction ValidTransaction=Validate transaction -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=Ledger +BookkeepingSubAccount=Subledger AccountBalance=Account balance ObjectsRef=Source object ref CAHTF=Total purchase vendor before tax @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Sell journal ACCOUNTING_PURCHASE_JOURNAL=Purchase journal @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups ByYear=By year NotMatch=Not Set -DeleteMvt=Delete Ledger lines +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=Year to delete DelJournal=Journal to delete -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Finance journal ExpenseReportsJournal=Expense reports journal DescFinanceJournal=Finance journal including all the types of payments by bank account -DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Account for VAT not defined ThirdpartyAccountNotDefined=Account for third party not defined ProductAccountNotDefined=Account for product not defined @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu %s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Export draft journal @@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Chart of accounts Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/bn_IN/admin.lang b/htdocs/langs/bn_IN/admin.lang index 0d3a7174232..f1c41a3b62b 100644 --- a/htdocs/langs/bn_IN/admin.lang +++ b/htdocs/langs/bn_IN/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=Edition of field %s FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=LDAP Setup LDAPGlobalParameters=Global parameters @@ -1670,7 +1672,7 @@ AdvancedEditor=Advanced editor ActivateFCKeditor=Activate advanced editor for: FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services) FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing) FCKeditorForUserSignature=WYSIWIG creation/edition of user signature FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting 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 user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup diff --git a/htdocs/langs/bn_IN/banks.lang b/htdocs/langs/bn_IN/banks.lang index 75f9549dca5..9500a5b8b2e 100644 --- a/htdocs/langs/bn_IN/banks.lang +++ b/htdocs/langs/bn_IN/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=Miscellaneous payments ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA mandate YourSEPAMandate=Your SEPA mandate FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/bn_IN/categories.lang b/htdocs/langs/bn_IN/categories.lang index 9bb71984ecf..ba37a43b4ec 100644 --- a/htdocs/langs/bn_IN/categories.lang +++ b/htdocs/langs/bn_IN/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup CategorieRecursiv=Link with parent tag/category automatically CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=Add the following product/service +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Show tag/category ByDefaultInList=By default in list ChooseCategory=Choose category -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/bn_IN/companies.lang b/htdocs/langs/bn_IN/companies.lang index 92674363ced..dadff6a7894 100644 --- a/htdocs/langs/bn_IN/companies.lang +++ b/htdocs/langs/bn_IN/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof Id 1 (Federal number) ProfId4CH=Prof Id 2 (Commercial Record number) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof Id 1 (R.U.T.) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr) ProfId2DE=Prof Id 2 (USt.-Nr) ProfId3DE=Prof Id 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof Id 1 (CIF/NIF) ProfId2ES=Prof Id 2 (Social security number) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (Collegiate number) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof Id 1 (SIREN) ProfId2FR=Prof Id 2 (SIRET) ProfId3FR=Prof Id 3 (NAF, old APE) ProfId4FR=Prof Id 4 (RCS/RM) -ProfId5FR=- +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Registration Number ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX) ProfId4IN=Prof Id 4 ProfId5IN=Prof Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Business permit) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (R.C.) ProfId2MA=Id prof. 2 (Patente) ProfId3MA=Id prof. 3 (I.F.) ProfId4MA=Id prof. 4 (C.N.S.S.) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof Id 1 (R.F.C). ProfId2MX=Prof Id 2 (R..P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK nummer ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof Id 2 (Social security number) ProfId3PT=Prof Id 3 (Commercial Record number) ProfId4PT=Prof Id 4 (Conservatory) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof Id 1 (OGRN) ProfId2RU=Prof Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s). NorProspectNorCustomer=Not prospect, nor customer JuridicalStatus=Legal Entity Type +Workforce=Workforce Staff=Employees ProspectLevelShort=Potential ProspectLevel=Prospect potential @@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor PaymentTypeBoth=Payment Type - Customer and Vendor MulticurrencyUsed=Use Multicurrency MulticurrencyCurrency=Currency +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/bn_IN/hrm.lang b/htdocs/langs/bn_IN/hrm.lang index 6cc7f6bef24..3b8f137e103 100644 --- a/htdocs/langs/bn_IN/hrm.lang +++ b/htdocs/langs/bn_IN/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=Employees Employee=Employee NewEmployee=New employee +ListOfEmployees=List of employees diff --git a/htdocs/langs/bn_IN/languages.lang b/htdocs/langs/bn_IN/languages.lang index cc80b9f1719..ba187326705 100644 --- a/htdocs/langs/bn_IN/languages.lang +++ b/htdocs/langs/bn_IN/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Spanish (Paraguay) Language_es_PE=Spanish (Peru) Language_es_PR=Spanish (Puerto Rico) +Language_es_US=Spanish (USA) Language_es_UY=Spanish (Uruguay) Language_es_GT=Spanish (Guatemala) Language_es_VE=Spanish (Venezuela) diff --git a/htdocs/langs/bn_IN/main.lang b/htdocs/langs/bn_IN/main.lang index 0af5c66f0e0..96c68cdcfa3 100644 --- a/htdocs/langs/bn_IN/main.lang +++ b/htdocs/langs/bn_IN/main.lang @@ -155,6 +155,7 @@ RemoveLink=Remove link AddToDraft=Add to draft Update=Update Close=Close +CloseAs=Set status to CloseBox=Remove widget from your dashboard Confirm=Confirm ConfirmSendCardByMail=Do you really want to send the content of this card by mail to %s? @@ -196,6 +197,7 @@ ReOpen=Re-Open Upload=Upload ToLink=Link Select=Select +SelectAll=Select all Choose=Choose Resize=Resize ResizeOrCrop=Resize or Crop @@ -256,6 +258,7 @@ Cards=Cards Card=Card Now=Now HourStart=Start hour +Deadline=Deadline Date=Date DateAndHour=Date and hour DateToday=Today's date @@ -264,8 +267,10 @@ DateStart=Start date DateEnd=End date DateCreation=Creation date DateCreationShort=Creat. date +IPCreation=Creation IP DateModification=Modification date DateModificationShort=Modif. date +IPModification=Modification IP DateLastModification=Latest modification date DateValidation=Validation date DateClosing=Closing date @@ -319,6 +324,7 @@ Morning=Morning Afternoon=Afternoon Quadri=Quadri MonthOfDay=Month of the day +DaysOfWeek=Days of week HourShort=H MinuteShort=mn Rate=Rate @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency MulticurrencyAmountHT=Amount (excl. tax), original currency MulticurrencyAmountTTC=Amount (inc. of tax), original currency MulticurrencyAmountVAT=Amount tax, original currency +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Amount tax 2 AmountLT2=Amount tax 3 AmountLT1ES=Amount RE @@ -487,6 +494,7 @@ By=By From=From FromDate=From FromLocation=From +at=at to=to To=to and=and @@ -509,6 +517,7 @@ Draft=Draft Drafts=Drafts StatusInterInvoiced=Invoiced Validated=Validated +ValidatedToProduce=Validated (To produce) Opened=Open OpenAll=Open (All) ClosedAll=Closed (All) @@ -655,6 +664,7 @@ Response=Response Priority=Priority SendByMail=Send by email MailSentBy=Email sent by +NotSent=Not sent TextUsedInTheMessageBody=Email body SendAcknowledgementByMail=Send confirmation email SendMail=Send email @@ -836,6 +846,7 @@ ListOfTemplates=List of templates Gender=Gender Genderman=Man Genderwoman=Woman +Genderother=Other ViewList=List view ViewGantt=Gantt view ViewKanban=Kanban view @@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous Calendar=Calendar GroupBy=Group by... ViewFlatList=View flat list +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Remove string '%s' SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at https://transifex.com/projects/p/dolibarr/ to add your improvements. DirectDownloadLink=Direct download link (public/external) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments SearchIntoExpenseReports=Expense reports SearchIntoLeaves=Leave SearchIntoTickets=Tickets +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Vendor payments +SearchIntoMiscPayments=Miscellaneous payments CommentLink=Comments NbComments=Number of comments CommentPage=Comments space @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Information Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Date of birth +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/bn_IN/mrp.lang b/htdocs/langs/bn_IN/mrp.lang index 863793063a0..f018be890cc 100644 --- a/htdocs/langs/bn_IN/mrp.lang +++ b/htdocs/langs/bn_IN/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/bn_IN/website.lang b/htdocs/langs/bn_IN/website.lang index 4b5294d5e43..03e042e4be6 100644 --- a/htdocs/langs/bn_IN/website.lang +++ b/htdocs/langs/bn_IN/website.lang @@ -31,7 +31,7 @@ AddWebsite=Add website Webpage=Web page/container AddPage=Add page/container HomePage=Home Page -PageContainer=Page/container +PageContainer=Page PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. 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. SiteDeleted=Web site '%s' deleted @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=RSS Feed RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/bs_BA/accountancy.lang b/htdocs/langs/bs_BA/accountancy.lang index b21215a1589..27f2742906e 100644 --- a/htdocs/langs/bs_BA/accountancy.lang +++ b/htdocs/langs/bs_BA/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Default for service DefaultForProduct=Pretpostavljeno za proizvod CantSuggest=Can't suggest AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s -ConfigAccountingExpert=Podešavanje modula eksperta računovodstva +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Prenos u dnevnik -Journaux=Dnevnici +Journals=Dnevnici JournalFinancial=Finansijski dnevnici BackToChartofaccounts=Vraćanje na pregled računa Chartofaccounts=Chart of accounts +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Current dedicated account AssignDedicatedAccountingAccount=New account to assign InvoiceLabel=Invoice label @@ -33,8 +35,8 @@ OtherInfo=Other information DeleteCptCategory=Remove accounting account from group ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group? JournalizationInLedgerStatus=Status of journalization -AlreadyInGeneralLedger=Already journalized in ledgers -NotYetInGeneralLedger=Not yet journalized in ledgers +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group DetailByAccount=Show detail by account AccountWithNonZeroValues=Accounts with non-zero values @@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC CountriesNotInEEC=Countries not in EEC CountriesInEECExceptMe=Countries in EEC except %s CountriesExceptMe=All countries except %s -AccountantFiles=Export accounting documents +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup @@ -79,7 +83,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) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Odaberi aktivnog pregleda računa ChangeAndLoad=Change and load Addanaccount=Dodaj računovodstveni račun @@ -89,6 +93,8 @@ SubledgerAccount=Subledger account SubledgerAccountLabel=Subledger account label ShowAccountingAccount=Show accounting account ShowAccountingJournal=Show accounting journal +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Predloženi računovodstveni račun MenuDefaultAccounts=Default accounts MenuBankAccounts=Žiro računi @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding CreateMvts=Create new transaction UpdateMvts=Modifikacija transakcije ValidTransaction=Validate transaction -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=Ledger +BookkeepingSubAccount=Subledger AccountBalance=Account balance ObjectsRef=Source object ref CAHTF=Total purchase vendor before tax @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Dnevnik prodaje ACCOUNTING_PURCHASE_JOURNAL=Dnevnik nabavki @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups ByYear=Po godini NotMatch=Not Set -DeleteMvt=Delete Ledger lines +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=Year to delete DelJournal=Journal to delete -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Finance journal ExpenseReportsJournal=Expense reports journal DescFinanceJournal=Finance journal including all the types of payments by bank account -DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Account for VAT not defined ThirdpartyAccountNotDefined=Account for third party not defined ProductAccountNotDefined=Account for product not defined @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu %s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Export draft journal @@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Chart of accounts Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang index f5d0629c8d0..4149ca416ca 100644 --- a/htdocs/langs/bs_BA/admin.lang +++ b/htdocs/langs/bs_BA/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=Edition of field %s FillThisOnlyIfRequired=Primjer: +2 (popuniti samo ako imate problema sa ofsetima vremenskih zona) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=LDAP Setup LDAPGlobalParameters=Globalni parametri @@ -1670,7 +1672,7 @@ AdvancedEditor=Advanced editor ActivateFCKeditor=Activate advanced editor for: FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services) FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing) FCKeditorForUserSignature=WYSIWIG creation/edition of user signature FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting 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 user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup diff --git a/htdocs/langs/bs_BA/banks.lang b/htdocs/langs/bs_BA/banks.lang index 5acc0fba6e6..696a6ff35f6 100644 --- a/htdocs/langs/bs_BA/banks.lang +++ b/htdocs/langs/bs_BA/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=Razna plaćanja ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA mandate YourSEPAMandate=Vaš SEPA mandat FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/bs_BA/categories.lang b/htdocs/langs/bs_BA/categories.lang index cb6c6a88aa4..0672e7c4bc7 100644 --- a/htdocs/langs/bs_BA/categories.lang +++ b/htdocs/langs/bs_BA/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup CategorieRecursiv=Link with parent tag/category automatically CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=Add the following product/service +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Show tag/category ByDefaultInList=By default in list ChooseCategory=Choose category -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/bs_BA/companies.lang b/htdocs/langs/bs_BA/companies.lang index 1987d742cd4..f1b1949d9a9 100644 --- a/htdocs/langs/bs_BA/companies.lang +++ b/htdocs/langs/bs_BA/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-Id br.) ProfId2AT=Prof Id 2 (USt.-br.) ProfId3AT=Prof Id 3 (br. trgovačkog registra) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof Id 1 (Federalni broj) ProfId4CH=Prof Id 2 (Broj komercijalnog zapisa) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof Id 1 (R.U.T.) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-Id br.) ProfId2DE=Prof Id 2 (USt.-br.) ProfId3DE=Prof Id 3 (br. trgovačkog registra) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof Id 1 (CIF/NIF) ProfId2ES=Prof Id 2 (broj socijalnog osiguranja) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (broj udruženja) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof Id 1 (SIREN) ProfId2FR=Prof Id 2 (SIRET) ProfId3FR=Prof Id 3 (NAF, stari APE) ProfId4FR=Prof Id 4 (RCS/RM) -ProfId5FR=- +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Registracijski broj ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC porez) ProfId4IN=Prof Id 4 ProfId5IN=Prof Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luksemburg) ProfId2LU=Id. prof. 2 (dozvola za rad) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (R.C.) ProfId2MA=Id prof. 2 (Patent) ProfId3MA=Id prof. 3 (I.F.) ProfId4MA=Id prof. 4 (C.N.S.S.) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof Id 1 (R.F.C). ProfId2MX=Prof Id 2 (R..P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK broj ProfId2NL=- ProfId3NL=- ProfId4NL=Broj usluga građanima (BSN) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof Id 2 (broj socijalnog osiguranja) ProfId3PT=Prof Id 3 (broj komercijalnog zapisa) ProfId4PT=Prof Id 4 (konzervator) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof Id 1 (OGRN) ProfId2RU=Prof Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi ErrorVATCheckMS_UNAVAILABLE=Provjera nije moguća. Servis za provjeru nije naveden od stran države članice (%s). NorProspectNorCustomer=Not prospect, nor customer JuridicalStatus=Legal Entity Type +Workforce=Workforce Staff=Employees ProspectLevelShort=Potencijal ProspectLevel=Potencijal mogućeg klijenta @@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor PaymentTypeBoth=Payment Type - Customer and Vendor MulticurrencyUsed=Use Multicurrency MulticurrencyCurrency=valuta +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/bs_BA/hrm.lang b/htdocs/langs/bs_BA/hrm.lang index 1415c9117c3..df8b7b1b849 100644 --- a/htdocs/langs/bs_BA/hrm.lang +++ b/htdocs/langs/bs_BA/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=Employees Employee=Zaposlenik NewEmployee=New employee +ListOfEmployees=List of employees diff --git a/htdocs/langs/bs_BA/languages.lang b/htdocs/langs/bs_BA/languages.lang index f30cffc94c2..203d794aa05 100644 --- a/htdocs/langs/bs_BA/languages.lang +++ b/htdocs/langs/bs_BA/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Španjolski (Paragvaj) Language_es_PE=Španjolski (Peru) Language_es_PR=Španjolski (Puerto Rico) +Language_es_US=Spanish (USA) Language_es_UY=Spanish (Uruguay) Language_es_GT=Spanish (Guatemala) Language_es_VE=Spanish (Venezuela) diff --git a/htdocs/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang index 477e64c7237..53577a4ab73 100644 --- a/htdocs/langs/bs_BA/main.lang +++ b/htdocs/langs/bs_BA/main.lang @@ -155,6 +155,7 @@ RemoveLink=Ukloni link AddToDraft=Dodaj u nacrt Update=Ažuriraj Close=Zatvori +CloseAs=Set status to CloseBox=Ukloni kutijicu sa svoje nadzorne ploče Confirm=Potvrdi ConfirmSendCardByMail=Do you really want to send the content of this card by mail to %s? @@ -196,6 +197,7 @@ ReOpen=Opet otvori Upload=Upload ToLink=Link Select=Odaberi +SelectAll=Select all Choose=Izaberi Resize=Promjena veličine ResizeOrCrop=Promijeni veličinu ili izreži @@ -256,6 +258,7 @@ Cards=Kartice Card=Kartica Now=Sada HourStart=Početno vrijeme +Deadline=Deadline Date=Datum DateAndHour=Datum i vrijeme DateToday=Današnji datum @@ -264,8 +267,10 @@ DateStart=Datum početka DateEnd=Datum završetka DateCreation=Datum kreiranja DateCreationShort=Datum pravlj. +IPCreation=Creation IP DateModification=Datum izmjene DateModificationShort=Datum izmj. +IPModification=Modification IP DateLastModification=Datum zadnje izmjene DateValidation=Datum potvrde DateClosing=Datum zatvaranja @@ -319,6 +324,7 @@ Morning=Jutro Afternoon=Večer Quadri=Četvoro MonthOfDay=Mjesec dana +DaysOfWeek=Days of week HourShort=h MinuteShort=min Rate=Stopa @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Iznos za plaćanje, orig. valuta MulticurrencyAmountHT=Amount (excl. tax), original currency MulticurrencyAmountTTC=Iznos (uklj. porez), origin. valuta MulticurrencyAmountVAT=Iznos poreza, orig. valuta +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Iznos poreza 2 AmountLT2=Iznos poreza 3 AmountLT1ES=Iznos RE @@ -487,6 +494,7 @@ By=Od From=Od FromDate=Od FromLocation=Od +at=at to=za To=za and=i @@ -509,6 +517,7 @@ Draft=Nacrt Drafts=Uzorak StatusInterInvoiced=Invoiced Validated=Potvrđeno +ValidatedToProduce=Validated (To produce) Opened=Otvori OpenAll=Open (All) ClosedAll=Closed (All) @@ -655,6 +664,7 @@ Response=Odgovor Priority=Prioritet SendByMail=Send by email MailSentBy=Email je poslao +NotSent=Nije poslano TextUsedInTheMessageBody=Tekst emaila SendAcknowledgementByMail=Pošalji konfirmacijski email SendMail=Pošalji e-mail @@ -836,6 +846,7 @@ ListOfTemplates=Spisak šablona Gender=Spol Genderman=Muškarac Genderwoman=Žena +Genderother=Ostalo ViewList=Lista ViewGantt=Gantt view ViewKanban=Kanban view @@ -877,6 +888,8 @@ Miscellaneous=Razno Calendar=Kalendar GroupBy=Grupiranje po... ViewFlatList=Vidi čisti spisak +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Ukloni pojam '%s' SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at https://transifex.com/projects/p/dolibarr/ to add your improvements. DirectDownloadLink=Direktni link preuzimanja (javni/vanjski) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Slanje kupcu SearchIntoExpenseReports=Izvještaj o troškovima SearchIntoLeaves=Leave SearchIntoTickets=Tickets +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Vendor payments +SearchIntoMiscPayments=Razna plaćanja CommentLink=Komentari NbComments=Broj komentara CommentPage=Prostor komentara @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Inromacije Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Date of birth +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/bs_BA/mrp.lang b/htdocs/langs/bs_BA/mrp.lang index 863793063a0..f018be890cc 100644 --- a/htdocs/langs/bs_BA/mrp.lang +++ b/htdocs/langs/bs_BA/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/bs_BA/website.lang b/htdocs/langs/bs_BA/website.lang index 32ced04bd3e..8aa0ca84eb0 100644 --- a/htdocs/langs/bs_BA/website.lang +++ b/htdocs/langs/bs_BA/website.lang @@ -31,7 +31,7 @@ AddWebsite=Add website Webpage=Web page/container AddPage=Add page/container HomePage=Home Page -PageContainer=Page/container +PageContainer=Stranica PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. 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. SiteDeleted=Web site '%s' deleted @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=RSS Feed RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang index 88c84d3d578..6146dd28e9f 100644 --- a/htdocs/langs/ca_ES/accountancy.lang +++ b/htdocs/langs/ca_ES/accountancy.lang @@ -27,7 +27,7 @@ Chartofaccounts=Pla comptable ChartOfSubaccounts=Pla de comptes individuals ChartOfIndividualAccountsOfSubsidiaryLedger=Pla de comptes individuals del llibre major CurrentDedicatedAccountingAccount=Compte dedicat actual -AssignDedicatedAccountingAccount=Nou compte per a assignar +AssignDedicatedAccountingAccount=Compte nou per a assignar InvoiceLabel=Etiqueta de factura OverviewOfAmountOfLinesNotBound=Vista general de la quantitat de línies no comptabilitzades en un compte comptable OverviewOfAmountOfLinesBound=Vista general de la quantitat de línies ja comptabilitzades en un compte comptable @@ -113,7 +113,7 @@ Binding=Comptabilitzar en comptes CustomersVentilation=Comptabilització de factura de client SuppliersVentilation=Comptabilització de la factura del proveïdor ExpenseReportsVentilation=Comptabilització d'informes de despeses -CreateMvts=Crea una nova transacció +CreateMvts=Crea una transacció nova UpdateMvts=Modificació d'una transacció ValidTransaction=Valida l'assentament WriteBookKeeping=Registra transaccions en comptabilitat @@ -230,7 +230,7 @@ FeeAccountNotDefined=Compte per tarifa no definit BankAccountNotDefined=Comptes comptables per al banc sense definir CustomerInvoicePayment=Pagament de factura de client ThirdPartyAccount=Compte de tercer -NewAccountingMvt=Nova transacció +NewAccountingMvt=Transacció nova NumMvts=Número de transacció ListeMvts=Llista de moviments ErrorDebitCredit=El dèbit i el crèdit no poden tenir valors alhora @@ -301,7 +301,7 @@ AddAccountFromBookKeepingWithNoCategories=Compte disponible encara no al grup pe CategoryDeleted=S'ha eliminat la categoria per al compte comptable AccountingJournals=Diari de comptabilitat AccountingJournal=Diari comptable -NewAccountingJournal=Nou diari comptable +NewAccountingJournal=Diari comptable nou ShowAccountingJournal=Mostrar diari comptable NatureOfJournal=Naturalesa del diari AccountingJournalType1=Operacions diverses @@ -313,8 +313,8 @@ AccountingJournalType8=Inventari AccountingJournalType9=Haver ErrorAccountingJournalIsAlreadyUse=Aquest diari ja està en ús AccountingAccountForSalesTaxAreDefinedInto=Nota: el compte de comptes de l'impost de vendes es defineix al menú %s - %s -NumberOfAccountancyEntries=Número d'entrades -NumberOfAccountancyMovements=Número de moviments +NumberOfAccountancyEntries=Nombre d'entrades +NumberOfAccountancyMovements=Nombre de moviments ACCOUNTING_DISABLE_BINDING_ON_SALES=Desactiva la vinculació i transferència de comptabilitat en vendes (les factures dels clients no es tindran en compte a la comptabilitat) ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Desactiva la vinculació i transferència a la comptabilitat de les compres (les factures de proveïdors no es tindran en compte a la comptabilitat) ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Desactiva la vinculació i transferència de comptes en els informes de despeses (els informes de despeses no es tindran en compte a la comptabilitat) @@ -339,6 +339,8 @@ Modelcsv_configurable=Exporta CSV configurable Modelcsv_FEC=Exporta FEC Modelcsv_Sage50_Swiss=Exportació per Sage 50 Switzerland Modelcsv_winfic=Exportar Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Exporta per a Gestinum (v3) +Modelcsv_Gestinumv5Export per a Gestinum (v5) ChartofaccountsId=Id pla comptable ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang index d6a70cd4caa..7d1f089796c 100644 --- a/htdocs/langs/ca_ES/admin.lang +++ b/htdocs/langs/ca_ES/admin.lang @@ -54,7 +54,7 @@ InternalUsers=Usuaris interns ExternalUsers=Usuaris externs GUISetup=Entorn SetupArea=Configuració -UploadNewTemplate=Carrega nova plantilla(s) +UploadNewTemplate=Carrega plantilles noves FormToTestFileUploadForm=Formulari de prova de càrrega de fitxer (segons opcions escollides) IfModuleEnabled=Nota: sí només és eficaç si el mòdul %s està activat RemoveLock=Elimineu/renombreu el fitxer %s si existeix, per a permetre l'ús de l'eina d'actualització/instal·lació. @@ -70,8 +70,8 @@ ErrorReservedTypeSystemSystemAuto=L'ús del tipus 'system' i 'systemauto' està ErrorCodeCantContainZero=El codi no pot contenir el valor 0 DisableJavascript=Desactivar les funcions Javascript DisableJavascriptNote=Nota: per a propòsits de prova o de depuració. Per a l’optimització dels navegadors cec o de text, és possible que preferiu utilitzar la configuració en el perfil de l’usuari -UseSearchToSelectCompanyTooltip=També si tenen un gran número de tercers (> 100.000), pot augmentar la velocitat mitjançant l'estableciement COMPANY_DONOTSEARCH_ANYWHERE amb la constant a 1 a Configuració --> Altres. La cerca serà limitada a la creació de la cadena -UseSearchToSelectContactTooltip=També si vostè té un gran número de tercers (> 100.000), pot augmentar la velocitat mitjançant l'estableciment. CONTACT_DONOTSEARCH_ANYWHERE amb la constant a 1 a Configuració --> Altres. La cerca serà limitada a la creació de la cadena +UseSearchToSelectCompanyTooltip=A més, si teniu un gran nombre de tercers (> 100.000), podeu augmentar la velocitat establint la constant COMPANY_DONOTSEARCH_ANYWHERE a 1 a Configuració->Altres. La cerca es limitarà a l'inici de la cadena. +UseSearchToSelectContactTooltip=A més, si teniu un gran nombre de tercers (> 100.000), podeu augmentar la velocitat establint la constant CONTACT_DONOTSEARCH_ANYWHERE a 1 a Configuració->Altres. La cerca es limitarà a l'inici de la cadena. DelaiedFullListToSelectCompany=Esperar fins que es prem una tecla abans de carregar el contingut de la llista combinada de Tercers.
Això pot augmentar el rendiment si teniu un gran nombre de tercers, però és menys convenient. DelaiedFullListToSelectContact=Espereu fins que es prem una tecla abans de carregar el contingut de la llista combinada de contactes.
Això pot augmentar el rendiment si teniu un gran nombre de contactes, però és menys convenient. NumberOfKeyToSearch=Nombre de caràcters per activar la cerca: %s @@ -122,7 +122,7 @@ OtherSetup=Altres configuracions CurrentValueSeparatorDecimal=Separador decimal CurrentValueSeparatorThousand=Separador milers Destination=Destinació -IdModule=ID del modul +IdModule=ID del mòdul IdPermissions=ID de permisos LanguageBrowserParameter=Variable %s LocalisationDolibarrParameters=Paràmetres de localització @@ -137,7 +137,7 @@ YouCanEditPHPTZ=Per establir una zona horària PHP diferent (no és necessari), HoursOnThisPageAreOnServerTZ=Avís, al contrari d'altres pantalles, les hores d'aquesta pàgina no són a la vostra zona horària local, sinó a la zona horària del servidor. Box=Panell Boxes=Panells -MaxNbOfLinesForBoxes=Màxim número de línies pels panells +MaxNbOfLinesForBoxes=Màx. nombre de línies pels panells AllWidgetsWereEnabled=Tots els widgets disponibles estan habilitats PositionByDefault=Posició per defecte Position=Lloc @@ -196,7 +196,7 @@ NameColumn=Nom de les columnes ExtendedInsert=Instruccions INSERT esteses NoLockBeforeInsert=Sense intrucció LOCK abans del INSERT DelayedInsert=Insercions amb retard -EncodeBinariesInHexa=Codificar els camps binaris en hexacesimal +EncodeBinariesInHexa=Codifica les dades binàries en hexadecimal IgnoreDuplicateRecords=Ignorar errors de registres duplicats (INSERT IGNORE) AutoDetectLang=Autodetecta (idioma del navegador) FeatureDisabledInDemo=Opció deshabilitada en demo @@ -205,12 +205,12 @@ BoxesDesc=Els panells són components que mostren algunes dades que poden afegir OnlyActiveElementsAreShown=Només els elements de mòduls activats són mostrats ModulesDesc=Els mòduls/aplicacions determinen quines funcions estan disponibles al programari. Alguns mòduls requereixen que es concedeixin permisos als usuaris després d'activar-lo. Feu clic al botó d'encesa/apagada %s de cada mòdul per a habilitar o desactivar 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 +ModulesDeployDesc=Si els permisos del vostre sistema de fitxers ho permeten, podeu utilitzar aquesta eina per desplegar un mòdul extern. El mòdul serà visible a la pestanya %s . ModulesMarketPlaces=Trobar mòduls/complements externs ModulesDevelopYourModule=Desenvolupeu els vostres mòduls/aplicacions ModulesDevelopDesc=Podeu desenvolupar o trobar un partner que desenvolupi per a vostè, el vostre mòdul personalitzat DOLISTOREdescriptionLong=En lloc d'anar al lloc web www.dolistore.com per trobar un mòdul extern, podeu utilitzar aquesta eina incrustada que farà la cerca en la tenda per vosaltres (pot ser lent, necessiteu un accés a internet)... -NewModule=Nou mòdul +NewModule=Mòdul nou 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). @@ -335,7 +335,7 @@ 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=
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. +InfDirExample=Llavors
declareu-ho a l'arxiu conf.php
$dolibarr_main_url_root_alt='/custom'
$dolibarr_main_document_root_alt='/ruta/del/dolibarr/htdocs/custom'
Si aquestes línies estan comentades amb "#", per a activar-les simplement descomenteu-les traient el caràcter "#". YouCanSubmitFile=Podeu pujar el fitxer .zip del paquet del mòdul des d’aquí: CurrentVersion=Versió actual de Dolibarr CallUpdatePage=Ves a la pàgina que actualitza l'estructura de base de dades i les dades: %s @@ -343,10 +343,10 @@ LastStableVersion=Última versió estable LastActivationDate=Data de l'última activació LastActivationAuthor=Últim autor d'activació LastActivationIP=Última IP d'activació -UpdateServerOffline=Actualitzacións del servidor fora de línia +UpdateServerOffline=Actualitza el servidor fora de línia WithCounter=Gestiona un comptador -GenericMaskCodes=Podeu introduir qualsevol màscara numèrica. En aquesta màscara, pot utilitzar les següents etiquetes:
{000000} correspon a un número que s'incrementa en cadascun %s. Introduïu tants zeros com longuitud desitgi mostrar. El comptador es completarà a partir de zeros per l'esquerra per tal de tenir tants zeros com la màscara.
{000000+000}Igual que l'anterior, amb una compensació corresponent al número a la dreta del signe + s'aplica a partir del primer %s.
{000000@x}igual que l'anterior, però el comptador es restableix a zero quan s'arriba a x mesos (x entre 1 i 12). Si aquesta opció s'utilitza i x és de 2 o superior, llavors la seqüència {yy}{mm} ó {yyyy}{mm} també és necessària.
{dd} dies (01 a 31).
{mm} mes (01 a 12).
{yy} , {yyyy ó {y} any en 2, 4 ó 1 xifra.
-GenericMaskCodes2={cccc} el codi de client amb n caracters
{cccc000} el codi de client amb n caracters seguit d'un contador dedicat pel client. Aquest contador dedicar al client es reinícia al mateix temps que el contador global.
{tttt} El codi del tipus de tercer amb n caracters (veure menú Inici - Configuració - Diccionaris - Tipus de tercer). Si afegeixes aquesta etiqueta, el contador serà diferent per a cada tipus de tercer.
+GenericMaskCodes=Podeu introduir qualsevol màscara numèrica. En aquesta màscara es podrien utilitzar les etiquetes següents:
{000000} correspon a un número que s'incrementarà a cada %s. Introduïu tants zeros com la longitud desitjada del comptador. El comptador es completarà amb zeros per l'esquerra per tal de tenir tants zeros com la màscara.
{000000+000} igual que l'anterior, però s'aplica un desplaçament corresponent al número a la dreta del signe + a partir del primer %s.
{000000@x} igual que l'anterior, però el comptador es restableix a zero quan s'arriba al mes x (x entre 1 i 12, o 0 per utilitzar els primers mesos de l'any fiscal definits a la configuració o 99 per restablir-los a zero cada mes). Si s’utilitza aquesta opció i x és 2 o superior, també és obligatòria la seqüència {yy}{mm} o {yyyy}{mm}.
{dd} dia (de l'1 al 31).
{mm} mes (01 a 12).
{aa} , {aaaa} o {y} any en 2, 4 o 1 xifra.
+GenericMaskCodes2={cccc} el codi de client amb n caràcters
{cccc000} el codi de client amb n caràcters seguit d'un comptador dedicat pel client. Aquest comptador dedicat al client es reinicia al mateix temps que el comptador global.
{tttt} El codi del tipus de tercer amb n caràcters (vegeu el menú Inici - Configuració - Diccionaris - Tipus de tercers). Si afegeixes aquesta etiqueta, el comptador serà diferent per a cada tipus de tercer.
GenericMaskCodes3=Qualsevol altre caràcter a la màscara es quedarà sense canvis.
No es permeten espais
GenericMaskCodes4a=Exemple en el 99 %s del tercer L'Empresa, amb data 31/01/2007:
GenericMaskCodes4b=Exemple sobre un tercer creat el 31/03/2007:
@@ -368,12 +368,12 @@ DisableLinkToHelpCenter=Amagar l'enllaç "Necessita suport o ajuda" a la pàgina DisableLinkToHelp=Amaga l'enllaç a l'ajuda en línia "%s" AddCRIfTooLong=No hi ha cap tall de text automàtic, el text massa llarg no es mostrarà als documents. Si cal, afegiu devolucions de carro a l'àrea de text. 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 +MinLength=Longitud mínima LanguageFilesCachedIntoShmopSharedMemory=arxius .lang en memòria compartida LanguageFile=Fitxer d'idioma ExamplesWithCurrentSetup=Exemples amb configuració 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. +ListOfDirectoriesForModelGenODT=Llista de directoris que contenen fitxers de plantilles amb format OpenDocument.

Posa aquí 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. NumberOfModelFilesFound=Nombre d'arxius de plantilles ODT/ODS trobats en aquest(s) directori(s) ExampleOfDirectoriesForModelGen=Exemples de sintaxi:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir FollowingSubstitutionKeysCanBeUsed=Posant les següents etiquetes a la plantilla, obtindrà una substitució amb el valor personalitzat en generar el document: @@ -382,7 +382,7 @@ FirstnameNamePosition=Posició del Nom/Cognoms DescWeather=Les imatges següents es mostraran al tauler de control quan el nombre d'accions posteriors arriba als valors següents: KeyForWebServicesAccess=Clau per utilitzar els Web Services (paràmetre "dolibarrkey" en els webservices) TestSubmitForm=Formulari de proves -ThisForceAlsoTheme=Utilitzar aquest gestor de menús predetermina també el tema, sigui quina sigui l'elecció de l'usuari. A més, aquest gestor de menús, especial per a smartphones, només funciona en alguns telèfons. Utilitzar un altre gestor Si veieu qualsevol problema. +ThisForceAlsoTheme=L’ús d’aquest gestor de menús també farà servir el seu propi tema sigui quina sigui l’opció de l’usuari. A més, aquest gestor de menú especialitzat per a telèfons intel·ligents no funciona en tots els telèfons intel·ligents. Utilitzeu un altre gestor de menús si teniu problemes amb el vostre. ThemeDir=Directori dels temes ConnectionTimeout=Temps d'espera de connexió ResponseTimeout=Timeout de resposta @@ -420,7 +420,7 @@ HtmlText=Text Html Int=Enter Float=Decimal DateAndTime=Data i hora -Unique=Unic +Unique=Únic Boolean=Boleà (una casella de selecció) ExtrafieldPhone = Telèfon ExtrafieldPrice = Preu @@ -435,7 +435,7 @@ ExtrafieldCheckBox=Caselles de selecció ExtrafieldCheckBoxFromList=Caselles de selecció des d'una taula ExtrafieldLink=Enllaç a un objecte ComputedFormula=Camp calculat -ComputedFormulaDesc=Podeu introduir aquí una fórmula utilitzant altres propietats de l’objecte o qualsevol codi PHP per obtenir un valor calculat dinàmicament. Podeu utilitzar qualsevol fórmula compatible amb PHP, inclós l'operador condicional "?" i els següents objectes globals: $db, $conf, $langs, $mysoc, $user, $object .
ATENCIÓ : Només poden estar disponibles algunes propietats de $object. Si necessiteu una propietat no carregada, només cal que incorporeu l'objecte a la vostra fórmula com en el segon exemple.
Utilitzar un camp calculat implica que no podreu introduir cap valor des de la interfície. A més, si hi ha un error de sintaxi, la fórmula pot no tornar 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 per tornar a carregar l'objecte
(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($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 pare:
(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found' +ComputedFormulaDesc=Podeu introduir aquí una fórmula utilitzant altres propietats de l’objecte o qualsevol codi PHP per obtenir un valor calculat dinàmicament. Podeu utilitzar qualsevol fórmula compatible amb PHP, inclòs l'operador condicional "?" i els següents objectes globals: $db, $conf, $langs, $mysoc, $user, $object .
ATENCIÓ : Només poden estar disponibles algunes propietats de $object. Si necessiteu una propietat no carregada, només cal que incorporeu l'objecte a la vostra fórmula com en el segon exemple.
Utilitzar un camp calculat implica que no podreu introduir cap valor des de la interfície. A més, si hi ha un error de sintaxi, la fórmula pot no tornar 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 per tornar a carregar l'objecte
(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($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 pare:
(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found' Computedpersistent=Emmagatzemar el camp computat ComputedpersistentDesc=Els camps addicionals computats s’emmagatzemaran a la base de dades, però, el valor només es tornarà a calcular quan l’objecte d’aquest camp s’ha canviat. Si el camp calculat depèn d'altres objectes o dades globals, aquest valor podria estar equivocat !! ExtrafieldParamHelpPassword=Mantenir aquest camp buit significa que el valor s'emmagatzema sense xifrar (el camp només ha d'estar amagat amb una estrella sobre la pantalla).
Establiu aquí el valor 'auto' per utilitzar la regla de xifrat per defecte per guardar la contrasenya a la base de dades (el valor llegit serà només el "hash", no hi haurà cap manera de recuperar el valor original) @@ -450,7 +450,7 @@ LibraryToBuildPDF=Llibreria utilitzada per generar PDF LocalTaxDesc=Alguns països apliquen 2 o 3 impostos en cada línia de factura. Si aquest és el cas, escull el tipus pel segon i el tercer impost i el seu valor. Els tipus possibles són:
1: impostos locals aplicats en productes i serveis sense IVA (l'impost local serà calculat en el total sense impostos)
2: impost local aplicat en productes i serveis amb IVA (l'impost local serà calculat amb el total + l'impost principal)
3: impost local aplicat en productes sense IVA (l'impost local serà calculat en el total sense impost)
4: impost local aplicat en productes amb IVA (l'impost local serà calculat amb el total + l'impost principal)
5: impost local aplicat en serveis sense IVA (l'impost local serà calculat amb el total sense impost)
6: impost local aplicat en serveis amb IVA inclòs (l'impost local serà calculat amb el total + IVA) SMS=SMS LinkToTestClickToDial=Introduïu un número de telèfon que voleu marcar per provar l'enllaç de crida ClickToDial per a l'usuari %s -RefreshPhoneLink=Refrescar enllaç +RefreshPhoneLink=Actualitza l'enllaç LinkToTest=Enllaç seleccionable per l'usuari %s (feu clic al número per provar) KeepEmptyToUseDefault=Deixa-ho buit per usar el valor per defecte KeepThisEmptyInMostCases=En la majoria dels casos, pots deixar aquest camp buit. @@ -468,11 +468,11 @@ ConfirmEraseAllCurrentBarCode=Esteu segur que voleu esborrar tots els valors de AllBarcodeReset=S'han eliminat tots els valors de codi de barres NoBarcodeNumberingTemplateDefined=No hi ha cap plantilla de codi de barres habilitada a la configuració del mòdul de codi de barres. EnableFileCache=Habilita la caché de fitxers -ShowDetailsInPDFPageFoot=Afegiu més detail al peu de pàgina, com l'adreça de la empresa o els noms dels gestors (a més dels ids dels professionals, capital de la empresa o el nº d'IVA). +ShowDetailsInPDFPageFoot=Afegiu més detalls al peu de pàgina, com ara l'adreça de l'empresa o els noms dels gestors (a més d'identificadors professionals, capital de l'empresa i número de NIF/CIF). NoDetails=No hi ha detalls addicionals al peu de pàgina 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 +DisplayCompanyInfoAndManagers=Mostra l'adreça de l'empresa i els noms de la persona gestora EnableAndSetupModuleCron=Si voleu que aquesta factura periòdica es generi automàticament, el mòdul * %s * s’ha d’habilitar i configurar correctament. En cas contrari, la generació de factures s’ha de fer manualment des d’aquesta plantilla mitjançant el botó *Crea*. Tingueu en compte que, fins i tot si heu activat la generació automàtica, encara podeu iniciar la generació manual amb seguretat. No es pot generar duplicats per al mateix període. ModuleCompanyCodeCustomerAquarium=%s seguit de codi de client de tercers per obtenir un codi de comptabilitat de clients ModuleCompanyCodeSupplierAquarium=%s seguit del codi de proveïdor per a un codi de comptabilitat del proveïdor @@ -490,16 +490,16 @@ WarningPHPMailD=Si el mètode "PHP Mail" és realment el mètode que voleu utili WarningPHPMail2=Si el vostre proveïdor SMTP necessita restringir al client de correu a una adreça IP (és raro), aquesta és la IP de l'agent d'usuari de correu (MUA) per la vostra aplicació ERP CRM: %s. WarningPHPMailSPF=Si el nom de domini de l’adreça de correu electrònic del remitent està protegit per un registre SPF (pregunteu-li al vostre registrador de noms de domini), heu d’afegir les següents IP al registre SPF del DNS del vostre domini: %s . ClickToShowDescription=Clica per mostrar la descripció -DependsOn=Aquest mòdul necesita el mòdul(s) +DependsOn=Aquest mòdul necessita els mòduls RequiredBy=Aquest mòdul és requerit pel/s mòdul/s -TheKeyIsTheNameOfHtmlField=Aquest és el nom del camp HTML. Son necessaris coneixements tècnics per llegir el contingut de la pàgina HTML per obtenir el nom clau d'un camp. +TheKeyIsTheNameOfHtmlField=Aquest és el nom del camp HTML. Es necessiten coneixements tècnics per llegir el contingut de la pàgina HTML per a 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. PageUrlForDefaultValuesCreate=
Exemple:
Per al formulari per crear una nou tercer, és %s .
Per a l'URL dels mòduls externs instal·lats al directori personalitzat, no incloeu "custom/", així que utilitzeu una ruta com mymodule / mypage.php i no custom/mymodule/mypage.php.
Si voleu un valor predeterminat només si la url té algun paràmetre, podeu utilitzar %s PageUrlForDefaultValuesList=
Exemple:
Per a la pàgina que llista els tercers, és %s .
Per a l'URL dels mòduls externs instal·lats al directori personalitzat, no incloeu "custom/" utilitzeu una ruta com mymodule/mypagelist.php i no custom/mymodule/mypagelist.php.
Si voleu un valor predeterminat només si la url té algun paràmetre, podeu utilitzar %s AlsoDefaultValuesAreEffectiveForActionCreate=També tingueu en compte que sobreescriure valors predeterminats per a la creació de formularis funciona només per a pàgines dissenyades correctament (de manera que amb el paràmetre action = create o presend ...) EnableDefaultValues=Activa la personalització dels valors predeterminats EnableOverwriteTranslation=Habilita l'ús de la traducció sobreescrita -GoIntoTranslationMenuToChangeThis=S'ha trobat una traducció per a la clau amb aquest codi. Per canviar aquest valor, heu d'editar-lo des de Inici-Configuració-Traducció. +GoIntoTranslationMenuToChangeThis=S'ha trobat una traducció de la clau amb aquest codi. Per a canviar aquest valor, l’heu d’editar des d'Inici-Configuració-Traducció. WarningSettingSortOrder=Avís, establir un ordre de classificació predeterminat pot provocar un error tècnic en passar a la pàgina de la llista si el camp és un camp desconegut. Si experimentes aquest error, torna a aquesta pàgina per eliminar l'ordre de classificació predeterminat i restablir el comportament predeterminat. Field=Camp ProductDocumentTemplates=Plantilles de documents per generar document de producte @@ -515,7 +515,7 @@ DAV_ALLOW_PRIVATE_DIRTooltip=El directori privat genèric és un directori WebDA DAV_ALLOW_PUBLIC_DIR=Habiliteu el directori públic genèric (directori dedicat de WebDAV anomenat "públic": no cal iniciar sessió DAV_ALLOW_PUBLIC_DIRTooltip=El directori públic genèric és un directori WebDAV que tothom pot accedir (en mode de lectura i escriptura), sense necessitat d’autorització (compte d’inici / contrasenya). DAV_ALLOW_ECM_DIR=Habiliteu el directori privat DMS / ECM (directori arrel del mòdul DMS / ECM) -DAV_ALLOW_ECM_DIRTooltip=El directori arrel on tots els fitxers son carregats manualment quan s'utilitza el mòdul GED. Al igual que per a la funció de l'interfície web, es necessitarà un nom/contrasenya vàlid amb permisos adequats per accedir a ella. +DAV_ALLOW_ECM_DIRTooltip=El directori arrel on es carreguen manualment tots els fitxers quan s’utilitza el mòdul GED. De manera similar a l'accés des de la interfície web, necessitareu un usuari/contrasenya vàlids amb permisos adequats per a accedir-hi. # Modules Module0Name=Usuaris i grups Module0Desc=Gestió d'usuaris / empleats i grups @@ -545,7 +545,7 @@ Module50Name=Productes Module50Desc=Gestió de productes Module51Name=Correus massius Module51Desc=Administració i enviament de correu de paper en massa -Module52Name=Stocks de productes +Module52Name=Estocs Module52Desc=Gestió d'estoc Module53Name=Serveis Module53Desc=Gestió de serveis @@ -588,7 +588,7 @@ Module320Desc=Afegeix un fil RSS a les pàgines de Dolibarr Module330Name=Marcadors i Dreceres Module330Desc=Crear marcadors, sempre accessibles, a les pàgines internes o externes a les quals accediu sovint Module400Name=Projectes o Oportunitats -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. +Module400Desc=Gestió de projectes, oportunitats/leads i/o tasques. També podeu assignar qualsevol element (factura, comanda, pressupost, intervenció, ...) a un projecte i obtenir una vista transversal del projecte. Module410Name=Webcalendar Module410Desc=Interface amb el calendari webcalendar Module500Name=Impostos i Despeses especials @@ -664,7 +664,7 @@ Module50300Desc=Oferiu als clients una pàgina de pagament en línia de Stripe ( Module50400Name=Comptabilitat (doble entrada) Module50400Desc=Gestió comptable (entrades dobles, suport de comptabilitats generals i subsidiàries). Exporteu el llibre major en altres formats de programari de comptabilitat. Module54000Name=PrintIPP -Module54000Desc=L'impressió directa (sense obrir els documents) utilitza l'interfície Cups IPP (L'impressora té que ser visible pel servidor i CUPS té que estar instal·lat en el servidor) +Module54000Desc=Impressió directa (sense obrir els documents) mitjançant la interfície Cups IPP (la impressora ha de ser visible des del servidor i CUPS ha d’estar instal·lat al servidor). Module55000Name=Enquesta o votació Module55000Desc=Creeu enquestes o vots en línia (com Doodle, Studs, RDVz, etc.) Module59000Name=Marges @@ -786,7 +786,7 @@ Permission214=Configurar la telefonia Permission215=Configurar proveïdors Permission221=Consulta enviaments de correu electrònic Permission222=Crear/modificar E-Mails (assumpte, destinataris, etc.) -Permission223=Validar E-Mails (permet l'enviament) +Permission223=Validar enviaments per correu electrònic (permet l’enviament) Permission229=Eliminar E-Mails Permission237=Veure els destinataris i la informació Permission238=Enviar els e-mails manualment @@ -870,17 +870,17 @@ Permission703=Eliminar donacions Permission771=Consulta informes de despeses (propis i dels subordinats) Permission772=Crear/modificar informe de despeses Permission773=Eliminar els informes de despeses -Permission774=Consulta tots els informes de despeses (inclòs els usuaris no subordinats) +Permission774=Consulta tots els informes de despeses (fins i tot per a usuaris no subordinats) Permission775=Aprovar els informes de despeses Permission776=Pagar informes de despeses Permission777=Llegeix els informes de despeses de tothom Permission778=Crea/modifica informes de despeses de tothom Permission779=Exportar informes de despeses -Permission1001=Consultar stocks +Permission1001=Consulta d'estocs Permission1002=Crear/modificar els magatzems Permission1003=Eliminar magatzems -Permission1004=Consultar moviments de stock -Permission1005=Crear/modificar moviments de stock +Permission1004=Consulta moviments d'estoc +Permission1005=Crea/modifica moviments d'estoc Permission1101=Consulta els rebuts d'entrega Permission1102=Crea/modifica els rebuts d'entrega Permission1104=Validar els rebuts d'entrega @@ -931,7 +931,7 @@ Permission2515=Configuració carpetes de documents Permission2801=Utilitzar el client FTP en mode lectura (només explorar i descarregar) Permission2802=Utilitzar el client FTP en mode escriptura (esborrar o pujar arxius) Permission3200=Llegiu els esdeveniments arxivats i les empremtes dactilars -Permission3301=Genera nous mòduls +Permission3301=Genera mòduls nous Permission4001=Vegeu empleats Permission4002=Crea empleats Permission4003=Suprimeix els empleats @@ -943,8 +943,8 @@ Permission10005=Suprimeix el contingut del lloc web Permission20001=Consulta els dies de lliure disposició (els propis i els dels teus subordinats) Permission20002=Crea/modifica els teus dies de lliure disposició (els propis i els dels teus subordinats) Permission20003=Elimina les peticions de dies lliures retribuïts -Permission20004=Consulta tots els dies de lliure disposició (inclòs els usuaris no subordinats) -Permission20005=Crea/modifica els dies de lliure disposició per tothom (inclòs els usuaris no subordinats) +Permission20004=Consulta totes les sol·licituds de permís (fins i tot dels usuaris no subordinats) +Permission20005=Crea/modifica sol·licituds de permís per a tothom (fins i tot per a usuaris no subordinats) Permission20006=Administra els dies de lliure disposició (configura i actualitza el balanç) Permission20007=Aproveu sol·licituds de dies lliures Permission23001=Consulta les tasques programades @@ -1028,7 +1028,7 @@ DictionarySocialNetworks=Xarxes socials DictionaryProspectStatus=Estat de perspectiva de les empreses DictionaryProspectContactStatus=Estat de perspectiva dels contactes DictionaryHolidayTypes=Tipus de dies lliures -DictionaryOpportunityStatus=Estat de d'oportunitat pel projecte/oportunitat +DictionaryOpportunityStatus=Estat d'oportunitat del projecte/oportunitat DictionaryExpenseTaxCat=Informe de despeses - Categories de transport DictionaryExpenseTaxRange=Informe de despeses - Rang per categoria de transport DictionaryTransportMode=Informe intracomm: mode de transport @@ -1068,7 +1068,7 @@ LocalTax2IsUsedDescES=El tipus d'IRPF proposat per defecte en les creacions de p LocalTax2IsNotUsedDescES=El tipus d'IRPF proposat per defecte es 0. Final de regla. LocalTax2IsUsedExampleES=A Espanya, es tracta de persones físiques: autònoms i professionals independents que presten serveis i empreses que han triat el règim fiscal de mòduls. LocalTax2IsNotUsedExampleES=A Espanya, es tracta d'empreses no subjectes al règim fiscal de mòduls. -RevenueStampDesc=El "segell fiscal" o "segell de ingressos" és un impost fix per factura (no depèn de la quantitat de la factura). També pot ser un impost percentual, però utilitzar el segon o tercer tipus d’impost és millor per a impostos percentuals ja que els segells d’impostos no proporcionen cap mena d’informació. Només uns pocs països utilitzen aquest tipus d’impostos. +RevenueStampDesc=El "segell d'impostos" o "segell d'ingressos" és un impost fix per factura (no depèn de l'import de la factura). També pot ser un percentatge d’impostos, però és millor utilitzar el segon o tercer tipus d’impostos per al percentatge d’impostos, ja que els segells d’impostos no proporcionen cap informe. Només uns pocs països utilitzen aquest tipus d’impostos. UseRevenueStamp=Utilitzar un segell fiscal UseRevenueStampExample=El valor del segell fiscal està definit per defecte en la configuració dels diccionaris (%s - %s - %s) CalcLocaltax=Informes d'impostos locals @@ -1116,10 +1116,10 @@ SummarySystem=Resum de la informació de sistemes Dolibarr SummaryConst=Llista de tots els paràmetres de configuració Dolibarr MenuCompanySetup=Empresa/Organització DefaultMenuManager= Gestor del menú estàndard -DefaultMenuSmartphoneManager=Gestor de menú smartphone +DefaultMenuSmartphoneManager=Gestor de menús per a telèfons intel·ligents Skin=Tema visual -DefaultSkin=Tema visual por defecte -MaxSizeList=Longuitud màxima de llistats +DefaultSkin=Tema visual predeterminat +MaxSizeList=Longitud màxima per llistats DefaultMaxSizeList=Longitud màxima per defecte per a les llistes DefaultMaxSizeShortList=Longitud màxima per defecte en llistes curtes (per exemple, en la fitxa de client) MessageOfDay=Missatge del dia @@ -1136,7 +1136,7 @@ CompanyName=Nom/Raó social CompanyAddress=Adreça CompanyZip=Codi postal CompanyTown=Població -CompanyCountry=Pais +CompanyCountry=País CompanyCurrency=Divisa principal CompanyObject=Objecte de l'empresa IDCountry=ID de país @@ -1144,7 +1144,7 @@ Logo=Logo LogoDesc=Logotip principal de l'empresa. S'utilitzarà en documents generats (PDF, ...) LogoSquarred=Logo (quadrat) LogoSquarredDesc=Ha de ser una icona quadrada (amplada = alçada). Aquest logotip s'utilitzarà com a icona preferida o com a altra necessitat, com a la barra de menús superior (si no està desactivada en la configuració de l'entorn). -DoNotSuggestPaymentMode=No sugerir +DoNotSuggestPaymentMode=No ho suggereixis NoActiveBankAccountDefined=Cap compte bancari actiu definit OwnerOfBankAccount=Titular del compte %s BankModuleNotActive=Mòdul comptes bancaris no activat @@ -1197,7 +1197,7 @@ AccountantFileNumber=Número de fila DisplayDesc=Els paràmetres que afecten l'aspecte i el comportament de Dolibarr es poden modificar aquí. 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 +SessionTimeOut=Temps de desconnexió per a la sessió SessionExplanation=Aquest número garanteix que la sessió no caduqui abans d'aquest retard, si el netejador de sessió es fa mitjançant un netejador de sessió de PHP intern (i res més). El netejador de sessió intern de PHP no garanteix que la sessió expire després d'aquest retard. Caducarà, després d'aquest retard, i quan s'executi el netejador de sessió, de manera que cada accés %s / %s , però només durant l'accés fet per altres sessions (si el valor és 0, significa que l'eliminació de la sessió només es fa mitjançant un extern procés).
Nota: en alguns servidors amb un mecanisme de neteja de sessió externa (cron sota debian, ubuntu ...), les sessions es poden destruir després d'un període definit per una configuració externa, independentment del valor introduït aquí. SessionsPurgedByExternalSystem=Sembla que les sessions en aquest servidor són netejades mitjançant un mecanisme extern (cron sota debian, ubuntu ...), probablement cada %s segons (= el valor del paràmetre sessió.gc_maxlifetime ), així que modificant aquest valor aquí no té cap efecte, Heu de sol·licitar a l’administrador del servidor que canviï la durada de la sessió. TriggersAvailable=Triggers disponibles @@ -1209,7 +1209,7 @@ TriggerActiveAsModuleActive=Triggers d'aquest arxiu actius ja que el mòdul % GeneratedPasswordDesc=Trieu el mètode que s'utilitzarà per a les contrasenyes auto-generades. DictionaryDesc=Afegeix totes les dades de referència. Pots afegir els teus valors per defecte. ConstDesc=Aquesta pàgina permet editar (anul·lar) paràmetres no disponibles en altres pàgines. Aquests són paràmetres reservats només per a desenvolupadors o solucions avançades de problemes. -MiscellaneousDesc=Tots els altres paràmetres relacionats amb la seguretat es defineixen aqui. +MiscellaneousDesc=Aquí es defineixen la resta de paràmetres relacionats amb la seguretat. LimitsSetup=Configuració de límits i precisions LimitsDesc=Podeu definir aquí els límits i precisions utilitzats per Dolibarr MAIN_MAX_DECIMALS_UNIT=Decimals màxims per als preus unitaris @@ -1241,7 +1241,7 @@ RunningUpdateProcessMayBeRequired=Sembla que cal executar el procés d’actuali YouMustRunCommandFromCommandLineAfterLoginToUser=Ha d'executar la comanda des d'un shell després d'haver iniciat sessió amb el compte %s. YourPHPDoesNotHaveSSLSupport=Funcions SSL no disponibles al vostre PHP DownloadMoreSkins=Més temes per descarregar -SimpleNumRefModelDesc=Retorna el número de referència amb el format %syymm-nnnn on yy és l'any, mm és mes i nnnn és seqüencial sense reset +SimpleNumRefModelDesc=Retorna el número de referència amb el format %syymm-nnnn on yy és l'any, mm és el mes i nnnn és el seqüencial sense inicialitzar ShowProfIdInAddress=Mostra l'identificador professional amb adreces ShowVATIntaInAddress=Amaga el número d'IVA intracomunitari amb adreces TranslationUncomplete=Traducció parcial @@ -1250,7 +1250,7 @@ MeteoStdMod=Mode estàndard MeteoStdModEnabled=Mode estàndard habilitat MeteoPercentageMod=Mode percentual MeteoPercentageModEnabled=Mode de percentatge activat -MeteoUseMod=Prèmer per utilitzar %s +MeteoUseMod=Feu clic per utilitzar %s TestLoginToAPI=Comprovar connexió a l'API ProxyDesc=Algunes característiques de Dolibarr requereixen accés a Internet. Definiu aquí els paràmetres de connexió a Internet, com ara l'accés a través d'un servidor proxy, si és necessari. ExternalAccess=Accés extern / accés a Internet @@ -1285,13 +1285,13 @@ SendmailOptionMayHurtBuggedMTA=La característica per enviar correus mitjançant TranslationSetup=Configuració de traducció TranslationKeySearch=Cerca una clau o cadena de traducció TranslationOverwriteKey=Sobreescriu una cadena de traducció -TranslationDesc=Com configurar l'idioma de visualització:
* Per defecte / Sistema tot: menú Inici -> Configuració -> Pantalla
* Per usuari: fes clic al nom d'usuari a la part superior de la pantalla i modifiqueu la pestanya 0xe65d071f6fc9 de l'usuari de a l'usuari targeta. +TranslationDesc=Com configurar l'idioma de visualització:
* Per defecte / a tot el sistema: menú Inici -> Configuració -> Entorn
* Per usuari: Feu clic al nom d'usuari a la part superior de la pantalla i modifiqueu la pestanya Configuració d'entorn d'usuari de la fitxa d'usuari. 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 l'altra pestanya per ajudar-vos a saber quina clau de traducció voleu utilitzar TranslationString=Cadena de traducció CurrentTranslationString=Cadena de traducció actual WarningAtLeastKeyOrTranslationRequired=Es necessita un criteri de cerca com a mínim per cadena o clau de traducció -NewTranslationStringToShow=Nova cadena de traducció a mostrar +NewTranslationStringToShow=Cadena de traducció nova per mostrar OriginalValueWas=La traducció original s'ha sobreescrit. El valor original era:

%s TransKeyWithoutOriginalValue=Heu obligat una nova traducció de la clau de traducció ' %s ' que no existeix en cap fitxer d'idioma TitleNumberOfActivatedModules=Mòduls activats @@ -1314,6 +1314,7 @@ PHPModuleLoaded=Es carrega el component PHP %s PreloadOPCode=S'utilitza un codi OPC precarregat AddRefInList=Mostrar client / proveïdor ref. llista d'informació (llista de selecció o combobox) i la majoria d'hipervincle.
Els tercers apareixeran amb un format de nom de "CC12345 - SC45678 - The Big Company corp". en lloc de "The Big Company corp". AddAdressInList=Mostra la llista d'informació de la direcció de client / proveïdor (llista de selecció o combobox)
Els tercers apareixeran amb un format de nom de "The Big Company corp. - 21 jump street 123456 Big town - USA" en lloc de "The Big Company corp". +AddEmailPhoneTownInContactList=Mostra el correu electrònic de contacte (o els telèfons si no està definit) i la llista d'informació de la ciutat (llista de selecció o llista desplegable)
Els contactes apareixeran amb un format de nom "Dupond Durand - dupond.durand@email.com - Paris" o "Dupond Durand - 06 07 59 65 66 - París "en lloc de" Dupond Durand". AskForPreferredShippingMethod=Demaneu un mètode d'enviament preferit per a tercers. FieldEdition=Edició del camp %s FillThisOnlyIfRequired=Exemple: +2 (Completi només si es registre una desviació del temps en l'exportació) @@ -1327,7 +1328,7 @@ PasswordGenerationPerso=Retorna una contrasenya d'acord a la seva configuració SetupPerso=D'acord a la teva configuració PasswordPatternDesc=Descripció patró contrasenya ##### Users setup ##### -RuleForGeneratedPasswords=Regles per generar i validar contrasenyes +RuleForGeneratedPasswords=Regles per a generar i validar contrasenyes DisableForgetPasswordLinkOnLogonPage=No mostri l'enllaç "Contrasenya oblidada" a la pàgina d'inici de sessió UsersSetup=Configuració del mòdul usuaris UserMailRequired=Es necessita un correu electrònic per crear un nou usuari @@ -1351,7 +1352,7 @@ JSOnPaimentBill=Activar funció per autocompletar les línies de pagament a les CompanyIdProfChecker=Regles sobre els IDs professionals MustBeUnique=Ha de ser únic? MustBeMandatory=Obligatori per crear tercers (si es defineix el número d'IVA o el tipus d'empresa)? -MustBeInvoiceMandatory=Obligatori per validar factures? +MustBeInvoiceMandatory=És obligatori per a validar les factures? TechnicalServicesProvided=Prestació de serveis tècnics #####DAV ##### WebDAVSetupDesc=Aquest és l'enllaç per accedir al directori WebDAV. Conté un missatge "públic" obert a qualsevol usuari que conegui l'URL (si es permet l'accés al directori públic) i un directori "privat" que necessita un compte d'inici de sessió / contrasenya existent per a l'accés. @@ -1384,7 +1385,7 @@ BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Preguntar compte bancari del pressupost ##### SupplierProposal ##### SupplierProposalSetup=Configuració del mòdul Sol·licituds a proveïdor SupplierProposalNumberingModules=Models de numeració de sol·licitud de preus a proveïdor -SupplierProposalPDFModules=Models de documents de sol·licituts de preus a proveïdors +SupplierProposalPDFModules=Models de documents de sol·licituds de preus a proveïdors FreeLegalTextOnSupplierProposal=Text lliure en sol·licituds de preus a proveïdors WatermarkOnDraftSupplierProposal=Marca d'aigua en sol·licituds de preus a proveïdors (en cas d'estar buit) BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Preguntar per compte bancari per utilitzar en el pressupost @@ -1407,7 +1408,7 @@ FicheinterNumberingModules=Models de numeració d'intervencions TemplatePDFInterventions=Models de documents de les fitxes d'intervenció WatermarkOnDraftInterventionCards=Marca d'aigua en fitxes d'intervenció (en cas d'estar buit) ##### Contracts ##### -ContractsSetup=Configuració del modul contractes/subscripcions +ContractsSetup=Configuració del mòdul de contractes/subscripcions ContractsNumberingModules=Mòduls de numeració de contractes TemplatePDFContracts=Models de documents de contractes FreeLegalTextOnContracts=Text lliure en contractes @@ -1420,6 +1421,7 @@ AdherentMailRequired=Es necessita un correu electrònic per crear un nou membre MemberSendInformationByMailByDefault=La casella de selecció per enviar una confirmació per correu electrònic als socis (validació o nova subscripció) està activada per defecte VisitorCanChooseItsPaymentMode=El visitant pot triar entre els modes de pagament disponibles MEMBER_REMINDER_EMAIL=Activa el recordatori automàtic per correu electrònic de les subscripcions caducades. Nota: El mòdul %s s'ha d'habilitar i configurar correctament per enviar recordatoris. +MembersDocModules=Plantilles de documents per a documents generats a partir del registre de socis ##### LDAP setup ##### LDAPSetup=Configuració de LDAP LDAPGlobalParameters=Paràmetres globals @@ -1450,11 +1452,11 @@ LDAPAdminDn=DN del administrador LDAPAdminDnExample=DN complet (ex: cn=admin,dc=example,dc=com o cn=Administrator,cn=Users,dc=example,dc=com per active directory) LDAPPassword=Contrasenya de l'administrador LDAPUserDn=DN dels usuaris -LDAPUserDnExample=DN complet (ej: ou=users,dc=example,dc=com) +LDAPUserDnExample=DN complet (ex: ou=usuaris,dc=exemple,dc=com) LDAPGroupDn=DN dels grups -LDAPGroupDnExample=DN complet (ej: ou=groups,dc=example,dc=com) -LDAPServerExample=Adreça del servidor (ej: localhost, 192.168.0.2, ldaps://ldap.example.com/) -LDAPServerDnExample=DN complet (ej: dc=example,dc=com) +LDAPGroupDnExample=DN complet (ex: ou=grups,dc=exemple,dc=com) +LDAPServerExample=Adreça del servidor (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/) +LDAPServerDnExample=DN complet (ex: dc=exemple,dc=com) LDAPDnSynchroActive=Sincronització d'usuaris i grups LDAPDnSynchroActiveExample=Sincronització LDAP vers Dolibarr ó Dolibarr vers LDAP LDAPDnContactActive=Sincronització de contactes @@ -1464,7 +1466,7 @@ LDAPDnMemberActiveExample=Sincronització activada/desactivada 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) +LDAPContactDnExample=DN complet (ex: ou=contactes,dc=exemple,dc=com) LDAPMemberDn=DN dels socis de Dolibarr LDAPMemberDnExample=DN complet (ex: ou=members,dc=example,dc=com) LDAPMemberObjectClassList=Llista de objectClass @@ -1529,7 +1531,7 @@ LDAPFieldZip=Codi postal LDAPFieldZipExample=Exemple: codi postal LDAPFieldTown=Població LDAPFieldTownExample=Exemple: l -LDAPFieldCountry=Pais +LDAPFieldCountry=País LDAPFieldDescription=Descripció LDAPFieldDescriptionExample=Exemple: descripció LDAPFieldNotePublic=Nota publica @@ -1567,8 +1569,8 @@ NotSlowedDownByThis=No frenat per això. NotRiskOfLeakWithThis=No hi ha risc de filtració amb això. ApplicativeCache=Aplicació memòria cau MemcachedNotAvailable=No s'ha trobat una aplicació de cache. Pot millorar el rendiment instal·lant un cache server Memcached i un mòdul capaç d'utilitzar aquest servidor de cache.
Mes informació aquí http://wiki.dolibarr.org/index.php/Module_MemCached_EN.
Tingui en compte que alguns hostings no ofereixen servidors cache. -MemcachedModuleAvailableButNotSetup=Mòdul de memoria cache actiu, però la configuració del mòdul no està completa. -MemcachedAvailableAndSetup=Modul de memoria cache dedicada a utilitzar el servidor memcached està habilitat. +MemcachedModuleAvailableButNotSetup=S'ha trobat el mòdul memcached per a la aplicació de memòria cau, però la configuració del mòdul no està completa. +MemcachedAvailableAndSetup=El mòdul memcached dedicat a utilitzar el servidor memcached està habilitat. OPCodeCache=OPCode memòria cau NoOPCodeCacheFound=No s'ha trobat cap memòria cau OPCode. Potser utilitzeu una memòria cau OPCode diferent de XCache o eAccelerator (bé), o potser no tingueu la memòria cau OPCode (molt dolenta). HTTPCacheStaticResources=Memòria cau HTTP per a estadístiques de recursos (css, img, javascript) @@ -1594,9 +1596,9 @@ ServiceSetup=Configuració del mòdul Serveis ProductServiceSetup=Configuració dels mòduls Productes i Serveis NumberOfProductShowInSelect=Nombre màxim de productes que es mostraran a les llistes de selecció combo (0 = sense límit) ViewProductDescInFormAbility=Mostra les descripcions dels productes en els formularis (en cas contrari es mostra en una finestra emergent de suggeriments) -MergePropalProductCard=Activa en la pestanya fitxers adjunts de productes/serveis una opció per convinar el document de producte en PDF a un pressupost en PDF (si el producte/servei es troba en el pressupost) +MergePropalProductCard=Activeu a la pestanya Fitxers adjunts de productes/serveis una opció per combinar el document PDF del producte amb el PDF del pressupost si el producte/servei es troba en ell ViewProductDescInThirdpartyLanguageAbility=Mostra les descripcions dels productes en l'idioma del tercer -UseSearchToSelectProductTooltip=A més, si teniu una gran quantitat de productes (> 100 000), podeu augmentar la velocitat establint constant PRODUCT_DONOTSEARCH_ANYHERE a 1 a Setup-> Other. La cerca es limitarà al començament de la cadena. +UseSearchToSelectProductTooltip=A més, si teniu un gran nombre de productes (> 100.000), podeu augmentar la velocitat establiint la constant PRODUCT_DONOTSEARCH_ANYWHERE a 1 a Configuració->Altres. La cerca es limitarà a l'inici de la cadena. UseSearchToSelectProduct=Espereu fins que premeu una tecla abans de carregar el contingut de la llista combinada del producte (això pot augmentar el rendiment si teniu una gran quantitat de productes, però és menys convenient) SetDefaultBarcodeTypeProducts=Tipus de codi de barres utilitzat per defecte per als productes SetDefaultBarcodeTypeThirdParties=Tipus de codi de barres utilitzat per defecte per als tercers @@ -1614,7 +1616,7 @@ YouCanUseDOL_DATA_ROOT=Utilitza DOL_DATA_ROOT/dolibarr.log per un fitxer de regi ErrorUnknownSyslogConstant=La constant %s no és una constant syslog coneguda OnlyWindowsLOG_USER=En Windows, només s'admetrà la funció LOG_USER CompressSyslogs=Compressió i còpia de seguretat dels fitxers de registre de depuració (generats pel mòdul Log per depurar) -SyslogFileNumberOfSaves=Número de còpies de seguretat de logs a conservar +SyslogFileNumberOfSaves=Nombre de registres de còpia de seguretat que cal conservar ConfigureCleaningCronjobToSetFrequencyOfSaves=Configura la tasca programada de neteja per establir la freqüència de còpia de seguretat del registre ##### Donations ##### DonationsSetup=Configuració del mòdul donacions @@ -1641,7 +1643,7 @@ BarCodeNumberManager=Gestor per definir automàticament els números de codi de WithdrawalsSetup=Configuració dels pagaments de dèbit directe del mòdul ##### ExternalRSS ##### ExternalRSSSetup=Configuració de les importacions del flux RSS -NewRSS=Sindicació de un nou flux RSS +NewRSS=Canal RSS nou RSSUrl=URL del RSS RSSUrlExample=Un flux RSS interessant ##### Mailing ##### @@ -1670,13 +1672,13 @@ AdvancedEditor=Editor avançat ActivateFCKeditor=Activar editor avançat per a : FCKeditorForCompany=Creació/edició WYSIWIG de la descripció i notes dels tercers FCKeditorForProduct=Creació/edició WYSIWIG de la descripció i notes dels productes/serveis -FCKeditorForProductDetails=Creació / edició de productes WYSIWIG línies de detalls per a totes les entitats (propostes, comandes, factures, etc ...). 0x558520917bb7 Avís: L'ús d'aquesta opció per a aquest cas no es recomana seriosament, ja que pot crear problemes amb caràcters especials i format de pàgina quan es creïn fitxers PDF. +FCKeditorForProductDetails=Creació/edició WYSIWIG de línies de detalls de productes per a totes les entitats (pressupostos, comandes, factures, etc.). Advertiment: no es recomana utilitzar aquesta opció per a aquest cas, ja que pot crear problemes amb caràcters especials i format de pàgina en crear fitxers PDF. FCKeditorForMailing= Creació/edició WYSIWIG dels E-Mails FCKeditorForUserSignature=Creació/edició WYSIWIG de la signatura de l'usuari FCKeditorForMail=Edició/creació WYSIWIG per tots els e-mails (excepte Eines->eMailing) FCKeditorForTicket=Creació / edició de WYSIWIG per a entrades ##### Stock ##### -StockSetup=Configuració del mòdul de Estoc +StockSetup=Configuració del mòdul d'Estoc IfYouUsePointOfSaleCheckModule=Si utilitzeu el mòdul Point of Sale (POS) proporcionat per defecte o un mòdul extern, aquesta configuració pot ser ignorada pel vostre mòdul POS. La majoria dels mòduls de POS estan dissenyats per defecte per crear una factura immediatament i disminuir l'estoc, independentment de les opcions aquí. Així, si necessiteu o no una disminució de les existències al registrar una venda de la vostra TPV, consulteu també la vostra configuració del mòdul POS. ##### Menu ##### MenuDeleted=Menú eliminat @@ -1684,7 +1686,7 @@ Menu=Menú Menus=Menús TreeMenuPersonalized=Menús personalitzats NotTopTreeMenuPersonalized=Els menús personalitzats no estan enllaçats a una entrada de menú de capçalera -NewMenu=Nou menú +NewMenu=Menú nou MenuHandler=Gestor de menús MenuModule=Mòdul origen HideUnauthorizedMenu= Amaga també els menús no autoritzats a usuaris interns (si no només atenuats) @@ -1695,7 +1697,7 @@ DetailType=Tipus de menú (superior o esquerre) DetailTitre=Etiqueta de menú o codi d'etiqueta per traducció DetailUrl=URL de la pàgina cap a la qual el menú apunta DetailEnabled=Condició de mostrar o no -DetailRight=Condició de visualització completa o vidrossa +DetailRight=Condició per a mostrar menús grisos no autoritzats DetailLangs=Nom del fitxer Lang pel codi d'etiqueta de traducció DetailUser=Intern / Extern / Tots Target=Objectiu @@ -1704,7 +1706,7 @@ DetailLevel=Nivell (-1:menú superior, 0:principal, >0 menú y submenú) ModifMenu=Modificació del menú DeleteMenu=Eliminar entrada de menú ConfirmDeleteMenu=Estàs segur que vols eliminar l'entrada de menú %s ? -FailedToInitializeMenu=Error al inicialitzar el menú +FailedToInitializeMenu=No s'ha pogut inicialitzar el menú ##### Tax ##### TaxSetup=Configuració del mòdul d'impostos varis i dividends OptionVatMode=Opció de càrrega d'IVA @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Estableix automàticament aquest valor predetermin AGENDA_DEFAULT_FILTER_TYPE=Estableix automàticament aquest tipus d'esdeveniment al filtre de cerca de la vista d'agenda AGENDA_DEFAULT_FILTER_STATUS=Estableix automàticament aquest estat per a esdeveniments al filtre de cerca de la visualització d'agenda AGENDA_DEFAULT_VIEW=Quina vista voleu obrir de manera predeterminada en seleccionar el menú Agenda -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=Activa el recordatori de l'esdeveniment al navegador de l'usuari (quan s'aconsegueix la data de l'esdeveniment, cada usuari pot rebutjar això des de la pregunta de confirmació del navegador) +AGENDA_REMINDER_BROWSER=Activa el recordatori d'esdeveniments al navegador de l'usuari (Quan s'arriba a la data de recordatori, el navegador mostra una finestra emergent. Cada usuari pot desactivar aquestes notificacions des de la configuració de notificacions del navegador). AGENDA_REMINDER_BROWSER_SOUND=Habilita les notificacions sonores +AGENDA_REMINDER_EMAIL=Activa el recordatori d'esdeveniments per correu electrònic (es pot definir l'opció de recordatori/retard a cada esdeveniment). +AGENDA_REMINDER_EMAIL_NOTE=Nota: La freqüència de la tasca %s ha de ser suficient per a assegurar-se que els recordatoris s’envien en el moment correcte. AGENDA_SHOW_LINKED_OBJECT=Mostra l'objecte vinculat a la vista d'agenda ##### Clicktodial ##### ClickToDialSetup=Configuració del mòdul Click To Dial @@ -1754,8 +1757,8 @@ CashDeskBankAccountForSell=Compte per defecte a utilitzar pels cobraments en efe CashDeskBankAccountForCheque=Compte a utilitzar per defecte per rebre pagaments per xec CashDeskBankAccountForCB=Compte per defecte a utilitzar pels cobraments amb targeta de crèdit CashDeskBankAccountForSumup=Compte bancari per defecte que es farà servir per rebre pagaments de SumUp -CashDeskDoNotDecreaseStock=Desactiveu la disminució d'existències quan es realitzi una venda des del punt de venda (si "no", la disminució de les existències es fa per cada venda realitzada des de POS, independentment de l'opció establerta en el mòdul Stock). -CashDeskIdWareHouse=Forçar i restringir el magatzem a usar l'stock a disminuir +CashDeskDoNotDecreaseStock=Desactiva la reducció d'estoc quan es realitza una venda des del punt de venda (si és "no", la reducció d'estoc es realitza per a cada venda realitzada des del TPV, independentment de l'opció establerta al mòdul Estoc). +CashDeskIdWareHouse=Força i restringeix el magatzem a utilitzar per disminuir l'estoc StockDecreaseForPointOfSaleDisabled=La disminució d'estocs des del punt de venda està desactivat StockDecreaseForPointOfSaleDisabledbyBatch=La disminució d'accions en POS no és compatible amb el mòdul de gestió de Serial / Lot (actualment actiu) perquè la disminució de l'estoc està desactivada. CashDeskYouDidNotDisableStockDecease=No va desactivar la disminució de les existències en fer una venda des del punt de venda. Per tant, es requereix un magatzem. @@ -1770,7 +1773,7 @@ NbOfBoomarkToShow=Nombre màxim de marcadors que es mostrarà en el menú WebServicesSetup=Configuració del mòdul webservices WebServicesDesc=Mitjançant l'activació d'aquest mòdul, Dolibarr es converteix en el servidor de serveis web oferint diversos serveis web. WSDLCanBeDownloadedHere=La descripció WSDL dels serveis prestats es poden recuperar aquí -EndPointIs=Els clients SOAP hauran d'enviar les seves solicituds al punt final en la URL Dolibarr +EndPointIs=Els clients SOAP han d’enviar les seves sol·licituds al punt final Dolibarr disponible a l’URL ##### API #### ApiSetup=Configuració del mòdul API ApiDesc=Habilitant aquest mòdul, Dolibarr serà un servidor REST per oferir varis serveis web. @@ -1815,7 +1818,7 @@ UseSearchToSelectProject=Espereu fins que es prem una tecla abans de carregar el ##### Fiscal Year ##### AccountingPeriods=Períodes comptables AccountingPeriodCard=Període comptable -NewFiscalYear=Nou any fiscal +NewFiscalYear=Any fiscal nou OpenFiscalYear=Obrir any fiscal CloseFiscalYear=Tancar any fiscal DeleteFiscalYear=Eliminar any fiscal @@ -1826,7 +1829,7 @@ MAIN_APPLICATION_TITLE=Força veure el nom de l'aplicació (advertència: indica NbMajMin=Nombre mínim de caràcters en majúscules NbNumMin=Nombre mínim de caràcters numèrics NbSpeMin=Nombre mínim de caràcters especials -NbIteConsecutive=Capacitat màxima per repetir mateixos caràcters +NbIteConsecutive=Nombre màxim de repeticions dels mateixos caràcters NoAmbiCaracAutoGeneration=No utilitzar caràcters semblants ("1", "l", "i", "|", "0", "O") per a la generació automàtica SalariesSetup=Configuració del mòdul de salaris SortOrder=Ordre de classificació @@ -1834,7 +1837,7 @@ Format=Format TypePaymentDesc=0:Forma de pagament a client, 1:Forma de pagament a proveïdor, 2:Mateixa forma de pagament per clients i proveïdors 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 +TemplatePDFExpenseReports=Plantilles de documents per a generar un document d’informe de despeses 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 @@ -1867,8 +1870,8 @@ BackgroundTableTitleTextColor=Color del text per a la línia del títol de la ta BackgroundTableTitleTextlinkColor=Color del text per a la línia d'enllaç del títol de la taula BackgroundTableLineOddColor=Color de fons per les línies senars de les taules BackgroundTableLineEvenColor=Color de fons per les línies parells de les taules -MinimumNoticePeriod=Període mínim de notificació (La solicitud de dia lliure serà donada abans d'aquest període) -NbAddedAutomatically=Número de dies afegits en comptadors d'usuaris (automàticament) cada mes +MinimumNoticePeriod=Període mínim d’avís (la vostra sol·licitud de permís s’ha de fer abans d’aquest període) +NbAddedAutomatically=Nombre de dies afegits als comptadors d'usuaris (automàticament) cada mes EnterAnyCode=Aquest camp conté una referència a un identificador de línia. Introdueix qualsevol valor però sense caràcters especials. Enter0or1=Introdueix 0 o 1 UnicodeCurrency=Introduïu aquí entre claudàtors, llista del número de bytes que representa el símbol monetari. Per exemple: per $, introduïu [36] - per Brasil real R $ [82,36] - per €, introduïu [8364] @@ -1877,14 +1880,14 @@ PictoHelp=Nom de la icona en format dolibarr ("image.png" si es troba al directo PositionIntoComboList=Posició de la línia en llistes combo SellTaxRate=Valor de l'IVA 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 servei de transport ofereix una pàgina o un lloc web per comprovar l'estat dels seus enviaments, podeu introduir-lo aquí. Podeu utilitzar la tecla {TRACKID} als paràmetres d'URL perquè el sistema la reemplacelli amb el número de seguiment que l'usuari ha introduït a la targeta de transport. +UrlTrackingDesc=Si el proveïdor o el servei de transport ofereix una pàgina o un lloc web per comprovar l'estat dels vostres enviaments, podeu introduir-lo aquí. Podeu utilitzar la clau {TRACKID} als paràmetres d'URL perquè el sistema la substitueixi pel número de seguiment que l'usuari va introduir a la fitxa d'enviament. OpportunityPercent=Quan creeu un avantatge, definiran una quantitat estimada de projecte / avantatge. Segons l'estat del lideratge, aquesta quantitat es pot multiplicar per aquesta taxa per avaluar una quantitat total que pot generar tots els vostres clients potencials. El valor és un percentatge (entre 0 i 100). TemplateForElement=Aquest registre de plantilla es dedica a quin element TypeOfTemplate=Tipus de plantilla TemplateIsVisibleByOwnerOnly=La plantilla només és visible pel propietari VisibleEverywhere=Visible arreu VisibleNowhere=Visible enlloc -FixTZ=Fixar zona horaria +FixTZ=Correcció de zona horària FillFixTZOnlyIfRequired=Exemple: +2 (omple'l només si tens problemes) ExpectedChecksum=Checksum esperat CurrentChecksum=Checksum actual @@ -1975,11 +1978,11 @@ SwapSenderAndRecipientOnPDF=Intercanvieu la posició de l'adreça del remitent i FeatureSupportedOnTextFieldsOnly=Advertència, funció només compatible amb camps de text. També s'ha d'establir un paràmetre d'URL action = create o action = edit ha de ser OR el nom de la pàgina ha de finalitzar amb 'new.php' per activar aquesta funció. EmailCollector=Col lector de correu electrònic EmailCollectorDescription=Afegiu una tasca programada i una pàgina de configuració per escanejar regularment caixes de correu electrònic (utilitzant el protocol IMAP) i registreu els correus electrònics rebuts a la vostra aplicació, al lloc adequat i / o creeu alguns registres automàticament (com a clients potencials). -NewEmailCollector=Nou col · lector de correu electrònic +NewEmailCollector=Col·lector nou de correus electrònics EMailHost=Servidor IMAP de correu electrònic MailboxSourceDirectory=Directori d'origen de la bústia MailboxTargetDirectory=Directori de destinació de la bústia -EmailcollectorOperations=Operacions a realitzar per col·leccionista +EmailcollectorOperations=Operacions a fer per recol·lector MaxEmailCollectPerCollect=Nombre màxim de correus electrònics recopilats per recollida CollectNow=Recolliu ara ConfirmCloneEmailCollector=Esteu segur que voleu clonar el recollidor de correu electrònic %s? @@ -1987,7 +1990,7 @@ DateLastCollectResult=Data del darrer intent de recollida DateLastcollectResultOk=Data de la darrera recollida amb èxit LastResult=Últim resultat EmailCollectorConfirmCollectTitle=Confirmació de recollida de correu electrònic -EmailCollectorConfirmCollect=Voleu executar la col · lecció per aquest col · leccionista ara? +EmailCollectorConfirmCollect=Voleu executar ara la recol·lecció d’aquest col·lector? NoNewEmailToProcess=No hi ha cap altre correu electrònic (filtres coincidents) per processar NothingProcessed=No s'ha fet res XEmailsDoneYActionsDone=%s correus electrònics qualificats, %s correus electrònics processats amb èxit (per %s registre / accions realitzades) @@ -2049,7 +2052,7 @@ LargerThan=Major que IfTrackingIDFoundEventWillBeLinked=Tingueu en compte que si es troba un identificador de seguiment d’un objecte al correu electrònic o si el correu electrònic és una resposta d’un correu electrònic que ja està recollit i enllaçat a un objecte, l’esdeveniment creat s’enllaçarà automàticament a l’objecte relacionat conegut. WithGMailYouCanCreateADedicatedPassword=Amb un compte de GMail, si heu activat la validació de dos passos, es recomana crear una segona contrasenya dedicada a l’aplicació en comptes d’utilitzar la contrasenya del vostre compte des de https://myaccount.google.com/. EmailCollectorTargetDir=Pot ser un comportament desitjat traslladar el correu electrònic a una altra etiqueta / directori quan s'ha processat correctament. Només heu de definir el nom del directori per utilitzar aquesta funció (NO utilitzeu caràcters especials en nom). Tingueu en compte que també heu d'utilitzar un compte d'inici de sessió de lectura / escriptura. -EmailCollectorLoadThirdPartyHelp=Podeu utilitzar aquesta acció per utilitzar el contingut de correu electrònic per cercar i carregar una tercera part existent a la base de dades. La tercera part trobada (o creada) s'utilitzarà per a les accions que ho necessitin. Al camp del paràmetre podeu fer servir, per exemple, 'EXTRACT:BODY:Name:\\s([^\\s]*)' si voleu extreure el nom de la tercera part d'una cadena "Name: nom a trobar" que es troba a la cos. +EmailCollectorLoadThirdPartyHelp=Podeu utilitzar aquesta acció per a utilitzar el contingut del correu electrònic per trobar i carregar un tercer existent a la vostra base de dades. El tercer trobat (o creat) s'utilitzarà per seguir les accions que ho necessitin. Al camp del paràmetre podeu utilitzar, per exemple, 'EXTRACT:BODY:Name:\\s([^\\s]*)' si voleu extreure el nom del tercer d'una cadena 'Name:name to find' que es troba al cos. EndPointFor=Punt final per %s: %s DeleteEmailCollector=Suprimeix el recollidor de correu electrònic ConfirmDeleteEmailCollector=Esteu segur que voleu suprimir aquest recollidor de correu electrònic? @@ -2069,7 +2072,7 @@ FeatureNotAvailableWithReceptionModule=Funció no disponible quan el mòdul Rece RssNote=Nota: Cada definició de canal RSS proporciona un giny que heu d'habilitar per tenir-lo disponible al tauler de control JumpToBoxes=Vés a Configuració -> Ginys MeasuringUnitTypeDesc=Utilitzeu aquí un valor com "size", "surface", "volume", "weight", "time" -MeasuringScaleDesc=La escala és el nombre de llocs que heu de moure la part decimal per coincidir amb la unitat de referència predeterminada. Per al tipus d'unitat "temps", és el nombre de segons. Valors entre 80 i 99 són valors reservats. +MeasuringScaleDesc=L'escala és el nombre de llocs que heu de moure la part decimal per a coincidir amb la unitat de referència predeterminada. Per al tipus d'unitat de "temps", és el nombre de segons. Els valors entre 80 i 99 són valors reservats. TemplateAdded=S'ha afegit la plantilla TemplateUpdated=Plantilla actualitzada TemplateDeleted=S'ha suprimit la plantilla diff --git a/htdocs/langs/ca_ES/banks.lang b/htdocs/langs/ca_ES/banks.lang index c8160a8f0fb..593678f8d7d 100644 --- a/htdocs/langs/ca_ES/banks.lang +++ b/htdocs/langs/ca_ES/banks.lang @@ -2,7 +2,7 @@ Bank=Banc MenuBankCash=Banc | Efectiu MenuVariousPayment=Pagaments varis -MenuNewVariousPayment=Pagament extra nou +MenuNewVariousPayment=Pagament divers nou BankName=Nom del banc FinancialAccount=Compte BankAccount=Compte bancari @@ -49,11 +49,11 @@ BankAccountDomiciliation=Dades bancàries BankAccountCountry=País del compte BankAccountOwner=Nom del titular del compte BankAccountOwnerAddress=Direcció del titular del compte -RIBControlError=Ha fallat el control d'integritat. Això significa que la informació d'aquest compte bancari és incompleta o incorrecta (comprova el pais, els dígits i l'IBAN) +RIBControlError=Ha fallat la comprovació d’integritat dels valors. Això significa que la informació d’aquest número de compte no és completa o és incorrecta (comproveu el país, els números i l’IBAN). CreateAccount=Crear compte -NewBankAccount=Nou compte -NewFinancialAccount=Nou compte financer -MenuNewFinancialAccount=Nou compte +NewBankAccount=Compte nou +NewFinancialAccount=Compte financer nou +MenuNewFinancialAccount=Compte financer nou EditFinancialAccount=Edició compte LabelBankCashAccount=Etiqueta compte o caixa AccountType=Tipus de compte @@ -161,7 +161,7 @@ CheckRejectedAndInvoicesReopened=Xecs retornats i factures re-obertes BankAccountModelModule=Plantilles de documents per comptes bancaris DocumentModelSepaMandate=Plantilla per a mandat SEPA. Vàlid només per a països europeus de la CEE. DocumentModelBan=Plantilla per imprimir una pàgina amb informació BAN -NewVariousPayment=Nou pagament divers +NewVariousPayment=Pagament divers nou VariousPayment=Pagament divers VariousPayments=Pagaments varis ShowVariousPayment=Mostra pagaments diversos @@ -174,8 +174,9 @@ YourSEPAMandate=La vostra ordre SEPA FindYourSEPAMandate=Aquest és el vostre mandat de 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 AutoReportLastAccountStatement=Ompliu automàticament el camp "nombre d'extracte bancari" amb l'últim número de l'extracte al fer la conciliació CashControl=Tancar Efectiu del Punt de Venda -NewCashFence=Nou tancament d'efectiu +NewCashFence=Tancament d'efectiu nou BankColorizeMovement=Color de moviments BankColorizeMovementDesc=Si aquesta funció està habilitada, podeu triar un color de fons específic per als moviments de dèbit o de crèdit BankColorizeMovementName1=Color de fons pel moviment de dèbit BankColorizeMovementName2=Color de fons pel moviment de crèdit +IfYouDontReconcileDisableProperty=Si no feu les conciliacions bancàries en alguns comptes bancaris, desactiveu la propietat "%s" per eliminar aquest advertiment. diff --git a/htdocs/langs/ca_ES/categories.lang b/htdocs/langs/ca_ES/categories.lang index d2162375ad5..900f42e763a 100644 --- a/htdocs/langs/ca_ES/categories.lang +++ b/htdocs/langs/ca_ES/categories.lang @@ -19,7 +19,7 @@ ProjectsCategoriesArea=Àrea d'etiquetes de projectes UsersCategoriesArea=Àrea d'etiquetes d'usuaris SubCats=Subcategories CatList=Llistat d'etiquetes -NewCategory=Nova etiqueta +NewCategory=Etiqueta nova ModifCat=Modifica l'etiqueta CatCreated=Etiqueta creada CreateCat=Crea etiqueta @@ -81,6 +81,8 @@ CategoriesSetup=Configuració d'etiquetes CategorieRecursiv=Enllaça amb l'etiqueta mare automàticament CategorieRecursivHelp=Si l'opció està activada, quan afegiu un producte a una subcategoria, el producte també s’afegirà a la categoria pare. AddProductServiceIntoCategory=Afegir el següent producte/servei +AddCustomerIntoCategory=Assigna la categoria al client +AddSupplierIntoCategory=Assigna la categoria al proveïdor ShowCategory=Mostra etiqueta ByDefaultInList=Per defecte en el llistat ChooseCategory=Tria la categoria diff --git a/htdocs/langs/ca_ES/companies.lang b/htdocs/langs/ca_ES/companies.lang index e10f73720ef..1ed63965f27 100644 --- a/htdocs/langs/ca_ES/companies.lang +++ b/htdocs/langs/ca_ES/companies.lang @@ -5,13 +5,13 @@ SelectThirdParty=Seleccionar un tercer ConfirmDeleteCompany=Esteu segur de voler eliminar aquesta empresa i tota la informació dependent? DeleteContact=Eliminar un contacte ConfirmDeleteContact=Esteu segur de voler eliminar aquest contacte i tota la seva informació dependent? -MenuNewThirdParty=Nou tercer -MenuNewCustomer=Nou client -MenuNewProspect=Nou client potencial -MenuNewSupplier=Nou proveïdor -MenuNewPrivateIndividual=Nou particular -NewCompany=Nova empresa (client potencial, client, proveïdor) -NewThirdParty=Nou tercer (client potencial, client, proveïdor) +MenuNewThirdParty=Tercer nou +MenuNewCustomer=Client nou +MenuNewProspect=Client potencial nou +MenuNewSupplier=Proveïdor nou +MenuNewPrivateIndividual=Particular nou +NewCompany=Empresa nova (client potencial, client, proveïdor) +NewThirdParty=Tercer nou (client potencial, client, proveïdor) CreateDolibarrThirdPartySupplier=Crea un tercer (proveïdor) CreateThirdPartyOnly=Crea tercer CreateThirdPartyAndContact=Crea un tercer + un contacte fill @@ -124,7 +124,7 @@ ProfId1AT=CIF/NIF ProfId2AT=Núm. seguretat social ProfId3AT=CNAE ProfId4AT=- -ProfId5AT=- +ProfId5AT=Número EORI ProfId6AT=- ProfId1AU=CIF/NIF ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=CIF/NIF ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=Número EORI ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=Número UID ProfId2CH=- ProfId3CH=CIF/NIF ProfId4CH=Num registre de comerç -ProfId5CH=- +ProfId5CH=Número EORI ProfId6CH=- ProfId1CL=CIF/NIF ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=CIF/NIF ProfId2DE=Núm. seguretat social ProfId3DE=CNAE ProfId4DE=- -ProfId5DE=- +ProfId5DE=Número EORI ProfId6DE=- ProfId1ES=CIF/NIF ProfId2ES=Núm. seguretat social ProfId3ES=CNAE ProfId4ES=Núm. col·legiat -ProfId5ES=- +ProfId5ES=Número EORI ProfId6ES=- ProfId1FR=CIF/NIF ProfId2FR=Núm. seguretat social ProfId3FR=CNAE ProfId4FR=RCS/RM -ProfId5FR=- +ProfId5FR=Número EORI ProfId6FR=- ProfId1GB=Número registre ProfId2GB=- @@ -198,11 +198,16 @@ ProfId3IN=CNAE ProfId4IN=Id prof. 4 ProfId5IN=Id prof. 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=Número EORI ProfId1LU=CIF/NIF (R.C.S. Luxemburg) ProfId2LU=Núm. S.S. (permís comercial) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=Número EORI ProfId6LU=- ProfId1MA=CIF/NIF ProfId2MA=Núm. seguretat social @@ -220,13 +225,13 @@ ProfId1NL=Número KVK ProfId2NL=- ProfId3NL=- ProfId4NL=- -ProfId5NL=- +ProfId5NL=Número EORI ProfId6NL=- ProfId1PT=CIF/NIF ProfId2PT=Núm. seguretat social ProfId3PT=CNAE ProfId4PT=Conservatori -ProfId5PT=- +ProfId5PT=Número EORI ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=CUI ProfId2RO=Núm. Enmatriculare ProfId3RO=CAEN -ProfId4RO=- -ProfId5RO=EUID +ProfId4RO=EUID +ProfId5RO=Número EORI ProfId6RO=- ProfId1RU=CIF/NIF ProfId2RU=Núm. seguretat social @@ -339,8 +344,8 @@ NoContactForAnyOrderOrShipments=Aquest contacte no és un contacte per cap coman NoContactForAnyProposal=Aquest contacte no és contacte de cap pressupost NoContactForAnyContract=Aquest contacte no és contacte de cap contracte NoContactForAnyInvoice=Aquest contacte no és contacte de cap factura -NewContact=Nou contacte -NewContactAddress=Nou contacte/adreça +NewContact=Contacte nou +NewContactAddress=Contacte/Adreça nova MyContacts=Els meus contactes Capital=Capital CapitalOf=Capital de %s diff --git a/htdocs/langs/ca_ES/hrm.lang b/htdocs/langs/ca_ES/hrm.lang index ad4ee4e00b6..2952d702637 100644 --- a/htdocs/langs/ca_ES/hrm.lang +++ b/htdocs/langs/ca_ES/hrm.lang @@ -3,7 +3,7 @@ HRM_EMAIL_EXTERNAL_SERVICE=Correu electrònic per prevenir serveis externs HRM Establishments=Establiments Establishment=Establiment -NewEstablishment=Nou establiment +NewEstablishment=Establiment nou DeleteEstablishment=Elimina l'establiment ConfirmDeleteEstablishment=Vols eliminar aquest establiment? OpenEtablishment=Obre l'establiment @@ -15,4 +15,5 @@ DictionaryFunction=HRM: llocs de treball # Module Employees=Empleats Employee=Empleat -NewEmployee=Nou empleat +NewEmployee=Empleat nou +ListOfEmployees=Llistat d'empleats diff --git a/htdocs/langs/ca_ES/languages.lang b/htdocs/langs/ca_ES/languages.lang index 8006cee1beb..9d2b881f655 100644 --- a/htdocs/langs/ca_ES/languages.lang +++ b/htdocs/langs/ca_ES/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Espanyol (Panamà) Language_es_PY=Espanyol (Paraguai) Language_es_PE=Espanyol (Perú) Language_es_PR=Espanyol (Puerto Rico) +Language_es_US=Espanyol (EUA) Language_es_UY=Espanyol (Uruguai) Language_es_GT=Espanyol (Guatemala) Language_es_VE=Espanyol (Veneçuela) diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang index f427d92432c..c970c1697f3 100644 --- a/htdocs/langs/ca_ES/main.lang +++ b/htdocs/langs/ca_ES/main.lang @@ -65,7 +65,7 @@ ErrorNoVATRateDefinedForSellerCountry=Error, cap tipus d'IVA definit per al paí ErrorNoSocialContributionForSellerCountry=Error, cap tipus d'impost varis definit per al país '%s'. ErrorFailedToSaveFile=Error, el registre del fitxer ha fallat. ErrorCannotAddThisParentWarehouse=Esteu intentant afegir un magatzem primari que ja és fill d'un mag atzem existent -MaxNbOfRecordPerPage=Número màxim de registres per pàgina +MaxNbOfRecordPerPage=Màx. nombre de registres per pàgina NotAuthorized=No està autoritzat per fer-ho. SetDate=Indica la data SelectDate=Seleccioneu una data @@ -83,14 +83,14 @@ FileTransferComplete=El(s) fitxer(s) s'han carregat correctament FilesDeleted=El(s) fitxer(s) s'han eliminat correctament FileWasNotUploaded=Un arxiu ha estat seleccionat per adjuntar, però encara no ha estat pujat. Feu clic a "Adjuntar aquest arxiu" per a això. NbOfEntries=Nº d'entrades -GoToWikiHelpPage=Llegeix l'ajuda online (cal tenir accés a internet) +GoToWikiHelpPage=Llegiu l'ajuda en línia (cal tenir accés a Internet) GoToHelpPage=Consultar l'ajuda RecordSaved=Registre guardat RecordDeleted=Registre eliminat RecordGenerated=Registre generat LevelOfFeature=Nivell de funcions NotDefined=No definida -DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr està configurat en mode d'autenticació %s en el fitxer de configuració conf.php.
Això significa que la la contrasenya de la base de dades és externa a Dolibarr, per això tota modificació d'aquest camp pot resultar sense cap efecte. +DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr està configurat en mode d'autenticació %s al fitxer de configuració conf.php.
Això significa que la contrasenya de la base de dades és externa a Dolibarr, de manera que canviar aquest camp pot no tenir cap efecte. Administrator=Administrador Undefined=No definit PasswordForgotten=Heu oblidat la contrasenya? @@ -103,7 +103,7 @@ PreviousValue=Valor anterior ConnectedOnMultiCompany=Connexió a l'entitat ConnectedSince=Connectat des AuthenticationMode=Mode autentificació -RequestedUrl=Url solicitada +RequestedUrl=URL sol·licitada DatabaseTypeManager=Tipus de gestor de base de dades RequestLastAccessInError=Últimes peticions d'accés a la base de dades amb error ReturnCodeLastAccessInError=Retorna el codi per les últimes peticions d'accés a la base de dades amb error @@ -172,7 +172,7 @@ NotValidated=No validat Save=Desa SaveAs=Desa com SaveAndStay=Desa i continua -SaveAndNew=Guardar i nou +SaveAndNew=Desa i nou TestConnection=Provar la connexió ToClone=Copiar ConfirmCloneAsk=Esteu segur que voleu clonar l'objecte %s ? @@ -197,6 +197,7 @@ ReOpen=Reobrir Upload=Carrega ToLink=Enllaç Select=Seleccionar +SelectAll=Selecciona-ho tot Choose=Escollir Resize=Redimensionar ResizeOrCrop=Canviar la mida o tallar @@ -218,7 +219,7 @@ Parameters=Paràmetres Value=Valor PersonalValue=Valor personalitzat NewObject=Nou %s -NewValue=Nou valor +NewValue=Valor nou CurrentValue=Valor actual Code=Codi Type=Tipus @@ -229,7 +230,7 @@ Title=Títol Label=Etiqueta RefOrLabel=Ref. o etiqueta Info=Log -Family=Familia +Family=Família Description=Descripció Designation=Descripció DescriptionOfLine=Descripció de línia @@ -257,6 +258,7 @@ Cards=Fitxes Card=Fitxa Now=Ara HourStart=Hora d'inici +Deadline=Data límit Date=Data DateAndHour=Data i hora DateToday=Data d'avui @@ -265,8 +267,10 @@ DateStart=Data inicial DateEnd=Data final DateCreation=Data de creació DateCreationShort=Data creació +IPCreation=IP de creació DateModification=Data modificació DateModificationShort=Data modif. +IPModification=IP de modificació DateLastModification=Data de l'última modificació DateValidation=Data validació DateClosing=Data tancament @@ -480,7 +484,7 @@ TotalDuration=Duració total Summary=Resum DolibarrStateBoard=Estadístiques de base de dades DolibarrWorkBoard=Elements oberts -NoOpenedElementToProcess=No hi han elements oberts per processar +NoOpenedElementToProcess=No hi ha elements oberts per processar Available=Disponible NotYetAvailable=Encara no disponible NotAvailable=No disponible @@ -621,10 +625,10 @@ Example=Exemple Examples=Exemples NoExample=Sense exemple FindBug=Avisa d'un error -NbOfThirdParties=Número de tercers -NbOfLines=Números de línies +NbOfThirdParties=Nombre de tercers +NbOfLines=Nombre de línies NbOfObjects=Nombre d'objectes -NbOfObjectReferers=Número de registres relacionats +NbOfObjectReferers=Nombre d'elements relacionats Referers=Registres relacionats TotalQuantity=Quantitat total DateFromTo=De %s a %s @@ -706,7 +710,7 @@ Color=Color Documents=Documents Documents2=Documents UploadDisabled=Pujada desactivada -MenuAccountancy=Comptabilitat bàsica +MenuAccountancy=Comptabilitat MenuECM=Documents MenuAWStats=AWStats MenuMembers=Socis @@ -732,7 +736,7 @@ RootOfMedias=Arrel dels mitjans públics (/medias) Informations=Informació Page=Pàgina Notes=Notes -AddNewLine=Afegir nova línia +AddNewLine=Afegeix una línia nova AddFile=Afegir arxiu FreeZone=Producte de text lliure FreeLineOfType=Element de text lliure, escriviu: @@ -771,7 +775,7 @@ After=Després IPAddress=Adreça IP Frequency=Freqüència IM=Missatgeria instantània -NewAttribute=Nou atribut +NewAttribute=Atribut nou AttributeCode=Codi atribut URLPhoto=Url de la foto/logo SetLinkToAnotherThirdParty=Enllaça amb un altre tercer @@ -836,7 +840,7 @@ ShowIntervention=Mostrar intervenció ShowContract=Mostrar contracte GoIntoSetupToChangeLogo=Aneu a Inici - Configuració - Empresa per a canviar el logotip o aneu a Inici - Configuració - Entorn per a ocultar-lo. Deny=Denegar -Denied=Denegad +Denied=Denegat ListOf=Llista de %s ListOfTemplates=Llistat de plantilles Gender=Sexe @@ -852,7 +856,7 @@ GoodBye=A reveure Sincerely=Sincerament ConfirmDeleteObject=Esteu segur que voleu suprimir aquest objecte? DeleteLine=Elimina la línia -ConfirmDeleteLine=Esteu segur de voler eliminar aquesta línia ? +ConfirmDeleteLine=Esteu segur que voleu suprimir aquesta línia? ErrorPDFTkOutputFileNotFound=Error: el fitxer no s'ha generat. Comproveu que la comanda "pdftk" estigui instal·lada en un directori inclòs a la variable d'entorn $ PATH (només linux / unix) o poseu-vos en contacte amb l'administrador del vostre sistema. NoPDFAvailableForDocGenAmongChecked=No hi havia PDF disponibles per a la generació de document entre els registre comprovats TooManyRecordForMassAction=S'ha seleccionat massa registres per a l'acció massiva. L'acció està restringida a una llista de %s registres. @@ -920,7 +924,7 @@ Lead=Oportunitat Leads=Oportunitats ListOpenLeads=Llistat oportunitats obertes ListOpenProjects=Llistat projectes oberts -NewLeadOrProject=Nova oportunitat/projecte +NewLeadOrProject=Oportunitat o projecte nou Rights=Permisos LineNb=Núm. línia IncotermLabel=Incoterms @@ -1102,3 +1106,4 @@ SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=El testimoni de segure UpToDate=Actualitzat OutOfDate=Obsolet EventReminder=Recordatori d'esdeveniments +UpdateForAllLines=Actualització per a totes les línies diff --git a/htdocs/langs/ca_ES/mrp.lang b/htdocs/langs/ca_ES/mrp.lang index f2ab1773092..32ad23c0c3a 100644 --- a/htdocs/langs/ca_ES/mrp.lang +++ b/htdocs/langs/ca_ES/mrp.lang @@ -12,7 +12,7 @@ BillOfMaterials=Llista de material BOMsSetup=Configuració del mòdul BOM ListOfBOMs=Llista de factures de material - BOM ListOfManufacturingOrders=Llista d'ordres de fabricació -NewBOM=Nova llista de material +NewBOM=Llista nova de material ProductBOMHelp=Producte a crear amb aquest BOM.
Nota: els productes amb la propietat "Natura del producte" = "Matèria primera" no són visibles a aquesta llista. BOMsNumberingModules=Plantilles de numeració BOM BOMsModelModule=Plantilles de document BOM @@ -33,7 +33,7 @@ DeleteMo=Eliminar Ordre de Fabricació ConfirmDeleteBillOfMaterials=Estàs segur que vols suprimir aquesta llista de material? ConfirmDeleteMo=Esteu segur que voleu suprimir aquesta factura de material? MenuMRP=Ordres de fabricació -NewMO=Nova ordre de fabricació +NewMO=Ordre de fabricació nova QtyToProduce=Quantitat per produir DateStartPlannedMo=Data d’inici prevista DateEndPlannedMo=Data prevista de finalització @@ -70,10 +70,11 @@ AutoCloseMO=Tancar automàticament l’Ordre de Fabricació si s’arriba a les NoStockChangeOnServices=Sense canvi d’estoc en serveis ProductQtyToConsumeByMO=Quantitat de producte que encara es pot consumir amb OP obertes ProductQtyToProduceByMO=Quantitat de producte que encara es pot produir mitjançant OP obertes -AddNewConsumeLines=Afegiu una nova línia per consumir +AddNewConsumeLines=Afegiu una línia nova per consumir ProductsToConsume=Productes a consumir ProductsToProduce=Productes a produir UnitCost=Cost unitari TotalCost=Cost total BOMTotalCost=El cost de produir aquesta Llista de materials en funció del cost de cada quantitat i producte a consumir (utilitza el preu de cost si està definit, altrament el preu mitjà ponderat si està definit, altrament el millor preu de compra) -GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +GoOnTabProductionToProduceFirst=Per tancar una Ordre de fabricació primer heu d'iniciar la producció (vegeu la pestanya '%s'). Però sí podeu cancel·lar-la. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=Un kit no es pot utilitzar en una llista de material o en una OF diff --git a/htdocs/langs/ca_ES/website.lang b/htdocs/langs/ca_ES/website.lang index 5b5dac6c952..7adb65909be 100644 --- a/htdocs/langs/ca_ES/website.lang +++ b/htdocs/langs/ca_ES/website.lang @@ -31,15 +31,15 @@ AddWebsite=Afegir lloc web Webpage=Pàgina/contenidor web AddPage=Afegeix pàgina/contenidor HomePage=Pàgina d'inici -PageContainer=Pàgina/contenidor +PageContainer=Pàgina PreviewOfSiteNotYetAvailable=Vista prèvia del seu lloc web %s encara no està disponible. Primer ha de 'Importar plantilla web' o sols 'Afegir pàgina/contenidor'. 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. SiteDeleted=Lloc web '%s' eliminat PageContent=Pàgina/Contenidor PageDeleted=Pàgina/Contenidor '%s' del lloc web %s eliminat PageAdded=Pàgina/Contenidor '%s' afegit -ViewSiteInNewTab=Mostra el lloc en una nova pestanya -ViewPageInNewTab=Mostra la pàgina en una nova pestanya +ViewSiteInNewTab=Mostra el lloc en una pestanya nova +ViewPageInNewTab=Mostra la pàgina en una pestanya nova SetAsHomePage=Indica com a Pàgina principal RealURL=URL real ViewWebsiteInProduction=Mostra la pàgina web utilitzant les URLs d'inici @@ -66,7 +66,7 @@ ClonePage=Clona la pàgina/contenidor CloneSite=Clona el lloc SiteAdded=S'ha afegit el lloc web 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? +PageIsANewTranslation=La pàgina nova é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 @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Substitució realitzada %s pàgines o contenidors RSSFeed=Fils RSS RSSFeedDesc=Podeu obtenir un feed RSS dels darrers articles amb el tipus "blogpost" mitjançant aquesta URL PagesRegenerated=%s pàgina (es) / contenidor (s) regenerada +RegenerateWebsiteContent=Regenera els fitxers de memòria cau del lloc web +AllowedInFrames=Es permet en marcs diff --git a/htdocs/langs/cs_CZ/accountancy.lang b/htdocs/langs/cs_CZ/accountancy.lang index d95720c9bfd..cc61eeb86f0 100644 --- a/htdocs/langs/cs_CZ/accountancy.lang +++ b/htdocs/langs/cs_CZ/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Výchozí nastavení pro službu DefaultForProduct=Výchozí produkt CantSuggest=Nelze navrhnout AccountancySetupDoneFromAccountancyMenu=Většina nastavení účetnictví se provádí z nabídky %s -ConfigAccountingExpert=Konfigurace modulu účetního experta +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Jurnálizace -Journaux=Deníky +Journals=Deníky JournalFinancial=Finanční deníky BackToChartofaccounts=Vrátit schéma účtů Chartofaccounts=Graf účtů +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Aktuální vyhrazený účet AssignDedicatedAccountingAccount=Nový účet, který chcete přiřadit InvoiceLabel=faktura štítek @@ -33,8 +35,8 @@ OtherInfo=Jiná informace DeleteCptCategory=Odstraňte účetní účet ze skupiny ConfirmDeleteCptCategory=Opravdu chcete tento účtovací účet odstranit ze skupiny účetních účtů? JournalizationInLedgerStatus=Stav žurnalizace -AlreadyInGeneralLedger=Již v deníku do hlavní knihy -NotYetInGeneralLedger=Zatím nebyl zaznamenán v knihách +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Skupina je prázdná, zkontrolujte nastavení personalizované účetní skupiny DetailByAccount=Zobrazit detail podle účtu AccountWithNonZeroValues=Účty s nenulovými hodnotami @@ -43,7 +45,9 @@ CountriesInEEC=Země v EHS CountriesNotInEEC=Země, které nejsou v EHS CountriesInEECExceptMe=Země v EHS kromě %s CountriesExceptMe=Všechny země kromě %s -AccountantFiles=Exportní účetní doklady +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Hlavní účetní účetnictví pro zákazníky, které nejsou definovány v nastavení MainAccountForSuppliersNotDefined=Hlavní účty účetnictví pro dodavatele, které nejsou definovány v nastavení @@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=KROK %s: Přidání nebo úprava stávajících trans AccountancyAreaDescClosePeriod=KROK %s: Zavřete období, takže nemůžeme v budoucnu provádět změny. -TheJournalCodeIsNotDefinedOnSomeBankAccount=Povinný krok v nastavení nebyl úplný (časopis pro účetní záznamy není definován pro všechny bankovní účty) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Vybrat aktivní účtové osnovy ChangeAndLoad=Změna a načtení Addanaccount=Přidat účetní účet @@ -89,6 +93,8 @@ SubledgerAccount=Podřízený účet SubledgerAccountLabel=Označení podřízeného účtu ShowAccountingAccount=Zobrazit účetní účet ShowAccountingJournal=Zobrazit účetní deník +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Účetní účet navrhl MenuDefaultAccounts=výchozí účty MenuBankAccounts=Bankovní účty @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Záväzná zpráva o výdajích CreateMvts=Vytvořit novou transakci UpdateMvts=Modifikace transakce ValidTransaction=Ověřte transakci -WriteBookKeeping=Zaregistrujte transakce v knize +WriteBookKeeping=Register transactions in accounting Bookkeeping=účetní kniha +BookkeepingSubAccount=Subledger AccountBalance=Zůstatek na účtu ObjectsRef=Zdrojový objekt ref CAHTF=Celkový prodejce před zdaněním @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Zakázat přímé nahrávání transakce v bankovním ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Povolit návrh exportu v žurnálu ACCOUNTANCY_COMBO_FOR_AUX=Povolit seznam combo pro pomocný účet (může být pomalý, pokud máte spoustu třetích stran) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Prodejní deník ACCOUNTING_PURCHASE_JOURNAL=Nákupní deník @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Čekající účet DONATION_ACCOUNTINGACCOUNT=Účtování účet registrovaných darů ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Účtovací účet pro registraci předplatného +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Účetní účet ve výchozím nastavení pro zakoupené produkty (používá se, pokud není definováno v produktovém listu) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Účetní účet ve výchozím nastavení u zakoupených produktů v EHS (používá se, pokud není definováno v produktovém listu) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Účetní účet ve výchozím nastavení pro nakoupené produkty a dovážený z EHS (používá se, pokud není definován v listu produktu) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=Podle předdefinovaných skupin ByPersonalizedAccountGroups=Individuálními skupinami ByYear=Podle roku NotMatch=Nenastaveno -DeleteMvt=Odstraňte řádky knihy +DeleteMvt=Delete some operation lines from accounting DelMonth=Měsíc k odstranění DelYear=Odstrannění roku DelJournal=Journal, který chcete smazat -ConfirmDeleteMvt=Tím vymažete všechny řádky knihy pro rok / měsíc a / nebo z konkrétního deníku (je vyžadováno alespoň jedno kritérium). Budete muset znovu použít funkci 'Registrace v účetnictví', aby se vymazaný záznam vrátil do knihy. -ConfirmDeleteMvtPartial=Tímto bude smazána transakce z Ledger (všechny řádky související se stejnou transakcí budou smazány) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Finanční deník ExpenseReportsJournal=Výdajové zprávy journal DescFinanceJournal=Finanční deník včetně všech typů plateb prostřednictvím bankovního účtu -DescJournalOnlyBindedVisible=Toto je pohled na záznam, který je vázán na účet a může být zaznamenán do knihy. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Účet pro DPH není definován ThirdpartyAccountNotDefined=Účet subjektu není definován ProductAccountNotDefined=Účet pro výrobek není definován @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=Tento deník se již používá AccountingAccountForSalesTaxAreDefinedInto=Poznámka: Účtovací účet pro daň z prodeje je definován v menu %s - %s NumberOfAccountancyEntries=Počet vstupů NumberOfAccountancyMovements=Počet pohybů +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Exportovat deník návrhu @@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV konfigurovatelný Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export pro Sage 50 Švýcarsko Modelcsv_winfic=Exportovat Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Schéma Id účtů ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang index 12f8270a7bf..4a4c07061e4 100644 --- a/htdocs/langs/cs_CZ/admin.lang +++ b/htdocs/langs/cs_CZ/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=Je načtena komponenta PHP %s PreloadOPCode=Používá se předinstalovaný OPCode AddRefInList=Zobrazit číslo zákazníka / dodavatele seznam informací (vyberte seznam nebo kombinace) a většinu hypertextových odkazů.
Zobrazí se třetí strany s názvem formátu "CC12345 - SC45678 - The Big Company corp". místo "The Big Company corp". AddAdressInList=Zobrazte seznam informací o adresách zákazníků / prodejců (vyberte seznam nebo kombinace)
Subjekty se objeví ve formátu "Big Company Corp. - 21 skokové ulici 123456 Big City - USA" namísto "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Požádejte o preferovanou způsob přepravy pro subjekty. FieldEdition=Editace položky %s FillThisOnlyIfRequired=Příklad: +2 (vyplňte pouze v případě, že se vyskytly problémy s posunem časových pásem) @@ -1420,6 +1421,7 @@ AdherentMailRequired=K vytvoření nového člena je třeba e-mail MemberSendInformationByMailByDefault=Zaškrtávací políčko poslat mailem potvrzení členům (validace nebo nové předplatné) je ve výchozím nastavení VisitorCanChooseItsPaymentMode=Návštěvník si může vybrat z dostupných způsobů platby MEMBER_REMINDER_EMAIL=Povolit automatické připomenutí e-mailem vypršel odběr. Poznámka: Modul %s musí být povolen a správně nastaven pro odeslání připomenutí. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=Nastavení LDAP LDAPGlobalParameters=Globální parametry @@ -1670,7 +1672,7 @@ AdvancedEditor=Rozšířené editor ActivateFCKeditor=Aktivujte pokročilý editor pro: FCKeditorForCompany=WYSIWIG tvorba/vydání popisů prvků a poznámek (kromě produktů/služeb) FCKeditorForProduct=WYSIWIG vytvoření / edice produktů / služeb popis a poznámky -FCKeditorForProductDetails=WYSIWIG tvorba / edice produktů podrobností řádky pro všechny subjekty (návrhy, objednávky, faktury, atd.). Upozornění: Použití této možnosti v tomto případě není vážně doporučeno, protože může při vytváření souborů PDF vytvářet problémy se speciálními znaky a formátováním stránky. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG tvorba/vydání pro hromadné eMailings (Nástroje-> eMailing) FCKeditorForUserSignature=WYSIWIG vytvoření / edice uživatelského podpisu FCKeditorForMail=Vytvoření WYSIWIG / edition pro veškerou poštu (s výjimkou Nástroje-> e-mailem) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automaticky nastavte tuto výchozí hodnotu pro ty AGENDA_DEFAULT_FILTER_TYPE=Automaticky nastavte tento typ události ve filtru vyhledávání v agendě AGENDA_DEFAULT_FILTER_STATUS=Automaticky nastavte tento stav událostí ve filtru vyhledávání v agendě AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda -AGENDA_REMINDER_EMAIL=Povolení připomenutí události pomocí e-mailů (pro každou událost lze definovat možnost připomenutí / zpoždění). Poznámka: Modul %s musí být povolen a správně nastaven tak, aby bylo upozornění odesláno na správnou frekvenci. -AGENDA_REMINDER_BROWSER=Povolení připomenutí události v prohlížeči uživatele (při dosažení data události je každý uživatel schopen odmítnout tuto otázku z potvrzení prohlížeče) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Povolit zvukové upozornění +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Zobrazit propojený objekt do zobrazení agendy ##### Clicktodial ##### ClickToDialSetup=Klepněte na tlačítko Nastavení vytáčení modulu diff --git a/htdocs/langs/cs_CZ/banks.lang b/htdocs/langs/cs_CZ/banks.lang index 8188134be65..5dea684e67a 100644 --- a/htdocs/langs/cs_CZ/banks.lang +++ b/htdocs/langs/cs_CZ/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Různé platby VariousPayments=Různé platby ShowVariousPayment=Zobrazit různé platby AddVariousPayment=Přidat další platbu +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=Mandát SEPA YourSEPAMandate=Váš mandát SEPA FindYourSEPAMandate=Toto je vaše mandát SEPA, který autorizuje naši společnost, aby inkasovala inkasní příkaz k vaší bance. Vraťte jej podepsanou (skenování podepsaného dokumentu) nebo pošlete jej poštou @@ -176,3 +179,4 @@ BankColorizeMovement=Zbarvujte pohyby BankColorizeMovementDesc=Pokud je tato funkce povolena, můžete vybrat konkrétní barvu pozadí pro pohyby debetů nebo kreditů BankColorizeMovementName1=Barva pozadí pro debetní pohyb BankColorizeMovementName2=Barva pozadí pro pohyb úvěru +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/cs_CZ/categories.lang b/htdocs/langs/cs_CZ/categories.lang index 5c978c52c12..53d6caa3877 100644 --- a/htdocs/langs/cs_CZ/categories.lang +++ b/htdocs/langs/cs_CZ/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Nastavení tagů/kategorií CategorieRecursiv=Odkaz na nadřazený tag/kategorii automaticky CategorieRecursivHelp=Pokud je volba zapnuta, při přidání produktu do podkategorie bude produkt také přidán do nadřazené kategorie. AddProductServiceIntoCategory=Přidejte následující produkt/službu +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Zobrazit tag/kategorii ByDefaultInList=Ve výchozím nastavení je v seznamu ChooseCategory=Vyberte kategorii -StocksCategoriesArea=Oblast kategorií skladů -ActionCommCategoriesArea=Oblast kategorie událostí -WebsitePagesCategoriesArea=Oblast kategorií obsahu stránky +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Použití nebo operátor pro kategorie diff --git a/htdocs/langs/cs_CZ/companies.lang b/htdocs/langs/cs_CZ/companies.lang index d083dc74be8..19b9513ae7c 100644 --- a/htdocs/langs/cs_CZ/companies.lang +++ b/htdocs/langs/cs_CZ/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Prof. číslo) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao obecní) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof Id 1 (Federální číslo) ProfId4CH=Prof Id 2 (Commercial Record number) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof Id 1 (R.U.T.) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr) ProfId2DE=Prof Id 2 (USt.-Nr) ProfId3DE=Prof Id 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof Id 1 (CIF/NIF) ProfId2ES=Prof Id 2 (Číslo sociálního pojištění) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (Collegiate číslo) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof Id 1 (SIREN) ProfId2FR=Prof Id 2 (SIRET) ProfId3FR=Prof Id 3 (NAF, old APE) ProfId4FR=Prof Id 4 (RCS/RM) -ProfId5FR=- +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Registrační číslo ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX) ProfId4IN=Prof Id 4 ProfId5IN=Prof Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Obchodní povolení) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (R.C.) ProfId2MA=Id prof. 2 (patent) ProfId3MA=Id prof. 3 (I.F.) ProfId4MA=Id prof. 4 (C.N.S.S.) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof Id 1 (R.F.C). ProfId2MX=Prof Id 2 (R..P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK nummer ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof Id 2 (Social security number) ProfId3PT=Prof Id 3 (Commercial Record number) ProfId4PT=Prof Id 4 (Conservatory) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=ID Id 1 (CUI) ProfId2RO=Id Id 2 (č. Matikulare) ProfId3RO=ID Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof ID 5 (EUID) +ProfId4RO=Prof ID 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof Id 1 (OGRN) ProfId2RU=Prof Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=Můžete také zkontrolovat ručně na evropských stránká ErrorVATCheckMS_UNAVAILABLE=Kontrola není možná. Služba není členským státem poskytována (%s). NorProspectNorCustomer=Ani cíl, ani zákazník JuridicalStatus=Typ právnické osoby +Workforce=Workforce Staff=Zaměstnanci ProspectLevelShort=Potenciální ProspectLevel=Potenciální cíl @@ -456,3 +462,8 @@ PaymentTermsSupplier=Platební termín - dodavatel PaymentTypeBoth=Druh platby - zákazník a prodejce MulticurrencyUsed=Použití více měn MulticurrencyCurrency=Měna +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/cs_CZ/hrm.lang b/htdocs/langs/cs_CZ/hrm.lang index 3ea1914898c..d0850c4a89b 100644 --- a/htdocs/langs/cs_CZ/hrm.lang +++ b/htdocs/langs/cs_CZ/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Pracovní pozice Employees=Zaměstnanci Employee=Zaměstnanec NewEmployee=Nový zaměstnanec +ListOfEmployees=List of employees diff --git a/htdocs/langs/cs_CZ/languages.lang b/htdocs/langs/cs_CZ/languages.lang index b551ca150a1..893180a35d7 100644 --- a/htdocs/langs/cs_CZ/languages.lang +++ b/htdocs/langs/cs_CZ/languages.lang @@ -40,6 +40,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_US=Spanish (USA) Language_es_UY=Španělština (Urugway) Language_es_GT=Španělština (Guatemala) Language_es_VE=Španělština (Venezuela) diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang index 94780679f14..b2fcda76ae4 100644 --- a/htdocs/langs/cs_CZ/main.lang +++ b/htdocs/langs/cs_CZ/main.lang @@ -155,6 +155,7 @@ RemoveLink=Odebrat odkaz AddToDraft=Přidat k návrhům Update=Aktualizovat Close=Zavřít +CloseAs=Nastavte stav na CloseBox=Odebrat widget z panelu Confirm=Potvrdit ConfirmSendCardByMail=Opravdu chcete poslat obsah této karty mailem na %s? @@ -196,6 +197,7 @@ ReOpen=Znovu otevřít Upload=Nahrát ToLink=Odkaz Select=Vybrat +SelectAll=Select all Choose=Zvolit Resize=Změna velikosti ResizeOrCrop=Změnit velikost nebo oříznout @@ -256,6 +258,7 @@ Cards=Karty Card=Karta Now=Nyní HourStart=Startovní hodina +Deadline=Deadline Date=Datum DateAndHour=Datum a hodina DateToday=Dnešní datum @@ -264,8 +267,10 @@ DateStart=Datum zahájení DateEnd=Datum ukončení DateCreation=Datum vytvoření DateCreationShort=Vytvořit datum +IPCreation=Creation IP DateModification=Datum změny DateModificationShort=Datum úpravy +IPModification=Modification IP DateLastModification=Datum poslední změny DateValidation=Datum ověření DateClosing=Uzávěrka @@ -319,6 +324,7 @@ Morning=Ráno Afternoon=Odpoledne Quadri=Quadri MonthOfDay=Měsíce ode dne +DaysOfWeek=Days of week HourShort=H MinuteShort=mn Rate=Sazba @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Výše platby, původní měna MulticurrencyAmountHT=Částka (bez daně), původní měna MulticurrencyAmountTTC=Částka (vč. Daně), původní měně MulticurrencyAmountVAT=Výše daní, původní měna +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Částka daně z 2 AmountLT2=Částka daně 3 AmountLT1ES=Množství RE @@ -487,6 +494,7 @@ By=Podle From=Z FromDate=Z FromLocation=Z +at=at to=na To=na and=a @@ -509,6 +517,7 @@ Draft=Návrh Drafts=Návrhy StatusInterInvoiced=Fakturováno Validated=Ověřené +ValidatedToProduce=Validated (To produce) Opened=Otevřeno OpenAll=Otevřít (všechny) ClosedAll=Uzavřeno (všechny) @@ -655,6 +664,7 @@ Response=Odpověď Priority=Priorita SendByMail=Odeslat emailem MailSentBy=E-mail odeslán +NotSent=Neodesláno TextUsedInTheMessageBody=E-mail obsah SendAcknowledgementByMail=Zaslat potvrzovací e-mail SendMail=Odeslat e-mail @@ -836,6 +846,7 @@ ListOfTemplates=Seznam šablon Gender=Pohlaví Genderman=Muž Genderwoman=Žena +Genderother=Jiný ViewList=Zobrazení seznamu ViewGantt=Ganttův pohled ViewKanban=Kanban pohled @@ -877,6 +888,8 @@ Miscellaneous=Smíšený Calendar=Kalendář GroupBy=Skupina vytvořená... ViewFlatList=Zobrazit seznam plochý +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Odstraňte řetězec ‚%s‘ SomeTranslationAreUncomplete=Některé nabízené jazyky mohou být pouze částečně přeloženy nebo mohou obsahovat chyby. Český překlad je jen základní a orientační, může být nepřesný a mimo kontext. Pomozte prosím opravit svůj jazyk registrováním na https://transifex.com/projects/p/dolibarr/ a přidejte své vylepšení. DirectDownloadLink=Přímý odkaz ke stažení (veřejné / externí) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=zásilky zákazník SearchIntoExpenseReports=Zpráva výdajů SearchIntoLeaves=Listy SearchIntoTickets=Vstupenky +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Platby dodavatele +SearchIntoMiscPayments=Různé platby CommentLink=Komentáře NbComments=Počet komentářů CommentPage=Místo pro komentáře @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Informace Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Datum narození +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/cs_CZ/mrp.lang b/htdocs/langs/cs_CZ/mrp.lang index 281911067d5..a3e64ead7a8 100644 --- a/htdocs/langs/cs_CZ/mrp.lang +++ b/htdocs/langs/cs_CZ/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Jednotková cena TotalCost=Celkové náklady BOMTotalCost=Náklady na výrobu tohoto kusovníku na základě nákladů na každé spotřebované množství a produkt (použijte cenu Cena, pokud je definována, jinak průměrná vážená cena, pokud je definována, jinak nejlepší kupní cena) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/cs_CZ/website.lang b/htdocs/langs/cs_CZ/website.lang index a91cf601e84..cf30e5bd64d 100644 --- a/htdocs/langs/cs_CZ/website.lang +++ b/htdocs/langs/cs_CZ/website.lang @@ -31,7 +31,7 @@ AddWebsite=Přidat webovou stránku Webpage=Webová stránka / kontejner AddPage=Přidat stránku / kontejner HomePage=Domovská stránka -PageContainer=Stránka / kontejner +PageContainer=Strana PreviewOfSiteNotYetAvailable=Náhled vašeho webu %s zatím není k dispozici. Nejprve musíte ' Importovat celou šablonu webových stránek ' nebo jen ' Přidat stránku / kontejner '. RequestedPageHasNoContentYet=Požadovaná stránka s ID %s nemá dosud žádný obsah nebo byl odstraněn soubor cache .tpl.php. Upravte obsah stránky pro vyřešení tohoto problému. SiteDeleted=Webová stránka '%s' byla smazána @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Výměna se provádí na stránkách nebo kontejnerech % RSSFeed=RSS Feed RSSFeedDesc=Pomocí této adresy URL můžete získat RSS kanál nejnovějších článků typu blogpost PagesRegenerated=%s regenerováno stránky / kontejnery +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang index b600c4805fe..3af2cf33fbc 100644 --- a/htdocs/langs/da_DK/accountancy.lang +++ b/htdocs/langs/da_DK/accountancy.lang @@ -11,19 +11,21 @@ ACCOUNTING_EXPORT_DEVISE=Eksporter valuta Selectformat=Vælg formatet til filen ACCOUNTING_EXPORT_FORMAT=Vælg formatet til filen ACCOUNTING_EXPORT_ENDLINE=Vælg linjeskift type -ACCOUNTING_EXPORT_PREFIX_SPEC=Angiv præfiks for filnavn +ACCOUNTING_EXPORT_PREFIX_SPEC=Angiv præfiks for filnavnet ThisService=Denne ydelse ThisProduct=Dette produkt DefaultForService=forvalg ydelse DefaultForProduct=Forvalg produkt CantSuggest=Kan ikke foreslå AccountancySetupDoneFromAccountancyMenu=Hovedparten af opsætningen for regnskabet sker fra menuen %s -ConfigAccountingExpert=Konfiguration af ekspert Regnskabsmodulet +ConfigAccountingExpert=Konfiguration af modulregnskabet (dobbelt indtastning) Journalization=Bogføring -Journaux=Kladder +Journals=Kladder JournalFinancial=Finanskladde BackToChartofaccounts=Tilbage til kontoplan Chartofaccounts=Kontoplan +ChartOfSubaccounts=Diagram over individuelle konti +ChartOfIndividualAccountsOfSubsidiaryLedger=Diagram over underregnskabets individuelle konti CurrentDedicatedAccountingAccount=Aktuel tildelt konto AssignDedicatedAccountingAccount=Ny konto, der skal tildeles InvoiceLabel=Fakturaetiket @@ -33,8 +35,8 @@ OtherInfo=Anden information DeleteCptCategory=Fjern regnskabskonto fra gruppe ConfirmDeleteCptCategory=Er du sikker på, du vil fjerne denne regnskabskonto fra gruppen? JournalizationInLedgerStatus=Status for bogføring -AlreadyInGeneralLedger=Allerede bogført -NotYetInGeneralLedger=Kladder der ikke er bogført endnu +AlreadyInGeneralLedger=Allerede overført i regnskabsjournaler og hovedbog +NotYetInGeneralLedger=Endnu ikke overført i accouting tidsskrifter og hovedbog GroupIsEmptyCheckSetup=Gruppen er tom, kontroller opsætningen af ​​den brugerdefinerede regnskabsgruppe DetailByAccount=Vis detaljer efter konto AccountWithNonZeroValues=Konti med ikke-nul-værdier @@ -43,7 +45,9 @@ CountriesInEEC=Lande i EØF CountriesNotInEEC=Lande ikke i EØF CountriesInEECExceptMe=Lande i EØF undtagen %s CountriesExceptMe=Alle lande undtagen %s -AccountantFiles=Eksporter regnskabs dokumenter +AccountantFiles=Eksporter kildedokumenter +ExportAccountingSourceDocHelp=Med dette værktøj kan du eksportere de kildehændelser (liste og PDF-filer), der blev brugt til at generere din regnskab. For at eksportere dine tidsskrifter skal du bruge menuindgangen %s - %s. +VueByAccountAccounting=Vis efter regnskabskonto MainAccountForCustomersNotDefined=Standardkonto for kunder, der ikke er defineret i opsætningen MainAccountForSuppliersNotDefined=Hoved kontokort for leverandører, der ikke er defineret i opsætningen @@ -58,7 +62,7 @@ AccountancyAreaDescActionOnceBis=Næste skridt skal gøres for at spare tid i fr AccountancyAreaDescActionFreq=Følgende handlinger udføres normalt hver måned, uge ​​eller dag for meget store virksomheder ... AccountancyAreaDescJournalSetup=Trin %s: Opret eller tjek indholdet af din list med kladder fra menuen %s -AccountancyAreaDescChartModel=TRIN: %s Kontroller, at der findes en model af kontoplan, eller opret en fra menuen %s +AccountancyAreaDescChartModel=Trin %s: Kontroller, at der findes en skabelon til en kontoplan eller opret en fra menuen %s AccountancyAreaDescChart=TRIN %s:Vælg og/eller udfyld dit kontoplan fra menuen %s AccountancyAreaDescVat=Trin %s: Definer regnskabskonto for hver momssats. Til dette skal du bruge menupunktet %s. @@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=Trin %s: Tilføj eller rediger eksisterende transakti AccountancyAreaDescClosePeriod=Trin %s: Luk periode, så vi kan ikke foretage ændringer i fremtiden. -TheJournalCodeIsNotDefinedOnSomeBankAccount=Et obligatorisk trin i opsætningen er ikke gennemført (regnskabskode ikke defineret for alle bankkonti) +TheJournalCodeIsNotDefinedOnSomeBankAccount=Et obligatorisk trin i opsætningen er ikke afsluttet (regnskabskodejournal ikke defineret for alle bankkonti) Selectchartofaccounts=Vælg aktiv kontoplan ChangeAndLoad=Ret og indlæs Addanaccount=Tilføj en regnskabskonto @@ -89,6 +93,8 @@ SubledgerAccount=Subledger-konto SubledgerAccountLabel=Subledger-kontoetiket ShowAccountingAccount=Vis regnskabskonto ShowAccountingJournal=Vis kontokladde +ShowAccountingAccountInLedger=Vis regnskabskonto i hovedbog +ShowAccountingAccountInJournals=Vis regnskabskonto i tidsskrifter AccountAccountingSuggest=Forelslået regnskabskonto MenuDefaultAccounts=Standardkonti MenuBankAccounts=Bankkonti @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Bogfør Udgiftsrapport CreateMvts=Opret ny transaktion UpdateMvts=Rediger en transaktion ValidTransaction=Bekræft transaktion -WriteBookKeeping=Registrer transaktioner i Ledger +WriteBookKeeping=Registrer transaktioner i regnskab Bookkeeping=Hovedbog +BookkeepingSubAccount=Underleverandør AccountBalance=Kontobalance ObjectsRef=Objektreference CAHTF=Samlet købeleverandør før skat @@ -149,7 +156,8 @@ ACCOUNTING_MANAGE_ZERO=Tillad at administrere forskellige antal nuller i slutnin BANK_DISABLE_DIRECT_INPUT=Deaktiver direkte registrering af transaktionen på bankkonto ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Aktivér udkast til eksport på Journal ACCOUNTANCY_COMBO_FOR_AUX=Aktivér kombinationsliste for subsidiær konto (kan være langsom, hvis du har en masse tredjeparter) -ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DATE_START_BINDING=Definer en dato for start af binding og overførsel i regnskab. Under denne dato overføres transaktionerne ikke til regnskab. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Ved regnskabsoverførsel skal du vælge periode som standard ACCOUNTING_SELL_JOURNAL=Salgskladde ACCOUNTING_PURCHASE_JOURNAL=Indkøbskladde @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Regnskabskonto for afventning DONATION_ACCOUNTINGACCOUNT=Regnskabskonto til registrering af donationer ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Regnskabskonto for at registrere abonnementer +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Regnskabskonto er som standard for at registrere kundeindbetaling + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Regnskabskonto som standard for de købte produkter (bruges hvis ikke defineret i produktarket) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Regnskabskonto som standard for de købte produkter i EØF (brugt, hvis ikke defineret i produktarket) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Regnskabskonto som standard for de købte produkter og importeret ud af EØF (brugt, hvis ikke defineret i produktarket) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=Efter foruddefinerede grupper ByPersonalizedAccountGroups=Efter brugerdefinerede grupper ByYear=År NotMatch=Ikke angivet -DeleteMvt=Slet posteringer i hovedbogen +DeleteMvt=Slet nogle operationslinjer fra regnskabet DelMonth=Måned at slette DelYear=År, der skal slettes DelJournal=Kladde, der skal slettes -ConfirmDeleteMvt=Dette vil slette alle linjer i hovedbogen for året / måneden og / eller fra en bestemt journal (Der kræves mindst et kriterium). Du bliver nødt til at genbruge funktionen 'Registrering i regnskab' for at få den slettede post tilbage i hovedbogen. -ConfirmDeleteMvtPartial=Dette vil slette transaktionen fra Ledger (alle linjer, der er relateret til samme transaktion vil blive slettet) +ConfirmDeleteMvt=Dette sletter alle driftslinjer i regnskabet for året / måneden og / eller for en bestemt journal (mindst et kriterium er påkrævet). Du bliver nødt til at genbruge funktionen '%s' for at få den slettede post tilbage i hovedbogen. +ConfirmDeleteMvtPartial=Dette sletter transaktionen fra regnskabet (alle driftslinjer relateret til den samme transaktion slettes) FinanceJournal=Finanskladde ExpenseReportsJournal=Udgiftskladder DescFinanceJournal=Regnskabskladde inkl. alle betalingstyper med bankkonto -DescJournalOnlyBindedVisible=Dette er en opfattelse af post, der er bundet til en regnskabsmæssig betragtning og kan være registreret i Regnskabet. +DescJournalOnlyBindedVisible=Dette er en oversigt over poster, der er bundet til en regnskabskonto og kan registreres i tidsskrifterne og hovedbogen. VATAccountNotDefined=Momskonto ikke defineret ThirdpartyAccountNotDefined=Tredjepartskonto ikke defineret ProductAccountNotDefined=Varekonto ikke defineret @@ -285,7 +295,7 @@ ShowTutorial=Vis selvstudie NotReconciled=Ikke afstemt ## Admin -BindingOptions=Binding options +BindingOptions=Bindende muligheder ApplyMassCategories=Anvend massekategorier AddAccountFromBookKeepingWithNoCategories=Tilgængelig konto endnu ikke i den personaliserede gruppe CategoryDeleted=Kategori for regnskabskonto er blevet slettet @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=Denne kladde er allerede i brug AccountingAccountForSalesTaxAreDefinedInto=Bemærk: Regnskabskonto for salgsmoms er defineret i menuen %s - %s NumberOfAccountancyEntries=Antal poster NumberOfAccountancyMovements=Antal bevægelser +ACCOUNTING_DISABLE_BINDING_ON_SALES=Deaktiver binding og overførsel i regnskab ved salg (kundefakturaer tages ikke med i regnskabet) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Deaktiver binding og overførsel i regnskab ved køb (leverandørfakturaer tages ikke med i regnskabet) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Deaktiver binding og overførsel i regnskab på udgiftsrapporter (udgiftsrapporter tages ikke med i regnskabet) ## Export ExportDraftJournal=Eksporter udkast til kladde @@ -326,6 +339,8 @@ Modelcsv_configurable=Eksporter CSV Konfigurerbar Modelcsv_FEC=Eksport FEC Modelcsv_Sage50_Swiss=Eksport til Sage 50 Schweiz Modelcsv_winfic=Eksport Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Eksport til Gestinum (v3) +Modelcsv_Gestinumv5Export til Gestinum (v5) ChartofaccountsId=ID for kontoplan ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang index 4e96ba3451f..d7714c0c1df 100644 --- a/htdocs/langs/da_DK/admin.lang +++ b/htdocs/langs/da_DK/admin.lang @@ -2,7 +2,7 @@ Foundation=Fundament Version=Version Publisher=Forlægger -VersionProgram=Programversion +VersionProgram=Program version VersionLastInstall=Første version installeret VersionLastUpgrade=Seneste stabile version VersionExperimental=Eksperimentel @@ -37,8 +37,8 @@ UnlockNewSessions=Fjern forbindelseslås YourSession=Din session Sessions=Brugere Sessioner WebUserGroup=Webserver bruger / gruppe -PermissionsOnFilesInWebRoot=Permissions on files in web root directory -PermissionsOnFile=Permissions on file %s +PermissionsOnFilesInWebRoot=Tilladelser til filer i web-rodmappen +PermissionsOnFile=Tilladelser på fil %s NoSessionFound=Din PHP-konfiguration tillade ikke optagelse af aktive sessioner. Den mappe, der bruges til at gemme sessioner ( %s ), kan være beskyttet (for eksempel via operativsystemet eller ved PHP-direktivet open_basedir). DBStoringCharset=Database charset til at gemme data DBSortingCharset=Database charset for at sortere data @@ -82,7 +82,7 @@ AllowToSelectProjectFromOtherCompany=På tredjeparts dokument kan man vælge et JavascriptDisabled=JavaScript slået UsePreviewTabs=Brug forhåndsvisning faner ShowPreview=Vis forhåndsvisning -ShowHideDetails=Show-Hide details +ShowHideDetails=Vis skjul detaljer PreviewNotAvailable=Preview ikke tilgængeligt ThemeCurrentlyActive=Tema aktuelt aktive CurrentTimeZone=Aktuelle tidszone @@ -483,12 +483,12 @@ ModuleCompanyCodeSupplierDigitaria=%s efterfulgt af det afkortede leverandørnav Use3StepsApproval=Som standard skal indkøbsordrer oprettes og godkendes af 2 forskellige brugere (et trin / bruger til oprettelse og et trin / bruger at godkende. Bemærk at hvis brugeren har begge tilladelser til at oprette og godkende, er et trin / bruger tilstrækkeligt) . Du kan spørge med denne mulighed for at indføre et tredje trin / brugergodkendelse, hvis mængden er højere end en dedikeret værdi (så 3 trin vil være nødvendige: 1 = bekræftelse, 2 = første godkendelse og 3 = anden godkendelse, hvis mængden er tilstrækkelig).
Indstil dette til tomt, hvis en godkendelse (2 trin) er tilstrækkelig, angiv den til en meget lav værdi (0,1), hvis der kræves en anden godkendelse (3 trin). UseDoubleApproval=Brug en 3-trins godkendelse, når beløbet (uden skat) er højere end ... WarningPHPMail=ADVARSEL: Opsætningen til at sende e-mails fra applikationen bruger standardgenerisk opsætning. Det er ofte bedre at konfigurere udgående e-mails for at bruge e-mail-udbyderens e-mail-server i stedet for standardopsætningen af flere grunde: -WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM -WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota). -WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox. -WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other. +WarningPHPMailA=- Brug af e-mail-udbyderens server øger pålideligheden af din e-mail, så det øger leverings pålidelighed uden at blive markeret som SPAM +WarningPHPMailB=- Nogle e-mail-tjenesteudbydere (som Yahoo) tillader dig ikke at sende en e-mail fra en anden server end deres egen server. Din nuværende opsætning bruger programmets server til at sende e-mail og ikke din e-mail-udbyders server, så nogle modtagere (den der er kompatibel med den restriktive DMARC-protokol) vil spørge din e-mail-udbyder, om de kan acceptere din e-mail og nogle e-mail-udbydere (som Yahoo) svarer muligvis "nej", fordi serveren ikke er deres, så få af dine sendte e-mails accepteres muligvis ikke til levering (pas også på din e-mail-udbyders afsendekvote). +WarningPHPMailC=- Brug af din egen e-mail-tjenesteudbyders SMTP-server til at sende e-mails er også interessant, så alle e-mails, der sendes fra applikationen, gemmes også i din "Sendte" mappe i din postkasse. +WarningPHPMailD=Hvis metoden 'PHP Mail' virkelig er den metode, du gerne vil bruge, kan du fjerne denne advarsel ved at tilføje konstanten MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP til 1 i Home - Setup - Other. WarningPHPMail2=Hvis din e-mail SMTP udbyder skal begrænse e-mail klienten til nogle IP-adresser (meget sjælden), er dette IP-adressen til e-mail bruger agenten (MUA) til din ERP CRM-applikation: %s . -WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: %s. +WarningPHPMailSPF=Hvis domænenavnet i din afsender-e-mail-adresse er beskyttet af en SPF-post (spørg dit domænenavn til registrering), skal du tilføje følgende IP'er i SPF-registreringen af DNS for dit domæne: %s . ClickToShowDescription=Klik for at vise beskrivelse DependsOn=Dette modul har brug for modulet / modulerne RequiredBy=Dette modul er påkrævet efter modul (er) @@ -554,9 +554,9 @@ Module54Desc=Forvaltning af kontrakter (tjenester eller tilbagevendende abonneme Module55Name=Stregkoder Module55Desc=Stregkoder administration Module56Name=Betaling med kreditoverførsel -Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries. -Module57Name=Payments by Direct Debit -Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries. +Module56Desc=Styring af betaling af leverandører via ordrer med kreditoverførsel. Det inkluderer generering af SEPA-fil til europæiske lande. +Module57Name=Betalinger med Direct Debit +Module57Desc=Forvaltning af Direct Debit. Det inkluderer generering af SEPA-fil til europæiske lande. Module58Name=ClickToDial Module58Desc=ClickToDial integration Module60Name=mærkater @@ -662,7 +662,7 @@ Module50200Desc=Tilbyde kunder en PayPal-betalingssideside (PayPal-konto eller k Module50300Name=Stribe Module50300Desc=Tilbyde kunder en Stripe online betalingsside (kredit / betalingskort). Dette kan bruges til at give dine kunder mulighed for at foretage ad hoc-betalinger eller betalinger relateret til et bestemt Dolibarr-objekt (faktura, bestilling osv.) Module50400Name=Regnskab (dobbeltindtastning) -Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats. +Module50400Desc=Regnskabshåndtering (dobbelt poster, support hoved- og datterselskaber). Eksporter hovedbogen i flere andre regnskabssoftwareformater. Module54000Name=PrintIPP Module54000Desc=Direkte udskrivning (uden at åbne dokumenterne) ved hjælp af IPP-konnektorer (Printer skal være synlig fra serveren, og CUPS skal installeres på serveren). Module55000Name=Afstemning, Undersøgelse eller Afstemning @@ -677,7 +677,7 @@ Module63000Name=Ressourcer Module63000Desc=Administrer ressourcer (printere, biler, værelser, ...) til tildeling til arrangementer Permission11=Læs fakturaer Permission12=Opret/rediger kundefakturaer -Permission13=Invalidate customer invoices +Permission13=Ugyldig kundefakturaer Permission14=Bekræft fakturaer Permission15=Send fakturaer via e-mail Permission16=Opret betalinger for fakturaer @@ -694,7 +694,7 @@ Permission32=Opret/rediger varer/ydelser Permission34=Slet varer/ydelser Permission36=Se/administrer skjulte varer Permission38=Eksportere produkter -Permission39=Ignore minimum price +Permission39=Ignorer mindsteprisen Permission41=Læs projekter og opgaver (delt projekt og projekter jeg er kontakt til). Kan også indtaste tidskrævet, for mig eller mit hierarki, på tildelte opgaver (Tidsskema) Permission42=Opret / rediger projekter (delt projekt og projekter jeg er kontakt til). Kan også oprette opgaver og tildele brugere projekt og opgaver Permission44=Slet projekter (delte projekter og projekter jeg er kontaktperson for) @@ -703,9 +703,9 @@ Permission61=Læs interventioner Permission62=Opret/rediger indgreb Permission64=Slet interventioner Permission67=Eksporter interventioner -Permission68=Send interventions by email -Permission69=Validate interventions -Permission70=Invalidate interventions +Permission68=Send interventioner via e-mail +Permission69=Valider indgreb +Permission70=Ugyldige indgreb Permission71=Læs medlemmer Permission72=Opret/rediger medlemmer Permission74=Slet medlemmer @@ -728,7 +728,7 @@ Permission95=Læs rapporter Permission101=Læs sendings Permission102=Opret/rediger forsendelser Permission104=Bekræft forsendelser -Permission105=Send sendings by email +Permission105=Send afsendelser via e-mail Permission106=Eksporter forsendelser Permission109=Slet forsendelser Permission111=Læs finanskonti @@ -836,11 +836,11 @@ Permission402=Opret/rediger rabatter Permission403=Bekræft rabatter Permission404=Slet rabatter Permission430=Brug Debug Bar -Permission511=Read payments of salaries (yours and subordinates) +Permission511=Læs lønudbetalinger (dine og underordnede) Permission512=Opret / modificer lønudbetalinger Permission514=Slet betaling af lønninger -Permission517=Read payments of salaries of everybody -Permission519=Export salaries +Permission517=Læs alle lønninger +Permission519=Eksportlønninger Permission520=Læs lån Permission522=Opret / modificer lån Permission524=Slet lån @@ -851,19 +851,19 @@ Permission532=Opret/rediger ydelser Permission534=Slet ydelser Permission536=Se/administrer skjulte ydelser Permission538=Eksport af tjenesteydelser -Permission561=Read payment orders by credit transfer -Permission562=Create/modify payment order by credit transfer -Permission563=Send/Transmit payment order by credit transfer -Permission564=Record Debits/Rejections of credit transfer -Permission601=Read stickers -Permission602=Create/modify stickers -Permission609=Delete stickers +Permission561=Læs betalingsordrer ved kreditoverførsel +Permission562=Opret / rediger betalingsordre ved kreditoverførsel +Permission563=Send / send betalingsordre ved kreditoverførsel +Permission564=Registrer debiteringer / afvisninger af kreditoverførsel +Permission601=Læs stickers +Permission602=Opret / rediger stickers +Permission609=Slet stickers Permission650=Læs regninger af materialer Permission651=Opret / opdater materialeregninger Permission652=Slet materialeregninger -Permission660=Read Manufacturing Order (MO) -Permission661=Create/Update Manufacturing Order (MO) -Permission662=Delete Manufacturing Order (MO) +Permission660=Læs fremstillingsordre (MO) +Permission661=Opret / opdater produktionsordre (MO) +Permission662=Slet produktionsordre (MO) Permission701=Læs donationer Permission702=Opret/rediger donationer Permission703=Slet donationer @@ -873,8 +873,8 @@ Permission773=Slet udgiftsrapporter Permission774=Læs alle udgiftsrapporter (selv for brugere, der ikke er underordnede) Permission775=Godkendelse af udgiftsrapporter Permission776=Betalingsomkostningsrapporter -Permission777=Read expense reports of everybody -Permission778=Create/modify expense reports of everybody +Permission777=Læs udgiftsrapporter fra alle +Permission778=Opret / rediger udgiftsrapporter for alle Permission779=Eksportudgiftsrapporter Permission1001=Læs bestande Permission1002=Opret/rediger varehuse @@ -899,9 +899,9 @@ Permission1185=Godkend købsordrer Permission1186=Bestil indkøbsordrer Permission1187=Bekræft modtagelse af købsordrer Permission1188=Slet indkøbsordrer -Permission1189=Check/Uncheck a purchase order reception +Permission1189=Marker / fjern markeringen i en indkøbsordres modtagelse Permission1190=Godkend (anden godkendelse) købsordrer -Permission1191=Export supplier orders and their attributes +Permission1191=Eksportér leverandørordrer og deres attributter Permission1201=Få resultatet af en eksport Permission1202=Opret/rediger en eksport Permission1231=Læs leverandørfakturaer @@ -915,8 +915,8 @@ Permission1251=Kør massen import af eksterne data i databasen (data belastning) Permission1321=Eksporter kunde fakturaer, attributter og betalinger Permission1322=Genåb en betalt regning Permission1421=Eksporter salgsordrer og attributter -Permission1521=Read documents -Permission1522=Delete documents +Permission1521=Læs dokumenter +Permission1522=Slet dokumenter Permission2401=Læs handlinger (begivenheder eller opgaver), der er knyttet til hans brugerkonto (hvis ejer af begivenheden eller bare er tildelt) Permission2402=Opret / rediger handlinger (begivenheder eller opgaver), der er knyttet til hans brugerkonto (hvis ejeren af begivenheden) Permission2403=Slet handlinger (begivenheder eller opgaver), der er knyttet til hans brugerkonto (hvis ejeren af begivenheden) @@ -931,7 +931,7 @@ Permission2515=Opsæt dokumentdokumenter Permission2801=Brug FTP-klient i læsemodus (kun gennemse og download) Permission2802=Brug FTP-klient i skrivefunktion (slet eller upload filer) Permission3200=Læs arkiverede begivenheder og fingeraftryk -Permission3301=Generate new modules +Permission3301=Generer nye moduler Permission4001=Se medarbejdere Permission4002=Opret medarbejdere Permission4003=Slet medarbejdere @@ -951,13 +951,13 @@ Permission23001=Read Scheduled job Permission23002=Create/update Scheduled job Permission23003=Delete Scheduled job Permission23004=Execute Scheduled job -Permission50101=Use Point of Sale (SimplePOS) -Permission50151=Use Point of Sale (TakePOS) +Permission50101=Brug salgssted (SimplePOS) +Permission50151=Brug salgssted (TakePOS) Permission50201=Læs transaktioner Permission50202=Import transaktioner -Permission50330=Read objects of Zapier -Permission50331=Create/Update objects of Zapier -Permission50332=Delete objects of Zapier +Permission50330=Læs genstande fra Zapier +Permission50331=Opret / opdater objekter af Zapier +Permission50332=Slet objekter fra Zapier Permission50401=Bind produkter og fakturaer med regnskabskonti Permission50411=Læs operationer i hovedbok Permission50412=Skriv / rediger handlinger i hovedbok @@ -981,21 +981,21 @@ Permission63001=Læs ressourcer Permission63002=Opret / modificer ressourcer Permission63003=Slet ressourcer Permission63004=Link ressourcer til begivenheder i tidsplan -Permission64001=Allow direct printing -Permission67000=Allow printing of receipts -Permission68001=Read intracomm report -Permission68002=Create/modify intracomm report -Permission68004=Delete intracomm report -Permission941601=Read receipts -Permission941602=Create and modify receipts -Permission941603=Validate receipts -Permission941604=Send receipts by email -Permission941605=Export receipts -Permission941606=Delete receipts +Permission64001=Tillad direkte udskrivning +Permission67000=Tillad udskrivning af kvitteringer +Permission68001=Læs intracomm rapport +Permission68002=Opret / rediger intracomm-rapport +Permission68004=Slet intracomm-rapport +Permission941601=Læs kvitteringer +Permission941602=Opret og rediger kvitteringer +Permission941603=Valider kvitteringer +Permission941604=Send kvitteringer via e-mail +Permission941605=Eksportkvitteringer +Permission941606=Slet kvitteringer DictionaryCompanyType=Tredjepartstyper DictionaryCompanyJuridicalType=Tredjeparts juridiske enheder -DictionaryProspectLevel=Prospect potential level for companies -DictionaryProspectContactLevel=Prospect potential level for contacts +DictionaryProspectLevel=prospekt potentiale niveau for virksomheder +DictionaryProspectContactLevel=Prospekt potentiale niveau for kontakter DictionaryCanton=Stater / provinser DictionaryRegion=Regioner DictionaryCountry=Lande @@ -1025,14 +1025,14 @@ DictionaryEMailTemplates=Email skabeloner DictionaryUnits=Enheder DictionaryMeasuringUnits=Måleenheder DictionarySocialNetworks=Sociale netværk -DictionaryProspectStatus=Prospect status for companies -DictionaryProspectContactStatus=Prospect status for contacts +DictionaryProspectStatus=Prospektstatus for virksomheder +DictionaryProspectContactStatus=Prospektstatus for kontakter DictionaryHolidayTypes=Typer af orlov DictionaryOpportunityStatus=Ledestatus for projekt / bly DictionaryExpenseTaxCat=Udgiftsrapport - Transportkategorier DictionaryExpenseTaxRange=Omkostningsrapport - Område efter transportkategori -DictionaryTransportMode=Intracomm report - Transport mode -TypeOfUnit=Type of unit +DictionaryTransportMode=Intracomm rapport - Transporttilstand +TypeOfUnit=Type af enhed SetupSaved=Opsætning gemt SetupNotSaved=Opsætning er ikke gemt BackToModuleList=Tilbage til modul listen @@ -1083,7 +1083,7 @@ LabelUsedByDefault=Etiket, som bruges som standard, hvis ingen oversættelse kan LabelOnDocuments=Etiketten på dokumenter LabelOrTranslationKey=Etiket eller oversættelsestast ValueOfConstantKey=Værdi af en konfigurationskonstant -ConstantIsOn=Option %s is on +ConstantIsOn=Mulighed %s er aktiveret NbOfDays=Antal dage AtEndOfMonth=Ved udgangen af måneden CurrentNext=Aktuel / Næste @@ -1128,7 +1128,7 @@ LoginPage=Login side BackgroundImageLogin=Baggrundsbillede PermanentLeftSearchForm=Faste search form på venstre menu DefaultLanguage=Standard sprog -EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships +EnableMultilangInterface=Aktiver understøttelse af flere sprog for kunde- eller leverandørrelationer EnableShowLogo=Vis firmaets logo i menuen CompanyInfo=Virksomhed/Organisation CompanyIds=Virksomhed / Organisations identiteter @@ -1182,7 +1182,7 @@ InfoWebServer=Om webserver InfoDatabase=Om Database InfoPHP=Om PHP InfoPerf=Om forestillinger -InfoSecurity=About Security +InfoSecurity=Om sikkerhed BrowserName=Browser navn BrowserOS=Browser OS ListOfSecurityEvents=Liste over Dolibarr sikkerhed begivenheder @@ -1233,7 +1233,7 @@ RestoreDesc2=Gendan sikkerhedskopieringsfilen (f.eks. Zip-fil) af "dokumenter" - RestoreDesc3=Gendan database struktur og data fra en backup dump fil i databasen af den nye Dolibarr installation eller i databasen af denne nuværende installation ( %s ). Advarsel, når genoprettelsen er færdig, skal du bruge et login / adgangskode, der eksisterede fra backuptidspunktet / installationen for at oprette forbindelse igen.
For at gendanne en backup database til denne nuværende installation, kan du følge denne assistent. RestoreMySQL=MySQL import ForcedToByAModule=Denne regel er tvunget til at %s ved en aktiveret modul -ValueIsForcedBySystem=This value is forced by the system. You can't change it. +ValueIsForcedBySystem=Denne værdi tvinges af systemet. Du kan ikke ændre det. PreviousDumpFiles=Eksisterende backup filer PreviousArchiveFiles=Eksisterende arkivfiler WeekStartOnDay=Første dag i ugen @@ -1294,8 +1294,8 @@ WarningAtLeastKeyOrTranslationRequired=Et søgekriterium kræves i det mindste f NewTranslationStringToShow=Ny oversættelsestreng, der skal vises OriginalValueWas=Den oprindelige oversættelse overskrives. Oprindelig værdi var:

%s TransKeyWithoutOriginalValue=Du har tvinget en ny oversættelse til oversættelsessnøglen ' %s ', der ikke findes i nogen sprogfiler -TitleNumberOfActivatedModules=Activated modules -TotalNumberOfActivatedModules=Activated modules: %s / %s +TitleNumberOfActivatedModules=Aktiverede moduler +TotalNumberOfActivatedModules=Aktiverede moduler: %s / %s YouMustEnableOneModule=Du skal i det mindste aktivere 1 modul ClassNotFoundIntoPathWarning=Klasse %s ikke fundet i PHP-sti YesInSummer=Ja om sommeren @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP-komponent %s indlæses PreloadOPCode=Forudindlæst OPCode bruges AddRefInList=Vis kunde / sælger ref. info liste (vælg liste eller combobox) og det meste af hyperlink.
Tredjeparter vil blive vist med et navneformat af "CC12345 - SC45678 - The Big Company corp." i stedet for "The Big Company Corp". AddAdressInList=Vis kunde / leverandør adresse info liste (vælg liste eller combobox)
Tredjeparter vil blive vist med et navneformat af "The Big Company Corp. - 21 Jump Street 123456 Big Town - USA" i stedet for "The Big Company Corp". +AddEmailPhoneTownInContactList=Vis kontakt-e-mail (eller telefoner, hvis ikke defineret) og byinfo-liste (vælg liste eller kombinationsboks)
Kontakter vises med navnet format "Dupond Durand - dupond.durand@email.com - Paris" eller "Dupond Durand - 06 07 59 65 66 - Paris "i stedet for" Dupond Durand ". AskForPreferredShippingMethod=Anmod om en foretrukket forsendelsesmetode for tredjeparter. FieldEdition=Område udgave %s FillThisOnlyIfRequired=Eksempel: +2 (kun udfyld hvis problemer med tidszoneforskydning opstår) @@ -1321,7 +1322,7 @@ GetBarCode=Få stregkode NumberingModules=Nummerering modeller DocumentModules=Dokumentmodeller ##### Module password generation -PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase. +PasswordGenerationStandard=Returner en adgangskode, der er genereret i henhold til intern Dolibarr-algoritme: %s tegn, der indeholder delte tal og tegn i små bogstaver. PasswordGenerationNone=Foreslå ikke en genereret adgangskode. Adgangskoden skal indtastes manuelt. PasswordGenerationPerso=Ret en adgangskode i overensstemmelse med din personligt definerede konfiguration. SetupPerso=Ifølge din konfiguration @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email er påkrævet for at oprette et nyt medlem MemberSendInformationByMailByDefault=Checkbox til at sende mail bekræftelse til medlemmerne er slået til som standard VisitorCanChooseItsPaymentMode=Besøgende kan vælge mellem tilgængelige betalingsformer MEMBER_REMINDER_EMAIL=Aktivér automatisk påmindelse via e-mail af udløbne abonnementer. Bemærk: Modul %s skal være aktiveret og korrekt konfigureret til at sende påmindelser. +MembersDocModules=Dokumentskabeloner til dokumenter genereret fra medlemsregistrering ##### LDAP setup ##### LDAPSetup=LDAP-opsætning LDAPGlobalParameters=Globale parametre @@ -1562,9 +1564,9 @@ LDAPDescValues=Eksempel værdier er konstrueret til OpenLDAP med følgend ForANonAnonymousAccess=For en autentificeret adgang (for en skriveadgangen for eksempel) PerfDolibarr=Prestationsopsætning / optimeringsrapport YouMayFindPerfAdviceHere=Denne side giver nogle checks eller råd vedrørende performance. -NotInstalled=Not installed. -NotSlowedDownByThis=Not slowed down by this. -NotRiskOfLeakWithThis=Not risk of leak with this. +NotInstalled=Ikke installeret. +NotSlowedDownByThis=Ikke bremset af dette. +NotRiskOfLeakWithThis=Ikke risiko for lækage med dette. ApplicativeCache=Applikationsbuffer MemcachedNotAvailable=Ingen applikationsbuffer fundet. Du kan forbedre ydeevnen ved at installere en cache-server Memcached og et modul, der kan bruge denne cache-server.
Mere information her http: //wiki.dolibarr.org/index.php/Module_MemCached_EN .
Bemærk, at en masse web hosting udbyder ikke giver sådan cache server. MemcachedModuleAvailableButNotSetup=Modul memcached for applikationscache fundet, men opsætning af modul er ikke komplet. @@ -1612,9 +1614,9 @@ SyslogLevel=Niveau SyslogFilename=Filnavn og sti YouCanUseDOL_DATA_ROOT=Du kan bruge DOL_DATA_ROOT / dolibarr.log for en logfil i Dolibarr "dokumenter" mappen. Du kan indstille en anden vej til at gemme denne fil. ErrorUnknownSyslogConstant=Konstant %s er ikke en kendt syslog konstant -OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported +OnlyWindowsLOG_USER=På Windows understøttes kun LOG_USER-faciliteten CompressSyslogs=Komprimering og backup af fejlfindingslogfiler (genereret af modul Log til fejlfinding) -SyslogFileNumberOfSaves=Number of backup logs to keep +SyslogFileNumberOfSaves=Antal sikkerhedskopilogfiler, der skal gemmes ConfigureCleaningCronjobToSetFrequencyOfSaves=Konfigurer rengøringsplanlagt job for at indstille log backupfrekvens ##### Donations ##### DonationsSetup=Indstilling af donationsmodul @@ -1670,7 +1672,7 @@ AdvancedEditor=Avanceret tekstredigeringsværktøj ActivateFCKeditor=Aktivér FCKeditor for: FCKeditorForCompany=WYSIWIG oprettelse/redigering af beskrivelseselementer og noter (undtagen varer/ydelser) FCKeditorForProduct=WYSIWIG oprettelse/redigering af beskrivelse/noter for varer/ydelser -FCKeditorForProductDetails=WYSIWIG oprettelse / udgave af produkter detaljer linjer for alle enheder (forslag, ordrer, fakturaer osv. ..). Advarsel: Aktivering af denne indstilling anbefales ikke, da det kan skabe problemer med specialtegn og sideformatering, når du bygger PDF-filer. +FCKeditorForProductDetails=WYSIWIG oprettelse / udgave af produkt detaljers linjer for alle enheder (forslag, ordrer, fakturaer osv ...). Advarsel: Brug af denne indstilling til denne sag anbefales ikke, da det kan skabe problemer med specialtegn og sideformatering, når du bygger PDF-filer. FCKeditorForMailing= WYSIWIG oprettelsen / udgave af postforsendelser FCKeditorForUserSignature=WYSIWIG oprettelse / udgave af bruger signatur FCKeditorForMail=WYSIWIG oprettelse / udgave for al mail (undtagen Værktøjer-> eMailing) @@ -1735,15 +1737,16 @@ AGENDA_USE_EVENT_TYPE=Brug begivenhedstyper (styret i menuopsætning -> Ordbøge AGENDA_USE_EVENT_TYPE_DEFAULT=Indstil denne standardværdi automatisk for type begivenhed i begivenhedsoprettelsesformular AGENDA_DEFAULT_FILTER_TYPE=Indstil denne type begivenhed automatisk i søgefilter i dagsordblik AGENDA_DEFAULT_FILTER_STATUS=Indstil denne status automatisk for begivenheder i søgefilter i dagsordblik -AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda -AGENDA_REMINDER_EMAIL=Aktivér hændelsespåmindelse via e-mails (påmindelsesindstilling / forsinkelse kan defineres på hver hændelse). Bemærk: Modul %s skal være aktiveret og korrekt konfigureret for at få påmindelse sendt med den korrekte frekvens. -AGENDA_REMINDER_BROWSER=Aktivér hændelsespåmindelse på brugerens browser (når hændelsesdatoen er nået, kan hver bruger nægte dette fra browserbekræftelsesspørgsmålet) +AGENDA_DEFAULT_VIEW=Hvilken visning vil du åbne som standard, når du vælger menu Agenda +AGENDA_REMINDER_BROWSER=Aktivér påmindelse om begivenhed i brugerens browser (Når påmindelsesdato er nået, vises en popup af browseren. Hver bruger kan deaktivere sådanne underretninger fra sin browseropsætning). AGENDA_REMINDER_BROWSER_SOUND=Aktivér lydmeddelelse +AGENDA_REMINDER_EMAIL=Aktiver påmindelse om begivenhed via e-mails (påmindelsesmulighed / forsinkelse kan defineres for hver begivenhed). +AGENDA_REMINDER_EMAIL_NOTE=Bemærk: Frekvensen af opgaven %s skal være tilstrækkelig til at være sikker på, at påmindelsen sendes på det rigtige tidspunkt. AGENDA_SHOW_LINKED_OBJECT=Vis linkede objekter i tidsplanvisning ##### Clicktodial ##### ClickToDialSetup=Opsætning af Klik-for-at-ringe-modulet ClickToDialUrlDesc=Url kaldes, når man klikke på telefon billed. I URL kan du bruge tags
__ PHONETO __ , der vil blive erstattet med telefonnummeret til den person, der skal ringe
__ PHONEFROM __ , der vil blive erstattet med telefonnummeret til opkaldet person (din)
__ LOGIN __ , der vil blive erstattet med clicktodial login (defineret på brugerkort)
__ PASS __ , der vil blive erstattet med clicktodial adgangskode (defineret på bruger kort). -ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable. +ClickToDialDesc=Dette modul ændrer telefonnumre, når du bruger en stationær computer, til klikbare links. Et klik ringer op til nummeret. Dette kan bruges til at starte telefonopkaldet, når du bruger en blød telefon på skrivebordet eller når du f.eks. Bruger et CTI-system baseret på SIP-protokol. Bemærk: Når du bruger en smartphone, er telefonnumre altid klikbare. ClickToDialUseTelLink=Brug kun et link "tel:" på telefonnumre ClickToDialUseTelLinkDesc=Brug denne metode, hvis dine brugere har en softphone eller en software-grænseflade installeret på samme computer som browseren, og kaldes, når du klikker på et link i din browser, der starter med "tel:". Hvis du har brug for en fuld serverløsning (uden brug af lokal softwareinstallation), skal du indstille dette til "Nej" og udfylde næste felt. ##### Point Of Sale (CashDesk) ##### @@ -1873,7 +1876,7 @@ EnterAnyCode=Dette felt indeholder en reference til at identificere linje. Indta Enter0or1=Tryk 0 eller 1 UnicodeCurrency=Indtast her mellem seler, liste over byte nummer, der repræsenterer valutasymbolet. For eksempel: for $, indtast [36] - for Brasilien real R $ [82,36] - for €, indtast [8364] ColorFormat=RGB-farven er i HEX-format, fx: FF0000 -PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module) +PictoHelp=Ikonnavn i dolibarr-format ('image.png' hvis det er i det aktuelle temabibliotek, 'image.png@nom_du_module' hvis det er i biblioteket / img / i et modul) PositionIntoComboList=Linjens placering i kombinationslister SellTaxRate=Salgsskattesats RecuperableOnly=Ja for moms "Ikke opfattet, men genoprettelig" dedikeret til nogle stater i Frankrig. Hold værdi til "Nej" i alle andre tilfælde. @@ -1914,7 +1917,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s er tilgængelig. Versi ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s er tilgængelig. Version %s er en vedligeholdelsesversion, der indeholder kun fejlrettelser. Vi anbefaler alle brugere at opgradere til denne version. En vedligeholdelsesfrigivelse introducerer ikke nye funktioner eller ændringer i databasen. Du kan hente den fra downloadområdet på https://www.dolibarr.org portal (underkatalog Stable versioner). Du kan læse ChangeLog for en komplet liste over ændringer. MultiPriceRuleDesc=Når valgmuligheden "Flere prisniveauer pr. Produkt / service" er aktiveret, kan du definere forskellige priser (et pr. Prisniveau) for hvert produkt. For at spare tid, kan du her angive en regel for at autokalulere en pris for hvert niveau baseret på prisen på første niveau, så du skal kun angive en pris for første niveau for hvert produkt. Denne side er designet til at spare dig tid, men er kun nyttig, hvis dine priser for hvert niveau er i forhold til første niveau. Du kan ignorere denne side i de fleste tilfælde. ModelModulesProduct=Skabeloner til produktdokumenter -WarehouseModelModules=Templates for documents of warehouses +WarehouseModelModules=Skabeloner til dokumenter på lager ToGenerateCodeDefineAutomaticRuleFirst=For at kunne generere koder automatisk skal du først definere en manager for at definere stregkodenummeret automatisk. SeeSubstitutionVars=Se * note for liste over mulige substitutionsvariabler SeeChangeLog=Se ChangeLog-fil (kun engelsk) @@ -1993,16 +1996,16 @@ NothingProcessed=Intet gjort XEmailsDoneYActionsDone=%s e-mails kvalificerede, %s e-mails er behandlet (for %s-registrering / handlinger udført) RecordEvent=Optag email-begivenhed CreateLeadAndThirdParty=Opret ledelse (og tredjepart om nødvendigt) -CreateTicketAndThirdParty=Create ticket (and link to third party if it was loaded by a previous operation) +CreateTicketAndThirdParty=Opret billet (og link til tredjepart, hvis den blev indlæst af en tidligere operation) CodeLastResult=Latest result code NbOfEmailsInInbox=Antal e-mails i kildekataloget LoadThirdPartyFromName=Indlæs tredjeparts søgning på %s (kun belastning) LoadThirdPartyFromNameOrCreate=Indlæs tredjepartssøgning på %s (opret hvis ikke fundet) -WithDolTrackingID=Message from a conversation initiated by a first email sent from Dolibarr -WithoutDolTrackingID=Message from a conversation initiated by a first email NOT sent from Dolibarr -WithDolTrackingIDInMsgId=Message sent from Dolibarr -WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr -CreateCandidature=Create candidature +WithDolTrackingID=Besked fra en samtale startet af en første e-mail sendt fra Dolibarr +WithoutDolTrackingID=Besked fra en samtale startet af en første e-mail, der IKKE blev sendt fra Dolibarr +WithDolTrackingIDInMsgId=Besked sendt fra Dolibarr +WithoutDolTrackingIDInMsgId=Besked IKKE sendt fra Dolibarr +CreateCandidature=Opret kandidatur FormatZip=Postnummer MainMenuCode=Menu indtastningskode (hovedmenu) ECMAutoTree=Vis automatisk ECM-træ @@ -2016,7 +2019,7 @@ DisabledResourceLinkContact=Deaktiver funktion for at forbinde en ressource til EnableResourceUsedInEventCheck=Aktivér funktion til at kontrollere, om en ressource er i brug i en begivenhed ConfirmUnactivation=Bekræft modul reset OnMobileOnly=Kun på lille skærm (smartphone) -DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both) +DisableProspectCustomerType=Deaktiver tredjepartstypen "Prospekt + Kunder" (så tredjepart skal være "Prospekt" eller "Kunder", men kan ikke være begge) MAIN_OPTIMIZEFORTEXTBROWSER=Forenkle brugergrænsefladen til blindperson MAIN_OPTIMIZEFORTEXTBROWSERDesc=Aktivér denne indstilling, hvis du er blind person, eller hvis du bruger programmet fra en tekstbrowser som Lynx eller Links. MAIN_OPTIMIZEFORCOLORBLIND=Skift interfacefarve til farveblind person @@ -2038,15 +2041,15 @@ UseDebugBar=Brug fejlfindingslinjen DEBUGBAR_LOGS_LINES_NUMBER=Antal sidste loglinjer, der skal holdes i konsollen WarningValueHigherSlowsDramaticalyOutput=Advarsel, højere værdier bremser dramatisk output ModuleActivated=Modul %s er aktiveret og forsinker grænsefladen -IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s. -AntivirusEnabledOnUpload=Antivirus enabled on uploaded files +IfYouAreOnAProductionSetThis=Hvis du er i et produktionsmiljø, skal du indstille denne egenskab til %s. +AntivirusEnabledOnUpload=Antivirus aktiveret på uploadede filer EXPORTS_SHARE_MODELS=Eksportmodeller deles med alle ExportSetup=Opsætning af modul Eksport ImportSetup=Opsætning af modul til import InstanceUniqueID=Forekomstets unikke ID SmallerThan=Mindre end LargerThan=Større end -IfTrackingIDFoundEventWillBeLinked=Note that If a tracking ID of an object is found into email, or if the email is an answer of an email aready collected and linked to an object, the created event will be automatically linked to the known related object. +IfTrackingIDFoundEventWillBeLinked=Bemærk, at hvis et sporings-id for et objekt findes i e-mailen, eller hvis e-mailen er et svar fra en e-mail-område, der er indsamlet og linket til et objekt, vil den oprettede begivenhed automatisk blive linket til det kendte relaterede objekt. WithGMailYouCanCreateADedicatedPassword=Hvis du aktiverer valideringen af 2 trin med en GMail konto, anbefales det at oprette en dedikeret anden adgangskode til applikationen i stedet for at bruge dit eget kontos kodeord fra https://myaccount.google.com/. EmailCollectorTargetDir=Det kan være en ønsket opførsel at flytte e-mailen til et andet tag/bibliotek, når den blev behandlet med succes. Angiv blot navnet på kataloget her for at bruge denne funktion (Brug IKKE specialtegn i navnet). Bemærk, at du også skal bruge en læse/skrive logind konto. EmailCollectorLoadThirdPartyHelp=Du kan bruge denne handling til at bruge e-mail-indholdet til at finde og indlæse en eksisterende tredjepart i din database. Den fundne (eller oprettede) tredjepart bruges til følgende handlinger, der har brug for det. I parameterfeltet kan du bruge f.eks. 'UDTAGELSE: KROPP: Navn: \\ s ([^ \\ s] *)', hvis du vil udpakke navnet på tredjeparten fra en streng 'Navn: navn for at finde' fundet i legeme. @@ -2070,13 +2073,13 @@ RssNote=Bemærk: Hver RSS-feed-definition indeholder en widget, som du skal akti JumpToBoxes=Gå til Opsætning -> Widgets MeasuringUnitTypeDesc=Brug her en værdi som "størrelse", "overflade", "volumen", "vægt", "tid" MeasuringScaleDesc=Skalaen er antallet af steder, du skal flytte decimaldelen for at matche standardreferenceenheden. For "tid" -enhedstype er det antallet af sekunder. Værdier mellem 80 og 99 er reserverede værdier. -TemplateAdded=Template added -TemplateUpdated=Template updated -TemplateDeleted=Template deleted -MailToSendEventPush=Event reminder email -SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security +TemplateAdded=Skabelon tilføjet +TemplateUpdated=Skabelonen opdateret +TemplateDeleted=Skabelonen blev slettet +MailToSendEventPush=E-mail om påmindelse om begivenhed +SwitchThisForABetterSecurity=Det anbefales at skifte denne værdi til %s for mere sikkerhed DictionaryProductNature= Produktets art -CountryIfSpecificToOneCountry=Country (if specific to a given country) -YouMayFindSecurityAdviceHere=You may find security advisory here -ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it. -ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment. +CountryIfSpecificToOneCountry=Land (hvis det er specifikt for et givet land) +YouMayFindSecurityAdviceHere=Du kan finde sikkerhedsrådgivning her +ModuleActivatedMayExposeInformation=Dette modul kan udsætte følsomme data. Hvis du ikke har brug for det, skal du deaktivere det. +ModuleActivatedDoNotUseInProduction=Et modul designet til udviklingen er blevet aktiveret. Aktivér det ikke i et produktionsmiljø. diff --git a/htdocs/langs/da_DK/banks.lang b/htdocs/langs/da_DK/banks.lang index 81e842e525c..add4d042a86 100644 --- a/htdocs/langs/da_DK/banks.lang +++ b/htdocs/langs/da_DK/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Diverse betalinger VariousPayments=Diverse betalinger ShowVariousPayment=Vis diverse betalinger AddVariousPayment=Tilføj diverse betalinger +VariousPaymentId=Diverse betalings-id +VariousPaymentLabel=Diverse betalingsetiketter +ConfirmCloneVariousPayment=Bekræft klonen for en anden betaling SEPAMandate=SEPA mandat YourSEPAMandate=Dit SEPA mandat FindYourSEPAMandate=Dette er dit SEPA-mandat til at give vores firma tilladelse til at foretage en direkte debitering til din bank. Ret det underskrevet (scan af det underskrevne dokument) eller send det pr. Mail til @@ -176,3 +179,4 @@ BankColorizeMovement=Farvelæg bevægelser BankColorizeMovementDesc=Hvis denne funktion er aktiveret, kan du vælge specifik baggrundsfarve til debet- eller kreditbevægelser BankColorizeMovementName1=Baggrundsfarve til debetbevægelse BankColorizeMovementName2=Baggrundsfarve til kreditbevægelse +IfYouDontReconcileDisableProperty=Hvis du ikke foretager bankafstemninger på nogle bankkonti, skal du deaktivere ejerskab "%s" på dem for at fjerne denne advarsel. diff --git a/htdocs/langs/da_DK/categories.lang b/htdocs/langs/da_DK/categories.lang index fcc87cedca7..18b12b53318 100644 --- a/htdocs/langs/da_DK/categories.lang +++ b/htdocs/langs/da_DK/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Tags/kategorier opsætning CategorieRecursiv=Link med forældre tag/kategori automatisk CategorieRecursivHelp=Hvis indstillingen er aktiveret, tilføjes et produkt i en underkategori, tilføjes også produktet til den overordnede kategori. AddProductServiceIntoCategory=Tilføj følgende produkt/tjeneste +AddCustomerIntoCategory=Tildel kategori til kunde +AddSupplierIntoCategory=Tildel kategori til leverandør ShowCategory=Vis tag/kategori ByDefaultInList=Som standard i liste ChooseCategory=Vælg kategori -StocksCategoriesArea=Lager kategorier Område -ActionCommCategoriesArea=Arrangementer Kategorier Område -WebsitePagesCategoriesArea=Område med sidekontainerkategorier +StocksCategoriesArea=Lagerkategorier +ActionCommCategoriesArea=Begivenhedskategorier +WebsitePagesCategoriesArea=Side-containerkategorier UseOrOperatorForCategories=Brug eller operator til kategorier diff --git a/htdocs/langs/da_DK/companies.lang b/htdocs/langs/da_DK/companies.lang index 4757c3ae15e..76b286db769 100644 --- a/htdocs/langs/da_DK/companies.lang +++ b/htdocs/langs/da_DK/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI-nummer ProfId6AT=- ProfId1AU=Prof Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (professionelt ID) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI-nummer ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-nummer ProfId2CH=- ProfId3CH=Prof Id 1 (Federal nummer) ProfId4CH=Prof Id 2 (CVR-nummer) -ProfId5CH=- +ProfId5CH=EORI-nummer ProfId6CH=- ProfId1CL=Prof Id 1 (RUT) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr) ProfId2DE=Prof Id 2 (USt.-Nr) ProfId3DE=Prof Id 3 (Handelsregister-nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI-nummer ProfId6DE=- ProfId1ES=Prof Id 1 (CIF / NIF) ProfId2ES=Prof Id 2 (Social Security Number) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (Collegiate nummer) -ProfId5ES=- +ProfId5ES=EORI-nummer ProfId6ES=- ProfId1FR=Prof Id 1 (SIREN) ProfId2FR=Prof Id 2 (SIRET) ProfId3FR=Prof Id 3 (NAF, gamle APE) ProfId4FR=Prof Id 4 (RCS / RM) -ProfId5FR=Prof Id 5 +ProfId5FR=EORI-nummer ProfId6FR=- ProfId1GB=Prof ID 1 (Registration Number) ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 ProfId4IN=Prof Id 4 ProfId5IN=Prof Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI-nummer ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (erhvervstilladelse) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI-nummer ProfId6LU=- ProfId1MA=Id prof.. 1 (RC) ProfId2MA=Id prof.. 2 (Patente) ProfId3MA=Id prof.. 3 (IF) ProfId4MA=Id prof.. 4 (CNSS) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof Id 1 (RFC). ProfId2MX=Prof Id 2 (R.. P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK Nummer ProfId2NL=- ProfId3NL=- ProfId4NL=- -ProfId5NL=- +ProfId5NL=EORI-nummer ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof ID 2 (Social Security Number) ProfId3PT=Prof Id 3 (CVR-nummer) ProfId4PT=Prof Id 4 (konservatorium) -ProfId5PT=- +ProfId5PT=EORI-nummer ProfId6PT=- ProfId1SN=RC ProfId2SN=Ninea @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Registreringsnummer) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI-nummer ProfId6RO=- ProfId1RU=Prof Id 1 (OGRN) ProfId2RU=Prof Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=Du kan også tjekke manuelt på Europa-Kommissionens websted ErrorVATCheckMS_UNAVAILABLE=Kontrol er ikke muligt. Denne service leveres ikke af medlemsstaten (%s). NorProspectNorCustomer=Ikke mulighedder eller kunde JuridicalStatus=Juridisk enhedstype +Workforce=Arbejdskraft Staff=Medarbejdere ProspectLevelShort=Potentiale ProspectLevel=Kundepotentiale @@ -456,3 +462,8 @@ PaymentTermsSupplier=Betalingsperiode - Leverandør PaymentTypeBoth=Betalingstype - kunde og levendør MulticurrencyUsed=Brug flere valutaer MulticurrencyCurrency=Valuta +InEEC=Europa (EØF) +RestOfEurope=Resten af Europa (EØF) +OutOfEurope=Uden for Europa (EØF) +CurrentOutstandingBillLate=Nuværende udestående regning sent +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Vær forsigtig, afhængigt af dine produktindstillinger, skal du ændre tredjepart, før du tilføjer produktet til POS. diff --git a/htdocs/langs/da_DK/hrm.lang b/htdocs/langs/da_DK/hrm.lang index 2f0207525d3..123e22908c8 100644 --- a/htdocs/langs/da_DK/hrm.lang +++ b/htdocs/langs/da_DK/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job stillinger Employees=Medarbejdere Employee=Employee NewEmployee=Ny medarbejder +ListOfEmployees=Liste over medarbejdere diff --git a/htdocs/langs/da_DK/languages.lang b/htdocs/langs/da_DK/languages.lang index 9a8b424fdfe..e0b80a8963a 100644 --- a/htdocs/langs/da_DK/languages.lang +++ b/htdocs/langs/da_DK/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Spansk (Paraguay) Language_es_PE=Spansk (Peru) Language_es_PR=Spansk (Puerto Rico) +Language_es_US=Spansk (USA) Language_es_UY=Spansk (Uruguay) Language_es_GT=Spansk (Guatemala) Language_es_VE=Spanish (Venezuela) @@ -55,7 +56,7 @@ Language_fr_CM=Fransk (Cameroun) Language_fr_FR=Fransk Language_fr_GA=Fransk (Gabon) Language_fr_NC=Fransk (Ny Kaledonien) -Language_fr_SN=French (Senegal) +Language_fr_SN=Fransk (Senegal) Language_fy_NL=Frisian Language_gl_ES=galicisk Language_he_IL=Hebræisk diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang index 3ca6eed1fa6..b388aeabcdd 100644 --- a/htdocs/langs/da_DK/main.lang +++ b/htdocs/langs/da_DK/main.lang @@ -155,6 +155,7 @@ RemoveLink=Fjern link AddToDraft=Tilføj til udkast Update=Opdatering Close=Luk +CloseAs=Sæt status til CloseBox=Fjern widget fra dit dashboard Confirm=Bekræft ConfirmSendCardByMail=Vil du virkelig sende indholdet af dette kort pr. Mail til %s ? @@ -196,6 +197,7 @@ ReOpen=Genåbne Upload=Upload ToLink=Link Select=Vælg +SelectAll=Vælg alle Choose=Vælge Resize=Tilpasse størrelsen ResizeOrCrop=Tilpasse størrelsen eller Beskær @@ -256,6 +258,7 @@ Cards=Kort Card=Kort Now=Nu HourStart=Start time +Deadline=Deadline Date=Dato DateAndHour=Dato og tid DateToday=Dags dato @@ -264,8 +267,10 @@ DateStart=Startdato DateEnd=Slutdato DateCreation=Lavet dato DateCreationShort=Creat. dato +IPCreation=Oprettelse IP DateModification=Ændringsdatoen DateModificationShort=Modif. dato +IPModification=Ændring IP DateLastModification=Seneste ændring dato DateValidation=Bekræftelsesdato DateClosing=Udløbsdato @@ -319,6 +324,7 @@ Morning=Morgen Afternoon=Eftermiddag Quadri=Kvatal MonthOfDay=Måned fra den dato +DaysOfWeek=Ugedage HourShort=T MinuteShort=min Rate=Hyppighed @@ -356,7 +362,7 @@ Amount=Beløb AmountInvoice=Fakturabeløbet AmountInvoiced=Beløb faktureres AmountInvoicedHT=Faktureret beløb (ekskl. Moms) -AmountInvoicedTTC=Amount invoiced (inc. tax) +AmountInvoicedTTC=Faktureret beløb (inkl. Moms) AmountPayment=Indbetalingsbeløb AmountHTShort=Beløb (ekskl.) AmountTTCShort=Beløb (inkl. moms) @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Betalingsbeløb, oprindelig valuta MulticurrencyAmountHT=Beløb (ekskl. Skat), original valuta MulticurrencyAmountTTC=Beløb (inkl. Moms), oprindelig valuta MulticurrencyAmountVAT=Momsbeløb, oprindelige valuta +MulticurrencySubPrice=Beløb subpris multi valuta AmountLT1=Momsbeløb 2 AmountLT2=Momsbeløb 3 AmountLT1ES=Beløb RE @@ -487,6 +494,7 @@ By=Ved From=Fra FromDate=Fra FromLocation=Fra +at=på to=til To=til and=og @@ -509,6 +517,7 @@ Draft=Udkast Drafts=Udkast StatusInterInvoiced=faktureret Validated=Godkendt +ValidatedToProduce=Valideret (til produktion) Opened=Åben OpenAll=Åben (alle) ClosedAll=Lukket (Alle) @@ -655,6 +664,7 @@ Response=Responds Priority=Prioritet SendByMail=Send via email MailSentBy=Email sendt fra +NotSent=Ikke sendt TextUsedInTheMessageBody=Email indhold SendAcknowledgementByMail=Send bekræftelses Email SendMail=Send Email @@ -688,7 +698,7 @@ Method=Metode Receive=Modtag CompleteOrNoMoreReceptionExpected=Komplet eller intet mere at forvente ExpectedValue=Forventet værdi -ExpectedQty=Expected Qty +ExpectedQty=Forventet antal PartialWoman=Delvis TotalWoman=I alt NeverReceived=Aldrig modtaget @@ -836,6 +846,7 @@ ListOfTemplates=Liste over skabeloner Gender=Køn Genderman=Mand Genderwoman=Kvinde +Genderother=Andre ViewList=Vis liste ViewGantt=Gentt udsigt ViewKanban=Kanban udsigt @@ -877,6 +888,8 @@ Miscellaneous=Diverse Calendar=Kalender GroupBy=Gruppér efter ViewFlatList=Se flad liste +ViewAccountList=Vis hovedbog +ViewSubAccountList=Se underkonto hovedbog RemoveString=Fjern streng '%s' SomeTranslationAreUncomplete=Nogle af de sprog, der tilbydes, kan kun oversættes eller måske indeholde fejl. Hjælp venligst med at korrigere dit sprog ved at registrere dig på https://transifex.com/projects/p/dolibarr/ at tilføje dine forbedringer. DirectDownloadLink=Direkte download link (offentlig/ekstern) @@ -945,39 +958,39 @@ ShortThursday=T ShortFriday=F ShortSaturday=L ShortSunday=S -one=one -two=two -three=three -four=four -five=five -six=six -seven=seven -eight=eight -nine=nine -ten=ten -eleven=eleven -twelve=twelve -thirteen=thirdteen -fourteen=fourteen -fifteen=fifteen -sixteen=sixteen -seventeen=seventeen -eighteen=eighteen -nineteen=nineteen -twenty=twenty -thirty=thirty -forty=forty -fifty=fifty -sixty=sixty -seventy=seventy -eighty=eighty -ninety=ninety -hundred=hundred -thousand=thousand +one=en +two=to +three=tre +four=fire +five=fem +six=seks +seven=syv +eight=otte +nine=ni +ten=ti +eleven=elleve +twelve=tolv +thirteen=tretten +fourteen=fjorten +fifteen=femten +sixteen=seksten +seventeen=sytten +eighteen=atten +nineteen=nitten +twenty=tyve +thirty=tredive +forty=fyrre +fifty=halvtreds +sixty=tres +seventy=halvfjerds +eighty=firs +ninety=halvfems +hundred=hundrede +thousand=tusind million=million -billion=billion -trillion=trillion -quadrillion=quadrillion +billion=milliard +trillion=billioner +quadrillion=kvadrillion SelectMailModel=Vælg en Email-skabelon SetRef=Sæt ref. Select2ResultFoundUseArrows=Nogle resultater fundet. Brug pilene til at vælge. @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Kundeforsendelser SearchIntoExpenseReports=Udgiftsrapporter SearchIntoLeaves=Forlade SearchIntoTickets=Opgaver +SearchIntoCustomerPayments=Kundebetalinger +SearchIntoVendorPayments=Leverandørbetalinger +SearchIntoMiscPayments=Diverse betalinger CommentLink=Kommentarer NbComments=Antal kommentarer CommentPage=Kommentarer plads @@ -1076,10 +1092,18 @@ NotUsedForThisCustomer=Ikke brugt til denne kunde AmountMustBePositive=Beløbet skal være positivt ByStatus=Efter status InformationMessage=Information -Used=Used -ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create -MODIFYInDolibarr=Record %s modified -DELETEInDolibarr=Record %s deleted -VALIDATEInDolibarr=Record %s validated -APPROVEDInDolibarr=Record %s approved +Used=Brugt +ASAP=Så hurtigt som muligt +CREATEInDolibarr=Optag %s oprettet +MODIFYInDolibarr=Optag %s ændret +DELETEInDolibarr=Optagelse %s slettet +VALIDATEInDolibarr=Optag %s valideret +APPROVEDInDolibarr=Optag %s godkendt +DefaultMailModel=Standard mail model +PublicVendorName=Sælgers offentlige navn +DateOfBirth=Dato for fødsel +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Sikkerhedstoken er udløbet, så handlingen er annulleret. Prøv igen. +UpToDate=Opdateret +OutOfDate=Umoderne +EventReminder=Påmindelse om begivenhed +UpdateForAllLines=Opdatering til alle linjer diff --git a/htdocs/langs/da_DK/mrp.lang b/htdocs/langs/da_DK/mrp.lang index e53f08f50f7..063976415c0 100644 --- a/htdocs/langs/da_DK/mrp.lang +++ b/htdocs/langs/da_DK/mrp.lang @@ -1,6 +1,6 @@ Mrp=Fremstillingsordrer -MOs=Manufacturing orders -ManufacturingOrder=Manufacturing Order +MOs=Produktionsordrer +ManufacturingOrder=Produktionsordre MRPDescription=Modul til styring af produktions- og produktionsordrer (MO). MRPArea=MRP-område MrpSetupPage=Opsætning af modul MRP @@ -76,4 +76,5 @@ ProductsToProduce=Produkter til at producere UnitCost=Enhedspris TotalCost=Udgifter i alt BOMTotalCost=Omkostningerne til at fremstille denne BOM baseret på prisen for hver mængde og produkt, der skal forbruges (brug Prisen, hvis defineret, ellers Gennemsnit Vægtet pris, hvis defineret, ellers den bedste købspris) -GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +GoOnTabProductionToProduceFirst=Du skal først have startet produktionen for at lukke en produktionsordre (se fanen '%s'). Men du kan annullere det. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=Et sæt kan ikke bruges i en stykliste eller en MO diff --git a/htdocs/langs/da_DK/website.lang b/htdocs/langs/da_DK/website.lang index eda2f0c760c..35d95b5bc5e 100644 --- a/htdocs/langs/da_DK/website.lang +++ b/htdocs/langs/da_DK/website.lang @@ -31,7 +31,7 @@ AddWebsite=Tilføj hjemmeside Webpage=Webside / container AddPage=Tilføj side / container HomePage=Hjemmeside -PageContainer=Side / beholder +PageContainer=Side PreviewOfSiteNotYetAvailable=Forhåndsvisning af dit websted %s endnu ikke tilgængeligt. Du skal først Importer en fuld hjemmeside skabelon 'eller bare Tilføj en side / container '. RequestedPageHasNoContentYet=Den ønskede side med id %s har intet indhold endnu, eller cache-filen .tpl.php blev fjernet. Rediger indholdet på siden for at løse dette. SiteDeleted=Webstedet '%s' slettet @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Udskiftning udført i %s sider eller containere RSSFeed=RSS Feed RSSFeedDesc=Du kan få et RSS-feed af de nyeste artikler med typen 'blogpost' ved hjælp af denne URL PagesRegenerated=%sside (r) / container (r) regenereret +RegenerateWebsiteContent=Genopret cache-filer på webstedet +AllowedInFrames=Tilladt i rammer diff --git a/htdocs/langs/de_AT/main.lang b/htdocs/langs/de_AT/main.lang index 124392e3512..b00bc342fde 100644 --- a/htdocs/langs/de_AT/main.lang +++ b/htdocs/langs/de_AT/main.lang @@ -84,3 +84,4 @@ Events=Termine SearchIntoContacts=Kontakt SearchIntoInterventions=Eingriffe AssignedTo=zugewisen an +DateOfBirth=Geburtstdatum diff --git a/htdocs/langs/de_CH/accountancy.lang b/htdocs/langs/de_CH/accountancy.lang index 1ee50a1a423..afe0da5d99f 100644 --- a/htdocs/langs/de_CH/accountancy.lang +++ b/htdocs/langs/de_CH/accountancy.lang @@ -15,7 +15,6 @@ DefaultForService=Standard für Leistungen DefaultForProduct=Standard für Produkte CantSuggest=Ich habe keinen Vorschlag AccountancySetupDoneFromAccountancyMenu=Die meisten Einstellungen der Buchhaltung setzt du im Menu %s -ConfigAccountingExpert=Einstellungen des erweiterten Buchhaltungsmoduls Journalization=Journalisierung JournalFinancial=Finanzjournal BackToChartofaccounts=Zeige Kontenrahmen @@ -27,8 +26,6 @@ OverviewOfAmountOfLinesNotBound=Positionen ohne Verknüpfung zu einem Buchhaltun OverviewOfAmountOfLinesBound=Positionen mit Verknüpfung zu einem Buchhaltungskonto OtherInfo=Weitere Informationen ConfirmDeleteCptCategory=Möchten Sie dieses Konto wirklich aus der Kontogruppe entfernen? -AlreadyInGeneralLedger=Bereits im Hauptbuch eingetragen -NotYetInGeneralLedger=Nicht im Hauptbuch eingetragen GroupIsEmptyCheckSetup=Das Feld Gruppe ist leer, bitte prüfe die Einstellungen deiner Kontengruppen. DetailByAccount=Zeige Details nach Konto geordnet AccountWithNonZeroValues=Konten mit Werten > 0 @@ -37,7 +34,6 @@ CountriesInEEC=EWR - Staaten CountriesNotInEEC=Nicht EWR - Staaten CountriesInEECExceptMe=Länder im EWR ausser %s CountriesExceptMe=Alle Staaten, ausser %s -AccountantFiles=Buchhaltungsbelege exportieren MainAccountForCustomersNotDefined=Es ist kein kein Buchhaltungskonto für Kunden eingerichtet. MainAccountForSuppliersNotDefined=Es ist kein kein Buchhaltungskonto für Anbieter eingerichtet. MainAccountForUsersNotDefined=Es ist kein kein Buchhaltungskonto für Kontakte eingerichtet. @@ -64,7 +60,6 @@ AccountancyAreaDescBind=Schritt %s: Prüfe die Verknüpfungen von %s mit passend AccountancyAreaDescWriteRecords=Schritt %s: Lass alle Transaktionen ins Hauptbuch übertragen. Wechsle dazu in das Menu %s, und Klicke auf %s. AccountancyAreaDescAnalyze=Schritt %s: Erzeuge oder ergänze Transaktionen für Berichte und Exporte. AccountancyAreaDescClosePeriod=Schritt %s: Schliesse eine Geschäftsperiode ab, damit Sie nicht mehr abgeändert werden kann. -TheJournalCodeIsNotDefinedOnSomeBankAccount=Hoppla - nicht alle Bankkonten haben ein Buchhaltungskonto zugewiesen - bitte korrigiere das so: Selectchartofaccounts=Wähle deinen Kontenrahmen. ChangeAndLoad=Lade und ersetze Addanaccount=Buchhaltungskonto hinzüfügen @@ -88,7 +83,6 @@ ExpenseReportsVentilation=Verknüpfung für Spesenabrechnungen CreateMvts=Neue Transaktion UpdateMvts=Transaktion bearbeiten ValidTransaction=Transaktion freigeben -WriteBookKeeping=Transaktionen im Hauptbuch eintragen AccountBalance=Saldo ObjectsRef=Referenz des Quellobjektes CAHTF=Einkaufsaufwand von Steuern @@ -151,15 +145,11 @@ ByAccounts=Nach Konto ByPredefinedAccountGroups=Nach Gruppe ByPersonalizedAccountGroups=Nach eigenen Gruppen NotMatch=Nicht hinterlegt -DeleteMvt=Hauptbucheinträge löschen DelMonth=Zu löschender Monat DelYear=Zu löschendes Jahr DelJournal=Zu löschendes Journal -ConfirmDeleteMvt=Hier kannst du alle Hauptbucheinträge des gewählten Jahres (Monates) und/oder für einzelne Journale löschen. Gib mindestens eines von beidem an.\nDie gelöschten Eintrage kannst du danach wieder über die Zuweisungsfunktionen ins Hauptbuch eintragen. -ConfirmDeleteMvtPartial=Hier kannst du die Transaktion im Hauptbuch löschen. Alle zugehörigen Positionen werden ebenfalls entfernt. ExpenseReportsJournal=Spesenabrechnungs - Journal DescFinanceJournal=Finanzjournal mit allen Zahlungsarten nach Konto. -DescJournalOnlyBindedVisible=Du siehst hier alle mit einem Buchhaltungskonto verbundenen Journaleinträge. Diese kannst du im Hauptbuch eintragen. VATAccountNotDefined=Leider ist kein MWST - Konto definiert. ThirdpartyAccountNotDefined=Leider ist kein Partner definiert. ProductAccountNotDefined=Leider ist kein Konto für das Produkt definiert. diff --git a/htdocs/langs/de_CH/admin.lang b/htdocs/langs/de_CH/admin.lang index 4236a059fc4..951b6e8c534 100644 --- a/htdocs/langs/de_CH/admin.lang +++ b/htdocs/langs/de_CH/admin.lang @@ -483,13 +483,11 @@ NotificationSetup=E-Mail Benachrichtigunen konfigurieren NotificationEMailFrom=Absender E-Mail (From:) des Benachrichtigungsmoduls SendingsSetup=Modul Versand einrichten FCKeditorForCompany=WYSIWIG Erstellung/Bearbeitung der Firmennformationen und Notizen (ausser Produkte/Services) -FCKeditorForProductDetails=Freihand - Editor für Produkte und alle Objekte.Obacht: Das kann für die PDF - Generierung grosse Probleme in Layout und Satz bedeuten! - Für diesen Fall bitte nicht verwenden. FCKeditorForMail=WYSIWYG Erstellung/Bearbeitung für gesamte Mail (ausser Werkzeuge->Massenmaling) StockSetup=Modul Lagerverwaltung einrichten DetailTitre=Menübezeichner oder Bezeichnungs-Code für Übersetzung DetailLangs=Sprachdateiname für Bezeichnungsübersetzung OptionVatMode=MwSt. fällig -AGENDA_REMINDER_EMAIL=E-Mail - Benachrichtigung bei Ereignissen.
Obacht: Dazu muss das Modul '%s' aktiv - und richtig konfiguriert sein. CashDeskSetup=Modul Kasse (POS) einrichten BookmarkSetup=Lesezeichenmoduleinstellungen ApiSetup=API-Modul-Setup diff --git a/htdocs/langs/de_CH/companies.lang b/htdocs/langs/de_CH/companies.lang index 7c223ea0544..552d590f169 100644 --- a/htdocs/langs/de_CH/companies.lang +++ b/htdocs/langs/de_CH/companies.lang @@ -61,7 +61,6 @@ ProfId1BE=Prof Id 1 (Anzahl Professionnel) ProfId1BR=CNPJ ProfId2BR=IE (Staatliche Behörde) ProfId3BR=IM (kommunale Behörde) -ProfId1CH=- ProfId3CH=Prof Id 1 (Bundes-Nummer) ProfId4CH=Prof Id 2 (Commercial Record-Nummer) ProfId1DE=Umsatzsteuer-Identifikationsnummer @@ -71,7 +70,6 @@ ProfId2ES=Prof Id 2 (Social Security Number) ProfId4ES=Prof Id 4 (Collegiate Anzahl) ProfId3FR=Prof Id 3 (NAF, alte APE) ProfId4FR=Prof Id 4 (RCS / RM) -ProfId5FR=Prof Id 5 ProfId1GB=Prof Id 1 (Registration Number) ProfId3GB=Prof Id 3 (SIC) ProfId2IN=Prof Id 2 @@ -80,9 +78,7 @@ ProfId1LU=Id prof. 1 (R.C.S. Luxemburg) ProfId2LU=Id. Prof. 2 ProfId3LU=Id. Prof. 3 ProfId4LU=Id. Prof. 4 -ProfId5LU=Id. Prof. 5 ProfId6LU=Id. Prof. 6 -ProfId5MA=Id prof. 5 (C.I.C.E) ProfId4NL=- ProfId2PT=Prof Id 2 (Social Security Number) ProfId3PT=Prof Id 3 (Commercial Record-Nummer) @@ -98,7 +94,7 @@ ProfId6US=Id. Prof. 6 ProfId1RO=Firmennummer CUI ProfId2RO=Firmennummer (Nr. Înmatriculare) ProfId3RO=Firmennummer CAEN -ProfId5RO=Firmennummer EUID +ProfId4RO=Firmennummer EUID ProfId1RU=Prof ID 1 (OGRN) ProfId3DZ=TIN – Steuer-Identifikationsnummer (EU) VATIntra=MWST - Nummer diff --git a/htdocs/langs/de_CH/main.lang b/htdocs/langs/de_CH/main.lang index 3e5caad9224..672bfdcc6f9 100644 --- a/htdocs/langs/de_CH/main.lang +++ b/htdocs/langs/de_CH/main.lang @@ -217,6 +217,7 @@ ExpandAll=Alle ausklappen UndoExpandAll=Ausklappen rückgängig machen SeeAll=Zeige alles an CloseWindow=Fenster schliessen +NotSent=Nicht gesendet SendAcknowledgementByMail=Bestätigungsemail senden SendMail=sende E-Mail NoEMail=Keine E-Mail @@ -332,6 +333,7 @@ SearchIntoInterventions=Arbeitseinsätze SearchIntoCustomerShipments=Kundenlieferungen SearchIntoExpenseReports=Spesenrapporte SearchIntoLeaves=Ferien +SearchIntoVendorPayments=Lieferantenzahlungen NbComments=Anzahl Kommentare CommentPage=Kommentare CommentDeleted=Kommentar entfernt diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang index 296314e7df6..112d1879d15 100644 --- a/htdocs/langs/de_DE/accountancy.lang +++ b/htdocs/langs/de_DE/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Standard für Leistung DefaultForProduct=Standard für Produkt CantSuggest=Kann keines vorschlagen AccountancySetupDoneFromAccountancyMenu=Die wichtigste Teil der Konfiguration der Buchhaltung aus dem Menü %s wurde erledigt -ConfigAccountingExpert=Konfiguration des Experten-Buchhaltungsmoduls +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Journalisieren -Journaux=Journale +Journals=Journale JournalFinancial=Finanzjournale BackToChartofaccounts=Zurück zum Kontenplan Chartofaccounts=Kontenplan +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Aktuelles dediziertes Konto AssignDedicatedAccountingAccount=Neues Konto zuweisen InvoiceLabel=Rechnungsanschrift @@ -33,8 +35,8 @@ OtherInfo=Zusatzinformationen DeleteCptCategory=Buchhaltungskonto aus Gruppe entfernen ConfirmDeleteCptCategory=Soll dieses Buchhaltungskonto wirklich aus der Gruppe entfernt werden? JournalizationInLedgerStatus=Status der Journalisierung -AlreadyInGeneralLedger=Schon ins Hauptbuch übernommen -NotYetInGeneralLedger=Noch nicht ins Hauptbuch übernommen +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Gruppe ist leer, kontrollieren Sie die persönlichen Kontogruppen DetailByAccount=Detail pro Konto zeigen AccountWithNonZeroValues=Konto mit Werten != 0 @@ -43,7 +45,9 @@ CountriesInEEC=EU-Länder CountriesNotInEEC=Nicht-EU Länder CountriesInEECExceptMe=EU-Länder außer %s CountriesExceptMe=Alle Länder außer %s -AccountantFiles=Buchhaltungsdokumente exportieren +AccountantFiles=Belegdokumente exportieren +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=Ansicht nach Buchhaltungskonto MainAccountForCustomersNotDefined=Standardkonto für Kunden im Setup nicht definiert MainAccountForSuppliersNotDefined=Standardkonto für Lieferanten die nicht im Setup definiert sind @@ -79,7 +83,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=Eine erforderliche Einrichtung wurde nicht abgeschlossen. (Kontierungsinformationen fehlen bei einigen Bankkonten) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Aktiven Kontenplan wählen ChangeAndLoad=ändern & laden Addanaccount=Fügen Sie ein Buchhaltungskonto hinzu @@ -89,6 +93,8 @@ SubledgerAccount=Nebenbuchkonto SubledgerAccountLabel=Nebenbuchkonto-Bezeichnung ShowAccountingAccount=Buchhaltungskonten anzeigen ShowAccountingJournal=Buchhaltungsjournal anzeigen +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Buchhaltungskonto Vorschlag MenuDefaultAccounts=Standardkonten MenuBankAccounts=Bankkonten @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Spesenabrechnung Zuordnung CreateMvts=neue Transaktion erstellen UpdateMvts=Änderung einer Transaktion ValidTransaction=Transaktion bestätigen -WriteBookKeeping=Transaktionen ins Hauptbuch übernehmen +WriteBookKeeping=Register transactions in accounting Bookkeeping=Hauptbuch +BookkeepingSubAccount=Nebenbuch AccountBalance=Saldo Sachkonten ObjectsRef=Quellreferenz CAHTF=Gesamtbetrag Lieferant vor Steuern @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Deaktivieren der direkte Aufzeichnung von Transaktion ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Entwurfexport für Journal aktivieren ACCOUNTANCY_COMBO_FOR_AUX=Kombinationsliste für Nebenkonto aktivieren \n(kann langsam sein, wenn Sie viele Geschäftspartner haben) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Verkaufsjournal ACCOUNTING_PURCHASE_JOURNAL=Einkaufsjournal @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Buchhaltungskonto in Wartestellung DONATION_ACCOUNTINGACCOUNT=Buchhaltungskonto für Spenden ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Buchhaltungskonto für Abonnements +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Standard-Buchhaltungskonto für gekaufte Produkte \n(wenn nicht anders im Produktblatt definiert) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Standardmäßig Buchhaltungskonto für die gekauften Produkte in der EU (wird verwendet, wenn nicht im Produktblatt definiert) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Standardmäßig Buchhaltungskonto für die gekauften und aus der EU importierten Produkte (wird verwendet, wenn nicht im Produktblatt definiert) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=Pro vordefinierten Gruppen ByPersonalizedAccountGroups=Pro persönlichen Gruppierung ByYear=pro Jahr NotMatch=undefiniert -DeleteMvt=Zeilen im Hauptbuch löschen +DeleteMvt=Delete some operation lines from accounting DelMonth=Monat zum Löschen DelYear=Jahr zu entfernen DelJournal=Journal zu entfernen -ConfirmDeleteMvt=Dadurch werden alle Zeilen des Hauptbuchs für das Jahr / den Monat und / oder aus einem bestimmten Journal gelöscht (mindestens ein Kriterium ist erforderlich). Sie müssen die Funktion "Registrierung in der Buchhaltung" erneut verwenden, um den gelöschten Datensatz wieder im Hauptbuch zu haben. -ConfirmDeleteMvtPartial=Die Buchung wird aus dem Hauptbuch gelöscht (Alle Einträge aus dieser Buchung werden gelöscht) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Finanzjournal ExpenseReportsJournal=Spesenabrechnungsjournal DescFinanceJournal=Finanzjournal inklusive aller Arten von Zahlungen mit Bankkonto -DescJournalOnlyBindedVisible=Ansicht der Datensätze, die an Buchhaltungskonto gebunden sind und in das Hauptbuch übernommen werden können. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Steuerkonto nicht definiert ThirdpartyAccountNotDefined=Konto für Geschäftspartner nicht definiert ProductAccountNotDefined=Konto für Produkt nicht definiert @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=Dieses Journal wird bereits verwendet AccountingAccountForSalesTaxAreDefinedInto=Hinweis: Buchaltungskonten für Steuern sind im Menü %s - %s definiert NumberOfAccountancyEntries=Anzahl der Einträge NumberOfAccountancyMovements=Anzahl der Bewegungen +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Entwurfsjournal exportieren @@ -326,6 +339,8 @@ Modelcsv_configurable=konfigurierbarer CSV-Export Modelcsv_FEC=Export nach FEC Modelcsv_Sage50_Swiss=Export für Sage 50 (Schweiz) Modelcsv_winfic=Exportiere Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Kontenplan ID ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang index 646298d512a..7af899574d9 100644 --- a/htdocs/langs/de_DE/admin.lang +++ b/htdocs/langs/de_DE/admin.lang @@ -37,8 +37,8 @@ UnlockNewSessions=Sperrung neuer Sitzungen aufheben YourSession=Ihre Sitzung Sessions=Benutzersitzungen WebUserGroup=WebServer Benutzer/Gruppen -PermissionsOnFilesInWebRoot=Permissions on files in web root directory -PermissionsOnFile=Permissions on file %s +PermissionsOnFilesInWebRoot=Berechtigungen für Dateien im Stammverzeichnis Web +PermissionsOnFile=Berechtigungen für die Datei %s NoSessionFound=Ihre PHP -Konfiguration scheint keine Auflistung aktiver Sitzungen zuzulassen. Eventuell ist die Speicherung im Verzeichnis (%s) durch fehlende Berechtigungen blockiert (zum Beispiel: Betriebssystemberechtigungen oder open_basedir-Beschränkungen). DBStoringCharset=Zeichensatz der Datenbank-Speicherung DBSortingCharset=Datenbank-Zeichensatz zum Sortieren von Daten @@ -82,7 +82,7 @@ AllowToSelectProjectFromOtherCompany=Bei den Elementen eines Partners, ist es m JavascriptDisabled=JavaScript deaktiviert UsePreviewTabs=Vorschau-Tabs verwenden ShowPreview=Vorschau anzeigen -ShowHideDetails=Show-Hide details +ShowHideDetails=Details ein-/ausblenden PreviewNotAvailable=Vorschau nicht verfügbar ThemeCurrentlyActive=derzeit aktivierte grafische Oberfläche CurrentTimeZone=Aktuelle Zeitzone des PHP-Servers @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP Komponente %s ist geladen PreloadOPCode=Vorgeladener OPCode wird verwendet AddRefInList=Anzeigen der Info-Liste mit Kunden- / Lieferantenreferenz (Auswahlliste oder Combobox) und die meisten Hyperlinks.
Drittanbieter werden mit dem Namensformat "CC12345 - SC45678 - The Big Company corp." anstelle von "The Big Company corp" angezeigt. AddAdressInList=Anzeigen der Info-Liste mit Kunden- / Lieferantenadressen (Auswahlliste oder Kombinationsfeld)
Dritte werden mit dem Namensformat "The Big Company Corp. - 21 jump street 123456 Big Town - USA" anstelle von "The Big Company Corp." angezeigt. +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Nach der bevorzugten Versandart für Drittanbieter fragen. FieldEdition=Bearbeitung von Feld %s FillThisOnlyIfRequired=Beispiel: +2 (nur ausfüllen, wenn Sie Probleme mit der Zeitzone haben) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Für das Anlegen eines neuen Mitglieds ist eine E-Mail-Adre MemberSendInformationByMailByDefault=Das Kontrollkästchen für den automatischen Versand einer E-Mail-Bestätigung an Mitglieder (bei Freigabe oder neuem Abonnement) ist standardmäßig aktiviert VisitorCanChooseItsPaymentMode=Der Besucher kann aus verschiedenen Zahlungsmethoden auswählen MEMBER_REMINDER_EMAIL=Aktivieren Sie die automatische Erinnerung per E-Mail an abgelaufene Abonnements. Hinweis: Das Modul %s muss aktiviert und ordnungsgemäß eingerichtet sein, damit Erinnerungen gesendet werden können. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=LDAP-Einstellungen LDAPGlobalParameters=Globale LDAP-Parameter @@ -1670,7 +1672,7 @@ AdvancedEditor=Erweiterter Editor ActivateFCKeditor=FCKEditor aktivieren für: FCKeditorForCompany=WYSIWIG Erstellung/Bearbeitung der Partnerinformationen und Notizen FCKeditorForProduct=WYSIWIG Erstellung/Bearbeitung von Produkt-/Serviceinformationen und Notizen -FCKeditorForProductDetails=WYSIWG Erstellung/Bearbeitung der Produktdetails für alle Dokumente( Angebote, Bestellungen, Rechnungen etc...) Achtung: Die Option führt potentiell zu Problemen mit Umlauten und Sonderzeichen und wird daher nicht empfohlen. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG Erstellung/Bearbeitung von E-Mails FCKeditorForUserSignature=WYSIWIG Erstellung/Bearbeitung von Benutzer-Signaturen FCKeditorForMail=WYSIWYG-Erstellung/Bearbeitung für alle E-Mails (außer Werkzeuge->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Diesen Standardwert automatisch als Ereignistyp im AGENDA_DEFAULT_FILTER_TYPE=Diesen Ereignisstatus automatisch in den Suchfilter für die Agenda-Ansicht übernehmen AGENDA_DEFAULT_FILTER_STATUS=Diesen Ereignisstatus automatisch in den Suchfilter für die Agenda-Ansicht übernehmen AGENDA_DEFAULT_VIEW=Welche Standardansicht soll geöffnet werden, wenn das Menü 'Agenda' geöffnet wird -AGENDA_REMINDER_EMAIL=Aktiviere Terminbenachrichtigungen via E-Mail (Die Benachrichtigungszeit/Frequenz kann auf dem jeweiligen Termin eingestellt werden). Info: Modul %s muss aktiviert und richtig konfiguriert sein, damit die Erinnerungen korrekt versendet werden können. -AGENDA_REMINDER_BROWSER=Ereigniserinnerung aktivieren im Browser des Benutzers (Wenn das Ereignisdatum erreicht ist, kann jeder Benutzer dies in der Frage zur Browserbestätigung ablehnen.) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Aktiviere Tonbenachrichtigung +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Verknüpfte Objekte in Agenda anzeigen ##### Clicktodial ##### ClickToDialSetup=Click-to-Dial Moduleinstellungen @@ -2016,7 +2019,7 @@ DisabledResourceLinkContact=Funktion zum deaktivieren, dass eine Resource mit Ko EnableResourceUsedInEventCheck=Aktivieren Sie diese Funktion, um zu überprüfen, ob eine Ressource in einem Ereignis verwendet wird ConfirmUnactivation=Modul zurücksetzen bestätigen OnMobileOnly=Nur auf kleinen Bildschirmen (Smartphones) -DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both) +DisableProspectCustomerType=Deaktivieren Sie den Drittanbieter-Typ "Interessent + Kunde" (d.h. der Drittanbieter muss "Interessent" oder "Kunde" sein, kann aber nicht beides sein). MAIN_OPTIMIZEFORTEXTBROWSER=Vereinfachte Benutzeroberfläche für Blinde MAIN_OPTIMIZEFORTEXTBROWSERDesc=Aktivieren Sie diese Option, wenn Sie eine blinde Person sind, oder wenn Sie die Anwendung über einen Textbrowser wie Lynx oder Links verwenden. MAIN_OPTIMIZEFORCOLORBLIND=Farben der Benutzeroberfläche für Farbenblinde ändern. @@ -2038,8 +2041,8 @@ UseDebugBar=Verwenden Sie die Debug Leiste DEBUGBAR_LOGS_LINES_NUMBER=Zahl der letzten Protokollzeilen, die in der Konsole verbleiben sollen WarningValueHigherSlowsDramaticalyOutput=Warnung, höhere Werte verlangsamen die Ausgabe erheblich. ModuleActivated=Modul %s is aktiviert und verlangsamt die Overfläche -IfYouAreOnAProductionSetThis=If you are on a production environment, you should set this property to %s. -AntivirusEnabledOnUpload=Antivirus enabled on uploaded files +IfYouAreOnAProductionSetThis=Wenn Sie sich in einer Produktionsumgebung befinden, sollten Sie diese Eigenschaft auf %s setzen. +AntivirusEnabledOnUpload=Antivirus für hochgeladene Dateien aktiviert EXPORTS_SHARE_MODELS=Exportmodelle sind für jeden zugänglich. ExportSetup=Einrichtung Modul Export ImportSetup=Einrichtung des Modulimports @@ -2077,6 +2080,6 @@ MailToSendEventPush=Ereigniserinnerungs-E-Mail SwitchThisForABetterSecurity=Das Ändern dieses Werts auf %s wird aus Sicherheitsgründen empfohlen DictionaryProductNature= Art des Produkts CountryIfSpecificToOneCountry=Land (falls spezifisch für ein bestimmtes Land) -YouMayFindSecurityAdviceHere=You may find security advisory here -ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it. -ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment. +YouMayFindSecurityAdviceHere=Hier finden Sie Sicherheitshinweise +ModuleActivatedMayExposeInformation=Dieses Modul kann vertrauliche Daten verfügbar machen. Wenn Sie es nicht benötigen, deaktivieren Sie es. +ModuleActivatedDoNotUseInProduction=Ein für die Entwicklung entwickeltes Modul wurde aktiviert. Aktivieren Sie es nicht in einer Produktionsumgebung. diff --git a/htdocs/langs/de_DE/banks.lang b/htdocs/langs/de_DE/banks.lang index d5b6a615c64..a5c59fe2608 100644 --- a/htdocs/langs/de_DE/banks.lang +++ b/htdocs/langs/de_DE/banks.lang @@ -179,3 +179,4 @@ BankColorizeMovement=Bewegungen färben BankColorizeMovementDesc=Wenn diese Funktion aktiviert ist, können Sie eine bestimmte Hintergrundfarbe für Debit- oder Kreditbewegungen auswählen BankColorizeMovementName1=Hintergrundfarbe für Debit-Bewegung BankColorizeMovementName2=Hintergrundfarbe für Kredit-Bewegung +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/de_DE/categories.lang b/htdocs/langs/de_DE/categories.lang index 5b48f9de69a..c8fc85f28c9 100644 --- a/htdocs/langs/de_DE/categories.lang +++ b/htdocs/langs/de_DE/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Kategorie-Einstellungen CategorieRecursiv=Automatisch mit übergeordneter Kategorie verbinden CategorieRecursivHelp=Wenn die Option aktiviert ist, wird beim Hinzufügen eines Produkts zu einer Unterkategorie das Produkt auch automatisch zur übergeordneten Kategorie hinzugefügt. AddProductServiceIntoCategory=Folgendes Produkt / folgende Leistung dieser Kategorie hinzufügen: +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Zeige Kategorie ByDefaultInList=Standardwert in Liste ChooseCategory=Kategorie auswählen -StocksCategoriesArea=Bereich Lagerort-Kategorien -ActionCommCategoriesArea=Bereich Ereignis-Kategorien -WebsitePagesCategoriesArea=Bereich für Seitencontainer-Kategorien +StocksCategoriesArea=Lagerort-Kategorien +ActionCommCategoriesArea=Ereignis-Kategorien +WebsitePagesCategoriesArea=Seiteninhalte-Kategorien UseOrOperatorForCategories=Benutzer oder Operator für Kategorien diff --git a/htdocs/langs/de_DE/companies.lang b/htdocs/langs/de_DE/companies.lang index b0f0cfcc15a..f8bad6b3a9e 100644 --- a/htdocs/langs/de_DE/companies.lang +++ b/htdocs/langs/de_DE/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Steuernummer (Finanzamt) ProfId2AT=Gerichtsstand ProfId3AT=Firmenbuchnummer ProfId4AT=DVR-Nummer -ProfId5AT=- +ProfId5AT=EORI-Nummer ProfId6AT=- ProfId1AU=Prof ID 1 ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof ID 1 ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI-Nummer ProfId6BE=- ProfId1BR=- ProfId2BR=Bundes-/Landesbehörde @@ -144,11 +144,11 @@ ProfId3BR=Kommunalbehörde ProfId4BR=Bildungsgutschein #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=UID-Nummer (Nummer des Finanzamt für juristische Personen) +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof Id 1 (Federal number) ProfId4CH=Prof Id 2 (Commercial Record number) -ProfId5CH=- +ProfId5CH=EORI-Nummer ProfId6CH=- ProfId1CL=Prof Id 1 (R.U.T.) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Steuernummer ProfId2DE=Amtsgericht ProfId3DE=Handelsregister-Nummer ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI-Nummer ProfId6DE=- ProfId1ES=NIF (Frankreich): Numéro d'identification fiscale\nCIF (Spanien): Código de identificación fiscal ProfId2ES=Sozialversicherungsnummer ProfId3ES=Klassifikation der Wirtschaftszweige ProfId4ES=Stiftungsverzeichnis -ProfId5ES=- +ProfId5ES=EORI-Nummer ProfId6ES=- ProfId1FR=SIREN (Frankreich): Système d'identification du répertoire des entreprises ProfId2FR=SIRET (Frankreich): Système d’identification du répertoire des établissements ProfId3FR=NAF (Frankreich): Statistik-Code ProfId4FR=RCS (Frankreich): Registre du Commerce et des Sociétés\n(hier: Code im Handels- und Firmenregister) -ProfId5FR=- +ProfId5FR=EORI-Nummer ProfId6FR=- ProfId1GB=Registration Number ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX) ProfId4IN=Prof ID 4 ProfId5IN=Prof ID 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI-Nummer ProfId1LU=R.C.S. Luxemburg ProfId2LU=Prof ID 2 (Gewerbe-Erlaubnis) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI-Nummer ProfId6LU=- ProfId1MA=Prof ID 1 (R.C.) ProfId2MA=Prof ID 2 ProfId3MA=Prof ID 3 ProfId4MA=Prof ID 4 -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof Id 1 (R.F.C). ProfId2MX=Prof Id 2 (R..P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=Prof ID 1 KVK (Handelsregister-Nummer) ProfId2NL=- ProfId3NL=- ProfId4NL=Prof ID 2 BSN (Bürgerservicenummer) -ProfId5NL=- +ProfId5NL=EORI-Nummer ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof Id 2 (Social security number) ProfId3PT=Prof ID 3 ProfId4PT=Prof Id 4 (Conservatory) -ProfId5PT=- +ProfId5PT=EORI-Nummer ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI-Nummer ProfId6RO=- ProfId1RU=OGRN ProfId2RU=INN @@ -461,4 +466,4 @@ InEEC=Europa (EU / EWG) RestOfEurope=übriges Europa (EU / EWG) OutOfEurope=außerhalb Europas (EU / EWG) CurrentOutstandingBillLate=Offene Posten -BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Seien Sie vorsichtig: Abhängig von Ihren Produktpreiseinstellungen sollten Sie den Drittanbieter wechseln, bevor Sie das Produkt zum POS hinzufügen. diff --git a/htdocs/langs/de_DE/hrm.lang b/htdocs/langs/de_DE/hrm.lang index dcfae812e33..c3bf5170ae6 100644 --- a/htdocs/langs/de_DE/hrm.lang +++ b/htdocs/langs/de_DE/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Stellenangebote Employees=Mitarbeiter Employee=Mitarbeiter/in NewEmployee=neuer Mitarbeiter +ListOfEmployees=Liste der Mitarbeiter diff --git a/htdocs/langs/de_DE/languages.lang b/htdocs/langs/de_DE/languages.lang index 8cb1b4fe32c..0c63da65bab 100644 --- a/htdocs/langs/de_DE/languages.lang +++ b/htdocs/langs/de_DE/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Spanisch (Paraguay) Language_es_PE=Spanisch (Peru) Language_es_PR=Spanisch (Puerto Rico) +Language_es_US=Spanish (USA) Language_es_UY=Spanisch (Uruguay) Language_es_GT=Spanisch (Guatemala) Language_es_VE=Spanisch (Venezuela) @@ -55,7 +56,7 @@ Language_fr_CM=Französisch (Kamerun) Language_fr_FR=Französisch Language_fr_GA=Französisch (Gabon) Language_fr_NC=Französisch (Neukaledonien) -Language_fr_SN=French (Senegal) +Language_fr_SN=Französisch (Senegal) Language_fy_NL=Friesisch Language_gl_ES=Galizisch Language_he_IL=Hebräisch diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang index 24a97f6c837..3b75f3e7964 100644 --- a/htdocs/langs/de_DE/main.lang +++ b/htdocs/langs/de_DE/main.lang @@ -155,6 +155,7 @@ RemoveLink=Entferne Link AddToDraft=Zum Entwurf hinzufügen Update=Aktualisieren Close=Schließen +CloseAs=Status ändern in CloseBox=Widget von Ihrer Startseite entfernen Confirm=Bestätigen ConfirmSendCardByMail=Möchten Sie wirklich die Inhalte dieser Karteikarte per E-Mail an %s senden? @@ -196,6 +197,7 @@ ReOpen=Wiedereröffnen Upload=Upload ToLink=Link Select=Wählen Sie +SelectAll=Select all Choose=Wählen Resize=Skalieren ResizeOrCrop=Grösse ändern oder zuschneiden @@ -256,6 +258,7 @@ Cards=Karten Card=Übersicht Now=Jetzt HourStart=Startzeit +Deadline=Deadline Date=Datum DateAndHour=Datum und Uhrzeit DateToday=heutiges Datum @@ -264,8 +267,10 @@ DateStart=Startdatum DateEnd=Enddatum DateCreation=Erstellungsdatum DateCreationShort=Erstelldatum +IPCreation=Creation IP DateModification=Änderungsdatum DateModificationShort=Änderungsdatum +IPModification=Modification IP DateLastModification=Datum letzte Änderung DateValidation=Freigabedatum DateClosing=Schließungsdatum @@ -319,6 +324,7 @@ Morning=Morgen Afternoon=Nachmittag Quadri=vierfach MonthOfDay=Tag des Monats +DaysOfWeek=Days of week HourShort=H MinuteShort=mn Rate=Rate @@ -356,7 +362,7 @@ Amount=Betrag AmountInvoice=Rechnungsbetrag AmountInvoiced=berechneter Betrag AmountInvoicedHT=Rechnungsbetrag (ohne MwSt.) -AmountInvoicedTTC=Amount invoiced (inc. tax) +AmountInvoicedTTC=fakturierter Betrag (Steuern inbegriffen) AmountPayment=Zahlungsbetrag AmountHTShort=Nettobetrag AmountTTCShort=Bruttobetrag @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Zahlungsbetrag, Originalwährung MulticurrencyAmountHT=Nettobetrag, Originalwährung MulticurrencyAmountTTC=Betrag (Brutto), Originalwährung MulticurrencyAmountVAT=Steuerbetrag, Originalwährung +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=USt.-Betrag 2 AmountLT2=USt.-Betrag 3 AmountLT1ES=RE Betrag @@ -487,6 +494,7 @@ By=Durch From=Von FromDate=von FromLocation=von +at=at to=An To=An and=und @@ -509,6 +517,7 @@ Draft=Entwurf Drafts=Entwürfe StatusInterInvoiced=Berechnet Validated=Bestätigt +ValidatedToProduce=Validated (To produce) Opened=Geöffnet OpenAll=Öffnen (Alle) ClosedAll=Schließen (Alle) @@ -655,6 +664,7 @@ Response=Antwort Priority=Wichtigkeit SendByMail=Per E-Mail versenden MailSentBy=E-Mail Absender +NotSent=nicht gesendet TextUsedInTheMessageBody=E-Mail Text SendAcknowledgementByMail=Bestätigungsmail senden SendMail=E-Mail versenden @@ -688,7 +698,7 @@ Method=Methode Receive=Erhalten CompleteOrNoMoreReceptionExpected=Vollständig oder nichts mehr erwartet ExpectedValue=Erwarteter Wert -ExpectedQty=Expected Qty +ExpectedQty=Erwartete Menge PartialWoman=Teilweise TotalWoman=Vollständig NeverReceived=Nie erhalten @@ -836,6 +846,7 @@ ListOfTemplates=Liste der Vorlagen Gender=Geschlecht Genderman=männlich Genderwoman=weiblich +Genderother=Sonstige ViewList=Listenansicht ViewGantt=Gantt-Ansicht ViewKanban=Kanban-Ansicht @@ -877,6 +888,8 @@ Miscellaneous=Verschiedenes Calendar=Terminkalender GroupBy=Gruppiere nach ... ViewFlatList=Listenansicht zeigen +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger 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 https://www.transifex.com/dolibarr-association/dolibarr/translate/#de_DE/ verbessern bzw. ergänzen. DirectDownloadLink=Direkter Download Link @@ -945,17 +958,17 @@ ShortThursday=Do ShortFriday=Fr ShortSaturday=Sa ShortSunday=So -one=one -two=two -three=three -four=four -five=five -six=six -seven=seven -eight=eight -nine=nine -ten=ten -eleven=eleven +one=Eins +two=Zwei +three=Drei +four=Vier +five=Fünf +six=Sechs +seven=Sieben +eight=Acht +nine=Neun +ten=Zehn +eleven=Elf twelve=twelve thirteen=thirdteen fourteen=fourteen @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Kunden Lieferungen SearchIntoExpenseReports=Spesenabrechnungen SearchIntoLeaves=Urlaub SearchIntoTickets=Tickets +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Lieferanten Zahlung +SearchIntoMiscPayments=Sonstige Zahlungen CommentLink=Kommentare NbComments=Anzahl der Kommentare CommentPage=Kommentare Leerzeichen @@ -1077,9 +1093,17 @@ AmountMustBePositive=Der Betrag muss positiv sein ByStatus=Nach Status InformationMessage=Information Used=Used -ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create -MODIFYInDolibarr=Record %s modified -DELETEInDolibarr=Record %s deleted -VALIDATEInDolibarr=Record %s validated -APPROVEDInDolibarr=Record %s approved +ASAP=So schnell wie möglich +CREATEInDolibarr=Datensatz %s erstellt +MODIFYInDolibarr=Datensatz %s geändert +DELETEInDolibarr=Datensatz %s gelöscht +VALIDATEInDolibarr=Datensatz %s bestätigt +APPROVEDInDolibarr=Datensatz %s genehmigt +DefaultMailModel=Standard E-Mail Modell +PublicVendorName=Public name of vendor +DateOfBirth=Geburtsdatum +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Ereignis-Erinnerung +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/de_DE/mrp.lang b/htdocs/langs/de_DE/mrp.lang index 79530a8b223..731e122fa42 100644 --- a/htdocs/langs/de_DE/mrp.lang +++ b/htdocs/langs/de_DE/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Kosten pro Einheit TotalCost=Gesamtsumme Kosten BOMTotalCost=Die Herstellungskosten dieser Stückliste, basierend auf den Kosten jeder Menge und jeden verbrauchten Produktes (nutzt den Selbstkostenpreis wenn er definiert ist, ansonsten den Durchschnittspreis sofern definiert oder den besten Einkaufspreis) GoOnTabProductionToProduceFirst=Die Produktion muss begonnen sein, um einen Produktionsauftrag zu schließen (siehe Tab '%s'). Alternativ kann er storniert werden. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/de_DE/website.lang b/htdocs/langs/de_DE/website.lang index 7d91f729fba..2170414d12f 100644 --- a/htdocs/langs/de_DE/website.lang +++ b/htdocs/langs/de_DE/website.lang @@ -31,7 +31,7 @@ AddWebsite=Website hinzufügen Webpage=Webseite / Container AddPage=Seite / Container hinzufügen HomePage=Startseite -PageContainer=Seite / Container +PageContainer=Seite PreviewOfSiteNotYetAvailable=Vorschau ihrer Webseite %s noch nicht verfügbar. Zuerst muss eine 'Webseiten-Vorlage importiert' oder 'Seite / Container hinzugefügt' werden. 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. SiteDeleted=Website '%s' gelöscht @@ -58,10 +58,10 @@ NoPageYet=Noch keine Seiten YouCanCreatePageOrImportTemplate=Sie können eine neue Seite erstellen oder eine komplette Website-Vorlage importieren SyntaxHelp=Hilfe zu bestimmten Syntaxtipps YouCanEditHtmlSourceckeditor=Sie können den HTML-Quellcode über die Schaltfläche "Quelle" im Editor bearbeiten. -YouCanEditHtmlSource=
You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.

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

You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):
<?php redirectToContainer('alias_of_container_to_redirect_to'); ?>

To add a link to another page, use the syntax:
<a href="alias_of_page_to_link_to.php">mylink<a>

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 directory for public access), syntax is:
<img src="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
+YouCanEditHtmlSource=
Sie können PHP-Code mit den Tags <?php ?> in diese Quelle einfügen. Die folgenden globalen Variablen sind verfügbar: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $ pagelangs.

Mit der folgenden Syntax können Sie auch den Inhalt einer anderen Seite/eines anderen Containers einschließen:
<?php includeContainer('alias_of_container_to_include'); ?>

Mit der folgenden Syntax können Sie eine Umleitung auf eine andere Seite/einen anderen Container machen (Anmerkung: keinen Inhalt vor einer Umleitung ausgeben):
< php redirectToContainer ( 'alias_of_container_to_redirect_to'); ?

Um einen Link zu einer anderen Seite hinzuzufügen, benutzen Sie die Syntax:
<a href="alias_of_page_to_link_to.php" >mylink<a>

Um einen Link zum Download hinzuzufügen, der eine Datei in das Verzeichnis Dokumente speichert, nutzen Sie den document.phpwrapper:
Beispiel für eine Datei in Dokumente / ecm (muss aufgezeichnet werden), ist die Syntax:
<a href = "/document.php modulepart = 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 mit einem Freigabelink freigegebene Datei ( offener Zugang unter Nutzung des sharing hash key der Datei), lautet die Syntax:
<a href="/document.php?hashp=publicsharekeyoffile">

Um ein Bild in das Dokumente Verzeichnis zu speichern, verwenden Sie die viewimage.php Wrapper:
Beispiel für ein Bild in Dokumente / Medien (offen Verzeichnis für den Zugang der Öffentlichkeit), Syntax:
<img src = "/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
#YouCanEditHtmlSource2=
To include a image shared publicaly, use the viewimage.php wrapper:
Example with a shared key 123456789, syntax is:
<img src="/viewimage.php?hashp=12345679012...">
-YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), syntax is:
<img src="/viewimage.php?hashp=12345679012...">
-YouCanEditHtmlSourceMore=
More examples of HTML or dynamic code available on the wiki documentation
. +YouCanEditHtmlSource2=Für Bilder, die über einen Link geteilt werden (öffentlicher Zugriff über den geteilten Hash-Schlüssel der Datei) gilt folgende Syntax:
<img src="/viewimage.php?hashp=12345679012...">
+YouCanEditHtmlSourceMore=
Weitere Beispiele von HTML- oder dynamischem Code ist in der Wiki-Dokumentaion verfügbar.
ClonePage=Seite / Container klonen CloneSite=Website klonen SiteAdded=Website hinzugefügt @@ -124,7 +124,7 @@ ShowSubContainersOnOff=Ausführungs-Modus für 'dynamischen Inhalt' ist %s GlobalCSSorJS=Globale CSS / JS / Header-Datei der Website BackToHomePage=Zurück zur Startseite... TranslationLinks=Übersetzungslinks -YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not available.
(ref=%s, type=%s, status=%s) +YouTryToAccessToAFileThatIsNotAWebsitePage=Sie versuchen, eine Seite aufzurufen, welche nicht vorhanden ist.
(ref=%s, type=%s, status=%s) UseTextBetween5And70Chars=Verwende für gute SEO-Ergebnisse einen Text zwischen 5 und 70 Zeichen MainLanguage=Hauptsprache OtherLanguages=Andere Sprachen @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Ersetzt in %s Seiten oder Containern RSSFeed=RSS Feed RSSFeedDesc=Über diese URL können Sie einen RSS-Feed mit den neuesten Artikeln vom Typ "Blogpost" abrufen PagesRegenerated=%s Seite(n) / Container neu generiert +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang index 598f5dc9ab5..1189c759ce7 100644 --- a/htdocs/langs/el_GR/accountancy.lang +++ b/htdocs/langs/el_GR/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Προεπιλογή για υπηρεσία DefaultForProduct=Προεπιλογή για το προϊόν CantSuggest=Δεν μπορώ να προτείνω AccountancySetupDoneFromAccountancyMenu=Η μεγαλύτερη ρύθμιση της λογιστικής γίνεται από το μενού %s -ConfigAccountingExpert=Διαμόρφωση της μονάδας λογιστικής expert +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Περιοδικότητα -Journaux=Ημερολόγια +Journals=Ημερολόγια JournalFinancial=Οικονομικά ημερολόγια BackToChartofaccounts=Επιστροφή στο διάγραμμα των λογαριασμών Chartofaccounts=Διάγραμμα λογαριασμών +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Τρέχον ειδικό λογαριασμό AssignDedicatedAccountingAccount=Νέος λογαριασμός προς ανάθεση InvoiceLabel=Ετικέτα τιμολογίου @@ -33,8 +35,8 @@ OtherInfo=Αλλες πληροφορίες DeleteCptCategory=Κατάργηση λογαριασμού λογιστικής από την ομάδα ConfirmDeleteCptCategory=Είστε βέβαιοι ότι θέλετε να καταργήσετε αυτόν τον λογαριασμό λογιστικής από την ομάδα λογαριασμών λογαριασμού; JournalizationInLedgerStatus=Κατάσταση της περιοδικής εγγραφής -AlreadyInGeneralLedger=Έχει ήδη κυκλοφορήσει σε ημερολόγια -NotYetInGeneralLedger=Δεν έχει ακόμη καταχωρηθεί σε ημερολόγια +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Η ομάδα είναι κενή, ελέγξτε τη ρύθμιση της εξατομικευμένης ομάδας λογιστικής DetailByAccount=Εμφάνιση λεπτομερειών βάσει λογαριασμού AccountWithNonZeroValues=Λογαριασμοί με μη μηδενικές τιμές @@ -43,7 +45,9 @@ CountriesInEEC=Χώρες στην ΕΟΚ CountriesNotInEEC=Χώρες που δεν βρίσκονται στην ΕΟΚ CountriesInEECExceptMe=Χώρες στην ΕΟΚ εκτός από το %s CountriesExceptMe=Όλες οι χώρες εκτός από το %s -AccountantFiles=Εξαγωγή λογιστικών εγγράφων +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Κύριος λογαριασμός λογιστικής για πελάτες που δεν έχουν οριστεί στη ρύθμιση MainAccountForSuppliersNotDefined=Κύριος λογαριασμός λογιστικής για προμηθευτές που δεν καθορίζονται στη ρύθμιση @@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Προσθέστε ή επεξεργαστε AccountancyAreaDescClosePeriod=STEP %s: Κλείστε την περίοδο έτσι δεν μπορούμε να κάνουμε αλλαγές σε ένα μέλλον. -TheJournalCodeIsNotDefinedOnSomeBankAccount=Ένα υποχρεωτικό βήμα στη ρύθμιση δεν ήταν πλήρης (το λογιστικό περιοδικό δεν καθορίστηκε για όλους τους τραπεζικούς λογαριασμούς) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Επιλέξτε ενεργό πίνακα λογαριασμών ChangeAndLoad=Αλλαγή και φόρτωση Addanaccount=Προσθέστε ένα λογιστικό λογαριασμό @@ -89,6 +93,8 @@ SubledgerAccount=Λογαριασμός χρέωσης SubledgerAccountLabel=Ετικέτα λογαριασμού ShowAccountingAccount=Εμφάνιση λογαριασμού λογιστικής ShowAccountingJournal=Εμφάνιση λογιστικού περιοδικού +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Λογαριασμός λογιστικής πρότεινε MenuDefaultAccounts=Προεπιλεγμένοι λογαριασμοί MenuBankAccounts=Τραπεζικοί Λογαριασμοί @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Αναφορά σύνδεσης εξόδων CreateMvts=Δημιουργήστε μία νέα συναλλαγή UpdateMvts=Τροποποίηση συναλλαγής ValidTransaction=Επικύρωση συναλλαγής -WriteBookKeeping=Εγγραφή συναλλαγών στο Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=Καθολικό +BookkeepingSubAccount=Subledger AccountBalance=Υπόλοιπο λογαριασμού ObjectsRef=Αναφορά αντικειμένου προέλευσης CAHTF=Συνολικός προμηθευτής αγοράς προ φόρων @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Απενεργοποιήστε την απευθεία ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Ενεργοποιήστε το σχέδιο εξαγωγής στο περιοδικό ACCOUNTANCY_COMBO_FOR_AUX=Ενεργοποίηση σύνθετης λίστας για επικουρικό λογαριασμό (μπορεί να είναι αργή αν έχετε πολλούς τρίτους) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Ημερολόγιο πωλήσεων ACCOUNTING_PURCHASE_JOURNAL=Ημερολόγιο αγορών @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Λογαριασμός λογιστικής αναμ DONATION_ACCOUNTINGACCOUNT=Λογαριασμός λογιστικής για την εγγραφή δωρεών ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Λογαριασμός λογιστικής για την εγγραφή συνδρομών +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Λογαριασμός λογιστικής από προεπιλογή για τα αγορασμένα προϊόντα (χρησιμοποιείται αν δεν ορίζεται στο φύλλο προϊόντων) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Λογαριασμός από προεπιλογή για τα προϊόντα που αγοράστηκαν στην ΕΟΚ (χρησιμοποιείται αν δεν ορίζεται στο φύλλο προϊόντος) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Λογαριασμός από προεπιλογή για τα προϊόντα που αγοράστηκαν και εισάγονται εκτός ΕΟΚ (χρησιμοποιείται αν δεν ορίζεται στο φύλλο προϊόντος) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=Με προκαθορισμένες ομάδες ByPersonalizedAccountGroups=Με εξατομικευμένες ομάδες ByYear=Με χρόνια NotMatch=Δεν έχει οριστεί -DeleteMvt=Διαγραφή γραμμών Ledger +DeleteMvt=Delete some operation lines from accounting DelMonth=Μήνας προς διαγραφή DelYear=Έτος προς διαγραφή DelJournal=Ημερολόγιο προς διαγραφή -ConfirmDeleteMvt=Αυτό θα διαγράψει όλες τις γραμμές του Ημερολογίου Λογιστικής για το έτος / μήνα ή / και από μία συγκεκριμένη περίοδο (Απαιτείται τουλάχιστον ένα κριτήριο). Θα χρειαστεί να επαναχρησιμοποιήσετε τη λειτουργία "Εγγραφή στη λογιστική" για να έχετε το διαγραμμένο αρχείο πίσω στο ημερολόγιο. -ConfirmDeleteMvtPartial=Αυτό θα διαγράψει τη συναλλαγή από το Ledger (όλες οι γραμμές που σχετίζονται με την ίδια συναλλαγή θα διαγραφούν) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Ημερολόγιο οικονομικών ExpenseReportsJournal=Έκθεση εκθέσεων δαπανών DescFinanceJournal=Finance journal including all the types of payments by bank account -DescJournalOnlyBindedVisible=Πρόκειται για μια καταγραφή που συνδέεται με έναν λογαριασμό λογιστικής και μπορεί να καταγραφεί στον Λογαριασμό. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Δεν έχει οριστεί λογαριασμός για ΦΠΑ ThirdpartyAccountNotDefined=Ο λογαριασμός για τρίτους δεν έχει οριστεί ProductAccountNotDefined=Λογαριασμός για το προϊόν δεν έχει οριστεί @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=Αυτό το περιοδικό χρησιμ AccountingAccountForSalesTaxAreDefinedInto=Σημείωση: Ο λογαριασμός λογιστικής για τον φόρο πωλήσεων ορίζεται στο μενού %s - %s NumberOfAccountancyEntries=Αριθμός καταχωρήσεων NumberOfAccountancyMovements=Αριθμός κινήσεων +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Εξαγωγή σχεδίου περιοδικού @@ -326,6 +339,8 @@ Modelcsv_configurable=Εξαγωγή CSV εξαγωγής Modelcsv_FEC=Εξαγωγή FEC Modelcsv_Sage50_Swiss=Εξαγωγή για Sage 50 Ελβετία Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Λογαριασμός Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang index 9453937a5db..9066b5bbf90 100644 --- a/htdocs/langs/el_GR/admin.lang +++ b/htdocs/langs/el_GR/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=Το στοιχείο PHP %s έχει φορτωθεί PreloadOPCode=Χρησιμοποιείται προ-φορτωμένο OPCode AddRefInList=Εμφάνιση αναφοράς πελατών / προμηθευτή λίστα πληροφοριών (επιλέξτε κατάλογο ή combobox) και το μεγαλύτερο μέρος της υπερσύνδεσης.
Τα Τρίτα Μέρη θα εμφανιστούν με τη μορφή ονόματος "CC12345 - SC45678 - The Big Company corp". αντί του "The Big Company corp". AddAdressInList=Εμφάνιση λίστας πληροφοριών διευθύνσεων πελατών / προμηθευτών (επιλέξτε κατάλογο ή συνδυασμός)
Τα Τρίτα Μέρη θα εμφανιστούν με τη μορφή ονόματι "The Big Company Corp. - 21 άλμα δρόμου 123456 Μεγάλη πόλη - ΗΠΑ" αντί για "Το Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ζητήστε την προτιμώμενη μέθοδο αποστολής για τρίτους. FieldEdition=Έκδοση στο πεδίο %s FillThisOnlyIfRequired=Παράδειγμα: +2 (συμπληρώστε μόνο αν ζώνη ώρας αντισταθμίσουν τα προβλήματα για προβλήματα που προέκυψαν) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Απαιτείται ηλεκτρονικό ταχυδρο MemberSendInformationByMailByDefault=Τσέκαρε το πλαίσιο ελέγχου για την αποστολή επιβεβαίωσης αλληλογραφίας στα μέλη (επικύρωση ή νέα συνδρομή) είναι ενεργοποιημένη από προεπιλογή VisitorCanChooseItsPaymentMode=Ο επισκέπτης μπορεί να επιλέξει μεταξύ των διαθέσιμων τρόπων πληρωμής MEMBER_REMINDER_EMAIL=Ενεργοποιήστε την αυτόματη υπενθύμιση μέσω ηλεκτρονικού ταχυδρομείου των συνδρομών που έχουν λήξει. Σημείωση: Η ενότητα %s πρέπει να ενεργοποιηθεί και να ρυθμιστεί σωστά για να στείλετε υπενθυμίσεις. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=LDAP Setup LDAPGlobalParameters=Global parameters @@ -1670,7 +1672,7 @@ AdvancedEditor=Εξελιγμένο πρόγραμμα επεξεργασίας ActivateFCKeditor=Ενεργοποιήστε το προηγμένο πρόγραμμα επεξεργασίας για: FCKeditorForCompany=Δημιουργία / έκδοση WYSIWIG στοιχείων περιγραφής και σημειώσεων (εκτός από προϊόντα / υπηρεσίες) FCKeditorForProduct=Δημιουργία / έκδοση WYSIWIG των προϊόντων / υπηρεσιών περιγραφής και σημείωσης -FCKeditorForProductDetails=Η δημιουργία / έκδοση WYSIWIG παραθέτει λεπτομέρειες για όλες τις οντότητες (προτάσεις, παραγγελίες, τιμολόγια κ.λπ.). Προειδοποίηση: Η χρήση αυτής της επιλογής για αυτήν την περίπτωση δεν συνιστάται σοβαρά, καθώς μπορεί να δημιουργήσει προβλήματα με ειδικούς χαρακτήρες και μορφοποίηση σελίδων κατά την δημιουργία αρχείων PDF. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= Δημιουργία / έκδοση WYSIWIG για μαζικά eMailings (Εργαλεία-> eMailing) FCKeditorForUserSignature=WYSIWIG creation/edition of user signature FCKeditorForMail=Δημιουργία / έκδοση WYSIWIG για όλα τα μηνύματα (εκτός από τα εργαλεία-> eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Αυτόματη ρύθμιση αυτής της AGENDA_DEFAULT_FILTER_TYPE=Αυτόματη ρύθμιση αυτού του τύπου συμβάντος στο φίλτρο αναζήτησης της προβολής ατζέντας AGENDA_DEFAULT_FILTER_STATUS=Αυτόματη ρύθμιση αυτής της κατάστασης για συμβάντα στο φίλτρο αναζήτησης της προβολής ατζέντας AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda -AGENDA_REMINDER_EMAIL=Ενεργοποιήστε την υπενθύμιση συμβάντων μέσω μηνυμάτων ηλεκτρονικού ταχυδρομείου (η επιλογή επιλογής / καθυστέρησης μπορεί να οριστεί σε κάθε συμβάν). Σημείωση: Η ενότητα %s πρέπει να ενεργοποιηθεί και να ρυθμιστεί σωστά ώστε να έχει αποσταλεί υπενθύμιση στη σωστή συχνότητα. -AGENDA_REMINDER_BROWSER=Ενεργοποίηση υπενθύμισης συμβάντων στο πρόγραμμα περιήγησης του χρήστη (όταν φτάσει η ημερομηνία συμβάντος, κάθε χρήστης μπορεί να το αρνηθεί από την ερώτηση επιβεβαίωσης του προγράμματος περιήγησης) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Ενεργοποίηση ειδοποίησης ήχου +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Εμφάνιση συνδεδεμένου αντικειμένου στην προβολή ατζέντας ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup diff --git a/htdocs/langs/el_GR/banks.lang b/htdocs/langs/el_GR/banks.lang index f4e87ef0145..7cd78ac18a0 100644 --- a/htdocs/langs/el_GR/banks.lang +++ b/htdocs/langs/el_GR/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Διάφορες πληρωμές VariousPayments=Διάφορες πληρωμές ShowVariousPayment=Εμφάνιση διαφόρων πληρωμών AddVariousPayment=Προσθήκη διαφόρων πληρωμών +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=Εντολές άμεσης χρέωσης YourSEPAMandate=Οι εντολές άμεσης χρέωσης σας. FindYourSEPAMandate=Αυτή είναι η εντολή ΕΧΠΕ για να εξουσιοδοτήσετε την εταιρεία μας να κάνει άμεση εντολή χρέωσης στην τράπεζά σας. Επιστρέψτε το υπογεγραμμένο (σάρωση του υπογεγραμμένου εγγράφου) ή στείλτε το ταχυδρομικώς η με mail @@ -176,3 +179,4 @@ BankColorizeMovement=Χρωματισμός κινήσεων BankColorizeMovementDesc=Εάν αυτή η λειτουργία είναι ενεργή, μπορείτε να επιλέξετε συγκεκριμένο χρώμα φόντου για χρεωστικές ή πιστωτικές κινήσεις BankColorizeMovementName1=Χρώμα φόντου για την κίνηση χρέωσης BankColorizeMovementName2=Χρώμα φόντου για την πιστωτική κίνηση +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/el_GR/categories.lang b/htdocs/langs/el_GR/categories.lang index 88578934023..258447b74e0 100644 --- a/htdocs/langs/el_GR/categories.lang +++ b/htdocs/langs/el_GR/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Ρύθμιση ετικετών/κατηγοριών CategorieRecursiv=Αυτόματη σύνδεση με μητρική ετικέτα/κατηγορία CategorieRecursivHelp=Εάν είναι ενεργοποιημένη η επιλογή, όταν προσθέσετε ένα προϊόν σε μια υποκατηγορία, το προϊόν θα προστεθεί επίσης στην κατηγορία γονέων. AddProductServiceIntoCategory=Προσθέστε το ακόλουθο προϊόν/υπηρεσία +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Εμφάνιση ετικέτας/κατηγορίας ByDefaultInList=By default in list ChooseCategory=Επιλέξτε κατηγορία -StocksCategoriesArea=Αποθήκες Κατηγορίες Περιοχή -ActionCommCategoriesArea=Περιοχή κατηγοριών Εκδηλώσεων -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Χρήση ή χειριστής για κατηγορίες diff --git a/htdocs/langs/el_GR/companies.lang b/htdocs/langs/el_GR/companies.lang index 5f197c22491..318aa1d98d3 100644 --- a/htdocs/langs/el_GR/companies.lang +++ b/htdocs/langs/el_GR/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof Id 1 (Federal number) ProfId4CH=Prof Id 2 (Αριθμός Εμπορικής Εγγραφής) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Ο καθηγητής Id 1 (RUT) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr) ProfId2DE=Prof Id 2 (USt.-Nr) ProfId3DE=Prof Id 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof Id 1 (CIF/NIF) ProfId2ES=Prof Id 2 (Social security number) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (Collegiate number) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof Id 1 (SIREN) ProfId2FR=Prof Id 2 (SIRET) ProfId3FR=Prof Id 3 (NAF, old APE) ProfId4FR=Prof Id 4 (RCS/RM) -ProfId5FR=Καθ ID 5 +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Prof Id 1 (Registration Number) ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 ProfId4IN=Prof Id 4 ProfId5IN=Καθ ID 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Business permit) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (RC) ProfId2MA=Id prof. 2 (Patente) ProfId3MA=Id prof. 3 (ΑΝ) ProfId4MA=Id prof. 4 (CNSS) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Ο καθηγητής Id 1 (RFC). ProfId2MX=Ο καθηγητής ID 2 (R.. Π. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK nummer ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof Id 2 (Social security number) ProfId3PT=Prof Id 3 (Αριθμός Εμπορικής Εγγραφής) ProfId4PT=Prof Id 4 (Conservatory) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Πρότυπο Id 1 (CUI) ProfId2RO=Πρότυπο Id 2 (Nr. Înmatriculare) ProfId3RO=Πρότυπο Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Πρότυπο Id 5 (EUID) +ProfId4RO=Πρότυπο Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Καθ Id 1 (OGRN) ProfId2RU=Καθ Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=Μπορείτε επίσης να ελέγξετε χειρ ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s). NorProspectNorCustomer=Δεν προοπτική, ούτε πελάτης JuridicalStatus=Τύπος νομικού προσώπου +Workforce=Workforce Staff=Εργαζόμενοι ProspectLevelShort=Δυναμική ProspectLevel=Δυναμική προοπτικής @@ -456,3 +462,8 @@ PaymentTermsSupplier=Όρος πληρωμής - Πωλητής PaymentTypeBoth=Τύπος Πληρωμής - Πελάτης και Πωλητής MulticurrencyUsed=Χρησιμοποιήστε το Πολλαπλάσιο MulticurrencyCurrency=Νόμισμα +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/el_GR/hrm.lang b/htdocs/langs/el_GR/hrm.lang index b7dcc4da1b8..6800960626f 100644 --- a/htdocs/langs/el_GR/hrm.lang +++ b/htdocs/langs/el_GR/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=Εργαζόμενοι Employee=Υπάλληλος NewEmployee=Νέος εργαζόμενος +ListOfEmployees=Λίστα εργαζομένων diff --git a/htdocs/langs/el_GR/languages.lang b/htdocs/langs/el_GR/languages.lang index da99fbcb992..35076749bf2 100644 --- a/htdocs/langs/el_GR/languages.lang +++ b/htdocs/langs/el_GR/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Ισπανικά (Παραγουάη) Language_es_PE=Ισπανικά (Περού) Language_es_PR=Ισπανικά (Πουέρτο Ρίκο) +Language_es_US=Spanish (USA) Language_es_UY=Ισπανικά (Ουρουγουάη) Language_es_GT=Spanish (Guatemala) Language_es_VE=Ισπανικά (Βενεζουέλας) diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang index fcac93efc25..420fc166108 100644 --- a/htdocs/langs/el_GR/main.lang +++ b/htdocs/langs/el_GR/main.lang @@ -155,6 +155,7 @@ RemoveLink=Αφαίρεση συνδέσμου AddToDraft=Προσθήκη στο προσχέδιο Update=Ανανέωση Close=Κλείσιμο +CloseAs=Αλλαγή κατάστασης σε CloseBox=Καταργήστε το γραφικό στοιχείο από τον πίνακα ελέγχου Confirm=Επιβεβαίωση ConfirmSendCardByMail=Θέλετε πραγματικά να στείλετε το περιεχόμενο αυτής της κάρτας μέσω ταχυδρομείου στο %s ; @@ -196,6 +197,7 @@ ReOpen=Εκ νέου άνοιγμα Upload=Ανεβάστε ToLink=Σύνδεσμος Select=Επιλογή +SelectAll=Select all Choose=Επιλογή Resize=Αλλαγή διαστάσεων ResizeOrCrop=Αλλαγή μεγέθους ή περικοπή @@ -256,6 +258,7 @@ Cards=Καρτέλες Card=Καρτέλα Now=Τώρα HourStart=Έναρξη ωρών +Deadline=Deadline Date=Ημερομηνία DateAndHour=Ημερομηνία και ώρα DateToday=Σημερινή ημερομηνία @@ -264,8 +267,10 @@ DateStart=Ημερομηνία έναρξης DateEnd=Ημερομηνία λήξης DateCreation=Ημερομηνία Δημιουργίας DateCreationShort=Ημερομηνία δημιουργίας +IPCreation=Creation IP DateModification=Ημερομηνία Τροποποίησης DateModificationShort=Ημερ. Τροπ. +IPModification=Modification IP DateLastModification=Τελευταία ημερομηνία τροποποίησης DateValidation=Ημερομηνία Επικύρωσης DateClosing=Ημερομηνία Κλεισίματος @@ -319,6 +324,7 @@ Morning=Πρωί Afternoon=Απόγευμα Quadri=Τετραπλής MonthOfDay=Μήνας από την ημέρα +DaysOfWeek=Days of week HourShort=Ω MinuteShort=mn Rate=Βαθμός @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Ποσό πληρωμής, αρχικό νόμισμ MulticurrencyAmountHT=Ποσό (εκτός φόρου), αρχικό νόμισμα MulticurrencyAmountTTC=Ποσό (με φόρους), αρχικό νόμισμα MulticurrencyAmountVAT=Ποσό φόρων, αρχικό νόμισμα +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Ποσό Φόρου 2 AmountLT2=Ποσό Φόρου 3 AmountLT1ES=Ποσό RE @@ -487,6 +494,7 @@ By=Από From=Από FromDate=Από FromLocation=Από +at=at to=πρός To=πρός and=και @@ -509,6 +517,7 @@ Draft=Προσχέδιο Drafts=Προσχέδια StatusInterInvoiced=Τιμολογήθηκε Validated=Επικυρωμένο +ValidatedToProduce=Validated (To produce) Opened=Άνοιγμα OpenAll=Άνοιγμα (Όλα) ClosedAll=Κλειστό (Όλα) @@ -655,6 +664,7 @@ Response=Απάντηση Priority=Προτεραιότητα SendByMail=Απόστειλε μέσω ηλεκτρονικού ταχυδρομείου MailSentBy=Το email στάλθηκε από +NotSent=Δεν αποστέλλεται TextUsedInTheMessageBody=Κείμενο email SendAcknowledgementByMail=Αποστολή email επιβεβαίωσης SendMail=Αποστολή email @@ -836,6 +846,7 @@ ListOfTemplates=Κατάλογος των προτύπων Gender=Φύλο Genderman=Άνδρας Genderwoman=Γυναίκα +Genderother=Άλλο ViewList=Προβολή λίστας ViewGantt=Gantt θέα ViewKanban=Θέα στο Kanban @@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous Calendar=Ημερολόγιο GroupBy=Ομαδοποίηση κατά... ViewFlatList=Προβολή λίστας +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Αφαιρέστε τη συμβολοσειρά '%s' SomeTranslationAreUncomplete=Ορισμένες από τις γλώσσες που προσφέρονται μπορούν να μεταφραστούν μόνο μερικώς ή ενδέχεται να περιέχουν σφάλματα. Βοηθήστε να διορθώσετε τη γλώσσα σας, εγγραφείτε στη διεύθυνση https://transifex.com/projects/p/dolibarr/ για να προσθέσετε τις βελτιώσεις σας. DirectDownloadLink=Άμεση σύνδεση λήψης (δημόσια / εξωτερική) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Αποστολές Πελάτη SearchIntoExpenseReports=Αναφορές εξόδων SearchIntoLeaves=Αδεια SearchIntoTickets=Εισιτήρια +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Πληρωμές προμηθευτών +SearchIntoMiscPayments=Διάφορες πληρωμές CommentLink=Σχόλια NbComments=Αριθμός σχολίων CommentPage=Χώρος σχολίων @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Πληροφορίες Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Ημερομηνία γεννήσεως +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Υπενθύμιση συμβάντος +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/el_GR/mrp.lang b/htdocs/langs/el_GR/mrp.lang index d1222e8eff4..25e91a2a182 100644 --- a/htdocs/langs/el_GR/mrp.lang +++ b/htdocs/langs/el_GR/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Κόστος μονάδας TotalCost=Συνολικό κόστος BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/el_GR/website.lang b/htdocs/langs/el_GR/website.lang index f5029a325e7..50dd8e48759 100644 --- a/htdocs/langs/el_GR/website.lang +++ b/htdocs/langs/el_GR/website.lang @@ -31,7 +31,7 @@ AddWebsite=Προσθήκη ιστοτόπου Webpage=Ιστοσελίδα / δοχείο AddPage=Προσθήκη σελίδας / δοχείου HomePage=Αρχική σελίδα -PageContainer=Σελίδα / δοχείο +PageContainer=Σελίδα PreviewOfSiteNotYetAvailable=Δεν είναι ακόμα διαθέσιμη η προεπισκόπηση του ιστοτόπου σας %s . Πρέπει πρώτα να εισαγάγετε ένα πλήρες πρότυπο ιστότοπου ή απλά να προσθέσετε μια σελίδα / κοντέινερ . RequestedPageHasNoContentYet=Η σελίδα που ζητήθηκε με id %s δεν έχει ακόμα περιεχόμενο, ή το αρχείο cache .tpl.php καταργήθηκε. Επεξεργαστείτε το περιεχόμενο της σελίδας για να το επιλύσετε. SiteDeleted=Ο ιστότοπος "%s" διαγράφηκε @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Η αντικατάσταση έγινε σε σελίδ RSSFeed=RSS Feed RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/en_AU/main.lang b/htdocs/langs/en_AU/main.lang index 102482cbd63..dac6a875c2d 100644 --- a/htdocs/langs/en_AU/main.lang +++ b/htdocs/langs/en_AU/main.lang @@ -35,4 +35,3 @@ TTC=Incl GST VAT=GST VATRate=GST Rate Check=Cheque -CREATEInDolibarr=Record %s create diff --git a/htdocs/langs/en_CA/main.lang b/htdocs/langs/en_CA/main.lang index 2fcf148aea0..6d4ce6e30f2 100644 --- a/htdocs/langs/en_CA/main.lang +++ b/htdocs/langs/en_CA/main.lang @@ -26,4 +26,3 @@ TotalVAT=Total GST TotalLT1=Total PST VAT=GST VATRate=GST rate -CREATEInDolibarr=Record %s create diff --git a/htdocs/langs/en_GB/accountancy.lang b/htdocs/langs/en_GB/accountancy.lang index e87b321f445..9a42aff0270 100644 --- a/htdocs/langs/en_GB/accountancy.lang +++ b/htdocs/langs/en_GB/accountancy.lang @@ -1,14 +1,11 @@ # Dolibarr language file - Source file is en_US - accountancy ACCOUNTING_EXPORT_PIECE=Export the number of pieces -ConfigAccountingExpert=Configuration for the financial expert module Journalization=Journalisation BackToChartofaccounts=Return to chart of accounts OverviewOfAmountOfLinesNotBound=Overview of number of lines not bound to an finance account OverviewOfAmountOfLinesBound=Overview of number of lines already bound to an finance account DeleteCptCategory=Remove finance account from group JournalizationInLedgerStatus=Status of journals -AlreadyInGeneralLedger=Already journalised in ledgers -NotYetInGeneralLedger=Not yet journalised in ledgers GroupIsEmptyCheckSetup=Group is empty, check setup of the personalised finance group MainAccountForCustomersNotDefined=Main finance account for customers not defined in setup MainAccountForUsersNotDefined=Main finance account for users not defined in setup @@ -26,7 +23,6 @@ AccountancyAreaDescProd=STEP %s: Define finance accounts for your products/servi AccountancyAreaDescBind=STEP %s: Checking links between existing %s lines and finance account is done, so application will be able to journalise transactions in Ledger with one click. To complete missing links use the menu entry %s. AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu %s, and click button %s. AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make future modifications. -TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not completed (accounting code journal not defined for all bank accounts) Addanaccount=Add a financial account AccountAccounting=Financial Account ShowAccountingAccount=Show finance account @@ -71,8 +67,6 @@ AccountingCategory=Personalised groups GroupByAccountAccounting=Group by finance account AccountingAccountGroupsDesc=Here you can define some groups of financial accounts. They will be used for personalised accounting reports. ByPersonalizedAccountGroups=By personalised groups -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to this transaction will be deleted) -DescJournalOnlyBindedVisible=This is a view of records that are linked to a finance account and can be posted into the Ledger. FeeAccountNotDefined=Account for fees not defined CustomerInvoicePayment=Payment by customer invoice NumMvts=Transaction Number diff --git a/htdocs/langs/en_GB/main.lang b/htdocs/langs/en_GB/main.lang index 9fb796ec07a..5617fe77778 100644 --- a/htdocs/langs/en_GB/main.lang +++ b/htdocs/langs/en_GB/main.lang @@ -40,4 +40,3 @@ Canceled=Cancelled Color=Colour NoPhotoYet=No picture available yet SearchIntoSupplierProposals=Vendor quotes -CREATEInDolibarr=Record %s create diff --git a/htdocs/langs/en_IN/main.lang b/htdocs/langs/en_IN/main.lang index 2012bdeac9d..46aef779403 100644 --- a/htdocs/langs/en_IN/main.lang +++ b/htdocs/langs/en_IN/main.lang @@ -23,4 +23,3 @@ CommercialProposalsShort=Quotations LinkToProposal=Link to quotation SearchIntoCustomerProposals=Quotations ContactDefault_propal=Quotation -CREATEInDolibarr=Record %s create diff --git a/htdocs/langs/en_SG/companies.lang b/htdocs/langs/en_SG/companies.lang deleted file mode 100644 index 4f7719d61ea..00000000000 --- a/htdocs/langs/en_SG/companies.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - companies -ProfId5MA=Id. prof. 5 (I.C.E.) diff --git a/htdocs/langs/en_SG/main.lang b/htdocs/langs/en_SG/main.lang index d7e1fe7e8a5..2e691473326 100644 --- a/htdocs/langs/en_SG/main.lang +++ b/htdocs/langs/en_SG/main.lang @@ -19,4 +19,3 @@ 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 -CREATEInDolibarr=Record %s create diff --git a/htdocs/langs/es_AR/accountancy.lang b/htdocs/langs/es_AR/accountancy.lang index f3fbfaaa853..96c58aaf400 100644 --- a/htdocs/langs/es_AR/accountancy.lang +++ b/htdocs/langs/es_AR/accountancy.lang @@ -11,8 +11,8 @@ ACCOUNTING_EXPORT_PREFIX_SPEC=Especificar el prefijo para el nombre de archivo DefaultForService=Predeterminado para servicio DefaultForProduct=Predeterminado para producto AccountancySetupDoneFromAccountancyMenu=La mayor parte de la configuración de la contabilidad se hace desde el menú %s -ConfigAccountingExpert=Experto en la configuración del módulo contabilidad Journalization=Contabilización +Journals=Diarios Contables JournalFinancial=Diarios Financieros AssignDedicatedAccountingAccount=Nueva cuenta para asignar InvoiceLabel=Etiqueta de la factura diff --git a/htdocs/langs/es_AR/companies.lang b/htdocs/langs/es_AR/companies.lang index 615e978d85a..5e7e576b77f 100644 --- a/htdocs/langs/es_AR/companies.lang +++ b/htdocs/langs/es_AR/companies.lang @@ -119,7 +119,6 @@ ProfId1MA=ID Prof 1 (RC) ProfId2MA=ID Prof 2 (Patente) ProfId3MA=ID Prof 3 (IF) ProfId4MA=ID Prof 4 (CNSS) -ProfId5MA=ID Prof 5 (ICE) ProfId1MX=ID Prof 1 (RFC) ProfId2MX=ID Prof 2 (RP IMSS) ProfId3MX=ID Prof 3 (Charter Profesional) @@ -136,7 +135,7 @@ ProfId1US=ID Prof (FEIN) ProfId1RO=ID Prof 1 (CUI) ProfId2RO=ID Prof 2 (NI) ProfId3RO=ID Prof 3 (CAEN) -ProfId5RO=ID Prof 5 (EUID) +ProfId4RO=ID Prof 5 (EUID) ProfId1RU=ID Prof 1 (OGRN) ProfId2RU=ID Prof 2 (INN) ProfId3RU=ID Prof 3 (KPP) @@ -189,6 +188,7 @@ CompanyDeleted=Empresa "%s" eliminada de la base de datos ListOfContacts=Lista de contactos/direcciones ListOfContactsAddresses=Lista de contactos/direcciones ListOfThirdParties=Lista de terceros +ShowContact=Contacto-Dirección ContactType=Tipo de Contacto ContactForOrders=Contacto de la orden ContactForOrdersOrShipments=Contacto de la orden o su envío @@ -269,6 +269,7 @@ SaleRepresentativeFirstname=Nombre del vendedor SaleRepresentativeLastname=Apellido del vendedor ErrorThirdpartiesMerge=Se produjo un error al eliminar los terceros. Por favor revisa el registro. Los cambios se han reversado. NewCustomerSupplierCodeProposed=Código de cliente o proveedor ya utilizado, se ha sugerido un nuevo código +KeepEmptyIfGenericAddress=Mantenga este campo vacío si esta dirección es una dirección genérica PaymentTypeBoth=Tipo de pago - cliente y proveedor MulticurrencyUsed=Usar diferentes monedas MulticurrencyCurrency=Moneda diff --git a/htdocs/langs/es_CL/accountancy.lang b/htdocs/langs/es_CL/accountancy.lang index 4d26e87f67f..764defc64a4 100644 --- a/htdocs/langs/es_CL/accountancy.lang +++ b/htdocs/langs/es_CL/accountancy.lang @@ -13,8 +13,8 @@ DefaultForService=Predeterminado para servicio DefaultForProduct=Predeterminado para producto CantSuggest=No puedo sugerir AccountancySetupDoneFromAccountancyMenu=La mayoría de las configuraciones de la contabilidad se realizan desde el menú %s -ConfigAccountingExpert=Configuración del módulo Contabilidad Experta Journalization=Periodización +Journals=Revistas JournalFinancial=Diarios financieras BackToChartofaccounts=Volver al gráfico de cuentas Chartofaccounts=Gráfico de cuentas @@ -25,13 +25,10 @@ OverviewOfAmountOfLinesNotBound=Descripción general de la cantidad de líneas n OverviewOfAmountOfLinesBound=Descripción general de la cantidad de líneas ya vinculadas a una cuenta de contabilidad ConfirmDeleteCptCategory=¿Está seguro de que desea eliminar esta cuenta contable del grupo de cuentas contables? JournalizationInLedgerStatus=Estado de la periodización -AlreadyInGeneralLedger=Ya se ha contabilizado en libros mayores -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. CountriesInEECExceptMe=Países en EEC excepto %s -AccountantFiles=Documentos contables de exportación 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 @@ -57,7 +54,6 @@ AccountancyAreaDescBind=PASO %s: verifique que el enlace entre las líneas %s ex AccountancyAreaDescWriteRecords=PASO %s: Escriba transacciones en el Libro mayor. Para esto, vaya al menú %s, y haga clic en el botón %s. AccountancyAreaDescAnalyze=PASO %s: Agregue o edite las transacciones existentes y genere informes y exportaciones. AccountancyAreaDescClosePeriod=PASO %s: Cierre el período para que no podamos realizar modificaciones en el futuro. -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 auxiliar @@ -78,7 +74,6 @@ ExpenseReportsVentilation=Encuadernación del informe de gastos CreateMvts=Crear nueva transacción UpdateMvts=Modificación de una transacción ValidTransaction=Validar transacción -WriteBookKeeping=Registrar transacciones en Ledger Bookkeeping=Libro mayor ObjectsRef=Referencia de objeto de origen CAHTF=Total vendedor comprado antes de impuestos @@ -133,13 +128,11 @@ JournalLabel=Etiqueta de revista NumPiece=Pieza número TransactionNumShort=Num. transacción AccountingAccountGroupsDesc=Puede definir aquí algunos grupos de cuentas contables. Se usarán para informes de contabilidad personalizados. -DeleteMvt=Eliminar líneas de libro mayor DelYear=Año para borrar DelJournal=Diario para eliminar FinanceJournal=Diario de finanzas ExpenseReportsJournal=Diario de informes de gastos DescFinanceJournal=Diario financiero que incluye todos los tipos de pagos por cuenta bancaria -DescJournalOnlyBindedVisible=Esta es una vista de registro que está vinculada a una cuenta de contabilidad y se puede registrar en el Libro mayor. VATAccountNotDefined=Cuenta para el IVA no definido ThirdpartyAccountNotDefined=Cuenta para un tercero no definido ProductAccountNotDefined=Cuenta para producto no definido diff --git a/htdocs/langs/es_CL/admin.lang b/htdocs/langs/es_CL/admin.lang index fec44bde6a4..71fb8fe9887 100644 --- a/htdocs/langs/es_CL/admin.lang +++ b/htdocs/langs/es_CL/admin.lang @@ -1143,7 +1143,6 @@ FreeLegalTextOnDeliveryReceipts=Texto libre en recibos de entrega ActivateFCKeditor=Activa el editor avanzado para: FCKeditorForCompany=Creación / edición WYSIWIG de descripción y nota de elementos (excepto productos / servicios) FCKeditorForProduct=WYSIWIG creación / edición de productos / servicios descripción y nota -FCKeditorForProductDetails=Creación / edición WYSIWIG de líneas de detalles de productos para todas las entidades (propuestas, pedidos, facturas, etc.). Advertencia: el uso de esta opción para este caso no se recomienda seriamente, ya que puede crear problemas con los caracteres especiales y el formato de página al crear archivos PDF. FCKeditorForMailing=Creación / edición WYSIWIG para eMailings masivos (Herramientas-> eMailing) FCKeditorForUserSignature=Creación / edición WYSIWIG de la firma del usuario FCKeditorForMail=Creación / edición WYSIWIG para todo el correo (excepto Herramientas-> correo electrónico) @@ -1194,8 +1193,6 @@ AGENDA_USE_EVENT_TYPE=Usar tipos de eventos (administrados en el menú Configura AGENDA_USE_EVENT_TYPE_DEFAULT=Establecer automáticamente este valor predeterminado para el tipo de evento en el formulario de creación de evento AGENDA_DEFAULT_FILTER_TYPE=Configure automáticamente este tipo de evento en el filtro de búsqueda de la vista de agenda AGENDA_DEFAULT_FILTER_STATUS=Establecer automáticamente este estado para eventos en el filtro de búsqueda de la vista de agenda -AGENDA_REMINDER_EMAIL=Habilite el recordatorio de eventos por correo electrónico (la opción recordar/demorar se puede definir en cada evento). Nota: El módulo %s debe estar habilitado y configurado correctamente para que el recordatorio se envíe con la frecuencia correcta. -AGENDA_REMINDER_BROWSER=Active el recordatorio de eventos en el navegador del usuario (cuando se alcanza la fecha del evento, cada usuario puede rechazar esto de la pregunta de confirmación del navegador) AGENDA_REMINDER_BROWSER_SOUND=Habilitar notificación de sonido AGENDA_SHOW_LINKED_OBJECT=Mostrar objeto vinculado en la vista de agenda ClickToDialUrlDesc=Se llama a Url cuando se hace clic en el picto de un teléfono. En la URL, puede usar etiquetas
__ PHONETO __ que se reemplazarán por el número de teléfono de la persona a quien llamar
__ PHONEFROM __ que se reemplazará por el número de teléfono de la llamada persona (suya)
__ LOGIN __ que se reemplazará con clicktodial de inicio de sesión (definido en la tarjeta de usuario)
__ PASS __ que se reemplazará con clicktodial contraseña (definida en usuario tarjeta). diff --git a/htdocs/langs/es_CL/categories.lang b/htdocs/langs/es_CL/categories.lang index 1af6a813239..e6f54ab9caa 100644 --- a/htdocs/langs/es_CL/categories.lang +++ b/htdocs/langs/es_CL/categories.lang @@ -73,4 +73,3 @@ CategorieRecursiv=Enlace con la etiqueta / categoría principal automáticamente AddProductServiceIntoCategory=Agregue el siguiente producto / servicio ShowCategory=Mostrar etiqueta / categoría ChooseCategory=Elegir la categoría -StocksCategoriesArea=Área de Categorías de Almacenes diff --git a/htdocs/langs/es_CL/companies.lang b/htdocs/langs/es_CL/companies.lang index 51017d9026b..a1b385f9d95 100644 --- a/htdocs/langs/es_CL/companies.lang +++ b/htdocs/langs/es_CL/companies.lang @@ -79,7 +79,6 @@ ProfId4FR=Prof Id 4 (RCS / RM) ProfId1GB=Número de Registro ProfId1LU=Carné de identidad. profe. 1 (R.C.S. Luxemburgo) ProfId2LU=Carné de identidad. profe. 2 (Permiso comercial) -ProfId5MA=Carné de identidad. profe. 5 (I.C.E.) ProfId3MX=Prof Id 3 (Charter Profesional) ProfId1NL=Nummer KVK ProfId2PT=Prof Id 2 (Número de seguridad social) diff --git a/htdocs/langs/es_CL/main.lang b/htdocs/langs/es_CL/main.lang index 6895438fd44..b40800298bc 100644 --- a/htdocs/langs/es_CL/main.lang +++ b/htdocs/langs/es_CL/main.lang @@ -515,6 +515,8 @@ SearchIntoCustomerShipments=Envíos de clientes SearchIntoExpenseReports=Reporte de gastos SearchIntoLeaves=Salir SearchIntoTickets=Entradas +SearchIntoVendorPayments=Pagos de proveedores +SearchIntoMiscPayments=Pagos diversos NbComments=Numero de comentarios CommentAdded=Comentario agregado Everybody=Todos diff --git a/htdocs/langs/es_CL/website.lang b/htdocs/langs/es_CL/website.lang index 51df9222310..4f997504810 100644 --- a/htdocs/langs/es_CL/website.lang +++ b/htdocs/langs/es_CL/website.lang @@ -16,7 +16,6 @@ EditMedias=Editar medios EditPageMeta=Edita prop pag/contenedor Webpage=Página web / contenedor AddPage=Añadir página / contenedor -PageContainer=Página / contenedor PreviewOfSiteNotYetAvailable=Vista previa de su sitio web %s aún no está disponible. Primero debe ' Importar una plantilla de sitio web completa ' o simplemente ' Agregar una página / contenedor '. RequestedPageHasNoContentYet=La página solicitada con el id. %s aún no tiene contenido o el archivo de caché .tpl.php fue eliminado. Edita el contenido de la página para resolver esto. SiteDeleted=Sitio web '%s' eliminado diff --git a/htdocs/langs/es_CO/accountancy.lang b/htdocs/langs/es_CO/accountancy.lang index b6e0aacc814..ccd905cc761 100644 --- a/htdocs/langs/es_CO/accountancy.lang +++ b/htdocs/langs/es_CO/accountancy.lang @@ -12,7 +12,6 @@ ACCOUNTING_EXPORT_PREFIX_SPEC=Especifique el prefijo para el nombre del archivo. DefaultForService=Por defecto para el servicio DefaultForProduct=Predeterminado para producto CantSuggest=No puedo sugerir -ConfigAccountingExpert=Configuración del módulo experto en contabilidad. Journalization=Periodización JournalFinancial=Revistas financieras BackToChartofaccounts=Tabla de retorno de cuentas @@ -24,8 +23,6 @@ OverviewOfAmountOfLinesNotBound=Resumen de la cantidad de líneas no vinculadas OverviewOfAmountOfLinesBound=Resumen de la cantidad de líneas ya unidas a una cuenta contable DeleteCptCategory=Eliminar cuenta contable del grupo JournalizationInLedgerStatus=Estado de la periodización -AlreadyInGeneralLedger=Ya publicado en libros de contabilidad. -NotYetInGeneralLedger=Aún no se ha publicado en los libros de contabilidad. GroupIsEmptyCheckSetup=El grupo está vacío, verifique la configuración del grupo de contabilidad personalizado DetailByAccount=Mostrar detalle por cuenta AccountWithNonZeroValues=Cuentas con valores distintos de cero. @@ -53,7 +50,6 @@ AccountancyAreaDescBind=PASO %s: verifique el enlace entre las líneas %s existe AccountancyAreaDescWriteRecords=PASO %s: Escriba transacciones en el Libro mayor. Para esto, vaya al menú %s y haga clic en el botón %s . AccountancyAreaDescAnalyze=PASO %s: agregue o edite transacciones existentes y genere informes y exportaciones. AccountancyAreaDescClosePeriod=PASO %s: Cierre el período para que no podamos realizar modificaciones en el futuro. -TheJournalCodeIsNotDefinedOnSomeBankAccount=Un paso obligatorio en la configuración no se completó (el diario del código contable no está definido para todas las cuentas bancarias) Selectchartofaccounts=Seleccionar plan de cuentas activo ChangeAndLoad=Cambio y carga ShowAccountingAccount=Mostrar cuenta contable @@ -114,14 +110,11 @@ TransactionNumShort=Num. transacción GroupByAccountAccounting=Grupo por cuenta contable AccountingAccountGroupsDesc=Puede definir aquí algunos grupos de cuentas contables. Serán utilizados para informes contables personalizados. ByPredefinedAccountGroups=Por grupos predefinidos. -DeleteMvt=Eliminar líneas de libro mayor DelYear=Año para borrar DelJournal=Diario para eliminar -ConfirmDeleteMvtPartial=Esto eliminará la transacción del Libro mayor (se eliminarán todas las líneas relacionadas con la misma transacción) FinanceJournal=Revista de finanzas ExpenseReportsJournal=Diario de informes de gastos DescFinanceJournal=Revista financiera que incluye todos los tipos de pagos por cuenta bancaria. -DescJournalOnlyBindedVisible=Esta es una vista de registro que está vinculada a una cuenta de contabilidad y se puede registrar en el Libro mayor. VATAccountNotDefined=Cuenta para el IVA no definido ThirdpartyAccountNotDefined=Cuenta por tercero no definida. ProductAccountNotDefined=Cuenta por producto no definido. diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang index c7b24327da4..f9161cc6931 100644 --- a/htdocs/langs/es_CO/admin.lang +++ b/htdocs/langs/es_CO/admin.lang @@ -916,7 +916,6 @@ FreeLegalTextOnDeliveryReceipts=Texto libre en los recibos de entrega ActivateFCKeditor=Activar editor avanzado para: FCKeditorForCompany=Creación / edición de WYSIWIG de elementos, descripción y nota (excepto productos / servicios) FCKeditorForProduct=WYSIWIG creación / edición de productos / servicios descripción y nota -FCKeditorForProductDetails=Creación / edición WYSIWIG de líneas de detalles de productos para todas las entidades (propuestas, pedidos, facturas, etc.). Advertencia: el uso de esta opción para este caso no se recomienda seriamente, ya que puede crear problemas con los caracteres especiales y el formato de página al crear archivos PDF. FCKeditorForMailing=Creación / edición WYSIWIG para eMailings masivos (Herramientas-> eMailing) FCKeditorForUserSignature=Creación / edición WYSIWIG de la firma del usuario. FCKeditorForMail=Creación / edición WYSIWIG para todo el correo (excepto Herramientas-> eMailing) @@ -966,8 +965,6 @@ AGENDA_USE_EVENT_TYPE=Usar tipos de eventos (administrados en el menú Configura AGENDA_USE_EVENT_TYPE_DEFAULT=Establecer automáticamente este valor predeterminado para el tipo de evento en el formulario de creación de evento AGENDA_DEFAULT_FILTER_TYPE=Configure automáticamente este tipo de evento en el filtro de búsqueda de la vista de agenda AGENDA_DEFAULT_FILTER_STATUS=Establecer automáticamente este estado para eventos en el filtro de búsqueda de la vista de agenda -AGENDA_REMINDER_EMAIL=Habilite el recordatorio del evento por correos electrónicos (la opción de recordatorio / retraso se puede definir en cada evento). Nota: el módulo %s debe estar habilitado y configurado correctamente para que se envíe un recordatorio con la frecuencia correcta. -AGENDA_REMINDER_BROWSER=Habilite el recordatorio de evento en el navegador del usuario (cuando se alcanza la fecha del evento, cada usuario puede rechazar esto de la pregunta de confirmación del navegador) AGENDA_REMINDER_BROWSER_SOUND=Habilitar notificación de sonido AGENDA_SHOW_LINKED_OBJECT=Mostrar objeto vinculado en vista de agenda ClickToDialSetup=Haga clic para configurar el módulo de marcado. diff --git a/htdocs/langs/es_CO/banks.lang b/htdocs/langs/es_CO/banks.lang index 026dd844524..56fc77c7d64 100644 --- a/htdocs/langs/es_CO/banks.lang +++ b/htdocs/langs/es_CO/banks.lang @@ -7,3 +7,4 @@ StatusAccountOpened=Activo StatusAccountClosed=Cerrado SocialContributionPayment=Pago de impuestos sociales / fiscales TransferTo=A +Graph=Graficas diff --git a/htdocs/langs/es_CO/categories.lang b/htdocs/langs/es_CO/categories.lang index c3bc80d45d8..bd65c7847a9 100644 --- a/htdocs/langs/es_CO/categories.lang +++ b/htdocs/langs/es_CO/categories.lang @@ -1,3 +1,4 @@ # Dolibarr language file - Source file is en_US - categories Rubriques=Etiquetas / Categorías +ImpossibleAddCat=Imposible agregar etiqueta/categoria %s ExtraFieldsCategories=Atributos complementarios diff --git a/htdocs/langs/es_CO/website.lang b/htdocs/langs/es_CO/website.lang deleted file mode 100644 index 66f7e531a9a..00000000000 --- a/htdocs/langs/es_CO/website.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - website -PageContainer=Página diff --git a/htdocs/langs/es_EC/accountancy.lang b/htdocs/langs/es_EC/accountancy.lang index c67b47aa30f..ffe1b3a23e6 100644 --- a/htdocs/langs/es_EC/accountancy.lang +++ b/htdocs/langs/es_EC/accountancy.lang @@ -10,7 +10,7 @@ ACCOUNTING_EXPORT_PREFIX_SPEC=Especifique el prefijo para el nombre de archivo DefaultForService=Predeterminado para servicio CantSuggest=No puedo sugerir AccountancySetupDoneFromAccountancyMenu=La mayoría de la configuración de la contabilidad se realiza desde el menú%s -ConfigAccountingExpert=Configuración del experto en contabilidad de módulos +Journals=Revistas JournalFinancial=Revistas financieras BackToChartofaccounts=Retorno gráfico de cuentas Chartofaccounts=Catálogo de cuentas @@ -22,8 +22,6 @@ OverviewOfAmountOfLinesBound=Descripción general de la cantidad de líneas ya v DeleteCptCategory=Eliminar cuenta de contabilidad del grupo ConfirmDeleteCptCategory=¿Está seguro de que desea eliminar esta cuenta contable del grupo de cuentas contables? JournalizationInLedgerStatus=Estado de la publicación -AlreadyInGeneralLedger=Ya registrado en diarios -NotYetInGeneralLedger=No se ha registrado en los libros mayores GroupIsEmptyCheckSetup=El grupo está vacío, compruebe la configuración del grupo de contabilidad personalizado DetailByAccount=Mostrar detalles por cuenta AccountWithNonZeroValues=Cuentas con valores distintos de cero. @@ -52,7 +50,6 @@ AccountancyAreaDescBind=PASO%s: Compruebe la vinculación entre las líneas%s ex AccountancyAreaDescWriteRecords=PASO%s: Escribir transacciones en el Libro mayor. Para ello, vaya al menú %s y haga clic en el botón %s. AccountancyAreaDescAnalyze=PASO%s: Añadir o editar transacciones existentes y generar informes y exportaciones. AccountancyAreaDescClosePeriod=PASO%s: Período de cierre para que no podamos hacer modificaciones en un futuro. -TheJournalCodeIsNotDefinedOnSomeBankAccount=Un paso obligatorio en la instalación no estaba completo (diario de código de contabilidad no definido para todas las cuentas bancarias) Selectchartofaccounts=Seleccionar el plan de cuentas activo Addanaccount=Agregar una cuenta de contabilidad AccountAccounting=Cuenta de contabilidad @@ -74,7 +71,6 @@ ExpenseReportsVentilation=Relación de informes de gastos CreateMvts=Crear nueva transacción UpdateMvts=Modificación de una transacción ValidTransaction=Validar transacción -WriteBookKeeping=Registrar transacciones en Ledger Bookkeeping=Libro mayor ObjectsRef=Objeto fuente ref CAHTF=Proveedor de compra total antes de impuestos @@ -132,14 +128,11 @@ NumPiece=Número de pieza TransactionNumShort=Num. transacción GroupByAccountAccounting=Grupo por cuenta contable AccountingAccountGroupsDesc=Puede definir aquí algunos grupos de cuentas contables. Se usarán para informes de contabilidad personalizados. -DeleteMvt=Eliminar líneas de libro mayor DelMonth=Mes para borrar DelJournal=Diario para borrar -ConfirmDeleteMvt=Esto eliminará todas las líneas del Libro mayor para el año / mes y / o de una revista específica (se requiere al menos un criterio). Deberá volver a utilizar la función 'Registro en contabilidad' para que el registro eliminado vuelva al libro mayor. FinanceJournal=Diario de finanzas ExpenseReportsJournal=Diario de informes de gastos DescFinanceJournal=Revista financiera que incluye todos los tipos de pagos por cuenta bancaria -DescJournalOnlyBindedVisible=Esta es una vista de registro que está vinculada a una cuenta de contabilidad y se puede registrar en el Libro mayor. VATAccountNotDefined=Cuenta IVA no definida ThirdpartyAccountNotDefined=Cuenta para terceros no definida ProductAccountNotDefined=Cuenta para producto no definido diff --git a/htdocs/langs/es_EC/admin.lang b/htdocs/langs/es_EC/admin.lang index b38cb1a0d94..63854f4450c 100644 --- a/htdocs/langs/es_EC/admin.lang +++ b/htdocs/langs/es_EC/admin.lang @@ -1218,7 +1218,6 @@ FreeLegalTextOnDeliveryReceipts=Texto libre en los recibos de entrega ActivateFCKeditor=Activar editor avanzado para: FCKeditorForCompany=WYSIWIG creación / edición de elementos descripción y nota (excepto productos / servicios) FCKeditorForProduct=WYSIWIG creación / edición de productos / servicios descripción y nota -FCKeditorForProductDetails=Creación / edición WYSIWIG de líneas de detalles de productos para todas las entidades (propuestas, pedidos, facturas, etc.). eMailing) FCKeditorForUserSignature=WYSIWIG creación / edición de firma de usuario FCKeditorForMail=WYSIWIG Creación / edición para todo el correo (excepto Herramientas-> eMailing) @@ -1269,8 +1268,6 @@ AGENDA_USE_EVENT_TYPE=Usar tipos de eventos (administrados en el menú Configura AGENDA_USE_EVENT_TYPE_DEFAULT=Establecer automáticamente este valor predeterminado para el tipo de evento en el formulario de creación de evento AGENDA_DEFAULT_FILTER_TYPE=Configure automáticamente este tipo de evento en el filtro de búsqueda de la vista de agenda AGENDA_DEFAULT_FILTER_STATUS=Establecer automáticamente este estado para eventos en el filtro de búsqueda de la vista de agenda -AGENDA_REMINDER_EMAIL=Habilite el recordatorio de eventos por correo electrónico (la opción recordar / demora se puede definir en cada evento). Nota: El módulo %s debe estar habilitado y configurado correctamente para enviar un recordatorio a la frecuencia correcta. -AGENDA_REMINDER_BROWSER=Habilite el recordatorio de evento en el navegador del usuario (cuando se alcanza la fecha del evento, cada usuario puede rechazar esto de la pregunta de confirmación del navegador) AGENDA_REMINDER_BROWSER_SOUND=Habilitar la notificación de sonido AGENDA_SHOW_LINKED_OBJECT=Mostrar objeto relacionado en la vista de la agenda ClickToDialSetup=Configuración del módulo - Haga clic para marcar diff --git a/htdocs/langs/es_EC/categories.lang b/htdocs/langs/es_EC/categories.lang index ae193783e1d..48cdc8b6202 100644 --- a/htdocs/langs/es_EC/categories.lang +++ b/htdocs/langs/es_EC/categories.lang @@ -57,5 +57,3 @@ ExtraFieldsCategories=Atributos complementarios CategorieRecursiv=Vincular automáticamente con la etiqueta/categoría principal AddProductServiceIntoCategory=Agregue el siguiente producto/servicio ChooseCategory=Elegir la categoría -StocksCategoriesArea=Área de Categorías de Almacenes -ActionCommCategoriesArea=Área de Categorías de Eventos diff --git a/htdocs/langs/es_EC/companies.lang b/htdocs/langs/es_EC/companies.lang index 067eeb2932e..398cf5448d1 100644 --- a/htdocs/langs/es_EC/companies.lang +++ b/htdocs/langs/es_EC/companies.lang @@ -117,7 +117,6 @@ ProfId4IN=ID Prof. 4 ProfId5IN=ID Prof. 5 ProfId1LU=ID Prof. 1 (R.C.S. Luxembourg) ProfId2LU=ID Prof. 2 (Permiso de negocio) -ProfId5MA=ID Prof. 5 (I.C.E.) ProfId1MX=ID Prof. 1 (R.F.C). ProfId2MX=ID Prof. 2 (R..P. IMSS) ProfId3MX=ID Prof. 3 (Profesional Charter) @@ -134,7 +133,7 @@ ProfId1US=Id del Prof (FEIN) ProfId1RO=Id profesional 1 (CUI) ProfId2RO=Id profesional 2 (Nr. Înmatriculare) ProfId3RO=Id profesional 3 (CAEN) -ProfId5RO=Id profesional 5 (EUID) +ProfId4RO=Id profesional 5 (EUID) ProfId1RU=ID Prof. 1 (OGRN) ProfId2RU=ID Prof. 2 (INN) ProfId3RU=ID Prof. 3 (KPP) diff --git a/htdocs/langs/es_EC/main.lang b/htdocs/langs/es_EC/main.lang index a8b753d0290..f7bc16c0fc9 100644 --- a/htdocs/langs/es_EC/main.lang +++ b/htdocs/langs/es_EC/main.lang @@ -534,6 +534,7 @@ SearchIntoSupplierProposals=Propuestas del vendedor SearchIntoCustomerShipments=Envíos de clientes SearchIntoExpenseReports=Reporte de gastos SearchIntoLeaves=Hoja +SearchIntoVendorPayments=Pagos a proveedores CommentPage=Espacio para comentarios Everybody=Todos AssignedTo=Asignado a diff --git a/htdocs/langs/es_EC/website.lang b/htdocs/langs/es_EC/website.lang index f13a3162157..fb174b10601 100644 --- a/htdocs/langs/es_EC/website.lang +++ b/htdocs/langs/es_EC/website.lang @@ -14,7 +14,6 @@ EditCss=Editar propiedades web EditMenu=Editar menú EditPageMeta=Editar propiedades Webpage=Página web/contenedor -HomePage=Página Principal PreviewOfSiteNotYetAvailable=Vista previa de su sitio web %s aún no disponible. Primero debe 'Importar una plantilla de sitio web completa' o simplemente 'Agregar una página / contenedor'. RequestedPageHasNoContentYet=La página solicitada con id %s todavía no tiene contenido o el archivo de caché .tpl.php fue eliminado. Editar el contenido de la página para resolver esto. PageContent=Página/Contenair diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang index 1540bdb2286..62560e80262 100644 --- a/htdocs/langs/es_ES/accountancy.lang +++ b/htdocs/langs/es_ES/accountancy.lang @@ -339,6 +339,8 @@ Modelcsv_configurable=Exportación CSV Configurable Modelcsv_FEC=Exportación FEC Modelcsv_Sage50_Swiss=Exportación a Sage 50 Suiza Modelcsv_winfic=Exportar Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) 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 2fa0011349e..12d860d8ecc 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -836,10 +836,10 @@ Permission402=Crear/modificar haberes Permission403=Validar haberes Permission404=Eliminar haberes Permission430=Usa barra de debug -Permission511=Read payments of salaries (yours and subordinates) +Permission511=Leer pagos de salarios (suyos y subordinados) Permission512=Crear/modificar pagos de salarios Permission514=Eliminar pagos de salarios -Permission517=Read payments of salaries of everybody +Permission517=Leer pagos de salarios de todos Permission519=Exportar salarios Permission520=Consultar Créditos Permission522=Crear/modificar Créditos @@ -1314,6 +1314,7 @@ PHPModuleLoaded=El componente PHP %s está cargado PreloadOPCode=Se utiliza OPCode precargado AddRefInList=Mostrar código de cliente/proveedor en los listados (y selectores) y enlaces.
Los terceros aparecerán con el nombre "CC12345 - SC45678 - The big company coorp", en lugar de "The big company coorp". AddAdressInList=Mostrar la dirección del cliente/proveedor en los listados (y selectores)
Los terceros aparecerán con el nombre "The big company coorp - 21 jump street 123456 Big town - USA ", en lugar de "The big company coorp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Consultar por el método preferido de envío a terceros. FieldEdition=Edición del campo %s FillThisOnlyIfRequired=Ejemplo: +2 (Complete sólo si se registra una desviación del tiempo en la exportación) @@ -1420,6 +1421,7 @@ AdherentMailRequired=E-Mail obligatorio para crear un miembro nuevo MemberSendInformationByMailByDefault=Casilla de verificación para enviar el correo de confirmación (validación ó nueva cotización) a los miembros es por defecto "sí" VisitorCanChooseItsPaymentMode=El visitante puede elegir entre los modos de pago disponibles MEMBER_REMINDER_EMAIL=Habilitar recordatorio de eventos por e-mail de suscripciones expiradas. Nota: El módulo %s debe estar habilitado y configurado correctamente para que el recordatorio se envíe. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=Configuración del módulo LDAP LDAPGlobalParameters=Parámetros globales @@ -1670,7 +1672,7 @@ AdvancedEditor=Editor avanzado ActivateFCKeditor=Activar editor avanzado para : FCKeditorForCompany=Creación/edición WYSIWIG de la descripción y notas de los terceros FCKeditorForProduct=Creación/edición WYSIWIG de la descripción y notas de los productos/servicios -FCKeditorForProductDetails=Creación/edición WYSIWIG de las líneas de detalle de los productos (pedidos, presupuestos, facturas, etc.). Atención: El uso de esta opción no es recomendable ya que puede crear problemas con los caracteres especiales y el formateo de página al generar archivos PDF. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= Creación/edición WYSIWIG de los E-Mails (Utilidades->E-Mailings) FCKeditorForUserSignature=Creación/edición WYSIWIG de la firma de usuarios FCKeditorForMail=Creación/edición WYSIWIG de todos los e-mails ( excepto Utilidades->E-Mailings) @@ -1736,9 +1738,10 @@ 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 vista por defecto al seleccionar el menú Agenda -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=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Activar sonido de notificación +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Mostrar el link en la agenda ##### Clicktodial ##### ClickToDialSetup=Configuración del módulo Click To Dial diff --git a/htdocs/langs/es_ES/banks.lang b/htdocs/langs/es_ES/banks.lang index ecd31149c25..38c78945dc7 100644 --- a/htdocs/langs/es_ES/banks.lang +++ b/htdocs/langs/es_ES/banks.lang @@ -37,7 +37,7 @@ IbanValid=BAN válido IbanNotValid=BAN no válido StandingOrders=Domiciliaciones StandingOrder=Domiciliación -PaymentByDirectDebit=Payment by direct debit +PaymentByDirectDebit=Cobro por domiciliación bancaria PaymentByBankTransfers=Pagos por transferencia bancaria PaymentByBankTransfer=Pago por transferencia bancaria AccountStatement=Extracto @@ -106,8 +106,8 @@ SupplierInvoicePayment=Pago a proveedor SubscriptionPayment=Pago cuota WithdrawalPayment=Domiciliación SocialContributionPayment=Pago impuesto social/fiscal -BankTransfer=Credit transfer -BankTransfers=Credit transfers +BankTransfer=Transferencia bancaria +BankTransfers=Transferencias bancarias MenuBankInternalTransfer=Transferencia interna TransferDesc=Al crear una transferencia de una de sus cuentas bancarias hacia otra, Dolibarr crea dos registros contables (uno de débito en una cuenta y otro de crédito, del mismo importe, en la otra cuenta. Se utiliza para los dos registros la misma etiqueta de transferencia y la misma fecha) TransferFrom=De @@ -166,6 +166,9 @@ VariousPayment=Pago varios VariousPayments=Pagos varios ShowVariousPayment=Mostrar pago varios AddVariousPayment=Añadir pago varios +VariousPaymentId=ID de pago varios +VariousPaymentLabel=Etiqueta de pago miscelánea +ConfirmCloneVariousPayment=Confirmar el clon de un pago misceláneo SEPAMandate=Mandato SEPA YourSEPAMandate=Su mandato SEPA FindYourSEPAMandate=Este es su mandato SEPA para autorizar a nuestra empresa a realizar un petición de débito directo a su banco. Gracias por devolverlo firmado (escaneo del documento firmado) o enviado por correo a @@ -176,3 +179,4 @@ BankColorizeMovement=Colorear movimientos BankColorizeMovementDesc=Si esta función está activada, puede elegir un color de fondo específico para los movimientos de débito o crédito BankColorizeMovementName1=Color de fondo para el movimiento de débito BankColorizeMovementName2=Color de fondo para el movimiento de crédito +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/es_ES/categories.lang b/htdocs/langs/es_ES/categories.lang index 7b8ec9d86bd..a48a95c6da2 100644 --- a/htdocs/langs/es_ES/categories.lang +++ b/htdocs/langs/es_ES/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Configuración de etiquetas/categorías CategorieRecursiv=Enlazar con la etiqueta/categoría automáticamente CategorieRecursivHelp=Si la opción está activada, cuando agrega un producto a una subcategoría, el producto también se agregará a la categoría principal. AddProductServiceIntoCategory=Añadir el siguiente producto/servicio +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Mostrar etiqueta/categoría ByDefaultInList=Por defecto en lista ChooseCategory=Elija una categoría -StocksCategoriesArea=Área Categorías de Almacenes -ActionCommCategoriesArea=Área Categorías de Eventos -WebsitePagesCategoriesArea=Área de categorías de contenedores de páginas +StocksCategoriesArea=Categorías de almacenes +ActionCommCategoriesArea=Categorías de eventos +WebsitePagesCategoriesArea=Categorías de contenedor de página UseOrOperatorForCategories=Uso u operador para categorías diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang index 1ceb2726c47..6a1e2a35020 100644 --- a/htdocs/langs/es_ES/companies.lang +++ b/htdocs/langs/es_ES/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=ABN ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=N° colegiado ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Número federado ProfId4CH=Num registro de comercio -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=R.U.T. ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Id prof. 1 (USt.-IdNr) ProfId2DE=Id prof. 2 (USt.-Nr) ProfId3DE=Id prof. 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=CIF/NIF ProfId2ES=Núm. seguridad social ProfId3ES=CNAE ProfId4ES=Núm. colegiado -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=SIREN ProfId2FR=SIRET ProfId3FR=NAF (Ex APE) ProfId4FR=RCS/RM -ProfId5FR=- +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Número registro ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Id prof. 3 ProfId4IN=Id prof. 4 ProfId5IN=Id prof. 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Business permit) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (R.C.) ProfId2MA=Id prof. 2 (Patente) ProfId3MA=Id prof. 3 (I.F.) ProfId4MA=Id prof. 4 (C.N.S.S.) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=R.F.C. ProfId2MX=Registro Patronal IMSS @@ -220,13 +225,13 @@ ProfId1NL=Número KVK ProfId2NL=- ProfId3NL=- ProfId4NL=- -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=NIPC ProfId2PT=Núm. seguridad social ProfId3PT=Num reg. comercial ProfId4PT=Conservatorio -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=CUI ProfId2RO=Prof ID 2 (Numero de registro) ProfId3RO=CAEN -ProfId4RO=- -ProfId5RO=EUID +ProfId4RO=EUID +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=OGRN ProfId2RU=INN @@ -354,6 +359,7 @@ VATIntraManualCheck=Puede también realizar una verificación manual en la web d ErrorVATCheckMS_UNAVAILABLE=Comprobación imposible. El servicio de comprobación no es prestado por el país país miembro (%s). NorProspectNorCustomer=Ni cliente, ni cliente potencial JuridicalStatus=Forma jurídica +Workforce=Personal Staff=Empleados ProspectLevelShort=Potencial ProspectLevel=Cliente potencial @@ -456,3 +462,8 @@ PaymentTermsSupplier=Condiciones de pago - Proveedor PaymentTypeBoth=Tipo de pago: cliente y proveedor MulticurrencyUsed=Usar Multimoneda MulticurrencyCurrency=Divisa +InEEC=Europa (CEE) +RestOfEurope=Resto de Europa (CEE) +OutOfEurope=Fuera de Europa (CEE) +CurrentOutstandingBillLate=Factura actual pendiente con retraso +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Tenga cuidado, dependiendo de la configuración del precio de su producto, debe cambiar de tercero antes de agregar el producto al POS. diff --git a/htdocs/langs/es_ES/hrm.lang b/htdocs/langs/es_ES/hrm.lang index d3d06082c67..29509408597 100644 --- a/htdocs/langs/es_ES/hrm.lang +++ b/htdocs/langs/es_ES/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=R.R.H.H. - Puestos de trabajo Employees=Empleados Employee=Empleado NewEmployee=Nuevo empleado +ListOfEmployees=Listado de empleados diff --git a/htdocs/langs/es_ES/languages.lang b/htdocs/langs/es_ES/languages.lang index ad58634371b..d8a30708395 100644 --- a/htdocs/langs/es_ES/languages.lang +++ b/htdocs/langs/es_ES/languages.lang @@ -1,11 +1,11 @@ # Dolibarr language file - Source file is en_US - languages -Language_am_ET=Ethiopian +Language_am_ET=Etíope Language_ar_AR=Árabe Language_ar_EG=Árabe (Egipto) Language_ar_SA=Árabe -Language_az_AZ=Azerbaijani +Language_az_AZ=Azerbaiyano Language_bn_BD=Bengalí -Language_bn_IN=Bengali (India) +Language_bn_IN=Bengalí (India) Language_bg_BG=Búlgaro Language_bs_BA=Bosnio Language_ca_ES=Catalán @@ -23,7 +23,7 @@ Language_en_GB=Inglés (Reino Unido) Language_en_IN=Inglés (India) Language_en_NZ=Inglés (Nueva Zelanda) Language_en_SA=Inglés (Arabia Saudita) -Language_en_SG=English (Singapore) +Language_en_SG=Inglés (Singapur) Language_en_US=Inglés (Estados Unidos) Language_en_ZA=Inglés (Sudáfrica) Language_es_ES=Español @@ -33,15 +33,16 @@ Language_es_CL=Español (Chile) Language_es_CO=Español (Colombia) Language_es_DO=Español (República Dominicana) Language_es_EC=Español (Ecuador) -Language_es_GT=Spanish (Guatemala) +Language_es_GT=Español (Guatemala) Language_es_HN=Español (Honduras) Language_es_MX=Español (México) 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_US=Spanish (USA) Language_es_UY=Español (Uruguay) -Language_es_GT=Spanish (Guatemala) +Language_es_GT=Español (Guatemala) Language_es_VE=Español (Venezuela) Language_et_EE=Estonio Language_eu_ES=Vasco @@ -50,14 +51,14 @@ Language_fi_FI=Finés Language_fr_BE=Francés (Bélgica) Language_fr_CA=Francés (Canadá) Language_fr_CH=Francés (Suiza) -Language_fr_CI=French (Cost Ivory) -Language_fr_CM=French (Cameroun) +Language_fr_CI=Francés (Costa de Marfil) +Language_fr_CM=Francés (Camerún) Language_fr_FR=Francés -Language_fr_GA=French (Gabon) +Language_fr_GA=Francés (Gabón) Language_fr_NC=Francés (Nueva Caledonia) -Language_fr_SN=French (Senegal) +Language_fr_SN=Francés (Senegal) Language_fy_NL=Frisio -Language_gl_ES=Galician +Language_gl_ES=Gallego Language_he_IL=Hebreo Language_hi_IN=Hindi (India) Language_hr_HR=Croata @@ -65,7 +66,7 @@ Language_hu_HU=Húngaro Language_id_ID=Indonesio Language_is_IS=Islandés Language_it_IT=Italiano -Language_it_CH=Italian (Switzerland) +Language_it_CH=Italiano (Suiza) Language_ja_JP=Japonés Language_ka_GE=Georgiano Language_km_KH=Jemer @@ -77,7 +78,7 @@ Language_lv_LV=Latvio Language_mk_MK=Macedonio Language_mn_MN=Mongol Language_nb_NO=Noruego (Bokmål) -Language_ne_NP=Nepali +Language_ne_NP=Nepalí Language_nl_BE=Neerlandés (Bélgica) Language_nl_NL=Holandés Language_pl_PL=Polaco @@ -100,5 +101,5 @@ Language_uz_UZ=Uzbeco Language_vi_VN=Vietnamita Language_zh_CN=Chino Language_zh_TW=Chino (Tradicional) -Language_zh_HK=Chinese (Hong Kong) +Language_zh_HK=Chino (Hong Kong) Language_bh_MY=Malayo diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang index 50b1ff7c9c7..e60664f5d0f 100644 --- a/htdocs/langs/es_ES/main.lang +++ b/htdocs/langs/es_ES/main.lang @@ -197,6 +197,7 @@ ReOpen=Reabrir Upload=Enviar archivo ToLink=Enlace Select=Seleccionar +SelectAll=Select all Choose=Elegir Resize=Redimensionar ResizeOrCrop=Cambiar el tamaño o cortar @@ -257,6 +258,7 @@ Cards=Fichas Card=Ficha Now=Ahora HourStart=Hora de inicio +Deadline=Deadline Date=Fecha DateAndHour=Fecha y hora DateToday=Fecha de hoy @@ -265,8 +267,10 @@ DateStart=Fecha de inicio DateEnd=Fecha de fin DateCreation=Fecha de creación DateCreationShort=Fecha creación +IPCreation=Creation IP DateModification=Fecha de modificación DateModificationShort=Fecha modif. +IPModification=Modification IP DateLastModification=Última fecha de modificación DateValidation=Fecha de validación DateClosing=Fecha de cierre @@ -1102,3 +1106,4 @@ SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=El token de seguridad UpToDate=A hoy OutOfDate=Fuera de plazo EventReminder=Recordatorio evento +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/es_ES/mrp.lang b/htdocs/langs/es_ES/mrp.lang index 1893c410479..34538f681bb 100644 --- a/htdocs/langs/es_ES/mrp.lang +++ b/htdocs/langs/es_ES/mrp.lang @@ -76,4 +76,5 @@ ProductsToProduce=Productos para producir UnitCost=Costo unitario TotalCost=Coste total BOMTotalCost=El costo para producir esta Lista de Materiales en función del costo de cada cantidad y producto a consumir (use el precio de costo si está definido, de lo contrario, el precio promedio ponderado si está definido, o el mejor precio de compra) -GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +GoOnTabProductionToProduceFirst=Primero debe haber iniciado la producción para cerrar una orden de fabricación (consulte la pestaña '%s'). Pero puedes cancelarlo. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/es_ES/website.lang b/htdocs/langs/es_ES/website.lang index cea9424a904..56cb631183f 100644 --- a/htdocs/langs/es_ES/website.lang +++ b/htdocs/langs/es_ES/website.lang @@ -16,7 +16,7 @@ WEBSITE_ROBOT=Archivo de robots (robots.txt) WEBSITE_HTACCESS=Archivo .htaccess del sitio web WEBSITE_MANIFEST_JSON=Archivo manifest.json del sitio web WEBSITE_README=Archivo README.md -WEBSITE_KEYWORDSDesc=Use a comma to separate values +WEBSITE_KEYWORDSDesc=Usar coma para separar valores EnterHereLicenseInformation=Ingrese aquí metadatos o información de licencia para llenar un archivo README.md. si distribuye su sitio web como plantilla, el archivo se incluirá en el paquete template. 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. @@ -31,7 +31,7 @@ AddWebsite=Añadir sitio web Webpage=Página web/Contenedor AddPage=Añadir página/contenedor HomePage=Página de inicio -PageContainer=Página/contenedor +PageContainer=Página PreviewOfSiteNotYetAvailable=La vista previa de su sitio web %s aún no está disponible. Primero debe 'Importar una plantilla de sitio web completa' o simplemente 'Agregar una página/contenedor'. 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. SiteDeleted=Sitio web '%s' eliminado @@ -58,10 +58,10 @@ NoPageYet=No hay páginas todavía YouCanCreatePageOrImportTemplate=Puede crear una nueva página o importar una plantilla de sitio web completa 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, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.

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

You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):
<?php redirectToContainer('alias_of_container_to_redirect_to'); ?>

To add a link to another page, use the syntax:
<a href="alias_of_page_to_link_to.php">mylink<a>

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 directory for public access), syntax is:
<img src="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
+YouCanEditHtmlSource=
Puede incluir código PHP en este fuente usando los tags <?php ?>. Dispone de estas variables globales: $conf, $langs, $db, $mysoc, $user, $website.

También puede incluir contenido de otra Página/Contenedor con la siguiente sintaxis:
<?php includeContainer('alias_of_container_to_include'); ?>

Para incluir un enlace para descargar un archivo guardado en el directorio documents, use el wrapper document.php :
Por ejemplo, para un archivo de documents/ecm (es necesario estar logueado), la sintaxis:
<a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
Para un archivo de into documents/medias (directorio abierto para acceso público), la sintaxis es:
<a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
Para un archivo compartido mediante un enlace compartido (acceso abierto utilizando la clave hash para compartir del archivo), la sintaxis es:
<a href="/document.php?hashp=publicsharekeyoffile">

Para incluir una imagen guardada en el directorio documents , use el wrapper viewimage.php :
Ejemplo para una imagen de documents/medias (acceso abierto), la sintaxis es:
<a href="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
#YouCanEditHtmlSource2=
To include a image shared publicaly, use the viewimage.php wrapper:
Example with a shared key 123456789, syntax is:
<img src="/viewimage.php?hashp=12345679012...">
-YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), syntax is:
<img src="/viewimage.php?hashp=12345679012...">
-YouCanEditHtmlSourceMore=
More examples of HTML or dynamic code available on the wiki documentation
. +YouCanEditHtmlSource2=Para una imagen compartida con un enlace para compartir (acceso abierto usando la clave hash para compartir del archivo), la sintaxis es:
<img src="/viewimage.php? Hashp=12345679012 ...">
+YouCanEditHtmlSourceMore=
Más ejemplos de código HTML o dinámico disponibles en la documentación wiki
. ClonePage=Clonar página/contenedor CloneSite=Clonar sitio SiteAdded=Sitio web agregado @@ -124,7 +124,7 @@ ShowSubContainersOnOff=El modo para ejecutar 'dynamic content' es %s GlobalCSSorJS=Archivo global CSS/JS/Header del sitio web BackToHomePage=Volver a la página de inicio... TranslationLinks=Enlaces de traducción -YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not available.
(ref=%s, type=%s, status=%s) +YouTryToAccessToAFileThatIsNotAWebsitePage=Intenta acceder a una página que no está disponible.
(ref=%s, tipo=%s, estado=%s) UseTextBetween5And70Chars=Para buenas prácticas de SEO, use un texto de entre 5 y 70 caracteres. MainLanguage=Lenguaje principal OtherLanguages=Otros idiomas @@ -134,4 +134,6 @@ AvailableLanguagesAreDefinedIntoWebsiteProperties=Los idiomas disponibles se def ReplacementDoneInXPages=Reemplazo realizado en páginas o contenedores %s RSSFeed=Hilos RSS RSSFeedDesc=Puede obtener una fuente RSS de los últimos artículos con el tipo 'blogpost' usando esta URL -PagesRegenerated=%s page(s)/container(s) regenerated +PagesRegenerated=%s página(s)/contenedor(s) regenerados +RegenerateWebsiteContent=Regenerar archivos de caché del sitio web +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/es_MX/accountancy.lang b/htdocs/langs/es_MX/accountancy.lang index 37fdb0db710..073d5f060b7 100644 --- a/htdocs/langs/es_MX/accountancy.lang +++ b/htdocs/langs/es_MX/accountancy.lang @@ -13,7 +13,6 @@ OverviewOfAmountOfLinesNotBound=Resumen de la cantidad de líneas no vinculadas OverviewOfAmountOfLinesBound=Resumen de la cantidad de líneas ya vinculadas a una cuenta contable DeleteCptCategory=Eliminar cuenta contable del grupo ConfirmDeleteCptCategory=¿Está seguro de que desea eliminar esta cuenta contable del grupo de cuentas contables? -AlreadyInGeneralLedger=Ya registrado en diarios 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 @@ -43,7 +42,6 @@ AccountancyAreaDescBind=PASO %s: Compruebe el enlace entre las líneas %s existe AccountancyAreaDescWriteRecords=PASO %s: Escriba las transacciones en el libro mayor. Para esto, vaya al menú %s , y haga clic en el botón %s . AccountancyAreaDescAnalyze=PASO %s: Agregue o edite transacciones existentes y genere informes y exportaciones. AccountancyAreaDescClosePeriod=PASO %s: Cierre el período para que no podamos realizar modificaciones en el futuro. -TheJournalCodeIsNotDefinedOnSomeBankAccount=No se completó un paso obligatorio en la configuración (el diario del código de contabilidad no está definido para todas las cuentas bancarias) Selectchartofaccounts=Seleccionar gráfico activo de cuentas SubledgerAccount=Cuenta auxiliar SubledgerAccountLabel=Etiqueta de la cuenta auxiliar @@ -62,7 +60,6 @@ ExpenseReportsVentilation=Enlace de reporte de gastos CreateMvts=Crear nueva transaccion UpdateMvts=Modificación de una transacción ValidTransaction=Validar transacción -WriteBookKeeping=Registrar transacciones en el Libro Mayor Bookkeeping=Libro mayor ObjectsRef=Referencia del objeto fuente CAHTF=Compra total de proveedor antes de impuestos diff --git a/htdocs/langs/es_MX/companies.lang b/htdocs/langs/es_MX/companies.lang index e03c2bd72da..94d7e8f6bd4 100644 --- a/htdocs/langs/es_MX/companies.lang +++ b/htdocs/langs/es_MX/companies.lang @@ -2,11 +2,9 @@ ErrorCompanyNameAlreadyExists=El nombre de la empresa %s ya existe. Elige uno diferente. ErrorSetACountryFirst=Ajusta primero el país SelectThirdParty=Selecciona un tercero -ConfirmDeleteCompany=¿Estás seguro que quieres borrar esta compañía y toda la información heredada? +ConfirmDeleteCompany=¿Estás seguro que quieres borrar esta compañía y toda la información relacionada? DeleteContact=Eliminar un contacto/dirección ConfirmDeleteContact=¿Estás seguro que quieres borrar este contacto y toda la información heredada? -MenuNewProspect=Nuevo prospecto -MenuNewSupplier=Nuevo vendedor NewCompany=Nueva compañía (cliente potencial, cliente, proveedor) NewThirdParty=Nuevo tercero (cleinte potencial, cliente, proveedor) CreateThirdPartyAndContact=Crear un tercero + un contacto hijo @@ -15,14 +13,13 @@ IdCompany=ID de empresa IdContact=ID de contacto ThirdPartyContacts=Contactos de terceros ThirdPartyContact=Contacto/dirección de terceros -CompanyName=Nombre de empresa +CompanyName=Nombre de la empresa AliasNames=Nombre simple (comercial, marca registrada, ...) AliasNameShort=Alias CountryIsInEEC=El país está dentro de la Comunidad Económica Europea. PriceFormatInCurrentLanguage=Formato de visualización de precios en el idioma y moneda actuales ThirdPartyEmail=Correo electrónico del tercero ThirdPartyCustomersWithIdProf12=Clientes con %s o %s -ThirdPartySuppliers=Vendedores ToCreateContactWithSameName=Creará automáticamente un contacto/dirección con la misma información en tercero. En la mayoría de los casos, incluso si su tercero es una persona física, la creación de un tercero solo es suficiente. ParentCompany=Empresa matriz ReportByQuarter=Reporte por tasa @@ -44,15 +41,15 @@ VATIsUsed=Impuesto a las ventas utilizado VATIsUsedWhenSelling=Esto define si este tercero incluye un impuesto de venta o no cuando realiza una factura a sus propios clientes VATIsNotUsed=No se utiliza impuesto sobre las ventas CopyAddressFromSoc=Copiar dirección de detalles de terceros -ThirdpartyNotCustomerNotSupplierSoNoRef=Tercero no es ni cliente ni vendedor, no hay objetos de referencia disponibles -ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Tercero no es ni cliente ni vendedor, los descuentos no están disponibles. -OverAllProposals=Propuestas +ThirdpartyNotCustomerNotSupplierSoNoRef=Tercero no es ni cliente ni proveedor, no hay objetos de referencia disponibles +ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Tercero no es ni cliente ni proveedor, los descuentos no están disponibles. +OverAllProposals=Cotizaciones OverAllSupplierProposals=Solicitudes de precios LocalTax1IsUsed=Usar segundo impuesto LocalTax1IsUsedES=RE se utiliza LocalTax2IsUsed=Usar tercer impuesto WrongCustomerCode=Código de cliente inválido -WrongSupplierCode=Código de proveedor no válido +WrongSupplierCode=Código de proveedor inválido CustomerCodeModel=Modelo de código de cliente SupplierCodeModel=Modelo de código de proveedor ProfId1Short=ID Prof. 1 @@ -102,14 +99,13 @@ ProfId1MA=ID Prof. 1 (R.C.) ProfId2MA=ID Prof. 2 (Patente) ProfId3MA=Id Prof. 3 (I.F.) ProfId4MA=ID Prof. 4 (C.N.S.S.) -ProfId5MA=ID. prof. 5 (I.C.E.) ProfId2MX=R.P. IMSS ProfId3PT=Prof Id 3 (número de registro comercial) ProfId1US=ID del profesional (FEIN) ProfId1RO=ID 1 (CUI) ProfId2RO=ID2 ( Fiscal matricule) ProfId3RO=ID 3 (CAEN) -ProfId5RO=ID 5 (EUID) +ProfId4RO=ID 5 (EUID) VATIntra=ID de IVA VATIntraShort=ID de IVA VATIntraSyntaxIsValid=La sintaxis es válida @@ -136,6 +132,7 @@ CustomerAbsoluteDiscountMy=Descuento absoluto para el cliente (autorizado por us SupplierAbsoluteDiscountAllUsers=Descuento absoluto con proveedor (dado por todos los usuarios) SupplierAbsoluteDiscountMy=Descuento absoluto con proveedor (dado por usted mismo) DiscountNone=Ninguno +Contact=Dirección de contacto Contacts=Contactos/Direcciones ContactId=ID de contacto NoContactDefinedForThirdParty=No se ha definido un contacto para este tercero @@ -157,6 +154,7 @@ CompanyDeleted=Empresa "%s" eliminada de la base de datos. ListOfContacts=Lista de contactos/direcciones ListOfContactsAddresses=Lista de contactos/direcciones ListOfThirdParties=Lista de terceros +ShowContact=Dirección de contacto ContactsAllShort=Todos (Sin filtro) ContactForOrdersOrShipments=Contacto de la orden o del envío ContactForInvoices=Contacto de facturación @@ -211,6 +209,7 @@ ListSuppliersShort=Lista de proveedores ListProspectsShort=Lista de clientes potenciales ListCustomersShort=Lista de clientes ThirdPartiesArea=Terceros/Contactos +LastModifiedThirdParties=Último %s modificado Terceros UniqueThirdParties=Total de terceros InActivity=Abierta OutstandingBillReached=Max. para la cuenta pendiente alcanzada @@ -226,7 +225,7 @@ SaleRepresentativeLogin=Inicio de sesión del representante de ventas SaleRepresentativeFirstname=Nombre del representante de ventas SaleRepresentativeLastname=Apellido del representante de ventas ErrorThirdpartiesMerge=Hubo un error al eliminar los terceros. Por favor compruebe el log. Los cambios han sido revertidos. +KeepEmptyIfGenericAddress=Mantenga este campo vacío si esta dirección es una dirección genérica PaymentTypeSupplier=Tipo de pago: proveedor -PaymentTermsSupplier=Condiciones de pago - Vendedor MulticurrencyUsed=Utilizar monedas múltiples MulticurrencyCurrency=Moneda diff --git a/htdocs/langs/es_MX/main.lang b/htdocs/langs/es_MX/main.lang index 4d0eb80f605..d2d2407adfe 100644 --- a/htdocs/langs/es_MX/main.lang +++ b/htdocs/langs/es_MX/main.lang @@ -271,5 +271,7 @@ SearchIntoSupplierOrders=Ordenes de compra SearchIntoCustomerProposals=Propuestas comerciales SearchIntoExpenseReports=Reporte de gastos AssignedTo=Asignado a +ToProcess=Procesar ContactDefault_agenda=Evento +ContactDefault_order_supplier=Orden de compra ContactDefault_propal=Cotización diff --git a/htdocs/langs/es_MX/website.lang b/htdocs/langs/es_MX/website.lang index c290dfeb729..ff12c0bdb52 100644 --- a/htdocs/langs/es_MX/website.lang +++ b/htdocs/langs/es_MX/website.lang @@ -1,4 +1,3 @@ # Dolibarr language file - Source file is en_US - website -HomePage=Página Principal NoPageYet=Sin páginas aun GrabImagesInto=Insertar también las imágenes encontradas en CSS y página. diff --git a/htdocs/langs/es_PE/accountancy.lang b/htdocs/langs/es_PE/accountancy.lang index f36dd1e717a..3fa654ee77c 100644 --- a/htdocs/langs/es_PE/accountancy.lang +++ b/htdocs/langs/es_PE/accountancy.lang @@ -9,7 +9,7 @@ ACCOUNTING_EXPORT_DEVISE=Moneda de exportación ACCOUNTING_EXPORT_PREFIX_SPEC=Especifique el prefijo del nombre del fichero DefaultForService=Servicio por defecto DefaultForProduct=Producto por defecto -ConfigAccountingExpert=Configuración del módulo experto en contabilidad +Journals=Revistas JournalFinancial=Revistas financieras BackToChartofaccounts=Retornar gráfico de cuentas Selectchartofaccounts=Seleccione el plan de cuentas activo diff --git a/htdocs/langs/es_VE/main.lang b/htdocs/langs/es_VE/main.lang index 6db9ce60111..55e67bea58a 100644 --- a/htdocs/langs/es_VE/main.lang +++ b/htdocs/langs/es_VE/main.lang @@ -38,6 +38,7 @@ ValidatePayment=Validar este pago NewAttribute=Nuevo atributo AttributeCode=Código atributo LinkToOrder=Enlazar a un pedido +Genderother=Otra Progress=Progresión Export=Exportación ExpenseReports=Gastos diff --git a/htdocs/langs/es_VE/website.lang b/htdocs/langs/es_VE/website.lang deleted file mode 100644 index 66f7e531a9a..00000000000 --- a/htdocs/langs/es_VE/website.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - website -PageContainer=Página diff --git a/htdocs/langs/et_EE/accountancy.lang b/htdocs/langs/et_EE/accountancy.lang index e6ecde693aa..682433c526e 100644 --- a/htdocs/langs/et_EE/accountancy.lang +++ b/htdocs/langs/et_EE/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Default for service DefaultForProduct=Default for product CantSuggest=Can't suggest AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s -ConfigAccountingExpert=Configuration of the module accounting expert +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Journalization -Journaux=Journals +Journals=Journals JournalFinancial=Financial journals BackToChartofaccounts=Return chart of accounts Chartofaccounts=Kontoplaan +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Current dedicated account AssignDedicatedAccountingAccount=New account to assign InvoiceLabel=Invoice label @@ -33,8 +35,8 @@ OtherInfo=Other information DeleteCptCategory=Remove accounting account from group ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group? JournalizationInLedgerStatus=Status of journalization -AlreadyInGeneralLedger=Already journalized in ledgers -NotYetInGeneralLedger=Not yet journalized in ledgers +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group DetailByAccount=Show detail by account AccountWithNonZeroValues=Accounts with non-zero values @@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC CountriesNotInEEC=Countries not in EEC CountriesInEECExceptMe=Countries in EEC except %s CountriesExceptMe=All countries except %s -AccountantFiles=Export accounting documents +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup @@ -79,7 +83,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) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Select active chart of accounts ChangeAndLoad=Change and load Addanaccount=Add an accounting account @@ -89,6 +93,8 @@ SubledgerAccount=Subledger account SubledgerAccountLabel=Subledger account label ShowAccountingAccount=Show accounting account ShowAccountingJournal=Show accounting journal +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Accounting account suggested MenuDefaultAccounts=Default accounts MenuBankAccounts=Pangakontod @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding CreateMvts=Create new transaction UpdateMvts=Modification of a transaction ValidTransaction=Validate transaction -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=Ledger +BookkeepingSubAccount=Subledger AccountBalance=Account balance ObjectsRef=Source object ref CAHTF=Total purchase vendor before tax @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Sell journal ACCOUNTING_PURCHASE_JOURNAL=Purchase journal @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups ByYear=Aasta järgi NotMatch=Not Set -DeleteMvt=Delete Ledger lines +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=Year to delete DelJournal=Journal to delete -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Finance journal ExpenseReportsJournal=Expense reports journal DescFinanceJournal=Finance journal including all the types of payments by bank account -DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Account for VAT not defined ThirdpartyAccountNotDefined=Account for third party not defined ProductAccountNotDefined=Account for product not defined @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu %s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Export draft journal @@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Chart of accounts Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang index efea0054a6d..268ecfbe48e 100644 --- a/htdocs/langs/et_EE/admin.lang +++ b/htdocs/langs/et_EE/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=Välja %s muutmine FillThisOnlyIfRequired=Näide: +2 (täida vaid siis, kui koged ajavööndi nihkega probleeme) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member MemberSendInformationByMailByDefault=Liikmetele e-kirja kinnituse saatmise (kinnitamise või uue tellimuse puhul) märkeruut on vaikimisi valitud VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=LDAP seadistamine LDAPGlobalParameters=Üldised parameetrid @@ -1670,7 +1672,7 @@ AdvancedEditor=Keerulisem toimeti ActivateFCKeditor=Aktiveeri keerulisem toimeti järgmistel lehtedel: FCKeditorForCompany=WYSIWIG loomine/muutmine elementide kirjeldustes ja märkustes (välja arvatud tooted/teenused) FCKeditorForProduct=WYSIWIG loomine/muutmine toodete/teenuste kirjeldustes ja märkustes -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG loomine/muutmine masspostitusel (Tööriistad->E-kirjad) FCKeditorForUserSignature=WYSIWIG loomine/muutmine kasutaja allkirjas FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting 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 user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view ##### Clicktodial ##### ClickToDialSetup=Click To Dial mooduli seadistamine diff --git a/htdocs/langs/et_EE/banks.lang b/htdocs/langs/et_EE/banks.lang index 9ede8f3e1e2..60e4f3457b4 100644 --- a/htdocs/langs/et_EE/banks.lang +++ b/htdocs/langs/et_EE/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=Mitmesugused maksed ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA mandate YourSEPAMandate=Your SEPA mandate FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/et_EE/categories.lang b/htdocs/langs/et_EE/categories.lang index b2ad6020b51..ac9524d0f0d 100644 --- a/htdocs/langs/et_EE/categories.lang +++ b/htdocs/langs/et_EE/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup CategorieRecursiv=Link with parent tag/category automatically CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=Add the following product/service +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Show tag/category ByDefaultInList=By default in list ChooseCategory=Choose category -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/et_EE/companies.lang b/htdocs/langs/et_EE/companies.lang index 3fe3d3aef83..7689d22553b 100644 --- a/htdocs/langs/et_EE/companies.lang +++ b/htdocs/langs/et_EE/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Reg nr 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Reg kood (Äriregistri registrikood) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof Id 1 (Federal number) ProfId4CH=Prof Id 2 (Commercial Record) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof Id 1 (R.U.T.) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr) ProfId2DE=Prof Id 2 (USt.-Nr) ProfId3DE=Prof Id 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof Id 1 (CIF / NIF) ProfId2ES=Prof Id 2 (Social security number) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (Collegiate number) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof Id 1 (sireen) ProfId2FR=Prof Id 2 (SIRET) ProfId3FR=Prof Id 3 (NAF, vana APE) ProfId4FR=Prof Id 4 (RCS / RM) -ProfId5FR=Prof Id 5 +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Registrinumber ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX) ProfId4IN=Prof Id 4 ProfId5IN=Prof Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Business permit) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (RC) ProfId2MA=Id prof. 2 (Patente) ProfId3MA=Id prof. 3 (IF) ProfId4MA=Id prof. 4 (CNSS) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof Id 1 (RFC). ProfId2MX=Prof Id 2 (R.. P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK nummer ProfId2NL=- ProfId3NL=- ProfId4NL=- -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof Id 2 (sotsiaalkindlustus number) ProfId3PT=Prof Id 3 (Commercial rekordarv) ProfId4PT=Prof Id 4 (Konservatooriumis) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof Id 1 (OGRN) ProfId2RU=Prof Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi ErrorVATCheckMS_UNAVAILABLE=Kontrollida pole võimalik. Kontrolli, et liikmesriik (%s) võimaldab teenust kasutada. NorProspectNorCustomer=Not prospect, nor customer JuridicalStatus=Legal Entity Type +Workforce=Workforce Staff=Töötajad ProspectLevelShort=Potentsiaalne ProspectLevel=Huvilise potentsiaal @@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor PaymentTypeBoth=Payment Type - Customer and Vendor MulticurrencyUsed=Use Multicurrency MulticurrencyCurrency=Valuuta +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/et_EE/hrm.lang b/htdocs/langs/et_EE/hrm.lang index 92c7798e63f..ea89f34be48 100644 --- a/htdocs/langs/et_EE/hrm.lang +++ b/htdocs/langs/et_EE/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=Töötajad Employee=Töötaja NewEmployee=New employee +ListOfEmployees=List of employees diff --git a/htdocs/langs/et_EE/languages.lang b/htdocs/langs/et_EE/languages.lang index b352df45118..ef1fe82cda5 100644 --- a/htdocs/langs/et_EE/languages.lang +++ b/htdocs/langs/et_EE/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Hispaania (Paraguay) Language_es_PE=Hispaania (Peruu) Language_es_PR=Hispaania (Puerto Rico) +Language_es_US=Spanish (USA) Language_es_UY=Spanish (Uruguay) Language_es_GT=Spanish (Guatemala) Language_es_VE=Spanish (Venezuela) diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang index c4b68666af8..813ad00b669 100644 --- a/htdocs/langs/et_EE/main.lang +++ b/htdocs/langs/et_EE/main.lang @@ -155,6 +155,7 @@ RemoveLink=Remove link AddToDraft=Add to draft Update=Uuenda Close=Sulge +CloseAs=Set status to CloseBox=Remove widget from your dashboard Confirm=Kinnita ConfirmSendCardByMail=Do you really want to send the content of this card by mail to %s? @@ -196,6 +197,7 @@ ReOpen=Ava uuesti Upload=Upload ToLink=Seosta Select=Vali +SelectAll=Select all Choose=Vali Resize=Muuda suurust ResizeOrCrop=Resize or Crop @@ -256,6 +258,7 @@ Cards=Kaardid Card=Kaart Now=Nüüd HourStart=Algustund +Deadline=Deadline Date=Kuupäev DateAndHour=Päev ja tund DateToday=Today's date @@ -264,8 +267,10 @@ DateStart=Alguskuupäev DateEnd=Lõppkuupäev DateCreation=Loomise kuupäev DateCreationShort=Creat. date +IPCreation=Creation IP DateModification=Muutmise kuupäev DateModificationShort=Muutm kuupäev +IPModification=Modification IP DateLastModification=Latest modification date DateValidation=Kinnitamise kuupäev DateClosing=Lõpetamise kuupäev @@ -319,6 +324,7 @@ Morning=Hommik Afternoon=Pärastlõuna Quadri=Kvartal MonthOfDay=Kuu päev +DaysOfWeek=Days of week HourShort=H MinuteShort=mn Rate=Määr @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency MulticurrencyAmountHT=Amount (excl. tax), original currency MulticurrencyAmountTTC=Amount (inc. of tax), original currency MulticurrencyAmountVAT=Amount tax, original currency +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Maksu summa 2 AmountLT2=Maksu summa 3 AmountLT1ES=RE summa @@ -487,6 +494,7 @@ By=Isik From=Kellelt FromDate=Kellelt FromLocation=Kellelt +at=at to=kellele To=kellele and=ja @@ -509,6 +517,7 @@ Draft=Mustand Drafts=Mustandid StatusInterInvoiced=Invoiced Validated=Kinnitatud +ValidatedToProduce=Validated (To produce) Opened=Ava OpenAll=Open (All) ClosedAll=Closed (All) @@ -655,6 +664,7 @@ Response=Vastus Priority=Tähtsus SendByMail=Send by email MailSentBy=E-posti saatis +NotSent=Saatmata TextUsedInTheMessageBody=E-kirja sisu SendAcknowledgementByMail=Send confirmation email SendMail=Saada e-kiri @@ -836,6 +846,7 @@ ListOfTemplates=List of templates Gender=Gender Genderman=Man Genderwoman=Woman +Genderother=Muu ViewList=Nimekirja vaade ViewGantt=Gantt view ViewKanban=Kanban view @@ -877,6 +888,8 @@ Miscellaneous=Muu Calendar=Kalender GroupBy=Group by... ViewFlatList=View flat list +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Remove string '%s' SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at https://transifex.com/projects/p/dolibarr/ to add your improvements. DirectDownloadLink=Direct download link (public/external) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments SearchIntoExpenseReports=Expense reports SearchIntoLeaves=Leave SearchIntoTickets=Tickets +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Tarnija maksed +SearchIntoMiscPayments=Mitmesugused maksed CommentLink=Kommentaarid NbComments=Number of comments CommentPage=Comments space @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Informatsioon Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Sünniaeg +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/et_EE/mrp.lang b/htdocs/langs/et_EE/mrp.lang index 863793063a0..f018be890cc 100644 --- a/htdocs/langs/et_EE/mrp.lang +++ b/htdocs/langs/et_EE/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/et_EE/website.lang b/htdocs/langs/et_EE/website.lang index ca36c3e11fa..b1d332fe020 100644 --- a/htdocs/langs/et_EE/website.lang +++ b/htdocs/langs/et_EE/website.lang @@ -31,7 +31,7 @@ AddWebsite=Add website Webpage=Web page/container AddPage=Add page/container HomePage=Home Page -PageContainer=Page/container +PageContainer=Lehekülg PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. 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. SiteDeleted=Web site '%s' deleted @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=RSS voog RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/eu_ES/accountancy.lang b/htdocs/langs/eu_ES/accountancy.lang index 7b59e33b296..3211a0b62df 100644 --- a/htdocs/langs/eu_ES/accountancy.lang +++ b/htdocs/langs/eu_ES/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Default for service DefaultForProduct=Default for product CantSuggest=Can't suggest AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s -ConfigAccountingExpert=Configuration of the module accounting expert +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Journalization -Journaux=Journals +Journals=Journals JournalFinancial=Financial journals BackToChartofaccounts=Return chart of accounts Chartofaccounts=Chart of accounts +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Current dedicated account AssignDedicatedAccountingAccount=New account to assign InvoiceLabel=Invoice label @@ -33,8 +35,8 @@ OtherInfo=Other information DeleteCptCategory=Remove accounting account from group ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group? JournalizationInLedgerStatus=Status of journalization -AlreadyInGeneralLedger=Already journalized in ledgers -NotYetInGeneralLedger=Not yet journalized in ledgers +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group DetailByAccount=Show detail by account AccountWithNonZeroValues=Accounts with non-zero values @@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC CountriesNotInEEC=Countries not in EEC CountriesInEECExceptMe=Countries in EEC except %s CountriesExceptMe=All countries except %s -AccountantFiles=Export accounting documents +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup @@ -79,7 +83,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) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Select active chart of accounts ChangeAndLoad=Change and load Addanaccount=Add an accounting account @@ -89,6 +93,8 @@ SubledgerAccount=Subledger account SubledgerAccountLabel=Subledger account label ShowAccountingAccount=Show accounting account ShowAccountingJournal=Show accounting journal +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Accounting account suggested MenuDefaultAccounts=Default accounts MenuBankAccounts=Bank accounts @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding CreateMvts=Create new transaction UpdateMvts=Modification of a transaction ValidTransaction=Validate transaction -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=Ledger +BookkeepingSubAccount=Subledger AccountBalance=Account balance ObjectsRef=Source object ref CAHTF=Total purchase vendor before tax @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Sell journal ACCOUNTING_PURCHASE_JOURNAL=Purchase journal @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups ByYear=By year NotMatch=Not Set -DeleteMvt=Delete Ledger lines +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=Year to delete DelJournal=Journal to delete -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Finance journal ExpenseReportsJournal=Expense reports journal DescFinanceJournal=Finance journal including all the types of payments by bank account -DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Account for VAT not defined ThirdpartyAccountNotDefined=Account for third party not defined ProductAccountNotDefined=Account for product not defined @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu %s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Export draft journal @@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Chart of accounts Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang index f49c326d560..4e1e3f4f917 100644 --- a/htdocs/langs/eu_ES/admin.lang +++ b/htdocs/langs/eu_ES/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=Edition of field %s FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=LDAP konfigurazioa LDAPGlobalParameters=Parametro orokorrak @@ -1670,7 +1672,7 @@ AdvancedEditor=Advanced editor ActivateFCKeditor=Activate advanced editor for: FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services) FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing) FCKeditorForUserSignature=WYSIWIG creation/edition of user signature FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting 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 user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup diff --git a/htdocs/langs/eu_ES/banks.lang b/htdocs/langs/eu_ES/banks.lang index 91a30683b36..cd868f74239 100644 --- a/htdocs/langs/eu_ES/banks.lang +++ b/htdocs/langs/eu_ES/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=Miscellaneous payments ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA mandate YourSEPAMandate=Your SEPA mandate FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/eu_ES/categories.lang b/htdocs/langs/eu_ES/categories.lang index 9bb71984ecf..ba37a43b4ec 100644 --- a/htdocs/langs/eu_ES/categories.lang +++ b/htdocs/langs/eu_ES/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup CategorieRecursiv=Link with parent tag/category automatically CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=Add the following product/service +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Show tag/category ByDefaultInList=By default in list ChooseCategory=Choose category -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/eu_ES/companies.lang b/htdocs/langs/eu_ES/companies.lang index fbf687b3dd0..50a8223fe7c 100644 --- a/htdocs/langs/eu_ES/companies.lang +++ b/htdocs/langs/eu_ES/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof Id 1 (Federal number) ProfId4CH=Prof Id 2 (Commercial Record number) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof Id 1 (R.U.T.) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr) ProfId2DE=Prof Id 2 (USt.-Nr) ProfId3DE=Prof Id 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof Id 1 (CIF/NIF) ProfId2ES=Prof Id 2 (Social security number) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (Collegiate number) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof Id 1 (SIREN) ProfId2FR=Prof Id 2 (SIRET) ProfId3FR=Prof Id 3 (NAF, old APE) ProfId4FR=Prof Id 4 (RCS/RM) -ProfId5FR=- +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Registration Number ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX) ProfId4IN=Prof Id 4 ProfId5IN=Prof Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Business permit) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (R.C.) ProfId2MA=Id prof. 2 (Patente) ProfId3MA=Id prof. 3 (I.F.) ProfId4MA=Id prof. 4 (C.N.S.S.) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof Id 1 (R.F.C). ProfId2MX=Prof Id 2 (R..P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK nummer ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof Id 2 (Social security number) ProfId3PT=Prof Id 3 (Commercial Record number) ProfId4PT=Prof Id 4 (Conservatory) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof Id 1 (OGRN) ProfId2RU=Prof Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s). NorProspectNorCustomer=Not prospect, nor customer JuridicalStatus=Legal Entity Type +Workforce=Workforce Staff=Employees ProspectLevelShort=Potential ProspectLevel=Prospect potential @@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor PaymentTypeBoth=Payment Type - Customer and Vendor MulticurrencyUsed=Use Multicurrency MulticurrencyCurrency=Currency +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/eu_ES/hrm.lang b/htdocs/langs/eu_ES/hrm.lang index 5417c180124..97a33211e6f 100644 --- a/htdocs/langs/eu_ES/hrm.lang +++ b/htdocs/langs/eu_ES/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=Employees Employee=Langilea NewEmployee=New employee +ListOfEmployees=List of employees diff --git a/htdocs/langs/eu_ES/languages.lang b/htdocs/langs/eu_ES/languages.lang index aac76345a55..2717b18e96e 100644 --- a/htdocs/langs/eu_ES/languages.lang +++ b/htdocs/langs/eu_ES/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Spanish (Paraguay) Language_es_PE=Gaztelania (Peru) Language_es_PR=Spanish (Puerto Rico) +Language_es_US=Spanish (USA) Language_es_UY=Spanish (Uruguay) Language_es_GT=Spanish (Guatemala) Language_es_VE=Spanish (Venezuela) diff --git a/htdocs/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang index 6a5f8a75250..ce139e4fb15 100644 --- a/htdocs/langs/eu_ES/main.lang +++ b/htdocs/langs/eu_ES/main.lang @@ -155,6 +155,7 @@ RemoveLink=Remove link AddToDraft=Add to draft Update=Berritu Close=Itxi +CloseAs=Set status to CloseBox=Remove widget from your dashboard Confirm=Confirm ConfirmSendCardByMail=Do you really want to send the content of this card by mail to %s? @@ -196,6 +197,7 @@ ReOpen=Re-Open Upload=Upload ToLink=Esteka Select=Select +SelectAll=Select all Choose=Choose Resize=Resize ResizeOrCrop=Resize or Crop @@ -256,6 +258,7 @@ Cards=Cards Card=Card Now=Orain HourStart=Start hour +Deadline=Deadline Date=Data DateAndHour=Data eta ordua DateToday=Today's date @@ -264,8 +267,10 @@ DateStart=Start date DateEnd=End date DateCreation=Creation date DateCreationShort=Creat. date +IPCreation=Creation IP DateModification=Modification date DateModificationShort=Modif. date +IPModification=Modification IP DateLastModification=Latest modification date DateValidation=Validation date DateClosing=Closing date @@ -319,6 +324,7 @@ Morning=Morning Afternoon=Afternoon Quadri=Quadri MonthOfDay=Month of the day +DaysOfWeek=Days of week HourShort=H MinuteShort=mn Rate=Rate @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency MulticurrencyAmountHT=Amount (excl. tax), original currency MulticurrencyAmountTTC=Amount (inc. of tax), original currency MulticurrencyAmountVAT=Amount tax, original currency +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Amount tax 2 AmountLT2=Amount tax 3 AmountLT1ES=Amount RE @@ -487,6 +494,7 @@ By=By From=From FromDate=From FromLocation=From +at=at to=to To=to and=and @@ -509,6 +517,7 @@ Draft=Draft Drafts=Drafts StatusInterInvoiced=Invoiced Validated=Validated +ValidatedToProduce=Validated (To produce) Opened=Open OpenAll=Open (All) ClosedAll=Closed (All) @@ -655,6 +664,7 @@ Response=Response Priority=Priority SendByMail=Send by email MailSentBy=Email sent by +NotSent=Not sent TextUsedInTheMessageBody=Email body SendAcknowledgementByMail=Send confirmation email SendMail=e-posta bidali @@ -836,6 +846,7 @@ ListOfTemplates=List of templates Gender=Gender Genderman=Man Genderwoman=Woman +Genderother=Besteak ViewList=List view ViewGantt=Gantt view ViewKanban=Kanban view @@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous Calendar=Egutegia GroupBy=Group by... ViewFlatList=View flat list +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Remove string '%s' SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at https://transifex.com/projects/p/dolibarr/ to add your improvements. DirectDownloadLink=Direct download link (public/external) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments SearchIntoExpenseReports=Expense reports SearchIntoLeaves=Leave SearchIntoTickets=Tickets +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Vendor payments +SearchIntoMiscPayments=Miscellaneous payments CommentLink=Comments NbComments=Number of comments CommentPage=Comments space @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Informazioa Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Date of birth +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/eu_ES/mrp.lang b/htdocs/langs/eu_ES/mrp.lang index 863793063a0..f018be890cc 100644 --- a/htdocs/langs/eu_ES/mrp.lang +++ b/htdocs/langs/eu_ES/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/eu_ES/website.lang b/htdocs/langs/eu_ES/website.lang index bb26cb14ba4..f00254a6c66 100644 --- a/htdocs/langs/eu_ES/website.lang +++ b/htdocs/langs/eu_ES/website.lang @@ -31,7 +31,7 @@ AddWebsite=Add website Webpage=Web page/container AddPage=Add page/container HomePage=Home Page -PageContainer=Page/container +PageContainer=Page PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. 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. SiteDeleted=Web site '%s' deleted @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=RSS kanala RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/fa_IR/accountancy.lang b/htdocs/langs/fa_IR/accountancy.lang index 00e11436d1a..be45e5ff3ed 100644 --- a/htdocs/langs/fa_IR/accountancy.lang +++ b/htdocs/langs/fa_IR/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=پیش‌فرض برای خدمات DefaultForProduct=پیش‌فرض برای محصول CantSuggest=امکان پیش‌نهاد نیست AccountancySetupDoneFromAccountancyMenu=اکثر برپاسازی حساب‌داری برای فهرست %s انجام شده است -ConfigAccountingExpert=پیکربندی بخش کارشناس حسابداری +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=دفترنویسی -Journaux=دفاتر +Journals=دفاتر JournalFinancial=دفاتر مالی BackToChartofaccounts=بازگشت به نمودار حساب‌ها Chartofaccounts=نمودار حساب‌ها +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=حسابی اختصاصی کنونی AssignDedicatedAccountingAccount=نسبت دادن حساب جدید InvoiceLabel=عنوان صورت‌حساب @@ -33,8 +35,8 @@ OtherInfo=سایر اطلاعات DeleteCptCategory=حذف حساب حساب‌درای از گروه ConfirmDeleteCptCategory=اطمینان دارید که می‌خواهید این حساب حساب‌داری را از گروه حساب حساب‌داری حذف کنید؟ JournalizationInLedgerStatus=وضعیت دفترنویسی -AlreadyInGeneralLedger=قبلا در دفترکل دفترنویسی شده -NotYetInGeneralLedger=فعلا در دفترکل دفترنویسی نشده +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=گروه خالی است، برپاسازی گروه حساب‌داری انفرادی را بررسی کنید DetailByAccount=نمایش جزئیات مربوط به حساب AccountWithNonZeroValues=حساب‌هائی که صفر نیستند @@ -43,7 +45,9 @@ CountriesInEEC=کشورهائی که در اتحادیۀ اروپا هستند CountriesNotInEEC=کشورهائی که در اتحادیۀ اروپا نیستند CountriesInEECExceptMe=کشورهائی که در اتحادیۀ اروپا هستند به استثناء %s CountriesExceptMe=همۀ کشورها باستثناء %s -AccountantFiles=صادرات مستندات حساب‌داری +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=در برپاسازی برای مشتریان حساب حساب‌داری اصلی تعریف نشده است MainAccountForSuppliersNotDefined=در برپاسازی برای تامین کنندگان حساب حساب‌داری اصلی تعریف نشده است @@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=گام %s: تراکنش‌های موجود را اض AccountancyAreaDescClosePeriod=گام %s: بازۀ زمانی را ببندید تا دیگر در آینده قابل ویرایش نباشد. -TheJournalCodeIsNotDefinedOnSomeBankAccount=روند گام‌به‌گام الزامی کامل نیست ( کد حساب دفترنویسی برای همۀ حساب‌های بانک تعریف نشده است ) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=انتخاب نمودار فعالی از حساب‌ها ChangeAndLoad=تغییر و بارگذاری Addanaccount=افزودن یک حساب حسابداری @@ -89,6 +93,8 @@ SubledgerAccount=حساب دفترمعین SubledgerAccountLabel=برچسب حساب دفترمعین ShowAccountingAccount=نمایش حساب حساب‌داری ShowAccountingJournal=نمایش دفترنویسی حساب‌داری +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=حساب حسابداری پیشنهاد شده MenuDefaultAccounts=حساب‌های پیش‌فرض MenuBankAccounts=حسابهای بانکی @@ -110,8 +116,9 @@ ExpenseReportsVentilation=بندشدن به گزارش هزینه‌ها CreateMvts=ایجاد تراکنش جدید UpdateMvts=ویرایش تراکنش ValidTransaction=اعتباردهی به تراکنش -WriteBookKeeping=ثبت تراکنش در دفترکل +WriteBookKeeping=Register transactions in accounting Bookkeeping=دفترکل +BookkeepingSubAccount=Subledger AccountBalance=موجودی حساب ObjectsRef=مرجع شیء منبع CAHTF=خرید کل تامین کننده قبل از مالیات @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=غیرفعال کردن ثبت مستقیم تراکن ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=فعال کردن خروجی پیش‌نویس از دفتر ACCOUNTANCY_COMBO_FOR_AUX=فعال کردن فهرست ترکیبی برای حساب وابسته(ممکن است در صورتی که شخص‌سوم‌های زیادی داشته باشید، کند باشد) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=دفتر فروش ACCOUNTING_PURCHASE_JOURNAL=دفتر خرید @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=حساب حساب‌داری انتظار DONATION_ACCOUNTINGACCOUNT=حساب حساب‌داری ثبت کمک و اعانه ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=حساب حساب‌داری ثبت اشتراک‌ها +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=به واسطۀ گروه‌های از پیش‌تع ByPersonalizedAccountGroups=به واسطۀ گروه‌های دل‌خواه ByYear=به واسطۀ سال NotMatch=تعیین نشده -DeleteMvt=حذف سطور دفترکل +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=حذف سال DelJournal=حذف دفتر -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=این کار باعث حذف تراکنش از دفترکل می‌شود (همۀ سطور مربوط به این تراکنش نیز حذف خواهند شد) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=دفتر مالی ExpenseReportsJournal=دفتر گزارش هزینه DescFinanceJournal=دفتر مالی که شامل همۀ انواع پرداخت بواسطۀ حساب بانکی می‌شود -DescJournalOnlyBindedVisible=این نمائی از ردیف‌هائی است که به یک حساب حسابداری بند شده‌اند و امکان ثبت آن‌ها در دفتر کل وجود دارد. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=حساب مالیات‌بر‌ارزش‌افزوده تعریف نشده است ThirdpartyAccountNotDefined=حساب شخص‌سوم تعریف نشده است ProductAccountNotDefined=حساب محصول تعریف نشده است @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=این دفتر فعلا در حال استف AccountingAccountForSalesTaxAreDefinedInto=نکته: حساب حساب‌داری برای مالیات بر فروش در گزینۀ %s - %s قابل تعریف است NumberOfAccountancyEntries=تعداد ورودی‌ها NumberOfAccountancyMovements=تعداد جابجائی‌ها +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=صادرکردن پیش‌نویس دفتر @@ -326,6 +339,8 @@ Modelcsv_configurable= صدور قابل پیکربندی CSV Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=صادرکردن برای Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=ساختار شناسۀ حساب‌‌ها ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang index 204b3c4734f..047c4802f96 100644 --- a/htdocs/langs/fa_IR/admin.lang +++ b/htdocs/langs/fa_IR/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=بخش %s در PHP بارگذاری شده است PreloadOPCode=OPCode از پیش بارگذاری شده مورد استفاده است AddRefInList=نمایش فهرست اطلاعات مرجع -ref. فروشنده/مشتری (فهرست انتخابی یا ترکیبی) و اکثر ابَرپیوند.
نام طرف‌های سوم به شکل " CC12345 - SC45678 - شرکت بزرگ سازمانی " به جای "شرکت بزرگ سازمانی" نمایش داده خواهد شد. AddAdressInList=نمایش فهرست اطلاعات نشانی‌های فروشنده/مشتری (فهرست انتخابی یا ترکیبی)
شخص سوم‌ها به شکل "شرکت بزرگ سازمانی - شمارۀ 21 خیابان 123456 شهر بزرگ ایران" به جای "شرکت بزرگ سازمانی" نمایش داده خواهند شد. +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=پرسش برای روش ارسال ترجیحی برای اشخاص سوم FieldEdition=ویرایش بخش %s FillThisOnlyIfRequired=مثال: +2 (تنها در صورتی که با مشکل ناحیۀ زمانی مواجه شوید) @@ -1420,6 +1421,7 @@ AdherentMailRequired=برای ساخت یک عضو یک رایانامه لاز MemberSendInformationByMailByDefault=کادرتائید برای ارسال تصدیق رایانامه برای اعضا (اعتباردهی یا عضویت جدید) به شکل پیش‌فرض فعال است VisitorCanChooseItsPaymentMode=کاربر می‌تواند از انواع روش پرداخت موجود استفاده نماید MEMBER_REMINDER_EMAIL=فعال‌کردن یادآور خودکار توسط رایانامه برای عضویت‌های منقضی‌شده. توجه: واحد %s برای ارسال صحیح یادآورها نیازمند فعال‌سازی و پیکربندی صحیح است. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=برپاسازی LDAP LDAPGlobalParameters=مقادیر سراسری @@ -1670,7 +1672,7 @@ AdvancedEditor=ویرایشگر پیشرفته ActivateFCKeditor=فعال کردن ویرایشگر پیشرفته برای: FCKeditorForCompany=ساخت/ویرایش عناصر توضیح و یادآوری به شکل WYSIWIG (باستثناء محصولات/خدمات) FCKeditorForProduct=ساخت/ویرایش عناصر توضیح و یادآوری به شکل WYSIWIG -FCKeditorForProductDetails=ساخت/ویرایش سطور جزئیات برای همۀ موجودیت‌های محصولات (پیشنهادها، سفارش‌ها، صورت‌حساب‌ها و غیره) با WYSIWIG. هشدار: استفده از این گزینه برای این مورد اساسا توصیه نمی‌شود زیرا ممکن است در هنگام ساخت فایل‌های PDF در خصوص نویسه‌های خاص در هنگام شکل‌دهی صفحه مشکل ایجاد نماید. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= ساخت/ویرایش WYSIWIG برای ارسال رایانامۀ انبوه (ابزار->ارسال رایانامه) FCKeditorForUserSignature=ساخت/ویرایش امضای کاربر توسط WYSIWIG FCKeditorForMail=ساخت/ویرایش همۀ رایانامه‌ها با WYSIWIG (منهای ابزار->ارسال رایانامه) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=ثبت خودکار این مقدار پیش‌ف AGENDA_DEFAULT_FILTER_TYPE=ثبت خودکار این نوع از رخداد در صافی جستجوی نمای جلسات AGENDA_DEFAULT_FILTER_STATUS=ثبت خودکار این وضعیت جلسه در صافی جستجوی نمای جلسات AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda -AGENDA_REMINDER_EMAIL=فعال‌کردن یادآوری رخدادها توسط رایانامه (توجه داشته بشید در خصوص هر رخداد گزینه‌ها/تاخیر قابل تعریف هستند). نکته: برای ارسال با بسامد صحیح رایانامه‌های یادآوری واحد %s باید فعال بوده و به‌‌درستی پیکربندی شده باشد. -AGENDA_REMINDER_BROWSER=فعال‌کردن یادآوری رخداد روی مرورگر کاربر (در هنگامی که رخداد سررسید، هر کاربر می‌تواند این کار را از طریق سوال تائید مرورگر نفی کند) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=فعال‌کردن آگاهی‌رسانی صوتی +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=نمایش شیء پیوند شده به نمای جلسه ##### Clicktodial ##### ClickToDialSetup=برپاسازی واحد کلیک برای شماره‌گیری diff --git a/htdocs/langs/fa_IR/banks.lang b/htdocs/langs/fa_IR/banks.lang index fb945a8cf81..b2492377312 100644 --- a/htdocs/langs/fa_IR/banks.lang +++ b/htdocs/langs/fa_IR/banks.lang @@ -166,6 +166,9 @@ VariousPayment=پرداخت متفرقه VariousPayments=پرداخت‌های متفرقه ShowVariousPayment=نمایش پرداخت متفرقه AddVariousPayment=افزودن پرداخت متفرقه +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=تعهدنامۀ SEPA YourSEPAMandate=تعهدنامۀ SEPAی شما FindYourSEPAMandate=این تعهدنامۀ SEPAی شماست تا شرکت ما را مجاز کند سفارش پرداخت مستقیم از بانک داشته باشد. آن را امضا شده بازگردانید (نسخۀ اسکن‌شدۀ برگۀ امضا شده) یا آن را توسط رایانامه ارسال کنید: @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/fa_IR/categories.lang b/htdocs/langs/fa_IR/categories.lang index 3c6512de70b..adc3e73cfdb 100644 --- a/htdocs/langs/fa_IR/categories.lang +++ b/htdocs/langs/fa_IR/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=برپاسازی کلیدواژه/دسته‌بندی‌ CategorieRecursiv=پیوند خودکار با کلیدواژه/دسته‌بندی والد CategorieRecursivHelp=اگر این گزینه روشن باشد، در هنگام افزودن یک محصول به یک زیردسته، محصول مورد نظر به دسته‌بندی وارد نیز اضافه خواهد شد AddProductServiceIntoCategory=افزودن پیگیری محصول/سرویس +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=نمایش کلیدواژه/دسته‌بندی ByDefaultInList=به طور پیش‌فرض در فهرست ChooseCategory=انتخاب دسته‌بندی -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/fa_IR/companies.lang b/htdocs/langs/fa_IR/companies.lang index 6ec56674436..9a4bc483b57 100644 --- a/htdocs/langs/fa_IR/companies.lang +++ b/htdocs/langs/fa_IR/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=شناسۀ کاری 1 (USt.-IdNr) ProfId2AT=شناسۀ کاری 2 (USt.-Nr) ProfId3AT=شناسۀ کاری 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=شناسۀ کاری 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=شناسۀ کاری 1 (شمارۀ حرفه‌ای) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=شناسۀ حرفه‌ای 1 (Federal number) ProfId4CH=شناسۀ حرفه‌ای 2 (Commercial Record number) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=شناسۀ حرفه‌ای 1 (R.U.T.) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE= شناسۀ کاری 1 (USt.-IdNr) ProfId2DE=شناسۀ کاری 2 (USt.-Nr) ProfId3DE=شناسۀ کاری 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=شناسۀ کاری 1 (CIF/NIF) ProfId2ES=شناسۀ کاری 2 (شمارۀ امنیت اجتماعی) ProfId3ES=شناسۀ کاری 3 (CNAE) ProfId4ES=شناسۀ کاری 4 (Collegiate number) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=شناسۀ کاری 1 (SIREN) ProfId2FR=شناسۀ کاری 2 (SIRET) ProfId3FR=شناسۀ کاری 3 (NAF, old APE) ProfId4FR=شناسۀ کاری 4 (RCS/RM) -ProfId5FR=- +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=شمارۀ ثبت ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=شناسۀ کاری 3 (SRVC TAX) ProfId4IN=شناسۀ کاری 4 ProfId5IN=شناسۀ کاری 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=شناسۀ کاری 1 (R.C.S. Luxembourg) ProfId2LU=شناسۀ کاری 2 (Business permit) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=شناسۀ کاری 1 (R.C.) ProfId2MA=شناسۀ کاری 2 (Patente) ProfId3MA=شناسۀ کاری 3 (I.F.) ProfId4MA=شناسۀ کاری 4 (C.N.S.S.) -ProfId5MA=شناسۀ کاری 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=شناسۀ کاری 1 (R.F.C). ProfId2MX=شناسۀ کاری 2 (R..P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=nummer KVK ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=شناسۀ کاری 1 (NIPC) ProfId2PT=شناسۀ کاری 2 (شمارۀ تامین اجتماعی) ProfId3PT=شناسۀ کاری 3 (Commercial Record number) ProfId4PT=شناسۀ کاری 4 (Conservatory) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=شناسۀ کاری 1 (OGRN) ProfId2RU=شناسۀ کاری 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=همچنین می‌توانید به‌طور دستی رو ErrorVATCheckMS_UNAVAILABLE=بررسی مقدور نبود. خدمات بررسی برای کشور عضو (%s) ارائه نمی‌شود. NorProspectNorCustomer=مشتری‌احتمالی نیست/مشتری نیست JuridicalStatus=نوع موجودیت قانونی +Workforce=Workforce Staff=کارمندان ProspectLevelShort=توان‌بالقوه-پتانسیل ProspectLevel=مشتری‌احتمالی بالقوه @@ -456,3 +462,8 @@ PaymentTermsSupplier=شرایط پرداخت - فروشنده PaymentTypeBoth=Payment Type - Customer and Vendor MulticurrencyUsed=استفادۀ چند‌واحدپولی MulticurrencyCurrency=واحد‌پولی +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/fa_IR/hrm.lang b/htdocs/langs/fa_IR/hrm.lang index 382a1c9bb9d..590bc8b6434 100644 --- a/htdocs/langs/fa_IR/hrm.lang +++ b/htdocs/langs/fa_IR/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=کارمندان Employee=کارمند NewEmployee=کارمند جدید +ListOfEmployees=List of employees diff --git a/htdocs/langs/fa_IR/languages.lang b/htdocs/langs/fa_IR/languages.lang index e3a6fbcac16..a94c8c643c1 100644 --- a/htdocs/langs/fa_IR/languages.lang +++ b/htdocs/langs/fa_IR/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=اسپانیائی (پاناما) Language_es_PY=اسپانیایی پروگوئه Language_es_PE=اسپانیایی پرو Language_es_PR=اسپانیایی (پورتوریکو) +Language_es_US=Spanish (USA) Language_es_UY=اسپانیائی (اروگوئه) Language_es_GT=Spanish (Guatemala) Language_es_VE=اسپانیائی (ونزوئلا) diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang index 7392e0e2498..c53d9860524 100644 --- a/htdocs/langs/fa_IR/main.lang +++ b/htdocs/langs/fa_IR/main.lang @@ -155,6 +155,7 @@ RemoveLink=حذف پیون AddToDraft=افزودن به پیش‌نویس Update=به‌روز‌رسانی Close=بستن +CloseAs=Set status to CloseBox=حذف این وسیله از صفحۀ پیشخوان شما Confirm=تائید ConfirmSendCardByMail=آیا واقعا می‌خواهید محتوای این کارت را توسط رایانامه به %s بفرستید؟ @@ -196,6 +197,7 @@ ReOpen=دوباره باز کردن Upload=بالاگذاری ToLink=پیوند Select=انتخاب +SelectAll=Select all Choose=انتخاب‌کردن Resize=تغییر اندازه ResizeOrCrop=تغییراندازه یا برش @@ -256,6 +258,7 @@ Cards=کارت Card=کارت Now=اکنون HourStart=تاریخ شروع +Deadline=Deadline Date=تاریخ DateAndHour=تاریخ و ساعت DateToday=تاریخ امروز @@ -264,8 +267,10 @@ DateStart=تاریخ شروع DateEnd=تاریخ پایان DateCreation=تاریخ ایجاد DateCreationShort=تاریخ ساخت +IPCreation=Creation IP DateModification=تاریخ اصلاح DateModificationShort=تاریخ اصلاح +IPModification=Modification IP DateLastModification=آخرین تاریخ اصلاح DateValidation=تاریخ اعتباردهی DateClosing=تاریخ بسته شدن @@ -319,6 +324,7 @@ Morning=صبح Afternoon=بعدازظهر Quadri=چهارتایی MonthOfDay=ماه از روز +DaysOfWeek=Days of week HourShort=H MinuteShort=mn Rate=نرخ @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=مبلغ پرداخت، واحدپولی اصلی MulticurrencyAmountHT=مبلغ (بدون مالیات)، واحدپولی اصلی MulticurrencyAmountTTC=مبلغ (بامالیات)، واحد پولی اصلی MulticurrencyAmountVAT=مالیات مبلغ، واحدپولی اصلی +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=مالیات مبلغ 2 AmountLT2=مالیات مبلغ 3 AmountLT1ES=مبلغ RE @@ -487,6 +494,7 @@ By=توسط From=از FromDate=از FromLocation=از +at=at to=به To=به and=و @@ -509,6 +517,7 @@ Draft=پیش‌نویس Drafts=پیش‌نویس‌ها StatusInterInvoiced=صورت‌حساب‌شده Validated=تائیدشده +ValidatedToProduce=Validated (To produce) Opened=باز OpenAll=باز (همه) ClosedAll=بسته (همه) @@ -655,6 +664,7 @@ Response=واکنش Priority=اولویت SendByMail=ارسال توسط رایانامه MailSentBy=رایانامه‌های ارسالیِ +NotSent=ارسال نشده TextUsedInTheMessageBody=متن رایانامه SendAcknowledgementByMail=ارسال رایانامۀ تائید SendMail=ارسال رایانامه @@ -836,6 +846,7 @@ ListOfTemplates=فهرست قالب‌ها Gender=جنسیت Genderman=مرد Genderwoman=زن +Genderother=سایر ViewList=نمای فهرستی ViewGantt=Gantt view ViewKanban=Kanban view @@ -877,6 +888,8 @@ Miscellaneous=متفرقه Calendar=تقویم GroupBy=گروه‌بندی توسط... ViewFlatList=نمایش فهرست خطی +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=حذف عبارت '%s' SomeTranslationAreUncomplete=برخی از زبان‌های قابل انتخاب ممکن است تنها به شکل ناقص ترجمه شده باشد یا دارای خطا باشند. لطفا برای تکمیل و تصحیح زبان مورد نظر خود در https://transifex.com/projects/p/dolibarr/ ثبت نام نمائید و اصلاحات مورد نظر خود را انجام دهید. DirectDownloadLink=پیوند دریافت مستقیم (عمومی/خارجی) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=حمل‌ونقل مشتریان SearchIntoExpenseReports=گزارش‌هزینه‌ها SearchIntoLeaves=ترک SearchIntoTickets=برگه‌های پشتیبانی +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=پرداخت‌های فروشندگان +SearchIntoMiscPayments=پرداخت‌های متفرقه CommentLink=نظرات NbComments=تعداد نظرات CommentPage=محل نظرات @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=اطلاعات Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=تاریخ تولد +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/fa_IR/mrp.lang b/htdocs/langs/fa_IR/mrp.lang index 649b72bc70f..5edbad940c2 100644 --- a/htdocs/langs/fa_IR/mrp.lang +++ b/htdocs/langs/fa_IR/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/fa_IR/website.lang b/htdocs/langs/fa_IR/website.lang index 1a1d063ed4e..3c1ada31ac4 100644 --- a/htdocs/langs/fa_IR/website.lang +++ b/htdocs/langs/fa_IR/website.lang @@ -31,7 +31,7 @@ AddWebsite=Add website Webpage=Web page/container AddPage=Add page/container HomePage=Home Page -PageContainer=Page/container +PageContainer=صفحه PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. 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. SiteDeleted=Web site '%s' deleted @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=خوراک RSS RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/fi_FI/accountancy.lang b/htdocs/langs/fi_FI/accountancy.lang index a702faa322c..2e529b15833 100644 --- a/htdocs/langs/fi_FI/accountancy.lang +++ b/htdocs/langs/fi_FI/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Oletusarvo palvelulle DefaultForProduct=Oletusarvo tuotteelle CantSuggest=Ei ehdotuksia AccountancySetupDoneFromAccountancyMenu=Kirjanpidon asetukset tehdään pääasiassa valikosta %s -ConfigAccountingExpert=Moduulin kirjanpitoasiantuntijan määrittäminen +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Journalization -Journaux=Päiväkirjat +Journals=Päiväkirjat JournalFinancial=Rahoituspäiväkirjat BackToChartofaccounts=Palauta tilikartta Chartofaccounts=Tilikartta +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Current dedicated account AssignDedicatedAccountingAccount=New account to assign InvoiceLabel=Laskun etiketti @@ -33,8 +35,8 @@ OtherInfo=Other information DeleteCptCategory=Poista kirjanpitotili ryhmästä ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group? JournalizationInLedgerStatus=Status of journalization -AlreadyInGeneralLedger=Already journalized in ledgers -NotYetInGeneralLedger=Not yet journalized in ledgers +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group DetailByAccount=Yksityiskohtaiset tiedot tileittäin AccountWithNonZeroValues=Accounts with non-zero values @@ -43,7 +45,9 @@ CountriesInEEC=EU-alueen maat CountriesNotInEEC=EU: n ulkopuoliset maat CountriesInEECExceptMe=EU-alueen maat, poislukien %s CountriesExceptMe=Kaikki maat, poislukien %s -AccountantFiles=Kirjanpitodokumenttien vienti +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup @@ -79,7 +83,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) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Valitse aktiivinen tilikartta ChangeAndLoad=Change and load Addanaccount=Lisää kirjanpitotili @@ -89,6 +93,8 @@ SubledgerAccount=Subledger account SubledgerAccountLabel=Subledger account label ShowAccountingAccount=Show accounting account ShowAccountingJournal=Show accounting journal +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Ehdotettu kirjanpitotili MenuDefaultAccounts=Oletustilit MenuBankAccounts=Pankkitilit @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Kuluraportin kiinnittäminen CreateMvts=Luo uusi transaktio UpdateMvts=Transaktion muuttaminen ValidTransaction=Hyväksy transaktio -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=Pääkirjanpito +BookkeepingSubAccount=Subledger AccountBalance=Tilin saldo ObjectsRef=Source object ref CAHTF=Total purchase vendor before tax @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Myyntipäiväkirja ACCOUNTING_PURCHASE_JOURNAL=Ostopäiväkirja @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups ByYear=Vuoden mukaan NotMatch=Not Set -DeleteMvt=Poista pääkirjan rivit +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=Poistettava vuosi DelJournal=Poistettava päiväkirja -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Finance journal ExpenseReportsJournal=Expense reports journal DescFinanceJournal=Finance journal including all the types of payments by bank account -DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=ALV tiliä ei ole määritelty ThirdpartyAccountNotDefined=Sidosryhmän tiliä ei ole määritetty ProductAccountNotDefined=Tuotteen tiliä ei ole määritetty @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu %s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Export draft journal @@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Chart of accounts Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang index 671e236ec7f..59cee45e755 100644 --- a/htdocs/langs/fi_FI/admin.lang +++ b/htdocs/langs/fi_FI/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP:n laajennus %sladattu PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=Alalla painos %s FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member MemberSendInformationByMailByDefault=Checkbox lähettää vahvistusviestin jäsenille on oletusarvoisesti VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=LDAP-asetukset LDAPGlobalParameters=Parametrit @@ -1670,7 +1672,7 @@ AdvancedEditor=Kehittynyt editori ActivateFCKeditor=Ota FCKeditor varten: FCKeditorForCompany=WYSIWIG luominen / painos yritysten kuvaus ja huomaa FCKeditorForProduct=WYSIWIG luominen / painos tuotteiden / palvelujen kuvaus ja huomaa -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG luominen / painos postitusten FCKeditorForUserSignature=WYSIWIG creation/edition of user signature FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting 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 user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Ota käyttöön ilmoitusäänet +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view ##### Clicktodial ##### ClickToDialSetup='Click To Dial'-moduulin asetukset diff --git a/htdocs/langs/fi_FI/banks.lang b/htdocs/langs/fi_FI/banks.lang index ce815e33aef..ef24faa1c72 100644 --- a/htdocs/langs/fi_FI/banks.lang +++ b/htdocs/langs/fi_FI/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=Muut maksut ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA mandate YourSEPAMandate=SEPA-toimeksiantonne FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/fi_FI/categories.lang b/htdocs/langs/fi_FI/categories.lang index bdb8af99b57..371a1c6cbb7 100644 --- a/htdocs/langs/fi_FI/categories.lang +++ b/htdocs/langs/fi_FI/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup CategorieRecursiv=Link with parent tag/category automatically CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=Add the following product/service +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Show tag/category ByDefaultInList=By default in list ChooseCategory=Choose category -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/fi_FI/companies.lang b/htdocs/langs/fi_FI/companies.lang index 7efa6cc83b4..a542eed8fcc 100644 --- a/htdocs/langs/fi_FI/companies.lang +++ b/htdocs/langs/fi_FI/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (professionnel numero) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof Id 1 (liittovaltion numero) ProfId4CH=Prof Id 2 (Commercial Record numero) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Professori Id 1 (RUT) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Y-tunnus 1 (USt.-IdNr) ProfId2DE=ALV-numero 2 (USt.-Nr) ProfId3DE=Prof Id 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=ALV-numero 1 (CIF / NIF Espanja) ProfId2ES=Prof Id 2 (Henkilötunnus) ProfId3ES=Prof tunnus 3 (CNAE) ProfId4ES=Prof Id 4 (Collegiate numero) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof Id 1 (SIREN) ProfId2FR=Prof Id 2 (Siret) ProfId3FR=Prof Id 3 (NAF, vanha APE) ProfId4FR=Prof Id 4 (RCS / RM) -ProfId5FR=Prof Id 5 +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Prof Id 1 (Registration Number) ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX) ProfId4IN=Prof Id 4 ProfId5IN=Prof Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Business permit) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (RC) ProfId2MA=Id prof. 2 (Patente) ProfId3MA=Id prof. 3 (IF) ProfId4MA=Id prof. 4 (CNSS) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Professori Id 1 (RFC). ProfId2MX=Professori Id 2 (R. P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KvK nummer ProfId2NL=- ProfId3NL=- ProfId4NL=- -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof Id 2 (Sosiaaliturva numero) ProfId3PT=Prof Id 3 (Commercial Record numero) ProfId4PT=Prof Id 4 (konservatorio) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Professori Id 1 (OGRN) ProfId2RU=Professori Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=Voit tehdä tarkastuksen myös käsin E.U: n sivuilla %s? @@ -196,6 +197,7 @@ ReOpen=Avaa uudelleen Upload=Upload ToLink=Linkki Select=Valitse +SelectAll=Select all Choose=Valitse Resize=Muuta kokoa ResizeOrCrop=Resize or Crop @@ -256,6 +258,7 @@ Cards=Kortit Card=Kortti Now=Nyt HourStart=Aloitus tunti +Deadline=Deadline Date=Päivä DateAndHour=Päivämäärä ja tunti DateToday=Päivämäärä tänään @@ -264,8 +267,10 @@ DateStart=Aloituspäivämäärä DateEnd=Lopetuspäivä DateCreation=Luotu DateCreationShort=Luonti päivämäärä +IPCreation=Creation IP DateModification=Muokattu DateModificationShort=Muokattu +IPModification=Modification IP DateLastModification=Latest modification date DateValidation=Vahvistettu DateClosing=Suljettu @@ -319,6 +324,7 @@ Morning=Aamu Afternoon=Iltapäivä Quadri=Quadri MonthOfDay=Kuukaudenpäivä +DaysOfWeek=Days of week HourShort=H MinuteShort=min Rate=Kurssi @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Suorituksen summa, alkuperäinen valuutta MulticurrencyAmountHT=Amount (excl. tax), original currency MulticurrencyAmountTTC=Summa (verollinen), alkuperäisessä valuutassa MulticurrencyAmountVAT=Veron määrä, alkuperäinen valuutta +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Verot 2 AmountLT2=Verot 3 AmountLT1ES=Määrä RE @@ -487,6 +494,7 @@ By=Mennessä From=Mistä FromDate=Laskuttaja FromLocation=Laskuttaja +at=at to=on To=on and=ja @@ -509,6 +517,7 @@ Draft=Vedos Drafts=Vedokset StatusInterInvoiced=Laskutettu Validated=Vahvistetut +ValidatedToProduce=Validated (To produce) Opened=Avoinna OpenAll=Open (All) ClosedAll=Closed (All) @@ -655,6 +664,7 @@ Response=Vastaus Priority=Prioriteetti SendByMail=Send by email MailSentBy=Sähköpostin lähetti +NotSent=Ei lähetetty TextUsedInTheMessageBody=Sähköpostiviesti SendAcknowledgementByMail=Lähetä vahvistussähköposti SendMail=Lähetä sähköpostia @@ -836,6 +846,7 @@ ListOfTemplates=Luettelo Pohjista Gender=Sukupuoli Genderman=Mies Genderwoman=Nainen +Genderother=Muu ViewList=Näytä lista ViewGantt=Gantt view ViewKanban=Kanban view @@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous Calendar=Kalenteri GroupBy=Group by... ViewFlatList=View flat list +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Remove string '%s' SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at https://transifex.com/projects/p/dolibarr/ to add your improvements. DirectDownloadLink=Suora latauslinkki (julkinen/ulkoinen) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Asiakas lähetykset SearchIntoExpenseReports=Kuluraportit SearchIntoLeaves=Leave SearchIntoTickets=Tiketit +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Toimittajien maksut +SearchIntoMiscPayments=Muut maksut CommentLink=Kommentit NbComments=Kommenttien määrä CommentPage=Comments space @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Information Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Päiväys syntyvyyden +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/fi_FI/mrp.lang b/htdocs/langs/fi_FI/mrp.lang index 863793063a0..f018be890cc 100644 --- a/htdocs/langs/fi_FI/mrp.lang +++ b/htdocs/langs/fi_FI/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/fi_FI/website.lang b/htdocs/langs/fi_FI/website.lang index 9392f375afc..5ecbd8e3ca4 100644 --- a/htdocs/langs/fi_FI/website.lang +++ b/htdocs/langs/fi_FI/website.lang @@ -31,7 +31,7 @@ AddWebsite=Lisää sivusto Webpage=Web page/container AddPage=Add page/container HomePage=Kotisivu -PageContainer=Page/container +PageContainer=Sivu PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. 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. SiteDeleted=Web site '%s' deleted @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=RSS-syöte RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/fr_BE/accountancy.lang b/htdocs/langs/fr_BE/accountancy.lang index 1071dd5c68b..11b91eb3db3 100644 --- a/htdocs/langs/fr_BE/accountancy.lang +++ b/htdocs/langs/fr_BE/accountancy.lang @@ -1,5 +1,4 @@ # Dolibarr language file - Source file is en_US - accountancy -ConfigAccountingExpert=Configuration du module de compta expert Processing=Exécution Lineofinvoice=Lignes de facture Doctype=Type de document diff --git a/htdocs/langs/fr_CA/accountancy.lang b/htdocs/langs/fr_CA/accountancy.lang index 18532f2fd92..c34f7d4c7ad 100644 --- a/htdocs/langs/fr_CA/accountancy.lang +++ b/htdocs/langs/fr_CA/accountancy.lang @@ -23,8 +23,6 @@ OverviewOfAmountOfLinesBound=Aperçu du nombre de lignes déjà liées à un com DeleteCptCategory=Supprimer le compte comptable du groupe ConfirmDeleteCptCategory=Voulez-vous vraiment supprimer ce compte du groupe de comptes? JournalizationInLedgerStatus=État de la journalisation -AlreadyInGeneralLedger=Déjà journalisé dans les livres -NotYetInGeneralLedger=Pas encore journalisé dans les livres GroupIsEmptyCheckSetup=Le groupe est vide, vérifiez la configuration du groupe comptable personnalisé DetailByAccount=Voir le détail par compte AccountWithNonZeroValues=Comptes avec des valeurs différentes de zéro @@ -32,7 +30,6 @@ CountriesInEEC=Pays membres du CEE CountriesNotInEEC=Pays non membres du CEE CountriesInEECExceptMe=Pays membres du CEE sauf %s CountriesExceptMe=Tous le pays sauf %s -AccountantFiles=Exporter un document comptable MainAccountForCustomersNotDefined=Compte comptable principal pour les clients non défini dans la configuration MainAccountForSuppliersNotDefined=Compte comptable principal pour les vendeurs non défini dans la configuration MainAccountForUsersNotDefined=Compte comptable principal pour les utilisateurs non défini dans la configuration @@ -58,7 +55,6 @@ AccountancyAreaDescBind=ÉTAPE %s: Vérifiez la liaison entre les lignes %s exis AccountancyAreaDescWriteRecords=ÉTAPE %s: Écrivez des transactions dans le Ledger. Pour cela, accédez au menu %s, et cliquez sur le bouton %s. AccountancyAreaDescAnalyze=ÉTAPE %s: Ajoutez ou modifiez des transactions existantes et générez des rapports et des exportations. AccountancyAreaDescClosePeriod=ÉTAPE%s: Période de fermeture afin que nous ne puissions faire aucune modification dans un futur. -TheJournalCodeIsNotDefinedOnSomeBankAccount=Étape obligatoire de configuration non terminée (journal des codes comptables non défini pour tous les comptes bancaires) Selectchartofaccounts=Sélectionnez le plan des comptes actif SubledgerAccountLabel=Étiquette de compte auxiliaire ShowAccountingJournal=Afficher le journal comptable @@ -76,7 +72,6 @@ SuppliersVentilation=Reliure de facture fournisseur ExpenseReportsVentilation=Rapport de dépenses liant CreateMvts=Créer une nouvelle transaction ValidTransaction=Valider une transaction -WriteBookKeeping=Enregistrer des transactions dans le grand livre AccountBalance=Solde du compte ObjectsRef=Référence à un objet source CAHTF=Fournisseur d'achat total avant taxes @@ -104,7 +99,6 @@ ACCOUNTING_SERVICE_BUY_ACCOUNT=Compte comptable par défaut pour les services ac ACCOUNTING_SERVICE_SOLD_ACCOUNT=Compte comptable par défaut pour les services vendus (utilisé si non défini dans la fiche de service) GroupByAccountAccounting=Groupe par compte comptable NotMatch=Pas encore défini -DeleteMvt=Effacer les lignes du grand livre FinanceJournal=Journal des finances ExpenseReportsJournal=Journal des rapports de dépenses DescFinanceJournal=Journal de banque comprenant tous les types de règlements autres que espèce\t diff --git a/htdocs/langs/fr_CH/companies.lang b/htdocs/langs/fr_CH/companies.lang deleted file mode 100644 index 4f7719d61ea..00000000000 --- a/htdocs/langs/fr_CH/companies.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - companies -ProfId5MA=Id. prof. 5 (I.C.E.) diff --git a/htdocs/langs/fr_CH/main.lang b/htdocs/langs/fr_CH/main.lang index 65f49b2ef5e..2888af9c5df 100644 --- a/htdocs/langs/fr_CH/main.lang +++ b/htdocs/langs/fr_CH/main.lang @@ -3,19 +3,19 @@ DIRECTION=ltr FONTFORPDF=helvetica FONTSIZEFORPDF=10 SeparatorDecimal=. -SeparatorThousand=, -FormatDateShort=%d/%m/%Y -FormatDateShortInput=%d/%m/%Y -FormatDateShortJava=dd/MM/yyyy -FormatDateShortJavaInput=dd/MM/yyyy -FormatDateShortJQuery=dd/mm/yy -FormatDateShortJQueryInput=dd/mm/yy +SeparatorThousand=Space +FormatDateShort=%d.%m.%Y +FormatDateShortInput=%d.%m.%Y +FormatDateShortJava=dd.MM.yyyy +FormatDateShortJavaInput=dd.MM.yyyy +FormatDateShortJQuery=dd.mm.yy +FormatDateShortJQueryInput=dd.mm.yy FormatHourShortJQuery=HH:MI -FormatHourShort=%I:%M %p +FormatHourShort=%H:%M %p FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y -FormatDateHourShort=%d/%m/%Y %I:%M %p -FormatDateHourSecShort=%d/%m/%Y %I:%M:%S %p -FormatDateHourTextShort=%d %b %Y, %I:%M %p -FormatDateHourText=%d %B %Y, %I:%M %p +FormatDateHourShort=%d.%m.%Y %H:%M %p +FormatDateHourSecShort=%d.%m.%Y %H:%M:%S %p +FormatDateHourTextShort=%d %b %Y, %H:%M %p +FormatDateHourText=%d %B %Y, %H:%M %p diff --git a/htdocs/langs/fr_CI/companies.lang b/htdocs/langs/fr_CI/companies.lang deleted file mode 100644 index 4f7719d61ea..00000000000 --- a/htdocs/langs/fr_CI/companies.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - companies -ProfId5MA=Id. prof. 5 (I.C.E.) diff --git a/htdocs/langs/fr_CM/companies.lang b/htdocs/langs/fr_CM/companies.lang deleted file mode 100644 index 4f7719d61ea..00000000000 --- a/htdocs/langs/fr_CM/companies.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - companies -ProfId5MA=Id. prof. 5 (I.C.E.) diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang index 44bc2592b68..7937bfcebbf 100644 --- a/htdocs/langs/fr_FR/accountancy.lang +++ b/htdocs/langs/fr_FR/accountancy.lang @@ -339,6 +339,8 @@ Modelcsv_configurable=Export configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export pour Sage 50 Suisse Modelcsv_winfic=Export pour Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export vers Gestinum (v3) +Modelcsv_Gestinumv5Export Pour Gestinum (V5) ChartofaccountsId=Id plan comptable ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 7892913e52b..601ed14f0c1 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -484,7 +484,7 @@ Use3StepsApproval=Par défaut, les commandes fournisseurs nécessitent d'être c UseDoubleApproval=Activer l'approbation en trois étapes si le montant HT est supérieur à... WarningPHPMail=AVERTISSEMENT: la configuration pour envoyer des e-mails à partir de l'application utilise la configuration générique par défaut. Il est souvent préférable de configurer les e-mails sortants pour utiliser le serveur de messagerie de votre fournisseur de services de messagerie au lieu de la configuration par défaut pour plusieurs raisons: WarningPHPMailA= - L'utilisation des serveurs de prestataires de messagerie augmente le niveau confiance des e-mails, cela augmente donc les chances de délivrabilité en n'étant pas considéré comme spam. -WarningPHPMailB=- Certains fournisseurs de services de messagerie (comme Yahoo) ne vous permettent pas d'envoyer un e-mail à partir d'un autre serveur que leur propre serveur. Votre configuration actuelle utilise le serveur de l'application pour envoyer des e-mails et non le serveur de votre fournisseur de messagerie, donc certains destinataires (ceux compatibles avec le protocole DMARC restrictif), demanderont à votre fournisseur de messagerie s'il peut accepter votre message et certains fournisseurs de messagerie (comme Yahoo) peut répondre «non» parce que le serveur n'est pas le leur, aussi une partie de vos e-mails envoyés peuvent ne pas être acceptés pour la livraison (faites également attention au quota d'envoi de votre fournisseur de messagerie). +WarningPHPMailB=- Certains fournisseurs de services de messagerie (comme Yahoo) ne vous permettent pas d'envoyer un e-mail à partir d'un autre serveur que leur propre serveur. Votre configuration actuelle utilise le serveur de l'application pour envoyer des e-mails et non le serveur de votre fournisseur de messagerie, donc certains destinataires (ceux compatibles avec le protocole DMARC restrictif), demanderont à votre fournisseur de messagerie si ils peuvent accepter votre message et ce fournisseur de messagerie (comme Yahoo) peut répondre «non» parce que le serveur d'envoi n'est pas le leur, aussi une partie de vos e-mails envoyés peuvent ne pas être acceptés pour la livraison (faites également attention au quota d'envoi de votre fournisseur de messagerie). WarningPHPMailC=- Utiliser le serveur SMTP de votre propre fournisseur de services de messagerie pour envoyer des e-mails est également intéressant afin que tous les e-mails envoyés depuis l'application soient également enregistrés dans votre répertoire "Envoyés" de votre boîte aux lettres. WarningPHPMailD=Si PHP est vraiment la méthode d'envoi des e-mails que vous avez choisi d'utiliser, supprimer cette alerte en activant à 1 la constante MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP dans Accueil - Configuration - Divers WarningPHPMail2=Si votre fournisseur de messagerie SMTP a besoin de restreindre le client de messagerie à certaines adresses IP (très rare), voici l'adresse IP du mail user agent (MUA) de votre application CRM ERP : %s . @@ -507,7 +507,7 @@ FreeLegalTextOnExpenseReports=Mention complémentaire sur les notes de frais WatermarkOnDraftExpenseReports=Filigrane sur les notes de frais 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 +SendEmailsReminders=Envoyer des rappels agenda par e-mails davDescription=Ajout d'un composant pour devenir un serveur DAV DAVSetup=Configuration du module DAV DAV_ALLOW_PRIVATE_DIR=Activer le répertoire privé générique (répertoire dédié WebDAV nommé "private" - identification requise) @@ -1314,6 +1314,7 @@ PHPModuleLoaded=Le composant PHP %s est chargé PreloadOPCode=Le code OP préchargé est utilisé AddRefInList=Afficher les références client/fournisseur dans les listes (listes déroulantes ou à autocomplétion) et les libellés des liens clicables.
Les tiers apparaîtront alors sous la forme "CC12345 - SC45678 - La big company coorp", au lieu de "La big company coorp". AddAdressInList=Affiche les informations sur l’adresse du client/fournisseur (liste de sélection ou liste déroulante)
Les tiers apparaîtront avec le format de nom suivant: "The Big Company corp. - 21, rue du saut 123456 Big town - USA" au lieu de "The Big Company corp". +AddEmailPhoneTownInContactList=Afficher l'adresse e-mail du contact (ou les téléphones si non définis) et la ville
Les contacts apparaîtront avec un nom au format "Dupond Durand - dupond.durand@email.com - Paris" ou "Dupond Durand - 06 07 59 65 66 - Paris" au lieu de "Dupond Durand". AskForPreferredShippingMethod=Demander la méthode d'expédition préférée pour les Tiers FieldEdition=Édition du champ %s FillThisOnlyIfRequired=Exemple: +2 (ne remplir que si un décalage d'heure est constaté dans l'export) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email obligatoire pour créer un nouvel adhérent MemberSendInformationByMailByDefault=Case à cocher pour envoyer un email de confirmation (validation ou nouvelle cotisation) aux adhérents est à oui par défaut. VisitorCanChooseItsPaymentMode=Le visiteur peut choisir parmi les modes de paiement disponibles MEMBER_REMINDER_EMAIL=Activer le rappel automatique par e-mail des adhésions expirées. Remarque: le module %s doit être activé et configuré correctement pour qu'un rappel soit envoyé. +MembersDocModules=Modèle de document pour le document généré depuis la fiche d'un adhérent ##### LDAP setup ##### LDAPSetup=Configuration du module LDAP LDAPGlobalParameters=Paramètres globaux @@ -1670,7 +1672,7 @@ AdvancedEditor=Editeur avancé ActivateFCKeditor=Activer l'éditeur avancé pour : FCKeditorForCompany=Création/édition WYSIWIG de la description et note des éléments (autre que produits/services) FCKeditorForProduct=Création/édition WYSIWIG de la description et note des produits/services -FCKeditorForProductDetails=Création/édition WYSIWIG des lignes détails produits sur tous les éléments (commandes, propales, factures, etc...). Attention: L'utilisation pour ce cas est fortement déconseillée car peut poser des problèmes dans la gestion de caractères et mise en page des fichiers PDF générés. +FCKeditorForProductDetails=Création/édition WYSIWYG des lignes de détails produits sur tous les éléments (commandes, propales, factures, etc...). Attention: L'utilisation pour ce cas est fortement déconseillée car peut créer des problèmes dans la gestion de caractères et mise en page des fichiers PDF générés. FCKeditorForMailing= Création/édition WYSIWIG des emailings (Outils->Emailings) FCKeditorForUserSignature=Création/édition WYSIWIG de la signature des utilisateurs FCKeditorForMail=Création/édition WYSIWIG tous les emails (sauf Outils->Emailings) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Configurez automatiquement cette valeur par défau AGENDA_DEFAULT_FILTER_TYPE=Positionner automatiquement ce type d'événement dans le filtre de recherche de la vue agenda AGENDA_DEFAULT_FILTER_STATUS=Positionner automatiquement ce 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=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 le rappel d'événement sur le navigateur de l'utilisateur (lorsque la date de l'événement est atteinte, chaque utilisateur peut le refuser à partir de la question de confirmation du navigateur) +AGENDA_REMINDER_BROWSER=Activer le rappel d'événement sur le navigateur de l'utilisateur (lorsque la date de l'événement est atteinte, une popup est affichée sur la navigateur. Chaque utilisateur peut désactiver de telles notification depuis la configuration des notifications de son navigateur) AGENDA_REMINDER_BROWSER_SOUND=Activer les notifications sonores. +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). +AGENDA_REMINDER_EMAIL_NOTE=Note : la fréquence d'exécution de la tâche %s doit être suffisante pour être sûr que le rappel soit envoyé au bon moment.. AGENDA_SHOW_LINKED_OBJECT=Afficher l'objet lié dans la vue agenda ##### Clicktodial ##### ClickToDialSetup=Configuration du module Click To Dial diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang index 6e6d0e26b4a..17a6d56823f 100644 --- a/htdocs/langs/fr_FR/banks.lang +++ b/htdocs/langs/fr_FR/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Paiement divers VariousPayments=Opérations diverses ShowVariousPayment=Afficher les paiements divers AddVariousPayment=Créer paiement divers +VariousPaymentId=Identifiant du paiement divers +VariousPaymentLabel=Libellé de paiement divers +ConfirmCloneVariousPayment=Confirmation du clonage du paiement divers SEPAMandate=Mandat SEPA YourSEPAMandate=Votre mandat SEPA 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 à @@ -176,3 +179,4 @@ BankColorizeMovement=Coloriser les mouvements BankColorizeMovementDesc=Si cette fonction est activée, vous pouvez choisir une couleur de fond spécifique pour les mouvements de débit ou de crédit. BankColorizeMovementName1=Couleur de fond pour les mouvements de débit BankColorizeMovementName2=Couleur de fond pour le mouvement de crédit +IfYouDontReconcileDisableProperty=Si vous ne réalisez pas le rapprochement bancaire sur certains comptes bancaires, désactivez la fonctionnalité "%s" pour ne plus afficher cette alerte. diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang index 689d6551ccc..b5588c21df3 100644 --- a/htdocs/langs/fr_FR/bills.lang +++ b/htdocs/langs/fr_FR/bills.lang @@ -43,7 +43,7 @@ ConsumedBy=Consommé par NotConsumed=Non consommé NoReplacableInvoice=Pas de facture remplaçable NoInvoiceToCorrect=Pas de facture à corriger -InvoiceHasAvoir=Cette facture a déjà fait l'objet d'un ou plusieurs avoirs. +InvoiceHasAvoir=Cette facture a déjà fait l'objet d'avoirs CardBill=Fiche facture PredefinedInvoices=Facture modèles Invoice=Facture diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang index a7aa6836bdc..580e98a38e9 100644 --- a/htdocs/langs/fr_FR/categories.lang +++ b/htdocs/langs/fr_FR/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Configuration des tags/catégories CategorieRecursiv=Lier automatiquement avec le(a) tag/catégorie parent(e) CategorieRecursivHelp=Si l'option est activé, quand un produit est ajouté dans une sous-catégorie, le produit sera ajouté aussi dans la catégorie parente. AddProductServiceIntoCategory=Ajouter le produit/service suivant +AddCustomerIntoCategory=Assigner cette catégorie au client +AddSupplierIntoCategory=Assigner cette catégorie au fournisseur ShowCategory=Afficher tag/catégorie ByDefaultInList=Par défaut dans la liste ChooseCategory=Choisissez une catégorie -StocksCategoriesArea=Espace Catégories d'entrepôts -ActionCommCategoriesArea=Espace catégories d'événements -WebsitePagesCategoriesArea=Espace catégories des Pages-Containeurs +StocksCategoriesArea=Catégories d'entrepôts +ActionCommCategoriesArea=Catégories d'évènements +WebsitePagesCategoriesArea=Catégories des pages-conteneurs UseOrOperatorForCategories=Utiliser l'opérateur 'ou' pour les catégories diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang index f2e509ecb91..1fc19440a1c 100644 --- a/htdocs/langs/fr_FR/companies.lang +++ b/htdocs/langs/fr_FR/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Id. prof. 1 (USt.-IdNr) ProfId2AT=Id. prof. 2 (USt.-Nr) ProfId3AT=Id. prof. 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=Numéro EORI ProfId6AT=- ProfId1AU=Id. prof. 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Id. prof. 1 (N° professionnel) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=Numéro EORI ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Numéro fédéral ProfId4CH=Num. registre du commerce -ProfId5CH=- +ProfId5CH=Numéro EORI ProfId6CH=- ProfId1CL=Prof Id 1 (R.U.T.) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Id. prof. 1 (USt.-IdNr) ProfId2DE=Id. prof. 2 (USt.-Nr) ProfId3DE=Id. prof. 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=Numéro EORI ProfId6DE=- ProfId1ES=Id. prof. 1 (CIF/NIF) ProfId2ES=Id. prof. 2 (Num. sécurité social) ProfId3ES=Id. prof. 3 (CNAE) ProfId4ES=Id. prof. 4 (Num. Collégiale) -ProfId5ES=- +ProfId5ES=Numéro EORI ProfId6ES=- ProfId1FR=Id. prof. 1 (SIREN) ProfId2FR=Id. prof. 2 (SIRET) ProfId3FR=Id. prof. 3 (NAF-APE) ProfId4FR=Id. prof. 4 (RCS/RM) -ProfId5FR=- +ProfId5FR=Numéro EORI ProfId6FR=- ProfId1GB=Numéro d'enregistrement ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Id. prof. 3 (SRVC TAX) ProfId4IN=Id. prof. 4 ProfId5IN=Id. prof. 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=Numéro EORI ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Business permit) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=Numéro EORI ProfId6LU=- ProfId1MA=Id. prof. 1 (R.C.) ProfId2MA=Id. prof. 2 (Patente) ProfId3MA=Id. prof. 3 (I.F.) ProfId4MA=Id. prof. 4 (C.N.S.S.) -ProfId5MA=Id prof. 5 (I.C.E.) +ProfId5MA=Identifiant Commun de l’Entreprise (ICE) ProfId6MA=- ProfId1MX=Id. prof. 1 (R.F.C). ProfId2MX=ID. prof. 2 (R..P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK nummer ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=Numéro EORI ProfId6NL=- ProfId1PT=Id. prof. 1 (NIPC) ProfId2PT=Id. prof. 2 (Num. sécurité social) ProfId3PT=Id. prof. 3 (Num. enreg. commercial) ProfId4PT=Id. prof. 4 (Conservatory) -ProfId5PT=- +ProfId5PT=Numéro EORI ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Id. prof. 1 (CUI) ProfId2RO=Id. prof. 2 (Nr. Înmatriculare) ProfId3RO=Id. prof. 3 (CAEN) -ProfId4RO=- -ProfId5RO=Id prof 5 (EUID) +ProfId4RO=Id prof 5 (EUID) +ProfId5RO=Numéro EORI ProfId6RO=- ProfId1RU=Id. prof.1 (OGRN) ProfId2RU=Id. prof.2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=Vous pouvez aussi vérifier manuellement via le site de la c ErrorVATCheckMS_UNAVAILABLE=Vérification impossible. Le service de vérification n'est pas fourni par ce pays membre (%s). NorProspectNorCustomer=Ni client, ni prospect JuridicalStatus=Type d'entité légale +Workforce=Effectifs Staff=Salariés ProspectLevelShort=Potentiel ProspectLevel=Potentiel du prospect @@ -456,3 +462,8 @@ PaymentTermsSupplier=Conditions de paiement - fournisseur PaymentTypeBoth=Type de paiement - Client et fournisseur MulticurrencyUsed=Utiliser plusieurs devises MulticurrencyCurrency=Devise +InEEC=Union Européenne (UE) +RestOfEurope=Reste de l'Union Européenne (UE) +OutOfEurope=Hors Union Européenne (UE) +CurrentOutstandingBillLate=Montant impayé arrivé à échéance +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Attention : selon votre configuration des prix des produits/services, vous devriez changer le tiers avant d'ajouter le produit diff --git a/htdocs/langs/fr_FR/cron.lang b/htdocs/langs/fr_FR/cron.lang index 38c6d34650d..b154c5de72c 100644 --- a/htdocs/langs/fr_FR/cron.lang +++ b/htdocs/langs/fr_FR/cron.lang @@ -7,13 +7,14 @@ Permission23103 = Supprimer une tâche planifiée Permission23104 = Exécuter une tâche planifiée # Admin CronSetup=Page de configuration du module - Gestion des travaux programmés -URLToLaunchCronJobs=URL pour vérifier ou lancer les travaux planifiés qualifiés -OrToLaunchASpecificJob=Ou pour vérifier et lancer un travail programmé spécifique +URLToLaunchCronJobs=URL pour vérifier et lancer les travaux planifiés qualifiés depuis un navigateur +OrToLaunchASpecificJob=Ou pour vérifier et lancer une tâche planifiée spécifique depuis un navigateur KeyForCronAccess=Clé de sécurité pour l'URL de lancement des travaux programmés FileToLaunchCronJobs=Ligne de commande pour vérifier et lancer les travaux programmés qualifiés CronExplainHowToRunUnix=Sur un environnement Unix vous pouvez utiliser l'entrée suivante en crontab pour exécuter la ligne de commande toutes les 5 minutes CronExplainHowToRunWin=Sous Microsoft (tm) Windows, vous pouvez utiliser les outils Tâches programmées pour exécuter la ligne de commande toutes les 5 minutes. CronMethodDoesNotExists=La classe %s ne contient aucune méthode %s +CronMethodNotAllowed=La méthode %s de la classe %s est dans la liste noire des méthodes interdites CronJobDefDesc=Les travaux planifiés sont définis dans le fichier descripteur de module. Lorsque le module est activé, ils sont chargés et disponibles afin que vous puissiez administrer les travaux à partir du menu des outils d'administration %s. CronJobProfiles=Liste des profils de travaux planifiés prédéfinis # Menu @@ -46,6 +47,7 @@ CronNbRun=Nb. de lancements CronMaxRun=Nb max de lancement CronEach=Tous les JobFinished=Travail lancé et terminé +Scheduled=Programmé #Page card CronAdd= Ajoutez des travaux CronEvery=Exécuter chaque tâche @@ -56,7 +58,7 @@ CronNote=Commentaire CronFieldMandatory=Le champ %s est obligatoire CronErrEndDateStartDt=La date de fin ne peux être avant la date de début StatusAtInstall=Statut lors de l'installation du module -CronStatusActiveBtn=Activer +CronStatusActiveBtn=Planifier CronStatusInactiveBtn=Désactiver CronTaskInactive=Cette tâche est désactivée CronId=Id @@ -81,3 +83,5 @@ JobDisabled=Travail désactivé MakeLocalDatabaseDumpShort=Sauvegarde locale de base MakeLocalDatabaseDump=Créez un fichier dump de base local. Les paramètres sont: compression ('gz' ou 'bz' ou 'none'), type de sauvegarde ('mysql', 'pgsql', 'auto'), 1, 'auto' ou nom du fichier à générer, nombre de fichiers de sauvegarde à garder WarningCronDelayed=Attention, à des fins de performance, quelle que soit la prochaine date d'exécution des travaux activés, vos travaux peuvent être retardés jusqu'à %s heures avant d'être exécutés. +DATAPOLICYJob=Nettoyeur de données et anonymiseur +JobXMustBeEnabled=Le poste %s doit être activé diff --git a/htdocs/langs/fr_FR/hrm.lang b/htdocs/langs/fr_FR/hrm.lang index 1a009ca38b0..083d42df0b1 100644 --- a/htdocs/langs/fr_FR/hrm.lang +++ b/htdocs/langs/fr_FR/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=GRH - Liste des fonctions Employees=Salariés Employee=Salarié NewEmployee=Nouveau salarié +ListOfEmployees=List des salariés diff --git a/htdocs/langs/fr_FR/languages.lang b/htdocs/langs/fr_FR/languages.lang index 6cde9682397..12b99eab661 100644 --- a/htdocs/langs/fr_FR/languages.lang +++ b/htdocs/langs/fr_FR/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Espagnol (Panama) Language_es_PY=Espagnol (Paraguay) Language_es_PE=Espagnol (Peru) Language_es_PR=Espagnol (Puerto Rico) +Language_es_US=Espagnol (USA) Language_es_UY=Espagnol (Uruguay) Language_es_GT=Espagnol (Guatemala) Language_es_VE=Espagnol (Venezuela) diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index c0c206f064d..4756a52b6a2 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -197,6 +197,7 @@ ReOpen=Réouvrir Upload=Envoyer fichier ToLink=Lier Select=Sélectionner +SelectAll=Sélectionner tout Choose=Choisir Resize=Redimensionner ResizeOrCrop=Redimensionner ou Recadrer @@ -257,6 +258,7 @@ Cards=Fiches Card=Fiche Now=Maintenant HourStart=Heure de début +Deadline=Echéance Date=Date DateAndHour=Date et heure DateToday=Date du jour @@ -265,8 +267,10 @@ DateStart=Date début DateEnd=Date fin DateCreation=Date création DateCreationShort=Date de création +IPCreation=Création IP DateModification=Date modification DateModificationShort=Date modif. +IPModification=Modification IP DateLastModification=Date de dernière modification DateValidation=Date validation DateClosing=Date clôture @@ -1100,5 +1104,6 @@ PublicVendorName=Nom publique du vendeur DateOfBirth=Date de naissance SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Le jeton de sécurité a expiré, aussi l'action a été annulée. Merci de ré-essayer. UpToDate=Adhésion à jour -OutOfDate=Adhésion terminée +OutOfDate=Adhésion expirée EventReminder=Rappel d'événement +UpdateForAllLines=Mise à jour de toutes les lignes diff --git a/htdocs/langs/fr_FR/mrp.lang b/htdocs/langs/fr_FR/mrp.lang index 24665aeebef..f1eaeffdfed 100644 --- a/htdocs/langs/fr_FR/mrp.lang +++ b/htdocs/langs/fr_FR/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Coût unitaire TotalCost=Coût total BOMTotalCost=Le coût de production de cette nomenclature basé sur chaque quantité et produit à consommer (utilise le prix de revient si défini, sinon le PMP si défini, sinon le meilleur prix d'achat) GoOnTabProductionToProduceFirst=Vous devez avoir la production pour clôturer un Ordre de Fabrication (voir onglet '%s'). Mais vous pouvez l'annuler. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=Un kit ne peut pas être utilisé dans une nomenclature ou un ordre de fabrication. diff --git a/htdocs/langs/fr_FR/website.lang b/htdocs/langs/fr_FR/website.lang index e89cd5779c3..0db2af94537 100644 --- a/htdocs/langs/fr_FR/website.lang +++ b/htdocs/langs/fr_FR/website.lang @@ -31,7 +31,7 @@ AddWebsite=Ajouter site web Webpage=Page/container Web AddPage=Ajouter une page/container HomePage=Page d'accueil -PageContainer=Page/container +PageContainer=Page PreviewOfSiteNotYetAvailable=La prévisualisation de votre site web %s n'est pas disponible actuellement. Vous devez d'abord 'Importer un modèle de site web complet' ou juste 'Ajouter une page/container. RequestedPageHasNoContentYet=La page demandée avec l'id=%s ne présente encore aucun contenu ou le fichier cache .tpl.php a été supprimé. Ajoutez du contenu à la page pour résoudre cela. SiteDeleted=Site Web '%s' supprimé @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Remplacement effectué dans %s pages ou des conteneurs RSSFeed=Flux RSS RSSFeedDesc=Vous pouvez obtenir un flux RSS des derniers articles de type 'blogpost' en utilisant cette URL PagesRegenerated=%s page(s)/conteneur(s) régénéré(s) +RegenerateWebsiteContent=Régénérer les fichiers de cache du site Web +AllowedInFrames=Autorisé dans les cadres diff --git a/htdocs/langs/fr_GA/companies.lang b/htdocs/langs/fr_GA/companies.lang index 7a6ad51afa6..b055edace88 100644 --- a/htdocs/langs/fr_GA/companies.lang +++ b/htdocs/langs/fr_GA/companies.lang @@ -8,7 +8,6 @@ ProfId3=CNAMGS ProfId4=RCCM ProfId5=NIM ProfId6=NIF -ProfId5MA=Id. prof. 5 (I.C.E.) Contact=Contact / Adresse Contacts=Contacts / Adresses ContactsAddresses=Contacts / Adresses diff --git a/htdocs/langs/gl_ES/accountancy.lang b/htdocs/langs/gl_ES/accountancy.lang index 2c6f92c301b..1aa15550b74 100644 --- a/htdocs/langs/gl_ES/accountancy.lang +++ b/htdocs/langs/gl_ES/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Predeterminado para o servizo DefaultForProduct=Predeterminado para o produto CantSuggest=Non pode suxerirse AccountancySetupDoneFromAccountancyMenu=A maior parte da configuración da contabilidade realizase dende o menú %s -ConfigAccountingExpert=Configuración do módulo contabilidade avanzada +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Procesar diarios -Journaux=Diarios +Journals=Diarios JournalFinancial=Diarios financieiros BackToChartofaccounts=Voltar ao plan contable Chartofaccounts=Plan contable +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Conta contable adicada AssignDedicatedAccountingAccount=Nova conta a asignar InvoiceLabel=Etiqueta factura @@ -33,8 +35,8 @@ OtherInfo=Outra información DeleteCptCategory=Eliminar a conta contable do grupo ConfirmDeleteCptCategory=¿Está certo de querer eliminar esta conta contable do grupo de contas contables? JournalizationInLedgerStatus=Estado de diario -AlreadyInGeneralLedger=Xa rexistrado no Libro Maior -NotYetInGeneralLedger=Non foi rexistrado aínda no Libro Maior +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=O grupo está baleiro, comprobe a configuración da personalización de grupos contables DetailByAccount=Amosar detalles por conta AccountWithNonZeroValues=Contas con valores non cero @@ -43,7 +45,9 @@ CountriesInEEC=Países na CEE CountriesNotInEEC=Países non CEE CountriesInEECExceptMe=Todos os paises incluidos na CEE excepto %s CountriesExceptMe=Todos os países excepto %s -AccountantFiles=Exportar documentos contables +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Conta contable principal para clientes non definida na configuración MainAccountForSuppliersNotDefined=Conta contable principal para provedores non definida na configuración @@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=PASO %s: Engadir ou editar transaccións existentes, AccountancyAreaDescClosePeriod=PASO %s: Pechar periodo, polo que non poderá facer modificacións nun futuro. -TheJournalCodeIsNotDefinedOnSomeBankAccount=Non foi completado un paso obrigatorio na configuración (conta contable non definida en todas as contas bancarias) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Seleccione un plan contable activo ChangeAndLoad=Cambiar e cargar Addanaccount=Engadir unha conta contable @@ -89,6 +93,8 @@ SubledgerAccount=Subconta contable SubledgerAccountLabel=Etiqueta subconta contable ShowAccountingAccount=Amosar contabilidade ShowAccountingJournal=Amosar diario contable +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Conta contable suxerida MenuDefaultAccounts=Contas contables por defecto MenuBankAccounts=Contas Bancarias @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Contabilizar informes de gastos CreateMvts=Crear nova transacción UpdateMvts=Modificación dunha transacción ValidTransaction=Transacción validada -WriteBookKeeping=Rexistrar movimentos no Libro Maior +WriteBookKeeping=Register transactions in accounting Bookkeeping=Libro Maior +BookkeepingSubAccount=Subledger AccountBalance=Saldo da conta ObjectsRef=Referencia de obxecto orixe CAHTF=Total compras a provedor antes de impostos @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Desactivar transaccións directas en conta bancaria ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Habilitar exportación de borradores al diario ACCOUNTANCY_COMBO_FOR_AUX=Habilita a listaxe combinada para a conta subsidiaria (pode ser lento se ten moitos terceiros) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Diario de vendas ACCOUNTING_PURCHASE_JOURNAL=Diario de compras @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Conta contable de operacións pendentes de asignar DONATION_ACCOUNTINGACCOUNT=Conta contable de rexistro de doacións/subvencións ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Conta contable de rexistro subscricións +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Conta contable predeterminada para produtos comprados (usada se non están definidos na folla de produtos) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=Por grupos predefinidos ByPersonalizedAccountGroups=Por grupos persoalizados ByYear=Por ano NotMatch=Non establecido -DeleteMvt=Eliminar liñas do Libro Maior +DeleteMvt=Delete some operation lines from accounting DelMonth=Mes a eliminar DelYear=Ano a eliminar DelJournal=Diario a eliminar -ConfirmDeleteMvt=Isto eliminará todas as liñas do Libro Maior do ano e/ou dun diario específico. Precísase alo menos un criterio. -ConfirmDeleteMvtPartial=Isto eliminará a transacción do libro maior (serán eliminadas todas as liñas relacionadas coa mesma transacción) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Diario financiero ExpenseReportsJournal=Diario informe de gastos DescFinanceJournal=O diario financiero inclúe todos os tipos de pagos por conta bancaria -DescJournalOnlyBindedVisible=Ista é una vista do rexistro ligada a unha conta contable e que pode ser rexistrada no Libro Maior. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Conta contable para IVE non definida ThirdpartyAccountNotDefined=Conta contable para terceiro non definida ProductAccountNotDefined=Conta contable para produto non definida @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=Este diario xa está a ser utilizado AccountingAccountForSalesTaxAreDefinedInto=Nota: A conta contable do IVE nas vendas defínese no menú %s - %s NumberOfAccountancyEntries=Número de entradas NumberOfAccountancyMovements=Número de movementos +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Exportar libro borrador @@ -326,6 +339,8 @@ Modelcsv_configurable=Exportar a CSV Configurable Modelcsv_FEC=Exportar FEC (Art. L47 A) Modelcsv_Sage50_Swiss=Exportar a Sage 50 Suiza Modelcsv_winfic=Exportar a Winfic - eWinfic - WinSis Conta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Id do plan contable ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/gl_ES/admin.lang b/htdocs/langs/gl_ES/admin.lang index 77eef8b68dd..dc2f2aa0a84 100644 --- a/htdocs/langs/gl_ES/admin.lang +++ b/htdocs/langs/gl_ES/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Pregarca de OPCode está activa AddRefInList=Amosar código de cliente/provedor nas listaxes (e selectores) e ligazóns.
Os terceiros aparecerán co nome "CC12345 - SC45678 - The big company coorp", no lugar de "The big company coorp". AddAdressInList=Amosar o enderezo do cliente/provedor nas listaxes (e selectores)
Os terceiros aparecerán co nome "The big company coorp - 21 jump street 123456 Big town - USA ", no lugar de "The big company coorp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Consultar polo método preferido de envío a terceiros. FieldEdition=Edición do campo %s FillThisOnlyIfRequired=Exemplo: +2 (Complete só se rexistra unha desviación do tempo na exportación) @@ -1420,6 +1421,7 @@ AdherentMailRequired=E-Mail obrigatorio para crear un membro novo MemberSendInformationByMailByDefault=Caixa de verificación para enviar o correo de confirmación (validación ou nova cotización) aos membros é por defecto "sí" VisitorCanChooseItsPaymentMode=O visitante pode escoller entre os modos de pagamento dispoñibles MEMBER_REMINDER_EMAIL=Habilitar recordatorio de eventos por e-mail de suscripcións expiradas. Nota: O módulo %s debe estar habilitado e configurado correctamente para que o recordatorio sexa enviado. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=Configuración do módulo LDAP LDAPGlobalParameters=Parámetros globais @@ -1670,7 +1672,7 @@ AdvancedEditor=Editor avanzado ActivateFCKeditor=Activar editor avanzado para : FCKeditorForCompany=Creación/edición WYSIWIG da descrición e notas dos terceiros FCKeditorForProduct=Creación/edición WYSIWIG da descrición e notas dos produtos/servizos -FCKeditorForProductDetails=Creación/edición WYSIWIG das liñas de detalle dos produtos (pedimentos, orzamentos, facturas, etc.). Atención: O uso desta opción non é recomendable xa que puede crear problemas cos caracteres especiais e o formateo de páxina ao xerar ficheiros PDF. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= Creación/edición WYSIWIG dos E-Mails (Utilidades->E-Mailings) FCKeditorForUserSignature=Creación/edición WYSIWIG da sinatura de usuarios FCKeditorForMail=Creación/edición WYSIWIG de todos os e-mails ( excepto Utilidades->E-Mailings) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting 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 user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup diff --git a/htdocs/langs/gl_ES/banks.lang b/htdocs/langs/gl_ES/banks.lang index 93160d3254e..bb0b955c32c 100644 --- a/htdocs/langs/gl_ES/banks.lang +++ b/htdocs/langs/gl_ES/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Pagamento varios VariousPayments=Pagamentos varios ShowVariousPayment=Amosar pagamentos varios AddVariousPayment=Engadir pagamentos varios +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=Orde SEPA YourSEPAMandate=A súa orde SEPA FindYourSEPAMandate=Esta é a súa orde SEPA para autorizar a nosa empresa a realizar un petición de débito ao seu banco. Envíea de volta asinada (dixitalice o documento asinado) ou envíe por correo a @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/gl_ES/categories.lang b/htdocs/langs/gl_ES/categories.lang index 1879baaec46..2aa1b892b01 100644 --- a/htdocs/langs/gl_ES/categories.lang +++ b/htdocs/langs/gl_ES/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup CategorieRecursiv=Link with parent tag/category automatically CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=Add the following product/service +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Show tag/category ByDefaultInList=By default in list ChooseCategory=Choose category -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/gl_ES/companies.lang b/htdocs/langs/gl_ES/companies.lang index 9968bdc6941..fa0e5afee91 100644 --- a/htdocs/langs/gl_ES/companies.lang +++ b/htdocs/langs/gl_ES/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Id Prof 1 (USt.-IdNr) ProfId2AT=Id Prof 2 (USt.-Nr) ProfId3AT=Id Prof 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Id Prof 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Id Prof 1 (Número de colexiado) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscrición Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscrición Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Id Prof 1 (Número federal) ProfId4CH=Id Prof 2 (Número de rexistro comercial) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Id Prof 1 (R.U.T.) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Id prof. 1 (USt.-IdNr) ProfId2DE=Id prof. 2 (USt.-Nr) ProfId3DE=Id prof. 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=CIF/NIF ProfId2ES=Número Seguridade Social ProfId3ES=CNAE ProfId4ES=Número de colexiado -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Id Prof 1 (SIREN) ProfId2FR=Id Prof 2 (SIRET) ProfId3FR=Id Prof 3 (NAF, antigo APE) ProfId4FR=Id Prof 4 (RCS/RM) -ProfId5FR=- +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Número rexistro ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Id prof. 3 (SRVC TAX) ProfId4IN=Id prof. 4 ProfId5IN=Id prof. 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Negocios permitidos) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (R.C.) ProfId2MA=Id prof. 2 (Patente) ProfId3MA=Id prof. 3 (I.F.) ProfId4MA=Id prof. 4 (C.N.S.S.) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Id prof. 1 (R.F.C.) ProfId2MX=Id prof. 2 (Rexistro Patroal IMSS) @@ -220,13 +225,13 @@ ProfId1NL=Número KVK ProfId2NL=- ProfId3NL=- ProfId4NL=- -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=NIPC ProfId2PT=Número segurança social ProfId3PT=Número rexistro comercial ProfId4PT=Conservatorio -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Id prof. 1 (OGRN) ProfId2RU=Id prof. 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=Pode tamén verificar manualmente na web da Comisión Europe ErrorVATCheckMS_UNAVAILABLE=Comprobación imposible. O servizo de comprobación non é fornecido polo Estado membro (%s). NorProspectNorCustomer=Nin cliente, nin cliente potencial JuridicalStatus=Forma xurídica +Workforce=Workforce Staff=Empregados ProspectLevelShort=Potencial ProspectLevel=Cliente potencial @@ -456,3 +462,8 @@ PaymentTermsSupplier=Termos de pagamento - Provedor PaymentTypeBoth=Tipo de pagamento - Cliente e Provedor MulticurrencyUsed=Usa MultiMoeda MulticurrencyCurrency=Moeda +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/gl_ES/hrm.lang b/htdocs/langs/gl_ES/hrm.lang index cb095d64e0d..bd222ac2e5e 100644 --- a/htdocs/langs/gl_ES/hrm.lang +++ b/htdocs/langs/gl_ES/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=Empregados Employee=Empregado NewEmployee=New employee +ListOfEmployees=List of employees diff --git a/htdocs/langs/gl_ES/languages.lang b/htdocs/langs/gl_ES/languages.lang index 762cecb554f..ce9d78410c2 100644 --- a/htdocs/langs/gl_ES/languages.lang +++ b/htdocs/langs/gl_ES/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Español (Paraguay) Language_es_PE=Español (Perú) Language_es_PR=Español (Porto Rico) +Language_es_US=Spanish (USA) Language_es_UY=Spanish (Uruguay) Language_es_GT=Spanish (Guatemala) Language_es_VE=Spanish (Venezuela) diff --git a/htdocs/langs/gl_ES/main.lang b/htdocs/langs/gl_ES/main.lang index a442449ba51..5ccf9173975 100644 --- a/htdocs/langs/gl_ES/main.lang +++ b/htdocs/langs/gl_ES/main.lang @@ -155,6 +155,7 @@ RemoveLink=Eliminar vínculo AddToDraft=Engadir a borrador Update=Actualizar Close=Pechar +CloseAs=Set status to CloseBox=Eliminar panel do seu taboleiro Confirm=Confirmar ConfirmSendCardByMail=¿Realmente quere enviar o contido desta ficha por correo a %s? @@ -196,6 +197,7 @@ ReOpen=Reabrir Upload=Actualizar arquivo ToLink=Vínculo Select=Seleccionar +SelectAll=Select all Choose=Escoller Resize=Redimensionar ResizeOrCrop=Cambiar o tamaño ou cortar @@ -256,6 +258,7 @@ Cards=Fichas Card=Ficha Now=Agora HourStart=Hora de inicio +Deadline=Deadline Date=Data DateAndHour=Data e hora DateToday=Data de hoxe @@ -264,8 +267,10 @@ DateStart=Data de inicio DateEnd=Data de fin DateCreation=Data de creación DateCreationShort=Data creac. +IPCreation=Creation IP DateModification=Data de modificación DateModificationShort=Data modif. +IPModification=Modification IP DateLastModification=Última data de modificación DateValidation=Data de validación DateClosing=Data de peche @@ -319,6 +324,7 @@ Morning=Na mañá Afternoon=Na tarde Quadri=Trimestre MonthOfDay=Mes do día +DaysOfWeek=Days of week HourShort=H MinuteShort=min Rate=Tipo @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Importe total na divisa orixinal MulticurrencyAmountHT=Base impoñible na divisa orixinal MulticurrencyAmountTTC=Total na divisa orixinal MulticurrencyAmountVAT=Importe IVE na divisa orixinal +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Importe Imposto 2 AmountLT2=Importe IRPF AmountLT1ES=Importe RE @@ -487,6 +494,7 @@ By=Por From=De FromDate=De FromLocation=De +at=at to=a To=a and=e @@ -509,6 +517,7 @@ Draft=Borrador Drafts=Borradores StatusInterInvoiced=Facturado Validated=Validado +ValidatedToProduce=Validated (To produce) Opened=Activo OpenAll=Aberto (todo) ClosedAll=Pechado (Todo) @@ -655,6 +664,7 @@ Response=Resposta Priority=Prioridade SendByMail=Enviar por e-mail MailSentBy=E-mail enviado por +NotSent=Non enviado TextUsedInTheMessageBody=Texto no corpo da mensaxe SendAcknowledgementByMail=Enviar correo de confirmación SendMail=Enviar correo @@ -836,6 +846,7 @@ ListOfTemplates=Listaxe de prantillas Gender=Sexo Genderman=Home Genderwoman=Muller +Genderother=Outro ViewList=Vista de listaxe ViewGantt=Vista de Gantt ViewKanban=Vista de Kanban @@ -877,6 +888,8 @@ Miscellaneous=Miscelánea Calendar=Calendario GroupBy=Agrupado por... ViewFlatList=Ver listaxe plana +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Eliminar cadea '%s' SomeTranslationAreUncomplete=Algúns dos idiomas ofrecidos poden estar parcialmente traducidos ou poden conter erros. Axuda a corrixir teu idioma rexistrándose en http://transifex.com/projects/p/dolibarr/. DirectDownloadLink=Ligazón de descarga directa (público/externo) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Envíos a clientes SearchIntoExpenseReports=Informes de gastos SearchIntoLeaves=Día libre SearchIntoTickets=Tickets +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Pagamentos a provedores +SearchIntoMiscPayments=Pagamentos varios CommentLink=Comentarios NbComments=Número de comentarios CommentPage=Espazo de comentarios @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Información Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Date of birth +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/gl_ES/mrp.lang b/htdocs/langs/gl_ES/mrp.lang index 4320d486c84..84a0177e4de 100644 --- a/htdocs/langs/gl_ES/mrp.lang +++ b/htdocs/langs/gl_ES/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/gl_ES/website.lang b/htdocs/langs/gl_ES/website.lang index 0e491ee17b6..e16ee97f8fa 100644 --- a/htdocs/langs/gl_ES/website.lang +++ b/htdocs/langs/gl_ES/website.lang @@ -31,7 +31,7 @@ AddWebsite=Add website Webpage=Web page/container AddPage=Add page/container HomePage=Home Page -PageContainer=Page/container +PageContainer=Páxina PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. 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. SiteDeleted=Web site '%s' deleted @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=Fíos RSS RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/he_IL/accountancy.lang b/htdocs/langs/he_IL/accountancy.lang index 7b59e33b296..3211a0b62df 100644 --- a/htdocs/langs/he_IL/accountancy.lang +++ b/htdocs/langs/he_IL/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Default for service DefaultForProduct=Default for product CantSuggest=Can't suggest AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s -ConfigAccountingExpert=Configuration of the module accounting expert +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Journalization -Journaux=Journals +Journals=Journals JournalFinancial=Financial journals BackToChartofaccounts=Return chart of accounts Chartofaccounts=Chart of accounts +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Current dedicated account AssignDedicatedAccountingAccount=New account to assign InvoiceLabel=Invoice label @@ -33,8 +35,8 @@ OtherInfo=Other information DeleteCptCategory=Remove accounting account from group ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group? JournalizationInLedgerStatus=Status of journalization -AlreadyInGeneralLedger=Already journalized in ledgers -NotYetInGeneralLedger=Not yet journalized in ledgers +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group DetailByAccount=Show detail by account AccountWithNonZeroValues=Accounts with non-zero values @@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC CountriesNotInEEC=Countries not in EEC CountriesInEECExceptMe=Countries in EEC except %s CountriesExceptMe=All countries except %s -AccountantFiles=Export accounting documents +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup @@ -79,7 +83,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) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Select active chart of accounts ChangeAndLoad=Change and load Addanaccount=Add an accounting account @@ -89,6 +93,8 @@ SubledgerAccount=Subledger account SubledgerAccountLabel=Subledger account label ShowAccountingAccount=Show accounting account ShowAccountingJournal=Show accounting journal +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Accounting account suggested MenuDefaultAccounts=Default accounts MenuBankAccounts=Bank accounts @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding CreateMvts=Create new transaction UpdateMvts=Modification of a transaction ValidTransaction=Validate transaction -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=Ledger +BookkeepingSubAccount=Subledger AccountBalance=Account balance ObjectsRef=Source object ref CAHTF=Total purchase vendor before tax @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Sell journal ACCOUNTING_PURCHASE_JOURNAL=Purchase journal @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups ByYear=By year NotMatch=Not Set -DeleteMvt=Delete Ledger lines +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=Year to delete DelJournal=Journal to delete -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Finance journal ExpenseReportsJournal=Expense reports journal DescFinanceJournal=Finance journal including all the types of payments by bank account -DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Account for VAT not defined ThirdpartyAccountNotDefined=Account for third party not defined ProductAccountNotDefined=Account for product not defined @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu %s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Export draft journal @@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Chart of accounts Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang index 08401d46dbd..e630e1c2258 100644 --- a/htdocs/langs/he_IL/admin.lang +++ b/htdocs/langs/he_IL/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=Edition of field %s FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member MemberSendInformationByMailByDefault=תיבת סימון לשלוח אישור בדואר לחברי (אימות או מנוי חדש) מופעלת כברירת מחדל VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=הגדרת LDAP LDAPGlobalParameters=גלובל פרמטרים @@ -1670,7 +1672,7 @@ AdvancedEditor=עורך מתקדם ActivateFCKeditor=הפעל עורך מתקדם עבור: FCKeditorForCompany=WYSIWIG יצירת / מהדורה של תיאור של רכיב הערה (למעט מוצרים / שירותים) FCKeditorForProduct=WYSIWIG יצירת / מהדורה של המוצרים / שירות של תיאור הערה -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG יצירת / מהדורה של דברי דואר FCKeditorForUserSignature=WYSIWIG creation/edition of user signature FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting 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 user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view ##### Clicktodial ##### ClickToDialSetup=לחץ כדי לחייג ההתקנה מודול diff --git a/htdocs/langs/he_IL/banks.lang b/htdocs/langs/he_IL/banks.lang index 75f9549dca5..9500a5b8b2e 100644 --- a/htdocs/langs/he_IL/banks.lang +++ b/htdocs/langs/he_IL/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=Miscellaneous payments ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA mandate YourSEPAMandate=Your SEPA mandate FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/he_IL/categories.lang b/htdocs/langs/he_IL/categories.lang index 0115a1a5dca..c8bfcef77e2 100644 --- a/htdocs/langs/he_IL/categories.lang +++ b/htdocs/langs/he_IL/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup CategorieRecursiv=Link with parent tag/category automatically CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=Add the following product/service +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Show tag/category ByDefaultInList=By default in list ChooseCategory=Choose category -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/he_IL/companies.lang b/htdocs/langs/he_IL/companies.lang index 673e594c9bc..2537b7e9b2f 100644 --- a/htdocs/langs/he_IL/companies.lang +++ b/htdocs/langs/he_IL/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof Id 1 (Federal number) ProfId4CH=Prof Id 2 (Commercial Record number) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof Id 1 (R.U.T.) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr) ProfId2DE=Prof Id 2 (USt.-Nr) ProfId3DE=Prof Id 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof Id 1 (CIF/NIF) ProfId2ES=Prof Id 2 (Social security number) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (Collegiate number) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof Id 1 (SIREN) ProfId2FR=Prof Id 2 (SIRET) ProfId3FR=Prof Id 3 (NAF, old APE) ProfId4FR=Prof Id 4 (RCS/RM) -ProfId5FR=- +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Registration Number ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX) ProfId4IN=Prof Id 4 ProfId5IN=Prof Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Business permit) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (R.C.) ProfId2MA=Id prof. 2 (Patente) ProfId3MA=Id prof. 3 (I.F.) ProfId4MA=Id prof. 4 (C.N.S.S.) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof Id 1 (R.F.C). ProfId2MX=Prof Id 2 (R..P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK nummer ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof Id 2 (Social security number) ProfId3PT=Prof Id 3 (Commercial Record number) ProfId4PT=Prof Id 4 (Conservatory) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof Id 1 (OGRN) ProfId2RU=Prof Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s). NorProspectNorCustomer=Not prospect, nor customer JuridicalStatus=Legal Entity Type +Workforce=Workforce Staff=Employees ProspectLevelShort=Potential ProspectLevel=Prospect potential @@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor PaymentTypeBoth=Payment Type - Customer and Vendor MulticurrencyUsed=Use Multicurrency MulticurrencyCurrency=Currency +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/he_IL/hrm.lang b/htdocs/langs/he_IL/hrm.lang index 6cc7f6bef24..3b8f137e103 100644 --- a/htdocs/langs/he_IL/hrm.lang +++ b/htdocs/langs/he_IL/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=Employees Employee=Employee NewEmployee=New employee +ListOfEmployees=List of employees diff --git a/htdocs/langs/he_IL/languages.lang b/htdocs/langs/he_IL/languages.lang index 0289bdfbc68..4e177f741af 100644 --- a/htdocs/langs/he_IL/languages.lang +++ b/htdocs/langs/he_IL/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=ספרדית (פרגוואי) Language_es_PE=ספרדית (פרו) Language_es_PR=ספרדית (פורטו ריקו) +Language_es_US=Spanish (USA) Language_es_UY=Spanish (Uruguay) Language_es_GT=Spanish (Guatemala) Language_es_VE=Spanish (Venezuela) diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang index 1b6a09d3b5c..f6d4759a902 100644 --- a/htdocs/langs/he_IL/main.lang +++ b/htdocs/langs/he_IL/main.lang @@ -155,6 +155,7 @@ RemoveLink=Remove link AddToDraft=Add to draft Update=Update Close=Close +CloseAs=Set status to CloseBox=Remove widget from your dashboard Confirm=Confirm ConfirmSendCardByMail=Do you really want to send the content of this card by mail to %s? @@ -196,6 +197,7 @@ ReOpen=Re-Open Upload=Upload ToLink=קשר Select=Select +SelectAll=Select all Choose=Choose Resize=Resize ResizeOrCrop=Resize or Crop @@ -256,6 +258,7 @@ Cards=Cards Card=Card Now=Now HourStart=Start hour +Deadline=Deadline Date=Date DateAndHour=Date and hour DateToday=Today's date @@ -264,8 +267,10 @@ DateStart=Start date DateEnd=End date DateCreation=Creation date DateCreationShort=Creat. date +IPCreation=Creation IP DateModification=Modification date DateModificationShort=Modif. date +IPModification=Modification IP DateLastModification=Latest modification date DateValidation=Validation date DateClosing=Closing date @@ -319,6 +324,7 @@ Morning=Morning Afternoon=Afternoon Quadri=Quadri MonthOfDay=Month of the day +DaysOfWeek=Days of week HourShort=H MinuteShort=mn Rate=Rate @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency MulticurrencyAmountHT=Amount (excl. tax), original currency MulticurrencyAmountTTC=Amount (inc. of tax), original currency MulticurrencyAmountVAT=Amount tax, original currency +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Amount tax 2 AmountLT2=Amount tax 3 AmountLT1ES=Amount RE @@ -487,6 +494,7 @@ By=By From=From FromDate=From FromLocation=From +at=at to=to To=to and=and @@ -509,6 +517,7 @@ Draft=Draft Drafts=Drafts StatusInterInvoiced=Invoiced Validated=Validated +ValidatedToProduce=Validated (To produce) Opened=Open OpenAll=Open (All) ClosedAll=Closed (All) @@ -655,6 +664,7 @@ Response=Response Priority=Priority SendByMail=Send by email MailSentBy=Email sent by +NotSent=Not sent TextUsedInTheMessageBody=Email body SendAcknowledgementByMail=Send confirmation email SendMail=Send email @@ -836,6 +846,7 @@ ListOfTemplates=List of templates Gender=Gender Genderman=Man Genderwoman=Woman +Genderother=אחר ViewList=List view ViewGantt=Gantt view ViewKanban=Kanban view @@ -877,6 +888,8 @@ Miscellaneous=שונות Calendar=Calendar GroupBy=Group by... ViewFlatList=View flat list +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Remove string '%s' SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at https://transifex.com/projects/p/dolibarr/ to add your improvements. DirectDownloadLink=Direct download link (public/external) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments SearchIntoExpenseReports=Expense reports SearchIntoLeaves=Leave SearchIntoTickets=Tickets +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Vendor payments +SearchIntoMiscPayments=Miscellaneous payments CommentLink=Comments NbComments=Number of comments CommentPage=Comments space @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Information Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Date of birth +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/he_IL/mrp.lang b/htdocs/langs/he_IL/mrp.lang index 863793063a0..f018be890cc 100644 --- a/htdocs/langs/he_IL/mrp.lang +++ b/htdocs/langs/he_IL/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/he_IL/website.lang b/htdocs/langs/he_IL/website.lang index 2207acdf12f..bc14948946c 100644 --- a/htdocs/langs/he_IL/website.lang +++ b/htdocs/langs/he_IL/website.lang @@ -31,7 +31,7 @@ AddWebsite=Add website Webpage=Web page/container AddPage=Add page/container HomePage=Home Page -PageContainer=Page/container +PageContainer=Page PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. 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. SiteDeleted=Web site '%s' deleted @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=עדכוני RSS RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/hi_IN/accountancy.lang b/htdocs/langs/hi_IN/accountancy.lang index 9d20e82a9a3..0afe8f7a50d 100644 --- a/htdocs/langs/hi_IN/accountancy.lang +++ b/htdocs/langs/hi_IN/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=सेवा के लिए डिफ़ॉल्ट DefaultForProduct=उत्पाद के लिए डिफ़ॉल्ट CantSuggest=सुझाव नहीं दे सकते AccountancySetupDoneFromAccountancyMenu=लेखाकर्म का अधिकांश सेटअप मेनू से किया जाता है %s -ConfigAccountingExpert=मॉड्यूल लेखांकन विशेषज्ञ का कन्फ़िग्यर्एशन +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=रोज़नामचीकरण -Journaux=बहीखाता +Journals=बहीखाता JournalFinancial=वित्तीय बहीखाता BackToChartofaccounts=प्रतिफल लेखा जोखा का व्यौरा Chartofaccounts=लेखा जोखा का व्यौरा +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=चालू समर्पित खाता AssignDedicatedAccountingAccount=निर्दिष्ट करने के लिए नया खाता InvoiceLabel=चालान लेबल @@ -33,8 +35,8 @@ OtherInfo=अन्य सूचना DeleteCptCategory=Remove accounting account from group ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group? JournalizationInLedgerStatus=Status of journalization -AlreadyInGeneralLedger=Already journalized in ledgers -NotYetInGeneralLedger=Not yet journalized in ledgers +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group DetailByAccount=Show detail by account AccountWithNonZeroValues=Accounts with non-zero values @@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC CountriesNotInEEC=Countries not in EEC CountriesInEECExceptMe=Countries in EEC except %s CountriesExceptMe=All countries except %s -AccountantFiles=Export accounting documents +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup @@ -79,7 +83,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) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Select active chart of accounts ChangeAndLoad=Change and load Addanaccount=Add an accounting account @@ -89,6 +93,8 @@ SubledgerAccount=Subledger account SubledgerAccountLabel=Subledger account label ShowAccountingAccount=Show accounting account ShowAccountingJournal=Show accounting journal +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Accounting account suggested MenuDefaultAccounts=Default accounts MenuBankAccounts=Bank accounts @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding CreateMvts=Create new transaction UpdateMvts=Modification of a transaction ValidTransaction=Validate transaction -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=Ledger +BookkeepingSubAccount=Subledger AccountBalance=Account balance ObjectsRef=Source object ref CAHTF=Total purchase vendor before tax @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Sell journal ACCOUNTING_PURCHASE_JOURNAL=Purchase journal @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups ByYear=By year NotMatch=Not Set -DeleteMvt=Delete Ledger lines +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=Year to delete DelJournal=Journal to delete -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Finance journal ExpenseReportsJournal=Expense reports journal DescFinanceJournal=Finance journal including all the types of payments by bank account -DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Account for VAT not defined ThirdpartyAccountNotDefined=Account for third party not defined ProductAccountNotDefined=Account for product not defined @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu %s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Export draft journal @@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Chart of accounts Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/hi_IN/admin.lang b/htdocs/langs/hi_IN/admin.lang index d0501a4e43d..976284cbff1 100644 --- a/htdocs/langs/hi_IN/admin.lang +++ b/htdocs/langs/hi_IN/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=Edition of field %s FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=LDAP Setup LDAPGlobalParameters=Global parameters @@ -1670,7 +1672,7 @@ AdvancedEditor=Advanced editor ActivateFCKeditor=Activate advanced editor for: FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services) FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing) FCKeditorForUserSignature=WYSIWIG creation/edition of user signature FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting 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 user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup diff --git a/htdocs/langs/hi_IN/banks.lang b/htdocs/langs/hi_IN/banks.lang index 75f9549dca5..9500a5b8b2e 100644 --- a/htdocs/langs/hi_IN/banks.lang +++ b/htdocs/langs/hi_IN/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=Miscellaneous payments ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA mandate YourSEPAMandate=Your SEPA mandate FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/hi_IN/categories.lang b/htdocs/langs/hi_IN/categories.lang index 9bb71984ecf..ba37a43b4ec 100644 --- a/htdocs/langs/hi_IN/categories.lang +++ b/htdocs/langs/hi_IN/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup CategorieRecursiv=Link with parent tag/category automatically CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=Add the following product/service +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Show tag/category ByDefaultInList=By default in list ChooseCategory=Choose category -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/hi_IN/companies.lang b/htdocs/langs/hi_IN/companies.lang index af8988fd3ef..e9f51f14885 100644 --- a/htdocs/langs/hi_IN/companies.lang +++ b/htdocs/langs/hi_IN/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof Id 1 (Federal number) ProfId4CH=Prof Id 2 (Commercial Record number) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof Id 1 (R.U.T.) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr) ProfId2DE=Prof Id 2 (USt.-Nr) ProfId3DE=Prof Id 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof Id 1 (CIF/NIF) ProfId2ES=Prof Id 2 (Social security number) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (Collegiate number) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof Id 1 (SIREN) ProfId2FR=Prof Id 2 (SIRET) ProfId3FR=Prof Id 3 (NAF, old APE) ProfId4FR=Prof Id 4 (RCS/RM) -ProfId5FR=- +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Registration Number ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX) ProfId4IN=Prof Id 4 ProfId5IN=Prof Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Business permit) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (R.C.) ProfId2MA=Id prof. 2 (Patente) ProfId3MA=Id prof. 3 (I.F.) ProfId4MA=Id prof. 4 (C.N.S.S.) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof Id 1 (R.F.C). ProfId2MX=Prof Id 2 (R..P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK nummer ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof Id 2 (Social security number) ProfId3PT=Prof Id 3 (Commercial Record number) ProfId4PT=Prof Id 4 (Conservatory) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof Id 1 (OGRN) ProfId2RU=Prof Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s). NorProspectNorCustomer=Not prospect, nor customer JuridicalStatus=Legal Entity Type +Workforce=Workforce Staff=Employees ProspectLevelShort=Potential ProspectLevel=Prospect potential @@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor PaymentTypeBoth=Payment Type - Customer and Vendor MulticurrencyUsed=Use Multicurrency MulticurrencyCurrency=Currency +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/hi_IN/hrm.lang b/htdocs/langs/hi_IN/hrm.lang index 6cc7f6bef24..3b8f137e103 100644 --- a/htdocs/langs/hi_IN/hrm.lang +++ b/htdocs/langs/hi_IN/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=Employees Employee=Employee NewEmployee=New employee +ListOfEmployees=List of employees diff --git a/htdocs/langs/hi_IN/languages.lang b/htdocs/langs/hi_IN/languages.lang index cc80b9f1719..ba187326705 100644 --- a/htdocs/langs/hi_IN/languages.lang +++ b/htdocs/langs/hi_IN/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Spanish (Paraguay) Language_es_PE=Spanish (Peru) Language_es_PR=Spanish (Puerto Rico) +Language_es_US=Spanish (USA) Language_es_UY=Spanish (Uruguay) Language_es_GT=Spanish (Guatemala) Language_es_VE=Spanish (Venezuela) diff --git a/htdocs/langs/hi_IN/main.lang b/htdocs/langs/hi_IN/main.lang index 429e07287e1..50363abd476 100644 --- a/htdocs/langs/hi_IN/main.lang +++ b/htdocs/langs/hi_IN/main.lang @@ -155,6 +155,7 @@ RemoveLink=Remove link AddToDraft=Add to draft Update=Update Close=Close +CloseAs=Set status to CloseBox=Remove widget from your dashboard Confirm=Confirm ConfirmSendCardByMail=Do you really want to send the content of this card by mail to %s? @@ -196,6 +197,7 @@ ReOpen=Re-Open Upload=Upload ToLink=Link Select=Select +SelectAll=Select all Choose=Choose Resize=Resize ResizeOrCrop=Resize or Crop @@ -256,6 +258,7 @@ Cards=Cards Card=Card Now=Now HourStart=Start hour +Deadline=Deadline Date=Date DateAndHour=Date and hour DateToday=Today's date @@ -264,8 +267,10 @@ DateStart=Start date DateEnd=End date DateCreation=Creation date DateCreationShort=Creat. date +IPCreation=Creation IP DateModification=Modification date DateModificationShort=Modif. date +IPModification=Modification IP DateLastModification=Latest modification date DateValidation=Validation date DateClosing=Closing date @@ -319,6 +324,7 @@ Morning=Morning Afternoon=Afternoon Quadri=Quadri MonthOfDay=Month of the day +DaysOfWeek=Days of week HourShort=H MinuteShort=mn Rate=Rate @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency MulticurrencyAmountHT=Amount (excl. tax), original currency MulticurrencyAmountTTC=Amount (inc. of tax), original currency MulticurrencyAmountVAT=Amount tax, original currency +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Amount tax 2 AmountLT2=Amount tax 3 AmountLT1ES=Amount RE @@ -487,6 +494,7 @@ By=By From=From FromDate=From FromLocation=From +at=at to=to To=to and=and @@ -509,6 +517,7 @@ Draft=Draft Drafts=Drafts StatusInterInvoiced=Invoiced Validated=Validated +ValidatedToProduce=Validated (To produce) Opened=Open OpenAll=Open (All) ClosedAll=Closed (All) @@ -655,6 +664,7 @@ Response=Response Priority=Priority SendByMail=Send by email MailSentBy=Email sent by +NotSent=Not sent TextUsedInTheMessageBody=Email body SendAcknowledgementByMail=Send confirmation email SendMail=Send email @@ -836,6 +846,7 @@ ListOfTemplates=List of templates Gender=Gender Genderman=Man Genderwoman=Woman +Genderother=Other ViewList=List view ViewGantt=Gantt view ViewKanban=Kanban view @@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous Calendar=Calendar GroupBy=Group by... ViewFlatList=View flat list +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Remove string '%s' SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at https://transifex.com/projects/p/dolibarr/ to add your improvements. DirectDownloadLink=Direct download link (public/external) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments SearchIntoExpenseReports=Expense reports SearchIntoLeaves=Leave SearchIntoTickets=Tickets +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Vendor payments +SearchIntoMiscPayments=Miscellaneous payments CommentLink=Comments NbComments=Number of comments CommentPage=Comments space @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Information Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Date of birth +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/hi_IN/mrp.lang b/htdocs/langs/hi_IN/mrp.lang index 863793063a0..f018be890cc 100644 --- a/htdocs/langs/hi_IN/mrp.lang +++ b/htdocs/langs/hi_IN/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/hi_IN/website.lang b/htdocs/langs/hi_IN/website.lang index 4b5294d5e43..03e042e4be6 100644 --- a/htdocs/langs/hi_IN/website.lang +++ b/htdocs/langs/hi_IN/website.lang @@ -31,7 +31,7 @@ AddWebsite=Add website Webpage=Web page/container AddPage=Add page/container HomePage=Home Page -PageContainer=Page/container +PageContainer=Page PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. 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. SiteDeleted=Web site '%s' deleted @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=RSS Feed RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/hr_HR/accountancy.lang b/htdocs/langs/hr_HR/accountancy.lang index ef969d9eba3..d3f1ceacc61 100644 --- a/htdocs/langs/hr_HR/accountancy.lang +++ b/htdocs/langs/hr_HR/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Default for service DefaultForProduct=Default for product CantSuggest=Can't suggest AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s -ConfigAccountingExpert=Napredno podešavanje modula računovodstva +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Journalization -Journaux=Journals +Journals=Journals JournalFinancial=Financial journals BackToChartofaccounts=Return chart of accounts Chartofaccounts=Grafikon za račune +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Current dedicated account AssignDedicatedAccountingAccount=New account to assign InvoiceLabel=Invoice label @@ -33,8 +35,8 @@ OtherInfo=Ostali podaci DeleteCptCategory=Remove accounting account from group ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group? JournalizationInLedgerStatus=Status of journalization -AlreadyInGeneralLedger=Already journalized in ledgers -NotYetInGeneralLedger=Not yet journalized in ledgers +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group DetailByAccount=Show detail by account AccountWithNonZeroValues=Accounts with non-zero values @@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC CountriesNotInEEC=Countries not in EEC CountriesInEECExceptMe=Countries in EEC except %s CountriesExceptMe=All countries except %s -AccountantFiles=Export accounting documents +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup @@ -79,7 +83,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) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Select active chart of accounts ChangeAndLoad=Change and load Addanaccount=Dodaj obračunski račun @@ -89,6 +93,8 @@ SubledgerAccount=Subledger account SubledgerAccountLabel=Subledger account label ShowAccountingAccount=Show accounting account ShowAccountingJournal=Show accounting journal +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Accounting account suggested MenuDefaultAccounts=Default accounts MenuBankAccounts=Bankovni računi @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding CreateMvts=Create new transaction UpdateMvts=Modification of a transaction ValidTransaction=Validate transaction -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=Ledger +BookkeepingSubAccount=Subledger AccountBalance=Stanje računa ObjectsRef=Source object ref CAHTF=Total purchase vendor before tax @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Sell journal ACCOUNTING_PURCHASE_JOURNAL=Purchase journal @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups ByYear=Po godini NotMatch=Nije postavljeno -DeleteMvt=Delete Ledger lines +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=Godina za obrisati DelJournal=Dnevnik za obrisati -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Finance journal ExpenseReportsJournal=Expense reports journal DescFinanceJournal=Financijski izvještaj uključujući sve tipove plačanja po bankovnom računom -DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Account for VAT not defined ThirdpartyAccountNotDefined=Account for third party not defined ProductAccountNotDefined=Account for product not defined @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu %s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Export draft journal @@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Chart of accounts Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang index 4d9951cd220..073e9232710 100644 --- a/htdocs/langs/hr_HR/admin.lang +++ b/htdocs/langs/hr_HR/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=Izdanje polja %s FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=Podešavanje LDAP LDAPGlobalParameters=Globalni parametri @@ -1670,7 +1672,7 @@ AdvancedEditor=Napredni uređivač ActivateFCKeditor=Aktiviraj napredni uređivač za: FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services) FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing) FCKeditorForUserSignature=WYSIWIG creation/edition of user signature FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting 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 user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view ##### Clicktodial ##### ClickToDialSetup=Podešavanje modula ClickToDial diff --git a/htdocs/langs/hr_HR/banks.lang b/htdocs/langs/hr_HR/banks.lang index 98c1d34d3f0..722bbc6949d 100644 --- a/htdocs/langs/hr_HR/banks.lang +++ b/htdocs/langs/hr_HR/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=Miscellaneous payments ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA mandate YourSEPAMandate=Your SEPA mandate FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/hr_HR/categories.lang b/htdocs/langs/hr_HR/categories.lang index f6a9205bc95..b3f785c8df7 100644 --- a/htdocs/langs/hr_HR/categories.lang +++ b/htdocs/langs/hr_HR/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Podešavanje kategorija CategorieRecursiv=Poveži automatski sa matičnom kategorijom CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=Dodaj sljedeće proizvode/usluge +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Prikaži kategoriju ByDefaultInList=Po predefiniranom na listi ChooseCategory=Choose category -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/hr_HR/companies.lang b/htdocs/langs/hr_HR/companies.lang index b376da108d4..70f428267e7 100644 --- a/htdocs/langs/hr_HR/companies.lang +++ b/htdocs/langs/hr_HR/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof Id 1 (Federal number) ProfId4CH=Dokaz ID 2 (broj komercijalnog podatka) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof Id 1 (R.U.T.) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr) ProfId2DE=Prof Id 2 (USt.-Nr) ProfId3DE=Prof Id 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof Id 1 (CIF/NIF) ProfId2ES=Prof Id 2 (Social security number) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (Collegiate number) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof Id 1 (SIREN) ProfId2FR=Prof Id 2 (SIRET) ProfId3FR=Prof Id 3 (NAF, old APE) ProfId4FR=Prof Id 4 (RCS/RM) -ProfId5FR=- +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Registracijski broj ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX) ProfId4IN=Prof Id 4 ProfId5IN=Prof Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Business permit) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (R.C.) ProfId2MA=Id prof. 2 (Patente) ProfId3MA=Id prof. 3 (I.F.) ProfId4MA=Id prof. 4 (C.N.S.S.) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof Id 1 (R.F.C). ProfId2MX=Prof Id 2 (R..P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK nummer ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof Id 2 (Social security number) ProfId3PT=Dokaz ID 3 (broj komercijalnog podatka) ProfId4PT=Prof Id 4 (Conservatory) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof Id 1 (OGRN) ProfId2RU=Prof Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi ErrorVATCheckMS_UNAVAILABLE=Provjera nije moguća. Servis za provjeru nije pružena od strane države članice (%s). NorProspectNorCustomer=Not prospect, nor customer JuridicalStatus=Legal Entity Type +Workforce=Workforce Staff=Zaposlenici ProspectLevelShort=Potencijal ProspectLevel=Potencijalni kupac @@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor PaymentTypeBoth=Payment Type - Customer and Vendor MulticurrencyUsed=Use Multicurrency MulticurrencyCurrency=Valuta +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/hr_HR/hrm.lang b/htdocs/langs/hr_HR/hrm.lang index 99e3fb53219..e5bf98f9c0f 100644 --- a/htdocs/langs/hr_HR/hrm.lang +++ b/htdocs/langs/hr_HR/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=Zaposlenici Employee=Zaposlenik NewEmployee=Novi zaposlenik +ListOfEmployees=List of employees diff --git a/htdocs/langs/hr_HR/languages.lang b/htdocs/langs/hr_HR/languages.lang index eb963a3ad39..91789655f61 100644 --- a/htdocs/langs/hr_HR/languages.lang +++ b/htdocs/langs/hr_HR/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Španjolski (Paragvaj) Language_es_PE=Španjolski (Peru) Language_es_PR=Španjolski (Puerto Rico) +Language_es_US=Spanish (USA) Language_es_UY=Spanish (Uruguay) Language_es_GT=Spanish (Guatemala) Language_es_VE=Španjolski (Venezuela) diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang index 189ffed37e7..8ef879f459d 100644 --- a/htdocs/langs/hr_HR/main.lang +++ b/htdocs/langs/hr_HR/main.lang @@ -197,6 +197,7 @@ ReOpen=Ponovo otvori Upload=Podigni ToLink=Poveznica Select=Odaberi +SelectAll=Select all Choose=Izaberi Resize=Promjeni veličinu ResizeOrCrop=Izmjena veličine ili obrezivanje @@ -257,6 +258,7 @@ Cards=Kartice Card=Kartica Now=Sad HourStart=Početni sat +Deadline=Deadline Date=Datum DateAndHour=Datum i vrijeme DateToday=Današnji datum @@ -265,8 +267,10 @@ DateStart=Početni datum DateEnd=Završni datum DateCreation=Datum izrade DateCreationShort=Datum izrade +IPCreation=Creation IP DateModification=Datum izmjene DateModificationShort=Datum izmjene +IPModification=Modification IP DateLastModification=Datum zadnje izmjene DateValidation=Datum ovjere DateClosing=Datum zatvaranja @@ -1102,3 +1106,4 @@ SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has exp UpToDate=Up-to-date OutOfDate=Out-of-date EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/hr_HR/mrp.lang b/htdocs/langs/hr_HR/mrp.lang index 863793063a0..f018be890cc 100644 --- a/htdocs/langs/hr_HR/mrp.lang +++ b/htdocs/langs/hr_HR/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/hr_HR/website.lang b/htdocs/langs/hr_HR/website.lang index 123242c3f79..41f2e8808aa 100644 --- a/htdocs/langs/hr_HR/website.lang +++ b/htdocs/langs/hr_HR/website.lang @@ -31,7 +31,7 @@ AddWebsite=Add website Webpage=Web page/container AddPage=Add page/container HomePage=Home Page -PageContainer=Page/container +PageContainer=Strana PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. 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. SiteDeleted=Web site '%s' deleted @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=RSS Feed RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/hu_HU/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang index a30f5942c73..70ffa6bdfbb 100644 --- a/htdocs/langs/hu_HU/accountancy.lang +++ b/htdocs/langs/hu_HU/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Default for service DefaultForProduct=Default for product CantSuggest=Can't suggest AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s -ConfigAccountingExpert=A könyvvizsgáló szakértő modul beállítása +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Journalization -Journaux=Naplók +Journals=Naplók JournalFinancial=Pénzügyi mérleg naplók BackToChartofaccounts=Return chart of accounts Chartofaccounts=Chart of accounts +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Current dedicated account AssignDedicatedAccountingAccount=New account to assign InvoiceLabel=Invoice label @@ -33,8 +35,8 @@ OtherInfo=Egyéb információk DeleteCptCategory=Remove accounting account from group ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group? JournalizationInLedgerStatus=Status of journalization -AlreadyInGeneralLedger=Already journalized in ledgers -NotYetInGeneralLedger=Not yet journalized in ledgers +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group DetailByAccount=Show detail by account AccountWithNonZeroValues=Accounts with non-zero values @@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC CountriesNotInEEC=Countries not in EEC CountriesInEECExceptMe=Countries in EEC except %s CountriesExceptMe=All countries except %s -AccountantFiles=Export accounting documents +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup @@ -79,7 +83,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) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Select active chart of accounts ChangeAndLoad=Change and load Addanaccount=Add an accounting account @@ -89,6 +93,8 @@ SubledgerAccount=Subledger account SubledgerAccountLabel=Subledger account label ShowAccountingAccount=Show accounting account ShowAccountingJournal=Show accounting journal +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Accounting account suggested MenuDefaultAccounts=Default accounts MenuBankAccounts=Bankszámlák @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding CreateMvts=Create new transaction UpdateMvts=Modification of a transaction ValidTransaction=Validate transaction -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=Ledger +BookkeepingSubAccount=Subledger AccountBalance=Account balance ObjectsRef=Source object ref CAHTF=Total purchase vendor before tax @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Sell journal ACCOUNTING_PURCHASE_JOURNAL=Purchase journal @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups ByYear=Az év NotMatch=Not Set -DeleteMvt=Delete Ledger lines +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=Year to delete DelJournal=Journal to delete -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Finance journal ExpenseReportsJournal=Expense reports journal DescFinanceJournal=Finance journal including all the types of payments by bank account -DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Account for VAT not defined ThirdpartyAccountNotDefined=Account for third party not defined ProductAccountNotDefined=Account for product not defined @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu %s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Export draft journal @@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Chart of accounts Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang index 617d936cebf..2beca20a1c0 100644 --- a/htdocs/langs/hu_HU/admin.lang +++ b/htdocs/langs/hu_HU/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=Az %s PHP összetevő betöltődött PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=%s mező szerkesztése FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member MemberSendInformationByMailByDefault=Checkbox levelet küldeni visszaigazolást a tagok (jóváhagyás vagy új előfizetés) alapértelmezés szerint be van VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=LDAP beállítása LDAPGlobalParameters=Globális paraméterek @@ -1670,7 +1672,7 @@ AdvancedEditor=Speciális szerkesztő ActivateFCKeditor=Aktiválja a fejlett szerkesztő: FCKeditorForCompany=WYSIWIG létrehozása / kiadás elem leírása és megjegyzés (kivéve a termékek / szolgáltatások) FCKeditorForProduct=WYSIWIG létrehozása / kiadásában termék / szolgáltatás 's leírása és megjegyzés -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG létrehozása / kiadás levelek FCKeditorForUserSignature=WYSIWIG creation/edition of user signature FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting 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 user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view ##### Clicktodial ##### ClickToDialSetup=Kattintson a Tárcsázás modul beállítása diff --git a/htdocs/langs/hu_HU/banks.lang b/htdocs/langs/hu_HU/banks.lang index 4c8fc232f11..b526b83be5c 100644 --- a/htdocs/langs/hu_HU/banks.lang +++ b/htdocs/langs/hu_HU/banks.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - banks Bank=Bank MenuBankCash=Banks | Cash -MenuVariousPayment=Miscellaneous payments +MenuVariousPayment=Egyéb fizetések MenuNewVariousPayment=New Miscellaneous payment BankName=Bank neve FinancialAccount=Fiók @@ -39,7 +39,7 @@ StandingOrders=Direct debit orders StandingOrder=Direct debit order PaymentByDirectDebit=Payment by direct debit PaymentByBankTransfers=Payments by credit transfer -PaymentByBankTransfer=Payment by credit transfer +PaymentByBankTransfer=Fizetés átutalással AccountStatement=Számlakivonat AccountStatementShort=Nyilatkozat AccountStatements=Számlakivonatok @@ -163,9 +163,12 @@ DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries DocumentModelBan=Template to print a page with BAN information. NewVariousPayment=New miscellaneous payment VariousPayment=Miscellaneous payment -VariousPayments=Miscellaneous payments +VariousPayments=Egyéb fizetések ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA mandate YourSEPAMandate=Your SEPA mandate FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/hu_HU/categories.lang b/htdocs/langs/hu_HU/categories.lang index f857f60accc..741cab33de6 100644 --- a/htdocs/langs/hu_HU/categories.lang +++ b/htdocs/langs/hu_HU/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup CategorieRecursiv=Link with parent tag/category automatically CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=Add the following product/service +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Show tag/category ByDefaultInList=By default in list ChooseCategory=Choose category -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/hu_HU/companies.lang b/htdocs/langs/hu_HU/companies.lang index 3e3bc1f36a6..d6179acca4b 100644 --- a/htdocs/langs/hu_HU/companies.lang +++ b/htdocs/langs/hu_HU/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Szakma ID 1 (USt.-IdNr) ProfId2AT=Szakma Id 2 (USt.-Nr) ProfId3AT=Szakma Id 3 (Kereskedelm kamarai szám) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof ID 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Szakma ID 1 (Szakma szám) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=RÁ (Regisztrált Állam) @@ -144,11 +144,11 @@ ProfId3BR=RV (Regisztrált város) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Szakma ID 1 (szövetségi szám) ProfId4CH=Szakma ID 2 (Kereskedelmi azonosító) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Szakma ID 1 (RUT) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Szakma ID 1 (USt.-IdNr) ProfId2DE=Szakma Id 2 (USt.-Nr) ProfId3DE=Szakma Id 3 (Kereskedelm kamarai szám) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Szakma ID 1 (CIF / NIF) ProfId2ES=Szakma ID 2 (Társadalombiztosítási szám) ProfId3ES=Szakma Id 3 (CNAE) ProfId4ES=Szakma Id 4 (Collegiate szám) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Szakma ID 1 (SIREN) ProfId2FR=Szakma ID 2 (SIRET) ProfId3FR=Szakma Id 3 (NAF, régi APE) ProfId4FR=Szakma Id 4 (RCS / RM) -ProfId5FR=Szakma Id 5 +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Regisztrációs szám ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Szakma ID 3 (SRVC TAX) ProfId4IN=Szakma Id 4 ProfId5IN=Szakma Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Technikai azonosító 1 (Luxemburg) ProfId2LU=Technikai azonosító 2 (Üzlet engedélye) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Szakma id 1 (RC) ProfId2MA=Szakma id 2 (Patente) ProfId3MA=Szakma id 3 (IF) ProfId4MA=Szakma id 4 (CNSS) -ProfId5MA=Szakma id 5 (C.I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Szakma ID 1 (RFC). ProfId2MX=Szakma ID 2 (R.. P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK Szám ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Szakma ID 1 (NIPC) ProfId2PT=Szakma ID 2 (Társadalombiztosítási szám) ProfId3PT=Szakma Id 3 (Kereskedelmi azonosító szám) ProfId4PT=Szakma Id 4 (Konzervatórium) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Szakma id 1 (CUI) ProfId2RO=Szakma ID 2 (regisztrációs szám) ProfId3RO=Szakma ID 3 (CAEN) -ProfId4RO=- -ProfId5RO=Szakma ID 5 (EUID) +ProfId4RO=Szakma ID 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Szakma ID 1 (OGRN) ProfId2RU=Szakma ID 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=Manuálisan ellenőrizheti az Európai Bizottság webhelyén ErrorVATCheckMS_UNAVAILABLE=Ellenőrzés nem lehetséges. A szolgáltatást a tagállam nem teszi lehetővé (%s). NorProspectNorCustomer=Nem leendő partner, nem ügyfél JuridicalStatus=Jogi személy típusa +Workforce=Workforce Staff=Alkalmazottak ProspectLevelShort=Potenciális ProspectLevel=Jelentkezői potenciál @@ -456,3 +462,8 @@ PaymentTermsSupplier=Fizetési határidő - Eladó PaymentTypeBoth=Fizetés típusa - Vevő és eladó MulticurrencyUsed=Több pénznem használata MulticurrencyCurrency=Pénznem +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/hu_HU/hrm.lang b/htdocs/langs/hu_HU/hrm.lang index c671aaf7500..38a5e58b39c 100644 --- a/htdocs/langs/hu_HU/hrm.lang +++ b/htdocs/langs/hu_HU/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Munkahelyek Employees=Alkalmazottak Employee=Foglalkoztató NewEmployee=Új alkalmazott +ListOfEmployees=List of employees diff --git a/htdocs/langs/hu_HU/languages.lang b/htdocs/langs/hu_HU/languages.lang index 31fa1647481..1242a9d40dd 100644 --- a/htdocs/langs/hu_HU/languages.lang +++ b/htdocs/langs/hu_HU/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Spanyol (Panama) Language_es_PY=Spanyol (Paraguay) Language_es_PE=Spanyol (Peru) Language_es_PR=Spanyol (Puerto Rico) +Language_es_US=Spanish (USA) Language_es_UY=Spanyol (Uruguay) Language_es_GT=Spanish (Guatemala) Language_es_VE=Spanyol (Venezuela) diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang index ff000eb7c96..1cb2ef1cbf2 100644 --- a/htdocs/langs/hu_HU/main.lang +++ b/htdocs/langs/hu_HU/main.lang @@ -28,7 +28,7 @@ NoTemplateDefined=Ilyen e-mail típushoz nincs elérhető sablon AvailableVariables=Elérhető helyettesítő változók NoTranslation=Nincs fordítás Translation=Fordítás -EmptySearchString=Enter non empty search criterias +EmptySearchString=Adjon meg nem üres keresési feltételeket NoRecordFound=Rekord nem található NoRecordDeleted=Nincs törölt rekord NotEnoughDataYet=Nincs elég adat @@ -155,6 +155,7 @@ RemoveLink=Hivatkozás megszüntetése AddToDraft=Adja a vázlathoz Update=Frissítés Close=Zár +CloseAs=Állapot beállítása CloseBox=A widget eltávolítása a vezérlőpultról Confirm=Megerősít ConfirmSendCardByMail=Valóban el akarod küldeni levélben ezt a kártyát %s címre? @@ -174,7 +175,7 @@ SaveAndStay=Mentés és maradj SaveAndNew=Mentés és új TestConnection=Kapcsolat tesztelése ToClone=Klónozás -ConfirmCloneAsk=Are you sure you want to clone the object %s? +ConfirmCloneAsk=Biztosan klónozza az %s objektumot? ConfirmClone=Válassza ki a klónozni kívánt adatokat: NoCloneOptionsSpecified=Nincs klónozandó adat meghatározva. Of=birtokában @@ -187,7 +188,7 @@ ShowCardHere=Kártyát mutat Search=Keres SearchOf=Keres SearchMenuShortCut=Ctrl + shift + f -QuickAdd=Quick add +QuickAdd=Gyors hozzáadás QuickAddMenuShortCut=Ctrl + shift + l Valid=Hiteles Approve=Jóváhagy @@ -196,6 +197,7 @@ ReOpen=Újra megnyit Upload=Feltöltés ToLink=Link Select=Kiválaszt +SelectAll=Select all Choose=Kiválaszt Resize=Átméretezés ResizeOrCrop=Átméretezés és levágás @@ -256,6 +258,7 @@ Cards=Kártyák Card=Kártya Now=Most HourStart=Kezdés ideje +Deadline=Deadline Date=Dátum DateAndHour=Dátum és idő DateToday=Mai dátum @@ -264,8 +267,10 @@ DateStart=Kezdet dátuma DateEnd=Befejezés dátuma DateCreation=Létrehozás dátuma DateCreationShort=Létreh. dátuma +IPCreation=Creation IP DateModification=Szerkesztés dátuma DateModificationShort=Szerk. dátuma +IPModification=Modification IP DateLastModification=Utolsó módosítás dátuma DateValidation=Hitelesítés dátuma DateClosing=Lezárás dátuma @@ -319,6 +324,7 @@ Morning=Reggel Afternoon=Délután Quadri=Negyed MonthOfDay=Nap hónapja +DaysOfWeek=A hét napjai HourShort=Ó MinuteShort=p Rate=Arány @@ -356,7 +362,7 @@ Amount=Mennyiség AmountInvoice=Számla mennyiség AmountInvoiced=Számlázott összeg AmountInvoicedHT=Számlázott összeg (ÁFA nélkül) -AmountInvoicedTTC=Amount invoiced (inc. tax) +AmountInvoicedTTC=Számlázott összeg (adóval együtt) AmountPayment=Fizetés mennyiség AmountHTShort=Összeg (ÁFA nélkül) AmountTTCShort=Mennyiség (bruttó) @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Fizetendő összeg, eredeti pénznem MulticurrencyAmountHT=Összeg (ÁFA nélkül), eredeti pénznem MulticurrencyAmountTTC=Összeg (ÁFA-val), eredeti pénznem MulticurrencyAmountVAT=ÁFA összeg, eredeti pénznem +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=ÁFA mennyiség 2 AmountLT2=ÁFA mennyiség 3 AmountLT1ES=RE mennyiség @@ -428,7 +435,7 @@ Modules=Modulok/alkalmazások Option=Opció List=Lista FullList=Teljes lista -FullConversation=Full conversation +FullConversation=Teljes beszélgetés Statistics=Statisztika OtherStatistics=Egyéb statisztikák Status=Állapot @@ -487,6 +494,7 @@ By=által From=Kitől? FromDate=Feladó FromLocation=Feladó +at=at to=kinek To=kinek and=és @@ -509,6 +517,7 @@ Draft=Piszkozat Drafts=Piszkozatok StatusInterInvoiced=Számlázva Validated=Hitelesítve +ValidatedToProduce=Érvényesítve (gyártáshoz) Opened=Nyitott OpenAll=Megnyitás (összes) ClosedAll=Bezárás (összes) @@ -655,6 +664,7 @@ Response=Válasz Priority=Prioritás SendByMail=Küldés e-mailben MailSentBy=Email feladója +NotSent=Nem küldött TextUsedInTheMessageBody=Email tartalma SendAcknowledgementByMail=Megerősítő email küldése SendMail=E-mail küldése @@ -667,7 +677,7 @@ Owner=Tulajdonos FollowingConstantsWillBeSubstituted=Az alábbi konstansok helyettesítve leszenek a hozzájuk tartozó értékekkel. Refresh=Frissítés BackToList=Vissza a listához -BackToTree=Back to tree +BackToTree=Vissza a fához GoBack=Vissza CanBeModifiedIfOk=Módosítható ha hitelesített CanBeModifiedIfKo=Módosítható ha nem hitelesített @@ -688,7 +698,7 @@ Method=Módszer Receive=Kap CompleteOrNoMoreReceptionExpected=Teljes, vagy semmi több várható ExpectedValue=Várt érték -ExpectedQty=Expected Qty +ExpectedQty=Várható mennyiség PartialWoman=Részleges TotalWoman=Összes NeverReceived=Soha nem került átvételre @@ -705,7 +715,7 @@ MenuECM=Dokumentumok MenuAWStats=AWStats MenuMembers=Tagok MenuAgendaGoogle=Google naptár -MenuTaxesAndSpecialExpenses=Taxes | Special expenses +MenuTaxesAndSpecialExpenses=Adók | Különleges kiadások ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb NoFileFound=Nincs mentett dokumentum ebben a könyvtárban CurrentUserLanguage=Jelenlegi nyelv @@ -728,7 +738,7 @@ Page=Oldal Notes=Megjegyzés AddNewLine=Új sor hozzáadása AddFile=Fájl hozzáadása -FreeZone=Free-text product +FreeZone=Szabad szöveges termék FreeLineOfType=Szabad szöveges leírás, válassz típust: CloneMainAttributes=Objektum klónozása a főbb jellemzőivel ReGeneratePDF=PDF újragenerálása @@ -836,9 +846,10 @@ ListOfTemplates=Sablonok listája Gender=Nem Genderman=Férfi Genderwoman=Nő +Genderother=Egyéb ViewList=Lista megtekintése -ViewGantt=Gantt view -ViewKanban=Kanban view +ViewGantt=Gantt-nézet +ViewKanban=Kanban nézet Mandatory=Kötelező kitölteni Hello=Hello GoodBye=Viszontlátásra @@ -846,7 +857,7 @@ Sincerely=Tisztelettel ConfirmDeleteObject=Biztosan törli ezt az objektumot? DeleteLine=Sor törlése ConfirmDeleteLine=Biztos, hogy törölni akarja ezt a sort ? -ErrorPDFTkOutputFileNotFound=Error: the file was not generated. Please check that the 'pdftk' command is installed in a directory included in the $PATH environment variable (linux/unix only) or contact your system administrator. +ErrorPDFTkOutputFileNotFound=Hiba: a fájl nem lett létrehozva. Kérjük, ellenőrizze, hogy a 'pdftk' parancs telepítve van-e a $PATH környezeti változóban található könyvtárba (csak linux/unix), vagy vegye fel a kapcsolatot a rendszergazdával. NoPDFAvailableForDocGenAmongChecked=Az ellenőrzött rekordok között nem volt elérhető PDF a dokumentum előállításához TooManyRecordForMassAction=Túl sok rekord van kiválasztva a tömeges művelethez. A művelet %s rekord listájára korlátozódik. NoRecordSelected=Nincs kiválasztva rekord @@ -877,6 +888,8 @@ Miscellaneous=Vegyes Calendar=Naptár GroupBy=Csoportosít... ViewFlatList=Lapos lista megtekintése +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Távolítsa el a '%s' karakterláncot SomeTranslationAreUncomplete=A felkínált nyelvek némelyike csak részben fordítható le, vagy hibákat tartalmazhat. Kérjük, segítsen nyelvének javításában az https://transifex.com/projects/p/dolibarr/ címen regisztrálva. DirectDownloadLink=Közvetlen letöltési link (nyilvános / külső) @@ -945,39 +958,39 @@ ShortThursday=Cs ShortFriday=P ShortSaturday=Szo ShortSunday=V -one=one -two=two -three=three -four=four -five=five -six=six -seven=seven -eight=eight -nine=nine -ten=ten -eleven=eleven -twelve=twelve -thirteen=thirdteen -fourteen=fourteen -fifteen=fifteen -sixteen=sixteen -seventeen=seventeen -eighteen=eighteen -nineteen=nineteen -twenty=twenty -thirty=thirty -forty=forty -fifty=fifty -sixty=sixty -seventy=seventy -eighty=eighty -ninety=ninety -hundred=hundred -thousand=thousand -million=million -billion=billion -trillion=trillion -quadrillion=quadrillion +one=egy +two=kettő +three=három +four=négy +five=öt +six=hat +seven=hét +eight=nyolc +nine=kilenc +ten=tíz +eleven=tizenegy +twelve=tizenkettő +thirteen=tizenhárom +fourteen=tizennégy +fifteen=tizenöt +sixteen=tizenhat +seventeen=tizenhét +eighteen=tizennyolc +nineteen=tizenkilenc +twenty=húsz +thirty=harminc +forty=negyven +fifty=ötven +sixty=hatvan +seventy=hetven +eighty=nyolcvan +ninety=kilencven +hundred=száz +thousand=ezer +million=millió +billion=milliárd +trillion=billió +quadrillion=kvadrillió SelectMailModel=Válasszon egy e-mail sablont SetRef=Set ref Select2ResultFoundUseArrows=Találati lista. Használja a nyilakat a kiválasztáshoz. @@ -994,7 +1007,7 @@ SearchIntoMembers=Tagok SearchIntoUsers=Felhasználók SearchIntoProductsOrServices=Termékek vagy Szolgáltatások SearchIntoProjects=Projektek -SearchIntoMO=Manufacturing Orders +SearchIntoMO=Gyártási rendelések SearchIntoTasks=Tennivalók SearchIntoCustomerInvoices=Ügyfél számlák SearchIntoSupplierInvoices=Szállítói számlák @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Vásárlói kiszállítások SearchIntoExpenseReports=Költség kimutatások SearchIntoLeaves=Elhagy SearchIntoTickets=Jegyek +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Vendor payments +SearchIntoMiscPayments=Egyéb fizetések CommentLink=Megjegyzéske NbComments=Megjegyzések száma CommentPage=Megjegyzés helye @@ -1067,19 +1083,27 @@ SelectYourGraphOptionsFirst=Válassza ki a grafikon beállításait a grafikon f Measures=Méretek XAxis=X-tengely YAxis=Y-tengely -StatusOfRefMustBe=Status of %s must be %s -DeleteFileHeader=Confirm file delete -DeleteFileText=Do you really want delete this file? -ShowOtherLanguages=Show other languages -SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for this language -NotUsedForThisCustomer=Not used for this customer -AmountMustBePositive=Amount must be positive -ByStatus=By status +StatusOfRefMustBe=Az %s állapotának %s kell lennie +DeleteFileHeader=A fájl törlésének megerősítése +DeleteFileText=Tényleg törölni szeretné ezt a fájlt? +ShowOtherLanguages=További nyelvek megjelenítése +SwitchInEditModeToAddTranslation=Váltson szerkesztési módba, ha fordításokat szeretne hozzáadni ehhez a nyelvhez +NotUsedForThisCustomer=Ehhez az ügyfélhez nem használt +AmountMustBePositive=Az összegnek pozitívnak kell lennie +ByStatus=Státusz szerint InformationMessage=Információ -Used=Used -ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create -MODIFYInDolibarr=Record %s modified -DELETEInDolibarr=Record %s deleted -VALIDATEInDolibarr=Record %s validated -APPROVEDInDolibarr=Record %s approved +Used=Használt +ASAP=Amint lehetséges +CREATEInDolibarr=%s rekord létrehozva +MODIFYInDolibarr=%s rekord módosítva +DELETEInDolibarr=%s rekord törölve +VALIDATEInDolibarr=%s rekord érvényesítve +APPROVEDInDolibarr=%s rekord jóváhagyva +DefaultMailModel=Alapértelmezett levélminta +PublicVendorName=Public name of vendor +DateOfBirth=Dátum a születési +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/hu_HU/mrp.lang b/htdocs/langs/hu_HU/mrp.lang index 549c82f9422..0a110b4dee4 100644 --- a/htdocs/langs/hu_HU/mrp.lang +++ b/htdocs/langs/hu_HU/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/hu_HU/website.lang b/htdocs/langs/hu_HU/website.lang index cef2661b673..25d8faccd6d 100644 --- a/htdocs/langs/hu_HU/website.lang +++ b/htdocs/langs/hu_HU/website.lang @@ -31,7 +31,7 @@ AddWebsite=Webhely hozzáadása Webpage=Weblap / tároló AddPage=Oldal / tároló hozzáadása HomePage=Honlap -PageContainer=Oldal / konténer +PageContainer=Oldal PreviewOfSiteNotYetAvailable=A weboldal előnézete %s még nem érhető el. Először ' Teljes weboldal-sablont kell importálnia ' vagy csak ' Oldal / tároló hozzáadása ' elemet . RequestedPageHasNoContentYet=Az %s azonosítóval kért oldalnak még nincs tartalma, vagy a .tpl.php gyorsítótár fájlt eltávolították. Szerkessze az oldal tartalmát ennek megoldásához. SiteDeleted='%s' webhely törölve @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=RSS Feed RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/id_ID/accountancy.lang b/htdocs/langs/id_ID/accountancy.lang index ddaca2284f1..669c6b2ad04 100644 --- a/htdocs/langs/id_ID/accountancy.lang +++ b/htdocs/langs/id_ID/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Standar untuk Layanan DefaultForProduct=Standar untuk Produk CantSuggest=Tidak bisa menyarankan AccountancySetupDoneFromAccountancyMenu=Kebanyakan aturan akutansi dilakukan dari bilah menu %s -ConfigAccountingExpert=Konfigurasi modul ahli akuntansi +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Pencatatan Jurnal -Journaux=Jurnal +Journals=Jurnal JournalFinancial=Jurnal Keuangan BackToChartofaccounts=Akun grafik pembalik Chartofaccounts=Tabel Akun +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Akun sekarang yang dipakai AssignDedicatedAccountingAccount=Akun baru untuk ditambahkan InvoiceLabel=Label Tagihan @@ -33,8 +35,8 @@ OtherInfo=Informasi lain DeleteCptCategory=Hilangkan akun akutansi dari grup ConfirmDeleteCptCategory=Apakah Anda yakin untuk menghilangkan akun akutansi ini dari grup akun akutansi? JournalizationInLedgerStatus=Status Pencatatan Jurnal -AlreadyInGeneralLedger=Sudah dijurnal dalam buku besar -NotYetInGeneralLedger=Belum dijurnal dalam buku besar +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Grup kosong, periksa pengaturan grup akuntansi yang dipersonalisasi DetailByAccount=Tampilkan rincian berdasarkan akun AccountWithNonZeroValues=Akun dengan nilai bukan nol @@ -43,7 +45,9 @@ CountriesInEEC=Negara di EEC CountriesNotInEEC=Negara bukan di EEC CountriesInEECExceptMe=Negara di EEC kecuali %s CountriesExceptMe=Semua negara kecuali %s -AccountantFiles=Ekspor dokumen akuntansi +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Akun akuntansi utama untuk pelanggan tidak ditentukan dalam pengaturan MainAccountForSuppliersNotDefined=Akun akuntansi utama untuk vendor tidak ditentukan dalam pengaturan @@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=LANGKAH %s: Tambahkan atau sunting transaksi yang ada AccountancyAreaDescClosePeriod=LANGKAH %s: Tutup periode sehingga kita tidak dapat melakukan modifikasi di masa mendatang. -TheJournalCodeIsNotDefinedOnSomeBankAccount=Langkah wajib dalam penyiapan pengaturan tidak lengkap (jurnal kode akuntansi tidak ditentukan untuk semua rekening bank) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Pilih bagan akun aktif ChangeAndLoad=Ubah dan muat Addanaccount=Tambahkan sebuah akun akuntansi @@ -89,6 +93,8 @@ SubledgerAccount=Akun sub Buku Besar SubledgerAccountLabel=Label akun sub Buku Besar ShowAccountingAccount=Tampilkan akun akuntansi ShowAccountingJournal=Tampilkan jurnal akuntansi +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Akun akuntansi yang disarankan MenuDefaultAccounts=Akun standar MenuBankAccounts=Akun bank @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Penjilidan laporan pengeluaran CreateMvts=Buat transaksi baru UpdateMvts=Modifikasi sebuah transaksi ValidTransaction=Validasi transaksi -WriteBookKeeping=Daftarkan transaksi di Buku Besar +WriteBookKeeping=Register transactions in accounting Bookkeeping=Buku Besar +BookkeepingSubAccount=Subledger AccountBalance=Saldo akun ObjectsRef=Referensi sumber objek CAHTF=Jumlah total pembelian vendor sebelum pajak @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Nonaktifkan pencatatan langsung transaksi di rekening ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Aktifkan konsep ekspor di jurnal ACCOUNTANCY_COMBO_FOR_AUX=Aktifkan daftar kombo untuk akun anak perusahaan (mungkin lambat jika Anda memiliki banyak pihak ketiga) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Jurnal Penjualan ACCOUNTING_PURCHASE_JOURNAL=Jurnal Pembelian @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Akun akuntansi tunggu DONATION_ACCOUNTINGACCOUNT=Akun akuntansi untuk mendaftarkan sumbangan ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Akun akuntansi untuk mendaftar langganan +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Akun akuntansi secara default untuk produk yang dibeli (digunakan jika tidak didefinisikan dalam lembar produk) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Akun akuntansi secara default untuk produk yang dibeli di EEC (digunakan jika tidak didefinisikan dalam lembar produk) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Akun akuntansi secara default untuk produk yang dibeli dan diimpor dari EEC (digunakan jika tidak didefinisikan dalam lembar produk) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=Oleh kelompok yang telah ditentukan ByPersonalizedAccountGroups=Oleh grup yang dipersonalisasi ByYear=Tahun NotMatch=Tidak diatur -DeleteMvt=Hapus baris Buku Besar +DeleteMvt=Delete some operation lines from accounting DelMonth=Bulan untuk dihapus DelYear=Tahun untuk dihapus DelJournal=Jurnal untuk dihapus -ConfirmDeleteMvt=Ini akan menghapus semua baris Buku Besar untuk tahun / bulan dan / atau dari jurnal tertentu (Setidaknya diperlukan satu kriteria). Anda harus menggunakan kembali fitur 'Pendaftaran dalam akuntansi' untuk memiliki catatan yang dihapus kembali dalam buku besar. -ConfirmDeleteMvtPartial=Ini akan menghapus transaksi dari Buku Besar (semua baris yang terkait dengan transaksi yang sama akan dihapus) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Finance journal ExpenseReportsJournal=Jurnal biaya laporan DescFinanceJournal=Finance journal including all the types of payments by bank account -DescJournalOnlyBindedVisible=Ini adalah tampilan catatan yang terikat ke akun akuntansi dan dapat direkam ke dalam Buku Besar. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Akun untuk PPN tidak ditentukan ThirdpartyAccountNotDefined=Akun untuk pihak ketiga tidak ditentukan ProductAccountNotDefined=Akun untuk produk tidak ditentukan @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=Jurnal ini sudah digunakan AccountingAccountForSalesTaxAreDefinedInto=Catatan: Akun akuntansi untuk Pajak penjualan didefinisikan ke dalam menu%s-%s NumberOfAccountancyEntries=Jumlah entri NumberOfAccountancyMovements=Jumlah gerakan +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Ekspor draft jurnal @@ -326,6 +339,8 @@ Modelcsv_configurable=Ekspor CSV Dapat Dikonfigurasi Modelcsv_FEC=Ekspor FEC Modelcsv_Sage50_Swiss=Ekspor untuk Sage 50 Swiss Modelcsv_winfic=Ekspor Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Bagan akun Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang index 639aa331a4c..d5b84801d2d 100644 --- a/htdocs/langs/id_ID/admin.lang +++ b/htdocs/langs/id_ID/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=Komponen PHP %s dimuat PreloadOPCode=OPCode preloaded digunakan AddRefInList=Tampilkan Pelanggan / Vendor ref. daftar info (daftar pilih atau kotak kombo) dan sebagian besar hyperlink.
Pihak Ketiga akan muncul dengan format nama "CC12345 - SC45678 - The Big Company corp." alih-alih "Perusahaan Besar Perusahaan". AddAdressInList=Tampilkan daftar info alamat Pelanggan / Vendor (daftar pilih atau kotak kombo)
Pihak Ketiga akan muncul dengan format nama "Korporasi Perusahaan Besar - 21 lompat jalan 123456 Kota besar - AS" alih-alih "Korps Perusahaan Besar". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Mintalah metode pengiriman pilihan untuk Pihak Ketiga. FieldEdition=Edisi baris %s FillThisOnlyIfRequired=Contoh: +2 (isi hanya jika masalah offset zona waktu dialami) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Diperlukan email untuk membuat anggota baru MemberSendInformationByMailByDefault=Kotak centang untuk mengirim konfirmasi email kepada anggota (validasi atau berlangganan baru) diaktifkan secara default VisitorCanChooseItsPaymentMode=Pengunjung dapat memilih dari mode pembayaran yang tersedia MEMBER_REMINDER_EMAIL=Aktifkan pengingat otomatismelalui emaildari langganan yang kedaluwarsa. Catatan: Modul%s harus diaktifkan dan diatur dengan benar untuk mengirim pengingat. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=Pengaturan LDAP LDAPGlobalParameters=Parameter Global @@ -1670,7 +1672,7 @@ AdvancedEditor=Editor tingkat lanjut ActivateFCKeditor=Aktifkan editor lanjutan untuk: FCKeditorForCompany=WYSIWIG pembuatan / edisi deskripsi elemen dan catatan (kecuali produk / layanan) FCKeditorForProduct=WYSIWIG pembuatan / edisi deskripsi produk dan layanan / catatan -FCKeditorForProductDetails=WYSIWIG membuat / edisi garis rincian produk untuk semua entitas (proposal, pesanan, faktur, dll ...). Peringatan: Menggunakan opsi ini untuk kasus ini sangat tidak disarankan karena dapat membuat masalah dengan karakter khusus dan pemformatan halaman saat membuat file PDF. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= Pembuatan / edisi WYSIWIG untuk eMailing massal (Alat-> eMailing) FCKeditorForUserSignature=WYSIWIG pembuatan / edisi tanda tangan pengguna FCKeditorForMail=Pembuatan / edisi WYSIWIG untuk semua email (kecuali Tools-> eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Secara otomatis mengatur nilai default ini untuk j AGENDA_DEFAULT_FILTER_TYPE=Secara otomatis mengatur jenis agenda ini di filter pencarian tampilan agenda AGENDA_DEFAULT_FILTER_STATUS=Secara otomatis mengatur status ini untuk agenda di filter pencarian tampilan agenda AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda -AGENDA_REMINDER_EMAIL=Aktifkan pengingat agendamelalui email(opsi pengingat / penundaan dapat ditentukan pada setiap agenda). Catatan: Modul%s harus diaktifkan dan diatur dengan benar agar pengingat dikirim pada frekuensi yang benar. -AGENDA_REMINDER_BROWSER=Aktifkan pengingat agendadi browser pengguna(ketika tanggal agenda tercapai, setiap pengguna dapat menolak ini dari pertanyaan konfirmasi browser) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Aktifkan pemberitahuan suara +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Tampilkan objek yang ditautkan ke tampilan agenda ##### Clicktodial ##### ClickToDialSetup=Klik Untuk Memanggil pengaturan modul diff --git a/htdocs/langs/id_ID/banks.lang b/htdocs/langs/id_ID/banks.lang index 0b560405473..4f6a68201fd 100644 --- a/htdocs/langs/id_ID/banks.lang +++ b/htdocs/langs/id_ID/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Pembayaran lain-lain VariousPayments=Pembayaran lain-lain ShowVariousPayment=Tampilkan pembayaran lain-lain AddVariousPayment=Tambahkan pembayaran lain-lain +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=Mandat SEPA YourSEPAMandate=Mandat SEPA Anda FindYourSEPAMandate=Ini adalah mandat SEPA Anda untuk mengotorisasi perusahaan kami untuk melakukan pemesanan debit langsung ke bank Anda. Kembalikan ditandatangani (pindai dokumen yang ditandatangani) atau kirimkan melalui pos ke @@ -176,3 +179,4 @@ BankColorizeMovement=Warnai gerakan BankColorizeMovementDesc=Jika fungsi ini diaktifkan, Anda dapat memilih warna latar belakang spesifik untuk gerakan debit atau kredit BankColorizeMovementName1=Warna latar belakang untuk pergerakan debit BankColorizeMovementName2=Warna latar belakang untuk pergerakan kredit +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/id_ID/categories.lang b/htdocs/langs/id_ID/categories.lang index 1e3f50cd4e4..15b8b143200 100644 --- a/htdocs/langs/id_ID/categories.lang +++ b/htdocs/langs/id_ID/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Pengaturan label/kategori CategorieRecursiv=Tautkan dengan label/kategori induk secara otomatis CategorieRecursivHelp=Jika opsi aktif, ketika Anda menambahkan produk ke dalam subkategori, produk juga akan ditambahkan ke dalam kategori induk. AddProductServiceIntoCategory=Tambahkan produk/layanan berikut +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Tampilkan label/kategori ByDefaultInList=Secara default dalam daftar ChooseCategory=Pilih Kategori -StocksCategoriesArea=Kategori Gudang Area -ActionCommCategoriesArea=Kategori Perihal Area -WebsitePagesCategoriesArea=Halaman-Kategori Kategori Kontainer +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Gunakan atau operator untuk kategori diff --git a/htdocs/langs/id_ID/companies.lang b/htdocs/langs/id_ID/companies.lang index 52524b4b5e4..3dd19063424 100644 --- a/htdocs/langs/id_ID/companies.lang +++ b/htdocs/langs/id_ID/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Id Prof 1 (nomor profesional) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Id Prof 1 (nomor Federal) ProfId4CH=Prof Id 2 (Nomor Catatan Komersial) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Id Prof 1 (R.U.T.) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr) ProfId2DE=Prof Id 2 (USt.-Nr) ProfId3DE=Prof Id 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof Id 1 (CIF/NIF) ProfId2ES=Prof Id 2 (Nomor jaminan sosial) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (nomor perguruan tinggi) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof Id 1 (SIREN) ProfId2FR=Prof Id 2 (SIRET) ProfId3FR=Prof Id 3 (NAF, APE lama) ProfId4FR=Id Prof 4 (RCS/RM) -ProfId5FR=- +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Nomor pendaftaran ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (PAJAK SRVC) ProfId4IN=Id Prof 4 ProfId5IN=Id Prof 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Indo. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Indo. prof. 2 (Izin usaha) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (R.C.) ProfId2MA=Id prof. 2 (Patente) ProfId3MA=Id prof. 3 (I.F.) ProfId4MA=Id prof. 4 (C.N.S.) -ProfId5MA=Indo. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Id Prof 1 (R.F.C). ProfId2MX=Prof Id 2 (R..P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=Jumlah KVK ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof Id 2 (Nomor jaminan sosial) ProfId3PT=Prof Id 3 (Nomor Catatan Komersial) ProfId4PT=Prof Id 4 (Konservatori) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Matnmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof Id 1 (OGRN) ProfId2RU=Prof Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=Anda juga dapat memeriksa secara manual di situs web Komisi ErrorVATCheckMS_UNAVAILABLE=Periksa tidak mungkin. Layanan cek tidak disediakan oleh negara anggota (%s). NorProspectNorCustomer=Bukan prospek, bukan pelanggan JuridicalStatus=Jenis Badan Hukum +Workforce=Workforce Staff=karyawan ProspectLevelShort=Potensi ProspectLevel=Potensi prospek @@ -456,3 +462,8 @@ PaymentTermsSupplier=Jangka Waktu Pembayaran - Vendor PaymentTypeBoth=Jenis Pembayaran - Pelanggan dan Vendor MulticurrencyUsed=Gunakan Multicurrency MulticurrencyCurrency=Mata uang +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/id_ID/hrm.lang b/htdocs/langs/id_ID/hrm.lang index 574bb5bd380..829bb3d48e9 100644 --- a/htdocs/langs/id_ID/hrm.lang +++ b/htdocs/langs/id_ID/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Posisi pekerjaan Employees=karyawan Employee=karyawan NewEmployee=Karyawan Baru +ListOfEmployees=Daftar Karyawan diff --git a/htdocs/langs/id_ID/languages.lang b/htdocs/langs/id_ID/languages.lang index e8207abbf96..641ee7a5b60 100644 --- a/htdocs/langs/id_ID/languages.lang +++ b/htdocs/langs/id_ID/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Spanyol (Panama) Language_es_PY=Spanyol (Paraguay) Language_es_PE=Spanyol (Peru) Language_es_PR=Spanyol (Puerto Rico) +Language_es_US=Spanish (USA) Language_es_UY=Spanyol (Uruguay) Language_es_GT=Spanyol (Guatemala) Language_es_VE=Spanyol (Venezuela) diff --git a/htdocs/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang index 04dbbf3fcba..def7208cb73 100644 --- a/htdocs/langs/id_ID/main.lang +++ b/htdocs/langs/id_ID/main.lang @@ -155,6 +155,7 @@ RemoveLink=Hapus tautan AddToDraft=Tambahkan ke konsep Update=Membarui Close=Menutup +CloseAs=Set status to CloseBox=Hapus widget dari dasbor Anda Confirm=Konfirmasi ConfirmSendCardByMail=Apakah Anda benar-benar ingin mengirim konten kartu ini melalui pos ke%s ? @@ -196,6 +197,7 @@ ReOpen=Buka kembali Upload=Unggah ToLink=Link Select=Pilih +SelectAll=Select all Choose=Memilih Resize=Ubah ukuran ResizeOrCrop=Ubah Ukuran atau Pangkas @@ -256,6 +258,7 @@ Cards=Kartu-kartu Card=Kartu Now=Sekarang HourStart=Mulai jam +Deadline=Deadline Date=Tanggal DateAndHour=Tanggal dan jam DateToday=Tanggal hari ini @@ -264,8 +267,10 @@ DateStart=Tanggal mulai DateEnd=Tanggal Akhir DateCreation=Tangga dibuat DateCreationShort=Creat. tanggal +IPCreation=Creation IP DateModification=Tanggal modifikasi DateModificationShort=Modif. tanggal +IPModification=Modification IP DateLastModification=Tanggal modifikasi terbaru DateValidation=Tanggal validasi DateClosing=Tanggal Penutupan @@ -319,6 +324,7 @@ Morning=Pagi Afternoon=Sore Quadri=Quadri MonthOfDay=Bulan dalam sehari +DaysOfWeek=Days of week HourShort=H MinuteShort=M N Rate=Menilai @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Jumlah pembayaran, mata uang asli MulticurrencyAmountHT=Jumlah (tidak termasuk pajak), mata uang asli MulticurrencyAmountTTC=Jumlah (termasuk pajak), mata uang asli MulticurrencyAmountVAT=Pajak jumlah, mata uang asli +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Jumlah pajak 2 AmountLT2=Jumlah pajak 3 AmountLT1ES=Jumlah RE @@ -487,6 +494,7 @@ By=Oleh From=Dari FromDate=Dari FromLocation=Dari +at=at to=untuk To=untuk and=dan @@ -509,6 +517,7 @@ Draft=Konsep Drafts=Draf StatusInterInvoiced=Faktur Validated=Divalidasi +ValidatedToProduce=Validated (To produce) Opened=Buka OpenAll=Buka semua) ClosedAll=Tertutup (Semua) @@ -655,6 +664,7 @@ Response=Tanggapan Priority=Prioritas SendByMail=Kirim melalui email MailSentBy=Email dikirim oleh +NotSent=Not sent TextUsedInTheMessageBody=Badan email SendAcknowledgementByMail=Kirim email konfirmasi SendMail=Mengirim email @@ -836,6 +846,7 @@ ListOfTemplates=Daftar templat Gender=Jenis kelamin Genderman=Pria Genderwoman=Wanita +Genderother=Lainnya ViewList=Tampilan daftar ViewGantt=Lihat saja ViewKanban=Tampilan kanban @@ -877,6 +888,8 @@ Miscellaneous=Lain-lain Calendar=Kalender GroupBy=Kelompokkan oleh ... ViewFlatList=Lihat daftar datar +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Hapus string '%s' SomeTranslationAreUncomplete=Beberapa bahasa yang ditawarkan mungkin hanya diterjemahkan sebagian atau mengandung kesalahan. Tolong bantu untuk memperbaiki bahasa Anda dengan mendaftar di https://transifex.com/projects/p/dolibarr/ untuk menambahkan perbaikan dari Anda. DirectDownloadLink=Tautan unduhan langsung (publik / eksternal) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Pengiriman pelanggan SearchIntoExpenseReports=Laporan biaya SearchIntoLeaves=Keluar SearchIntoTickets=Tiket +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Vendor payments +SearchIntoMiscPayments=Miscellaneous payments CommentLink=Komentar NbComments=Jumlah komentar CommentPage=Ruang komentar @@ -1078,8 +1094,16 @@ ByStatus=Menurut status InformationMessage=Information Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Date of birth +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/id_ID/mrp.lang b/htdocs/langs/id_ID/mrp.lang index b758778f120..0dab77fbf41 100644 --- a/htdocs/langs/id_ID/mrp.lang +++ b/htdocs/langs/id_ID/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Biaya satuan TotalCost=Total biaya BOMTotalCost=Biaya untuk menghasilkan BOM ini berdasarkan pada biaya setiap kuantitas dan produk yang akan dikonsumsi (gunakan harga Biaya jika ditentukan, selain itu Harga Rata-rata Tertimbang jika ditentukan, selain itu harga pembelian Terbaik) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/id_ID/website.lang b/htdocs/langs/id_ID/website.lang index 149649e47b3..9d0b6cc0fe1 100644 --- a/htdocs/langs/id_ID/website.lang +++ b/htdocs/langs/id_ID/website.lang @@ -31,7 +31,7 @@ AddWebsite=Tambahkan situs web Webpage=Halaman web / wadah AddPage=Tambahkan halaman / wadah HomePage=Halaman Depan -PageContainer=Halaman / wadah +PageContainer=Page PreviewOfSiteNotYetAvailable=Pratinjau situs web Anda%s belum tersedia. Anda harus terlebih dahulu ' Impor template situs web lengkap ' atau hanya ' Tambahkan halaman / wadah '. RequestedPageHasNoContentYet=Halaman yang diminta dengan id %s belum memiliki konten, atau file cache .tpl.php telah dihapus. Edit konten halaman untuk menyelesaikan ini. SiteDeleted=Situs web '%s' dihapus @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Penggantian dilakukan di halaman atau wadah %s RSSFeed=Umpan RSS RSSFeedDesc=Anda bisa mendapatkan RSS feed dari artikel terbaru dengan mengetikkan 'blogpost' menggunakan URL ini PagesRegenerated=%s halaman / wadah dibuat ulang +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/is_IS/accountancy.lang b/htdocs/langs/is_IS/accountancy.lang index 43dcc6fc6fe..c83c3cef1d6 100644 --- a/htdocs/langs/is_IS/accountancy.lang +++ b/htdocs/langs/is_IS/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Default for service DefaultForProduct=Default for product CantSuggest=Can't suggest AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s -ConfigAccountingExpert=Configuration of the module accounting expert +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Journalization -Journaux=Journals +Journals=Journals JournalFinancial=Financial journals BackToChartofaccounts=Return chart of accounts Chartofaccounts=Chart of accounts +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Current dedicated account AssignDedicatedAccountingAccount=New account to assign InvoiceLabel=Invoice label @@ -33,8 +35,8 @@ OtherInfo=Other information DeleteCptCategory=Remove accounting account from group ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group? JournalizationInLedgerStatus=Status of journalization -AlreadyInGeneralLedger=Already journalized in ledgers -NotYetInGeneralLedger=Not yet journalized in ledgers +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group DetailByAccount=Show detail by account AccountWithNonZeroValues=Accounts with non-zero values @@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC CountriesNotInEEC=Countries not in EEC CountriesInEECExceptMe=Countries in EEC except %s CountriesExceptMe=All countries except %s -AccountantFiles=Export accounting documents +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup @@ -79,7 +83,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) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Select active chart of accounts ChangeAndLoad=Change and load Addanaccount=Add an accounting account @@ -89,6 +93,8 @@ SubledgerAccount=Subledger account SubledgerAccountLabel=Subledger account label ShowAccountingAccount=Show accounting account ShowAccountingJournal=Show accounting journal +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Accounting account suggested MenuDefaultAccounts=Default accounts MenuBankAccounts=Bankareikningar @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding CreateMvts=Create new transaction UpdateMvts=Modification of a transaction ValidTransaction=Validate transaction -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=Ledger +BookkeepingSubAccount=Subledger AccountBalance=Account balance ObjectsRef=Source object ref CAHTF=Total purchase vendor before tax @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Sell journal ACCOUNTING_PURCHASE_JOURNAL=Purchase journal @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups ByYear=Ár NotMatch=Not Set -DeleteMvt=Delete Ledger lines +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=Year to delete DelJournal=Journal to delete -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Finance journal ExpenseReportsJournal=Expense reports journal DescFinanceJournal=Finance journal including all the types of payments by bank account -DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Account for VAT not defined ThirdpartyAccountNotDefined=Account for third party not defined ProductAccountNotDefined=Account for product not defined @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu %s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Export draft journal @@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Chart of accounts Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang index d7d7c4f0ca2..a97b287a176 100644 --- a/htdocs/langs/is_IS/admin.lang +++ b/htdocs/langs/is_IS/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=%s viði útgáfa FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member MemberSendInformationByMailByDefault=Checkbox að senda póst staðfestingu á meðlimum (löggilding eða nýja áskrift) er sjálfgefið VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=LDAP Skipulag LDAPGlobalParameters=Global breytur @@ -1670,7 +1672,7 @@ AdvancedEditor=Ítarlegri ritstjóri ActivateFCKeditor=Virkja FCKeditor fyrir: FCKeditorForCompany=WYSIWIG sköpun / útgáfa af lýsingu companie og athugaðu FCKeditorForProduct=s WYSIWIG sköpun / útgáfa af vörum / þjónustu "lýsingu og athugaðu -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG sköpun / útgáfa af póstlista FCKeditorForUserSignature=WYSIWIG creation/edition of user signature FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting 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 user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view ##### Clicktodial ##### ClickToDialSetup=Smelltu til að hringja mát skipulag diff --git a/htdocs/langs/is_IS/banks.lang b/htdocs/langs/is_IS/banks.lang index 5c48d9a2ce8..ca4aef62431 100644 --- a/htdocs/langs/is_IS/banks.lang +++ b/htdocs/langs/is_IS/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=Miscellaneous payments ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA mandate YourSEPAMandate=Your SEPA mandate FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/is_IS/categories.lang b/htdocs/langs/is_IS/categories.lang index 7192cb3eae7..12ea7e5e036 100644 --- a/htdocs/langs/is_IS/categories.lang +++ b/htdocs/langs/is_IS/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup CategorieRecursiv=Link with parent tag/category automatically CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=Add the following product/service +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Show tag/category ByDefaultInList=By default in list ChooseCategory=Choose category -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/is_IS/companies.lang b/htdocs/langs/is_IS/companies.lang index f53325c968e..1ec0e068f53 100644 --- a/htdocs/langs/is_IS/companies.lang +++ b/htdocs/langs/is_IS/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional tala) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof Id 1 (Federal tala) ProfId4CH=Prof Id 2 (Commercial Record tala) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof Id 1 (Rut) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr) ProfId2DE=Prof Id 2 (USt.-Nr) ProfId3DE=Prof Id 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof Id 1 (CIF / nEf) ProfId2ES=Prof Id 2 (Kennitala) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (Collegiate tala) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof Id 1 (Siren) ProfId2FR=Prof Id 2 (SIRET) ProfId3FR=Prof Id 3 (NAF, gamall MANNAPI) ProfId4FR=Prof Id 4 (RCS / RM) -ProfId5FR=Prof Id 5 +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Prof Id 1 (Registration Number) ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 ProfId4IN=Prof Id 4 ProfId5IN=Prof Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Business permit) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id Prof. 1 (RC) ProfId2MA=Id Prof. 2 (Patente) ProfId3MA=Id Prof. 3 (IF) ProfId4MA=Id Prof. 4 (CNSS) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof Id 1 (RFC). ProfId2MX=Prof Id 2 (R.. P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=Kvk nummer ProfId2NL=- ProfId3NL=- ProfId4NL=- -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof Id 2 (Kennitala) ProfId3PT=Prof Id 3 (Commercial Record tala) ProfId4PT=Prof Id 4 (Conservatory) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof Id 1 (OGRN) ProfId2RU=Prof Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi ErrorVATCheckMS_UNAVAILABLE=Athuga ekki hægt. Athugaðu þjónusta er ekki veitt af aðildarríki ( %s ). NorProspectNorCustomer=Not prospect, nor customer JuridicalStatus=Legal Entity Type +Workforce=Workforce Staff=Employees ProspectLevelShort=Möguleiki ProspectLevel=Prospect möguleiki @@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor PaymentTypeBoth=Payment Type - Customer and Vendor MulticurrencyUsed=Use Multicurrency MulticurrencyCurrency=Gjaldmiðill +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/is_IS/hrm.lang b/htdocs/langs/is_IS/hrm.lang index 6cc7f6bef24..3b8f137e103 100644 --- a/htdocs/langs/is_IS/hrm.lang +++ b/htdocs/langs/is_IS/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=Employees Employee=Employee NewEmployee=New employee +ListOfEmployees=List of employees diff --git a/htdocs/langs/is_IS/languages.lang b/htdocs/langs/is_IS/languages.lang index d68088905cb..ad4840a820e 100644 --- a/htdocs/langs/is_IS/languages.lang +++ b/htdocs/langs/is_IS/languages.lang @@ -40,6 +40,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_US=Spanish (USA) Language_es_UY=Spanish (Uruguay) Language_es_GT=Spanish (Guatemala) Language_es_VE=Spanish (Venezuela) diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang index 278c752c71e..55729865831 100644 --- a/htdocs/langs/is_IS/main.lang +++ b/htdocs/langs/is_IS/main.lang @@ -155,6 +155,7 @@ RemoveLink=Remove link AddToDraft=Add to draft Update=Uppfæra Close=Loka +CloseAs=Set status to CloseBox=Remove widget from your dashboard Confirm=Staðfesta ConfirmSendCardByMail=Do you really want to send the content of this card by mail to %s? @@ -196,6 +197,7 @@ ReOpen=Re-Open Upload=Upload ToLink=Link Select=Velja +SelectAll=Select all Choose=Veldu Resize=Búa ResizeOrCrop=Resize or Crop @@ -256,6 +258,7 @@ Cards=Spil Card=Card Now=Nú HourStart=Start hour +Deadline=Deadline Date=Dagsetning DateAndHour=Date and hour DateToday=Today's date @@ -264,8 +267,10 @@ DateStart=Upphafsdagur DateEnd=Lokadagur DateCreation=Creation dagsetning DateCreationShort=Creat. date +IPCreation=Creation IP DateModification=Breytingadagsetningu DateModificationShort=Modif. dagsetning +IPModification=Modification IP DateLastModification=Latest modification date DateValidation=Löggilding dagur DateClosing=Lokadegi @@ -319,6 +324,7 @@ Morning=Morning Afternoon=Afternoon Quadri=Quadri MonthOfDay=Mánuður dagsins +DaysOfWeek=Days of week HourShort=H MinuteShort=mn Rate=Verð @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency MulticurrencyAmountHT=Amount (excl. tax), original currency MulticurrencyAmountTTC=Amount (inc. of tax), original currency MulticurrencyAmountVAT=Amount tax, original currency +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Amount tax 2 AmountLT2=Amount tax 3 AmountLT1ES=Upphæð RE @@ -487,6 +494,7 @@ By=Með því að From=Frá FromDate=Frá FromLocation=Frá +at=at to=til To=til and=og @@ -509,6 +517,7 @@ Draft=Víxill Drafts=Drög StatusInterInvoiced=Invoiced Validated=Staðfestar +ValidatedToProduce=Validated (To produce) Opened=Opnaðu OpenAll=Open (All) ClosedAll=Closed (All) @@ -655,6 +664,7 @@ Response=Svar Priority=Forgangur SendByMail=Send by email MailSentBy=Email sent +NotSent=Ekki senda TextUsedInTheMessageBody=Email líkami SendAcknowledgementByMail=Send confirmation email SendMail=Senda tölvupóst @@ -836,6 +846,7 @@ ListOfTemplates=List of templates Gender=Gender Genderman=Man Genderwoman=Woman +Genderother=Önnur ViewList=Skoða lista ViewGantt=Gantt view ViewKanban=Kanban view @@ -877,6 +888,8 @@ Miscellaneous=Ýmislegt Calendar=Calendar GroupBy=Group by... ViewFlatList=View flat list +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Remove string '%s' SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at https://transifex.com/projects/p/dolibarr/ to add your improvements. DirectDownloadLink=Direct download link (public/external) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments SearchIntoExpenseReports=Expense reports SearchIntoLeaves=Leave SearchIntoTickets=Tickets +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Vendor payments +SearchIntoMiscPayments=Miscellaneous payments CommentLink=Athugasemdir NbComments=Number of comments CommentPage=Comments space @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Information Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Dags til fæðingu +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/is_IS/mrp.lang b/htdocs/langs/is_IS/mrp.lang index 863793063a0..f018be890cc 100644 --- a/htdocs/langs/is_IS/mrp.lang +++ b/htdocs/langs/is_IS/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/is_IS/website.lang b/htdocs/langs/is_IS/website.lang index f104163dd5a..5f3b13b98b1 100644 --- a/htdocs/langs/is_IS/website.lang +++ b/htdocs/langs/is_IS/website.lang @@ -31,7 +31,7 @@ AddWebsite=Add website Webpage=Web page/container AddPage=Add page/container HomePage=Home Page -PageContainer=Page/container +PageContainer=Page PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. 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. SiteDeleted=Web site '%s' deleted @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=RSS Feed RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/it_CH/companies.lang b/htdocs/langs/it_CH/companies.lang deleted file mode 100644 index 4f7719d61ea..00000000000 --- a/htdocs/langs/it_CH/companies.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - companies -ProfId5MA=Id. prof. 5 (I.C.E.) diff --git a/htdocs/langs/it_IT/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang index 781085f58c4..efd66d86cb6 100644 --- a/htdocs/langs/it_IT/accountancy.lang +++ b/htdocs/langs/it_IT/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Predefinito per servizio DefaultForProduct=Predefinito per prodotto CantSuggest=Non posso suggerire AccountancySetupDoneFromAccountancyMenu=La maggior parte del setup della contabilità è effettuata dal menù %s -ConfigAccountingExpert=Configurazione del modulo contabilità esperta +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Giornali -Journaux=Giornali +Journals=Giornali JournalFinancial=Giornali finanziari BackToChartofaccounts=Ritorna alla lista dell'account Chartofaccounts=Piano dei conti +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Attuale account dedicato AssignDedicatedAccountingAccount=Nuovo account da assegnare InvoiceLabel=Etichetta fattura @@ -33,8 +35,8 @@ OtherInfo=Altre informazioni DeleteCptCategory=Rimuovi conto corrente dal gruppo ConfirmDeleteCptCategory=Sei sicuro di voler rimuovere questo account contabile dal gruppo di account contabilità? JournalizationInLedgerStatus=Stato delle registrazioni -AlreadyInGeneralLedger=Già registrato nei libri mastri -NotYetInGeneralLedger=Non ancora registrato nei libri mastri +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Il gruppo è vuoto, controlla le impostazioni del gruppo personalizzato di contabilità DetailByAccount=Mostra dettagli dall'account AccountWithNonZeroValues=Account con valori non-zero @@ -43,7 +45,9 @@ CountriesInEEC=Paesi nella CEE CountriesNotInEEC=Paesi al di fuori della CEE CountriesInEECExceptMe=Paesi nella CEE eccetto %s CountriesExceptMe=Tutti i paesi eccetto %s -AccountantFiles=Esportare documenti contabili +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Account principale di contabilità per i clienti non definito nel setup MainAccountForSuppliersNotDefined=Account principale di contabilità per fornitori non definito nel setup @@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Aggiunti o modifica le transazioni esistenti AccountancyAreaDescClosePeriod=STEP %s: Chiudo il periodo così non verranno fatte modifiche in futuro. -TheJournalCodeIsNotDefinedOnSomeBankAccount=Uno step obbligatorio non è stato completato (il codice del diario contabile non è stato definito per tutti i conti bancari) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Seleziona il piano dei conti attivo ChangeAndLoad=Cambia e carica Addanaccount=Aggiungi un conto di contabilità @@ -89,6 +93,8 @@ SubledgerAccount=Conto del registro secondario SubledgerAccountLabel=Etichetta del conto Registro secondario ShowAccountingAccount=Mostra conti di contabilità ShowAccountingJournal=Mostra diario contabile +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Conto suggerito per contabilità MenuDefaultAccounts=Conti predefiniti MenuBankAccounts=Conti bancari @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Associa nota spese CreateMvts=Crea nuova transazione UpdateMvts=Modifica una transazione ValidTransaction=Valida transazione -WriteBookKeeping=Registrare le transazioni nel Libro Mastro +WriteBookKeeping=Register transactions in accounting Bookkeeping=Libro contabile +BookkeepingSubAccount=Subledger AccountBalance=Saldo ObjectsRef=Sorgente oggetto in riferimento CAHTF=Totale acquisto al lordo delle imposte @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disabilita la registrazione diretta della transazione ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Abilita la bozza di esportazione sul giornale ACCOUNTANCY_COMBO_FOR_AUX=Abilita l'elenco combinato per il conto secondario (potrebbe essere lento se hai un sacco di terze parti) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Giornale Vendite ACCOUNTING_PURCHASE_JOURNAL=Giornale Acquisti @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Conto di contabilità di attesa DONATION_ACCOUNTINGACCOUNT=Conto di contabilità per registrare le donazioni ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Conto contabile per registrare gli abbonamenti +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Conto di contabilità predefinito per i prodotti acquistati (se non definito nella scheda prodotto) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Conto contabile predefinito per i prodotti acquistati in CEE (usato se non definito nella scheda prodotto) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Conto contabile predefinito per i prodotti acquistati e importati al di fuori della CEE (usato se non definito nella scheda prodotto) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=Per gruppi predefiniti ByPersonalizedAccountGroups=Gruppi personalizzati ByYear=Per anno NotMatch=Non impostato -DeleteMvt=Cancella linee libro contabile +DeleteMvt=Delete some operation lines from accounting DelMonth=Mese da cancellare DelYear=Anno da cancellare DelJournal=Giornale da cancellare -ConfirmDeleteMvt=Questo cancellerà tutte le righe del libro mastro per l'anno e/o da un giornale specifico. È richiesto almeno un criterio. -ConfirmDeleteMvtPartial=Questo cancellerà la transazione dal libro mastro (tutte le righe relative alla stessa transazione saranno cancellate) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Giornale delle finanze ExpenseReportsJournal=Rapporto spese DescFinanceJournal=Giornale finanziario che include tutti i tipi di pagamenti per conto bancario -DescJournalOnlyBindedVisible=Questa è una vista del record che sono legati a un conto contabile e possono essere registrati nel libro mastro. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Conto per IVA non definito ThirdpartyAccountNotDefined=Conto per terze parti non definito ProductAccountNotDefined=Account per prodotto non definito @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=Questo giornale è già in uso AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu %s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Export draft journal @@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Esporta Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Id Piano dei Conti ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang index 0880d5dc6dd..b20c40b7563 100644 --- a/htdocs/langs/it_IT/admin.lang +++ b/htdocs/langs/it_IT/admin.lang @@ -274,7 +274,7 @@ NoticePeriod=Periodo di avviso NewByMonth=New by month Emails=Email EMailsSetup=Impostazioni Email -EMailsDesc=This page allows you to set parameters or options for email sending. +EMailsDesc=Questa pagina ti permette di configurare i parametri o le opzioni per l'invio email. EmailSenderProfiles=Profili mittente email EMailsSenderProfileDesc=Puoi tenere vuota questa sezione. Se inserisci alcune e-mail qui, verranno aggiunte all'elenco dei possibili mittenti nella casella combinata quando scrivi una nuova e-mail. MAIN_MAIL_SMTP_PORT=Porta SMTP / SMTPS (predefinito in php.ini: %s ) @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=Modifica del campo %s FillThisOnlyIfRequired=Per esempio: +2 (compilare solo se ci sono problemi di scostamento del fuso orario) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member MemberSendInformationByMailByDefault=Checkbox per inviare una mail di conferma per i membri (è attiva per impostazione predefinita) VisitorCanChooseItsPaymentMode=Il visitatore può scegliere tra le modalità di pagamento disponibili MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=Impostazioni del protocollo LDAP LDAPGlobalParameters=Parametri globali @@ -1614,7 +1616,7 @@ YouCanUseDOL_DATA_ROOT=È possibile utilizzare DOL_DATA_ROOT/dolibarr.log come f ErrorUnknownSyslogConstant=La costante %s è sconosciuta a syslog. OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug) -SyslogFileNumberOfSaves=Number of backup logs to keep +SyslogFileNumberOfSaves=Numero dei backup di log da mantenere ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency ##### Donations ##### DonationsSetup=Impostazioni modulo donazioni @@ -1670,7 +1672,7 @@ AdvancedEditor=Editor avanzato ActivateFCKeditor=Attiva editor avanzato per: FCKeditorForCompany=Editor WYSIWIG per le società FCKeditorForProduct=Editor WYSIWIG per i prodotti/servizi -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= Editor WYSIWIG per le email FCKeditorForUserSignature=WYSIWIG creazione/modifica della firma utente FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting 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 user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Attiva i suoni per le notifiche +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view ##### Clicktodial ##### ClickToDialSetup=Impostazioni modulo ClickToDial (telefonate con un clic) diff --git a/htdocs/langs/it_IT/banks.lang b/htdocs/langs/it_IT/banks.lang index 99e5e05c812..67051003cf9 100644 --- a/htdocs/langs/it_IT/banks.lang +++ b/htdocs/langs/it_IT/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=Pagamenti vari ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=Mandato SEPA YourSEPAMandate=I tuoi mandati SEPA FindYourSEPAMandate=Questo è il tuo mandato SEPA che autorizza la nostra azienda ad effettuare un ordine di addebito diretto alla tua banca. Da restituire firmata (scansione del documento firmato) o inviato all'indirizzo email @@ -176,3 +179,4 @@ BankColorizeMovement=Colora i movimenti BankColorizeMovementDesc=Se questa funzione è abilitata, è possibile scegliere il colore di sfondo specifico per i movimenti di debito o credito BankColorizeMovementName1=Colore di sfondo per il movimento di debito BankColorizeMovementName2=Colore di sfondo per il movimento del credito +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/it_IT/categories.lang b/htdocs/langs/it_IT/categories.lang index 0907cae5aaa..7d60396caab 100644 --- a/htdocs/langs/it_IT/categories.lang +++ b/htdocs/langs/it_IT/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Impostazioni Tag/categorie CategorieRecursiv=Collega automaticamente alla tag/categoria padre CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=Aggiungi il seguente prodotto/servizio +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Mostra tag/categoria ByDefaultInList=Default nella lista ChooseCategory=Choose category -StocksCategoriesArea=Area categorie magazzini -ActionCommCategoriesArea=Area eventi categorie -WebsitePagesCategoriesArea=Pagina contenitore Area categorie +StocksCategoriesArea=Categorie magazzini +ActionCommCategoriesArea=Categorie eventi +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Uso o operatore per le categorie diff --git a/htdocs/langs/it_IT/companies.lang b/htdocs/langs/it_IT/companies.lang index bc8d25726e2..703fa6018f2 100644 --- a/htdocs/langs/it_IT/companies.lang +++ b/htdocs/langs/it_IT/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=USt.-IdNr ProfId2AT=USt.-Nr ProfId3AT=Handelsregister-Nr. ProfId4AT=- -ProfId5AT=- +ProfId5AT=Codice EORI ProfId6AT=- ProfId1AU=ABN ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Numero professionale) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=Codice EORI ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=numero federale ProfId4CH=numero registrazione commerciale -ProfId5CH=- +ProfId5CH=Codice EORI ProfId6CH=- ProfId1CL=RUT ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=USt.-IdNr ProfId2DE=USt.-Nr ProfId3DE=Handelsregister-Nr. ProfId4DE=- -ProfId5DE=- +ProfId5DE=Codice EORI ProfId6DE=- ProfId1ES=CIF/NIF ProfId2ES=Núm seguridad social ProfId3ES=CNAE ProfId4ES=Núm colegiado -ProfId5ES=- +ProfId5ES=Codice EORI ProfId6ES=- ProfId1FR=SIREN ProfId2FR=SIRET ProfId3FR=NAF, vecchio APE ProfId4FR=RCS/RM -ProfId5FR=- +ProfId5FR=Codice EORI ProfId6FR=- ProfId1GB=Registration Number ProfId2GB=- @@ -198,11 +198,16 @@ ProfId3IN=- ProfId4IN=- ProfId5IN=- ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=Codice EORI ProfId1LU=Id. prof. 1 (R.C.S. Lussemburgo) ProfId2LU=Id. prof. 2 (Permesso d'affari) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=Codice EORI ProfId6LU=- ProfId1MA=RC ProfId2MA=Patente @@ -220,13 +225,13 @@ ProfId1NL=KVK nummer ProfId2NL=- ProfId3NL=- ProfId4NL=- -ProfId5NL=- +ProfId5NL=Codice EORI ProfId6NL=- ProfId1PT=NIPC ProfId2PT=numero di sicurezza sociale ProfId3PT=numero registrazione commerciale ProfId4PT=Conservatorio -ProfId5PT=- +ProfId5PT=Codice EORI ProfId6PT=- ProfId1SN=RC ProfId2SN=Ninea @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof ID 1 (CUI) ProfId2RO=Prof ID 2 (Nr. Immatricolazione) ProfId3RO=Prof ID 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof ID 5 (EUID) +ProfId4RO=Prof ID 5 (EUID) +ProfId5RO=Codice EORI ProfId6RO=- ProfId1RU=OGRN ProfId2RU=INN @@ -354,6 +359,7 @@ VATIntraManualCheck=È anche possibile controllare manualmente sul sito della Co ErrorVATCheckMS_UNAVAILABLE=Non è possibile effettuare il controllo. Servizio non previsto per lo stato membro ( %s). NorProspectNorCustomer=Né cliente, né cliente potenziale JuridicalStatus=Forma giuridica +Workforce=Workforce Staff=Dipendenti ProspectLevelShort=Cl. Pot. ProspectLevel=Liv. cliente potenziale @@ -456,3 +462,8 @@ PaymentTermsSupplier=Termine di pagamento - Fornitore PaymentTypeBoth=Tipo di pagamento - Cliente e fornitore MulticurrencyUsed=Use Multicurrency MulticurrencyCurrency=Valuta +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/it_IT/hrm.lang b/htdocs/langs/it_IT/hrm.lang index 74aac91da31..acf3452f8ea 100644 --- a/htdocs/langs/it_IT/hrm.lang +++ b/htdocs/langs/it_IT/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Posizioni di lavoro Employees=Dipendenti Employee=Dipendente NewEmployee=Nuovo dipendente +ListOfEmployees=Lista dei dipendenti diff --git a/htdocs/langs/it_IT/languages.lang b/htdocs/langs/it_IT/languages.lang index 3d88ef5f267..5e5be267cc1 100644 --- a/htdocs/langs/it_IT/languages.lang +++ b/htdocs/langs/it_IT/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Spagnolo (Panama) Language_es_PY=Spagnolo (Paraguay) Language_es_PE=Spagnolo (Perù) Language_es_PR=Spagnolo (Portorico) +Language_es_US=Spanish (USA) Language_es_UY=Spagnolo (Uruguay) Language_es_GT=Spagnolo (Guatemala) Language_es_VE=Spagnolo (Venezuela) diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang index ac69f12e8ba..0be748325f0 100644 --- a/htdocs/langs/it_IT/main.lang +++ b/htdocs/langs/it_IT/main.lang @@ -197,6 +197,7 @@ ReOpen=Riapri Upload=Upload ToLink=Link Select=Seleziona +SelectAll=Select all Choose=Scegli Resize=Ridimensiona ResizeOrCrop=Ridimensiona o ritaglia @@ -257,6 +258,7 @@ Cards=Schede Card=Scheda Now=Adesso HourStart=Ora di inizio +Deadline=Deadline Date=Data DateAndHour=Data e ora DateToday=Data odierna @@ -265,8 +267,10 @@ DateStart=Data di inizio DateEnd=Data di fine DateCreation=Data di creazione DateCreationShort=Data di creazione +IPCreation=Creation IP DateModification=Data di modifica DateModificationShort=Data modif. +IPModification=Modification IP DateLastModification=Data ultima modifica DateValidation=Data di convalida DateClosing=Data di chiusura @@ -1102,3 +1106,4 @@ SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has exp UpToDate=Up-to-date OutOfDate=Out-of-date EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/it_IT/mrp.lang b/htdocs/langs/it_IT/mrp.lang index 93f8c25e0cd..e5048e22764 100644 --- a/htdocs/langs/it_IT/mrp.lang +++ b/htdocs/langs/it_IT/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Costo unitario TotalCost=Costo totale BOMTotalCost=Il costo per produrre questa distinta base in base al costo di ciascuna quantità e prodotto da consumare (utilizzare il prezzo di costo se definito, altrimenti il prezzo medio ponderato se definito, altrimenti il miglior prezzo di acquisto) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/it_IT/website.lang b/htdocs/langs/it_IT/website.lang index 44e82e1accc..2037c7d7c8d 100644 --- a/htdocs/langs/it_IT/website.lang +++ b/htdocs/langs/it_IT/website.lang @@ -31,7 +31,7 @@ AddWebsite=Aggiungi sito web Webpage=Web page/container AddPage=Aggiungi pagina/contenitore HomePage=Home Page -PageContainer=Page/container +PageContainer=Pagina PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. 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. SiteDeleted=Web site '%s' deleted @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Sostituzione eseguite in%spagine o contenitori RSSFeed=Feed RSS RSSFeedDesc=Puoi ottenere un feed RSS degli articoli più recenti con il tipo "blogpost" utilizzando questo URL PagesRegenerated=%s pagina(e)/contenitore(i) rigenerato +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang index c5bcc21b0bb..03fca6294e9 100644 --- a/htdocs/langs/ja_JP/accountancy.lang +++ b/htdocs/langs/ja_JP/accountancy.lang @@ -339,6 +339,8 @@ Modelcsv_configurable=CSV構成可能のエクスポート Modelcsv_FEC=FECのエクスポート Modelcsv_Sage50_Swiss=セージ50スイスへのエクスポート Modelcsv_winfic=Winficのエクスポート-eWinfic-WinSisCompta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=勘定科目表ID ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang index 9047c69a596..489bb909061 100644 --- a/htdocs/langs/ja_JP/admin.lang +++ b/htdocs/langs/ja_JP/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHPコンポーネント%sがロードされる PreloadOPCode=プリロードされたOPCodeが使用される AddRefInList=顧客/仕入先参照を表示する。情報リスト ( 選択リストまたはコンボボックス ) およびほとんどのハイパーリンク。
取引先は、「CC12345-SC45678-The BigCompanycorp。」という名前の形式で表示される。 「TheBigCompanycorp」の代わりに。 AddAdressInList=顧客/仕入先の住所情報リストを表示する ( リストまたはコンボボックスを選択 )
取引先は、「TheBigCompanycorp。」ではなく「TheBigCompanycorp。-21jumpstreet 123456Bigtown-USA」の名前形式で表示される。 +AddEmailPhoneTownInContactList=連絡先の電子メール（または未定義の場合は電話）と町の情報リスト（選択リストまたはコンボボックス）を表示
連絡先は以下の名称と形式で表記される："Dupond Durand" の形式でなく、 "Dupond Durand - dupond.durand@email.com - Paris" または "Dupond Durand - 06 07 59 65 66 - Paris" 。 AskForPreferredShippingMethod=取引先の優先配送方法を尋ねる。 FieldEdition=フィールド%sのエディション FillThisOnlyIfRequired=例：+2 ( タイムゾーンオフセットの問題が発生した場合にのみ入力 ) @@ -1420,6 +1421,7 @@ AdherentMailRequired=新規メンバーを作成するにはメールが必要 MemberSendInformationByMailByDefault=メンバー ( 検証や新規サブスクリプション ) にメールの確認を送信するチェックボックスはデフォルトでオンになっている VisitorCanChooseItsPaymentMode=訪問者は利用可能な支払いモードから選択できる MEMBER_REMINDER_EMAIL=期限切れのサブスクリプションの電子メールによって自動リマインダーを有効にする。注：モジュール %s を有効にして、リマインダーを送信するように正しく設定する必要がある。 +MembersDocModules=メンバーレコードから生成されたドキュメント用のドキュメントテンプレート ##### LDAP setup ##### LDAPSetup=LDAPの設定 LDAPGlobalParameters=グローバルパラメータ @@ -1670,7 +1672,7 @@ AdvancedEditor=高度なエディタ ActivateFCKeditor=のための高度なエディタをアクティブにする。 FCKeditorForCompany=要素の説明と注意事項のWYSIWIGエディタの作成/版 ( 製品/サービスを除く ) FCKeditorForProduct=製品/サービスの説明と注意事項のWYSIWIGエディタの作成/版 -FCKeditorForProductDetails=WYSIWIGによる製品の作成/エディションは、すべてのエンティティ ( 提案、注文、請求書など ) の詳細行を示する。 警告：この場合にこのオプションを使用することは、PDFファイルを作成するときに特殊文字やページの書式設定で問題が発生する可能性があるため、真剣に推奨されない。 +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= 郵送のWYSIWIGエディタの作成/版 FCKeditorForUserSignature=WYSIWIGによるユーザ署名の作成/編集 FCKeditorForMail=すべてのメールのWYSIWIG作成/エディション ( 【ツール】-> 【電子メール】を除く ) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=イベント作成フォームでイベントの AGENDA_DEFAULT_FILTER_TYPE=アジェンダビューの検索フィルターでこの種別のイベントを自動的に設定する AGENDA_DEFAULT_FILTER_STATUS=アジェンダビューの検索フィルターでイベントのこのステータスを自動的に設定する AGENDA_DEFAULT_VIEW=メニューの議題を選択するときに、デフォルトでどのビューを開くか -AGENDA_REMINDER_EMAIL=電子メールでイベントリマインダーを有効にする ( リマインダーオプション/遅延は各イベントで定義できる ) 。注：モジュール %s を有効にして、正しい頻度でリマインダーを送信するように正しく設定する必要がある。 -AGENDA_REMINDER_BROWSER=ユーザのブラウザでイベントリマインダーを有効にする ( イベントの日付に達すると、各ユーザはブラウザの確認の質問からこれを拒否できる ) +AGENDA_REMINDER_BROWSER=ユーザーのブラウザでイベントリマインダーを有効にする（リマインダーの日付に達すると、ブラウザにポップアップが表示される。各ユーザーは、ブラウザの通知設定からそのような通知を無効にできる）。 AGENDA_REMINDER_BROWSER_SOUND=音声通知を有効にする +AGENDA_REMINDER_EMAIL=電子メールでイベントリマインダーを有効にする（リマインダーオプション/遅延は各イベントで定義できる）。 +AGENDA_REMINDER_EMAIL_NOTE=注：タスク%sの頻度は、リマインダーが正しいタイミングで送信されることを確認するのに十分でなければならない。 AGENDA_SHOW_LINKED_OBJECT=リンクされたオブジェクトを議題ビューに表示する ##### Clicktodial ##### ClickToDialSetup=モジュールの設定をダイヤルする】をクリックする diff --git a/htdocs/langs/ja_JP/banks.lang b/htdocs/langs/ja_JP/banks.lang index 3bacdce2be5..c04eea05179 100644 --- a/htdocs/langs/ja_JP/banks.lang +++ b/htdocs/langs/ja_JP/banks.lang @@ -179,3 +179,4 @@ BankColorizeMovement=移動に色を付ける BankColorizeMovementDesc=この機能が有効になっている場合は、借方または貸方の移動に特定の背景色を選択できます BankColorizeMovementName1=借方移動の背景色 BankColorizeMovementName2=クレジット移動の背景色 +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/ja_JP/categories.lang b/htdocs/langs/ja_JP/categories.lang index f6dfbacc7e2..f3d63b0723d 100644 --- a/htdocs/langs/ja_JP/categories.lang +++ b/htdocs/langs/ja_JP/categories.lang @@ -81,6 +81,8 @@ CategoriesSetup=タグ/カテゴリの設定 CategorieRecursiv=親タグ/カテゴリと自動的にリンクする CategorieRecursivHelp=オプションがオンの場合、製品をサブカテゴリに追加すると、製品も親カテゴリに追加される。 AddProductServiceIntoCategory=次の製品/サービスを追加する +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=タグ/カテゴリを表示 ByDefaultInList=デフォルトでリストに ChooseCategory=カテゴリを選択 diff --git a/htdocs/langs/ja_JP/companies.lang b/htdocs/langs/ja_JP/companies.lang index 62ead20ff0a..4296d39f2dd 100644 --- a/htdocs/langs/ja_JP/companies.lang +++ b/htdocs/langs/ja_JP/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=職 Id 1 (USt.-IdNr) ProfId2AT=職 Id 2 (USt.-Nr) ProfId3AT=職 Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI番号 ProfId6AT=- ProfId1AU=職 Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=職 Id 1 (Professional number) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI番号 ProfId6BE=- ProfId1BR=- ProfId2BR=IE (国家登録) @@ -144,11 +144,11 @@ ProfId3BR=IM (市営登録) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-番号 ProfId2CH=- ProfId3CH=職 Id 1 (Federal number) ProfId4CH=職 Id 2 (Commercial Record number) -ProfId5CH=- +ProfId5CH=EORI番号 ProfId6CH=- ProfId1CL=職 Id 1 (R.U.T.) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=職 Id 1 (USt.-IdNr) ProfId2DE=職 Id 2 (USt.-Nr) ProfId3DE=職 Id 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI番号 ProfId6DE=- ProfId1ES=職 Id 1 (CIF/NIF) ProfId2ES=職 Id 2 (Social security number) ProfId3ES=職 Id 3 (CNAE) ProfId4ES=職 Id 4 (Collegiate number) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=職 Id 1 (SIREN) ProfId2FR=職 Id 2 (SIRET) ProfId3FR=職 Id 3 (NAF, old APE) ProfId4FR=職 Id 4 (RCS/RM) -ProfId5FR=教授はID 5 +ProfId5FR=EORI番号 ProfId6FR=- ProfId1GB=登録番号 ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=職 Id 3 (SRVC TAX) ProfId4IN=職 Id 4 ProfId5IN=職 Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI番号 ProfId1LU=Id. 職 1 (R.C.S. Luxembourg) ProfId2LU=Id. 職 2 (Business permit) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI番号 ProfId6LU=- ProfId1MA=Id. 職 1 (R.C.) ProfId2MA=Id. 職 2 (Patente) ProfId3MA=Id. 職 3 (I.F.) ProfId4MA=Id. 職 4 (C.N.S.S.) -ProfId5MA=Id. 職 5 (I.C.E.) +ProfId5MA=Id 職 5 (I.C.E.) ProfId6MA=- ProfId1MX=職 Id 1 (R.F.C). ProfId2MX=職 Id 2 (R..P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK nummer ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=EORI番号 ProfId6NL=- ProfId1PT=職 Id 1 (NIPC) ProfId2PT=職 Id 2 (Social security number) ProfId3PT=職 Id 3 (Commercial Record number) ProfId4PT=職 Id 4 (Conservatory) -ProfId5PT=- +ProfId5PT=EORI番号 ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=職 Id 1 (CUI) ProfId2RO=職 Id 2 (Nr. Înmatriculare) ProfId3RO=職 Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=職 Id 5 (EUID) +ProfId4RO=職 Id 5 (EUID) +ProfId5RO=EORI番号 ProfId6RO=- ProfId1RU=職 Id 1 (OGRN) ProfId2RU=職 Id 2 (INN) diff --git a/htdocs/langs/ja_JP/hrm.lang b/htdocs/langs/ja_JP/hrm.lang index e7cd1a4f1b8..4b9b1edd9d3 100644 --- a/htdocs/langs/ja_JP/hrm.lang +++ b/htdocs/langs/ja_JP/hrm.lang @@ -3,16 +3,17 @@ HRM_EMAIL_EXTERNAL_SERVICE=HRM外部サービスを防止するためのメール Establishments=事業所 Establishment=事業所 -NewEstablishment=新しい事業所 +NewEstablishment=新規事業所 DeleteEstablishment=事業所を削除 -ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment? +ConfirmDeleteEstablishment=この事業所を削除したいのね、いいよね？ OpenEtablishment=事業所を開く CloseEtablishment=事業所を閉じる # Dictionary -DictionaryPublicHolidays=HRM - Public holidays -DictionaryDepartment=HRM - 部門リスト -DictionaryFunction=HRM - Job positions +DictionaryPublicHolidays=HRM - 祝祭日 +DictionaryDepartment=HRM - 部門一覧 +DictionaryFunction=HRM - 職位 # Module -Employees=従業員 +Employees=従業員s Employee=従業員 -NewEmployee=新しい従業員 +NewEmployee=新規従業員 +ListOfEmployees=List of employees diff --git a/htdocs/langs/ja_JP/languages.lang b/htdocs/langs/ja_JP/languages.lang index ca9614afe50..99d0e3d3fbb 100644 --- a/htdocs/langs/ja_JP/languages.lang +++ b/htdocs/langs/ja_JP/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=スペイン語 (パナマ) Language_es_PY=スペイン語（パラグアイ） Language_es_PE=スペイン語（ペルー） Language_es_PR=スペイン語（プエルトリコ） +Language_es_US=Spanish (USA) Language_es_UY=スペイン語（ウルグアイ） Language_es_GT=スペイン語（グアテマラ） Language_es_VE=スペイン語 (ベネズエラ) diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang index c8932af0d28..3612332cbff 100644 --- a/htdocs/langs/ja_JP/main.lang +++ b/htdocs/langs/ja_JP/main.lang @@ -197,6 +197,7 @@ ReOpen=再オープン Upload=アップロード ToLink=リンク Select=選択する +SelectAll=すべて選択 Choose=選択する Resize=サイズを変更する ResizeOrCrop=サイズ変更またはトリミング @@ -257,6 +258,7 @@ Cards=カード Card=カード Now=現在 HourStart=開始時間 +Deadline=Deadline Date=日付 DateAndHour=日付と時間 DateToday=今日の日付 @@ -265,8 +267,10 @@ DateStart=開始日 DateEnd=終了日 DateCreation=作成日 DateCreationShort=クリート。日付 +IPCreation=Creation IP DateModification=変更日 DateModificationShort=MODIF。日付 +IPModification=Modification IP DateLastModification=最新の変更日 DateValidation=検証日 DateClosing=日付を閉じる @@ -1102,3 +1106,4 @@ SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=セキュリティト UpToDate=最新の OutOfDate=時代遅れ EventReminder=イベントリマインダー +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/ja_JP/mrp.lang b/htdocs/langs/ja_JP/mrp.lang index a1d3c20a558..d783dd432ac 100644 --- a/htdocs/langs/ja_JP/mrp.lang +++ b/htdocs/langs/ja_JP/mrp.lang @@ -77,3 +77,4 @@ UnitCost=単価 TotalCost=総費用 BOMTotalCost=消費する各数量と製品のコストに基づいてこのBOMを生成するためのコスト（定義されている場合は原価、定義されている場合は平均加重価格、それ以外の場合は最良の購入価格を使用） GoOnTabProductionToProduceFirst=製造指図を閉じるには、最初に製造を開始しておく必要がある（タブ '%s'を参照）。ただし、キャンセルすることはできる。 +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/ja_JP/website.lang b/htdocs/langs/ja_JP/website.lang index 0d68e3cf38a..2553493c60a 100644 --- a/htdocs/langs/ja_JP/website.lang +++ b/htdocs/langs/ja_JP/website.lang @@ -1,137 +1,139 @@ # Dolibarr language file - Source file is en_US - website Shortname=コー​​ド -WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them. +WebsiteSetupDesc=使用したいウェブサイトをここに作成する。次に、メニューのWebサイトに移動して編集する。 DeleteWebsite=ウェブサイトを削除 -ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain. -WEBSITE_TYPE_CONTAINER=Type of page/container -WEBSITE_PAGE_EXAMPLE=Web page to use as example -WEBSITE_PAGENAME=Page name/alias -WEBSITE_ALIASALT=Alternative page names/aliases -WEBSITE_ALIASALTDesc=Use here list of other name/aliases so the page can also be accessed using this other names/aliases (for example the old name after renaming the alias to keep backlink on old link/name working). Syntax is:
alternativename1, alternativename2, ... -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=Website .htaccess file -WEBSITE_MANIFEST_JSON=Website manifest.json file -WEBSITE_README=README.md file -WEBSITE_KEYWORDSDesc=Use a comma to separate values -EnterHereLicenseInformation=Enter here meta data or license information to fille a README.md file. if you distribute your website as a template, the file will be included into the temptate package. -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 website properties -EditMenu=Edit menu -EditMedias=Edit medias -EditPageMeta=Edit page/container properties -EditInLine=Edit inline -AddWebsite=Add website -Webpage=Web page/container -AddPage=Add page/container -HomePage=Home Page -PageContainer=Page/container -PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. -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. -SiteDeleted=Web site '%s' deleted -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 +ConfirmDeleteWebsite=このWebサイトを削除してもよいか？そのすべてのページとコンテンツも削除される。アップロードされたファイル（メディアディレクトリ、ECMモジュールなど）は残る。 +WEBSITE_TYPE_CONTAINER=ページ/コンテナのタイプ +WEBSITE_PAGE_EXAMPLE=例として使用するWebページ +WEBSITE_PAGENAME=ページ名/エイリアス +WEBSITE_ALIASALT=代替ページ名/エイリアス +WEBSITE_ALIASALTDesc=他の名前/エイリアスのリストをここで使用して、この他の名前/エイリアスを使用してページにアクセスできるようにする（たとえば、古いリンク/名前のバックリンクを機能させるためにエイリアスの名前を変更した後の古い名前）。構文は次のとおり。
alternativename1、alternativename2、..。 +WEBSITE_CSS_URL=外部CSSファイルのURL +WEBSITE_CSS_INLINE=CSSファイルの内容（すべてのページに共通） +WEBSITE_JS_INLINE=Javascriptファイルの内容（すべてのページに共通） +WEBSITE_HTML_HEADER=HTMLヘッダーの下部に追加（すべてのページに共通） +WEBSITE_ROBOT=ロボットファイル（robots.txt） +WEBSITE_HTACCESS=ウェブサイトの.htaccessファイル +WEBSITE_MANIFEST_JSON=ウェブサイトmanifest.jsonファイル +WEBSITE_README=README.mdファイル +WEBSITE_KEYWORDSDesc=値を区切るにはコンマを使用する +EnterHereLicenseInformation=ここにメタデータまたはライセンス情報を入力して、README.mdファイルに入力する。ウェブサイトをテンプレートとして配布する場合、ファイルは誘惑パッケージに含まれる。 +HtmlHeaderPage=HTMLヘッダー（このページにのみ固有） +PageNameAliasHelp=ページの名前またはエイリアス。
このエイリアスは、WebサイトがWebサーバーの仮想ホスト（Apacke、Nginxなど）から実行されるときにSEOURLを偽造するためにも使用される。このエイリアスを編集するには、ボタン「%s」を使用する。 +EditTheWebSiteForACommonHeader=注：すべてのページにパーソナライズされたヘッダーを定義する場合は、ページ/コンテナーではなくサイトレベルでヘッダーを編集する。 +MediaFiles=メディアライブラリ +EditCss=Webサイトのプロパティを編集する +EditMenu=編集メニュー +EditMedias=メディアを編集する +EditPageMeta=ページ/コンテナのプロパティを編集する +EditInLine=インライン編集 +AddWebsite=ウェブサイトを追加 +Webpage=Webページ/コンテナ +AddPage=ページ/コンテナを追加 +HomePage=ホームページ +PageContainer=ページ +PreviewOfSiteNotYetAvailable=あなたのウェブサイトのプレビュー%sはまだ利用できません。最初に「完全なWebサイトテンプレート」をインポートするか、「ページ/コンテナ」を追加する必要がある。 +RequestedPageHasNoContentYet=ID %sの要求されたページにまだコンテンツがないか、キャッシュファイル.tpl.phpが削除された。これを解決するには、ページのコンテンツを編集すること。 +SiteDeleted=Webサイト '%s'が削除された +PageContent=ページ/コンテネア +PageDeleted=ウェブサイト%sのページ/ Contenair'%s 'が削除された +PageAdded=ページ/ Contenair'%s 'が追加された +ViewSiteInNewTab=新しいタブでサイトを表示 +ViewPageInNewTab=新しいタブでページを表示 SetAsHomePage=ホームページに設定する -RealURL=Real URL -ViewWebsiteInProduction=View web site using home URLs -SetHereVirtualHost=Use with Apache/NGinx/...
Create on your web server (Apache, Nginx, ...) a dedicated Virtual Host with PHP enabled and a Root directory on
%s -ExampleToUseInApacheVirtualHostConfig=Example to use in Apache virtual host setup: -YouCanAlsoTestWithPHPS=Use with PHP embedded server
On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running
php -S 0.0.0.0:8080 -t %s -YouCanAlsoDeployToAnotherWHP=Run your web site with another Dolibarr Hosting provider
If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on https://saas.dolibarr.org -CheckVirtualHostPerms=Check also that virtual host has permission %s on files into
%s +RealURL=実際のURL +ViewWebsiteInProduction=ホームURLを使用してWebサイトを表示する +SetHereVirtualHost=Apache/NGinx/...で使用
専用の仮想ホストをWEBサーバ (Apache, Nginx, ...) 上に作成し、PHP 使用可で、ルートディレクトリを以下に指定する
%s +ExampleToUseInApacheVirtualHostConfig=Apache仮想ホストのセットアップで使用する例： +YouCanAlsoTestWithPHPS=PHP組み込みサーバーでの使用
開発環境では、 PHP組み込みWebサーバ (PHP 5.5 が必要) でサイトをテストするのが都合がいいなら、次のコマンドを動かす
php -S 0.0.0.0:8080 -t %s +YouCanAlsoDeployToAnotherWHP= 別のDolibarrホスティングプロバイダーでWebサイトを実行する
インターネット上でApacheやNGinxなどのWebサーバーを利用できない場合は、完全なDolibarrホスティングプロバイダーが提供する別のDolibarrインスタンスにWebサイトをエクスポートおよびインポートできる。ウェブサイトモジュールとの統合。いくつかのDolibarrホスティングプロバイダーのリストは、 https：//saas.dolibarr.orgにある。 +CheckVirtualHostPerms=また、仮想ホストが
%sへのファイルに対する権限%sを持っていることを確認すること。 ReadPerm=読む -WritePerm=Write -TestDeployOnWeb=Test/deploy on web -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 -YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template -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, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.

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

You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):
<?php redirectToContainer('alias_of_container_to_redirect_to'); ?>

To add a link to another page, use the syntax:
<a href="alias_of_page_to_link_to.php">mylink<a>

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 directory for public access), syntax is:
<img src="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
+WritePerm=書く +TestDeployOnWeb=Webでのテスト/デプロイ +PreviewSiteServedByWebServer=新しいタブで %s をプレビュー。

%s は、外部Webサーバ (Apache, Nginx, IIS など) から提供される。 以下のディレクトリを指定するには、当該サーバをインストールして設定する必要あり:
%s
URL は外部サーバ:
%s による +PreviewSiteServedByDolibarr= 新しいタブで%sをプレビューする。

%sはDolibarrサーバーによって提供されるため、追加のWebサーバー（Apache、Nginx、IISなど）をインストールする必要はない。
不便なのは、ページのURLがユーザーフレンドリーではなく、Dolibarrのパスで始まること。 URL
Dolibarrによって提供：
%s

ディレクトリ
%s
上のポイントは、この仮想サーバーの名前を入力するWebサーバー上の仮想ホストを作成し、このウェブサイトを提供するために、独自の外部Webサーバーを使用するには他のプレビューボタンをクリックする。 +VirtualHostUrlNotDefined=外部Webサーバーによって提供される仮想ホストのURLが定義されていない +NoPageYet=まだページはない +YouCanCreatePageOrImportTemplate=新しいページを作成するか、完全なWebサイトテンプレートをインポートできる +SyntaxHelp=特定の構文のヒントに関するヘルプ +YouCanEditHtmlSourceckeditor=エディタの "ソース" ボタンを使用して、HTMLソースコードを編集できる。 +YouCanEditHtmlSource=
タグ <?php ?> を使用して、当該ソースにPHPコードを含めることができる。次のグローバル変数が使用できる: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.

以下の構文を使用して、別のページ/コンテナーのコンテンツを含めることもできる:
<?php includeContainer('alias_of_container_to_include'); ?>

以下の構文で別のページ/コンテナへのリダイレクトを行うことができる（注：リダイレクト前には、いかなるコンテンツも出力しないこと） :
<?php redirectToContainer('alias_of_container_to_redirect_to'); ?>

別のページへのリンクを追加するには、以下の構文:
<a href="alias_of_page_to_link_to.php">mylink<a>

含めるのが ダウンロードリンク で、ファイル保管場所が documents ディレクトリなら、使うのは document.php ラッパー:
例、ファイルを documents/ecm (ログ記録が必須) に置くなら、構文は:
<a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
ファイルを documents/medias (パブリックアクセス用のオープンディレクトリ) に置くなら、構文は:
<a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
ファイルを共有リンク (ファイルの共有ハッシュキーを使用したオープンアクセス) で共有するなら、構文は:
<a href="/document.php?hashp=publicsharekeyoffile">

含めるのが 画像 で、保管先が documents ディレクトリなら、使うのは viewimage.php ラッパー:
例、画像を documents/medias (パブリックアクセス用のオープンディレクトリ) に置くなら、構文は:
<img src="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
#YouCanEditHtmlSource2=
To include a image shared publicaly, use the viewimage.php wrapper:
Example with a shared key 123456789, syntax is:
<img src="/viewimage.php?hashp=12345679012...">
-YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), syntax is:
<img src="/viewimage.php?hashp=12345679012...">
-YouCanEditHtmlSourceMore=
More examples of HTML or dynamic code available on the wiki documentation
. -ClonePage=Clone page/container -CloneSite=Clone site -SiteAdded=Website 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 page from scratch or from a page template... -FetchAndCreate=Fetch and Create -ExportSite=Export website -ImportSite=Import website template -IDOfPage=Id of page -Banner=Banner -BlogPost=Blog post -WebsiteAccount=Website account -WebsiteAccounts=Website accounts -AddWebsiteAccount=Create web site account -BackToListForThirdParty=Back to list for the third-party -DisableSiteFirst=Disable website first -MyContainerTitle=My web site title -AnotherContainer=This is how to include content of another page/container (you may have an error here if you enable dynamic code because the embedded subcontainer may not exists) -SorryWebsiteIsCurrentlyOffLine=Sorry, this website is currently off line. Please comme back later... -WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table -WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / third party -YouMustDefineTheHomePage=You must first define the default Home page -OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved for experienced users. Depending on the complexity of source page, the result of importation may differ from the original. Also if the source page uses common CSS styles or conflicting javascript, it may break the look or features of the Website editor when working on this page. This method is a quicker way to create a page but it is recommended to create your new page from scratch or from a suggested page template.
Note also that the inline editor may not works correclty when used on a grabbed external page. -OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site -GrabImagesInto=Grab also images found into css and page. -ImagesShouldBeSavedInto=Images should be saved into directory -WebsiteRootOfImages=Root directory for website images -SubdirOfPage=Sub-directory dedicated to page -AliasPageAlreadyExists=Alias page %s already exists -CorporateHomePage=Corporate Home page -EmptyPage=Empty page -ExternalURLMustStartWithHttp=External URL must start with http:// or https:// -ZipOfWebsitePackageToImport=Upload the Zip file of the website template package -ZipOfWebsitePackageToLoad=or Choose an available embedded website template package -ShowSubcontainers=Include dynamic content -InternalURLOfPage=Internal URL of page -ThisPageIsTranslationOf=This page/container is a translation of -ThisPageHasTranslationPages=This page/container has translation -NoWebSiteCreateOneFirst=No website has been created yet. Create one first. -GoTo=Go to -DynamicPHPCodeContainsAForbiddenInstruction=You add dynamic PHP code that contains the PHP instruction '%s' that is forbidden by default as dynamic content (see hidden options WEBSITE_PHP_ALLOW_xxx to increase list of allowed commands). -NotAllowedToAddDynamicContent=You don't have permission to add or edit PHP dynamic content in websites. Ask permission or just keep code into php tags unmodified. -ReplaceWebsiteContent=Search or Replace website content -DeleteAlsoJs=Delete also all javascript files specific to this website? -DeleteAlsoMedias=Delete also all medias files specific to this website? -MyWebsitePages=My website pages -SearchReplaceInto=Search | Replace into -ReplaceString=New string -CSSContentTooltipHelp=Enter here CSS content. To avoid any conflict with the CSS of the application, be sure to prepend all declaration with the .bodywebsite class. For example:

#mycssselector, input.myclass:hover { ... }
must be
.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }

Note: If you have a large file without this prefix, you can use 'lessc' to convert it to append the .bodywebsite prefix everywhere. -LinkAndScriptsHereAreNotLoadedInEditor=Warning: This content is output only when site is accessed from a server. It is not used in Edit mode so if you need to load javascript files also in edit mode, just add your tag 'script src=...' into the page. -Dynamiccontent=Sample of a page with dynamic content -ImportSite=Import website template -EditInLineOnOff=Mode 'Edit inline' is %s -ShowSubContainersOnOff=Mode to execute 'dynamic content' is %s -GlobalCSSorJS=Global CSS/JS/Header file of web site -BackToHomePage=Back to home page... -TranslationLinks=Translation links -YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not available.
(ref=%s, type=%s, status=%s) -UseTextBetween5And70Chars=For good SEO practices, use a text between 5 and 70 characters -MainLanguage=Main language -OtherLanguages=Other languages -UseManifest=Provide a manifest.json file -PublicAuthorAlias=Public author alias -AvailableLanguagesAreDefinedIntoWebsiteProperties=Available languages are defined into website properties -ReplacementDoneInXPages=Replacement done in %s pages or containers +YouCanEditHtmlSource2=画像を共有リンク (ファイルの共有ハッシュキーを使用したオープンアクセス) で共有するなら、構文は:
<img src="/viewimage.php?hashp=12345679012...">
+YouCanEditHtmlSourceMore=
HTMLまたは動的コードのその他の例は、 the wiki documentation
で利用可能。 +ClonePage=クローンページ/コンテナ +CloneSite=クローンサイト +SiteAdded=ウェブサイトを追加 +ConfirmClonePage=新しいページのコード/エイリアスを入力し、それが複製されたページの翻訳であるかどうかを入力すること。 +PageIsANewTranslation=新しいページは現在のページの翻訳ですか？ +LanguageMustNotBeSameThanClonedPage=ページを翻訳として複製する。新しいページの言語は、ソースページの言語とは異なっている必要がある。 +ParentPageId=親ページID +WebsiteId=ウェブサイトID +CreateByFetchingExternalPage=外部URLからページをフェッチしてページ/コンテナを作成する... +OrEnterPageInfoManually=または、最初から、またはページテンプレートからページを作成する... +FetchAndCreate=フェッチして作成 +ExportSite=ウェブサイトをエクスポート +ImportSite=ウェブサイトテンプレートをインポートする +IDOfPage=ページのID +Banner=バナー +BlogPost=ブログ投稿 +WebsiteAccount=ウェブサイトアカウント +WebsiteAccounts=ウェブサイトアカウント +AddWebsiteAccount=Webサイトアカウントを作成する +BackToListForThirdParty=サードパーティのリストに戻る +DisableSiteFirst=最初にウェブサイトを無効にする +MyContainerTitle=私のウェブサイトのタイトル +AnotherContainer=これは、別のページ/コンテナのコンテンツを含める方法です（埋め込まれたサブコンテナが存在しない可能性があるため、動的コードを有効にすると、ここでエラーが発生する可能性がある） +SorryWebsiteIsCurrentlyOffLine=申し訳ないが、このウェブサイトは現在オフライン。後で戻ってきてください... +WEBSITE_USE_WEBSITE_ACCOUNTS=Webサイトのアカウントテーブルを有効にする +WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=テーブルを有効にして、各Webサイト/サードパーティのWebサイトアカウント（ログイン/パス）を保存する +YouMustDefineTheHomePage=最初にデフォルトのホームページを定義する必要がある +OnlyEditionOfSourceForGrabbedContentFuture=警告：外部WebページをインポートしてWebページを作成することは、経験豊富なユーザーのために予約されています。ソースページの複雑さによっては、インポートの結果が元のページと異なる場合がある。また、ソースページが一般的なCSSスタイルまたは競合するJavaScriptを使用している場合、このページで作業するときにWebサイトエディターの外観や機能が損なわれる可能性がある。この方法はページを作成するためのより迅速な方法ですが、最初から、または提案されたページテンプレートから新しいページを作成することをお勧めする。
取得した外部ページで使用すると、インラインエディタが正しく機能しない場合があることにも注意すること。 +OnlyEditionOfSourceForGrabbedContent=コンテンツが外部サイトから取得された場合は、HTMLソースのエディションのみが可能。 +GrabImagesInto=cssとページにある画像も取得する。 +ImagesShouldBeSavedInto=画像はディレクトリに保存する必要がある +WebsiteRootOfImages=ウェブサイト画像のルートディレクトリ +SubdirOfPage=ページ専用のサブディレクトリ +AliasPageAlreadyExists=エイリアスページ%sはすでに存在する +CorporateHomePage=企業ホームページ +EmptyPage=空のページ +ExternalURLMustStartWithHttp=外部URLは http:// または https:// で始まる必要がある +ZipOfWebsitePackageToImport=ウェブサイトテンプレートパッケージのZipファイルをアップロードする +ZipOfWebsitePackageToLoad=または利用可能な埋め込みWebサイトテンプレートパッケージを選択する +ShowSubcontainers=動的コンテンツを含める +InternalURLOfPage=ページの内部URL +ThisPageIsTranslationOf=このページ/コンテナはの翻訳です +ThisPageHasTranslationPages=このページ/コンテナには翻訳がある +NoWebSiteCreateOneFirst=ウェブサイトはまだ作成されていない。最初に作成する。 +GoTo=に移動 +DynamicPHPCodeContainsAForbiddenInstruction=動的コンテンツとしてデフォルトで禁止されているPHP命令 ' %s 'を含む動的PHPコードを追加する（許可されるコマンドのリストを増やすには、非表示のオプションWEBSITE_PHP_ALLOW_xxxを参照すること）。 +NotAllowedToAddDynamicContent=WebサイトでPHP動的コンテンツを追加または編集する権限がない。許可を求めるか、コードを変更せずにphpタグに入れること。 +ReplaceWebsiteContent=Webサイトのコンテンツを検索または置換する +DeleteAlsoJs=このウェブサイトに固有のすべてのJavaScriptファイルも削除するか？ +DeleteAlsoMedias=このウェブサイトに固有のすべてのメディアファイルも削除するか？ +MyWebsitePages=私のウェブサイトのページ +SearchReplaceInto=検索|に置き換える +ReplaceString=新しい文字列 +CSSContentTooltipHelp=ここにCSSコンテンツを入力する。アプリケーションのCSSとの競合を避けるために、すべての定義に .bodywebsite クラスを前置することが必須。例:

#mycssselector, input.myclass:hover { ... }
は、以下のようにする。
.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }

注記: もし大きなファイルでこの前置が無いものがあれば、 'lessc' を使用して .bodywebsite の前置をすべての場所に追加する変換ができる。 +LinkAndScriptsHereAreNotLoadedInEditor=警告：このコンテンツは、サーバーからサイトにアクセスした場合にのみ出力される。編集モードでは使用されないため、編集モードでもJavaScriptファイルをロードする必要がある場合は、タグ「scriptsrc = ...」をページに追加するだけ。 +Dynamiccontent=動的コンテンツを含むページのサンプル +ImportSite=ウェブサイトテンプレートをインポートする +EditInLineOnOff=モード「インライン編集」は%sです +ShowSubContainersOnOff=「動的コンテンツ」を実行するモードは%s。 +GlobalCSSorJS=WebサイトのグローバルCSS / JS /ヘッダーファイル +BackToHomePage=ホームページに戻る... +TranslationLinks=翻訳リンク +YouTryToAccessToAFileThatIsNotAWebsitePage=利用できないページにアクセスしようとしました。
（ref = %s、type = %s、status = %s） +UseTextBetween5And70Chars=SEOを適切に実践するには、5〜70文字のテキストを使用する +MainLanguage=主な言語 +OtherLanguages=他の言語 +UseManifest=マニフェスト.jsonファイルを提供する +PublicAuthorAlias=公開著者エイリアス +AvailableLanguagesAreDefinedIntoWebsiteProperties=利用可能な言語はウェブサイトのプロパティに定義されています +ReplacementDoneInXPages=%sページまたはコンテナで行われた交換 RSSFeed=RSSフィード -RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL -PagesRegenerated=%s page(s)/container(s) regenerated +RSSFeedDesc=このURLを使用して、タイプ「blogpost」の最新記事のRSSフィードを取得できる。 +PagesRegenerated=%sページ(s)/コンテナ(s)が再生成された +RegenerateWebsiteContent=Webサイトのキャッシュファイルを再生成する +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/ka_GE/accountancy.lang b/htdocs/langs/ka_GE/accountancy.lang index 7b59e33b296..3211a0b62df 100644 --- a/htdocs/langs/ka_GE/accountancy.lang +++ b/htdocs/langs/ka_GE/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Default for service DefaultForProduct=Default for product CantSuggest=Can't suggest AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s -ConfigAccountingExpert=Configuration of the module accounting expert +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Journalization -Journaux=Journals +Journals=Journals JournalFinancial=Financial journals BackToChartofaccounts=Return chart of accounts Chartofaccounts=Chart of accounts +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Current dedicated account AssignDedicatedAccountingAccount=New account to assign InvoiceLabel=Invoice label @@ -33,8 +35,8 @@ OtherInfo=Other information DeleteCptCategory=Remove accounting account from group ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group? JournalizationInLedgerStatus=Status of journalization -AlreadyInGeneralLedger=Already journalized in ledgers -NotYetInGeneralLedger=Not yet journalized in ledgers +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group DetailByAccount=Show detail by account AccountWithNonZeroValues=Accounts with non-zero values @@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC CountriesNotInEEC=Countries not in EEC CountriesInEECExceptMe=Countries in EEC except %s CountriesExceptMe=All countries except %s -AccountantFiles=Export accounting documents +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup @@ -79,7 +83,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) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Select active chart of accounts ChangeAndLoad=Change and load Addanaccount=Add an accounting account @@ -89,6 +93,8 @@ SubledgerAccount=Subledger account SubledgerAccountLabel=Subledger account label ShowAccountingAccount=Show accounting account ShowAccountingJournal=Show accounting journal +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Accounting account suggested MenuDefaultAccounts=Default accounts MenuBankAccounts=Bank accounts @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding CreateMvts=Create new transaction UpdateMvts=Modification of a transaction ValidTransaction=Validate transaction -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=Ledger +BookkeepingSubAccount=Subledger AccountBalance=Account balance ObjectsRef=Source object ref CAHTF=Total purchase vendor before tax @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Sell journal ACCOUNTING_PURCHASE_JOURNAL=Purchase journal @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups ByYear=By year NotMatch=Not Set -DeleteMvt=Delete Ledger lines +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=Year to delete DelJournal=Journal to delete -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Finance journal ExpenseReportsJournal=Expense reports journal DescFinanceJournal=Finance journal including all the types of payments by bank account -DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Account for VAT not defined ThirdpartyAccountNotDefined=Account for third party not defined ProductAccountNotDefined=Account for product not defined @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu %s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Export draft journal @@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Chart of accounts Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang index 0d3a7174232..f1c41a3b62b 100644 --- a/htdocs/langs/ka_GE/admin.lang +++ b/htdocs/langs/ka_GE/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=Edition of field %s FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=LDAP Setup LDAPGlobalParameters=Global parameters @@ -1670,7 +1672,7 @@ AdvancedEditor=Advanced editor ActivateFCKeditor=Activate advanced editor for: FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services) FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing) FCKeditorForUserSignature=WYSIWIG creation/edition of user signature FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting 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 user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup diff --git a/htdocs/langs/ka_GE/banks.lang b/htdocs/langs/ka_GE/banks.lang index 75f9549dca5..9500a5b8b2e 100644 --- a/htdocs/langs/ka_GE/banks.lang +++ b/htdocs/langs/ka_GE/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=Miscellaneous payments ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA mandate YourSEPAMandate=Your SEPA mandate FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/ka_GE/categories.lang b/htdocs/langs/ka_GE/categories.lang index 9bb71984ecf..ba37a43b4ec 100644 --- a/htdocs/langs/ka_GE/categories.lang +++ b/htdocs/langs/ka_GE/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup CategorieRecursiv=Link with parent tag/category automatically CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=Add the following product/service +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Show tag/category ByDefaultInList=By default in list ChooseCategory=Choose category -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/ka_GE/companies.lang b/htdocs/langs/ka_GE/companies.lang index 92674363ced..dadff6a7894 100644 --- a/htdocs/langs/ka_GE/companies.lang +++ b/htdocs/langs/ka_GE/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof Id 1 (Federal number) ProfId4CH=Prof Id 2 (Commercial Record number) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof Id 1 (R.U.T.) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr) ProfId2DE=Prof Id 2 (USt.-Nr) ProfId3DE=Prof Id 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof Id 1 (CIF/NIF) ProfId2ES=Prof Id 2 (Social security number) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (Collegiate number) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof Id 1 (SIREN) ProfId2FR=Prof Id 2 (SIRET) ProfId3FR=Prof Id 3 (NAF, old APE) ProfId4FR=Prof Id 4 (RCS/RM) -ProfId5FR=- +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Registration Number ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX) ProfId4IN=Prof Id 4 ProfId5IN=Prof Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Business permit) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (R.C.) ProfId2MA=Id prof. 2 (Patente) ProfId3MA=Id prof. 3 (I.F.) ProfId4MA=Id prof. 4 (C.N.S.S.) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof Id 1 (R.F.C). ProfId2MX=Prof Id 2 (R..P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK nummer ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof Id 2 (Social security number) ProfId3PT=Prof Id 3 (Commercial Record number) ProfId4PT=Prof Id 4 (Conservatory) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof Id 1 (OGRN) ProfId2RU=Prof Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s). NorProspectNorCustomer=Not prospect, nor customer JuridicalStatus=Legal Entity Type +Workforce=Workforce Staff=Employees ProspectLevelShort=Potential ProspectLevel=Prospect potential @@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor PaymentTypeBoth=Payment Type - Customer and Vendor MulticurrencyUsed=Use Multicurrency MulticurrencyCurrency=Currency +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/ka_GE/hrm.lang b/htdocs/langs/ka_GE/hrm.lang index 6cc7f6bef24..3b8f137e103 100644 --- a/htdocs/langs/ka_GE/hrm.lang +++ b/htdocs/langs/ka_GE/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=Employees Employee=Employee NewEmployee=New employee +ListOfEmployees=List of employees diff --git a/htdocs/langs/ka_GE/languages.lang b/htdocs/langs/ka_GE/languages.lang index cc80b9f1719..ba187326705 100644 --- a/htdocs/langs/ka_GE/languages.lang +++ b/htdocs/langs/ka_GE/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Spanish (Paraguay) Language_es_PE=Spanish (Peru) Language_es_PR=Spanish (Puerto Rico) +Language_es_US=Spanish (USA) Language_es_UY=Spanish (Uruguay) Language_es_GT=Spanish (Guatemala) Language_es_VE=Spanish (Venezuela) diff --git a/htdocs/langs/ka_GE/main.lang b/htdocs/langs/ka_GE/main.lang index 0af5c66f0e0..96c68cdcfa3 100644 --- a/htdocs/langs/ka_GE/main.lang +++ b/htdocs/langs/ka_GE/main.lang @@ -155,6 +155,7 @@ RemoveLink=Remove link AddToDraft=Add to draft Update=Update Close=Close +CloseAs=Set status to CloseBox=Remove widget from your dashboard Confirm=Confirm ConfirmSendCardByMail=Do you really want to send the content of this card by mail to %s? @@ -196,6 +197,7 @@ ReOpen=Re-Open Upload=Upload ToLink=Link Select=Select +SelectAll=Select all Choose=Choose Resize=Resize ResizeOrCrop=Resize or Crop @@ -256,6 +258,7 @@ Cards=Cards Card=Card Now=Now HourStart=Start hour +Deadline=Deadline Date=Date DateAndHour=Date and hour DateToday=Today's date @@ -264,8 +267,10 @@ DateStart=Start date DateEnd=End date DateCreation=Creation date DateCreationShort=Creat. date +IPCreation=Creation IP DateModification=Modification date DateModificationShort=Modif. date +IPModification=Modification IP DateLastModification=Latest modification date DateValidation=Validation date DateClosing=Closing date @@ -319,6 +324,7 @@ Morning=Morning Afternoon=Afternoon Quadri=Quadri MonthOfDay=Month of the day +DaysOfWeek=Days of week HourShort=H MinuteShort=mn Rate=Rate @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency MulticurrencyAmountHT=Amount (excl. tax), original currency MulticurrencyAmountTTC=Amount (inc. of tax), original currency MulticurrencyAmountVAT=Amount tax, original currency +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Amount tax 2 AmountLT2=Amount tax 3 AmountLT1ES=Amount RE @@ -487,6 +494,7 @@ By=By From=From FromDate=From FromLocation=From +at=at to=to To=to and=and @@ -509,6 +517,7 @@ Draft=Draft Drafts=Drafts StatusInterInvoiced=Invoiced Validated=Validated +ValidatedToProduce=Validated (To produce) Opened=Open OpenAll=Open (All) ClosedAll=Closed (All) @@ -655,6 +664,7 @@ Response=Response Priority=Priority SendByMail=Send by email MailSentBy=Email sent by +NotSent=Not sent TextUsedInTheMessageBody=Email body SendAcknowledgementByMail=Send confirmation email SendMail=Send email @@ -836,6 +846,7 @@ ListOfTemplates=List of templates Gender=Gender Genderman=Man Genderwoman=Woman +Genderother=Other ViewList=List view ViewGantt=Gantt view ViewKanban=Kanban view @@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous Calendar=Calendar GroupBy=Group by... ViewFlatList=View flat list +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Remove string '%s' SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at https://transifex.com/projects/p/dolibarr/ to add your improvements. DirectDownloadLink=Direct download link (public/external) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments SearchIntoExpenseReports=Expense reports SearchIntoLeaves=Leave SearchIntoTickets=Tickets +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Vendor payments +SearchIntoMiscPayments=Miscellaneous payments CommentLink=Comments NbComments=Number of comments CommentPage=Comments space @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Information Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Date of birth +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/ka_GE/mrp.lang b/htdocs/langs/ka_GE/mrp.lang index 863793063a0..f018be890cc 100644 --- a/htdocs/langs/ka_GE/mrp.lang +++ b/htdocs/langs/ka_GE/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/ka_GE/website.lang b/htdocs/langs/ka_GE/website.lang index 4b5294d5e43..03e042e4be6 100644 --- a/htdocs/langs/ka_GE/website.lang +++ b/htdocs/langs/ka_GE/website.lang @@ -31,7 +31,7 @@ AddWebsite=Add website Webpage=Web page/container AddPage=Add page/container HomePage=Home Page -PageContainer=Page/container +PageContainer=Page PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. 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. SiteDeleted=Web site '%s' deleted @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=RSS Feed RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/km_KH/accountancy.lang b/htdocs/langs/km_KH/accountancy.lang index 7b59e33b296..3211a0b62df 100644 --- a/htdocs/langs/km_KH/accountancy.lang +++ b/htdocs/langs/km_KH/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Default for service DefaultForProduct=Default for product CantSuggest=Can't suggest AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s -ConfigAccountingExpert=Configuration of the module accounting expert +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Journalization -Journaux=Journals +Journals=Journals JournalFinancial=Financial journals BackToChartofaccounts=Return chart of accounts Chartofaccounts=Chart of accounts +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Current dedicated account AssignDedicatedAccountingAccount=New account to assign InvoiceLabel=Invoice label @@ -33,8 +35,8 @@ OtherInfo=Other information DeleteCptCategory=Remove accounting account from group ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group? JournalizationInLedgerStatus=Status of journalization -AlreadyInGeneralLedger=Already journalized in ledgers -NotYetInGeneralLedger=Not yet journalized in ledgers +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group DetailByAccount=Show detail by account AccountWithNonZeroValues=Accounts with non-zero values @@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC CountriesNotInEEC=Countries not in EEC CountriesInEECExceptMe=Countries in EEC except %s CountriesExceptMe=All countries except %s -AccountantFiles=Export accounting documents +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup @@ -79,7 +83,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) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Select active chart of accounts ChangeAndLoad=Change and load Addanaccount=Add an accounting account @@ -89,6 +93,8 @@ SubledgerAccount=Subledger account SubledgerAccountLabel=Subledger account label ShowAccountingAccount=Show accounting account ShowAccountingJournal=Show accounting journal +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Accounting account suggested MenuDefaultAccounts=Default accounts MenuBankAccounts=Bank accounts @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding CreateMvts=Create new transaction UpdateMvts=Modification of a transaction ValidTransaction=Validate transaction -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=Ledger +BookkeepingSubAccount=Subledger AccountBalance=Account balance ObjectsRef=Source object ref CAHTF=Total purchase vendor before tax @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Sell journal ACCOUNTING_PURCHASE_JOURNAL=Purchase journal @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups ByYear=By year NotMatch=Not Set -DeleteMvt=Delete Ledger lines +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=Year to delete DelJournal=Journal to delete -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Finance journal ExpenseReportsJournal=Expense reports journal DescFinanceJournal=Finance journal including all the types of payments by bank account -DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Account for VAT not defined ThirdpartyAccountNotDefined=Account for third party not defined ProductAccountNotDefined=Account for product not defined @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu %s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Export draft journal @@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Chart of accounts Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/km_KH/admin.lang b/htdocs/langs/km_KH/admin.lang index 0d3a7174232..f1c41a3b62b 100644 --- a/htdocs/langs/km_KH/admin.lang +++ b/htdocs/langs/km_KH/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=Edition of field %s FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=LDAP Setup LDAPGlobalParameters=Global parameters @@ -1670,7 +1672,7 @@ AdvancedEditor=Advanced editor ActivateFCKeditor=Activate advanced editor for: FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services) FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing) FCKeditorForUserSignature=WYSIWIG creation/edition of user signature FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting 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 user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup diff --git a/htdocs/langs/km_KH/banks.lang b/htdocs/langs/km_KH/banks.lang index 75f9549dca5..9500a5b8b2e 100644 --- a/htdocs/langs/km_KH/banks.lang +++ b/htdocs/langs/km_KH/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=Miscellaneous payments ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA mandate YourSEPAMandate=Your SEPA mandate FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/km_KH/categories.lang b/htdocs/langs/km_KH/categories.lang index 9bb71984ecf..ba37a43b4ec 100644 --- a/htdocs/langs/km_KH/categories.lang +++ b/htdocs/langs/km_KH/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup CategorieRecursiv=Link with parent tag/category automatically CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=Add the following product/service +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Show tag/category ByDefaultInList=By default in list ChooseCategory=Choose category -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/km_KH/companies.lang b/htdocs/langs/km_KH/companies.lang index 92674363ced..dadff6a7894 100644 --- a/htdocs/langs/km_KH/companies.lang +++ b/htdocs/langs/km_KH/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof Id 1 (Federal number) ProfId4CH=Prof Id 2 (Commercial Record number) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof Id 1 (R.U.T.) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr) ProfId2DE=Prof Id 2 (USt.-Nr) ProfId3DE=Prof Id 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof Id 1 (CIF/NIF) ProfId2ES=Prof Id 2 (Social security number) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (Collegiate number) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof Id 1 (SIREN) ProfId2FR=Prof Id 2 (SIRET) ProfId3FR=Prof Id 3 (NAF, old APE) ProfId4FR=Prof Id 4 (RCS/RM) -ProfId5FR=- +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Registration Number ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX) ProfId4IN=Prof Id 4 ProfId5IN=Prof Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Business permit) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (R.C.) ProfId2MA=Id prof. 2 (Patente) ProfId3MA=Id prof. 3 (I.F.) ProfId4MA=Id prof. 4 (C.N.S.S.) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof Id 1 (R.F.C). ProfId2MX=Prof Id 2 (R..P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK nummer ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof Id 2 (Social security number) ProfId3PT=Prof Id 3 (Commercial Record number) ProfId4PT=Prof Id 4 (Conservatory) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof Id 1 (OGRN) ProfId2RU=Prof Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s). NorProspectNorCustomer=Not prospect, nor customer JuridicalStatus=Legal Entity Type +Workforce=Workforce Staff=Employees ProspectLevelShort=Potential ProspectLevel=Prospect potential @@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor PaymentTypeBoth=Payment Type - Customer and Vendor MulticurrencyUsed=Use Multicurrency MulticurrencyCurrency=Currency +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/km_KH/hrm.lang b/htdocs/langs/km_KH/hrm.lang index 6cc7f6bef24..3b8f137e103 100644 --- a/htdocs/langs/km_KH/hrm.lang +++ b/htdocs/langs/km_KH/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=Employees Employee=Employee NewEmployee=New employee +ListOfEmployees=List of employees diff --git a/htdocs/langs/km_KH/languages.lang b/htdocs/langs/km_KH/languages.lang index cc80b9f1719..ba187326705 100644 --- a/htdocs/langs/km_KH/languages.lang +++ b/htdocs/langs/km_KH/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Spanish (Paraguay) Language_es_PE=Spanish (Peru) Language_es_PR=Spanish (Puerto Rico) +Language_es_US=Spanish (USA) Language_es_UY=Spanish (Uruguay) Language_es_GT=Spanish (Guatemala) Language_es_VE=Spanish (Venezuela) diff --git a/htdocs/langs/km_KH/main.lang b/htdocs/langs/km_KH/main.lang index 7f2168fdea2..68378c28883 100644 --- a/htdocs/langs/km_KH/main.lang +++ b/htdocs/langs/km_KH/main.lang @@ -155,6 +155,7 @@ RemoveLink=Remove link AddToDraft=Add to draft Update=Update Close=Close +CloseAs=Set status to CloseBox=Remove widget from your dashboard Confirm=Confirm ConfirmSendCardByMail=Do you really want to send the content of this card by mail to %s? @@ -196,6 +197,7 @@ ReOpen=Re-Open Upload=Upload ToLink=Link Select=Select +SelectAll=Select all Choose=Choose Resize=Resize ResizeOrCrop=Resize or Crop @@ -256,6 +258,7 @@ Cards=Cards Card=Card Now=Now HourStart=Start hour +Deadline=Deadline Date=Date DateAndHour=Date and hour DateToday=Today's date @@ -264,8 +267,10 @@ DateStart=Start date DateEnd=End date DateCreation=Creation date DateCreationShort=Creat. date +IPCreation=Creation IP DateModification=Modification date DateModificationShort=Modif. date +IPModification=Modification IP DateLastModification=Latest modification date DateValidation=Validation date DateClosing=Closing date @@ -319,6 +324,7 @@ Morning=Morning Afternoon=Afternoon Quadri=Quadri MonthOfDay=Month of the day +DaysOfWeek=Days of week HourShort=H MinuteShort=mn Rate=Rate @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency MulticurrencyAmountHT=Amount (excl. tax), original currency MulticurrencyAmountTTC=Amount (inc. of tax), original currency MulticurrencyAmountVAT=Amount tax, original currency +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Amount tax 2 AmountLT2=Amount tax 3 AmountLT1ES=Amount RE @@ -487,6 +494,7 @@ By=By From=From FromDate=From FromLocation=From +at=at to=to To=to and=and @@ -509,6 +517,7 @@ Draft=Draft Drafts=Drafts StatusInterInvoiced=Invoiced Validated=Validated +ValidatedToProduce=Validated (To produce) Opened=Open OpenAll=Open (All) ClosedAll=Closed (All) @@ -655,6 +664,7 @@ Response=Response Priority=Priority SendByMail=Send by email MailSentBy=Email sent by +NotSent=Not sent TextUsedInTheMessageBody=Email body SendAcknowledgementByMail=Send confirmation email SendMail=Send email @@ -836,6 +846,7 @@ ListOfTemplates=List of templates Gender=Gender Genderman=Man Genderwoman=Woman +Genderother=Other ViewList=List view ViewGantt=Gantt view ViewKanban=Kanban view @@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous Calendar=Calendar GroupBy=Group by... ViewFlatList=View flat list +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Remove string '%s' SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at https://transifex.com/projects/p/dolibarr/ to add your improvements. DirectDownloadLink=Direct download link (public/external) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments SearchIntoExpenseReports=Expense reports SearchIntoLeaves=Leave SearchIntoTickets=Tickets +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Vendor payments +SearchIntoMiscPayments=Miscellaneous payments CommentLink=Comments NbComments=Number of comments CommentPage=Comments space @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Information Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Date of birth +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/km_KH/mrp.lang b/htdocs/langs/km_KH/mrp.lang index 863793063a0..f018be890cc 100644 --- a/htdocs/langs/km_KH/mrp.lang +++ b/htdocs/langs/km_KH/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/km_KH/website.lang b/htdocs/langs/km_KH/website.lang index 4b5294d5e43..03e042e4be6 100644 --- a/htdocs/langs/km_KH/website.lang +++ b/htdocs/langs/km_KH/website.lang @@ -31,7 +31,7 @@ AddWebsite=Add website Webpage=Web page/container AddPage=Add page/container HomePage=Home Page -PageContainer=Page/container +PageContainer=Page PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. 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. SiteDeleted=Web site '%s' deleted @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=RSS Feed RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/kn_IN/accountancy.lang b/htdocs/langs/kn_IN/accountancy.lang index 7b59e33b296..3211a0b62df 100644 --- a/htdocs/langs/kn_IN/accountancy.lang +++ b/htdocs/langs/kn_IN/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Default for service DefaultForProduct=Default for product CantSuggest=Can't suggest AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s -ConfigAccountingExpert=Configuration of the module accounting expert +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Journalization -Journaux=Journals +Journals=Journals JournalFinancial=Financial journals BackToChartofaccounts=Return chart of accounts Chartofaccounts=Chart of accounts +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Current dedicated account AssignDedicatedAccountingAccount=New account to assign InvoiceLabel=Invoice label @@ -33,8 +35,8 @@ OtherInfo=Other information DeleteCptCategory=Remove accounting account from group ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group? JournalizationInLedgerStatus=Status of journalization -AlreadyInGeneralLedger=Already journalized in ledgers -NotYetInGeneralLedger=Not yet journalized in ledgers +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group DetailByAccount=Show detail by account AccountWithNonZeroValues=Accounts with non-zero values @@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC CountriesNotInEEC=Countries not in EEC CountriesInEECExceptMe=Countries in EEC except %s CountriesExceptMe=All countries except %s -AccountantFiles=Export accounting documents +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup @@ -79,7 +83,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) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Select active chart of accounts ChangeAndLoad=Change and load Addanaccount=Add an accounting account @@ -89,6 +93,8 @@ SubledgerAccount=Subledger account SubledgerAccountLabel=Subledger account label ShowAccountingAccount=Show accounting account ShowAccountingJournal=Show accounting journal +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Accounting account suggested MenuDefaultAccounts=Default accounts MenuBankAccounts=Bank accounts @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding CreateMvts=Create new transaction UpdateMvts=Modification of a transaction ValidTransaction=Validate transaction -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=Ledger +BookkeepingSubAccount=Subledger AccountBalance=Account balance ObjectsRef=Source object ref CAHTF=Total purchase vendor before tax @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Sell journal ACCOUNTING_PURCHASE_JOURNAL=Purchase journal @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups ByYear=By year NotMatch=Not Set -DeleteMvt=Delete Ledger lines +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=Year to delete DelJournal=Journal to delete -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Finance journal ExpenseReportsJournal=Expense reports journal DescFinanceJournal=Finance journal including all the types of payments by bank account -DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Account for VAT not defined ThirdpartyAccountNotDefined=Account for third party not defined ProductAccountNotDefined=Account for product not defined @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu %s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Export draft journal @@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Chart of accounts Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/kn_IN/admin.lang b/htdocs/langs/kn_IN/admin.lang index 1ac78cd5914..77951271212 100644 --- a/htdocs/langs/kn_IN/admin.lang +++ b/htdocs/langs/kn_IN/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=Edition of field %s FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=LDAP Setup LDAPGlobalParameters=Global parameters @@ -1670,7 +1672,7 @@ AdvancedEditor=Advanced editor ActivateFCKeditor=Activate advanced editor for: FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services) FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing) FCKeditorForUserSignature=WYSIWIG creation/edition of user signature FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting 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 user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup diff --git a/htdocs/langs/kn_IN/banks.lang b/htdocs/langs/kn_IN/banks.lang index 1b84f9236c9..b1816234c5a 100644 --- a/htdocs/langs/kn_IN/banks.lang +++ b/htdocs/langs/kn_IN/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=Miscellaneous payments ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA mandate YourSEPAMandate=Your SEPA mandate FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/kn_IN/categories.lang b/htdocs/langs/kn_IN/categories.lang index 9bb71984ecf..ba37a43b4ec 100644 --- a/htdocs/langs/kn_IN/categories.lang +++ b/htdocs/langs/kn_IN/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup CategorieRecursiv=Link with parent tag/category automatically CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=Add the following product/service +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Show tag/category ByDefaultInList=By default in list ChooseCategory=Choose category -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/kn_IN/companies.lang b/htdocs/langs/kn_IN/companies.lang index 0c231bd09df..5a13d292ec1 100644 --- a/htdocs/langs/kn_IN/companies.lang +++ b/htdocs/langs/kn_IN/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof Id 1 (Federal number) ProfId4CH=Prof Id 2 (Commercial Record number) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof Id 1 (R.U.T.) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr) ProfId2DE=Prof Id 2 (USt.-Nr) ProfId3DE=Prof Id 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof Id 1 (CIF/NIF) ProfId2ES=Prof Id 2 (Social security number) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (Collegiate number) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof Id 1 (SIREN) ProfId2FR=Prof Id 2 (SIRET) ProfId3FR=Prof Id 3 (NAF, old APE) ProfId4FR=Prof Id 4 (RCS/RM) -ProfId5FR=- +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=ನೋಂದಣಿ ಸಂಖ್ಯೆ ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=ವೃತ್ತಿಪರ ಗುರುತಿನ ಸಂಖ್ಯೆ 3 (S ProfId4IN=Prof Id 4 ProfId5IN=Prof Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Business permit) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (R.C.) ProfId2MA=Id prof. 2 (Patente) ProfId3MA=Id prof. 3 (I.F.) ProfId4MA=Id prof. 4 (C.N.S.S.) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof Id 1 (R.F.C). ProfId2MX=Prof Id 2 (R..P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK nummer ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof Id 2 (Social security number) ProfId3PT=Prof Id 3 (Commercial Record number) ProfId4PT=Prof Id 4 (Conservatory) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof Id 1 (OGRN) ProfId2RU=Prof Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s). NorProspectNorCustomer=Not prospect, nor customer JuridicalStatus=Legal Entity Type +Workforce=Workforce Staff=Employees ProspectLevelShort=ಸಂಭವನೀಯ ProspectLevel=ಸಂಭಾವ್ಯ ನಿರೀಕ್ಷಿತರು @@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor PaymentTypeBoth=Payment Type - Customer and Vendor MulticurrencyUsed=Use Multicurrency MulticurrencyCurrency=Currency +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/kn_IN/hrm.lang b/htdocs/langs/kn_IN/hrm.lang index 6cc7f6bef24..3b8f137e103 100644 --- a/htdocs/langs/kn_IN/hrm.lang +++ b/htdocs/langs/kn_IN/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=Employees Employee=Employee NewEmployee=New employee +ListOfEmployees=List of employees diff --git a/htdocs/langs/kn_IN/languages.lang b/htdocs/langs/kn_IN/languages.lang index cc80b9f1719..ba187326705 100644 --- a/htdocs/langs/kn_IN/languages.lang +++ b/htdocs/langs/kn_IN/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Spanish (Paraguay) Language_es_PE=Spanish (Peru) Language_es_PR=Spanish (Puerto Rico) +Language_es_US=Spanish (USA) Language_es_UY=Spanish (Uruguay) Language_es_GT=Spanish (Guatemala) Language_es_VE=Spanish (Venezuela) diff --git a/htdocs/langs/kn_IN/main.lang b/htdocs/langs/kn_IN/main.lang index aaf4819a944..9635417e322 100644 --- a/htdocs/langs/kn_IN/main.lang +++ b/htdocs/langs/kn_IN/main.lang @@ -155,6 +155,7 @@ RemoveLink=Remove link AddToDraft=Add to draft Update=Update Close=Close +CloseAs=Set status to CloseBox=Remove widget from your dashboard Confirm=Confirm ConfirmSendCardByMail=Do you really want to send the content of this card by mail to %s? @@ -196,6 +197,7 @@ ReOpen=Re-Open Upload=Upload ToLink=Link Select=Select +SelectAll=Select all Choose=Choose Resize=Resize ResizeOrCrop=Resize or Crop @@ -256,6 +258,7 @@ Cards=Cards Card=Card Now=Now HourStart=Start hour +Deadline=Deadline Date=Date DateAndHour=Date and hour DateToday=Today's date @@ -264,8 +267,10 @@ DateStart=Start date DateEnd=End date DateCreation=Creation date DateCreationShort=Creat. date +IPCreation=Creation IP DateModification=Modification date DateModificationShort=Modif. date +IPModification=Modification IP DateLastModification=Latest modification date DateValidation=Validation date DateClosing=Closing date @@ -319,6 +324,7 @@ Morning=Morning Afternoon=Afternoon Quadri=Quadri MonthOfDay=Month of the day +DaysOfWeek=Days of week HourShort=H MinuteShort=mn Rate=Rate @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency MulticurrencyAmountHT=Amount (excl. tax), original currency MulticurrencyAmountTTC=Amount (inc. of tax), original currency MulticurrencyAmountVAT=Amount tax, original currency +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Amount tax 2 AmountLT2=Amount tax 3 AmountLT1ES=Amount RE @@ -487,6 +494,7 @@ By=By From=From FromDate=From FromLocation=From +at=at to=to To=to and=and @@ -509,6 +517,7 @@ Draft=Draft Drafts=Drafts StatusInterInvoiced=Invoiced Validated=Validated +ValidatedToProduce=Validated (To produce) Opened=ತೆರೆಯಲಾಗಿದೆ OpenAll=Open (All) ClosedAll=Closed (All) @@ -655,6 +664,7 @@ Response=Response Priority=Priority SendByMail=Send by email MailSentBy=Email sent by +NotSent=Not sent TextUsedInTheMessageBody=Email body SendAcknowledgementByMail=Send confirmation email SendMail=Send email @@ -836,6 +846,7 @@ ListOfTemplates=List of templates Gender=Gender Genderman=Man Genderwoman=Woman +Genderother=ಇತರ ViewList=List view ViewGantt=Gantt view ViewKanban=Kanban view @@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous Calendar=Calendar GroupBy=Group by... ViewFlatList=View flat list +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Remove string '%s' SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at https://transifex.com/projects/p/dolibarr/ to add your improvements. DirectDownloadLink=Direct download link (public/external) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments SearchIntoExpenseReports=Expense reports SearchIntoLeaves=Leave SearchIntoTickets=Tickets +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Vendor payments +SearchIntoMiscPayments=Miscellaneous payments CommentLink=Comments NbComments=Number of comments CommentPage=Comments space @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Information Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Date of birth +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/kn_IN/mrp.lang b/htdocs/langs/kn_IN/mrp.lang index 863793063a0..f018be890cc 100644 --- a/htdocs/langs/kn_IN/mrp.lang +++ b/htdocs/langs/kn_IN/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/kn_IN/website.lang b/htdocs/langs/kn_IN/website.lang index 4b5294d5e43..03e042e4be6 100644 --- a/htdocs/langs/kn_IN/website.lang +++ b/htdocs/langs/kn_IN/website.lang @@ -31,7 +31,7 @@ AddWebsite=Add website Webpage=Web page/container AddPage=Add page/container HomePage=Home Page -PageContainer=Page/container +PageContainer=Page PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. 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. SiteDeleted=Web site '%s' deleted @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=RSS Feed RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/ko_KR/accountancy.lang b/htdocs/langs/ko_KR/accountancy.lang index 5f53ebb4389..2202ceafd92 100644 --- a/htdocs/langs/ko_KR/accountancy.lang +++ b/htdocs/langs/ko_KR/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Default for service DefaultForProduct=Default for product CantSuggest=Can't suggest AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s -ConfigAccountingExpert=Configuration of the module accounting expert +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Journalization -Journaux=분개장 +Journals=분개장 JournalFinancial=Financial journals BackToChartofaccounts=Return chart of accounts Chartofaccounts=Chart of accounts +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Current dedicated account AssignDedicatedAccountingAccount=New account to assign InvoiceLabel=Invoice label @@ -33,8 +35,8 @@ OtherInfo=Other information DeleteCptCategory=Remove accounting account from group ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group? JournalizationInLedgerStatus=Status of journalization -AlreadyInGeneralLedger=Already journalized in ledgers -NotYetInGeneralLedger=Not yet journalized in ledgers +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group DetailByAccount=Show detail by account AccountWithNonZeroValues=Accounts with non-zero values @@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC CountriesNotInEEC=Countries not in EEC CountriesInEECExceptMe=Countries in EEC except %s CountriesExceptMe=All countries except %s -AccountantFiles=Export accounting documents +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup @@ -79,7 +83,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) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Select active chart of accounts ChangeAndLoad=Change and load Addanaccount=Add an accounting account @@ -89,6 +93,8 @@ SubledgerAccount=Subledger account SubledgerAccountLabel=Subledger account label ShowAccountingAccount=Show accounting account ShowAccountingJournal=Show accounting journal +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Accounting account suggested MenuDefaultAccounts=Default accounts MenuBankAccounts=Bank accounts @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding CreateMvts=Create new transaction UpdateMvts=Modification of a transaction ValidTransaction=Validate transaction -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=원장 +BookkeepingSubAccount=Subledger AccountBalance=Account balance ObjectsRef=Source object ref CAHTF=Total purchase vendor before tax @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=매출분개장 ACCOUNTING_PURCHASE_JOURNAL=구매분개장 @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups ByYear=By year NotMatch=Not Set -DeleteMvt=Delete Ledger lines +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=Year to delete DelJournal=Journal to delete -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Finance journal ExpenseReportsJournal=Expense reports journal DescFinanceJournal=Finance journal including all the types of payments by bank account -DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Account for VAT not defined ThirdpartyAccountNotDefined=Account for third party not defined ProductAccountNotDefined=Account for product not defined @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu %s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Export draft journal @@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Chart of accounts Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang index 141a238f6ee..41c75987caf 100644 --- a/htdocs/langs/ko_KR/admin.lang +++ b/htdocs/langs/ko_KR/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=Edition of field %s FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=LDAP Setup LDAPGlobalParameters=Global parameters @@ -1670,7 +1672,7 @@ AdvancedEditor=Advanced editor ActivateFCKeditor=Activate advanced editor for: FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services) FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing) FCKeditorForUserSignature=WYSIWIG creation/edition of user signature FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting 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 user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup diff --git a/htdocs/langs/ko_KR/banks.lang b/htdocs/langs/ko_KR/banks.lang index 6f3802751aa..cbe0734591b 100644 --- a/htdocs/langs/ko_KR/banks.lang +++ b/htdocs/langs/ko_KR/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=Miscellaneous payments ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA mandate YourSEPAMandate=Your SEPA mandate FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/ko_KR/categories.lang b/htdocs/langs/ko_KR/categories.lang index 0487220e12c..79bfe18f625 100644 --- a/htdocs/langs/ko_KR/categories.lang +++ b/htdocs/langs/ko_KR/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup CategorieRecursiv=Link with parent tag/category automatically CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=Add the following product/service +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Show tag/category ByDefaultInList=By default in list ChooseCategory=Choose category -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/ko_KR/companies.lang b/htdocs/langs/ko_KR/companies.lang index b700c94d963..4e623422f6e 100644 --- a/htdocs/langs/ko_KR/companies.lang +++ b/htdocs/langs/ko_KR/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=프로필 Id 1 (USt.-IdNr) ProfId2AT=프로필 Id 2 (USt-Nr) ProfId3AT=프로필 Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=프로필 Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=프로필 Id 1 (자격증 번호) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=프로필 ID 1 (연방 번호) ProfId4CH=프로필 Id 2 (상업 기록 번호) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=프로필 Id 1 (R.U.T.) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=프로필 Id 1 (USt.-IdNr) ProfId2DE=프로필 Id 2 (USt-Nr) ProfId3DE=프로필 Id 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=프로필 Id 1 (CIF / NIF) ProfId2ES=프로필 ID2 (사회보장번호) ProfId3ES=프로필 Id 3 (CNAE) ProfId4ES=프로필 Id 4 (대학생 번호) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=프로필 ID 1 (SIREN) ProfId2FR=프로필 Id 2 (SIRET) ProfId3FR=프로필 Id 3 (NAF, 구 APE) ProfId4FR=프로필 Id 4 (RCS / RM) -ProfId5FR=- +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=등록 번호 ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=프로필 Id 3 (SRVC TAX) ProfId4IN=프로필 Id 4 ProfId5IN=프로필 Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=프로필 Id 1 (룩셈부르크) ProfId2LU=프로필 Id 2 (사업 허가) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=프로필 Id 1 (R.C.) ProfId2MA=프로필 Id 2 (특허) ProfId3MA=프로필 Id 3 (I.F.) ProfId4MA=프로필 Id 4 (C.N.S.S.) -ProfId5MA=프로필 Id 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=프로필 Id 1 (R.F.C). ProfId2MX=프로필 Id 2 (R..P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK 번호 ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=프로필 Id 1 (NIPC) ProfId2PT=프로필 Id 2 (사회 보장 번호) ProfId3PT=프로필 Id 3 (상업 기록 번호) ProfId4PT=프로필 Id 4 (Conservatory) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=프로필 Id 1 (OGRN) ProfId2RU=프로필 Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi ErrorVATCheckMS_UNAVAILABLE=확인할 수 없습니다. 수표 서비스는 회원 국가에서 제공하지 않습니다 (%s). NorProspectNorCustomer=Not prospect, nor customer JuridicalStatus=Legal Entity Type +Workforce=Workforce Staff=Employees ProspectLevelShort=가능성 ProspectLevel=미래 잠재고객 @@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor PaymentTypeBoth=Payment Type - Customer and Vendor MulticurrencyUsed=Use Multicurrency MulticurrencyCurrency=Currency +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/ko_KR/hrm.lang b/htdocs/langs/ko_KR/hrm.lang index 6cc7f6bef24..3b8f137e103 100644 --- a/htdocs/langs/ko_KR/hrm.lang +++ b/htdocs/langs/ko_KR/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=Employees Employee=Employee NewEmployee=New employee +ListOfEmployees=List of employees diff --git a/htdocs/langs/ko_KR/languages.lang b/htdocs/langs/ko_KR/languages.lang index 5359947a598..f81f3e8d03d 100644 --- a/htdocs/langs/ko_KR/languages.lang +++ b/htdocs/langs/ko_KR/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=스페인어 (파나마) Language_es_PY=스페인어 (파라과이) Language_es_PE=스페인어 (페루) Language_es_PR=스페인어 (푸에르토 리코) +Language_es_US=Spanish (USA) Language_es_UY=Spanish (Uruguay) Language_es_GT=Spanish (Guatemala) Language_es_VE=스페인어 (베네수엘라) diff --git a/htdocs/langs/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang index 5392faabe13..cd328ee454a 100644 --- a/htdocs/langs/ko_KR/main.lang +++ b/htdocs/langs/ko_KR/main.lang @@ -155,6 +155,7 @@ RemoveLink=링크 제거 AddToDraft=초안에 추가 Update=갱신 Close=닫기 +CloseAs=Set status to CloseBox=대시 보드에서 위젯 제거 Confirm=확인 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to %s? @@ -196,6 +197,7 @@ ReOpen=다시 열기 Upload=Upload ToLink=링크 Select=선택 +SelectAll=Select all Choose=선택 Resize=크기 조정 ResizeOrCrop=Resize or Crop @@ -256,6 +258,7 @@ Cards=카드 Card=카드 Now=현재 HourStart=시작 시각 +Deadline=Deadline Date=날짜 DateAndHour=날짜 및 시간 DateToday=오늘 날짜 @@ -264,8 +267,10 @@ DateStart=시작날짜 DateEnd=종료날짜 DateCreation=생성날짜 DateCreationShort=생성 날짜 +IPCreation=Creation IP DateModification=수정날짜 DateModificationShort=수정날짜 +IPModification=Modification IP DateLastModification=최종 수정일 DateValidation=검사날짜 DateClosing=마감날짜 @@ -319,6 +324,7 @@ Morning=아침 Afternoon=대낮 Quadri=쿼드리 MonthOfDay=현재 월 +DaysOfWeek=Days of week HourShort=H MinuteShort=mn Rate=율 @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=지불 금액, 원래 통화 MulticurrencyAmountHT=Amount (excl. tax), original currency MulticurrencyAmountTTC=금액 (세금 포함), 원화 MulticurrencyAmountVAT=금액 세금, 원화 +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=세액 2 AmountLT2=세액 3 AmountLT1ES=RE 금액 @@ -487,6 +494,7 @@ By=별 From=부터 FromDate=부터 FromLocation=부터 +at=at to=까지 To=까지 and=그리고 @@ -509,6 +517,7 @@ Draft=작성 Drafts=작성자 StatusInterInvoiced=Invoiced Validated=확인 함 +ValidatedToProduce=Validated (To produce) Opened=열기 OpenAll=Open (All) ClosedAll=Closed (All) @@ -655,6 +664,7 @@ Response=응답 Priority=우선순위 SendByMail=Send by email MailSentBy=보낸 이메일 +NotSent=Not sent TextUsedInTheMessageBody=이메일 본문 SendAcknowledgementByMail=확인 이메일 보내기 SendMail=Send email @@ -836,6 +846,7 @@ ListOfTemplates=템플릿 목록 Gender=성별 Genderman=남자 Genderwoman=여자 +Genderother=기타 ViewList=목록 보기 ViewGantt=Gantt view ViewKanban=Kanban view @@ -877,6 +888,8 @@ Miscellaneous=기타등등 Calendar=달력 GroupBy=그룹화 ... ViewFlatList=평면 목록보기 +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString='%s'문자열을 제거하십시오. SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at https://transifex.com/projects/p/dolibarr/ to add your improvements. DirectDownloadLink=Direct download link (public/external) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=고객 출하 SearchIntoExpenseReports=경비 보고서 SearchIntoLeaves=Leave SearchIntoTickets=Tickets +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Vendor payments +SearchIntoMiscPayments=Miscellaneous payments CommentLink=주석 NbComments=Number of comments CommentPage=Comments space @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Information Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Date of birth +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/ko_KR/mrp.lang b/htdocs/langs/ko_KR/mrp.lang index 863793063a0..f018be890cc 100644 --- a/htdocs/langs/ko_KR/mrp.lang +++ b/htdocs/langs/ko_KR/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/ko_KR/website.lang b/htdocs/langs/ko_KR/website.lang index 9112a8719ca..a3167ada553 100644 --- a/htdocs/langs/ko_KR/website.lang +++ b/htdocs/langs/ko_KR/website.lang @@ -31,7 +31,7 @@ AddWebsite=Add website Webpage=Web page/container AddPage=Add page/container HomePage=Home Page -PageContainer=Page/container +PageContainer=Page PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. 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. SiteDeleted=Web site '%s' deleted @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=RSS Feed RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/lo_LA/accountancy.lang b/htdocs/langs/lo_LA/accountancy.lang index f7f3aa2fec7..a0451ff066b 100644 --- a/htdocs/langs/lo_LA/accountancy.lang +++ b/htdocs/langs/lo_LA/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Default for service DefaultForProduct=Default for product CantSuggest=Can't suggest AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s -ConfigAccountingExpert=Configuration of the module accounting expert +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Journalization -Journaux=Journals +Journals=Journals JournalFinancial=Financial journals BackToChartofaccounts=Return chart of accounts Chartofaccounts=Chart of accounts +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Current dedicated account AssignDedicatedAccountingAccount=New account to assign InvoiceLabel=Invoice label @@ -33,8 +35,8 @@ OtherInfo=Other information DeleteCptCategory=Remove accounting account from group ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group? JournalizationInLedgerStatus=Status of journalization -AlreadyInGeneralLedger=Already journalized in ledgers -NotYetInGeneralLedger=Not yet journalized in ledgers +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group DetailByAccount=Show detail by account AccountWithNonZeroValues=Accounts with non-zero values @@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC CountriesNotInEEC=Countries not in EEC CountriesInEECExceptMe=Countries in EEC except %s CountriesExceptMe=All countries except %s -AccountantFiles=Export accounting documents +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup @@ -79,7 +83,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) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Select active chart of accounts ChangeAndLoad=Change and load Addanaccount=Add an accounting account @@ -89,6 +93,8 @@ SubledgerAccount=Subledger account SubledgerAccountLabel=Subledger account label ShowAccountingAccount=Show accounting account ShowAccountingJournal=Show accounting journal +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Accounting account suggested MenuDefaultAccounts=Default accounts MenuBankAccounts=Bank accounts @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding CreateMvts=Create new transaction UpdateMvts=Modification of a transaction ValidTransaction=Validate transaction -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=Ledger +BookkeepingSubAccount=Subledger AccountBalance=Account balance ObjectsRef=Source object ref CAHTF=Total purchase vendor before tax @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Sell journal ACCOUNTING_PURCHASE_JOURNAL=Purchase journal @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups ByYear=By year NotMatch=Not Set -DeleteMvt=Delete Ledger lines +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=Year to delete DelJournal=Journal to delete -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Finance journal ExpenseReportsJournal=Expense reports journal DescFinanceJournal=Finance journal including all the types of payments by bank account -DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Account for VAT not defined ThirdpartyAccountNotDefined=Account for third party not defined ProductAccountNotDefined=Account for product not defined @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu %s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Export draft journal @@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Chart of accounts Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang index 37da07acc11..a651fd86d34 100644 --- a/htdocs/langs/lo_LA/admin.lang +++ b/htdocs/langs/lo_LA/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=Edition of field %s FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=LDAP Setup LDAPGlobalParameters=​ໂຕ​ຕັ້ງ​ຄ່າ​ທັງ​ໝົດ @@ -1670,7 +1672,7 @@ AdvancedEditor=Advanced editor ActivateFCKeditor=Activate advanced editor for: FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services) FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing) FCKeditorForUserSignature=WYSIWIG creation/edition of user signature FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting 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 user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup diff --git a/htdocs/langs/lo_LA/banks.lang b/htdocs/langs/lo_LA/banks.lang index 11a5c52982e..116b97d3f81 100644 --- a/htdocs/langs/lo_LA/banks.lang +++ b/htdocs/langs/lo_LA/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=Miscellaneous payments ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA mandate YourSEPAMandate=Your SEPA mandate FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/lo_LA/categories.lang b/htdocs/langs/lo_LA/categories.lang index 9bb71984ecf..ba37a43b4ec 100644 --- a/htdocs/langs/lo_LA/categories.lang +++ b/htdocs/langs/lo_LA/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup CategorieRecursiv=Link with parent tag/category automatically CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=Add the following product/service +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Show tag/category ByDefaultInList=By default in list ChooseCategory=Choose category -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/lo_LA/companies.lang b/htdocs/langs/lo_LA/companies.lang index 22059f348ec..4e8b86a7c57 100644 --- a/htdocs/langs/lo_LA/companies.lang +++ b/htdocs/langs/lo_LA/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof Id 1 (Federal number) ProfId4CH=Prof Id 2 (Commercial Record number) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof Id 1 (R.U.T.) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr) ProfId2DE=Prof Id 2 (USt.-Nr) ProfId3DE=Prof Id 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof Id 1 (CIF/NIF) ProfId2ES=Prof Id 2 (Social security number) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (Collegiate number) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof Id 1 (SIREN) ProfId2FR=Prof Id 2 (SIRET) ProfId3FR=Prof Id 3 (NAF, old APE) ProfId4FR=Prof Id 4 (RCS/RM) -ProfId5FR=- +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Registration Number ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX) ProfId4IN=Prof Id 4 ProfId5IN=Prof Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Business permit) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (R.C.) ProfId2MA=Id prof. 2 (Patente) ProfId3MA=Id prof. 3 (I.F.) ProfId4MA=Id prof. 4 (C.N.S.S.) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof Id 1 (R.F.C). ProfId2MX=Prof Id 2 (R..P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK nummer ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof Id 2 (Social security number) ProfId3PT=Prof Id 3 (Commercial Record number) ProfId4PT=Prof Id 4 (Conservatory) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof Id 1 (OGRN) ProfId2RU=Prof Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s). NorProspectNorCustomer=Not prospect, nor customer JuridicalStatus=Legal Entity Type +Workforce=Workforce Staff=Employees ProspectLevelShort=Potential ProspectLevel=Prospect potential @@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor PaymentTypeBoth=Payment Type - Customer and Vendor MulticurrencyUsed=Use Multicurrency MulticurrencyCurrency=Currency +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/lo_LA/hrm.lang b/htdocs/langs/lo_LA/hrm.lang index 6cc7f6bef24..3b8f137e103 100644 --- a/htdocs/langs/lo_LA/hrm.lang +++ b/htdocs/langs/lo_LA/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=Employees Employee=Employee NewEmployee=New employee +ListOfEmployees=List of employees diff --git a/htdocs/langs/lo_LA/languages.lang b/htdocs/langs/lo_LA/languages.lang index cc80b9f1719..ba187326705 100644 --- a/htdocs/langs/lo_LA/languages.lang +++ b/htdocs/langs/lo_LA/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Spanish (Paraguay) Language_es_PE=Spanish (Peru) Language_es_PR=Spanish (Puerto Rico) +Language_es_US=Spanish (USA) Language_es_UY=Spanish (Uruguay) Language_es_GT=Spanish (Guatemala) Language_es_VE=Spanish (Venezuela) diff --git a/htdocs/langs/lo_LA/main.lang b/htdocs/langs/lo_LA/main.lang index 96d7ae3cb09..026cbbb5ad7 100644 --- a/htdocs/langs/lo_LA/main.lang +++ b/htdocs/langs/lo_LA/main.lang @@ -155,6 +155,7 @@ RemoveLink=Remove link AddToDraft=Add to draft Update=ປັບປຸງ Close=Close +CloseAs=Set status to CloseBox=Remove widget from your dashboard Confirm=Confirm ConfirmSendCardByMail=Do you really want to send the content of this card by mail to %s? @@ -196,6 +197,7 @@ ReOpen=Re-Open Upload=Upload ToLink=Link Select=Select +SelectAll=Select all Choose=Choose Resize=Resize ResizeOrCrop=Resize or Crop @@ -256,6 +258,7 @@ Cards=Cards Card=Card Now=Now HourStart=Start hour +Deadline=Deadline Date=ວັນທີ DateAndHour=Date and hour DateToday=Today's date @@ -264,8 +267,10 @@ DateStart=Start date DateEnd=End date DateCreation=Creation date DateCreationShort=Creat. date +IPCreation=Creation IP DateModification=Modification date DateModificationShort=Modif. date +IPModification=Modification IP DateLastModification=Latest modification date DateValidation=Validation date DateClosing=Closing date @@ -319,6 +324,7 @@ Morning=Morning Afternoon=Afternoon Quadri=Quadri MonthOfDay=Month of the day +DaysOfWeek=Days of week HourShort=H MinuteShort=mn Rate=Rate @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency MulticurrencyAmountHT=Amount (excl. tax), original currency MulticurrencyAmountTTC=Amount (inc. of tax), original currency MulticurrencyAmountVAT=Amount tax, original currency +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Amount tax 2 AmountLT2=Amount tax 3 AmountLT1ES=Amount RE @@ -487,6 +494,7 @@ By=By From=From FromDate=From FromLocation=From +at=at to=to To=to and=and @@ -509,6 +517,7 @@ Draft=Draft Drafts=Drafts StatusInterInvoiced=Invoiced Validated=Validated +ValidatedToProduce=Validated (To produce) Opened=Open OpenAll=Open (All) ClosedAll=Closed (All) @@ -655,6 +664,7 @@ Response=Response Priority=Priority SendByMail=Send by email MailSentBy=Email sent by +NotSent=Not sent TextUsedInTheMessageBody=Email body SendAcknowledgementByMail=Send confirmation email SendMail=Send email @@ -836,6 +846,7 @@ ListOfTemplates=List of templates Gender=Gender Genderman=Man Genderwoman=Woman +Genderother=Other ViewList=List view ViewGantt=Gantt view ViewKanban=Kanban view @@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous Calendar=Calendar GroupBy=Group by... ViewFlatList=View flat list +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Remove string '%s' SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at https://transifex.com/projects/p/dolibarr/ to add your improvements. DirectDownloadLink=Direct download link (public/external) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments SearchIntoExpenseReports=Expense reports SearchIntoLeaves=Leave SearchIntoTickets=Tickets +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Vendor payments +SearchIntoMiscPayments=Miscellaneous payments CommentLink=Comments NbComments=Number of comments CommentPage=Comments space @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Information Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Date of birth +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/lo_LA/mrp.lang b/htdocs/langs/lo_LA/mrp.lang index 863793063a0..f018be890cc 100644 --- a/htdocs/langs/lo_LA/mrp.lang +++ b/htdocs/langs/lo_LA/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/lo_LA/website.lang b/htdocs/langs/lo_LA/website.lang index 4b5294d5e43..03e042e4be6 100644 --- a/htdocs/langs/lo_LA/website.lang +++ b/htdocs/langs/lo_LA/website.lang @@ -31,7 +31,7 @@ AddWebsite=Add website Webpage=Web page/container AddPage=Add page/container HomePage=Home Page -PageContainer=Page/container +PageContainer=Page PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. 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. SiteDeleted=Web site '%s' deleted @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=RSS Feed RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/lt_LT/accountancy.lang b/htdocs/langs/lt_LT/accountancy.lang index ba180500a96..006e60db613 100644 --- a/htdocs/langs/lt_LT/accountancy.lang +++ b/htdocs/langs/lt_LT/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Numatyta paslauga DefaultForProduct=Numatyta prekė CantSuggest=Pasiūlyti negalima AccountancySetupDoneFromAccountancyMenu=Dauguma apskaitos nustatymo atliekama iš meniu %s -ConfigAccountingExpert=Apskaitos eksperto modulio konfigūracija +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Įvestis -Journaux=Žurnalai +Journals=Žurnalai JournalFinancial=Finansiniai žurnalai BackToChartofaccounts=Grįžti į sąskaitų planą Chartofaccounts=Sąskaitų planas +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Dabartinė paskyra AssignDedicatedAccountingAccount=Nauja paskyra priskirimui InvoiceLabel=Sąskaitos žymė @@ -33,8 +35,8 @@ OtherInfo=Kita informacija DeleteCptCategory=Pašalinti apskaitos sąskaitą iš grupės ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group? JournalizationInLedgerStatus=Įvesties būklė -AlreadyInGeneralLedger=Jau įvesta didžiojoje knygoje -NotYetInGeneralLedger=Dar nėra įvesta didžiojoje knygoje +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Grupė yra tuščia, patikrinkite individualizuotos apskaitos grupės nustatymus DetailByAccount=Rodyti išsamią informaciją pagal apskaitos sąskaitą AccountWithNonZeroValues=Accounts with non-zero values @@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC CountriesNotInEEC=Countries not in EEC CountriesInEECExceptMe=Countries in EEC except %s CountriesExceptMe=All countries except %s -AccountantFiles=Export accounting documents +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Pagrindinė apskaitos sąskaita klientams, kurie nenustatyti sąrankos metu MainAccountForSuppliersNotDefined=Pagrindinė apskaitos sąskaita tiekėjams, kurie nenustatyti sąrankos metu @@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=ŽINGSNIS %s: pridėkite arba redaguokite esamus įve AccountancyAreaDescClosePeriod=ŽINGSNIS %s: uždarytas laikotarpis, todėl ateityje negalėsime keisti. -TheJournalCodeIsNotDefinedOnSomeBankAccount=Privalomas žingsnis nebuvo baigtas (apskaitos kodo žurnalas nenustatytas visoms banko sąskaitoms). +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Pasirinkite aktyvia sąskaitų planą ChangeAndLoad=Pakeiskite ir įkelkite Addanaccount=Pridėti apskaitos sąskaitą @@ -89,6 +93,8 @@ SubledgerAccount=Subledger account SubledgerAccountLabel=Subledger account label ShowAccountingAccount=Rodyti apskaitos sąskaitą ShowAccountingJournal=Rodyti apskaitos žurnalą +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Siūloma apskaitos sąskaita MenuDefaultAccounts=Numatytosios sąskaitos MenuBankAccounts=Banko sąskaitos @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Išlaidų ataskaita apvadas CreateMvts=Sukurkite naują sandorį UpdateMvts=Sandorio keitimas ValidTransaction=Patikrinti sandorį -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=Didžioji knyga +BookkeepingSubAccount=Subledger AccountBalance=Sąskaitos balansas ObjectsRef=Šaltinio objekto nuoroda CAHTF=Total purchase vendor before tax @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Išjungti tiesioginį sandorio įrašymą banko sąska ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Įgalinti eksporto projektą žurnale ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Pardavimų žurnalas ACCOUNTING_PURCHASE_JOURNAL=Pirkimų žurnalas @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups ByYear=Pagal metus NotMatch=Not Set -DeleteMvt=Delete Ledger lines +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=Year to delete DelJournal=Žurnalas, kurį norite ištrinti -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Finance journal ExpenseReportsJournal=Išlaidų ataskaitų žurnalas DescFinanceJournal=Finance journal including all the types of payments by bank account -DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Account for VAT not defined ThirdpartyAccountNotDefined=Account for third party not defined ProductAccountNotDefined=Account for product not defined @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=Šis žurnalas jau naudojamas AccountingAccountForSalesTaxAreDefinedInto=Pastaba: Apskaitos sąskaita pardavimų mokestis yra apibrėžta meniu %s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Eksportuoti žurnalo projektą @@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Chart of accounts Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang index aa50a51c14e..ea55fbcdc54 100644 --- a/htdocs/langs/lt_LT/admin.lang +++ b/htdocs/langs/lt_LT/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=Lauko %s redagavimas FillThisOnlyIfRequired=Pavyzdys: +2 (pildyti tik tuomet, jei laiko juostos nuokrypio problemos yra žymios) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member MemberSendInformationByMailByDefault=Patvirtinimas paukščiuku žymimame langelyje pašto siuntimui nariams (patvirtinimas arba nauja įmoka) yra pagal nutylėjimą VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=LDAP nuostatos LDAPGlobalParameters=Bendrieji parametrai @@ -1670,7 +1672,7 @@ AdvancedEditor=Išplėstinis redaktorius ActivateFCKeditor=Įjungti išplėstinį redaktorių: FCKeditorForCompany=Elementų aprašymo ir pastabų WYSIWIG kūrimas/redagavimas (išskyrus produktus/paslaugas) FCKeditorForProduct=Produktų/paslaugų aprašymų ir pastabų WYSIWIG kūrimas/redagavimas -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG kūrimas/redagavimas masiniams e-laiškams (Tools-> eMailing) FCKeditorForUserSignature=Vartotojo parašo WYSIWIG kūrimas/redagavimas FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting 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 user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view ##### Clicktodial ##### ClickToDialSetup=Click To Dial modulio nuostatos diff --git a/htdocs/langs/lt_LT/banks.lang b/htdocs/langs/lt_LT/banks.lang index 4f31a0cdfe2..48e08a11c34 100644 --- a/htdocs/langs/lt_LT/banks.lang +++ b/htdocs/langs/lt_LT/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=Miscellaneous payments ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA mandate YourSEPAMandate=Your SEPA mandate FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/lt_LT/categories.lang b/htdocs/langs/lt_LT/categories.lang index a4a4d42facc..eab51c93f5a 100644 --- a/htdocs/langs/lt_LT/categories.lang +++ b/htdocs/langs/lt_LT/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup CategorieRecursiv=Link with parent tag/category automatically CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=Pridėti sekantį produktą / servisą +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Show tag/category ByDefaultInList=By default in list ChooseCategory=Choose category -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/lt_LT/companies.lang b/htdocs/langs/lt_LT/companies.lang index 94cad3cf3aa..e121fe74fd6 100644 --- a/htdocs/langs/lt_LT/companies.lang +++ b/htdocs/langs/lt_LT/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof ID 1 (USt.-IdNr) ProfId2AT=Prof ID 2 (USt.-Nr) ProfId3AT=Prof ID 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof ID 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof ID 1 (Profesinis skaičius) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=VR (valstybinė registracija) @@ -144,11 +144,11 @@ ProfId3BR=SR (savivaldybės registracija) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof ID 1 (Federalinis numeris) ProfId4CH=Prof ID 2 (Komercinio Įrašo numeris) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof ID 1 (RUT) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof ID 1 (USt.-IdNr) ProfId2DE=Prof ID 2 (USt.-Nr) ProfId3DE=Prof ID 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof ID 1 (CIF/NIF) ProfId2ES=Prof ID 2 (Socialinio draudimo numeris) ProfId3ES=Prof ID 3 (CNAE) ProfId4ES=Prof ID 4 (Collegiate skaičius) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof ID 1 (SIRENOS) ProfId2FR=Prof ID 2 (SIRET) ProfId3FR=Prof ID 3 (NBS, senas APE) ProfId4FR=Prof ID 4 (RBS/RM) -ProfId5FR=- +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Registracijos numeris ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof ID 3 (SRVC TAX) ProfId4IN=Prof ID 4 ProfId5IN=Prof ID 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=ID Prof. 1 (R.C.S. Luxembourg) ProfId2LU=ID Prof. 2 (Verslo leidimas) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Prof ID 1 (RC) ProfId2MA=Prof ID 2 (patente) ProfId3MA=Prof ID 3 (IF) ProfId4MA=Prof ID 4 (CNSS) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof ID 1 (RFC). ProfId2MX=Prof ID 2 (R.. P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK Numeris ProfId2NL=- ProfId3NL=- ProfId4NL=SDN (Socialinio draudimo numeris) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof ID 1 (NIPC) ProfId2PT=Prof ID 2 (Socialinio draudimo numeris) ProfId3PT=Prof ID 3 (Komercinio Registro numeris) ProfId4PT=Prof ID 4 (Conservatory) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof ID 1 (OGRN) ProfId2RU=Prof ID 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi ErrorVATCheckMS_UNAVAILABLE=Tikrinimas negalimas. Tikrinimo paslauga nėra teikiama valstybės narės (%s). NorProspectNorCustomer=Not prospect, nor customer JuridicalStatus=Legal Entity Type +Workforce=Workforce Staff=Employees ProspectLevelShort=Potencialas ProspectLevel=Numatomų klientų potencialas @@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor PaymentTypeBoth=Payment Type - Customer and Vendor MulticurrencyUsed=Use Multicurrency MulticurrencyCurrency=Valiuta +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/lt_LT/hrm.lang b/htdocs/langs/lt_LT/hrm.lang index d5b3bbfa340..76db8a5dc5a 100644 --- a/htdocs/langs/lt_LT/hrm.lang +++ b/htdocs/langs/lt_LT/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=Employees Employee=Darbuotojas NewEmployee=New employee +ListOfEmployees=List of employees diff --git a/htdocs/langs/lt_LT/languages.lang b/htdocs/langs/lt_LT/languages.lang index 77a7c15b777..571c2ed6e1b 100644 --- a/htdocs/langs/lt_LT/languages.lang +++ b/htdocs/langs/lt_LT/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Ispanų (Paragvajus) Language_es_PE=Ispanų (Peru) Language_es_PR=Ispanų (Puerto Rikas) +Language_es_US=Spanish (USA) Language_es_UY=Spanish (Uruguay) Language_es_GT=Spanish (Guatemala) Language_es_VE=Spanish (Venezuela) diff --git a/htdocs/langs/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang index 52ee700de75..5b05397b5d2 100644 --- a/htdocs/langs/lt_LT/main.lang +++ b/htdocs/langs/lt_LT/main.lang @@ -155,6 +155,7 @@ RemoveLink=Remove link AddToDraft=Add to draft Update=Atnaujinimas Close=Uždaryti +CloseAs=Set status to CloseBox=Remove widget from your dashboard Confirm=Patvirtinti ConfirmSendCardByMail=Do you really want to send the content of this card by mail to %s? @@ -196,6 +197,7 @@ ReOpen=Atidaryti iš naujo Upload=Upload ToLink=Nuoroda Select=Pasirinkti +SelectAll=Select all Choose=Pasirinkti Resize=Pakeisti dydį ResizeOrCrop=Resize or Crop @@ -256,6 +258,7 @@ Cards=Kortelės Card=Kortelė Now=Dabar HourStart=Pradėti valandą +Deadline=Deadline Date=Data DateAndHour=Data ir valanda DateToday=Today's date @@ -264,8 +267,10 @@ DateStart=Pradžios data DateEnd=Pabaigos data DateCreation=Sukūrimo data DateCreationShort=Creat. date +IPCreation=Creation IP DateModification=Pakeitimo data DateModificationShort=Pakeitimo data +IPModification=Modification IP DateLastModification=Latest modification date DateValidation=Patvirtinimo data DateClosing=Uždarymo data @@ -319,6 +324,7 @@ Morning=Rytas Afternoon=Popietė Quadri=Ketur- MonthOfDay=Dienos mėnuo +DaysOfWeek=Days of week HourShort=H MinuteShort=MN Rate=Norma @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency MulticurrencyAmountHT=Amount (excl. tax), original currency MulticurrencyAmountTTC=Amount (inc. of tax), original currency MulticurrencyAmountVAT=Amount tax, original currency +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Mokesčių suma 2 AmountLT2=Mokesčių suma 3 AmountLT1ES=RE suma @@ -487,6 +494,7 @@ By=Pagal From=Nuo FromDate=Pardavėjas FromLocation=Pardavėjas +at=at to=į To=į and=ir @@ -509,6 +517,7 @@ Draft=Projektas Drafts=Projektai StatusInterInvoiced=Invoiced Validated=Pripažinti galiojančiais +ValidatedToProduce=Validated (To produce) Opened=Atidaryta OpenAll=Open (All) ClosedAll=Closed (All) @@ -655,6 +664,7 @@ Response=Atsakymas Priority=Prioritetas SendByMail=Send by email MailSentBy=E-Laišką atsiuntė +NotSent=Neišsiųsta TextUsedInTheMessageBody=E-laiško pagrindinė dalis SendAcknowledgementByMail=Send confirmation email SendMail=Siųsti e-laišką @@ -836,6 +846,7 @@ ListOfTemplates=Šablonų sąrašas Gender=Gender Genderman=Vyras Genderwoman=Moteris +Genderother=Kiti ViewList=Sąrašo vaizdas ViewGantt=Gantt view ViewKanban=Kanban view @@ -877,6 +888,8 @@ Miscellaneous=Įvairus Calendar=Kalendorius GroupBy=Group by... ViewFlatList=View flat list +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Remove string '%s' SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at https://transifex.com/projects/p/dolibarr/ to add your improvements. DirectDownloadLink=Direct download link (public/external) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments SearchIntoExpenseReports=Išlaidų ataskaitos SearchIntoLeaves=Leave SearchIntoTickets=Tickets +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Vendor payments +SearchIntoMiscPayments=Miscellaneous payments CommentLink=Komentarai NbComments=Number of comments CommentPage=Comments space @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Informacija Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Gimimo data +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/lt_LT/mrp.lang b/htdocs/langs/lt_LT/mrp.lang index 863793063a0..f018be890cc 100644 --- a/htdocs/langs/lt_LT/mrp.lang +++ b/htdocs/langs/lt_LT/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/lt_LT/website.lang b/htdocs/langs/lt_LT/website.lang index e8a8c3b92ea..df77c21ae55 100644 --- a/htdocs/langs/lt_LT/website.lang +++ b/htdocs/langs/lt_LT/website.lang @@ -31,7 +31,7 @@ AddWebsite=Add website Webpage=Web page/container AddPage=Add page/container HomePage=Home Page -PageContainer=Page/container +PageContainer=Puslapis PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. 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. SiteDeleted=Web site '%s' deleted @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=RSS mechanizmas RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang index f28afb279cc..9d43d7bcd9a 100644 --- a/htdocs/langs/lv_LV/accountancy.lang +++ b/htdocs/langs/lv_LV/accountancy.lang @@ -339,6 +339,8 @@ Modelcsv_configurable=Eksportēt CSV konfigurējamu Modelcsv_FEC=Eksporta FEC Modelcsv_Sage50_Swiss=Eksports uz Sage 50 Šveici Modelcsv_winfic=Eksportēt Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Kontu konts. Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang index c8881dcc252..d4c3cc29788 100644 --- a/htdocs/langs/lv_LV/admin.lang +++ b/htdocs/langs/lv_LV/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=Tiek ielādēts PHP komponents %s PreloadOPCode=Tiek izmantots iepriekš ielādēts OPCode AddRefInList=Rādīt klientu / pārdevēju ref. info saraksts (atlasiet sarakstu vai kombinēto) un lielākā daļa hipersaites.
Trešās puses parādīsies ar nosaukumu "CC12345 - SC45678 - Lielais uzņēmums". "Lielā uzņēmuma korpuss" vietā. AddAdressInList=Rādīt klienta / pārdevēja adrešu sarakstu (izvēlieties sarakstu vai kombināciju)
Trešās puses parādīsies ar nosaukumu "Lielās kompānijas korpuss - 21 lēkt iela 123456", nevis "Lielā uzņēmuma korpuss". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Pieprasiet vēlamo piegādes metodi trešajām pusēm. FieldEdition=Izdevums lauka %s FillThisOnlyIfRequired=Piemērs: +2 (aizpildiet tikai, ja sastopaties ar problēmām) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Lai izveidotu jaunu dalībnieku, nepieciešams e-pasts MemberSendInformationByMailByDefault=Rūtiņu, lai nosūtītu pasta apstiprinājums locekļiem (validāciju vai jauns abonements) ir ieslēgts pēc noklusējuma VisitorCanChooseItsPaymentMode=Apmeklētājs var izvēlēties no pieejamiem maksājumu veidiem MEMBER_REMINDER_EMAIL=Iespējot automātisku atgādinājumu pa e-pastu par beidzies abonementi. Piezīme. Modulim %s jābūt iespējotai un pareizi iestatītai, lai nosūtītu atgādinājumus. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=LDAP iestatījumi LDAPGlobalParameters=Globālie parametri @@ -1670,7 +1672,7 @@ AdvancedEditor=Uzlabotais redaktors ActivateFCKeditor=Aktivizēt uzlabotos redaktoru: FCKeditorForCompany=WYSIWYG izveidi / izdevums no elementiem apraksta un piezīmi (izņemot produktu / pakalpojumu) FCKeditorForProduct=WYSIWYG radīšana / izdevums produktu / pakalpojumu apraksts un atzīmēt -FCKeditorForProductDetails=WYSIWIG produktu izveides / izlaiduma detalizētu informāciju par visām vienībām (priekšlikumi, pasūtījumi, rēķini utt.). Brīdinājums: šīs opcijas izmantošana šajā gadījumā nav nopietni ieteicama, jo, veidojot PDF failus, tas var radīt problēmas ar īpašām rakstzīmēm un lapu formatējumu. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWYG izveide/ izdevums masveida emailings (Tools-> e-pastu) FCKeditorForUserSignature=WYSIWYG izveide/labošana lietotāja paraksta FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Veidojot notikuma veidlapu, automātiski iestatiet AGENDA_DEFAULT_FILTER_TYPE=Šādu pasākumu automātiski iestatīt darba kārtības skatā meklēšanas filtūrā AGENDA_DEFAULT_FILTER_STATUS=Automātiski iestatīt šo statusu notikumu skatīšanai darba filtru meklēšanas filtūrā AGENDA_DEFAULT_VIEW=Kuru skatu vēlaties atvērt pēc noklusējuma, izvēloties izvēlni Agenda -AGENDA_REMINDER_EMAIL=Iespējot notikumu atgādinājumu pa e-pastu (atgādinājums par iespēju / kavēšanos var definēt katrā notikumā). Piezīme: modulis %s ir jāaktivizē un pareizi jāiestata, lai atgādinājums tiktu nosūtīts pareizā laikā. -AGENDA_REMINDER_BROWSER=Iespējot notikuma atgādinājumu lietotāja pārlūkā (kad ir sasniegts notikuma datums, katrs lietotājs to var noraidīt no pārlūka apstiprinājuma jautājuma) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Iespējot skaņas paziņojumu +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Parādīt saistīto objektu darba kārtībā ##### Clicktodial ##### ClickToDialSetup=Klikšķiniet lai Dial moduļa uzstādīšanas diff --git a/htdocs/langs/lv_LV/banks.lang b/htdocs/langs/lv_LV/banks.lang index 4f61035b651..cf070821b46 100644 --- a/htdocs/langs/lv_LV/banks.lang +++ b/htdocs/langs/lv_LV/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Dažādi maksājumi VariousPayments=Dažādi maksājumi ShowVariousPayment=Rādīt dažādus maksājumus AddVariousPayment=Pievienot dažādus maksājumu +VariousPaymentId=Dažādu maksājumu ID +VariousPaymentLabel=Dažādu maksājumu etiķete +ConfirmCloneVariousPayment=Apstipriniet dažādu maksājumu klonu SEPAMandate=SEPA mandāts YourSEPAMandate=Jūsu SEPA mandāts FindYourSEPAMandate=Tas ir jūsu SEPA mandāts, lai pilnvarotu mūsu uzņēmumu veikt tiešā debeta pasūtījumu savai bankai. Atgriezt to parakstu (skenēt parakstīto dokumentu) vai nosūtīt pa pastu uz @@ -176,3 +179,4 @@ BankColorizeMovement=Krāsojiet kustības BankColorizeMovementDesc=Ja šī funkcija ir iespējota, jūs varat izvēlēties īpašu fona krāsu debeta vai kredīta pārvietošanai BankColorizeMovementName1=Debeta kustības fona krāsa BankColorizeMovementName2=Kredīta aprites fona krāsa +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/lv_LV/categories.lang b/htdocs/langs/lv_LV/categories.lang index e971dcad433..db3681c7335 100644 --- a/htdocs/langs/lv_LV/categories.lang +++ b/htdocs/langs/lv_LV/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Tagu / kategoriju iestatīšana CategorieRecursiv=Link with parent tag/category automatically CategorieRecursivHelp=Ja opcija ir ieslēgta, pievienojot produktu apakškategorijai, produkts tiks pievienots arī vecākajai kategorijai. AddProductServiceIntoCategory=Add the following product/service +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Show tag/category ByDefaultInList=By default in list ChooseCategory=Izvēlies sadaļu -StocksCategoriesArea=Noliktavu kategoriju zona -ActionCommCategoriesArea=Notikumu sadaļu zona -WebsitePagesCategoriesArea=Lapa-konteineru kategoriju zona +StocksCategoriesArea=Noliktavu kategorijas +ActionCommCategoriesArea=Pasākumu kategorijas +WebsitePagesCategoriesArea=Lapu konteineru kategorijas UseOrOperatorForCategories=Izmantojiet vai operatoru kategorijām diff --git a/htdocs/langs/lv_LV/companies.lang b/htdocs/langs/lv_LV/companies.lang index e8b3eb48a56..21c55893303 100644 --- a/htdocs/langs/lv_LV/companies.lang +++ b/htdocs/langs/lv_LV/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof ID 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof ID 1 (Professional skaits) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof ID 1 (Federālā skaits) ProfId4CH=Prof Id 2 (Tirdzniecības Ieraksta numurs) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof ID 1 (RUT) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof ID 1 (USt.-IDNR) ProfId2DE=Prof Id 2 (USt.-Nr) ProfId3DE=Prof Id 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof ID 1 (CIF / NIF) ProfId2ES=Prof Id 2 (Sociālās apdrošināšanas numurs) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (Collegiate numurs) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof ID 1 (Sirēnas) ProfId2FR=Prof Id 2 (SIRET) ProfId3FR=Prof Id 3 (NBS, vecais APE) ProfId4FR=Prof Id 4 (RCS / RM) -ProfId5FR=- +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Reģistrācijas numurs ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX) ProfId4IN=Prof Id 4 ProfId5IN=Prof Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Business permit) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (RC) ProfId2MA=Id prof. 2 (PATENTE) ProfId3MA=Id prof. 3 (IF) ProfId4MA=Id prof. 4 (CNSS) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof ID 1 (RFC). ProfId2MX=Prof Id 2 (R.. P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK nummurs ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof ID 1 (NIPC) ProfId2PT=Prof Id 2 (Sociālās apdrošināšanas numurs) ProfId3PT=Prof Id 3 (Tirdzniecības Ieraksta numurs) ProfId4PT=Prof Id 4 (konservatorija) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=1. prof. ID (CUI) ProfId2RO=Prof Id 2 (Nr. Manmatriculare) ProfId3RO=3. profils (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof ID 1 (BIN) ProfId2RU=Prof Id 2 (INN) diff --git a/htdocs/langs/lv_LV/hrm.lang b/htdocs/langs/lv_LV/hrm.lang index b3cf76f135c..20a92e2c4c7 100644 --- a/htdocs/langs/lv_LV/hrm.lang +++ b/htdocs/langs/lv_LV/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - darba vietas Employees=Darbinieki Employee=Darbinieks NewEmployee=Jauns darbinieks +ListOfEmployees=Darbinieku saraksts diff --git a/htdocs/langs/lv_LV/languages.lang b/htdocs/langs/lv_LV/languages.lang index 513c7c95a56..849292e69c4 100644 --- a/htdocs/langs/lv_LV/languages.lang +++ b/htdocs/langs/lv_LV/languages.lang @@ -40,6 +40,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_US=Spanish (USA) Language_es_UY=Spāņu (Urugvaja) Language_es_GT=Spāņu (Gvatemala) Language_es_VE=Spāņu (Venecuēla) diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang index d101032e7c8..3f1950cb761 100644 --- a/htdocs/langs/lv_LV/main.lang +++ b/htdocs/langs/lv_LV/main.lang @@ -197,6 +197,7 @@ ReOpen=Atvērt pa jaunu Upload=Augšupielādēt ToLink=Saite Select=Atlasīt +SelectAll=Select all Choose=Izvēlēties Resize=Samazināt ResizeOrCrop=Mainīt izmērus vai apgriezt @@ -257,6 +258,7 @@ Cards=Kartes Card=Karte Now=Tagad HourStart=Sākuma stunda +Deadline=Deadline Date=Datums DateAndHour=Datums un laiks DateToday=Šodienas datums @@ -265,8 +267,10 @@ DateStart=Sākuma datums DateEnd=Beigu datums DateCreation=Izveidošanas datums DateCreationShort=Izv. datums +IPCreation=Creation IP DateModification=Labošanas datums DateModificationShort=Modif. datums +IPModification=Modification IP DateLastModification=Jaunākais labošanas datums DateValidation=Apstiprināšanas datums DateClosing=Beigu datums @@ -1102,3 +1106,4 @@ SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Drošības pilnvaras d UpToDate=Aktuāls OutOfDate=Novecojis EventReminder=Atgādinājums par notikumu +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/lv_LV/mrp.lang b/htdocs/langs/lv_LV/mrp.lang index dbfa6d167fc..bf03d346a2e 100644 --- a/htdocs/langs/lv_LV/mrp.lang +++ b/htdocs/langs/lv_LV/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Vienības cena TotalCost=Kopējās izmaksas BOMTotalCost=Šīs BOM izgatavošanas izmaksas, pamatojoties uz katra patērētā daudzuma un produkta izmaksām (izmantojiet pašizmaksu, ja tā ir noteikta, cita - vidējā svērtā cena, ja ir noteikta, citur - labākā pirkuma cena). GoOnTabProductionToProduceFirst=Vispirms jums ir jāsāk ražošana, lai aizvērtu ražošanas pasūtījumu (sk. Cilni '%s'). Bet jūs varat to atcelt. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/lv_LV/website.lang b/htdocs/langs/lv_LV/website.lang index 839d6a901d8..45c5b91487f 100644 --- a/htdocs/langs/lv_LV/website.lang +++ b/htdocs/langs/lv_LV/website.lang @@ -31,7 +31,7 @@ AddWebsite=Pievienot vietni Webpage=Web lapa / konteiners AddPage=Pievienot lapu / konteineru HomePage=Mājas lapa -PageContainer=Lapa / konteiners +PageContainer=Lappuse PreviewOfSiteNotYetAvailable=Jūsu vietnes %s priekšskatījums vēl nav pieejams. Vispirms jums ir Jāimportē pilnu vietnes veidni vai vienkārši Pievienot lapu/konteineru". RequestedPageHasNoContentYet=Pieprasītā lapa ar id %s vēl nav ievietota, vai kešatmiņas fails .tpl.php tika noņemts. Rediģējiet lapas saturu, lai to atrisinātu. SiteDeleted=Tīmekļa vietne '%s' dzēsta @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Aizvietošana veikta %s lappusēs vai konteineros RSSFeed=RSS barotne RSSFeedDesc=Izmantojot šo URL, varat iegūt RSS plūsmu no jaunākajiem rakstiem ar veidu “blogpost” PagesRegenerated=reģenerēta %s lapa (s) / konteiners (-i) +RegenerateWebsiteContent=Atjaunojiet tīmekļa vietnes kešatmiņas failus +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/mk_MK/accountancy.lang b/htdocs/langs/mk_MK/accountancy.lang index 2d3a4148592..01016a2fb76 100644 --- a/htdocs/langs/mk_MK/accountancy.lang +++ b/htdocs/langs/mk_MK/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Стандардно за услугата DefaultForProduct=Стандардно за производот CantSuggest=Без предлози AccountancySetupDoneFromAccountancyMenu=Повеќето поставување на сметководството е направено од менито %s -ConfigAccountingExpert=Конфигурација на модулот сметководствен експерт +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Journalization -Journaux=Journals +Journals=Journals JournalFinancial=Financial journals BackToChartofaccounts=Врати табела на сметки Chartofaccounts=Табела на сметки +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Тековна наменска сметка AssignDedicatedAccountingAccount=Нова сметка за доделување InvoiceLabel=Етикета за фактура @@ -33,8 +35,8 @@ OtherInfo=Други информации DeleteCptCategory=Отстранете ја сметководствената сметка од групата ConfirmDeleteCptCategory=Дали сте сигурни дека сакате да ја отстраните оваа сметководствена сметка од групата за сметководствени сметки? JournalizationInLedgerStatus=Status of journalization -AlreadyInGeneralLedger=Already journalized in ledgers -NotYetInGeneralLedger=Not yet journalized in ledgers +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Групата е празна, проверете го поставувањето на персоналната сметководствена група DetailByAccount=Покажете детали по сметка AccountWithNonZeroValues=Сметки со вредности кои не се нула @@ -43,7 +45,9 @@ CountriesInEEC=Земји во Европска економска заедни CountriesNotInEEC=Земји што не се во Европска економска заедница CountriesInEECExceptMe=Земји во Европската економска заедница освен %s CountriesExceptMe=Сите земји освен %s -AccountantFiles=Експортирај документи за сметководство +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Главна сметководствена сметка за клиенти што не се дефинирани во сетапот MainAccountForSuppliersNotDefined=Главна сметководствена сметка за трговците кои не се дефинирани во сетапот @@ -79,7 +83,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) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Select active chart of accounts ChangeAndLoad=Change and load Addanaccount=Add an accounting account @@ -89,6 +93,8 @@ SubledgerAccount=Subledger account SubledgerAccountLabel=Subledger account label ShowAccountingAccount=Show accounting account ShowAccountingJournal=Show accounting journal +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Accounting account suggested MenuDefaultAccounts=Default accounts MenuBankAccounts=Bank accounts @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding CreateMvts=Create new transaction UpdateMvts=Modification of a transaction ValidTransaction=Validate transaction -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=Ledger +BookkeepingSubAccount=Subledger AccountBalance=Account balance ObjectsRef=Source object ref CAHTF=Total purchase vendor before tax @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Sell journal ACCOUNTING_PURCHASE_JOURNAL=Purchase journal @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups ByYear=By year NotMatch=Not Set -DeleteMvt=Delete Ledger lines +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=Year to delete DelJournal=Journal to delete -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Finance journal ExpenseReportsJournal=Expense reports journal DescFinanceJournal=Finance journal including all the types of payments by bank account -DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Account for VAT not defined ThirdpartyAccountNotDefined=Account for third party not defined ProductAccountNotDefined=Account for product not defined @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu %s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Export draft journal @@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Chart of accounts Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang index 794e5aa5cc3..04f993c0811 100644 --- a/htdocs/langs/mk_MK/admin.lang +++ b/htdocs/langs/mk_MK/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=Edition of field %s FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=LDAP Setup LDAPGlobalParameters=Global parameters @@ -1670,7 +1672,7 @@ AdvancedEditor=Advanced editor ActivateFCKeditor=Activate advanced editor for: FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services) FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing) FCKeditorForUserSignature=WYSIWIG creation/edition of user signature FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting 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 user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup diff --git a/htdocs/langs/mk_MK/banks.lang b/htdocs/langs/mk_MK/banks.lang index 0ba036badcd..7ed471f3c64 100644 --- a/htdocs/langs/mk_MK/banks.lang +++ b/htdocs/langs/mk_MK/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=Miscellaneous payments ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA mandate YourSEPAMandate=Your SEPA mandate FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/mk_MK/categories.lang b/htdocs/langs/mk_MK/categories.lang index 9349ecc5135..84e5796763e 100644 --- a/htdocs/langs/mk_MK/categories.lang +++ b/htdocs/langs/mk_MK/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup CategorieRecursiv=Link with parent tag/category automatically CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=Add the following product/service +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Show tag/category ByDefaultInList=By default in list ChooseCategory=Choose category -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/mk_MK/companies.lang b/htdocs/langs/mk_MK/companies.lang index 47c079b7378..ca5cbff55f1 100644 --- a/htdocs/langs/mk_MK/companies.lang +++ b/htdocs/langs/mk_MK/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof Id 1 (Federal number) ProfId4CH=Prof Id 2 (Commercial Record number) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof Id 1 (R.U.T.) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr) ProfId2DE=Prof Id 2 (USt.-Nr) ProfId3DE=Prof Id 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof Id 1 (CIF/NIF) ProfId2ES=Prof Id 2 (Social security number) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (Collegiate number) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof Id 1 (SIREN) ProfId2FR=Prof Id 2 (SIRET) ProfId3FR=Prof Id 3 (NAF, old APE) ProfId4FR=Prof Id 4 (RCS/RM) -ProfId5FR=- +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Registration Number ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX) ProfId4IN=Prof Id 4 ProfId5IN=Prof Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Business permit) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (R.C.) ProfId2MA=Id prof. 2 (Patente) ProfId3MA=Id prof. 3 (I.F.) ProfId4MA=Id prof. 4 (C.N.S.S.) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof Id 1 (R.F.C). ProfId2MX=Prof Id 2 (R..P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK nummer ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof Id 2 (Social security number) ProfId3PT=Prof Id 3 (Commercial Record number) ProfId4PT=Prof Id 4 (Conservatory) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof Id 1 (OGRN) ProfId2RU=Prof Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s). NorProspectNorCustomer=Not prospect, nor customer JuridicalStatus=Legal Entity Type +Workforce=Workforce Staff=Вработените ProspectLevelShort=Potential ProspectLevel=Prospect potential @@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor PaymentTypeBoth=Payment Type - Customer and Vendor MulticurrencyUsed=Use Multicurrency MulticurrencyCurrency=Currency +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/mk_MK/hrm.lang b/htdocs/langs/mk_MK/hrm.lang index a5d5c43a4e6..9f7475466fa 100644 --- a/htdocs/langs/mk_MK/hrm.lang +++ b/htdocs/langs/mk_MK/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=Вработени Employee=Вработен NewEmployee=Нов вработен +ListOfEmployees=List of employees diff --git a/htdocs/langs/mk_MK/languages.lang b/htdocs/langs/mk_MK/languages.lang index 3e571f0e756..a25efb26d67 100644 --- a/htdocs/langs/mk_MK/languages.lang +++ b/htdocs/langs/mk_MK/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Шпански (Парагвај) Language_es_PE=Шпански (Перу) Language_es_PR=Шпански (Порто Рико) +Language_es_US=Spanish (USA) Language_es_UY=Spanish (Uruguay) Language_es_GT=Spanish (Guatemala) Language_es_VE=Spanish (Venezuela) diff --git a/htdocs/langs/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang index 5d4bfbd830e..12eb210b51c 100644 --- a/htdocs/langs/mk_MK/main.lang +++ b/htdocs/langs/mk_MK/main.lang @@ -155,6 +155,7 @@ RemoveLink=Remove link AddToDraft=Add to draft Update=Update Close=Close +CloseAs=Set status to CloseBox=Remove widget from your dashboard Confirm=Confirm ConfirmSendCardByMail=Do you really want to send the content of this card by mail to %s? @@ -196,6 +197,7 @@ ReOpen=Re-Open Upload=Upload ToLink=Link Select=Select +SelectAll=Select all Choose=Choose Resize=Resize ResizeOrCrop=Resize or Crop @@ -256,6 +258,7 @@ Cards=Cards Card=Card Now=Now HourStart=Start hour +Deadline=Deadline Date=Date DateAndHour=Date and hour DateToday=Today's date @@ -264,8 +267,10 @@ DateStart=Start date DateEnd=End date DateCreation=Creation date DateCreationShort=Creat. date +IPCreation=Creation IP DateModification=Modification date DateModificationShort=Modif. date +IPModification=Modification IP DateLastModification=Latest modification date DateValidation=Validation date DateClosing=Closing date @@ -319,6 +324,7 @@ Morning=Morning Afternoon=Afternoon Quadri=Quadri MonthOfDay=Month of the day +DaysOfWeek=Days of week HourShort=H MinuteShort=mn Rate=Rate @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency MulticurrencyAmountHT=Amount (excl. tax), original currency MulticurrencyAmountTTC=Amount (inc. of tax), original currency MulticurrencyAmountVAT=Amount tax, original currency +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Amount tax 2 AmountLT2=Amount tax 3 AmountLT1ES=Amount RE @@ -487,6 +494,7 @@ By=By From=From FromDate=From FromLocation=From +at=at to=to To=to and=and @@ -509,6 +517,7 @@ Draft=Draft Drafts=Drafts StatusInterInvoiced=Invoiced Validated=Валидирано +ValidatedToProduce=Validated (To produce) Opened=Open OpenAll=Open (All) ClosedAll=Closed (All) @@ -655,6 +664,7 @@ Response=Response Priority=Priority SendByMail=Send by email MailSentBy=Email sent by +NotSent=Not sent TextUsedInTheMessageBody=Email body SendAcknowledgementByMail=Send confirmation email SendMail=Send email @@ -836,6 +846,7 @@ ListOfTemplates=List of templates Gender=Gender Genderman=Man Genderwoman=Woman +Genderother=Other ViewList=List view ViewGantt=Gantt view ViewKanban=Kanban view @@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous Calendar=Calendar GroupBy=Group by... ViewFlatList=View flat list +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Remove string '%s' SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at https://transifex.com/projects/p/dolibarr/ to add your improvements. DirectDownloadLink=Direct download link (public/external) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments SearchIntoExpenseReports=Expense reports SearchIntoLeaves=Leave SearchIntoTickets=Tickets +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Vendor payments +SearchIntoMiscPayments=Miscellaneous payments CommentLink=Comments NbComments=Number of comments CommentPage=Comments space @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Information Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Date of birth +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/mk_MK/mrp.lang b/htdocs/langs/mk_MK/mrp.lang index 863793063a0..f018be890cc 100644 --- a/htdocs/langs/mk_MK/mrp.lang +++ b/htdocs/langs/mk_MK/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/mk_MK/website.lang b/htdocs/langs/mk_MK/website.lang index 4b5294d5e43..03e042e4be6 100644 --- a/htdocs/langs/mk_MK/website.lang +++ b/htdocs/langs/mk_MK/website.lang @@ -31,7 +31,7 @@ AddWebsite=Add website Webpage=Web page/container AddPage=Add page/container HomePage=Home Page -PageContainer=Page/container +PageContainer=Page PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. 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. SiteDeleted=Web site '%s' deleted @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=RSS Feed RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/mn_MN/accountancy.lang b/htdocs/langs/mn_MN/accountancy.lang index 7b59e33b296..3211a0b62df 100644 --- a/htdocs/langs/mn_MN/accountancy.lang +++ b/htdocs/langs/mn_MN/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Default for service DefaultForProduct=Default for product CantSuggest=Can't suggest AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s -ConfigAccountingExpert=Configuration of the module accounting expert +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Journalization -Journaux=Journals +Journals=Journals JournalFinancial=Financial journals BackToChartofaccounts=Return chart of accounts Chartofaccounts=Chart of accounts +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Current dedicated account AssignDedicatedAccountingAccount=New account to assign InvoiceLabel=Invoice label @@ -33,8 +35,8 @@ OtherInfo=Other information DeleteCptCategory=Remove accounting account from group ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group? JournalizationInLedgerStatus=Status of journalization -AlreadyInGeneralLedger=Already journalized in ledgers -NotYetInGeneralLedger=Not yet journalized in ledgers +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group DetailByAccount=Show detail by account AccountWithNonZeroValues=Accounts with non-zero values @@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC CountriesNotInEEC=Countries not in EEC CountriesInEECExceptMe=Countries in EEC except %s CountriesExceptMe=All countries except %s -AccountantFiles=Export accounting documents +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup @@ -79,7 +83,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) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Select active chart of accounts ChangeAndLoad=Change and load Addanaccount=Add an accounting account @@ -89,6 +93,8 @@ SubledgerAccount=Subledger account SubledgerAccountLabel=Subledger account label ShowAccountingAccount=Show accounting account ShowAccountingJournal=Show accounting journal +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Accounting account suggested MenuDefaultAccounts=Default accounts MenuBankAccounts=Bank accounts @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding CreateMvts=Create new transaction UpdateMvts=Modification of a transaction ValidTransaction=Validate transaction -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=Ledger +BookkeepingSubAccount=Subledger AccountBalance=Account balance ObjectsRef=Source object ref CAHTF=Total purchase vendor before tax @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Sell journal ACCOUNTING_PURCHASE_JOURNAL=Purchase journal @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups ByYear=By year NotMatch=Not Set -DeleteMvt=Delete Ledger lines +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=Year to delete DelJournal=Journal to delete -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Finance journal ExpenseReportsJournal=Expense reports journal DescFinanceJournal=Finance journal including all the types of payments by bank account -DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Account for VAT not defined ThirdpartyAccountNotDefined=Account for third party not defined ProductAccountNotDefined=Account for product not defined @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu %s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Export draft journal @@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Chart of accounts Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/mn_MN/admin.lang b/htdocs/langs/mn_MN/admin.lang index 0d3a7174232..f1c41a3b62b 100644 --- a/htdocs/langs/mn_MN/admin.lang +++ b/htdocs/langs/mn_MN/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=Edition of field %s FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=LDAP Setup LDAPGlobalParameters=Global parameters @@ -1670,7 +1672,7 @@ AdvancedEditor=Advanced editor ActivateFCKeditor=Activate advanced editor for: FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services) FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing) FCKeditorForUserSignature=WYSIWIG creation/edition of user signature FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting 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 user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup diff --git a/htdocs/langs/mn_MN/banks.lang b/htdocs/langs/mn_MN/banks.lang index 75f9549dca5..9500a5b8b2e 100644 --- a/htdocs/langs/mn_MN/banks.lang +++ b/htdocs/langs/mn_MN/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=Miscellaneous payments ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA mandate YourSEPAMandate=Your SEPA mandate FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/mn_MN/categories.lang b/htdocs/langs/mn_MN/categories.lang index 9bb71984ecf..ba37a43b4ec 100644 --- a/htdocs/langs/mn_MN/categories.lang +++ b/htdocs/langs/mn_MN/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup CategorieRecursiv=Link with parent tag/category automatically CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=Add the following product/service +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Show tag/category ByDefaultInList=By default in list ChooseCategory=Choose category -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/mn_MN/companies.lang b/htdocs/langs/mn_MN/companies.lang index 92674363ced..dadff6a7894 100644 --- a/htdocs/langs/mn_MN/companies.lang +++ b/htdocs/langs/mn_MN/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof Id 1 (Federal number) ProfId4CH=Prof Id 2 (Commercial Record number) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof Id 1 (R.U.T.) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr) ProfId2DE=Prof Id 2 (USt.-Nr) ProfId3DE=Prof Id 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof Id 1 (CIF/NIF) ProfId2ES=Prof Id 2 (Social security number) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (Collegiate number) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof Id 1 (SIREN) ProfId2FR=Prof Id 2 (SIRET) ProfId3FR=Prof Id 3 (NAF, old APE) ProfId4FR=Prof Id 4 (RCS/RM) -ProfId5FR=- +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Registration Number ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX) ProfId4IN=Prof Id 4 ProfId5IN=Prof Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Business permit) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (R.C.) ProfId2MA=Id prof. 2 (Patente) ProfId3MA=Id prof. 3 (I.F.) ProfId4MA=Id prof. 4 (C.N.S.S.) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof Id 1 (R.F.C). ProfId2MX=Prof Id 2 (R..P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK nummer ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof Id 2 (Social security number) ProfId3PT=Prof Id 3 (Commercial Record number) ProfId4PT=Prof Id 4 (Conservatory) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof Id 1 (OGRN) ProfId2RU=Prof Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s). NorProspectNorCustomer=Not prospect, nor customer JuridicalStatus=Legal Entity Type +Workforce=Workforce Staff=Employees ProspectLevelShort=Potential ProspectLevel=Prospect potential @@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor PaymentTypeBoth=Payment Type - Customer and Vendor MulticurrencyUsed=Use Multicurrency MulticurrencyCurrency=Currency +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/mn_MN/hrm.lang b/htdocs/langs/mn_MN/hrm.lang index 6cc7f6bef24..3b8f137e103 100644 --- a/htdocs/langs/mn_MN/hrm.lang +++ b/htdocs/langs/mn_MN/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=Employees Employee=Employee NewEmployee=New employee +ListOfEmployees=List of employees diff --git a/htdocs/langs/mn_MN/languages.lang b/htdocs/langs/mn_MN/languages.lang index cc80b9f1719..ba187326705 100644 --- a/htdocs/langs/mn_MN/languages.lang +++ b/htdocs/langs/mn_MN/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Spanish (Paraguay) Language_es_PE=Spanish (Peru) Language_es_PR=Spanish (Puerto Rico) +Language_es_US=Spanish (USA) Language_es_UY=Spanish (Uruguay) Language_es_GT=Spanish (Guatemala) Language_es_VE=Spanish (Venezuela) diff --git a/htdocs/langs/mn_MN/main.lang b/htdocs/langs/mn_MN/main.lang index 1332148ae67..e22785650ad 100644 --- a/htdocs/langs/mn_MN/main.lang +++ b/htdocs/langs/mn_MN/main.lang @@ -155,6 +155,7 @@ RemoveLink=Remove link AddToDraft=Add to draft Update=Update Close=Close +CloseAs=Set status to CloseBox=Remove widget from your dashboard Confirm=Confirm ConfirmSendCardByMail=Do you really want to send the content of this card by mail to %s? @@ -196,6 +197,7 @@ ReOpen=Re-Open Upload=Upload ToLink=Link Select=Select +SelectAll=Select all Choose=Choose Resize=Resize ResizeOrCrop=Resize or Crop @@ -256,6 +258,7 @@ Cards=Cards Card=Card Now=Now HourStart=Start hour +Deadline=Deadline Date=Date DateAndHour=Date and hour DateToday=Today's date @@ -264,8 +267,10 @@ DateStart=Start date DateEnd=End date DateCreation=Creation date DateCreationShort=Creat. date +IPCreation=Creation IP DateModification=Modification date DateModificationShort=Modif. date +IPModification=Modification IP DateLastModification=Latest modification date DateValidation=Validation date DateClosing=Closing date @@ -319,6 +324,7 @@ Morning=Morning Afternoon=Afternoon Quadri=Quadri MonthOfDay=Month of the day +DaysOfWeek=Days of week HourShort=H MinuteShort=mn Rate=Rate @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency MulticurrencyAmountHT=Amount (excl. tax), original currency MulticurrencyAmountTTC=Amount (inc. of tax), original currency MulticurrencyAmountVAT=Amount tax, original currency +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Amount tax 2 AmountLT2=Amount tax 3 AmountLT1ES=Amount RE @@ -487,6 +494,7 @@ By=By From=From FromDate=From FromLocation=From +at=at to=to To=to and=and @@ -509,6 +517,7 @@ Draft=Draft Drafts=Drafts StatusInterInvoiced=Invoiced Validated=Validated +ValidatedToProduce=Validated (To produce) Opened=Open OpenAll=Open (All) ClosedAll=Closed (All) @@ -655,6 +664,7 @@ Response=Response Priority=Priority SendByMail=Send by email MailSentBy=Email sent by +NotSent=Not sent TextUsedInTheMessageBody=Email body SendAcknowledgementByMail=Send confirmation email SendMail=Send email @@ -836,6 +846,7 @@ ListOfTemplates=List of templates Gender=Gender Genderman=Man Genderwoman=Woman +Genderother=Other ViewList=List view ViewGantt=Gantt view ViewKanban=Kanban view @@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous Calendar=Calendar GroupBy=Group by... ViewFlatList=View flat list +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Remove string '%s' SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at https://transifex.com/projects/p/dolibarr/ to add your improvements. DirectDownloadLink=Direct download link (public/external) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments SearchIntoExpenseReports=Expense reports SearchIntoLeaves=Leave SearchIntoTickets=Tickets +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Vendor payments +SearchIntoMiscPayments=Miscellaneous payments CommentLink=Comments NbComments=Number of comments CommentPage=Comments space @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Information Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Date of birth +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/mn_MN/mrp.lang b/htdocs/langs/mn_MN/mrp.lang index 863793063a0..f018be890cc 100644 --- a/htdocs/langs/mn_MN/mrp.lang +++ b/htdocs/langs/mn_MN/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/mn_MN/website.lang b/htdocs/langs/mn_MN/website.lang index 4b5294d5e43..03e042e4be6 100644 --- a/htdocs/langs/mn_MN/website.lang +++ b/htdocs/langs/mn_MN/website.lang @@ -31,7 +31,7 @@ AddWebsite=Add website Webpage=Web page/container AddPage=Add page/container HomePage=Home Page -PageContainer=Page/container +PageContainer=Page PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. 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. SiteDeleted=Web site '%s' deleted @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=RSS Feed RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang index 9a3e5281b4f..cdf26c85c07 100644 --- a/htdocs/langs/nb_NO/accountancy.lang +++ b/htdocs/langs/nb_NO/accountancy.lang @@ -339,6 +339,8 @@ Modelcsv_configurable=Eksport CSV Konfigurerbar Modelcsv_FEC=Eksporter FEC Modelcsv_Sage50_Swiss=Eksport for Sage 50 Switzerland Modelcsv_winfic=Eksporter Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Kontoplan ID ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang index 60ce21e7983..9f6a787ed34 100644 --- a/htdocs/langs/nb_NO/admin.lang +++ b/htdocs/langs/nb_NO/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP-komponent %s lastet PreloadOPCode=Forhåndslastet OPCode brukes AddRefInList=Vis kunde/leverandør-ref i liste (velg liste eller kombinasjonsboks), og det meste av hyperkobling. Tredjepart vil vises med navnet "CC12345 - SC45678 - Stort selskap", i stedet for "Stort selskap". AddAdressInList=Vis liste over kunde-/leverandøradresseinfo (velg liste eller kombinasjonsboks)
Tredjeparter vil vises med et navnformat av "The Big Company Corp." - 21 Jump Street 123456 Big Town - USA "i stedet for" The Big Company Corp ". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Spør etter foretrukket sendingsmetode for tredjeparter FieldEdition=Endre felt %s FillThisOnlyIfRequired=Eksempel: +2 (brukes kun hvis du opplever problemer med tidssone offset) @@ -1420,6 +1421,7 @@ AdherentMailRequired=E-post kreves for å lage et nytt medlem MemberSendInformationByMailByDefault=Valg for å sende e-postbekreftelse til medlemmer (validering eller nytt abonnement) er krysset av som standard VisitorCanChooseItsPaymentMode=Besøkende kan velge blant tilgjengelige betalingsmåter MEMBER_REMINDER_EMAIL=Aktiver automatisk påminnelse via e-post av utløpte abonnementer. Merk: Modul %s må være aktivert og riktig oppsatt for å sende påminnelser. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=LDAP Setup LDAPGlobalParameters=Globale parametre @@ -1670,7 +1672,7 @@ AdvancedEditor=Avansert editor ActivateFCKeditor=Aktiver avansert editor for: FCKeditorForCompany=WYSIWIG opprettelse/endring av elementbeskrivelse og notater (untatt varer og tjenester) FCKeditorForProduct=WYSIWIG opprettelse/endring av vare-/tjenestebeskrivelse og notater -FCKeditorForProductDetails=WYSIWIG opprettelse/endring av varedetaljer for alle enheter (tilbud, ordre, fakturaer, osv ...). Advarsel! Bruk av dette alternativet er i dette tilfellet ikke anbefalt, da det kan skape problemer med spesialkarakterer og sideformatering ved opprettelse av PDF-filer. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG opprettelse/endring av masse-e-postutsendelser (Verktøy->E-post) FCKeditorForUserSignature=WYSIWIG-opprettelse av signatur FCKeditorForMail=WYSIWIG opprettelse/redigering for all post (unntatt Verktøy ->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Angi denne standardverdien automatisk for type hen AGENDA_DEFAULT_FILTER_TYPE=Still inn denne typen hendelse automatisk i søkefilter i agendavisning AGENDA_DEFAULT_FILTER_STATUS=Angi denne status automatisk for hendelser i søkefilter i agendavisning AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda -AGENDA_REMINDER_EMAIL=Aktiver hendelsespåminnelse via e-post (påminnelsesalternativ/forsinkelse kan defineres for hver hendelse). Merk: Modul %s må være aktivert og riktig satt opp for å få påminnelse sendt med riktig frekvens. -AGENDA_REMINDER_BROWSER=Aktiver hendelsespåminnelse i brukerens nettleser (når hendelsesdatoen er nådd, kan hver bruker nekte dette fra spørsmålet om nettleserbekreftelse) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Aktiver lydvarsler +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Vis koblet objekt i agendavisning ##### Clicktodial ##### ClickToDialSetup='Click To Dial' modul diff --git a/htdocs/langs/nb_NO/banks.lang b/htdocs/langs/nb_NO/banks.lang index d64fa0c597c..4717bd50c69 100644 --- a/htdocs/langs/nb_NO/banks.lang +++ b/htdocs/langs/nb_NO/banks.lang @@ -179,3 +179,4 @@ BankColorizeMovement=Fargelegg bevegelser BankColorizeMovementDesc=Hvis denne funksjonen er aktivert, kan du velge spesifikk bakgrunnsfarge for debet- eller kredittbevegelser BankColorizeMovementName1=Bakgrunnsfarge for debetbevegelse BankColorizeMovementName2=Bakgrunnsfarge for kredittbevegelse +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/nb_NO/categories.lang b/htdocs/langs/nb_NO/categories.lang index caf82c2e87b..b5d42ea3eba 100644 --- a/htdocs/langs/nb_NO/categories.lang +++ b/htdocs/langs/nb_NO/categories.lang @@ -81,6 +81,8 @@ CategoriesSetup=Oppsett av merker/kategorier CategorieRecursiv=Automatisk lenke til overordnet merke/kategori CategorieRecursivHelp=Hvis alternativet er på, når du legger til et produkt i en underkategori, vil produktet også bli lagt til i overordnet kategori. AddProductServiceIntoCategory=Legg til følgende vare/tjeneste +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Vis merke/kategori ByDefaultInList=Som standard i liste ChooseCategory=Velg kategori diff --git a/htdocs/langs/nb_NO/companies.lang b/htdocs/langs/nb_NO/companies.lang index d4eb19fbfe4..8a54b565605 100644 --- a/htdocs/langs/nb_NO/companies.lang +++ b/htdocs/langs/nb_NO/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-IdNr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof ID 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof ID 1 (Profesjonelt nummer) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof ID 1 (Føderalt nummer) ProfId4CH=Prof ID 2 (Commercial Record number) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof ID 1 (RUT) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof ID 1 (USt.-IdNr) ProfId2DE=Prof ID 2 (USt.-Nr) ProfId3DE=Prof ID 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof ID 1 (CIF / NIF) ProfId2ES=Prof ID 2 (personnummer) ProfId3ES=Prof ID 3 (CNAE) ProfId4ES=Prof ID 4 (Collegiate nummer) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof ID 1 (SIREN) ProfId2FR=Prof ID 2 (SIRET) ProfId3FR=Prof ID 3 (NAF, gammel APE) ProfId4FR=Prof ID 4 (RCS/RM) -ProfId5FR=Prof Id 5 +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Prof Id 1 (Registreringsnummer) ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof ID 3 (SRVC TAX) ProfId4IN=Prof ID 4 ProfId5IN=Prof Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Prof. ID 1 (R.C.S Luxembourg) ProfId2LU=Prof. ID (Forretningslisens) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Prof ID 1 (RC) ProfId2MA=Prof ID 2 (patent) ProfId3MA=Prof ID 3 (IF) ProfId4MA=Prof ID 4 (CNSS) -ProfId5MA=Prof ID 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof ID 1 (RFC). ProfId2MX=Prof ID 2 (R.. P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK nummer ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof ID 1 (NIPC) ProfId2PT=Prof ID 2 (Personnummer) ProfId3PT=Prof ID 3 (Commercial Record number) ProfId4PT=Prof ID 4 (Conservatory) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof ID 1 (OGRN) ProfId2RU=Prof ID 2 (INN) diff --git a/htdocs/langs/nb_NO/hrm.lang b/htdocs/langs/nb_NO/hrm.lang index 0dbd0e83398..bc2d3906005 100644 --- a/htdocs/langs/nb_NO/hrm.lang +++ b/htdocs/langs/nb_NO/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Jobbstillinger Employees=Ansatte Employee=Ansatt NewEmployee=Ny ansatt +ListOfEmployees=Liste over ansatte diff --git a/htdocs/langs/nb_NO/languages.lang b/htdocs/langs/nb_NO/languages.lang index 5a1c4ec625f..96839b3311b 100644 --- a/htdocs/langs/nb_NO/languages.lang +++ b/htdocs/langs/nb_NO/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Spansk (Panama) Language_es_PY=Spansk (Paraguay) Language_es_PE=Spansk (Peru) Language_es_PR=Spansk (Puerto Rico) +Language_es_US=Spanish (USA) Language_es_UY=Spansk (Uruguay) Language_es_GT=Spansk (Guatemala) Language_es_VE=Spansk (Venezuela) @@ -55,7 +56,7 @@ Language_fr_CM=Fransk (Kamerun) Language_fr_FR=Fransk Language_fr_GA=Fransk (Gabon) Language_fr_NC=Fransk (Ny Caledonia) -Language_fr_SN=French (Senegal) +Language_fr_SN=Fransk (Senegal) Language_fy_NL=Frisisk Language_gl_ES=Gælisk Language_he_IL=Hebraisk diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang index 37d2a4fd152..8def7e71e28 100644 --- a/htdocs/langs/nb_NO/main.lang +++ b/htdocs/langs/nb_NO/main.lang @@ -197,6 +197,7 @@ ReOpen=Gjenåpne Upload=Last opp ToLink=Lenke Select=Velg +SelectAll=Select all Choose=Velg Resize=Endre størrelse ResizeOrCrop=Endre størrelse eller beskjær @@ -257,6 +258,7 @@ Cards=Kort Card=Kort Now=Nå HourStart=Start time +Deadline=Deadline Date=Dato DateAndHour=Dato og tid DateToday=Dagens dato @@ -265,8 +267,10 @@ DateStart=Startdato DateEnd=Sluttdato DateCreation=Opprettet den DateCreationShort=Oppr. dato +IPCreation=Creation IP DateModification=Endret den DateModificationShort=Mod. dato +IPModification=Modification IP DateLastModification=Siste endringsdato DateValidation=Validert den DateClosing=Lukket den @@ -1102,3 +1106,4 @@ SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Sikkerhetstoken har ut UpToDate=Oppdatert OutOfDate=Utdatert EventReminder=Påminnelse om hendelse +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/nb_NO/mrp.lang b/htdocs/langs/nb_NO/mrp.lang index 25597ee9806..b3a5a2c1cd2 100644 --- a/htdocs/langs/nb_NO/mrp.lang +++ b/htdocs/langs/nb_NO/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Enhetskostnad TotalCost=Totalkostnad BOMTotalCost=Kostnaden for å produsere denne stykklisten basert på kostnadene for hver mengde og vare som skal konsumeres (bruk kostpris hvis definert, ellers gjennomsnittlig vektet pris hvis definert, ellers den beste kjøpesummen) GoOnTabProductionToProduceFirst=Du må først ha startet produksjonen for å lukke en produksjonsordre (se fanen '%s'). Men du kan kansellere den. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/nb_NO/website.lang b/htdocs/langs/nb_NO/website.lang index 1ce366d8e9c..a80a383be93 100644 --- a/htdocs/langs/nb_NO/website.lang +++ b/htdocs/langs/nb_NO/website.lang @@ -136,3 +136,4 @@ RSSFeed=RSS nyhetsstrøm RSSFeedDesc=Du kan få en RSS-feed med de nyeste artiklene med typen 'blogpost' ved hjelp av denne URL-en PagesRegenerated=%s side(r)/container(e) regenerert RegenerateWebsiteContent=Regenerer cache-filer på nettstedet +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/ne_NP/accountancy.lang b/htdocs/langs/ne_NP/accountancy.lang index 7b59e33b296..3211a0b62df 100644 --- a/htdocs/langs/ne_NP/accountancy.lang +++ b/htdocs/langs/ne_NP/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Default for service DefaultForProduct=Default for product CantSuggest=Can't suggest AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s -ConfigAccountingExpert=Configuration of the module accounting expert +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Journalization -Journaux=Journals +Journals=Journals JournalFinancial=Financial journals BackToChartofaccounts=Return chart of accounts Chartofaccounts=Chart of accounts +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Current dedicated account AssignDedicatedAccountingAccount=New account to assign InvoiceLabel=Invoice label @@ -33,8 +35,8 @@ OtherInfo=Other information DeleteCptCategory=Remove accounting account from group ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group? JournalizationInLedgerStatus=Status of journalization -AlreadyInGeneralLedger=Already journalized in ledgers -NotYetInGeneralLedger=Not yet journalized in ledgers +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group DetailByAccount=Show detail by account AccountWithNonZeroValues=Accounts with non-zero values @@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC CountriesNotInEEC=Countries not in EEC CountriesInEECExceptMe=Countries in EEC except %s CountriesExceptMe=All countries except %s -AccountantFiles=Export accounting documents +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup @@ -79,7 +83,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) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Select active chart of accounts ChangeAndLoad=Change and load Addanaccount=Add an accounting account @@ -89,6 +93,8 @@ SubledgerAccount=Subledger account SubledgerAccountLabel=Subledger account label ShowAccountingAccount=Show accounting account ShowAccountingJournal=Show accounting journal +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Accounting account suggested MenuDefaultAccounts=Default accounts MenuBankAccounts=Bank accounts @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding CreateMvts=Create new transaction UpdateMvts=Modification of a transaction ValidTransaction=Validate transaction -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=Ledger +BookkeepingSubAccount=Subledger AccountBalance=Account balance ObjectsRef=Source object ref CAHTF=Total purchase vendor before tax @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Sell journal ACCOUNTING_PURCHASE_JOURNAL=Purchase journal @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups ByYear=By year NotMatch=Not Set -DeleteMvt=Delete Ledger lines +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=Year to delete DelJournal=Journal to delete -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Finance journal ExpenseReportsJournal=Expense reports journal DescFinanceJournal=Finance journal including all the types of payments by bank account -DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Account for VAT not defined ThirdpartyAccountNotDefined=Account for third party not defined ProductAccountNotDefined=Account for product not defined @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu %s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Export draft journal @@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Chart of accounts Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/ne_NP/admin.lang b/htdocs/langs/ne_NP/admin.lang index 0d3a7174232..f1c41a3b62b 100644 --- a/htdocs/langs/ne_NP/admin.lang +++ b/htdocs/langs/ne_NP/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=Edition of field %s FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=LDAP Setup LDAPGlobalParameters=Global parameters @@ -1670,7 +1672,7 @@ AdvancedEditor=Advanced editor ActivateFCKeditor=Activate advanced editor for: FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services) FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing) FCKeditorForUserSignature=WYSIWIG creation/edition of user signature FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting 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 user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup diff --git a/htdocs/langs/ne_NP/banks.lang b/htdocs/langs/ne_NP/banks.lang index 75f9549dca5..9500a5b8b2e 100644 --- a/htdocs/langs/ne_NP/banks.lang +++ b/htdocs/langs/ne_NP/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=Miscellaneous payments ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA mandate YourSEPAMandate=Your SEPA mandate FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/ne_NP/categories.lang b/htdocs/langs/ne_NP/categories.lang index 9bb71984ecf..ba37a43b4ec 100644 --- a/htdocs/langs/ne_NP/categories.lang +++ b/htdocs/langs/ne_NP/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup CategorieRecursiv=Link with parent tag/category automatically CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=Add the following product/service +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Show tag/category ByDefaultInList=By default in list ChooseCategory=Choose category -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/ne_NP/companies.lang b/htdocs/langs/ne_NP/companies.lang index 92674363ced..dadff6a7894 100644 --- a/htdocs/langs/ne_NP/companies.lang +++ b/htdocs/langs/ne_NP/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof Id 1 (Federal number) ProfId4CH=Prof Id 2 (Commercial Record number) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof Id 1 (R.U.T.) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr) ProfId2DE=Prof Id 2 (USt.-Nr) ProfId3DE=Prof Id 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof Id 1 (CIF/NIF) ProfId2ES=Prof Id 2 (Social security number) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (Collegiate number) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof Id 1 (SIREN) ProfId2FR=Prof Id 2 (SIRET) ProfId3FR=Prof Id 3 (NAF, old APE) ProfId4FR=Prof Id 4 (RCS/RM) -ProfId5FR=- +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Registration Number ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX) ProfId4IN=Prof Id 4 ProfId5IN=Prof Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Business permit) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (R.C.) ProfId2MA=Id prof. 2 (Patente) ProfId3MA=Id prof. 3 (I.F.) ProfId4MA=Id prof. 4 (C.N.S.S.) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof Id 1 (R.F.C). ProfId2MX=Prof Id 2 (R..P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK nummer ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof Id 2 (Social security number) ProfId3PT=Prof Id 3 (Commercial Record number) ProfId4PT=Prof Id 4 (Conservatory) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof Id 1 (OGRN) ProfId2RU=Prof Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s). NorProspectNorCustomer=Not prospect, nor customer JuridicalStatus=Legal Entity Type +Workforce=Workforce Staff=Employees ProspectLevelShort=Potential ProspectLevel=Prospect potential @@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor PaymentTypeBoth=Payment Type - Customer and Vendor MulticurrencyUsed=Use Multicurrency MulticurrencyCurrency=Currency +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/ne_NP/hrm.lang b/htdocs/langs/ne_NP/hrm.lang index 6cc7f6bef24..3b8f137e103 100644 --- a/htdocs/langs/ne_NP/hrm.lang +++ b/htdocs/langs/ne_NP/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=Employees Employee=Employee NewEmployee=New employee +ListOfEmployees=List of employees diff --git a/htdocs/langs/ne_NP/languages.lang b/htdocs/langs/ne_NP/languages.lang index cc80b9f1719..ba187326705 100644 --- a/htdocs/langs/ne_NP/languages.lang +++ b/htdocs/langs/ne_NP/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Spanish (Paraguay) Language_es_PE=Spanish (Peru) Language_es_PR=Spanish (Puerto Rico) +Language_es_US=Spanish (USA) Language_es_UY=Spanish (Uruguay) Language_es_GT=Spanish (Guatemala) Language_es_VE=Spanish (Venezuela) diff --git a/htdocs/langs/ne_NP/main.lang b/htdocs/langs/ne_NP/main.lang index 0af5c66f0e0..96c68cdcfa3 100644 --- a/htdocs/langs/ne_NP/main.lang +++ b/htdocs/langs/ne_NP/main.lang @@ -155,6 +155,7 @@ RemoveLink=Remove link AddToDraft=Add to draft Update=Update Close=Close +CloseAs=Set status to CloseBox=Remove widget from your dashboard Confirm=Confirm ConfirmSendCardByMail=Do you really want to send the content of this card by mail to %s? @@ -196,6 +197,7 @@ ReOpen=Re-Open Upload=Upload ToLink=Link Select=Select +SelectAll=Select all Choose=Choose Resize=Resize ResizeOrCrop=Resize or Crop @@ -256,6 +258,7 @@ Cards=Cards Card=Card Now=Now HourStart=Start hour +Deadline=Deadline Date=Date DateAndHour=Date and hour DateToday=Today's date @@ -264,8 +267,10 @@ DateStart=Start date DateEnd=End date DateCreation=Creation date DateCreationShort=Creat. date +IPCreation=Creation IP DateModification=Modification date DateModificationShort=Modif. date +IPModification=Modification IP DateLastModification=Latest modification date DateValidation=Validation date DateClosing=Closing date @@ -319,6 +324,7 @@ Morning=Morning Afternoon=Afternoon Quadri=Quadri MonthOfDay=Month of the day +DaysOfWeek=Days of week HourShort=H MinuteShort=mn Rate=Rate @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency MulticurrencyAmountHT=Amount (excl. tax), original currency MulticurrencyAmountTTC=Amount (inc. of tax), original currency MulticurrencyAmountVAT=Amount tax, original currency +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Amount tax 2 AmountLT2=Amount tax 3 AmountLT1ES=Amount RE @@ -487,6 +494,7 @@ By=By From=From FromDate=From FromLocation=From +at=at to=to To=to and=and @@ -509,6 +517,7 @@ Draft=Draft Drafts=Drafts StatusInterInvoiced=Invoiced Validated=Validated +ValidatedToProduce=Validated (To produce) Opened=Open OpenAll=Open (All) ClosedAll=Closed (All) @@ -655,6 +664,7 @@ Response=Response Priority=Priority SendByMail=Send by email MailSentBy=Email sent by +NotSent=Not sent TextUsedInTheMessageBody=Email body SendAcknowledgementByMail=Send confirmation email SendMail=Send email @@ -836,6 +846,7 @@ ListOfTemplates=List of templates Gender=Gender Genderman=Man Genderwoman=Woman +Genderother=Other ViewList=List view ViewGantt=Gantt view ViewKanban=Kanban view @@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous Calendar=Calendar GroupBy=Group by... ViewFlatList=View flat list +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Remove string '%s' SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at https://transifex.com/projects/p/dolibarr/ to add your improvements. DirectDownloadLink=Direct download link (public/external) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments SearchIntoExpenseReports=Expense reports SearchIntoLeaves=Leave SearchIntoTickets=Tickets +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Vendor payments +SearchIntoMiscPayments=Miscellaneous payments CommentLink=Comments NbComments=Number of comments CommentPage=Comments space @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Information Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Date of birth +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/ne_NP/mrp.lang b/htdocs/langs/ne_NP/mrp.lang index 863793063a0..f018be890cc 100644 --- a/htdocs/langs/ne_NP/mrp.lang +++ b/htdocs/langs/ne_NP/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/ne_NP/website.lang b/htdocs/langs/ne_NP/website.lang index 4b5294d5e43..03e042e4be6 100644 --- a/htdocs/langs/ne_NP/website.lang +++ b/htdocs/langs/ne_NP/website.lang @@ -31,7 +31,7 @@ AddWebsite=Add website Webpage=Web page/container AddPage=Add page/container HomePage=Home Page -PageContainer=Page/container +PageContainer=Page PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. 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. SiteDeleted=Web site '%s' deleted @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=RSS Feed RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/nl_BE/accountancy.lang b/htdocs/langs/nl_BE/accountancy.lang index df9cdf82ec9..080da3b8334 100644 --- a/htdocs/langs/nl_BE/accountancy.lang +++ b/htdocs/langs/nl_BE/accountancy.lang @@ -7,7 +7,7 @@ ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Exporteren met globaal account Selectformat=Selecteer het formaat voor het bestand ACCOUNTING_EXPORT_FORMAT=Selecteer het formaat voor het bestand ACCOUNTING_EXPORT_PREFIX_SPEC=Geef de prefix voor het bestand -ConfigAccountingExpert=Configuratie van de module boekhouding expert +Journals=Dagboeken JournalFinancial=Financiële dagboeken BackToChartofaccounts=Geef kaart van accounts terug Selectchartofaccounts=Selecteer actieve grafieken van accounts diff --git a/htdocs/langs/nl_BE/banks.lang b/htdocs/langs/nl_BE/banks.lang index 9030ea033bc..69a470c6db3 100644 --- a/htdocs/langs/nl_BE/banks.lang +++ b/htdocs/langs/nl_BE/banks.lang @@ -2,5 +2,4 @@ TransferTo=Aan BankChecksToReceipt=Te innen cheques BankChecksToReceiptShort=Te innen cheques -BankMovements=Mutaties RejectCheckDate=Datum de cheque was teruggekeerd diff --git a/htdocs/langs/nl_BE/companies.lang b/htdocs/langs/nl_BE/companies.lang index 4740a852cae..a0db9d21665 100644 --- a/htdocs/langs/nl_BE/companies.lang +++ b/htdocs/langs/nl_BE/companies.lang @@ -34,12 +34,21 @@ WrongSupplierCode=Leverancierscode ongeldig SupplierCodeModel=Leverancierscode-model ProfId6=Professionele ID 6 ProfId2AR=Prof Id 2 (Inkomsten voor belastingen) +ProfId2AU=-- +ProfId3AU=-- +ProfId4AU=-- +ProfId2BE=-- +ProfId3BE=-- +ProfId4BE=-- +ProfId2CH=-- ProfId3CH=Prof id 1 (Federaal nummer) +ProfId4DE=-- ProfId2ES=Prof Id 2 (INSZ-nummer) +ProfId2GB=-- +ProfId4GB=-- ProfId1LU=Prof. Id. 1 (R.S.C. Luxemburg) ProfId2LU=Prof. Id. 2 (zakelijke vergunning) ProfId2MA=Id prof. 2 (Patent) -ProfId5MA=Id prof. 5 (C.I.C.E.) ProfId3MX=Prof Id 3 (Professioneel Charter) ProfId2PT=Prof. id 2 (INSZ-nummer) ProfId3PT=Prof. Id 3 (Commerciële fiche aantal) @@ -102,5 +111,6 @@ SaleRepresentativeFirstname=Voornaam van de verkoopsverantwoordelijke SaleRepresentativeLastname=Familienaam van de verkoopsverantwoordelijke ErrorThirdpartiesMerge=Er is een fout opgetreden bij het verwijderen van de derde partijen. Controleer het logboek. Wijzigingen zijn teruggedraaid. NewCustomerSupplierCodeProposed=Klant- of leverancierscode die al is gebruikt, wordt een nieuwe code voorgesteld +PaymentTypeCustomer=Betalingswijze - Klant PaymentTermsSupplier=Betalingstermijn - Verkoper PaymentTypeBoth=Betalingswijze - Klant en verkoper diff --git a/htdocs/langs/nl_BE/hrm.lang b/htdocs/langs/nl_BE/hrm.lang index da228383133..a8577d55908 100644 --- a/htdocs/langs/nl_BE/hrm.lang +++ b/htdocs/langs/nl_BE/hrm.lang @@ -8,3 +8,4 @@ ConfirmDeleteEstablishment=Weet U zeker dat U deze inrichting wilt verwijderen ? OpenEtablishment=Open inrichting CloseEtablishment=Sluit inrichting DictionaryDepartment=HRM - afdelingen lijst +ListOfEmployees=Lijst van werknemers diff --git a/htdocs/langs/nl_BE/languages.lang b/htdocs/langs/nl_BE/languages.lang index a27973f1fde..0da3656316c 100644 --- a/htdocs/langs/nl_BE/languages.lang +++ b/htdocs/langs/nl_BE/languages.lang @@ -1,2 +1,3 @@ # Dolibarr language file - Source file is en_US - languages +Language_bg_BG=Bulgaarse Language_fi_FI=Fins diff --git a/htdocs/langs/nl_BE/main.lang b/htdocs/langs/nl_BE/main.lang index d99036d1bdf..e91ff7bd44a 100644 --- a/htdocs/langs/nl_BE/main.lang +++ b/htdocs/langs/nl_BE/main.lang @@ -42,6 +42,7 @@ AuthenticationMode=Verificatiemodus RequestedUrl=Gevraagde URL RequestLastAccessInError=Laatste database toegangsaanvraag fout LineID=Regel ID +CloseAs=Zet de status op Resiliate=Beëindigen Hide=Verbergen NewObject=Nieuwe %s @@ -61,7 +62,6 @@ UserValidationShort=Geldig. gebruiker CurrencyRate=Wisselkoers van valuta UserModif=Gebruiker van laatste update PriceUHTCurrency=UP (valuta) -AmountHT=Bedrag (excl. BTW) MulticurrencyRemainderToPay=Blijf betalen, oorspronkelijke valuta MulticurrencyAmountHT=Bedrag (excl. Btw), oorspronkelijke valuta MulticurrencyAmountTTC=Bedrag (incl. Btw), oorspronkelijke valuta @@ -78,8 +78,8 @@ ApprovedBy2=Goedgekeurd door (tweede goedkeuring) Offered=Beschikbaar SetLinkToAnotherThirdParty=Link naar een derde partij SelectAction=Selecteer actie -Deny=Weigeren Denied=Geweigerd +Genderother=Ander Sincerely=Met vriendelijke groeten DeleteLine=Verwijder lijn ClassifyBilled=Wijzig Status naar "gefactureerd" diff --git a/htdocs/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang index dff9a6db046..c6449f8ac34 100644 --- a/htdocs/langs/nl_NL/accountancy.lang +++ b/htdocs/langs/nl_NL/accountancy.lang @@ -83,7 +83,7 @@ AccountancyAreaDescAnalyze=STAP %s: Maak boekingen aan of wijzigingen toe en maa AccountancyAreaDescClosePeriod=STAP %s: Sluit periode af zodat er geen wijzigingen meer kunnen worden aangebracht. -TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) +TheJournalCodeIsNotDefinedOnSomeBankAccount=Een verplichte stap in de installatie is niet voltooid (journaal met boekhoudcode niet gedefinieerd voor alle bankrekeningen) Selectchartofaccounts=Selecteer actief rekeningschema ChangeAndLoad=Wijzigen en inlezen Addanaccount=Nieuwe grootboekrekening @@ -156,8 +156,8 @@ ACCOUNTING_MANAGE_ZERO=Sta toe om een verschillend aantal nullen aan het einde v BANK_DISABLE_DIRECT_INPUT=Rechtstreeks boeken van transactie in bankboek uitzetten ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Schakel concept export van het journaal in ACCOUNTANCY_COMBO_FOR_AUX=Combo-lijst inschakelen voor dochteronderneming-account (kan traag zijn als u veel externe partijen hebt) -ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. -ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default +ACCOUNTING_DATE_START_BINDING=Definieer een startdatum voor het koppelen en doorboeken naar de boekhouding. Transacties voor deze datum worden niet doorgeboekt naar de boekhouding. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Selecteer bij boekhoudkundige overdracht standaard periodeweergave ACCOUNTING_SELL_JOURNAL=Verkoopboek ACCOUNTING_PURCHASE_JOURNAL=Inkoopboek @@ -213,12 +213,12 @@ ByPredefinedAccountGroups=Op voorgedefinieerde groepen ByPersonalizedAccountGroups=Op gepersonaliseerde groepen ByYear=Per jaar NotMatch=Niet ingesteld -DeleteMvt=Delete some operation lines from accounting +DeleteMvt=Verwijder enkele boekregels uit de boekhouding DelMonth=Maand om te verwijderen DelYear=Te verwijderen jaar DelJournal=Te verwijderen journaal -ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) +ConfirmDeleteMvt=Hiermee worden alle boekingen van de boekhouding voor het jaar / maand en / of voor een specifiek dagboek verwijderd (er is ten minste één criterium vereist). U moet de functie '%s' opnieuw gebruiken om de verwijderde boeking terug te krijgen. +ConfirmDeleteMvtPartial=Hiermee wordt de boeking uit de boekhouding verwijderd (alle regels die betrekking hebben op dezelfde boeking worden verwijderd) FinanceJournal=Kas/Bank journaal ExpenseReportsJournal=Overzicht resultaatrekening DescFinanceJournal=Financieel journaal inclusief alle soorten betalingen per kas/bankrekening @@ -339,6 +339,8 @@ Modelcsv_configurable=Configureerbare CSV export Modelcsv_FEC=FEC exporteren Modelcsv_Sage50_Swiss=Export voor Sage 50 Zwitserland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Rekeningschema Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang index 9cf48a43242..99c50f85f22 100644 --- a/htdocs/langs/nl_NL/admin.lang +++ b/htdocs/langs/nl_NL/admin.lang @@ -482,13 +482,13 @@ ModuleCompanyCodeCustomerDigitaria=%s gevolgd door de ingekorte klantnaam door h ModuleCompanyCodeSupplierDigitaria=%s gevolgd door de ingekorte leveranciersnaam met het aantal tekens: %s voor de boekhoudcode van de leverancier. Use3StepsApproval=Bestellingen moeten standaard worden gemaakt en goedgekeurd door 2 verschillende gebruikers (één stap / gebruiker om te maken en één stap / gebruiker goed te keuren. Merk op dat als gebruiker zowel toestemming heeft om te maken en goed te keuren, één stap / gebruiker volstaat) . U kunt met deze optie vragen om een ​​derde stap / gebruikersgoedkeuring in te voeren, als het bedrag hoger is dan een speciale waarde (dus 3 stappen zijn nodig: 1 = validatie, 2 = eerste keer goedkeuren en 3 = tweede keer goedkeuren als het bedrag voldoende is).
Stel deze optie in op leeg als één goedkeuring (2 stappen) voldoende is, stel deze in op een zeer lage waarde (0,1) als een tweede goedkeuring (3 stappen) altijd vereist is. UseDoubleApproval=Gebruik een goedkeuring in 3 stappen als het bedrag (zonder belasting) hoger is dan ... -WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons: -WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM +WarningPHPMail=WAARSCHUWING: De instelling om e-mails te verzenden vanuit de applicatie maakt gebruik van de standaard generieke instellingen. Om verschillende redenen is het vaak beter om uitgaande e-mails in te stellen om de e-mailserver van uw e-mailserviceprovider te gebruiken in plaats van de standaardinstellingen: +WarningPHPMailA=- Het gebruik van de server van de e-mailserviceprovider verhoogt de betrouwbaarheid van uw e-mail. Dus het verhoogt de kans te worden afgeleverd zonder te worden gemarkeerd als SPAM WarningPHPMailB=- Sommige e-mailproviders (zoals Yahoo) staan niet toe dat u een e-mail verzendt vanaf een andere server dan hun eigen server. Uw huidige installatie gebruikt de server van de applicatie om e-mail te verzenden en niet de server van uw e-mailprovider, dus sommige ontvangers (degene die compatibel zijn met het beperkende DMARC-protocol) zullen uw e-mailprovider vragen of zij uw e-mail kunnen accepteren en sommige e-mailproviders (zoals Yahoo) reageert mogelijk "nee" omdat de server niet van hen is, dus enkele van uw verzonden e-mails worden mogelijk niet geaccepteerd voor bezorging (let ook op de verzendquota van uw e-mailprovider). -WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox. -WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other. +WarningPHPMailC=- Het gebruik van de SMTP-server van uw eigen e-mailserviceprovider om e-mails te verzenden is ook interessant, dus alle e-mails die vanuit de toepassing worden verzonden, worden ook opgeslagen in uw "Verzonden" -map van uw mailbox. +WarningPHPMailD=Als de methode 'PHP Mail' echt de methode is die u zou willen gebruiken, kunt u deze waarschuwing verwijderen door de constante MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP toe te voegen aan 1 in Home - Setup - Other. WarningPHPMail2=Als uw e-mail SMTP-provider de e-mailclient moet beperken tot bepaalde IP-adressen (zeer zeldzaam), is dit het IP-adres van de mail user agent (MUA) voor uw ERP CRM-toepassing: %s. -WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: %s. +WarningPHPMailSPF=Als de domeinnaam in je afzender-e-mailadres is beschermd door een SPF-record (vraag je domeinnaamregistratie), moet je de volgende IP's toevoegen in het SPF-record van de DNS van je domein: %s. ClickToShowDescription=Klik voor omschrijving DependsOn=Deze module heeft de module(s) nodig RequiredBy=Deze module is vereist bij module(s) @@ -703,9 +703,9 @@ Permission61=Bekijk interventies Permission62=Creëer / wijzig interventies Permission64=Verwijder interventies Permission67=Exporteer interventies -Permission68=Send interventions by email -Permission69=Validate interventions -Permission70=Invalidate interventions +Permission68=Stuur interventies per e-mail +Permission69=Valideer interventies +Permission70=Interventies ongeldig maken Permission71=Bekijk leden Permission72=Creëer / wijzigen leden Permission74=Verwijder leden @@ -728,7 +728,7 @@ Permission95=Bekijk de rapporten Permission101=Bekijk verzendingen Permission102=Creëer / wijzig verzendingen Permission104=Valideer verzendingen -Permission105=Send sendings by email +Permission105=Verzend verzendingen per e-mail Permission106=Export zendingen Permission109=Verwijder verzendingen Permission111=Bekijk de financiële rekeningen @@ -836,10 +836,10 @@ Permission402=Creëren / wijzigen kortingen Permission403=Kortingen valideren Permission404=Kortingen verwijderen Permission430=Gebruik foutopsporingsbalk -Permission511=Read payments of salaries (yours and subordinates) +Permission511=Inlezen betalingen van salarissen (van jou en ondergeschikten) Permission512=Creëer / wijzig betalingen van salarissen Permission514=Betalingen van salarissen verwijderen -Permission517=Read payments of salaries of everybody +Permission517=Inlezen betalingen van salarissen van iedereen Permission519=Export salarissen Permission520=Lees Leningen Permission522=Creëer/wijzigen leningen @@ -851,12 +851,12 @@ Permission532=Creëren / wijzigen van diensten Permission534=Diensten verwijderen Permission536=Inzien / beheren van verborgen diensten Permission538=Diensten exporteren -Permission561=Read payment orders by credit transfer -Permission562=Create/modify payment order by credit transfer -Permission563=Send/Transmit payment order by credit transfer +Permission561=Inlezen betalingsopdrachten via overschrijving +Permission562=Betaalopdracht aanmaken/wijzigen via overschrijving +Permission563=Betaalopdracht verzenden Permission564=Record Debits/Rejections of credit transfer -Permission601=Read stickers -Permission602=Create/modify stickers +Permission601=Lees stickers +Permission602=Stickers maken/wijzigen Permission609=Verwijder etiketten Permission650=Lees stuklijsten Permission651=Materiaalrekeningen maken / bijwerken @@ -952,12 +952,12 @@ Permission23002=Maak/wijzig geplande taak Permission23003=Verwijder geplande taak Permission23004=Voer geplande taak uit Permission50101=Gebruik kassaonderdeel (SimplePOS) -Permission50151=Use Point of Sale (TakePOS) +Permission50151=Gebruik verkooppunt (TakePOS) Permission50201=Lees transacties Permission50202=Importeer transacties Permission50330=Read objects of Zapier Permission50331=Create/Update objects of Zapier -Permission50332=Delete objects of Zapier +Permission50332=Verwijder objecten van Zapier Permission50401=Bind producten en facturen met boekhoudrekeningen Permission50411=Bewerkingen lezen in grootboek Permission50412=Bewerkingen schrijven / bewerken in het grootboek @@ -982,10 +982,10 @@ Permission63002=Bronnen maken / wijzigen Permission63003=Verwijder resources Permission63004=Koppel middelen aan agenda-evenementen Permission64001=Sta direct printen toe -Permission67000=Allow printing of receipts -Permission68001=Read intracomm report -Permission68002=Create/modify intracomm report -Permission68004=Delete intracomm report +Permission67000=Printen kassabon toestaan +Permission68001=Lees intracomm rapport +Permission68002=Intracomm-rapport maken/wijzigen +Permission68004=Intracomm-rapport verwijderen Permission941601=Read receipts Permission941602=Bonnen aanmaken en wijzigen Permission941603=Validate receipts @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is geladen PreloadOPCode=Voorgeladen OPCode wordt gebruikt AddRefInList=Weergave klant/leverancier ref. infolijst (selecteer lijst of combobox) en de meeste hyperlinks.
Derden zullen verschijnen met een naamnotatie van "CC12345 - SC45678 - The Big Company corp." in plaats van "The Big Company corp". AddAdressInList=Toon klant / leverancier adres infolijst (selecteer lijst of combobox)
Derden zullen verschijnen met een naamnotatie van "The Big Company corp. - 21 jump street 123456 Big town - USA" in plaats van "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Vraag de gewenste verzendmethode voor derden. FieldEdition=Wijziging van het veld %s FillThisOnlyIfRequired=Voorbeeld: +2 (alleen invullen als tijdzone offset problemen worden ervaren) @@ -1420,6 +1421,7 @@ AdherentMailRequired=E-mail vereist om een nieuw lid te maken MemberSendInformationByMailByDefault=Vinkvakje om een bevestigingse-mail te sturen naar leden (validatie van nieuwe abonnementen). Staat standaard aan. VisitorCanChooseItsPaymentMode=Bezoeker kan kiezen uit beschikbare betalingsmodi MEMBER_REMINDER_EMAIL=Automatische herinnering per e-mail inschakelen voor verlopen abonnementen. Opmerking: Module %s moet zijn ingeschakeld en correct zijn ingesteld om herinneringen te verzenden. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=LDAP-instellingen LDAPGlobalParameters=Algemene instellingen @@ -1670,7 +1672,7 @@ AdvancedEditor=Geavanceerde editor ActivateFCKeditor=Activeer FCKeditor voor: FCKeditorForCompany=WYSIWIG creatie / bewerking van bedrijfsomschrijving en notities FCKeditorForProduct=WYSIWIG creatie / bewerking van product- / dienstomschrijving en notities -FCKeditorForProductDetails=WYSIWIG creatie / editie van productdetailsregels voor alle entiteiten (voorstellen, bestellingen, facturen, enz ...). Waarschuwing: het gebruik van deze optie voor dit geval wordt ernstig afgeraden, omdat dit problemen kan veroorzaken met speciale tekens en pagina-opmaak bij het bouwen van PDF-bestanden. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG creatie / bewerking van mailings FCKeditorForUserSignature=WYSIWIG creatie /aanpassing van ondertekening FCKeditorForMail=WYSIWIG creatie / bewerking voor alle e-mail (behalve Gereedschap-> E-mailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Stel deze standaardwaarde automatisch in voor het AGENDA_DEFAULT_FILTER_TYPE=Stel dit type evenement automatisch in het zoekfilter van de agendaweergave in AGENDA_DEFAULT_FILTER_STATUS=Stel deze status automatisch in voor evenementen in het zoekfilter van de agendaweergave AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda -AGENDA_REMINDER_EMAIL=Herinnering gebeurtenis inschakelen via e-mail (herinneringsoptie / vertraging kan worden gedefinieerd voor elke gebeurtenis). Opmerking: Module %s moet zijn ingeschakeld en correct zijn ingesteld om herinneringen op de juiste frequentie te laten verzenden. -AGENDA_REMINDER_BROWSER=Herinnering gebeurtenis inschakelen in de browser van de gebruiker (wanneer de datum van de gebeurtenis wordt bereikt, kan elke gebruiker dit weigeren via de bevestigingsvraag van de browser) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Schakel geluidsmelding in +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Gekoppeld object weergeven in agendaweergave ##### Clicktodial ##### ClickToDialSetup='Click-To-Dial' moduleinstellingen diff --git a/htdocs/langs/nl_NL/banks.lang b/htdocs/langs/nl_NL/banks.lang index da458aef622..2bdc1c80373 100644 --- a/htdocs/langs/nl_NL/banks.lang +++ b/htdocs/langs/nl_NL/banks.lang @@ -37,7 +37,7 @@ IbanValid=IBAN geldig IbanNotValid=IBAN is niet geldig StandingOrders=Incasso-opdrachten StandingOrder=Incasso-opdracht -PaymentByDirectDebit=Betaling via automatische incasso +PaymentByDirectDebit=Automatische incasso PaymentByBankTransfers=Betalingen via overschrijving PaymentByBankTransfer=Betaling via overschrijving AccountStatement=Rekeningafschrift @@ -73,8 +73,8 @@ ListBankTransactions=Lijst bankmutaties IdTransaction=Transactie ID BankTransactions=Bankmutaties BankTransaction=Bankmutatie -ListTransactions=Lijst items -ListTransactionsByCategory=Lijst items/categorie +ListTransactions=Mutatieoverzicht +ListTransactionsByCategory=Mutaties per categorie TransactionsToConciliate=Items af te stemmen TransactionsToConciliateShort=Af te stemmen Conciliable=Kunnen worden afgestemd @@ -126,7 +126,7 @@ NumberOfCheques=Checknr. DeleteTransaction=Ingave verwijderen ConfirmDeleteTransaction=Weet u zeker dat u deze boeking wilt verwijderen? ThisWillAlsoDeleteBankRecord=Hiermee wordt ook de boeking in de bank verwijderd -BankMovements=Verplaatsingen +BankMovements=Mutaties PlannedTransactions=Nog te verwerken Graph=Grafiek ExportDataset_banque_1=Bankboekingen en rekeningafschriften @@ -166,6 +166,9 @@ VariousPayment=Overige betaling VariousPayments=Diverse betalingen ShowVariousPayment=Laat overige betaling zien AddVariousPayment=Overige betaling toevoegen +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA-mandaat YourSEPAMandate=Uw SEPA-mandaat FindYourSEPAMandate=Met deze SEPA-machtiging geeft u ons bedrijf toestemming een opdracht ter incasso te sturen naar uw bank. Retourneer het ondertekend (scan van het ondertekende document) of stuur het per e-mail naar @@ -176,3 +179,4 @@ BankColorizeMovement=Inkleuren mutaties BankColorizeMovementDesc=Als deze functie is ingeschakeld, kunt u een specifieke achtergrondkleur kiezen voor debet- of creditmutaties BankColorizeMovementName1=Achtergrondkleur voor debetmutatie BankColorizeMovementName2=Achtergrondkleur voor creditmutatie +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/nl_NL/categories.lang b/htdocs/langs/nl_NL/categories.lang index e207eea9d84..c4008fe1ce5 100644 --- a/htdocs/langs/nl_NL/categories.lang +++ b/htdocs/langs/nl_NL/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Labels/categorieën instelling CategorieRecursiv= Automatische koppeling met bovenliggende label/categorie CategorieRecursivHelp=Als de optie is ingeschakeld, wordt het product ook toegevoegd aan de bovenliggende categorie wanneer u een product toevoegt aan een subcategorie. AddProductServiceIntoCategory=Voeg het volgende product/dienst toe +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Toon label/categorie ByDefaultInList=Standaard in de lijst ChooseCategory=Kies categorie -StocksCategoriesArea=Magazijnen Categorieën -ActionCommCategoriesArea=Gebeurtenissen categorieën omgeving -WebsitePagesCategoriesArea=Pagina-container categorieën +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Gebruik of operator voor categorieën diff --git a/htdocs/langs/nl_NL/companies.lang b/htdocs/langs/nl_NL/companies.lang index 2143cc917b0..2b4e7b136b4 100644 --- a/htdocs/langs/nl_NL/companies.lang +++ b/htdocs/langs/nl_NL/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof. id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof. id 1 (Professioneel nummer) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Belastingsnummer staat) @@ -144,11 +144,11 @@ ProfId3BR=IM (Belastingsnummer stad) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof id 1 (Federale nummer) ProfId4CH=Handelsregisternummer -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof Id 1 (RUT) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof. id 1 (USt.-IdNr) ProfId2DE=Prof. id 2 (USt.-Nr) ProfId3DE=Prof. Id 3 (Handelsregisternummer) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof Id 1 (CIF/NIF) ProfId2ES=Prof Id 2 (Social security number) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (Collegiate number) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof. id 1 (SIREN) ProfId2FR=Prof. id 2 (SIRET) ProfId3FR=Prof. Id 3 (NAF, oude APE) ProfId4FR=Prof. id 4 (RCS / RM) -ProfId5FR=Prof-id 5 +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Prof. id 1 (Registratienummer) ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 ProfId4IN=Prof Id 4 ProfId5IN=Prof-id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxemburg) ProfId2LU=Id. prof. 2 (Business permit) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (R.C.) ProfId2MA=Id prof. 2 (Patente) ProfId3MA=Id prof. 3 (I.F.) ProfId4MA=Id prof. 4 (C.N.S.S.) -ProfId5MA=ID. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof Id 1 (RFC). ProfId2MX=Prof Id 2 (R.. P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK nummer ProfId2NL== ProfId3NL== ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof. id 1 (NIPC) ProfId2PT=Prof. id 2 (Social security number) ProfId3PT=Prof. Id 3 (Commercial Record aantal) ProfId4PT=Prof. id 4 (Conservatorium) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof Id 1 (OGRN) ProfId2RU=Prof Id 2 (INN) diff --git a/htdocs/langs/nl_NL/hrm.lang b/htdocs/langs/nl_NL/hrm.lang index dc2d68d3a9e..00b91ece0f6 100644 --- a/htdocs/langs/nl_NL/hrm.lang +++ b/htdocs/langs/nl_NL/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Functies Employees=Werknemers Employee=Werknemer NewEmployee=Nieuwe werknemer +ListOfEmployees=List of employees diff --git a/htdocs/langs/nl_NL/languages.lang b/htdocs/langs/nl_NL/languages.lang index 186ee537182..e6b9fa70658 100644 --- a/htdocs/langs/nl_NL/languages.lang +++ b/htdocs/langs/nl_NL/languages.lang @@ -6,7 +6,7 @@ Language_ar_SA=Arabisch Language_az_AZ=Azerbaijani Language_bn_BD=Bengaals Language_bn_IN=Bengali (India) -Language_bg_BG=Bulgaarse +Language_bg_BG=Bulgaars Language_bs_BA=Bosnisch Language_ca_ES=Catalaans Language_cs_CZ=Tsjechisch @@ -23,7 +23,7 @@ Language_en_GB=Engels (Groot Brittannië) Language_en_IN=Engels (India) Language_en_NZ=Engels (Nieuw Zeeland) Language_en_SA=Engels (Saoedi-Arabië) -Language_en_SG=English (Singapore) +Language_en_SG=Engels (Singapore) Language_en_US=Engels (Verenigde Staten) Language_en_ZA=Engels (Zuid-Afrika) Language_es_ES=Spaans @@ -33,15 +33,16 @@ Language_es_CL=Spaans (Chili) Language_es_CO=Spaans (Colombia) Language_es_DO=Spaans (Dominicaanse Republiek) Language_es_EC=Spaans (Ecuador) -Language_es_GT=Spanish (Guatemala) +Language_es_GT=Spaans (Guatemala) Language_es_HN=Spaans (Honduras) Language_es_MX=Spaans (Mexico) Language_es_PA=Spaans (Panama) Language_es_PY=Spaans (Paraguay) Language_es_PE=Spaans (Peru) Language_es_PR=Spaans (Puerto Rico) +Language_es_US=Spanish (USA) Language_es_UY=Spaans (Uruguay) -Language_es_GT=Spanish (Guatemala) +Language_es_GT=Spaans (Guatemala) Language_es_VE=Spaans (Venezuela) Language_et_EE=Estlands Language_eu_ES=Bask @@ -50,12 +51,12 @@ Language_fi_FI=Voltooi Language_fr_BE=Frans (België) Language_fr_CA=Frans (Canada) Language_fr_CH=Frans (Zwitserland) -Language_fr_CI=French (Cost Ivory) -Language_fr_CM=French (Cameroun) +Language_fr_CI=Frans (Ivoorkust) +Language_fr_CM=Frans (Kameroen) Language_fr_FR=Frans (Frankrijk) Language_fr_GA=French (Gabon) Language_fr_NC=Frans (Nieuw-Caledonië) -Language_fr_SN=French (Senegal) +Language_fr_SN=Frans (Senegal) Language_fy_NL=Frisian Language_gl_ES=Galician Language_he_IL=Hebreeuws @@ -65,7 +66,7 @@ Language_hu_HU=Hongaars Language_id_ID=Indonesisch Language_is_IS=IJslands Language_it_IT=Italiaans -Language_it_CH=Italian (Switzerland) +Language_it_CH=Italiaans (Zwitserland) Language_ja_JP=Japans Language_ka_GE=Georgisch Language_km_KH=Khmer @@ -100,5 +101,5 @@ Language_uz_UZ=Oezbeeks Language_vi_VN=Vietnamees Language_zh_CN=Chinees Language_zh_TW=Chinees (traditioneel) -Language_zh_HK=Chinese (Hong Kong) +Language_zh_HK=Chinees (Hong Kong) Language_bh_MY=Maleis- diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang index 3356b74ed78..34b50571fb7 100644 --- a/htdocs/langs/nl_NL/main.lang +++ b/htdocs/langs/nl_NL/main.lang @@ -155,6 +155,7 @@ RemoveLink=Verwijder link AddToDraft=Toevoegen aan concept Update=Update Close=Sluiten +CloseAs=Wijzig status in CloseBox=Verwijder widget van uw dashboard Confirm=Bevestig ConfirmSendCardByMail=Wil je de inhoud van deze kaart echt per e-mail naar %s sturen ? @@ -196,6 +197,7 @@ ReOpen=Heropenen Upload=Uploaden ToLink=Link Select=Selecteer +SelectAll=Select all Choose=Kies Resize=Schalen ResizeOrCrop=Formaat wijzigen of bijsnijden @@ -256,6 +258,7 @@ Cards=Kaarten Card=Kaart Now=Nu HourStart=Start uur +Deadline=Deadline Date=Datum DateAndHour=Datum en uur DateToday=Huidige datum @@ -264,8 +267,10 @@ DateStart=Begindatum DateEnd=Einddatum DateCreation=Aanmaakdatum DateCreationShort=Aanmaakdatum +IPCreation=Creation IP DateModification=Wijzigingsdatum DateModificationShort=Wijzigingsdatum +IPModification=Modification IP DateLastModification=Laatste wijzigingsdatum DateValidation=Validatiedatum DateClosing=Sluitingsdatum @@ -319,6 +324,7 @@ Morning=Ochtend Afternoon=Namiddag Quadri=Trimester MonthOfDay=Maand van de dag +DaysOfWeek=Days of week HourShort=U MinuteShort=mn Rate=Tarief @@ -360,15 +366,16 @@ AmountInvoicedTTC=Amount invoiced (inc. tax) AmountPayment=Betalingsbedrag AmountHTShort=Bedrag (excl.) AmountTTCShort=Bedrag met BTW -AmountHT=Bedrag (excl. Belasting) +AmountHT=Bedrag (excl. BTW) AmountTTC=Bedrag (incl. BTW) AmountVAT=Bedrag BTW MulticurrencyAlreadyPaid=Reeds betaald, originele valuta MulticurrencyRemainderToPay=Rest openstaand, originele valuta MulticurrencyPaymentAmount=Betalingsbedrag, originele valuta -MulticurrencyAmountHT=Bedrag (excl. Belasting), oorspronkelijke valuta +MulticurrencyAmountHT=Bedrag (excl. BTW), oorspronkelijke valuta MulticurrencyAmountTTC=Bedrag (incl. BTW), oorspronkelijke valuta MulticurrencyAmountVAT=BTW bedrag, oorspronkelijke valuta +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Bedrag tax 2 AmountLT2=Bedrag tax 3 AmountLT1ES=Bedrag RE @@ -487,6 +494,7 @@ By=Door From=Van FromDate=Van FromLocation=Van +at=at to=t/m To=t/m and=en @@ -509,6 +517,7 @@ Draft=Concept Drafts=Concepten StatusInterInvoiced=gefactureerd Validated=Gevalideerd +ValidatedToProduce=Validated (To produce) Opened=Open OpenAll=Open (alles) ClosedAll=Gesloten (alles) @@ -619,7 +628,7 @@ FindBug=Rapporteer een bug NbOfThirdParties=Aantal derden NbOfLines=Aantal regels NbOfObjects=Aantal objecten -NbOfObjectReferers=Aantal gerelateerde items +NbOfObjectReferers=Aantal gerelateerde orders Referers=Gerelateerde items TotalQuantity=Totale hoeveelheid DateFromTo=Van %s naar %s @@ -655,6 +664,7 @@ Response=Antwoord Priority=Prioriteit SendByMail=Verzenden per e-mail MailSentBy=E-mail verzonden door +NotSent=Niet verzonden TextUsedInTheMessageBody=E-mailinhoud SendAcknowledgementByMail=Stuur e-mail ter bevestiging SendMail=Verzend e-mail @@ -829,13 +839,14 @@ ShowTransaction=Toon bankmutatie ShowIntervention=Tonen tussenkomst ShowContract=Toon contract GoIntoSetupToChangeLogo=Ga naar Home - Setup - Bedrijf om het logo te wijzigen of ga naar Home - Setup - Weergeven om te verbergen. -Deny=Wijgeren +Deny=Weigeren Denied=Gewijgerd ListOf=Lijst van %s ListOfTemplates=Lijst van templates Gender=Geslacht Genderman=Man Genderwoman=Vrouw +Genderother=Overig ViewList=Bekijk lijst ViewGantt=Gantt-weergave ViewKanban=Kanban-weergave @@ -877,6 +888,8 @@ Miscellaneous=Diversen Calendar=Kalender GroupBy=Groeperen op ... ViewFlatList=Weergeven als lijst +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString='%s' string verwijderen SomeTranslationAreUncomplete=Sommige aangeboden talen zijn mogelijk slechts gedeeltelijk vertaald of kunnen fouten bevatten. Help ons om uw taal te corrigeren door u te registreren op https://transifex.com/projects/p/dolibarr/ om uw verbeteringen toe te voegen. DirectDownloadLink=Directe download link (openbaar/extern) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Klantzendingen SearchIntoExpenseReports=Onkostennota's SearchIntoLeaves=Vertrekken SearchIntoTickets=Tickets +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Leveranciersbetalingen +SearchIntoMiscPayments=Diverse betalingen CommentLink=Opmerkingen NbComments=Aantal reacties CommentPage=Reacties ruimte @@ -1078,8 +1094,16 @@ ByStatus=Op status InformationMessage=Informatie Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Geboortedatum +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/nl_NL/mrp.lang b/htdocs/langs/nl_NL/mrp.lang index 7852dbe15f2..d6ad354427d 100644 --- a/htdocs/langs/nl_NL/mrp.lang +++ b/htdocs/langs/nl_NL/mrp.lang @@ -77,3 +77,4 @@ UnitCost=De kosten per eenheid TotalCost=Totale prijs BOMTotalCost=De kosten voor het produceren van deze stuklijst op basis van de kosten van elke hoeveelheid en elk te consumeren product (gebruik kostprijs indien gedefinieerd, anders gemiddelde gewogen prijs indien gedefinieerd, anders de beste aankoopprijs) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/nl_NL/website.lang b/htdocs/langs/nl_NL/website.lang index 165a5b0ab3f..855e09828b2 100644 --- a/htdocs/langs/nl_NL/website.lang +++ b/htdocs/langs/nl_NL/website.lang @@ -31,7 +31,7 @@ AddWebsite=Website toevoegen Webpage=Webpagina/container AddPage=Voeg pagina/container toe HomePage=Startpagina -PageContainer=Pagina/container +PageContainer=Pagina PreviewOfSiteNotYetAvailable=Voorbeeld van uw website %s is nog niet beschikbaar. U moet eerst 'Een volledige websitesjabloon importeren' of alleen 'Een pagina / container toevoegen'. RequestedPageHasNoContentYet=Gevraagde pagina met id %s heeft nog geen inhoud of cachebestand .tpl.php is verwijderd. Bewerk de inhoud van de pagina om dit op te lossen. SiteDeleted=Website '%s' verwijderd @@ -74,7 +74,7 @@ CreateByFetchingExternalPage=Pagina / container maken door pagina op te halen va OrEnterPageInfoManually=Of maak een nieuwe pagina of een paginasjabloon ... FetchAndCreate=Ophalen en maken ExportSite=Website exporteren -ImportSite=Websitemalplaatje importeren +ImportSite=Website template importeren IDOfPage=Id van pagina Banner=banier BlogPost=Blogpost @@ -118,7 +118,7 @@ ReplaceString=Nieuwe string CSSContentTooltipHelp=Voer hier CSS-inhoud in. Om elk conflict met de CSS van de toepassing te voorkomen, moet u alle aangiften met de .bodywebsite-klasse overslaan. Bijvoorbeeld:

#mycssselector, input.myclass: hover {...}
moet zijn
.bodywebsite #mycssselector, .bodywebsite input.myclass: hover {...}

Opmerking: als u een groot bestand zonder dit voorvoegsel hebt, kunt u 'lessc' gebruiken om het te converteren om het .bodywebsite-voorvoegsel overal toe te voegen. LinkAndScriptsHereAreNotLoadedInEditor=Waarschuwing: deze inhoud wordt alleen uitgevoerd wanneer de site wordt geopend vanaf een server. Het wordt niet gebruikt in de bewerkingsmodus, dus als u JavaScript-bestanden ook in de bewerkingsmodus wilt laden, voegt u gewoon uw tag 'script src = ...' toe aan de pagina. Dynamiccontent=Voorbeeld van een pagina met dynamische inhoud -ImportSite=Websitemalplaatje importeren +ImportSite=Website template importeren EditInLineOnOff=Modus 'Inline bewerken' is %s ShowSubContainersOnOff=De modus om 'dynamische inhoud' uit te voeren is %s GlobalCSSorJS=Globaal CSS / JS / Header-bestand van website @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Vervanging gedaan in %s pagina's of containers RSSFeed=RSS-feeds RSSFeedDesc=U kunt via deze URL een RSS-feed krijgen van de nieuwste artikelen met het type 'blogpost' PagesRegenerated=%s pagina ('s) / container (s) her-aangemaakt +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/pl_PL/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang index 2bb1cd7da36..f7abea4f251 100644 --- a/htdocs/langs/pl_PL/accountancy.lang +++ b/htdocs/langs/pl_PL/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Domyślny dla usługi DefaultForProduct=Domyślny dla produktu CantSuggest=Nie mogę zasugerować AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s -ConfigAccountingExpert=Konfiguracja modułu eksperta księgowego +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Dokumentowanie -Journaux=Dzienniki +Journals=Dzienniki JournalFinancial=Dzienniki finansowe BackToChartofaccounts=Zwróć plan kont Chartofaccounts=Plan kont +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Aktualne dedykowane konto AssignDedicatedAccountingAccount=Nowe konto do przypisania InvoiceLabel=Etykieta faktury @@ -33,8 +35,8 @@ OtherInfo=Inne informacje DeleteCptCategory=Usuń konto księgowe z grupy ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group? JournalizationInLedgerStatus=Status dokumentowania -AlreadyInGeneralLedger=Already journalized in ledgers -NotYetInGeneralLedger=Not yet journalized in ledgers +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group DetailByAccount=Pokaż szczegóły konta AccountWithNonZeroValues=Konta z wartościami niezerowymi @@ -43,7 +45,9 @@ CountriesInEEC=Kraje UE CountriesNotInEEC=Kraje spoza UE CountriesInEECExceptMe=Kraje UE oprócz %s CountriesExceptMe=Wszystkie kraje oprócz %s -AccountantFiles=Eksportuj dokumenty księgowe +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Główne konto księgowe dla klientów nie zdefiniowane w ustawieniach MainAccountForSuppliersNotDefined=Główne konto rozliczeniowe dla dostawców niezdefiniowane w konfiguracji @@ -79,7 +83,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) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Wybierz aktywny wykres kont ChangeAndLoad=Zmień i załaduj Addanaccount=Dodaj konto księgowe @@ -89,6 +93,8 @@ SubledgerAccount=Subledger account SubledgerAccountLabel=Subledger account label ShowAccountingAccount=Wyświetl konta księgowe ShowAccountingJournal=Wyświetl dziennik konta księgowego +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Zalecane konto rachunkowe MenuDefaultAccounts=Domyślne konta MenuBankAccounts=Konta bankowe @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Wiążący raport z wydatków CreateMvts=Utwórz nową transakcję UpdateMvts=Modyfikacja transakcji ValidTransaction=Potwierdź transakcję -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=Księga główna +BookkeepingSubAccount=Subledger AccountBalance=Bilans konta ObjectsRef=Source object ref CAHTF=Total purchase vendor before tax @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Wyłącz bezpośrednią rejestrację transakcji na kon ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Dziennik sprzedaży ACCOUNTING_PURCHASE_JOURNAL=Dziennik zakupów @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Konto księgowe dla oczekujących DONATION_ACCOUNTINGACCOUNT=Konto księgowe dla zarejestrowanych dotatcji ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups ByYear=Według roku NotMatch=Nie ustawione -DeleteMvt=Usuń linie z księgi głównej +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=Rok do usunęcia DelJournal=Dziennik do usunięcia -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Dziennik finansów ExpenseReportsJournal=Dziennik raportów kosztów DescFinanceJournal=Dziennik finansów zawiera wszystkie typy płatności wykonane przez konto bankowe -DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Konto dla niezdefiniowanego VATu ThirdpartyAccountNotDefined=Konto dla niezdefiniowanego kontrahenta ProductAccountNotDefined=Konto dla produktu nie zdefiniowane @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=Ten dziennik jest już w użytku AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu %s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Export dziennika projektu @@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Chart of accounts Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang index bc88bb80c96..cfd5007cf51 100644 --- a/htdocs/langs/pl_PL/admin.lang +++ b/htdocs/langs/pl_PL/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=Edycja pola% s FillThisOnlyIfRequired=Przykład: +2 (wypełnić tylko w przypadku strefy czasowej w stosunku problemy są doświadczeni) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member MemberSendInformationByMailByDefault=Checkbox wysłać mail z potwierdzeniem do członków jest domyślnie VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=Konfiguracja LDAP LDAPGlobalParameters=Parametry globalne @@ -1670,7 +1672,7 @@ AdvancedEditor=Zaawansowany edytor ActivateFCKeditor=Uaktywnij FCKeditor za: FCKeditorForCompany=WYSIWIG tworzenie / edycja spółek opis i notatki FCKeditorForProduct=WYSIWIG tworzenie / edycja produktów / usług "opis i notatki -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG tworzenie / edycja wiadomości FCKeditorForUserSignature=WYSIWIG tworzenie / edycja podpisu użytkownika FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting 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 user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view ##### Clicktodial ##### ClickToDialSetup=Kliknij, aby Dial konfiguracji modułu diff --git a/htdocs/langs/pl_PL/banks.lang b/htdocs/langs/pl_PL/banks.lang index 97fac86efb6..58fe92e5f58 100644 --- a/htdocs/langs/pl_PL/banks.lang +++ b/htdocs/langs/pl_PL/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=Różne płatności ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA mandate YourSEPAMandate=Your SEPA mandate FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/pl_PL/categories.lang b/htdocs/langs/pl_PL/categories.lang index 8f7a1a2bb8c..a6dfccaf849 100644 --- a/htdocs/langs/pl_PL/categories.lang +++ b/htdocs/langs/pl_PL/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Tagi / kategorie Konfiguracja CategorieRecursiv=Związek z dominującą tag / kategorii automatycznie CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=Dodaj następujący produkt / usługę +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Pokaż tag / kategoria ByDefaultInList=Domyśłnie na liście ChooseCategory=Wybrane kategorie -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/pl_PL/companies.lang b/htdocs/langs/pl_PL/companies.lang index 4eee2f0ecb7..0c7c3c2eb09 100644 --- a/htdocs/langs/pl_PL/companies.lang +++ b/htdocs/langs/pl_PL/companies.lang @@ -56,7 +56,7 @@ NatureOfThirdParty=Rodzaj kontrahenta NatureOfContact=Nature of Contact Address=Adres State=Województwo -StateCode=State/Province code +StateCode=Kod Stanu/Prowincji StateShort=Województwo Region=Region Region-State=Region - Województwo @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof ID 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof ID 1 (Professional number) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE @@ -144,11 +144,11 @@ ProfId3BR=IM ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof Id 1 (Federal numer) ProfId4CH=Prof ID 2 (Commercial rekordowa liczba) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof Id 1 (RUT) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr) ProfId2DE=Prof ID 2 (USt. Nr) ProfId3DE=Prof ID 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof Id 1 (CIF / NIF) ProfId2ES=Id Prof 2 (numer ubezpieczenia społeczne) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Id Prof 4 (liczba Collegiate) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof Id 1 (SIREN) ProfId2FR=Prof ID 2 (SIRET) ProfId3FR=Prof Id 3 (NAF, stare APE) ProfId4FR=Prof Id 4 (RCS / RM) -ProfId5FR=- +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Numer rejestracyjny ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof ID 3 ProfId4IN=Prof ID 4 ProfId5IN=Prof ID 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Pozwolenie na działalność gospodarczą) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (RC) ProfId2MA=Id prof. 2 (Patente) ProfId3MA=Id prof. 3 (IF) ProfId4MA=Id prof. 4 (CNSS) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof Id 1 (RFC). ProfId2MX=Prof Id 2 (R.. P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=nummer KVK ProfId2NL=- ProfId3NL=- ProfId4NL=- -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof ID 2 (numer ubezpieczenia społecznego) ProfId3PT=Prof Id 3 (Commercial rekordowa liczba) ProfId4PT=Prof Id 4 (Konserwatorium) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=Ninea @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof Id 1 (OGRN) ProfId2RU=Prof Id 2 (INN) @@ -297,7 +302,7 @@ AddContact=Stwórz konktakt AddContactAddress=Stwórz kontakt/adres EditContact=Edytuj kontakt EditContactAddress=Edytuj kontakt / adres -Contact=Contact/Address +Contact=Kontakt/Adres Contacts=Kontakty/adresy ContactId=Identyfikator kontaktu ContactsAddresses=Kontakty / Adresy @@ -326,7 +331,7 @@ ListOfContacts=Lista kontaktów/adresów ListOfContactsAddresses=Lista kontaktów/adresów ListOfThirdParties=Lista kontrahentów ShowCompany=Third Party -ShowContact=Contact-Address +ShowContact=Kontakt-Adres ContactsAllShort=Wszystkie (bez filtra) ContactType=Typ kontaktu ContactForOrders=Kontakt dla zamówienia @@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi ErrorVATCheckMS_UNAVAILABLE=Brak możliwości sprawdzenia. Usługa nie jest dostarczana dla wybranego regionu (%s). NorProspectNorCustomer=Not prospect, nor customer JuridicalStatus=Legal Entity Type +Workforce=Workforce Staff=Pracownicy ProspectLevelShort=Potencjał ProspectLevel=Potencjał potencjalnego klienta @@ -456,3 +462,8 @@ PaymentTermsSupplier=Warunki płatności - Sprzedawca PaymentTypeBoth=Typ płatności - Klient i Sprzedawca MulticurrencyUsed=Użyj wielowalutowości MulticurrencyCurrency=Waluta +InEEC=Europa (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/pl_PL/hrm.lang b/htdocs/langs/pl_PL/hrm.lang index a98f73bcb23..d6f087e0817 100644 --- a/htdocs/langs/pl_PL/hrm.lang +++ b/htdocs/langs/pl_PL/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=Zatrudnionych Employee=Pracownik NewEmployee=Nowy pracownik +ListOfEmployees=Lista pracowników diff --git a/htdocs/langs/pl_PL/languages.lang b/htdocs/langs/pl_PL/languages.lang index 8448976c9dd..946fc017a49 100644 --- a/htdocs/langs/pl_PL/languages.lang +++ b/htdocs/langs/pl_PL/languages.lang @@ -40,6 +40,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_US=Spanish (USA) Language_es_UY=Hiszpański (Urugwaj) Language_es_GT=Spanish (Guatemala) Language_es_VE=Hiszpański (Wenezuela) diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang index 3a69a3bf91d..401ac7b9b3c 100644 --- a/htdocs/langs/pl_PL/main.lang +++ b/htdocs/langs/pl_PL/main.lang @@ -155,6 +155,7 @@ RemoveLink=Usuń link AddToDraft=Dodaj do szkicu Update=Uaktualnić Close=Zamknij +CloseAs=Ustaw status do CloseBox=Usuń widget ze swojej tablicy Confirm=Potwierdź ConfirmSendCardByMail=Do you really want to send the content of this card by mail to %s? @@ -170,12 +171,12 @@ ToValidate=Aby potwierdzić NotValidated=Nie potwierdzone Save=Zapisać SaveAs=Zapisz jako -SaveAndStay=Save and stay +SaveAndStay=Zapisz i zostań SaveAndNew=Save and new TestConnection=Test połączenia ToClone=Duplikuj -ConfirmCloneAsk=Are you sure you want to clone the object %s? -ConfirmClone=Choose data you want to clone: +ConfirmCloneAsk=Czy jesteś pewny, chcesz sklonować objekt%s? +ConfirmClone=Wybierz datę którą chcesz sklonować: NoCloneOptionsSpecified=Brak zdefiniowanych danych do zduplikowania. Of=z Go=Idź @@ -187,15 +188,16 @@ ShowCardHere=Pokaż kartę Search=Wyszukaj SearchOf=Szukaj SearchMenuShortCut=Ctrl + shift + f -QuickAdd=Quick add +QuickAdd=Szybkie dodanie QuickAddMenuShortCut=Ctrl + shift + l Valid=Aktualny Approve=Zatwierdź Disapprove=Potępiać ReOpen=Otwórz ponownie -Upload=Upload +Upload=Wczytaj ToLink=Łącze Select=Wybierz +SelectAll=Select all Choose=Wybrać Resize=Zmiana rozmiaru ResizeOrCrop=Zmień rozmiar lub przytnij @@ -210,7 +212,7 @@ Password=Hasło PasswordRetype=Powtórz hasło NoteSomeFeaturesAreDisabled=Należy pamiętać, że wiele funkcji/modułów jest wyłączonych w tej demonstracji. Name=Nazwa -NameSlashCompany=Name / Company +NameSlashCompany=Nazwa / Firma Person=Osoba Parameter=Parametr Parameters=Parametry @@ -256,6 +258,7 @@ Cards=Kartki Card=Karta Now=Teraz HourStart=Godzina startu +Deadline=Deadline Date=Data DateAndHour=Data i godzina DateToday=Dzisiejsza data @@ -264,8 +267,10 @@ DateStart=Data rozpoczęcia DateEnd=Data zakończenia DateCreation=Data utworzenia DateCreationShort=Data utworzenia +IPCreation=Creation IP DateModification=Zmiana daty DateModificationShort=Data modyfikacji +IPModification=Modification IP DateLastModification=Data ostatniej zmiany DateValidation=Zatwierdzenie daty DateClosing=Ostateczny termin @@ -287,7 +292,7 @@ UserModification=Modyfikacja użytkownika UserValidation=Validation user UserCreationShort=Utwórz użytkownika UserModificationShort=Zmień użytkownika -UserValidationShort=Valid. user +UserValidationShort=Zły. Użytkownik DurationYear=rok DurationMonth=miesiąc DurationWeek=tydzień @@ -319,6 +324,7 @@ Morning=Rano Afternoon=Popołudniu Quadri=Kwadrans MonthOfDay=Dzień miesiąca +DaysOfWeek=Days of week HourShort=H MinuteShort=mn Rate=Stawka @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Kwota płatności, oryginalna waluta MulticurrencyAmountHT=Amount (excl. tax), original currency MulticurrencyAmountTTC=Kwota (zVAT), oryginalna waluta MulticurrencyAmountVAT=Kwota VAT, oryginalna waluta +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Wartość podatku 2 AmountLT2=Wartość podatku 3 AmountLT1ES=Kwota RE @@ -390,13 +397,13 @@ Totalforthispage=Suma dla tej strony TotalTTC=Ogółem (z VAT) TotalTTCToYourCredit=Ogółem (z VAT) na twoje konto TotalVAT=Razem VAT -TotalVATIN=Total IGST +TotalVATIN=Wszystkie IGST TotalLT1=Podatek całkowity 2 TotalLT2=Podatek całkowity 3 TotalLT1ES=Razem RE TotalLT2ES=Razem IRPF -TotalLT1IN=Total CGST -TotalLT2IN=Total SGST +TotalLT1IN=Wszystkie CGST +TotalLT2IN=Wszystkie SGST HT=Bez VAT TTC= z VAT INCVATONLY=Zawiera VAT @@ -487,6 +494,7 @@ By=Przez From=Od FromDate=Z FromLocation=Z +at=at to=do To=do and=i @@ -509,6 +517,7 @@ Draft=Szkic Drafts=Robocze StatusInterInvoiced=Invoiced Validated=Zatwierdzona +ValidatedToProduce=Validated (To produce) Opened=Otwarte OpenAll=Open (All) ClosedAll=Closed (All) @@ -653,15 +662,16 @@ FeatureNotYetSupported=Funkcja nie jest jeszcze obsługiwana CloseWindow=Zamknij okno Response=Odpowiedź Priority=Priorytet -SendByMail=Send by email +SendByMail=Wyślij przez email MailSentBy=E-mail został wysłany przez +NotSent=Nie wysłał TextUsedInTheMessageBody=Zawartość emaila SendAcknowledgementByMail=Wyślij email potwierdzający SendMail=Wyślij wiadomość email Email=Adres e-mail NoEMail=Brak e-mail -AlreadyRead=Already read -NotRead=Not read +AlreadyRead=Obecnie przeczytane +NotRead=Nie przeczytane NoMobilePhone=Brak telefonu komórkowego Owner=Właściciel FollowingConstantsWillBeSubstituted=Kolejna zawartość będzie zastąpiona wartością z korespondencji. @@ -779,7 +789,7 @@ LinkToSupplierProposal=Link to vendor proposal LinkToSupplierInvoice=Link to vendor invoice LinkToContract=Link do umowy LinkToIntervention=Link do interwencji -LinkToTicket=Link to ticket +LinkToTicket=Link do biletu CreateDraft=Utwórz Szic SetToDraft=Wróć do szkicu ClickToEdit=Kliknij by edytować @@ -836,6 +846,7 @@ ListOfTemplates=Lista szablonów Gender=Płeć Genderman=Mężczyzna Genderwoman=Kobieta +Genderother=Inne ViewList=Widok listy ViewGantt=Gantt view ViewKanban=Kanban view @@ -877,6 +888,8 @@ Miscellaneous=Różne Calendar=Kalendarz GroupBy=Grupuj według ViewFlatList=Zobacz płaską listę +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Usuń ciąg '%s' SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at https://transifex.com/projects/p/dolibarr/ to add your improvements. DirectDownloadLink=Bezpośredni link do pobierania (publiczny / zewnętrzny) @@ -1007,7 +1020,10 @@ SearchIntoContracts=Kontrakty SearchIntoCustomerShipments=Wysyłki klienta SearchIntoExpenseReports=Zestawienia wydatków SearchIntoLeaves=Leave -SearchIntoTickets=Tickets +SearchIntoTickets=Bilety +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Vendor payments +SearchIntoMiscPayments=Różne płatności CommentLink=Komentarze NbComments=Ilość komentarzy CommentPage=Miejsce na komentarze @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Informacja Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Data urodzenia +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/pl_PL/mrp.lang b/htdocs/langs/pl_PL/mrp.lang index 863793063a0..f018be890cc 100644 --- a/htdocs/langs/pl_PL/mrp.lang +++ b/htdocs/langs/pl_PL/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/pl_PL/website.lang b/htdocs/langs/pl_PL/website.lang index 27fba000e5c..2d9b4e9aa97 100644 --- a/htdocs/langs/pl_PL/website.lang +++ b/htdocs/langs/pl_PL/website.lang @@ -31,7 +31,7 @@ AddWebsite=Dodaj witrynę Webpage=Strona/pojemnik AddPage=Dodaj stronę HomePage=Strona główna -PageContainer=Strona/pojemnik +PageContainer=Strona PreviewOfSiteNotYetAvailable=Podgląd Twej witryny %s nie jest jeszcze dostępny. Użyj wpierw 'Załaduj szablon witryny' lub 'Dodaj stronę/pojemnik'. RequestedPageHasNoContentYet=Żądana strona o identyfikatorze %s nie ma jeszcze treści lub plik pamięci podręcznej .tpl.php został usunięty. Edytuj zawartość strony, aby to rozwiązać. SiteDeleted=Witryna '%s' usunięta @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=RSS Feed RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/pt_BR/accountancy.lang b/htdocs/langs/pt_BR/accountancy.lang index b515e57a41a..d453360b552 100644 --- a/htdocs/langs/pt_BR/accountancy.lang +++ b/htdocs/langs/pt_BR/accountancy.lang @@ -13,7 +13,6 @@ ACCOUNTING_EXPORT_PREFIX_SPEC=Especifique o prefixo do nome do arquivo DefaultForService=Padrão para serviço CantSuggest=Não posso sugerir AccountancySetupDoneFromAccountancyMenu=A maioria das configurações da Contabilidade é feita a partir do menu %s -ConfigAccountingExpert=Configuração do módulo específico de contabilidade Journalization=Lançamento no Livro Chartofaccounts=Plano de contas InvoiceLabel=Rótulo da fatura @@ -22,10 +21,7 @@ OverviewOfAmountOfLinesBound=Visão geral do montante das linhas já vinculadas DeleteCptCategory=Remover conta contábil do grupo ConfirmDeleteCptCategory=Tem certeza de que deseja remover essa conta contábil do grupo de contas contábeis? JournalizationInLedgerStatus=Situação do registro do diário -AlreadyInGeneralLedger=Já foram Livros de registro em livros contabilísticos -NotYetInGeneralLedger=Ainda não publicado em livros contábeis GroupIsEmptyCheckSetup=O grupo está vazio, verifique a configuração do grupo de contabilidade personalizado -AccountantFiles=Exportar documentos contábeis MainAccountForCustomersNotDefined=Conta contábil principal para clientes não definidos na configuração MainAccountForUsersNotDefined=Conta contábil principal para usuários não definidos na configuração MainAccountForVatPaymentNotDefined=Conta contábil principal para o pagamento do IVA não definido na configuração @@ -50,7 +46,6 @@ AccountancyAreaDescBind=PASSO %s: verifique a ligação entre as linhas %s exist AccountancyAreaDescWriteRecords=PASSO %s: efetue as transações no Livro de Registro. Para isso, vá para o menu %s e clique no botão %s . AccountancyAreaDescAnalyze=ETAPA %s: Adicionar ou editar as transações existentes, gerar os relatórios e exportar. AccountancyAreaDescClosePeriod=ETAPA %s: Fechar o período de forma que não possamos fazer modificações no futuro. -TheJournalCodeIsNotDefinedOnSomeBankAccount=Uma etapa obrigatória na configuração não foi concluída (o diário de código contábil não está definido para todas as contas bancárias) Selectchartofaccounts=Selecione gráfico ativo de contas ChangeAndLoad=Alterar e carregar Addanaccount=Adicionar uma conta contábil @@ -73,7 +68,6 @@ RegistrationInAccounting=Registro em contabilidade Binding=Vinculando para as contas CustomersVentilation=Vinculando as faturas do cliente ExpenseReportsVentilation=Relatório de despesas obrigatórias -WriteBookKeeping=Registrar transações no livro-razão Bookkeeping=Razão ObjectsRef=Referência da fonte do objeto CAHTF=Total de fornecedores antes de impostos @@ -134,13 +128,9 @@ TransactionNumShort=Nº da transação GroupByAccountAccounting=Agrupar pela conta da Contabilidade AccountingAccountGroupsDesc=Você pode definir aqui alguns grupos de contabilidade. Eles serão usados ​​para relatórios contábeis personalizados. NotMatch=Não Definido -DeleteMvt=Excluir linha do razão DelMonth=Mês a excluir DelYear=Ano a ser deletado DelJournal=Resumo a ser deletado -ConfirmDeleteMvt=Isso excluirá todas as linhas do livro razão do ano / mês e / ou de um diário específico (pelo menos um critério é necessário). Você precisará reutilizar o recurso 'Registro na contabilidade' para que o registro excluído volte ao livro razão. -ConfirmDeleteMvtPartial=Isso eliminará a transação do Livro de Registro (todas as linhas relacionadas à mesma transação serão excluídas) -DescJournalOnlyBindedVisible=Esta é uma visão de registro que é vinculada a uma conta contábil e pode ser gravada no Livro de Registro. VATAccountNotDefined=Conta para ICMS não definida ThirdpartyAccountNotDefined=Conta para terceiro não definida ProductAccountNotDefined=Conta para produto não definida diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang index 3055faaaa65..a6c2222a0d7 100644 --- a/htdocs/langs/pt_BR/admin.lang +++ b/htdocs/langs/pt_BR/admin.lang @@ -28,6 +28,7 @@ SessionSavePath=Local para salvar sessão PurgeSessions=Purgar Sessão ConfirmPurgeSessions=Você tem certeza que quer remover toas as sessões? Isto ira desconectar todos os usuários (exceto você) LockNewSessions=Bloquear Novas Sessões +ConfirmLockNewSessions=Tem certeza de que deseja restringir qualquer nova conexão Dolibarr a si mesmo? Apenas o usuário %s poderá se conectar depois disso. UnlockNewSessions=Remover Bloqueio de Conexão YourSession=Sua Sessão Sessions=Sessões de Usuários @@ -62,7 +63,6 @@ DisableJavascript=Desativar as funções Javascript e AJax DisableJavascriptNote=Obs.: Para propósitos de teste ou depuração. Para otimização de cegos ou navegadores de texto, é preferível usar a configuração do perfil do usuário UseSearchToSelectCompanyTooltip=Além disso, se você tem um grande número de terceiros (> 100 000), você pode aumentar a velocidade, definindo COMPANY_DONOTSEARCH_ANYWHERE constante a 1 em Setup-> Outro. Busca, então, ser limitada até o início da string. UseSearchToSelectContactTooltip=Além disso, se você tem um grande número de terceiros (> 100 000), você pode aumentar a velocidade, definindo CONTACT_DONOTSEARCH_ANYWHERE constante a 1 em Setup-> Outro. Busca, então, ser limitada até o início da string. -NumberOfKeyToSearch=Número de caracteres para acionar a pesquisa: %s NumberOfBytes=Número de Bytes SearchString=Seqüência de pesquisa NotAvailableWhenAjaxDisabled=Indisponível quando o Ajax esta desativado @@ -121,7 +121,6 @@ SystemToolsAreaDesc=Essa área dispõem de funções administrativas. Use esse m Purge=Purgar (apagar tudo) PurgeAreaDesc=Esta página permite deletar todos os arquivos gerados ou armazenados pelo Dolibarr (arquivos temporários ou todos os arquivos no diretório %s). Este recurso é fornecido como uma solução alternativa aos usuários cujo a instalação esteja hospedado num servidor que impeça o acesso as pastas onde os arquivos gerados pelo Dolibarr são armazenados, para excluí-los. PurgeDeleteLogFile=Excluir os arquivos de registro, incluindo o %s definido pelo módulo Syslog (não há risco de perda de dados) -PurgeDeleteTemporaryFiles=Exclua todos os arquivos temporários (sem risco de perder dados). Nota: A exclusão é feita apenas se o diretório temporário foi criado 24 horas atrás. PurgeDeleteTemporaryFilesShort=Excluir arquivos temporários PurgeDeleteAllFilesInDocumentsDir=Eliminar todos os arquivos do diretório %s. Isto irá excluir todos documentos (Terceiros, faturas, ...), arquivos carregados no módulo ECM, Backups e arquivos temporários PurgeRunNow=Purgar(Apagar) Agora @@ -143,7 +142,6 @@ ImportMySqlDesc=Para importar um arquivo de backup do MySQL, você pode usar o p ImportPostgreSqlDesc=Para importar um arquivo de backup, você deve usar pg_restore na linha de comando: ImportMySqlCommand=%s %s < meubackup.sql ImportPostgreSqlCommand=%s %s meubackup.sql -FileNameToGenerate=Nome de arquivo para backup: Compression=Compactar CommandsToDisableForeignKeysForImport=Comando para desativar as chaves estrangeiras(foreign keys) na importação CommandsToDisableForeignKeysForImportWarning=Mandatório se você quiser ser capaz de restaurar seu 'sql dump' depois @@ -186,16 +184,13 @@ AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponível somente se Javascript n UsedOnlyWithTypeOption=Usado por alguns opção agenda única Passwords=Senhas DoNotStoreClearPassword=Criptografar senhas armazenadas no banco de dados (NÃO como texto simples). É altamente recomendável ativar esta opção. -MainDbPasswordFileConfEncrypted=Criptografe a senha do banco de dados armazenada em conf.php. É altamente recomendável ativar esta opção. InstrucToEncodePass=Para ter a senha codificada no arquivo conf.php, substitua a linha
$dolibarr_main_db_pass="..."
por
$dolibarr_main_db_pass="crypted:%s" InstrucToClearPass=Para ter a senha não codificada(limpa) no arquivo conf.php, substitua a linha
$dolibarr_main_db_pass="crypted:..."
por
$dolibarr_main_db_pass="%s" -ProtectAndEncryptPdfFiles=Proteja arquivos PDF gerados. Isso NÃO é recomendado, pois interrompe a geração de PDF em massa. ProtectAndEncryptPdfFilesDesc=Proteção de um documento PDF mantém ele disponível para ler e imprimir com qualquer navegador PDF. No entanto, edição e cópia não é possível. Observe que a utilização deste recurso faz com que a construção de um PDF global mesclado não funcione. Feature=Destaque Developpers=Desenvolvedores/Contribuidores OfficialWebSite=Site oficial do Dolibarr OfficialWebSiteLocal=Web site local (%s) -OfficialWiki=Documentação Dolibarr / Wiki OfficialDemo=Demo online do Dolibarr OfficialMarketPlace=Loja oficial para módulos externos/addons OfficialWebHostingService=Serviços de hospedagem web referenciados (hospedagem na Nuvem) @@ -242,15 +237,12 @@ ModuleFamilyPortal=Websites e outras aplicações front-end MenuHandlers=Gestor de Menus MenuAdmin=Editor menus DoNotUseInProduction=Não utilizar em produção -ThisIsProcessToFollow=Procedimento de atualização: FindPackageFromWebSite=Encontre um pacote que forneça os recursos que você precisa (por exemplo, no site oficial %s). DownloadPackageFromWebSite=Download do pacote (por exemplo, do site oficial %s). UnpackPackageInDolibarrRoot=Desempacote/descompacte os arquivos empacotados no diretório do servidor Dolibarr: %s NotExistsDirect=O diretório root alternativo não está definido para um diretório existente.
InfDirAlt=Desde a versão 3, é possível definir um diretório-root alternativo. Isso permite que você armazene, em um diretório dedicado, plug-ins e modelos personalizados.
Basta criar um diretório na raiz de Dolibarr (por exemplo:custom).
InfDirExample=
Então declare no arquivo conf.php
$dolibarr_main_url_root_alt='/custom'
$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'
Se estas linhas estão comentadas com "#", para serem habilitadas, apenas remova o caractere "#". -YouCanSubmitFile=Você pode fazer upload do arquivo .zip do pacote do módulo aqui: -CallUpdatePage=Navegue até a página que atualiza a estrutura e os dados do banco de dados: %s. LastActivationAuthor=Último autor da ativação LastActivationIP=Último IP de ativação UpdateServerOffline=Atualização de servidor off-line @@ -283,7 +275,6 @@ ListOfDirectoriesForModelGenODT=A lista de diretórios contém modelos de arquiv ExampleOfDirectoriesForModelGen=Exemplo de sintaxe:
c:\\meudir
/home/meudir
DOL_DATA_ROOT/ecm/ecmdir FollowingSubstitutionKeysCanBeUsed=
Para saber como criar seus temas de documento em ODT, antes de armazená-los nesses diretórios, leia a documentação wiki: FirstnameNamePosition=Posição do Nome/Sobrenome -DescWeather=As imagens a seguir serão mostradas no painel quando o número de ações atrasadas atingir os seguintes valores: KeyForWebServicesAccess=Chave para usar o Serviços Web (parâmetro "dolibarrkey" no serviço web) TestSubmitForm=Teste de entrada de formulário ThisForceAlsoTheme=Usando este gerenciador de menu também usará seu próprio tema, seja qual for a escolha do usuário. Além disso, este gerenciador de menus especializado para smartphones não funciona em todos os smartphones. Use outro gerenciador de menu se tiver problemas com o seu. @@ -293,14 +284,11 @@ SmsTestMessage=Mensagem Teste de __PHONEFROM__ para __PHONETO__ ModuleMustBeEnabledFirst=O módulo %s deve estar primeiramente habilitado se você precisa desta funcionalidade. SecurityToken=Chave para proteção das URLs NoSmsEngine=Nenhum gerenciador de remetente de SMS disponível. Um gerenciador de remetentes SMS não é instalado com a distribuição padrão porque eles dependem de um fornecedor externo, mas você pode encontrar alguns em %s -PDFDesc=Opções globais para geração de PDF -PDFAddressForging=Regras para seção de endereço HideAnyVATInformationOnPDF=Ocultar todas as informações relacionadas a imposto sobre vendas/IVA PDFRulesForSalesTax=Regras para ICMS HideLocalTaxOnPDF=Ocultar %s taxa na coluna Imposto sobre vendas / IVA HideDescOnPDF=Ocultar descrição dos produtos HideRefOnPDF=Ocultar ref. dos produtos. -HideDetailsOnPDF=Ocultar detalhes das linhas de produtos PlaceCustomerAddressToIsoLocation=Use a posição padrão francesa (La Poste) para a posição do endereço do cliente UrlGenerationParameters=Parâmetros para URLs de segurança SecurityTokenIsUnique=Usar um único parâmetro na chave de segurança para cada URL @@ -394,26 +382,20 @@ Module20Desc=Gestor de Orçamentos Module22Name=E-mails em massa Module22Desc=Gerenciar o envio em massa de e-mails Module23Desc=Monitoramento de Consumo de Energia -Module25Name=Ordens de venda Module25Desc=Gerenciamento de pedidos de vendas Module40Name=Vendedores Module40Desc=Fornecedores e gerenciamento de compras (pedidos e cobrança de faturas de fornecedores) Module42Name=Notas de depuração Module42Desc=Recursos de registro (arquivo, syslog, ...). Tais registros são para propósitos técnicos/debug. Module49Desc=Gestor de Editores -Module50Desc=Gestão de Produtos Module51Name=Cartas Massivos Module51Desc=Gestão de correspondência do massa Module52Name=Estoques Module52Desc=Gestão de estoque -Module53Desc=Gestão de Serviços Module54Name=Contratos/Assinaturas Module55Name=Códigos de Barra Module55Desc=Gestor de Códigos de Barra -Module56Name=Pagamento por transferência de crédito Module56Desc=Gestão do pagamento de fornecedores por ordens de Transferência a Crédito. Inclui a geração de arquivo SEPA para países europeus. -Module57Name=Pagamentos por Débito Direto -Module57Desc=Gerenciamento de pedidos de Débito Direto. Inclui a geração de arquivo SEPA para países europeus. Module58Name=CliqueParaDiscarl Module58Desc=Integração do Sistema CliqueParaDiscar (Asterisk, etc.) Module60Name=Adesivos @@ -430,13 +412,10 @@ Module105Name=Carteiro e SPIP Module105Desc=Carteiro ou Interface SPIP para Módulo MembroMailman or SPIP interface for member module Module200Desc=Sincronização de diretório LDAP Module240Name=Exportações de Dados -Module240Desc=Ferramenta para exportar dados Dolibarr (com assistência) Module250Name=Importação de Dados -Module250Desc=Ferramenta para importar dados para Dolibarr (com assistência) Module310Desc=Gestor de Associação de Membros Module320Desc=Adicionar um feed RSS às páginas do Dolibarr Module330Name=Marcadores e atalhos -Module330Desc=Crie atalhos, sempre acessíveis, para as páginas internas ou externas às quais você acessa com frequência Module410Desc=Integração do Webcalendar Module500Name=Impostos e Despesas Especiais Module520Desc=Gestão dos empréstimos @@ -570,9 +549,6 @@ Permission182=Criar/modificar pedidos Permission183=Validar pedidos Permission184=Aprovar pedidos Permission185=Encomendar ou cancelar pedidos -Permission186=Receber ordens de compra -Permission187=Fechar ordens de compra -Permission188=Cancelar pedidos de compra Permission192=Criar Linhas Permission193=Cancelar Linhas Permission194=Leia as linhas de largura de banda @@ -615,10 +591,8 @@ Permission283=Deletar Contatos Permission286=Exportar Contatos Permission291=Ler Tarifas Permission292=Definir Permissões das Tarifas -Permission293=Modificar as tarifas do cliente Permission300=Ler códigos de barras Permission301=Criar/modificar códigos de barras -Permission302=Excluir códigos de barras Permission311=Ler Serviços Permission312=Atribuir Serviço no Contrato Permission331=Ler Marcadores de Página @@ -669,8 +643,6 @@ Permission1004=Ler Movimentação de Estoque Permission1005=Criar/Modificar Movimentação de Estoque Permission1101=Ler recibos de entrega Permission1102=Criar / alterar recibos de entrega -Permission1104=Validar recibos de entrega -Permission1109=Excluir recibos de entrega Permission1121=Leia propostas de fornecedores Permission1122=Criar / modificar propostas de fornecedores Permission1123=Validar propostas de fornecedores @@ -690,15 +662,12 @@ Permission1201=Conseguir Resultado de uma Exportação Permission1202=Criar/Modificar uma Exportação Permission1231=Ler faturas de fornecedores Permission1232=Criar/modificar faturas de fornecedores -Permission1233=Validar faturas de fornecedores Permission1234=Excluir faturas de fornecedores Permission1235=Enviar faturas de fornecedores por e-mail Permission1236=Exportar faturas, atributos e pagamentos do fornecedor -Permission1237=Exportar ordens de compra e seus detalhes Permission1251=Rodar(run) Importações Massivas de Dados Externos para o Banco de Dados (carregamento de dados) Permission1321=Exportar Faturas de Clientes, Atributos e Pagamentos Permission1322=Reabrir uma nota paga -Permission1421=Exportar ordens de venda e atributos Permission2401=Ler ações (eventos ou tarefas) vinculadas à sua conta de usuário (se o proprietário do evento ou apenas tiver sido atribuído a) Permission2402=Criar / modificar ações (eventos ou tarefas) vinculadas à sua conta de usuário (se for proprietário do evento) Permission2403=Excluir ações (eventos ou tarefas) vinculadas à sua conta de usuário (se for proprietário do evento) @@ -789,9 +758,7 @@ SetupSaved=Configurações Salvas SetupNotSaved=Configuração não salva BackToModuleList=Voltar à lista do módulo BackToDictionaryList=Voltar à lista de dicionários -VATManagement=Gestão de impostos sobre vendas VATIsUsedDesc=Por padrão, ao criar prospectos, faturas, pedidos etc., a taxa do imposto sobre vendas segue a regra padrão ativa:
Se o vendedor não estiver sujeito ao imposto sobre vendas, o imposto sobre vendas será padronizado como 0. Fim da regra.
Se o (país do vendedor = país do comprador), o imposto sobre vendas, por padrão, é igual ao imposto sobre vendas do produto no país do vendedor. Fim de regra.
Se o vendedor e o comprador estiverem na Comunidade Europeia e os bens forem produtos relacionados a transporte (transporte, transporte aéreo, companhia aérea), o IVA padrão é 0. Essa regra depende do país do vendedor - consulte seu contador. O IVA deve ser pago pelo comprador à estância aduaneira do seu país e não ao vendedor. Fim de regra.
Se o vendedor e o comprador estiverem ambos na Comunidade Europeia e o comprador não for uma empresa (com um número de IVA intracomunitário registrado), o IVA será padronizado para a taxa de IVA do país do vendedor. Fim de regra.
Se o vendedor e o comprador estiverem ambos na Comunidade Europeia e o comprador for uma empresa (com um número de IVA intracomunitário registrado), o IVA será 0 por padrão. Fim de regra.
Em qualquer outro caso, o padrão proposto é imposto sobre vendas = 0. Fim de regra. -VATIsNotUsedDesc=Por padrão, o imposto sobre vendas proposto é 0, que pode ser usado para casos como associações, indivíduos ou pequenas empresas. VATIsUsedExampleFR=Na França, significa empresas ou organizações que possuem um sistema fiscal real (real simplificado, real ou normal). Um sistema no qual o IVA é declarado. VATIsNotUsedExampleFR=Na França, isso significa associações que não são declaradas em impostos sobre vendas ou empresas, organizações ou profissões liberais que escolheram o sistema fiscal de microempresas (imposto sobre vendas em franquia) e pagaram uma taxa de vendas de franquia sem qualquer declaração de imposto sobre vendas. Essa opção exibirá a referência "Imposto sobre vendas não aplicável - art-293B do CGI" nas faturas. TypeOfSaleTaxes=Tipo de imposto sobre vendas @@ -847,7 +814,6 @@ MessageOfDay=Mensagem do dia MessageLogin=Mensagem da página de login LoginPage=Página de login PermanentLeftSearchForm=Formulário permanente de pesquisa no menu esquerdo -DefaultLanguage=Idioma padrão EnableShowLogo=Mostrar o logotipo da empresa no menu CompanyInfo=Empresa / Organização CompanyIds=Identidades da empresa / organização @@ -863,19 +829,10 @@ BankModuleNotActive=O módulo de contas bancárias não está habilitado ShowBugTrackLink=Mostrar link "%s" DelaysOfToleranceBeforeWarning=Atraso antes de exibir um alerta de aviso para: DelaysOfToleranceDesc=Defina o atraso antes de um ícone de alerta %s ser mostrado na tela para o elemento final. -Delays_MAIN_DELAY_ACTIONS_TODO=Eventos planejados (eventos da agenda) não concluídos Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Projeto não fechado a tempo Delays_MAIN_DELAY_TASKS_TODO=Tarefa planejada (tarefas do projeto) não concluídas Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Encomenda não processada -Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Pedido de compra não processado -Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Proposta não fechada -Delays_MAIN_DELAY_PROPALS_TO_BILL=Proposta não faturada -Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Serviço para ativar -Delays_MAIN_DELAY_RUNNING_SERVICES=Serviço expirado -Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Fatura de fornecedor não paga -Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Fatura de cliente não paga Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Conciliação bancária pendente -Delays_MAIN_DELAY_MEMBERS=Taxa de adesão atrasada Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Cheque depósito não feito Delays_MAIN_DELAY_EXPENSEREPORTS=Relatório de despesas para aprovar Delays_MAIN_DELAY_HOLIDAYS=Solicitações de Licenças para aprovar @@ -893,7 +850,6 @@ LogEventDesc=Ative o registro para eventos de segurança específicos. Administr AreaForAdminOnly=Os parâmetros de configuração só podem ser definidos pelos usuários administradores. SystemInfoDesc=Informações do sistema está faltando informações, técnicas você consegue em modo de leitura e é visivel somente para administradores. SystemAreaForAdminOnly=Esta área está disponível apenas para usuários administradores. As permissões de usuário do Dolibarr não podem alterar essa restrição. -CompanyFundationDesc=Edite as informações da sua empresa / organização. Clique no botão "%s" na parte inferior da página quando terminar. AccountantDesc=Se você tiver um contador / contador externo, poderá editar aqui suas informações. AccountantFileNumber=Código do contador DisplayDesc=Parâmetros afetando a aparência e o comportamento do Dolibarr podem ser modificados aqui. @@ -905,7 +861,6 @@ TriggerDisabledByName=Triggers neste arquivo estão desativados pelo sufixo - TriggerDisabledAsModuleDisabled=Triggers neste arquivo está desabilitado assim como o módulo %s está desabilitado. TriggerAlwaysActive=Triggers neste arquivo está sempre ativo, não importando os módulos ativos no Dolibarr. TriggerActiveAsModuleActive=Triggers neste arquivo são ativos quando módulo %s está ativado. -GeneratedPasswordDesc=Escolha o método a ser usado para senhas geradas automaticamente. DictionaryDesc=Inserir todos os dados de referência. Você pode adicionar seus valores ao padrão. ConstDesc=Esta página permite editar (substituir) parâmetros não disponíveis em outras páginas. Estes são parâmetros reservados principalmente para desenvolvedores / solução de problemas avançados. MiscellaneousDesc=Todos os outros parâmetros relacionados com a segurança são definidos aqui. @@ -922,16 +877,13 @@ SeeLocalSendMailSetup=Ver sua configuração local de envio de correspondência BackupDesc=Um backup completo de uma instalação do Dolibarr requer duas etapas. BackupDesc2=Faça backup do conteúdo do diretório "documentos" (%s) que contém todos os arquivos carregados e gerados. Isso também incluirá todos os arquivos de despejo gerados na Etapa 1. Essa operação pode durar vários minutos. BackupDesc3=Faça backup da estrutura e do conteúdo do banco de dados ( %s ) em um arquivo de despejo. Para isso, você pode usar o assistente a seguir. -BackupDescX=O diretório arquivado deve ser armazenado em um local seguro. BackupDescY=O arquivo de despeja gerado deverá ser armazenado em um local seguro. RestoreDesc=Para restaurar um backup Dolibarr, duas etapas são necessárias. RestoreDesc2=Restaure o arquivo de backup (arquivo zip, por exemplo) do diretório "documents" para uma nova instalação do Dolibarr ou para o diretório atual de documentos ( %s ). RestoreDesc3=Restaure a estrutura do banco de dados e os dados de um arquivo de despejo de backup no banco de dados da nova instalação do Dolibarr ou no banco de dados desta instalação atual ( %s ). Atenção, assim que a restauração for concluída, você deverá usar um login / senha, que existiu a partir do momento / instalação do backup para se conectar novamente.
Para restaurar um banco de dados de backup nesta instalação atual, você pode seguir este assistente. RestoreMySQL=Importar MySQL ForcedToByAModule=Essa Regra é forçada para %s by um módulo ativado -PreviousDumpFiles=Arquivos de backup existentes PreviousArchiveFiles=Arquivos existentes -WeekStartOnDay=Primeiro dia da semana RunningUpdateProcessMayBeRequired=A execução do processo de atualização parece ser necessária (a versão do programa %s é diferente da versão do banco de dados %s) YouMustRunCommandFromCommandLineAfterLoginToUser=Você deve rodar esse comando na linha de comando (CLI) depois de logar no shell com o usuário %s ou você deve adicionar a opção -W no final da linha de comando para fornecer a senha %s. YourPHPDoesNotHaveSSLSupport=Função SSL functions não está disponível no seu PHP @@ -947,9 +899,7 @@ ProxyDesc=Algumas características do Dolibarr requerem acesso à Internet. Defi ExternalAccess=Acesso Externo/Internet MAIN_PROXY_USE=Use um servidor proxy (caso contrário, o acesso é direto à internet) MAIN_PROXY_HOST=Servidor proxy: nome/endereço -MAIN_PROXY_PORT=Servidor proxy: porta MAIN_PROXY_USER=Servidor Proxy: Login/Usuário -MAIN_PROXY_PASS=Servidor proxy: senha DefineHereComplementaryAttributes=Defina aqui quaisquer atributos adicionais/personalizados que você deseja incluir: %s ExtraFieldsLinesRec=Atributos complementares (linhas dos temas das faturas) ExtraFieldsSupplierOrdersLines=Atributos complementares (linhas de encomenda) @@ -991,8 +941,6 @@ NumberingModules=Modelos de numeração DocumentModules=Modelos de documentos PasswordGenerationPerso=Retornar uma senha de acordo com a configuração definida para a sua personalidade. PasswordPatternDesc=Descrição do padrão de senha -RuleForGeneratedPasswords=Regras para gerar e validar senhas -DisableForgetPasswordLinkOnLogonPage=Não mostrar o link "Senha esquecida" na página de login UsersSetup=Configurações de módulo de usuários UserMailRequired=O e-mail é necessário para criar um novo usuário UserHideInactive=Ocultar usuários inativos de todas as listas combinadas de usuários (não recomendado: isso pode significar que você não poderá filtrar ou pesquisar usuários antigos em algumas páginas) @@ -1000,7 +948,6 @@ UsersDocModules=Modelos de documentos para documentos gerados a partir do regist GroupsDocModules=Modelos de documentos para documentos gerados a partir de um registro de grupo HRMSetup=Configuração do módulo RH CompanySetup=Configurações de módulo das empresas -CompanyCodeChecker=Opções para geração automática de códigos de cliente / fornecedor AccountCodeManager=Opções para geração automática de códigos contábeis de clientes / fornecedores NotificationsDesc=As notificações por e-mail podem ser enviadas automaticamente para alguns eventos do Dolibarr.
Destinatários de notificações podem ser definidos: NotificationsDescUser=* por usuário, um usuário por vez. @@ -1020,7 +967,6 @@ BillsNumberingModule=Faturas e notas de crédito no modelo de numeração BillsPDFModules=Modelos de documentos da fatura PaymentsPDFModules=Modelos dos documentos de pagamento ForceInvoiceDate=Forçar data de fatura para data de validação -SuggestedPaymentModesIfNotDefinedInInvoice=Modo de pagamento sugerido na fatura por padrão, se não estiver definido na fatura SuggestPaymentByRIBOnAccount=Sugerir pagamento por retirada na conta SuggestPaymentByChequeToAddress=Sugerir pagamento por cheque para FreeLegalTextOnInvoices=Texto livre nas fatura @@ -1044,7 +990,6 @@ BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Informar conta bancária de desti WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Solicitar Fonte de Armazenagem para o pedido BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Pedir destino da conta bancária da ordem de compra SuggestedPaymentModesIfNotDefinedInOrder=Modo de pagamentos sugeridos no pedido de venda por padrão, se não definido no pedido -OrdersSetup=Configuração de gerenciamento de pedidos de vendas OrdersNumberingModules=modelos de numeração de pedidos OrdersModelModule=Modelos de documentos de pedidos FreeLegalTextOnOrders=Texto livre em pedidos @@ -1078,7 +1023,6 @@ LDAPSynchronizeMembers=Organização dos membros da fundação em LDAP LDAPSynchronizeMembersTypes=Organização dos tipos de membro da fundação no LDAP LDAPPrimaryServer=Servidor primário LDAPSecondaryServer=Servidor secundário -LDAPServerPortExample=Porta padrão: 389 LDAPServerUseTLS=Usuário TLS LDAPServerUseTLSExample=Seu servidor LDAP usa TLS LDAPAdminDn=Administrador DN @@ -1120,14 +1064,7 @@ LDAPTCPConnectOK=Conexão TCP para o servidor LDAP foi um sucesso (Servidor=%s, LDAPTCPConnectKO=Conexão TCP para o servidor LDAP falhou (Servidor=%s, Porta=%s) LDAPSetupForVersion3=Servidor LDAP configurado para versão 3 LDAPSetupForVersion2=Servidor LDAP configurado para versão 2 -LDAPFieldLoginExample=Exemplo: uid LDAPFilterConnectionExample=Exemplo: &(objectClass = inetOrgPerson) -LDAPFieldLoginSambaExample=Exemplo: samaccountname -LDAPFieldFullnameExample=Exemplo: cn -LDAPFieldPasswordExample=Exemplo: userPassword -LDAPFieldCommonNameExample=Exemplo: cn -LDAPFieldNameExample=Exemplo: sn -LDAPFieldFirstNameExample=Exemplo: givenName LDAPFieldMail=E-Mail LDAPFieldMailExample=Exemplo: mail LDAPFieldPhone=Telefone profissional @@ -1137,19 +1074,14 @@ LDAPFieldHomePhoneExample=Exemplo: homephone LDAPFieldMobile=Celular LDAPFieldMobileExample=Exemplo: mobile LDAPFieldFax=Fax -LDAPFieldFaxExample=Exemplo: facsimiletelephonenumber LDAPFieldAddress=Endereço LDAPFieldAddressExample=Exemplo: street LDAPFieldZip=CEP LDAPFieldZipExample=Exemplo: postalcode LDAPFieldTown=Município -LDAPFieldTownExample=Exemplo: l LDAPFieldDescriptionExample=Exemplo: description LDAPFieldNotePublicExample=Exemplo: publicnote LDAPFieldGroupMembers=Membros de grupo -LDAPFieldGroupMembersExample=Exemplo: uniqueMember -LDAPFieldCompanyExample=Exemplo: o -LDAPFieldSidExample=Exemplo: objectsid LDAPFieldEndLastSubscription=Data do término de inscrição LDAPFieldTitleExample=Exemplo: Título LDAPFieldGroupid=ID do grupo @@ -1231,7 +1163,6 @@ MailingDelay=Segundos de espera antes do envio da mensagem seguinte NotificationSetup=Configuração do módulo de notificação por e-mail NotificationEMailFrom=E-mail do remetente (De) para e-mails enviados pelo módulo de Notificações FixedEmailTarget=Destinatário -SendingsSetup=Configuração do módulo de envio SendingsReceiptModel=Modelo de recibo do envio SendingsNumberingModules=Módulos de númeração de envios SendingsAbility=Suporte para folhas de envios, para entregas de cliente @@ -1243,7 +1174,6 @@ FreeLegalTextOnDeliveryReceipts=Texto livre em recibos de entregas ActivateFCKeditor=Editor avançado ativo por: FCKeditorForCompany=Criação/edição do WYSIWIG nas descrições de elementos e nota (exceto produtos/serviços) FCKeditorForProduct=Criação/edição do WYSIWIG nas descrições de produtos/serviços e nota -FCKeditorForProductDetails=WYSIWIG criação / edição de produtos detalha linhas para todas as entidades (propostas, pedidos, faturas, etc ...). Aviso: O uso desta opção para este caso não é recomendado, pois pode criar problemas com caracteres especiais e formatação de página ao criar arquivos PDF. FCKeditorForMailing=Criação/edição do WYSIWIG nos E-Mails massivos (ferramentas->emailing) FCKeditorForUserSignature=criação/edição do WYSIWIG nas assinaturas de usuários FCKeditorForMail=Criação/Edição WYSIWIG para todos os e-mails (exceto Ferramentas->eMailing) @@ -1284,14 +1214,11 @@ AccountancyCodeBuy=Código de contas de compras AgendaSetup=Configurações do módulo de eventos e agenda PasswordTogetVCalExport=Chave para autorizar exportação do link PastDelayVCalExport=Não exportar eventos antigos de -AGENDA_REMINDER_EMAIL=Ativar lembrete de evento por e-mails (A opção de lembrar / atraso pode ser definida em cada evento). Nota: Módulo 1 %s deve ser habilitado e configurado corretamente para que o lembrete seja enviado na freqüência correta. -AGENDA_REMINDER_BROWSER=Ativar lembrete de evento no navegador do usuário (quando a data do evento é atingida, cada usuário pode recusar isso da pergunta de confirmação do navegador) AGENDA_REMINDER_BROWSER_SOUND=Habilitar a notificação sonora AGENDA_SHOW_LINKED_OBJECT=Exibir objeto conectado na visualização da agenda ClickToDialSetup=Configurações do módulo clique para discar ClickToDialUrlDesc=URL chamada quando clica-se no ícone do telefone. Na URL, você pode usar as tags
__PHONETO__ que será substituída pelo número do telefone da pessoa a chamar
__PHONEFROM__ que será substituída pelo telefone da pessoa que está chamando (o seu)
__LOGIN__ que será substituída pelo login clicktodial (definido no cartão do usuário)
__PASS__ que será substituída pela senha clicktodial (definida no cartão do usuário). ClickToDialUseTelLink=Use apenas o link "tel." para os números de telefone -CashDeskSetup=Configuração do módulo de ponto de vendas CashDeskBankAccountForSell=Conta default para usar nos pagamentos em dinheiro CashDeskBankAccountForCheque=Conta padrão a ser usada para receber pagamentos por cheque CashDeskBankAccountForCB=Conta default para usar nos pagamentos em cartão de crédito @@ -1326,7 +1253,6 @@ SuppliersSetup=Configuração do módulo de fornecedor SuppliersCommandModel=Modelo completo do pedido SuppliersCommandModelMuscadet=Modelo completo do pedido (antiga implementação do modelo Cornas) SuppliersInvoiceModel=Modelo completo da fatura do fornecedor -SuppliersInvoiceNumberingModel=Modelos de numeração de faturas de fornecedores IfSetToYesDontForgetPermission=Se definido como um valor não nulo, não se esqueça de fornecer permissões a grupos ou usuários com permissão para a segunda aprovação GeoIPMaxmindSetup=Configurações do módulo GeoIP Maxmind NoteOnPathLocation=Nota que seu ip para o arquivo de dados do país deve estar dentro do diretório do seu PHP que possa ser lido (Verifique a configuração do seu PHP open_basedir e o sistema de permissões). diff --git a/htdocs/langs/pt_BR/banks.lang b/htdocs/langs/pt_BR/banks.lang index 75ffdce9a29..8b5063b041d 100644 --- a/htdocs/langs/pt_BR/banks.lang +++ b/htdocs/langs/pt_BR/banks.lang @@ -27,6 +27,9 @@ IbanValid=Numero de conta bancária valida IbanNotValid=Numero de conta bancária inválida StandingOrders=Pedidos com Débito direto StandingOrder=Ordem de débito direto +PaymentByDirectDebit=Pagamento por débito direto +PaymentByBankTransfers=Pagamentos por transferência de crédito +PaymentByBankTransfer=Pagamento por transferência de crédito AccountStatement=Extrato da conta AccountStatementShort=Extrato AccountStatements=Extratos da conta diff --git a/htdocs/langs/pt_BR/categories.lang b/htdocs/langs/pt_BR/categories.lang index 65fd3a7feca..fd9c6ce0047 100644 --- a/htdocs/langs/pt_BR/categories.lang +++ b/htdocs/langs/pt_BR/categories.lang @@ -27,7 +27,6 @@ WasAddedSuccessfully=Foi adicionado com êxito. ObjectAlreadyLinkedToCategory=Elemento já está ligada a esta tag / categoria. ProductIsInCategories=Produto / serviço está ligada à seguintes tags / categorias CompanyIsInCustomersCategories=Este Terceiro está vinculado às seguintes tags/categorias de Clientes/Prospects -CompanyIsInSuppliersCategories=Este terceiro está vinculado às seguintes tags / categorias de fornecedores MemberIsInCategories=Esse membro está vinculado a seguintes membros tags / categorias ContactIsInCategories=Este contato é ligado à sequência de contatos tags / categorias ProductHasNoCategory=Este produto / serviço não está em nenhuma tags / categorias @@ -43,14 +42,11 @@ ContentsNotVisibleByAllShort=Conteúdo não visivel por todos DeleteCategory=Excluir tag / categoria ConfirmDeleteCategory=Tem certeza que quer deleitar esta tag/categoria? NoCategoriesDefined=Nenhuma tag / categoria definida -SuppliersCategoryShort=Tag / categoria de fornecedores CustomersCategoryShort=Clientes tag / categoria ProductsCategoryShort=Produtos tag / categoria MembersCategoryShort=Membros tag / categoria -SuppliersCategoriesShort=Tags / categorias de fornecedores CustomersCategoriesShort=Clientes tags / categorias ProspectsCategoriesShort=Tag/categoria Prospecção -CustomersProspectsCategoriesShort=Cust./Prosp. tags / categorias ProductsCategoriesShort=Produtos tags / categorias MembersCategoriesShort=Tag / categorias de Membros ContactCategoriesShort=Contatos tags / categorias @@ -60,7 +56,6 @@ UsersCategoriesShort=Tags / categorias de usuários StockCategoriesShort=Tags / categorias de armazém ThisCategoryHasNoItems=Esta categoria não contém nenhum item. CategId=ID Tag / categoria -CatSupList=Lista de tags / categorias de fornecedores CatCusList=Lista de cliente / perspectivas de tags / categorias CatProdList=Lista de produtos tags / categorias CatMemberList=Lista de membros tags / categorias @@ -77,7 +72,4 @@ CategorieRecursivHelp=Se a opção estiver ativada, quando você adicionar um pr AddProductServiceIntoCategory=Adicione o seguinte produto / serviço ShowCategory=Mostrar tag / categoria ChooseCategory=Escolher categoria -StocksCategoriesArea=Área categorias de armazéns -ActionCommCategoriesArea=Área Categorias de Eventos -WebsitePagesCategoriesArea=Área Categorias de Contêiner da Página UseOrOperatorForCategories=Use operador para categorias diff --git a/htdocs/langs/pt_BR/companies.lang b/htdocs/langs/pt_BR/companies.lang index 06c5fb31a72..8987f615bd7 100644 --- a/htdocs/langs/pt_BR/companies.lang +++ b/htdocs/langs/pt_BR/companies.lang @@ -15,7 +15,6 @@ ProspectionArea=Área de prospecção IdThirdParty=ID do terceiro IdCompany=ID da empresa IdContact=ID do contato -ThirdPartyContacts=Contatos de terceiros ThirdPartyContact=Contato / endereço de terceiro AliasNames=Nome de fantasia (nome comercial, marca registrada etc.) AliasNameShort=Nome alternativo @@ -23,12 +22,9 @@ CountryIsInEEC=País está dentro da Comunidade Econômica Européia PriceFormatInCurrentLanguage=Formato de apresentação do preço na linguagem atual e tipo de moeda ThirdPartyName=Nome do terceiro ThirdPartyEmail=E-mail do terceiro -ThirdParty=Terceiro -ThirdParties=Terceiros ThirdPartyProspects=Prospectos de cliente ThirdPartyProspectsStats=Prospectos de cliente ThirdPartyCustomersWithIdProf12=Clientes com %s ou %s -ThirdPartyType=Tipo de terceiro Individual=Pessoa física ToCreateContactWithSameName=Irá automaticamente criar um contato/endereço com a mesma informação do terceiro. Na maioria dos casos, mesmo que o terceiro seja uma pessoa física, a criação de um único terceiro é suficiente. ParentCompany=Matriz @@ -182,7 +178,6 @@ CapitalOf=Capital de %s EditCompany=Editar empresa ThisUserIsNot=Este usuário não é um cliente em potencial, cliente ou fornecedor VATIntraCheckDesc=O ID do IVA deve incluir o prefixo do país. O link %s usa o serviço europeu de verificação de IVA (VIES), que requer acesso à Internet do servidor Dolibarr. -VATIntraCheckableOnEUSite=Verifique o ID do IVA intracomunitário no site da Comissão Europeia ErrorVATCheckMS_UNAVAILABLE=Verificação não é possível. Verifique o serviço não é necessário por um membro de estado (%s). NorProspectNorCustomer=Nem possivel cliente, nem cliente ProspectLevelShort=Pos. Cli. @@ -212,11 +207,8 @@ ProspectsByStatus=Prospectos por status ContactNotLinkedToCompany=Contato não esta vinculado a nenhum terceiro NoDolibarrAccess=Sem acesso ao Dolibarr ExportDataset_company_1=Terceiros(Companhias/fundações/pessoas físicas) e suas propriedades -ImportDataset_company_1=Terceiros e suas propriedades ImportDataset_company_2=Contatos/Enderecos adicionais e atributos de terceiros -ImportDataset_company_3=Contas bancárias de terceiros ImportDataset_company_4=Vendedores de terceiros (assinalar vendedores/usuários para empresas) -PriceLevel=Nível de preço PriceLevelLabels=Etiquetas de nível de preço DeliveryAddress=Endereço de entrega AddAddress=Adicionar endereço @@ -235,6 +227,7 @@ SocialNetworksGithubURL=URL GitHub YouMustAssignUserMailFirst=Você deve criar um e-mail para este usuário antes de poder adicionar uma notificação por e-mail. YouMustCreateContactFirst=Para estar apto a adicionar notificações por e-mail, você deve primeiramente definir contatos com e-mails válidos para o terceiro ListSuppliersShort=Lista de fornecedores +LastModifiedThirdParties=Últimos %s alterados por terceiros recentemente ActivityCeased=Inativo ThirdPartyIsClosed=O terceiro está fechado ProductsIntoElements=Lista de produtos/serviços em %s diff --git a/htdocs/langs/pt_BR/hrm.lang b/htdocs/langs/pt_BR/hrm.lang index 45a48efed5e..e86f7afe095 100644 --- a/htdocs/langs/pt_BR/hrm.lang +++ b/htdocs/langs/pt_BR/hrm.lang @@ -5,3 +5,4 @@ DeleteEstablishment=Excluir estabelecimento ConfirmDeleteEstablishment=Tem certeza de que deseja excluir este estabelecimento? DictionaryPublicHolidays=RH - Licenças DictionaryDepartment=RH - Lista de departamentos +DictionaryFunction=RH - Cargos diff --git a/htdocs/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang index 16df49a3432..c0d7d0ed2ac 100644 --- a/htdocs/langs/pt_BR/main.lang +++ b/htdocs/langs/pt_BR/main.lang @@ -73,8 +73,6 @@ PasswordForgotten=Esqueceu a senha? NoAccount=Sem conta? SeeAbove=Mencionar anteriormente HomeArea=Inicio -LastConnexion=Último login -PreviousConnexion=Login anterior ConnectedOnMultiCompany=Conectado no ambiente AuthenticationMode=Modo de Autenticação RequestedUrl=URL solicitada @@ -123,7 +121,6 @@ Hide=ocultar ShowCardHere=Mostrar cartão SearchMenuShortCut=Ctrl + Shift + F QuickAdd=Adição rápida -Upload=Carregar Resize=Modificar tamanho ResizeOrCrop=Redimensionar ou cortar Recenter=Recolocar no centro @@ -138,8 +135,6 @@ CurrentValue=Valor atual MultiLanguage=Multi Idioma RefOrLabel=Ref. da etiqueta DescriptionOfLine=Descrição da Linha -DateOfLine=Data da linha -DurationOfLine=Duração da linha Model=Template doc DefaultModel=Modelo de documento padrão Action=Ação @@ -236,7 +231,6 @@ VATs=Impostos sobre vendas VATINs=Impostos IGST LT1Type=Tipo de imposto sobre vendas 2 LT2Type=Tipo de imposto sobre vendas 3 -LT1GC=Centavos adicionais VATRate=Taxa ICMS VATCode=Codigo do ICMS VATNPR=Valor taxa NPR @@ -244,7 +238,6 @@ DefaultTaxRate=Taxa de imposto padrão RemainToPay=Permanecer para pagar Module=Modulo/Aplicacao Modules=Módulos / Aplicações -FullConversation=Conversa completa OtherStatistics=Outras estatisticas Favorite=Favorito RefSupplier=Ref. fornecedor @@ -286,7 +279,6 @@ ApprovedBy2=Aprovado pelo (segunda aprovação) ClosedAll=Fechados(Todos) ByUsers=Pelo usuário LateDesc=Um item é definido como atrasado de acordo com a configuração do sistema no menu Início - Configuração - Alertas. -NoItemLate=Nenhum item atrasado DeletePicture=Apagar foto ConfirmDeletePicture=Confirmar eliminação de fotografias LoginEmail=Usuario (e-mail) @@ -320,7 +312,6 @@ SeeAll=Ver tudo SendByMail=Envio por e-mail MailSentBy=Mail enviado por Email=E-mail -AlreadyRead=Já lido NoMobilePhone=Sem celular Refresh=Atualizar BackToList=Mostar Lista @@ -366,11 +357,9 @@ CreditCard=Cartão de credito CreditOrDebitCard=Cartao de credito ou debito FieldsWithAreMandatory=Campos com %s são obrigatorios FieldsWithIsForPublic=Os campos com %s são exibidos na lista pública de membros. Se você não quiser isso, desmarque a caixa "pública". -AccordingToGeoIPDatabase=(de acordo com a conversão GeoIP) NotSupported=Não suportado RequiredField=Campo obrigatorio ValidateBefore=O item deve ser validado antes de usar este recurso -Totalizable=Totalizável TotalizableDesc=Este campo é totalizável na lista Hidden=Escondido Resources=Resorsas @@ -386,11 +375,9 @@ LinkToOrder=Linque para o pedido LinkToInvoice=Link para a fatura LinkToTemplateInvoice=Link para fatura modelo LinkToSupplierOrder=Link para Ordem de compra -LinkToSupplierProposal=Link para a proposta do fornecedor LinkToSupplierInvoice=Link para a fatura do fornecedor LinkToContract=Link para o Contrato LinkToIntervention=Link para a Intervensão -LinkToTicket=Link para o ticket SetToDraft=Voltar para modo rascunho ClickToRefresh=Clique para atualizar EditWithEditor=Editar com o CKEditor @@ -429,6 +416,7 @@ ShowIntervention=Mostrar intervençao GoIntoSetupToChangeLogo=Vá para Home - Setup - Company para alterar o logotipo ou vá para Home - Setup - Display para ocultar. Denied=Negado Gender=Gênero +Genderother=Outros ViewList=Exibição de lista ViewGantt=Visualização Gantt ViewKanban=Visualização Kanban @@ -450,7 +438,6 @@ ClassifyBilled=Classificar Faturado ClassifyUnbilled=Classificar nao faturado FrontOffice=Frente do escritório BackOffice=Fundo do escritório -Submit=Enviar View=Visão Exports=Exportações IncludeDocsAlreadyExported=Incluir documentos já exportados @@ -475,7 +462,6 @@ ClickToShowHelp=Clique para mostrar ajuda de ajuda WebSiteAccounts=Conta do website TitleSetToDraft=Volte para o rascunho ConfirmSetToDraft=Tem certeza de que deseja voltar ao status de rascunho? -EMailTemplates=Modelos de e-mail FileNotShared=Arquivo não compartilhado para público externo LeadOrProject=Chumbo | Projeto LeadsOrProjects=Leads | Projetos @@ -502,6 +488,7 @@ SearchIntoCustomerOrders=Pedido de Venda SearchIntoSupplierProposals=Propostas de fornecedores SearchIntoContracts=Contratos SearchIntoCustomerShipments=Remessas do cliente +SearchIntoVendorPayments=Pagamentos do fornecedor CommentLink=Comentarios CommentPage=Espaço para comentarios CommentDeleted=Comentário deletado @@ -521,7 +508,6 @@ NoFilesUploadedYet=Por favor, carregue um doc. primeiro SeePrivateNote=Veja avisos privados PaymentInformation=Informações de Pagamento ValidFrom=Válido de -ValidUntil=Válido até NoRecordedUsers=Sem Usuários ToClose=Para Fechar ToProcess=A processar @@ -536,18 +522,13 @@ ContactDefault_order_supplier=Ordem de Compra ContactDefault_propal=Proposta ContactDefault_supplier_proposal=Proposta do Fornecedor ContactAddedAutomatically=Contato adicionado a partir de informações de terceiros -More=Mais -CustomReports=Relatórios personalizados StatisticsOn=Estatísticas sobre SelectYourGraphOptionsFirst=Selecione suas opções para criar um gráfico -Measures=Medidas -XAxis=Eixo X -YAxis=Eixo Y StatusOfRefMustBe=O status de %s deve ser %s DeleteFileHeader=Confirmar exclusão de arquivo DeleteFileText=Deseja realmente excluir este arquivo? -ShowOtherLanguages=Mostrar outros idiomas SwitchInEditModeToAddTranslation=Alterne modo de edição para adicionar traduções para este idioma NotUsedForThisCustomer=Não usado para este cliente AmountMustBePositive=O valor deve ser positivo ByStatus=Por status +DateOfBirth=Data de nascimento diff --git a/htdocs/langs/pt_BR/website.lang b/htdocs/langs/pt_BR/website.lang index f6831fbc85d..44be6ab3faf 100644 --- a/htdocs/langs/pt_BR/website.lang +++ b/htdocs/langs/pt_BR/website.lang @@ -18,8 +18,6 @@ MediaFiles=Biblioteca de mídias AddWebsite=Adicionar site Webpage=Página WEB / container AddPage=Adicionar página / recipiente -HomePage=Pagina inicial -PageContainer=Página / recipiente PreviewOfSiteNotYetAvailable=Pré-visualização do seu site %s ainda não estão disponíveis. Você deve primeiro Importar um modelo de site completo ou apenas Adicionar uma página / contêiner RequestedPageHasNoContentYet=A página solicitada com id %s ainda não possui conteúdo ou o arquivo de cache .tpl.php foi removido. Edite o conteúdo da página para resolver isso. PageContent=Página / Contenair diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang index 8037ba7cc8c..c94ba9653ef 100644 --- a/htdocs/langs/pt_PT/accountancy.lang +++ b/htdocs/langs/pt_PT/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Padrão para o serviço DefaultForProduct=Padrão para o produto CantSuggest=Não pode sugerir AccountancySetupDoneFromAccountancyMenu=A maioria da configuração da contabilidade é efetuada a partir do menu %s -ConfigAccountingExpert=Configuração do módulo "Contabilidade (avançada)" +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Registo em diário contabilístico -Journaux=Diários +Journals=Diários JournalFinancial=Diários financeiros BackToChartofaccounts=Voltar ao plano de contas Chartofaccounts=Gráfico de contas +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Conta dedicada atual AssignDedicatedAccountingAccount=Nova conta para atribuir InvoiceLabel=Etiqueta da fatura @@ -33,8 +35,8 @@ OtherInfo=Outra informação DeleteCptCategory=Remover conta contabilistica do grupo ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group? JournalizationInLedgerStatus=Status da jornalização -AlreadyInGeneralLedger=Já foi registado nos diários contabilísticos -NotYetInGeneralLedger=Ainda não é publicado em livros +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Grupo está vazio, verifique a configuração do grupo de contabilidade personalizado DetailByAccount=Mostrar detalhes por conta AccountWithNonZeroValues=Contas com valores diferentes de zero @@ -43,7 +45,9 @@ CountriesInEEC=Países da CEE CountriesNotInEEC=Países não na CEE CountriesInEECExceptMe=Países na CEE, exceto %s CountriesExceptMe=Todos os países, exceto %s -AccountantFiles=Export accounting documents +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Principal conta contábil para clientes não definidos na configuração MainAccountForSuppliersNotDefined=Conta contábil principal para fornecedores não definidos na configuração @@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=PASSO %s: Adicionar ou editar transações e gerar re AccountancyAreaDescClosePeriod=PASSO %s: Fechar período para que não seja possível modificar no futuro. -TheJournalCodeIsNotDefinedOnSomeBankAccount=Uma etapa obrigatória na configuração não foi concluída (o diário do código contábil não foi definido para todas as contas bancárias) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Selecione gráfico de contas ativo ChangeAndLoad=Mudar e carregar Addanaccount=Adicione uma conta contabilística @@ -89,6 +93,8 @@ SubledgerAccount=Subledger account SubledgerAccountLabel=Subledger account label ShowAccountingAccount=Mostrar conta contabilística ShowAccountingJournal=Mostrar diário contabilistico +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Conta contabilística sugerida MenuDefaultAccounts=Contas padrão MenuBankAccounts=Contas Bancárias @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Vinculação do relatório de despesas CreateMvts=Criar nova transação UpdateMvts=Modificação de uma transação ValidTransaction=Validar transação -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=Livro Razão +BookkeepingSubAccount=Subledger AccountBalance=Saldo da conta ObjectsRef=Ref de objeto de origem CAHTF=Total purchase vendor before tax @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Desactivar a gravação direta de transação na conta ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Ativar exportação de rascunho em diário ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Diário de vendas ACCOUNTING_PURCHASE_JOURNAL=Diário de compras @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Conta contabilística de espera DONATION_ACCOUNTINGACCOUNT=Conta contabilística para registar donativos ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=Por grupos predefinidos ByPersonalizedAccountGroups=Por grupos personalizados ByYear=por ano NotMatch=Não configurado -DeleteMvt=Eliminar as linhas do Livro Razão +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=Ano a apagar DelJournal=Diário a apagar -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=Isso excluirá a transação do razão (todas as linhas relacionadas à mesma transação serão excluídas) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Diário financeiro ExpenseReportsJournal=Diário de relatórios de despesas DescFinanceJournal=Diário financeiro incluindo todos os tipos de pagamentos por conta bancária -DescJournalOnlyBindedVisible=Esta é uma visão do registro que está vinculada a uma conta contábil e pode ser registrada no Ledger. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Conta para efeitos de IVA não definido ThirdpartyAccountNotDefined=Conta para terceiros não definido ProductAccountNotDefined=Conta para o produto não definido @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=Este diário já está a ser utilizado AccountingAccountForSalesTaxAreDefinedInto=Nota: A conta de contabilidade para imposto sobre vendas é definida no menu %s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Exportar o diário rascunho @@ -326,6 +339,8 @@ Modelcsv_configurable=Exportar CSV configurável Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=ID de plano de contas ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang index ead9a9d45b0..b2961d731ca 100644 --- a/htdocs/langs/pt_PT/admin.lang +++ b/htdocs/langs/pt_PT/admin.lang @@ -27,19 +27,19 @@ AvailableOnlyOnPackagedVersions=The local file for integrity checking is only av XmlNotFound=Ficheiro XML de integridade da aplicação não encontrado SessionId=Id. da Sessão SessionSaveHandler=Utilizador para guardar as sessões -SessionSavePath=Session save location +SessionSavePath=Local de salvamento da sessão PurgeSessions=Limpeza das sessões ConfirmPurgeSessions=Deseja mesmo limpar todas as sessões? Isto irá desassociar todos os utilizadores (exceto você). NoSessionListWithThisHandler=Salvar manipulador de sessão configurado no seu PHP não permite listar todas as sessões em execução. LockNewSessions=Bloquear novas ligações -ConfirmLockNewSessions=Tem certeza de que deseja restringir qualquer nova conexão Dolibarr a si mesmo? Apenas o usuário %s poderá se conectar depois disso. +ConfirmLockNewSessions=Tem certeza de que deseja restringir qualquer nova ligação a Dolibarr a si mesmo? Apenas o utilizador %s poderá se conectar depois disso. UnlockNewSessions=Remover bloqueio de ligação YourSession=A sua sessão -Sessions=Users Sessions +Sessions=Sessões de usuários WebUserGroup=Utilizador/grupo do servidor da Web PermissionsOnFilesInWebRoot=Permissions on files in web root directory PermissionsOnFile=Permissions on file %s -NoSessionFound=Your PHP configuration seems to not allow listing of active sessions. The directory used to save sessions (%s) may be protected (for example by OS permissions or by PHP directive open_basedir). +NoSessionFound=Sua configuração de PHP parece não permitir a listagem de sessões ativas. O diretório usado para salvar as sessões ( %s ) pode ser protegido (por exemplo, pelas permissões do sistema operacional ou pela diretiva open_basedir do 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 HostCharset=Host charset @@ -57,8 +57,8 @@ SetupArea=Configuração UploadNewTemplate=Carregar novo(s) modelo(s) FormToTestFileUploadForm=Formulário para testar o envio de ficheiro (de acordo com a configuração) IfModuleEnabled=Nota: sim, só é eficaz se o módulo %s estiver ativado -RemoveLock=Remove/rename file %s if it exists, to allow usage of the Update/Install tool. -RestoreLock=Restore file %s, with read permission only, to disable any further use of the Update/Install tool. +RemoveLock=Remova / renomeie o arquivo %s se existir, para permitir o uso da ferramenta Atualizar / Instalar. +RestoreLock=Restaure o arquivo %s , apenas com permissão de leitura, para desativar qualquer uso posterior da ferramenta Atualizar / Instalar. SecuritySetup=Configuração de segurança SecurityFilesDesc=Defina aqui opções relacionadas com a segurança de ficheiros carregados. ErrorModuleRequirePHPVersion=Erro, este módulo requer a versão %s ou superior do PHP @@ -74,7 +74,7 @@ UseSearchToSelectCompanyTooltip=Se tiver um grande número de terceiros (> 100 0 UseSearchToSelectContactTooltip=Se você tiver grande número de contactos (> 100 000), você pode aumentar a velocidade, definindo a constante CONTACT_DONOTSEARCH_ANYWHERE para 1 em Configuração -> Outros. A pesquisa será então limitada ao início da sequência de caracteres. DelaiedFullListToSelectCompany=Aguarde até que uma tecla seja pressionada antes de carregar o conteúdo da lista de combinação de terceiros.
Isso pode aumentar o desempenho se você tiver um grande número de terceiros, mas é menos conveniente. DelaiedFullListToSelectContact=Wait until a key is pressed before loading content of Contact combo list.
This may increase performance if you have a large number of contacts, but it is less convenient. -NumberOfKeyToSearch=Number of characters to trigger search: %s +NumberOfKeyToSearch=Número de caracteres para acionar a pesquisa: %s NumberOfBytes=Number of Bytes SearchString=Search string NotAvailableWhenAjaxDisabled=Não está disponível quando o Ajax está desativado @@ -98,14 +98,14 @@ NextValueForInvoices=Valor seguinte (faturas) NextValueForCreditNotes=Valor seguinte (notas de crédito) NextValueForDeposit=Valor seguinte (entrada inicial) NextValueForReplacements=Valor seguinte (restituições) -MustBeLowerThanPHPLimit=Note: your PHP configuration currently limits the maximum filesize for upload to %s %s, irrespective of the value of this parameter +MustBeLowerThanPHPLimit=Nota: sua configuração de PHP atualmente limita o tamanho máximo do arquivo para upload para %s %s, independentemente do valor deste parâmetro NoMaxSizeByPHPLimit=Nota: não está definido nenhum limite na sua configuração do PHP MaxSizeForUploadedFiles=Tamanho máximo para os ficheiros enviados (0 para rejeitar qualquer envio) UseCaptchaCode=Utilizar código gráfico (CAPTCHA) na página de iniciar a sessão AntiVirusCommand=Caminho completo para o comando de antivírus -AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan
Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe +AntiVirusCommandExample=Exemplo para ClamAv Daemon (requer clamav-daemon): / usr / bin / clamdscan
Exemplo para ClamWin (muito, muito lento): c: \\ Progra ~ 1 \\ ClamWin \\ bin \\ clamscan.exe AntiVirusParam= Mais parâmetros na linha de comando -AntiVirusParamExample=Example for ClamAv Daemon: --fdpass
Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib" +AntiVirusParamExample=Exemplo para ClamAv Daemon: --fdpass
Exemplo para ClamWin: --database = "C: \\ Arquivos de Programas (x86) \\ ClamWin \\ lib" ComptaSetup=Configuração do módulo de "Contabilidade" UserSetup=Configuração e gestão dos utilizadores MultiCurrencySetup=Configuração da utilização de várias moedas @@ -137,7 +137,7 @@ YouCanEditPHPTZ=Para definir um fuso horário PHP diferente (não obrigatório), HoursOnThisPageAreOnServerTZ=Atenção, ao contrário de outros ecrãs, as horas nesta página não estão no fuso horário local, mas sim no fuso horário do servidor. Box=Widget Boxes=Widgets -MaxNbOfLinesForBoxes=Max. number of lines for widgets +MaxNbOfLinesForBoxes=Máx. número de linhas para widgets AllWidgetsWereEnabled=Todos os widgets disponíveis estão habilitados PositionByDefault=Ordem predefinida Position=Posição @@ -149,13 +149,13 @@ Language_en_US_es_MX_etc=Language (en_US, es_MX, ...) System=Sistema SystemInfo=Informação do Sistema SystemToolsArea=Área de ferramentas do sistema -SystemToolsAreaDesc=This area provides administration functions. Use the menu to choose the required feature. +SystemToolsAreaDesc=Esta área fornece funções de administração. Use o menu para escolher o recurso necessário. Purge=Limpar -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 normally 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. +PurgeAreaDesc=Esta página permite excluir todos os arquivos gerados ou armazenados pelo Dolibarr (arquivos temporários ou todos os arquivos no diretório %s ). Usar esse recurso normalmente não é necessário. Ele é fornecido como uma solução alternativa para usuários cujo Dolibarr é hospedado por um provedor que não oferece permissões para excluir arquivos gerados pelo servidor da web. PurgeDeleteLogFile=Eliminar os ficheiros de registo, incluindo %s definido para o módulo Syslog (não existe risco de perda de dados) -PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data). Note: Deletion is done only if the temp directory was created 24 hours ago. +PurgeDeleteTemporaryFiles=Exclua todos os arquivos temporários (sem risco de perder dados). Nota: A exclusão é feita apenas se o diretório temporário foi criado 24 horas atrás. PurgeDeleteTemporaryFilesShort=Eliminar ficheiros temporários -PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory: %s.
This will delete all generated documents related to elements (third parties, invoices etc...), files uploaded into the ECM module, database backup dumps and temporary files. +PurgeDeleteAllFilesInDocumentsDir=Exclua todos os arquivos do diretório: %s .
Isso excluirá todos os documentos gerados relacionados aos elementos (terceiros, faturas etc ...), arquivos carregados no módulo ECM, despejos de backup de banco de dados e arquivos temporários. PurgeRunNow=Limpar agora PurgeNothingToDelete=Nenhuma diretoria ou ficheiros para eliminar. PurgeNDirectoriesDeleted=%s ficheiros ou diretorias eliminadas. @@ -168,16 +168,16 @@ Restore=Restaurar RunCommandSummary=A cópia de segurança foi iniciada com o seguinte comando BackupResult=Resultado da cópia de segurança BackupFileSuccessfullyCreated=Ficheiro de cópia de segurança gerado correctamente -YouCanDownloadBackupFile=The generated file can now be downloaded +YouCanDownloadBackupFile=O arquivo gerado agora pode ser baixado NoBackupFileAvailable=Sem ficheiros de cópias de segurança disponíveis ExportMethod=Método de exportação ImportMethod=Método de importação ToBuildBackupFileClickHere=Para criar um ficheiro de cópia de segurança, clique aqui. -ImportMySqlDesc=To import a MySQL backup file, you may use phpMyAdmin via your hosting or use the mysql command from the Command line.
For example: +ImportMySqlDesc=Para importar um arquivo de backup do MySQL, você pode usar phpMyAdmin através de sua hospedagem ou usar o comando mysql da linha de comando.
Por exemplo: ImportPostgreSqlDesc=Para importar um ficheiro de cópia de segurança, deve utilizar o comando pg_restore a partir da linha de comandos: ImportMySqlCommand=%s %s < ficheiro_copia_seguranca.sql ImportPostgreSqlCommand=%s %s ficheiro_copia_seguranca.sql -FileNameToGenerate=Filename for backup: +FileNameToGenerate=Nome de arquivo para backup: Compression=Compressão CommandsToDisableForeignKeysForImport=Comando para desactivar a chave exclusiva para a importação CommandsToDisableForeignKeysForImportWarning=Obrigatório, se pretender restaurar mais tarde o ficheiro dump de SQL @@ -203,7 +203,7 @@ FeatureDisabledInDemo=Opção desativada em demo FeatureAvailableOnlyOnStable=Funcionalidade apenas disponível em versões estáveis ​​oficiais BoxesDesc=Widgets são componentes que mostram algumas informações que você pode adicionar para personalizar algumas páginas. Você pode escolher entre mostrar o widget ou não selecionando a página de destino e clicando em "Ativar" ou clicando na lixeira para desativá-la. OnlyActiveElementsAreShown=Só são mostrados os elementos de módulos ativos. -ModulesDesc=The modules/applications determine which features are available in the software. Some modules require permissions to be granted to users after activating the module. Click the on/off button %s of each module to enable or disable a module/application. +ModulesDesc=Os módulos / aplicativos determinam quais recursos estão disponíveis no software. Alguns módulos exigem que as permissões sejam concedidas aos usuários após a ativação do módulo. Clique no botão liga / desliga %s de cada módulo para habilitar ou desabilitar um módulo / aplicativo. ModulesMarketPlaceDesc=Pode encontrar mais módulos para descarregar noutros sites da internet... ModulesDeployDesc=Se as permissões em seu sistema de arquivos permitirem, você poderá usar essa ferramenta para implantar um módulo externo. O módulo ficará visível na aba %s . ModulesMarketPlaces=Procurar aplicações/módulos externos @@ -237,18 +237,18 @@ Required=Requerido UsedOnlyWithTypeOption=Utilizado apenas por algumas opções da agenda Security=Segurança Passwords=Palavras-passe -DoNotStoreClearPassword=Encrypt passwords stored in database (NOT as plain-text). It is strongly recommended to activate this option. -MainDbPasswordFileConfEncrypted=Encrypt database password stored in conf.php. It is strongly recommended to activate this option. +DoNotStoreClearPassword=Criptografe as senhas armazenadas no banco de dados (NÃO como texto simples). É altamente recomendável ativar esta opção. +MainDbPasswordFileConfEncrypted=Criptografe a senha do banco de dados armazenada em conf.php. É altamente recomendável ativar esta opção. InstrucToEncodePass=Para que a palavra passe seja codificada no ficheiro conf.php, substitua a linha
$dolibarr_main_db_pass="...";
por
$dolibarr_main_db_pass="crypted:%s"; InstrucToClearPass=Para que a palavra passe seja descodificada no ficheiro conf.php, substitua a linha
$dolibarr_main_db_pass="crypted:...";
por
$dolibarr_main_db_pass="%s"; -ProtectAndEncryptPdfFiles=Protect generated PDF files. This is NOT recommended as it breaks bulk PDF generation. +ProtectAndEncryptPdfFiles=Proteja arquivos PDF gerados. Isso NÃO é recomendado, pois interrompe a geração de PDF em massa. ProtectAndEncryptPdfFilesDesc=A proteção de um documento PDF faz com que este esteja disponível para ler e imprimir a partir de qualquer navegador. No entanto, a edição e cópia do documento deixam de ser possíveis. Nota: ao usar esta funcionalidade deixa de ser possível juntar documentos PDFs singulares num único documento PDF global. Feature=Funcionalidade DolibarrLicense=Licença Developpers=Programadores/colaboradores -OfficialWebSite=Dolibarr official web site +OfficialWebSite=Site oficial da Dolibarr OfficialWebSiteLocal=Website local (%s) -OfficialWiki=Dolibarr documentation / Wiki +OfficialWiki=Documentação Dolibarr / Wiki OfficialDemo=Demo online Dolibarr OfficialMarketPlace=Mercado externo oficial para os módulos/addons OfficialWebHostingService=Serviços de hospedagem na Web referenciados (hospedagem na Nuvem) @@ -274,7 +274,7 @@ NoticePeriod=Período de aviso NewByMonth=Novo por mês Emails=Emails EMailsSetup=Configuração de emails -EMailsDesc=This page allows you to set parameters or options for email sending. +EMailsDesc=Esta página permite definir parâmetros ou opções para envio de e-mail. EmailSenderProfiles=Perfis do remetente de e-mails EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email. MAIN_MAIL_SMTP_PORT=Porta de SMTP/SMTPS (Por predefinição no php.ini: %s) @@ -305,14 +305,14 @@ UserEmail=Email do utilizador CompanyEmail=Company Email FeatureNotAvailableOnLinux=Funcionalidade não disponivel em sistemas Unix. Teste parâmetros sendmail localmente. FixOnTransifex=Fix the translation on the online translation platform of project -SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory langs/%s and submit your change to www.transifex.com/dolibarr-association/dolibarr/ +SubmitTranslation=Se a tradução para este idioma não estiver completa ou você encontrar erros, pode corrigir isso editando os arquivos no diretório langs / %s e enviar sua alteração para 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, if you are a developer, with a PR on github.com/Dolibarr/dolibarr ModuleSetup=Configuração do módulo ModulesSetup=Módulos/Aplicação - Configuração ModuleFamilyBase=Sistema -ModuleFamilyCrm=Customer Relationship Management (CRM) +ModuleFamilyCrm=Gerenciamento de relacionamento com o cliente (CRM) ModuleFamilySrm=Vendor Relationship Management (VRM) -ModuleFamilyProducts=Product Management (PM) +ModuleFamilyProducts=Gestão de Produto (PM) ModuleFamilyHr=Gestão de Recursos Humanos (HR) ModuleFamilyProjects=Projetos/Trabalho cooperativo ModuleFamilyOther=Outro @@ -325,20 +325,20 @@ ModuleFamilyInterface=Interfaces com sistemas externos MenuHandlers=Gestores de menu MenuAdmin=Editor de menu DoNotUseInProduction=Não utilizar em ambiente de produção -ThisIsProcessToFollow=Upgrade procedure: +ThisIsProcessToFollow=Procedimento de atualização: ThisIsAlternativeProcessToFollow=Esta é uma configuração alternativa para processar manualmente: StepNb=Passo %s -FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s). -DownloadPackageFromWebSite=Download package (for example from the official web site %s). -UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: %s +FindPackageFromWebSite=Encontre um pacote que forneça os recursos de que você precisa (por exemplo, no site oficial %s). +DownloadPackageFromWebSite=Baixe o pacote (por exemplo, do site oficial %s). +UnpackPackageInDolibarrRoot=Descompacte / descompacte os arquivos compactados no diretório do servidor Dolibarr: %s UnpackPackageInModulesRoot=Para implantar / instalar um módulo externo, descompacte / descompacte os arquivos empacotados no diretório do servidor dedicado aos módulos externos:
%s SetupIsReadyForUse=A implantação do módulo está concluída. No entanto, você deve ativar e configurar o módulo em seu aplicativo acessando os módulos de configuração de página: %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).
InfDirExample=
Depois declare-o no ficheiro conf.php
$dolibarr_main_url_root_alt='/custom'
$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'
Se estas linhas estiverem comentadas com um "#", descomente-as removendo o caracter "#". -YouCanSubmitFile=You can upload the .zip file of module package from here: +YouCanSubmitFile=Você pode fazer upload do arquivo .zip do pacote do módulo aqui: CurrentVersion=Versão atual do Dolibarr -CallUpdatePage=Browse to the page that updates the database structure and data: %s. +CallUpdatePage=Navegue até a página que atualiza a estrutura e os dados do banco de dados: %s. LastStableVersion=Última versão estável LastActivationDate=Última data de ativação LastActivationAuthor=Autor mais recente de ativação @@ -362,7 +362,7 @@ ErrorCantUseRazIfNoYearInMask=Erro, não pode usar a opção @ para repor o cont ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Erro, não pode usar a opção @ se a sequência {yy}{mm} ou {yyyy}{mm} não se encontra na máscara definida. UMask=Parâmetro UMask de novos ficheiros em sistemas Unix/Linux/BSD/macOS. UMaskExplanation=Este parâmetro permite definir permissões usadas por omissão em ficheiros criados pelo Dolibarr no servidor (durante o carregamento, por exemplo).
Este deve ter o valor octal (por exemplo, 0666 significa permissão de leitura/escrita para todos).
Este parâmetro não tem nenhum efeito sobre um servidor Windows. -SeeWikiForAllTeam=Take a look at the Wiki page for a list of contributors and their organization +SeeWikiForAllTeam=Dê uma olhada na página Wiki para obter uma lista de contribuidores e suas organizações UseACacheDelay= Atraso, em segundos, para o caching de exportação (0 ou em branco para não criar cache) DisableLinkToHelpCenter=Ocultar hiperligação "Precisa de ajuda ou apoio" na página de inicio de sessão DisableLinkToHelp=Ocultar a hiperligação para a ajuda on-line "%s" @@ -379,27 +379,27 @@ ExampleOfDirectoriesForModelGen=Exemplos de sintaxe:
c:\\mydir
/home/mydi FollowingSubstitutionKeysCanBeUsed=
Para saber como criar os seus modelos de documentos ODT, antes de armazená-los nestes diretórios, leia a documentação no wiki: FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template FirstnameNamePosition=Posição do primeiro nome/último nome -DescWeather=The following images will be shown on the dashboard when the number of late actions reach the following values: +DescWeather=As imagens a seguir serão mostradas no painel quando o número de ações atrasadas atingir os seguintes valores: KeyForWebServicesAccess=Chave para usar Web Services (parâmetro "dolibarrkey" nos webservices) TestSubmitForm=Formulário de teste de introdução -ThisForceAlsoTheme=Using this menu manager will also use its own theme whatever the user choice. Also this menu manager specialized for smartphones does not work on all smartphone. Use another menu manager if you experience problems with yours. +ThisForceAlsoTheme=Usar este gerenciador de menu também usará seu próprio tema, independentemente da escolha do usuário. Além disso, este gerenciador de menu especializado para smartphones não funciona em todos os smartphones. Use outro gerenciador de menu se tiver problemas com o seu. ThemeDir=Diretório de temas ConnectionTimeout=Tempo limite de conexão ResponseTimeout=Tempo limite de resposta SmsTestMessage=Mensagem teste de __PHONEFROM__ para __PHONETO__ ModuleMustBeEnabledFirst=Se precisa desta função, o módulo %s deve ser ativado antes. SecurityToken=A chave para URLs seguras -NoSmsEngine=No SMS sender manager available. A SMS sender manager is not installed with the default distribution because they depend on an external vendor, but you can find some on %s +NoSmsEngine=Nenhum gerenciador de remetente de SMS disponível. Um gerenciador de remetente de SMS não é instalado com a distribuição padrão porque eles dependem de um fornecedor externo, mas você pode encontrar alguns em %s PDF=PDF -PDFDesc=Global options for PDF generation -PDFAddressForging=Rules for address section -HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT +PDFDesc=Opções globais para geração de PDF +PDFAddressForging=Regras para seção de endereço +HideAnyVATInformationOnPDF=Oculte todas as informações relacionadas ao imposto sobre vendas / IVA PDFRulesForSalesTax=Regras para Imposto sobre Vendas / IVA PDFLocaltax=Regras para %s HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT -HideDescOnPDF=Hide products description -HideRefOnPDF=Hide products ref. -HideDetailsOnPDF=Hide product lines details +HideDescOnPDF=Ocultar descrição de produtos +HideRefOnPDF=Ocultar produtos ref. +HideDetailsOnPDF=Ocultar detalhes das linhas de produtos PlaceCustomerAddressToIsoLocation=Usar a posição padrão francesa (La Poste) para a posição de endereço do cliente Library=Biblioteca UrlGenerationParameters=Parâmetros para tornar URLs seguros @@ -410,7 +410,7 @@ ButtonHideUnauthorized=Ocultar botões para usuários não administradores para OldVATRates=Taxa de IVA antiga NewVATRates=Nova taxa de IVA PriceBaseTypeToChange=Modificar nos preços com valor de referência base definido em -MassConvert=Launch bulk conversion +MassConvert=Lançar conversão em massa PriceFormatInCurrentLanguage=Price Format In Current Language String=Sequencia de caracteres String1Line=String (1 line) @@ -439,15 +439,15 @@ ComputedFormulaDesc=You can enter here a formula using other properties of objec Computedpersistent=Store computed field ComputedpersistentDesc=Computed extra fields will be stored in the database, however, the value will only be recalculated when the object of this field is changed. If the computed field depends on other objects or global data this value might be wrong!! ExtrafieldParamHelpPassword=Deixar esse campo em branco significa que esse valor será armazenado sem criptografia (o campo deve ser oculto apenas com estrela na tela).
Defina 'auto' para usar a regra de criptografia padrão para salvar a senha no banco de dados (o valor lido será o hash apenas, nenhuma maneira de recuperar o valor original) -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

- id_field 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 which is the current id of current object
To use a SELECT into the filter use the keyword $SEL$ to bypass anti-injection protection.
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=Lista de valores devem ser linhas com chave de formato, o valor (onde chave pode não ser '0')

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

A fim de ter o lista dependendo de outra lista de atributos complementares:
1, value1 | options_ parent_list_code : Parent_Key
2, value2 | options_ parent_list_code : Parent_Key

para ter a lista de acordo com uma outra lista:
1, value1 | parent_list_code : parent_key
2, valor2 | parent_list_code : parent_key +ExtrafieldParamHelpcheckbox=A lista de valores deve ser composta por linhas com chave de formato, valor (onde a chave não pode ser '0')

por exemplo:
1, valor1
2, valor2
19bz3, valor3 +ExtrafieldParamHelpradio=A lista de valores deve ser composta por linhas com chave de formato, valor (onde a chave não pode ser '0')

por exemplo:
1, valor1
2, valor2
19bz3, valor3 +ExtrafieldParamHelpsellist=A lista de valores vem de uma tabela
Sintaxe: table_name: label_field: id_field :: filter
Exemplo: c_typent: libelle: id :: filter

- id_fieldcampo int = 1) para exibir apenas o valor ativo
Você também pode usar $ ID $ no filtro que é o id atual do objeto atual
Para usar um SELECT no filtro, use a palavra-chave $ SEL $ para ignorar a proteção anti-injeção.
se você quiser filtrar por campos extras, use a sintaxe extra.fieldcode = ... (onde o código do campo é o código do campo extra)

Para ter a lista dependendo de outra lista de opções de atributos complementares:
: libelle: idpent_ c_typent: parent_list_code | parent_column: filtro

para ter a lista de acordo com uma outra lista:
c_typent: libelle: id: parent_list_code | parent_column: Filtro 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=Parameters must be ObjectName:Classpath
Syntax: ObjectName:Classpath ExtrafieldParamHelpSeparator=Keep empty for a simple separator
Set this to 1 for a collapsing separator (open by default for new session, then status is kept for each user session)
Set this to 2 for a collapsing separator (collapsed by default for new session, then status is kept fore each user session) LibraryToBuildPDF=Biblioteca utilizada para gerar PDF -LocalTaxDesc=Some countries may apply two or three taxes on each invoice line. If this is the case, choose the type for the second and third tax and its rate. Possible type are:
1: local tax apply on products and services without vat (localtax is calculated on amount without tax)
2: local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3: local tax apply on products without vat (localtax is calculated on amount without tax)
4: local tax apply on products including vat (localtax is calculated on amount + main vat)
5: local tax apply on services without vat (localtax is calculated on amount without tax)
6: local tax apply on services including vat (localtax is calculated on amount + tax) +LocalTaxDesc=Alguns países podem aplicar dois ou três impostos em cada linha da fatura. Se for esse o caso, escolha o tipo de segundo e terceiro imposto e sua alíquota. Os tipos possíveis são:
1: imposto local aplicado sobre produtos e serviços sem IVA (imposto local é calculado sobre o valor sem imposto)
2: imposto local aplicado sobre produtos e serviços incluindo IVA (imposto local é calculado sobre o valor + imposto principal)
3: imposto local aplicável sobre produtos sem IVA (imposto local é calculado sobre o valor sem imposto)
4: imposto local aplicável sobre produtos incluindo IVA (imposto local é calculado sobre o valor + IVA principal)
5: imposto local aplicável sobre serviços sem IVA (imposto local é calculado no valor sem imposto)
6: imposto local aplicável sobre serviços, incluindo IVA (o imposto local é calculado sobre o valor + imposto) SMS=SMS LinkToTestClickToDial=Introduzida o número de telefone a ligar, de forma mostra um link para testar o ClickToDial para o utilizador %s RefreshPhoneLink=Atualizar hiperligação @@ -520,43 +520,43 @@ DAV_ALLOW_ECM_DIRTooltip=The root directory where all files are manually uploade Module0Name=Utilizadores e Grupos Module0Desc=Gestão de Utilizadores / Funcionários e Grupos Module1Name=Terceiros -Module1Desc=Companies and contacts management (customers, prospects...) +Module1Desc=Gestão de empresas e contatos (clientes, prospects ...) Module2Name=Comercial Module2Desc=Gestão comercial -Module10Name=Accounting (simplified) +Module10Name=Contabilidade (simplificado) Module10Desc=Relatórios contábeis simples (periódicos, faturamento) com base no conteúdo do banco de dados. Não usa nenhuma tabela de razão. Module20Name=Orçamentos Module20Desc=Gestão de orçamentos -Module22Name=Mass Emailings -Module22Desc=Manage bulk emailing +Module22Name=Emailings em massa +Module22Desc=Gerenciar e-mails em massa Module23Name=Energia Module23Desc=Monitorização do consumo de energia -Module25Name=Sales Orders -Module25Desc=Sales order management +Module25Name=Ordens de venda +Module25Desc=Gestão de pedidos de vendas Module30Name=Faturas Module30Desc=Gerenciamento de notas fiscais e notas de crédito para clientes. Gerenciamento de notas fiscais e notas de crédito para fornecedores Module40Name=Fornecedores -Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices) +Module40Desc=Fornecedores e gestão de compras (ordens de compra e faturamento de faturas de fornecedores) Module42Name=Registos Debug Module42Desc=Funções de registo de eventos (ficheiro, registo do sistema, ...). Tais registos, são para fins técnicos/depuração. Module49Name=Editores Module49Desc=Gestão de editores Module50Name=Produtos -Module50Desc=Management of Products +Module50Desc=Gestão de Produtos Module51Name=Envio de emails em massa Module51Desc=Gestão de envio de correio em massa Module52Name=Stocks -Module52Desc=Stock management +Module52Desc=Gestão de stocks Module53Name=Serviços -Module53Desc=Management of Services +Module53Desc=Gestão de Serviços Module54Name=Contractos/Subscrições Module54Desc=Gestão de contratos (serviços ou assinaturas recorrentes) Module55Name=Códigos de barras Module55Desc=Gestão dos códigos de barras -Module56Name=Payment by credit transfer -Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries. -Module57Name=Payments by Direct Debit -Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries. +Module56Name=Pagamento por transferência de crédito +Module56Desc=Gestão de pagamentos de fornecedores por ordens de Transferência a Crédito. Inclui a geração de arquivo SEPA para países europeus. +Module57Name=Pagamentos por Débito Direto +Module57Desc=Gerenciamento de pedidos de Débito Direto. Inclui a geração de arquivo SEPA para países europeus. Module58Name=ClickToDial Module58Desc=Integração com um sistema ClickToDial (Asterisk, ...) Module60Name=Stickers @@ -566,11 +566,11 @@ Module70Desc=Gestão de intervenções Module75Name=Notas de despesas e deslocações Module75Desc=Gestão das notas de despesas e deslocações Module80Name=Expedições -Module80Desc=Shipments and delivery note management -Module85Name=Banks & Cash +Module80Desc=Remessas e gerenciamento de notas de entrega +Module85Name=Bancos e dinheiro Module85Desc=Gestão das contas financeiras ou contas bancárias (prazo ou efetivo) Module100Name=Site Externo -Module100Desc=Add a link to an external website as a main menu icon. Website is shown in a frame under the top menu. +Module100Desc=Adicione um link para um site externo como ícone do menu principal. O site é mostrado em um quadro no menu superior. Module105Name=Mailman e SPIP Module105Desc=Interface Mailman ou SPIP para módulo membro Module200Name=LDAP @@ -578,27 +578,27 @@ Module200Desc=Sincronização da diretoria LDAP Module210Name=PostNuke Module210Desc=Integração com PostNuke Module240Name=Exportações de dados -Module240Desc=Tool to export Dolibarr data (with assistance) +Module240Desc=Ferramenta para exportar dados Dolibarr (com assistência) Module250Name=Importação de dados -Module250Desc=Tool to import data into Dolibarr (with assistance) +Module250Desc=Ferramenta para importar dados para Dolibarr (com assistência) Module310Name=Membros Module310Desc=Gestão de membros de uma fundação Module320Name=Feed RSS -Module320Desc=Add a RSS feed to Dolibarr pages -Module330Name=Bookmarks & Shortcuts -Module330Desc=Create shortcuts, always accessible, to the internal or external pages to which you frequently access +Module320Desc=Adicione um feed RSS às páginas Dolibarr +Module330Name=Favoritos e atalhos +Module330Desc=Crie atalhos, sempre acessíveis, para as páginas internas ou externas às quais você acessa com frequência Module400Name=Projetos ou Leads Module400Desc=Gestão de projetos, leads / oportunidades e / ou tarefas. Você também pode atribuir qualquer elemento (fatura, pedido, proposta, intervenção, ...) a um projeto e obter uma visão transversal da visão do projeto. Module410Name=Webcalendar Module410Desc=Integração com Webcalendar -Module500Name=Taxes & Special Expenses +Module500Name=Impostos e despesas especiais Module500Desc=Gestão de outras despesas (impostos de venda, impostos sociais ou fiscais, dividendos, ...) Module510Name=Salários Module510Desc=Registrar e acompanhar pagamentos de funcionários Module520Name=Empréstimos Module520Desc=Gestão de empréstimos -Module600Name=Notifications on business event -Module600Desc=Send email notifications triggered by a business event: per user (setup defined on each user), per third-party contacts (setup defined on each third party) or by specific emails +Module600Name=Notificações em eventos de negócios +Module600Desc=Enviar notificações por e-mail acionadas por um evento de negócios: por usuário (configuração definida em cada usuário), por contatos de terceiros (configuração definida em cada terceiro) ou por e-mails específicos Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda. Module610Name=Variantes de produtos Module610Desc=Criação de variantes de produtos (cor, tamanho etc.) @@ -615,13 +615,13 @@ Module1520Desc=Mass email document generation Module1780Name=Etiquetas/Categorias Module1780Desc=Criar etiquetas/categoria (produtos, clientes, fornecedores, contactos ou membros) Module2000Name=Editor WYSIWYG -Module2000Desc=Allow text fields to be edited/formatted using CKEditor (html) +Module2000Desc=Permitir que campos de texto sejam editados / formatados usando CKEditor (html) Module2200Name=Preços dinâmicos Module2200Desc=Use maths expressions for auto-generation of prices Module2300Name=Tarefas agendadas Module2300Desc=Gestão de trabalhos agendados (alias cron ou tabela chrono) Module2400Name=Eventos/Agenda -Module2400Desc=Track events. Log automatic events for tracking purposes or record manual events or meetings. This is the principal module for good Customer or Vendor Relationship Management. +Module2400Desc=Provas de pista. Registre eventos automáticos para fins de rastreamento ou registre eventos ou reuniões manuais. Este é o módulo principal para um bom gerenciamento de relacionamento com o cliente ou fornecedor. Module2500Name=SGD / GEC Module2500Desc=Sistema de Gestão de Documentos / Gestão de Conteúdo Eletrónico. Organização automática dos seus documentos gerados ou armazenados. Compartilhe-os quando precisar. Module2600Name=Serviços API/Web (servidor SOAP) @@ -645,20 +645,20 @@ Module6000Name=Fluxo de trabalho Module6000Desc=Gerenciamento de fluxo de trabalho (criação automática de objeto e / ou mudança automática de status) Module10000Name=Sites da Web Module10000Desc=Create websites (public) with a WYSIWYG editor. This is a webmaster or developer oriented CMS (it is better to know HTML and CSS language). 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. -Module20000Name=Leave Request Management -Module20000Desc=Define and track employee leave requests +Module20000Name=Gerenciamento de solicitação de licença +Module20000Desc=Definir e rastrear pedidos de licença de funcionários Module39000Name=Product Lots Module39000Desc=Lots, serial numbers, eat-by/sell-by date management for products Module40000Name=Multi Moeda Module40000Desc=Use moedas alternativas em preços e documentos Module50000Name=PayBox -Module50000Desc=Offer customers a PayBox online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...) +Module50000Desc=Ofereça aos clientes uma página de pagamento online PayBox (cartões de crédito / débito). Isso pode ser usado para permitir que seus clientes façam pagamentos ad-hoc ou pagamentos relacionados a um objeto Dolibarr específico (fatura, pedido etc ...) Module50100Name=POS SimplePOS -Module50100Desc=Point of Sale module SimplePOS (simple POS). +Module50100Desc=Módulo de Ponto de Venda SimplePOS (POS simples). Module50150Name=POS TakePOS Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants). Module50200Name=Paypal -Module50200Desc=Offer customers a PayPal online payment page (PayPal account or credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...) +Module50200Desc=Ofereça aos clientes uma página de pagamento online do PayPal (conta do PayPal ou cartões de crédito / débito). Isso pode ser usado para permitir que seus clientes façam pagamentos ad-hoc ou pagamentos relacionados a um objeto Dolibarr específico (fatura, pedido etc ...) Module50300Name=Stripe Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...) Module50400Name=Accounting (double entry) @@ -677,7 +677,7 @@ Module63000Name=Recursos Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events Permission11=Consultar faturas a clientes Permission12=Criar/modificar faturas a clientes -Permission13=Invalidate customer invoices +Permission13=Invalidar faturas de clientes Permission14=Validar faturas a clientes Permission15=Enviar faturas a clientes por email Permission16=Emitir pagamentos para faturas a clientes @@ -737,13 +737,13 @@ Permission113=Configurar as contas ficnanceiras (criar, gerir categorias) Permission114=Reconciliar transações Permission115=Exportar transacções e extractos Permission116=Transferências entre contas -Permission117=Manage checks dispatching +Permission117=Gerenciar o envio de cheques Permission121=Consultar terceiros associados ao utilizador Permission122=Criar/modificar terceiros associados ao utilizador Permission125=Eliminar terceiros associados ao utilizador Permission126=Exportar terceiros -Permission141=Read all projects and tasks (also private projects for which I am not a contact) -Permission142=Create/modify all projects and tasks (also private projects for which I am not a contact) +Permission141=Leia todos os projetos e tarefas (também projetos privados dos quais não sou um contato) +Permission142=Criar / modificar todos os projetos e tarefas (também projetos privados dos quais não sou um contato) Permission144=Eliminar todos os projetos e tarefas (também os projetos privados para os quais não sou contactado) Permission146=Consultar fornecedores de rede Permission147=Consultar estados @@ -763,14 +763,14 @@ Permission173=Apagar viagens e despesas Permission174=Consultar todas as viagens e despesas Permission178=Exportar viagens e despesas Permission180=Consultar fornecedores -Permission181=Read purchase orders -Permission182=Create/modify purchase orders -Permission183=Validate purchase orders -Permission184=Approve purchase orders -Permission185=Order or cancel purchase orders -Permission186=Receive purchase orders -Permission187=Close purchase orders -Permission188=Cancel purchase orders +Permission181=Leia ordens de compra +Permission182=Criar / modificar ordens de compra +Permission183=Validar pedidos de compra +Permission184=Aprovar pedidos de compra +Permission185=Solicite ou cancele pedidos de compra +Permission186=Receber ordens de compra +Permission187=Fechar ordens de compra +Permission188=Cancelar pedidos de compra Permission192=Criar linhas de rede Permission193=Cancelar linhas de rede Permission194=Ler as linhas de largura de banda @@ -803,7 +803,7 @@ PermissionAdvanced253=Criar/modificar utilizadores internos/externos e permissõ Permission254=Criar/modificar apenas utilizadores externos Permission255=Modificar a palavra-passe de outros utilizadores Permission256=Eliminar ou desativar outros utilizadores -Permission262=Extend access to all third parties (not only third parties for which 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 assignment matters). +Permission262=Estenda o acesso a todos os terceiros (não apenas terceiros para os quais o usuário é um representante de vendas).
Não é eficaz para usuários externos (sempre limitados a eles próprios para propostas, pedidos, faturas, contratos, etc.).
Não efetivo para projetos (apenas regras sobre permissões de projeto, visibilidade e questões de atribuição). Permission271=Consultar CA Permission272=Consultar faturas Permission273=Emitir fatura @@ -813,10 +813,10 @@ Permission283=Eliminar contactos Permission286=Exportar contactos Permission291=Consultar tarifas Permission292=Definir permissões das tarifas -Permission293=Modify customer's tariffs -Permission300=Read barcodes -Permission301=Create/modify barcodes -Permission302=Delete barcodes +Permission293=Modificar as tarifas do cliente +Permission300=Leia códigos de barras +Permission301=Criar / modificar códigos de barras +Permission302=Excluir códigos de barras Permission311=Consultar serviços Permission312=Atribuir serviço/subscrição ao contrato Permission331=Consultar marcadores @@ -881,10 +881,10 @@ Permission1002=Criar/modificar armazéns Permission1003=Eliminar armazéns Permission1004=Consultar movimentos de stock Permission1005=Criar/modificar movimentos de stock -Permission1101=Read delivery receipts -Permission1102=Create/modify delivery receipts -Permission1104=Validate delivery receipts -Permission1109=Delete delivery receipts +Permission1101=Leia recibos de entrega +Permission1102=Criar / modificar recibos de entrega +Permission1104=Validar recibos de entrega +Permission1109=Excluir recibos de entrega Permission1121=Read supplier proposals Permission1122=Create/modify supplier proposals Permission1123=Validate supplier proposals @@ -892,34 +892,34 @@ Permission1124=Send supplier proposals Permission1125=Delete supplier proposals Permission1126=Close supplier price requests Permission1181=Consultar fornecedores -Permission1182=Read purchase orders -Permission1183=Create/modify purchase orders -Permission1184=Validate purchase orders -Permission1185=Approve purchase orders -Permission1186=Order purchase orders -Permission1187=Acknowledge receipt of purchase orders -Permission1188=Delete purchase orders +Permission1182=Leia ordens de compra +Permission1183=Criar / modificar ordens de compra +Permission1184=Validar pedidos de compra +Permission1185=Aprovar pedidos de compra +Permission1186=Pedidos de compra +Permission1187=Confirmar recebimento de pedidos de compra +Permission1188=Excluir ordens de compra Permission1189=Check/Uncheck a purchase order reception Permission1190=Approve (second approval) purchase orders Permission1191=Export supplier orders and their attributes Permission1201=Obter resultado de uma exportação Permission1202=Criar/Modificar uma exportação -Permission1231=Read vendor invoices -Permission1232=Create/modify vendor invoices -Permission1233=Validate vendor invoices -Permission1234=Delete vendor invoices -Permission1235=Send vendor invoices by email -Permission1236=Export vendor invoices, attributes and payments -Permission1237=Export purchase orders and their details +Permission1231=Leia as faturas do fornecedor +Permission1232=Criar / modificar faturas de fornecedores +Permission1233=Validar faturas de fornecedores +Permission1234=Excluir faturas de fornecedor +Permission1235=Envie faturas de fornecedor por e-mail +Permission1236=Exportar faturas, atributos e pagamentos de fornecedores +Permission1237=Exportar ordens de compra e seus detalhes Permission1251=Executar importações em massa de dados externos para a bases de dados (data load) Permission1321=Exportar faturas, atributos e cobranças de clientes Permission1322=Reabrir uma fatura paga -Permission1421=Export sales orders and attributes +Permission1421=Exportar ordens de venda e atributos Permission1521=Read documents Permission1522=Delete documents -Permission2401=Read actions (events or tasks) linked to his user account (if owner of event or just assigned to) -Permission2402=Create/modify actions (events or tasks) linked to his user account (if owner of event) -Permission2403=Delete actions (events or tasks) linked to his user account (if owner of event) +Permission2401=Ler ações (eventos ou tarefas) vinculadas à sua conta de usuário (se o proprietário do evento ou apenas atribuído a) +Permission2402=Criar / modificar ações (eventos ou tarefas) vinculadas à sua conta de usuário (se dono do evento) +Permission2403=Excluir ações (eventos ou tarefas) vinculadas à sua conta de usuário (se o proprietário do evento) Permission2411=Consultar ações (eventos ou tarefas) de outros Permission2412=Criar/modificar ações (eventos ou tarefas) de outros Permission2413=Eliminar ações (eventos ou tarefas) de outros @@ -1035,14 +1035,14 @@ DictionaryTransportMode=Intracomm report - Transport mode TypeOfUnit=Type of unit SetupSaved=Configuração guardada SetupNotSaved=A configuração não foi guardada -BackToModuleList=Back to Module list +BackToModuleList=Voltar à lista de módulos BackToDictionaryList=Back to Dictionaries list TypeOfRevenueStamp=Tipo de selo fiscal -VATManagement=Sales Tax Management -VATIsUsedDesc=By default when creating prospects, invoices, orders etc. the Sales Tax rate follows the active standard rule:
If the seller is not subject to Sales tax, then Sales tax defaults to 0. End of rule.
If the (seller's country = buyer's country), then the Sales tax by default equals the Sales tax of the product in the seller's country. End of rule.
If the seller and buyer are both in the European Community and goods are transport-related products (haulage, shipping, airline), the default VAT is 0. This rule is dependant on the seller's country - please consult with your accountant. The VAT should be paid by the buyer to the customs office in their country and not to the seller. End of rule.
If the seller and buyer are both in the European Community and the buyer is not a company (with a registered intra-Community VAT number) then the VAT defaults to the VAT rate of the seller's country. End of rule.
If the seller and buyer are both in the European Community and the buyer is a company (with a registered intra-Community VAT number), then the VAT is 0 by default. End of rule.
In any other case the proposed default is Sales tax=0. End of rule. -VATIsNotUsedDesc=By default the proposed Sales tax is 0 which can be used for cases like associations, individuals or small companies. -VATIsUsedExampleFR=In France, it means companies or organizations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared. -VATIsNotUsedExampleFR=In France, it means associations that are non Sales tax declared or companies, organizations or liberal professions that have chosen the micro enterprise fiscal system (Sales tax in franchise) and paid a franchise Sales tax without any Sales tax declaration. This choice will display the reference "Non applicable Sales tax - art-293B of CGI" on invoices. +VATManagement=Gestão de impostos sobre vendas +VATIsUsedDesc=Por padrão, ao criar clientes em potencial, faturas, pedidos, etc., a taxa de imposto sobre vendas segue a regra padrão ativa:
Se o vendedor não estiver sujeito a imposto sobre vendas, o padrão para imposto sobre vendas é 0. Fim da regra.
Se o (país do vendedor = país do comprador), então o imposto sobre vendas por padrão é igual ao imposto sobre vendas do produto no país do vendedor. Fim da regra.
Se o vendedor e o comprador estiverem na Comunidade Europeia e as mercadorias forem produtos relacionados ao transporte (transporte, envio, companhia aérea), o IVA padrão é 0. Esta regra depende do país do vendedor - consulte seu contador. O IVA deve ser pago pelo comprador à estância aduaneira do seu país e não ao vendedor. Fim da regra.
Se o vendedor e o comprador estiverem ambos na Comunidade Européia e o comprador não for uma empresa (com um número de IVA intracomunitário registrado), o IVA é padronizado para a taxa de IVA do país do vendedor. Fim da regra.
Se o vendedor e o comprador estiverem ambos na Comunidade Europeia e o comprador for uma empresa (com um número de IVA intracomunitário registrado), então o IVA é 0 por padrão. Fim da regra.
Em qualquer outro caso, o padrão proposto é Imposto sobre vendas = 0. Fim da regra. +VATIsNotUsedDesc=Por padrão, o imposto sobre vendas proposto é 0, que pode ser usado para casos como associações, indivíduos ou pequenas empresas. +VATIsUsedExampleFR=Na França, significa empresas ou organizações com um sistema fiscal real (real simplificado ou real normal). Um sistema em que o IVA é declarado. +VATIsNotUsedExampleFR=Na França, significa associações que não são declaradas como imposto sobre vendas ou empresas, organizações ou profissões liberais que escolheram o sistema fiscal de microempresa (imposto sobre vendas em franquia) e pagaram um imposto sobre vendas de franquia sem qualquer declaração de imposto sobre vendas. Essa escolha exibirá a referência "Imposto sobre vendas não aplicável - art-293B do CGI" nas faturas. ##### Local Taxes ##### TypeOfSaleTaxes=Type of sales tax LTRate=Taxa @@ -1127,9 +1127,9 @@ MessageLogin=Mensagem da página de inicio de sessão LoginPage=Página de inicio de sessão BackgroundImageLogin=Imagem de fundo PermanentLeftSearchForm=Zona de pesquisa permanente no menu esquerdo -DefaultLanguage=Default language -EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships -EnableShowLogo=Show the company logo in the menu +DefaultLanguage=Idioma padrão +EnableMultilangInterface=Habilite o suporte multilíngue para relacionamentos com clientes ou fornecedores +EnableShowLogo=Mostra o logotipo da empresa no menu CompanyInfo=Empresa/Organização CompanyIds=Identidades da Empresa/Organização CompanyName=Nome/Razão social @@ -1150,29 +1150,29 @@ OwnerOfBankAccount=Titular da conta bancária %s BankModuleNotActive=O módulo de contas bancarias não se encontra ativado ShowBugTrackLink=Mostrar hiperligação "%s" Alerts=Alertas -DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for: -DelaysOfToleranceDesc=Set the delay before an alert icon %s is shown onscreen for the late element. -Delays_MAIN_DELAY_ACTIONS_TODO=Planned events (agenda events) not completed +DelaysOfToleranceBeforeWarning=Atrase antes de exibir um alerta de aviso para: +DelaysOfToleranceDesc=Defina o atraso antes que um ícone de alerta %s seja mostrado na tela para o elemento atrasado. +Delays_MAIN_DELAY_ACTIONS_TODO=Eventos planejados (eventos da agenda) não concluídos Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Project not closed in time Delays_MAIN_DELAY_TASKS_TODO=Planned task (project tasks) not completed -Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Order not processed -Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Purchase order not processed -Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Proposal not closed -Delays_MAIN_DELAY_PROPALS_TO_BILL=Proposal not billed -Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Service to activate -Delays_MAIN_DELAY_RUNNING_SERVICES=Expired service -Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Unpaid vendor invoice -Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Unpaid customer invoice -Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Pending bank reconciliation -Delays_MAIN_DELAY_MEMBERS=Delayed membership fee -Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Check deposit not done +Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Pedido não processado +Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Pedido de compra não processado +Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Proposta não fechada +Delays_MAIN_DELAY_PROPALS_TO_BILL=Proposta não faturada +Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Serviço para ativar +Delays_MAIN_DELAY_RUNNING_SERVICES=Serviço expirado +Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Fatura de fornecedor não paga +Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Fatura de cliente não paga +Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Pendente de reconciliação bancária +Delays_MAIN_DELAY_MEMBERS=Taxa de adesão atrasada +Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Depósito de cheque não feito Delays_MAIN_DELAY_EXPENSEREPORTS=Expense report to approve Delays_MAIN_DELAY_HOLIDAYS=Leave requests to approve SetupDescription1=Antes de começar a usar o Dolibarr, alguns parâmetros iniciais devem ser definidos e módulos ativados / configurados. -SetupDescription2=The following two sections are mandatory (the two first entries in the Setup menu): -SetupDescription3=%s -> %s

Basic parameters used to customize the default behavior of your application (e.g for country-related features). -SetupDescription4=%s -> %s

This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules. -SetupDescription5=Other Setup menu entries manage optional parameters. +SetupDescription2=As duas seções a seguir são obrigatórias (as duas primeiras entradas no menu Configuração): +SetupDescription3= %s -> %s

Parâmetros básicos usados para personalizar o comportamento padrão de seu aplicativo (por exemplo, para recursos relacionados ao país). +SetupDescription4= %s -> %s

Este software é um conjunto de vários módulos / aplicativos. Os módulos relacionados às suas necessidades devem ser habilitados e configurados. As entradas do menu aparecerão com a ativação desses módulos. +SetupDescription5=Outras entradas do menu Setup gerenciam parâmetros opcionais. LogEvents=Eventos de auditoria da segurança Audit=Auditoria InfoDolibarr=Sobre o Dolibarr @@ -1187,14 +1187,14 @@ BrowserName=Nome do navegador BrowserOS=Sistema operativo do navegador ListOfSecurityEvents=Listagem de eventos de segurança do Dolibarr SecurityEventsPurged=Os eventos de segurança purgados -LogEventDesc=Enable logging for specific security events. Administrators the log via menu %s - %s. Warning, this feature can generate a large amount of data in the database. +LogEventDesc=Ative o registro para eventos de segurança específicos. Administradores o log via menu %s - %s . Atenção, este recurso pode gerar uma grande quantidade de dados no banco de dados. AreaForAdminOnly=Os parâmetros de configuração só podem ser definidos pelos utilizadores administradores. SystemInfoDesc=Esta informação do sistema é uma informação técnica acessível só para leitura dos administradores. -SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction. -CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done. +SystemAreaForAdminOnly=Esta área está disponível apenas para usuários administradores. As permissões do usuário Dolibarr não podem alterar esta restrição. +CompanyFundationDesc=Edite as informações da sua empresa / organização. Clique no botão "%s" na parte inferior da página quando terminar. AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information. AccountantFileNumber=Accountant code -DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here. +DisplayDesc=Os parâmetros que afetam a aparência e o comportamento do Dolibarr podem ser modificados aqui. AvailableModules=Aplicações/módulos disponíveis ToActivateModule=Para ativar os módulos, vá para a Área (Início->Configuração->Módulos). SessionTimeOut=Tempo limite para a sessão @@ -1206,44 +1206,44 @@ TriggerDisabledByName=Os acionadores neste ficheiro estão desativados pelo sufi TriggerDisabledAsModuleDisabled=Os acionadores neste ficheiro estão desativados porque o módulo %s está desativado. TriggerAlwaysActive=Os acionadores neste ficheiro estão sempre ativos, independentemente de quais são os módulos ativados. TriggerActiveAsModuleActive=Os acionadores deste ficheiro estão ativos, isto porque o módulo %s está ativado. -GeneratedPasswordDesc=Choose the method to be used for auto-generated passwords. +GeneratedPasswordDesc=Escolha o método a ser usado para senhas geradas automaticamente. DictionaryDesc=Insira todos os dados de referência. Você pode adicionar os seus valores aos valores predefinidos. -ConstDesc=This page allows you to edit (override) parameters not available in other pages. These are mostly reserved parameters for developers/advanced troubleshooting only. +ConstDesc=Esta página permite que você edite (substitua) parâmetros não disponíveis em outras páginas. Em sua maioria, esses parâmetros são reservados apenas para desenvolvedores / solução de problemas avançada. MiscellaneousDesc=Aqui são definidos todos os outros parâmetros relacionados com segurança. LimitsSetup=Configuração de limites/precisão LimitsDesc=Você pode definir limites, precisões e otimizações usadas pelo Dolibarr aqui -MAIN_MAX_DECIMALS_UNIT=Max. decimals for unit prices -MAIN_MAX_DECIMALS_TOT=Max. decimals for total prices -MAIN_MAX_DECIMALS_SHOWN=Max. decimals for prices shown on screen. Add an ellipsis ... after this parameter (e.g. "2...") if you want to see "..." suffixed to the truncated price. -MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something other than base 10. For example, put 0.05 if rounding is done by 0.05 steps) +MAIN_MAX_DECIMALS_UNIT=Máx. decimais para preços unitários +MAIN_MAX_DECIMALS_TOT=Máx. decimais para preços totais +MAIN_MAX_DECIMALS_SHOWN=Máx. decimais para os preços mostrados na tela . Adicione reticências ... após este parâmetro (por exemplo, "2 ...") se quiser ver " ... " sufixo ao preço truncado. +MAIN_ROUNDING_RULE_TOT=Etapa do intervalo de arredondamento (para países onde o arredondamento é feito em algo diferente da base 10. Por exemplo, coloque 0,05 se o arredondamento for feito em 0,05 etapas) UnitPriceOfProduct=Preço unitário líquido de um produto -TotalPriceAfterRounding=Total price (excl/vat/incl tax) after rounding +TotalPriceAfterRounding=Preço total (excl / IVA / imposto incl.) Após o arredondamento ParameterActiveForNextInputOnly=Parâmetro efetivo somente para as próximas sessões -NoEventOrNoAuditSetup=No security event has been logged. This is normal if Audit has not been enabled in the "Setup - Security - Events" page. +NoEventOrNoAuditSetup=Nenhum evento de segurança foi registrado. Isso é normal se a Auditoria não tiver sido habilitada na página "Configuração - Segurança - Eventos". NoEventFoundWithCriteria=Nenhum evento de segurança foi encontrado para este critério de pesquisa. SeeLocalSendMailSetup=Verifique a configuração local de sendmail -BackupDesc=A complete backup of a Dolibarr installation requires two steps. -BackupDesc2=Backup the contents of the "documents" directory (%s) containing all uploaded and generated files. This will also include all the dump files generated in Step 1. This operation may last several minutes. -BackupDesc3=Backup the structure and contents of your database (%s) into a dump file. For this, you can use the following assistant. -BackupDescX=The archived directory should be stored in a secure place. +BackupDesc=Um backup completo de uma instalação Dolibarr requer duas etapas. +BackupDesc2=Faça backup do conteúdo do diretório "documentos" ( %s ) contendo todos os arquivos carregados e gerados. Isso também incluirá todos os arquivos de despejo gerados na Etapa 1. Esta operação pode durar vários minutos. +BackupDesc3=Faça backup da estrutura e do conteúdo de seu banco de dados ( %s ) em um arquivo de despejo. Para isso, você pode usar o seguinte assistente. +BackupDescX=O diretório arquivado deve ser armazenado em um local seguro. BackupDescY=A cópia de segurança gerada deve ser armazenada num local seguro. BackupPHPWarning=Backup não pode ser garantido com este método. Um anterior recomendado. -RestoreDesc=To restore a Dolibarr backup, two steps are required. -RestoreDesc2=Restore the backup file (zip file for example) of the "documents" directory to a new Dolibarr installation or into this current documents directory (%s). -RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (%s). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.
To restore a backup database into this current installation, you can follow this assistant. +RestoreDesc=Para restaurar um backup Dolibarr, são necessárias duas etapas. +RestoreDesc2=Restaure o arquivo de backup (arquivo zip, por exemplo) do diretório "documentos" em uma nova instalação do Dolibarr ou neste diretório de documentos atual ( %s ). +RestoreDesc3=Restaure a estrutura e os dados do banco de dados de um arquivo de despejo de backup no banco de dados da nova instalação Dolibarr ou no banco de dados desta instalação atual ( %s ). Atenção, assim que a restauração for concluída, você deve usar um login / senha, que existia desde o momento do backup / instalação para se conectar novamente.
Para restaurar um banco de dados de backup para a instalação atual, você pode seguir este assistente. RestoreMySQL=Importação MySQL ForcedToByAModule=Esta regra é forçada a a %s, por um módulo ativo ValueIsForcedBySystem=This value is forced by the system. You can't change it. -PreviousDumpFiles=Existing backup files +PreviousDumpFiles=Arquivos de backup existentes PreviousArchiveFiles=Existing archive files -WeekStartOnDay=First day of the week -RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Program version %s differs from Database version %s) +WeekStartOnDay=Primeiro dia da semana +RunningUpdateProcessMayBeRequired=A execução do processo de atualização parece ser necessária (a versão do programa %s difere da versão do banco de dados %s) YouMustRunCommandFromCommandLineAfterLoginToUser=Deve executar este comando a partir de uma linha de comandos depois de iniciar a sessão, na linha de comandos, com o utilizador %s ou deve adicionar a opção -W no fim da linha de comando para indicar a palavra-passe %s. YourPHPDoesNotHaveSSLSupport=Funções SSL não estão disponíveis no seu PHP DownloadMoreSkins=Mais temas para descarregar -SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is sequential with no reset -ShowProfIdInAddress=Show professional id with addresses -ShowVATIntaInAddress=Hide intra-Community VAT number with addresses +SimpleNumRefModelDesc=Retorna o número de referência com o formato %syymm-nnnn onde yy é o ano, mm é o mês e nnnn é sequencial sem redefinir +ShowProfIdInAddress=Mostrar id profissional com endereços +ShowVATIntaInAddress=Ocultar número de IVA intracomunitário com endereços TranslationUncomplete=Tradução parcial MAIN_DISABLE_METEO=Desativar vista meteorológica MeteoStdMod=Modo padrão @@ -1252,20 +1252,20 @@ MeteoPercentageMod=Modo percentagem MeteoPercentageModEnabled=Modo percentagem ativado MeteoUseMod=Clique para usar %s TestLoginToAPI=Teste o login à API -ProxyDesc=Some features of Dolibarr require internet access. Define here the internet connection parameters such as access through a proxy server if necessary. -ExternalAccess=External/Internet Access -MAIN_PROXY_USE=Use a proxy server (otherwise access is direct to the internet) -MAIN_PROXY_HOST=Proxy server: Name/Address -MAIN_PROXY_PORT=Proxy server: Port -MAIN_PROXY_USER=Proxy server: Login/User -MAIN_PROXY_PASS=Proxy server: Password -DefineHereComplementaryAttributes=Define here any additional/custom attributes that you want to be included for: %s +ProxyDesc=Alguns recursos do Dolibarr requerem acesso à Internet. Defina aqui os parâmetros de conexão à Internet, como acesso por meio de um servidor proxy, se necessário. +ExternalAccess=Acesso externo / Internet +MAIN_PROXY_USE=Use um servidor proxy (caso contrário, o acesso é direto para a Internet) +MAIN_PROXY_HOST=Servidor proxy: Nome / Endereço +MAIN_PROXY_PORT=Servidor proxy: porta +MAIN_PROXY_USER=Servidor proxy: Login / usuário +MAIN_PROXY_PASS=Servidor proxy: senha +DefineHereComplementaryAttributes=Defina aqui quaisquer atributos adicionais / personalizados que deseja incluir: %s ExtraFields=Atributos complementares ExtraFieldsLines=Atributos complementares (linhas) ExtraFieldsLinesRec=Atributos complementares (linhas de faturas de modelos) ExtraFieldsSupplierOrdersLines=Atributos complementares (linhas da encomenda) ExtraFieldsSupplierInvoicesLines=Atributos complementares (linhas da fatura) -ExtraFieldsThirdParties=Complementary attributes (third party) +ExtraFieldsThirdParties=Atributos complementares (terceiros) ExtraFieldsContacts=Atributos complementares (contatos / endereço) ExtraFieldsMember=Atributos complementares (membro) ExtraFieldsMemberType=Atributos complementares (tipo de membro) @@ -1285,7 +1285,7 @@ SendmailOptionMayHurtBuggedMTA=O recurso para enviar e-mails usando o método "P 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 the display language:
* Default/Systemwide: menu Home -> Setup -> Display
* Per user: Click on the username at the top of the screen and modify the User Display Setup tab on the user card. +TranslationDesc=Como definir o idioma de exibição:
* Padrão / Em todo o sistema: menu Página inicial -> Configuração -> Exibir
* Por usuário: Clique no nome de usuário na parte superior da tela e modifique a guia Configuração do usuário a0e78439d647d0 usuário0e78439d647d0fc0fc971 do usuário0fc647d7 cartão. TranslationOverwriteDesc=Pode substituir as entradas na seguinte tabela. Escolha o seu idioma no menu suspenso "%s", insira a chave da tradução em "%s" e a sua nova tradução em "%s" TranslationOverwriteDesc2=Você pode usar a outra guia para ajudá-lo a saber qual chave de tradução deve ser usada TranslationString=Texto de tradução @@ -1295,11 +1295,11 @@ NewTranslationStringToShow=Novo texto de tradução a exibir OriginalValueWas=A tradução original foi alterada. O valor original era:

%s TransKeyWithoutOriginalValue=Você forçou uma nova tradução para a chave de tradução ' %s ' que não existe em nenhum arquivo de idioma TitleNumberOfActivatedModules=Activated modules -TotalNumberOfActivatedModules=Activated modules: %s / %s +TotalNumberOfActivatedModules=Módulos ativados: %s / %s YouMustEnableOneModule=Deve ativar, pelo menos, 1 módulo ClassNotFoundIntoPathWarning=Classe %s não encontrada no caminho do PHP YesInSummer=Sim no verão -OnlyFollowingModulesAreOpenedToExternalUsers=Note, only the following modules are available to external users (irrespective of the permissions of such users) and only if permissions are granted:
+OnlyFollowingModulesAreOpenedToExternalUsers=Observe que apenas os seguintes módulos estão disponíveis para usuários externos (independentemente das permissões de tais usuários) e somente se as permissões forem concedidas:
SuhosinSessionEncrypt=Sessão de armazenamento encriptada por Suhosin ConditionIsCurrently=A condição está atualmente %s YouUseBestDriver=You use driver %s which is the best driver currently available. @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Peça o método de envio preferido para terceiros. FieldEdition=Edição do campo %s FillThisOnlyIfRequired=Exemplo: +2 (para preencher apenas se existir problemas de desvios de fuso horário) @@ -1321,16 +1322,16 @@ GetBarCode=Obter código de barras NumberingModules=Numbering models DocumentModules=Document models ##### Module password generation -PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase. +PasswordGenerationStandard=Retorne uma senha gerada de acordo com o algoritmo Dolibarr interno: %s caracteres contendo números compartilhados e caracteres em minúsculas. PasswordGenerationNone=Não sugira uma senha gerada. A senha deve ser digitada manualmente. PasswordGenerationPerso=Retornar uma palavra-passe que esteja de acordo com sua configuração definida. SetupPerso=De acordo com a sua configuração PasswordPatternDesc=Descrição do padrão da palavra-passe ##### Users setup ##### -RuleForGeneratedPasswords=Rules to generate and validate passwords -DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page +RuleForGeneratedPasswords=Regras para gerar e validar senhas +DisableForgetPasswordLinkOnLogonPage=Não mostrar o link "Senha esquecida" na página de login UsersSetup=Configuração do módulo "Utilizadores" -UserMailRequired=Email required to create a new user +UserMailRequired=Email necessário para criar um novo usuário UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages) UsersDocModules=Document templates for documents generated from user record GroupsDocModules=Document templates for documents generated from a group record @@ -1338,9 +1339,9 @@ GroupsDocModules=Document templates for documents generated from a group record HRMSetup=Configuração do módulo "GRH" ##### Company setup ##### CompanySetup=Configuração do módulo "Empresas" -CompanyCodeChecker=Options for automatic generation of customer/vendor codes -AccountCodeManager=Options for automatic generation of customer/vendor accounting codes -NotificationsDesc=Email notifications can be sent automatically for some Dolibarr events.
Recipients of notifications can be defined: +CompanyCodeChecker=Opções para geração automática de códigos de cliente / fornecedor +AccountCodeManager=Opções para geração automática de códigos de contabilidade de cliente / fornecedor +NotificationsDesc=Notificações de e-mail podem ser enviadas automaticamente para alguns eventos Dolibarr.
Os destinatários das notificações podem ser definidos: NotificationsDescUser=* per user, one user at a time. NotificationsDescContact=* per third-party contacts (customers or vendors), one contact at a time. NotificationsDescGlobal=* or by setting global email addresses in this setup page. @@ -1350,7 +1351,7 @@ WatermarkOnDraft=Marca d'água no documento rascunho JSOnPaimentBill=Ative a funcionalidade para preencher automaticamente as linhas de pagamento no formulário de pagamento CompanyIdProfChecker=Regras para as Id. Profissionais MustBeUnique=Deve ser único? -MustBeMandatory=Mandatory to create third parties (if VAT number or type of company defined) ? +MustBeMandatory=Obrigatória a criação de terceiros (se definido o número de contribuinte ou tipo de empresa)? MustBeInvoiceMandatory=Obrigatório para validar faturas? TechnicalServicesProvided=Serviços técnicos fornecidos #####DAV ##### @@ -1365,13 +1366,13 @@ BillsPDFModules=Modelo de documentos de faturas BillsPDFModulesAccordindToInvoiceType=Modelos de documentos de faturas de acordo com o tipo de fatura PaymentsPDFModules=Modelos de documentos de pagamento ForceInvoiceDate=Forçar a data de fatura para a data de validação -SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined on the invoice -SuggestPaymentByRIBOnAccount=Suggest payment by withdrawal on account -SuggestPaymentByChequeToAddress=Suggest payment by check to +SuggestedPaymentModesIfNotDefinedInInvoice=Modo de pagamento sugerido na fatura por padrão, se não estiver definido na fatura +SuggestPaymentByRIBOnAccount=Sugerir pagamento por saque na conta +SuggestPaymentByChequeToAddress=Sugira pagamento em cheque para FreeLegalTextOnInvoices=Texto livre em faturas WatermarkOnDraftInvoices=Marca d'água nas faturas rascunho (nenhuma se em branco) PaymentsNumberingModule=Modelo de numeração de pagamentos -SuppliersPayment=Vendor payments +SuppliersPayment=Pagamentos a fornecedores SupplierPaymentSetup=Vendor payments setup ##### Proposals ##### PropalSetup=Configuração do módulo de orçamentos @@ -1393,7 +1394,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Pedir qual o armazém origem para a encomen BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Pedir conta bancária destinatária para encomendas a fornecedores ##### Orders ##### SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sale order by default if not defined on the order -OrdersSetup=Sales Orders management setup +OrdersSetup=Configuração de gerenciamento de pedidos de vendas OrdersNumberingModules=Modelos de numeração de encomendas OrdersModelModule=Modelos de documentos de encomendas FreeLegalTextOnOrders=Texto livre em encomendas @@ -1416,10 +1417,11 @@ WatermarkOnDraftContractCards=Marca d'água nos contratos rascunho (nenhuma se e MembersSetup=Configuração do módulo "Membros" MemberMainOptions=Opções principais AdherentLoginRequired= Gerir um login para cada membro -AdherentMailRequired=Email required to create a new member +AdherentMailRequired=Email necessário para criar um novo membro MemberSendInformationByMailByDefault=Selecione para enviar email de confirmação aos membros (validação ou nova subscrição), está ativada por defeito VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=Configuração do módulo "LDAP" LDAPGlobalParameters=Parâmetros globais @@ -1441,7 +1443,7 @@ LDAPSynchronizeMembersTypes=Organização dos tipos de membros da fundação no LDAPPrimaryServer=Servidor primario LDAPSecondaryServer=Servidor secundario LDAPServerPort=Porta do servidor -LDAPServerPortExample=Default port: 389 +LDAPServerPortExample=Porta padrão: 389 LDAPServerProtocolVersion=Versão de protocolo LDAPServerUseTLS=Utilizar TLS LDAPServerUseTLSExample=O seu servidor LDAP utiliza TLS @@ -1498,49 +1500,49 @@ LDAPSetupForVersion2=Servidor LDAP configurado para a versão 2 LDAPDolibarrMapping=Mapeamento Dolibarr LDAPLdapMapping=Mapeamento LDAP LDAPFieldLoginUnix=Nome de utilizador (Unix) -LDAPFieldLoginExample=Example: uid +LDAPFieldLoginExample=Exemplo: uid LDAPFilterConnection=Filtro de pesquisa -LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson) +LDAPFilterConnectionExample=Exemplo: & (objectClass = inetOrgPerson) LDAPFieldLoginSamba=Nome de utilizador (samba, activedirectory) -LDAPFieldLoginSambaExample=Example: samaccountname +LDAPFieldLoginSambaExample=Exemplo: samaccountname LDAPFieldFullname=Nome completo -LDAPFieldFullnameExample=Example: cn +LDAPFieldFullnameExample=Exemplo: cn LDAPFieldPasswordNotCrypted=Senha não criptografada LDAPFieldPasswordCrypted=Senha criptografada -LDAPFieldPasswordExample=Example: userPassword -LDAPFieldCommonNameExample=Example: cn +LDAPFieldPasswordExample=Exemplo: userPassword +LDAPFieldCommonNameExample=Exemplo: cn LDAPFieldName=Nome -LDAPFieldNameExample=Example: sn +LDAPFieldNameExample=Exemplo: sn LDAPFieldFirstName=Primeiro nome -LDAPFieldFirstNameExample=Example: givenName +LDAPFieldFirstNameExample=Exemplo: givenName LDAPFieldMail=Endereço de email -LDAPFieldMailExample=Example: mail +LDAPFieldMailExample=Exemplo: correio LDAPFieldPhone=Número de telefone profissional -LDAPFieldPhoneExample=Example: telephonenumber +LDAPFieldPhoneExample=Exemplo: número de telefone LDAPFieldHomePhone=Número de telefone pessoal -LDAPFieldHomePhoneExample=Example: homephone +LDAPFieldHomePhoneExample=Exemplo: telefone residencial LDAPFieldMobile=Número de telemóvel -LDAPFieldMobileExample=Example: mobile +LDAPFieldMobileExample=Exemplo: celular LDAPFieldFax=Número de fax -LDAPFieldFaxExample=Example: facsimiletelephonenumber +LDAPFieldFaxExample=Exemplo: facsimiletelephonenumber LDAPFieldAddress=Rua -LDAPFieldAddressExample=Example: street +LDAPFieldAddressExample=Exemplo: rua LDAPFieldZip=Código postal -LDAPFieldZipExample=Example: postalcode +LDAPFieldZipExample=Exemplo: código postal LDAPFieldTown=Localidade -LDAPFieldTownExample=Example: l +LDAPFieldTownExample=Exemplo: l LDAPFieldCountry=País LDAPFieldDescription=Descrição -LDAPFieldDescriptionExample=Example: description +LDAPFieldDescriptionExample=Exemplo: descrição LDAPFieldNotePublic=Nota Pública LDAPFieldNotePublicExample=Example: publicnote LDAPFieldGroupMembers= Membros do grupo -LDAPFieldGroupMembersExample= Example: uniqueMember +LDAPFieldGroupMembersExample= Exemplo: uniqueMember LDAPFieldBirthdate=Data de nascimento LDAPFieldCompany=Empresa -LDAPFieldCompanyExample=Example: o +LDAPFieldCompanyExample=Exemplo: o LDAPFieldSid=SID -LDAPFieldSidExample=Example: objectsid +LDAPFieldSidExample=Exemplo: objectsid LDAPFieldEndLastSubscription=Data de fim da subscrição LDAPFieldTitle=Cargo LDAPFieldTitleExample=Exemplo: title @@ -1592,8 +1594,8 @@ DefaultMandatory=Campos Obrigatórios ProductSetup=Configuração do módulo "Produtos" ServiceSetup=Configuração do módulo "Serviços" ProductServiceSetup=Configuração do módulo "Produtos e Serviços" -NumberOfProductShowInSelect=Maximum number of products to show in combo select lists (0=no limit) -ViewProductDescInFormAbility=Display product descriptions in forms (otherwise shown in a tooltip popup) +NumberOfProductShowInSelect=Número máximo de produtos a serem exibidos nas listas de seleção de combinação (0 = sem limite) +ViewProductDescInFormAbility=Exibir descrições de produtos em formulários (caso contrário, mostrado em um pop-up de dica) MergePropalProductCard=Ative no separador "Ficheiros Anexados" do produto/serviço uma opção para unir o documento em PDF ao orçamento em PDF, se o produto/serviço estiver no orçamento ViewProductDescInThirdpartyLanguageAbility=Exibir descrições de produtos no idioma do terceiro UseSearchToSelectProductTooltip=Além disso, se você tiver um grande número de produtos (> 100 000), poderá aumentar a velocidade definindo PRODUCT_DONOTSEARCH_ANYWHERE como 1 em Setup-> Other. A pesquisa será limitada ao início da string. @@ -1612,7 +1614,7 @@ SyslogLevel=Nível SyslogFilename=Nome e caminho do ficheiro YouCanUseDOL_DATA_ROOT=Pode utilizar DOL_DATA_ROOT/dolibarr.log para um ficheiro log no diretório de "documentos" do Dolibarr. ErrorUnknownSyslogConstant=A constante %s não é uma constante Syslog conhecida -OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported +OnlyWindowsLOG_USER=No Windows, apenas o recurso LOG_USER será suportado CompressSyslogs=Compactação e backup de arquivos de log de depuração (gerados pelo módulo Log para depuração) SyslogFileNumberOfSaves=Number of backup logs to keep ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure o trabalho agendado de limpeza para definir a frequência do registo da cópia de segurança @@ -1638,7 +1640,7 @@ GenbarcodeLocation=Ferramenta da linha de comandos para a produção de códigos BarcodeInternalEngine=Motor interno BarCodeNumberManager=Gestor para definir automaticamente números de código de barras ##### Prelevements ##### -WithdrawalsSetup=Setup of module Direct Debit payments +WithdrawalsSetup=Configuração do módulo de pagamentos de débito direto ##### ExternalRSS ##### ExternalRSSSetup=Configuração das importações de feeds RSS externos NewRSS=Novo feed RSS @@ -1646,15 +1648,15 @@ RSSUrl=Endereço do feed RSS RSSUrlExample=Um feed RSS interessante ##### Mailing ##### MailingSetup=Configuração do módulo "Emailing" -MailingEMailFrom=Sender email (From) for emails sent by emailing module -MailingEMailError=Return Email (Errors-to) for emails with errors +MailingEMailFrom=E-mail do remetente (De) para e-mails enviados pelo módulo de e-mail +MailingEMailError=Retornar e-mail (erros para) para e-mails com erros MailingDelay=Segundos a esperar antes de enviar a próxima mensagem ##### Notification ##### -NotificationSetup=Email Notification module setup -NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module +NotificationSetup=Configuração do módulo de notificação por email +NotificationEMailFrom=Email do remetente (De) para emails enviados pelo módulo Notificações FixedEmailTarget=Destinatario ##### Sendings ##### -SendingsSetup=Shipping module setup +SendingsSetup=Configuração do módulo de envio SendingsReceiptModel=Modelo do recibo de expedição SendingsNumberingModules=Envios módulos numerados SendingsAbility=Suporte para guias de transporte para entregas a clientes @@ -1670,7 +1672,7 @@ AdvancedEditor=Editor avançado ActivateFCKeditor=Ativar editor avançado para: FCKeditorForCompany=Criação/Edição WYSIWIG da descrição e notas de elementos (exceto produtos/services) FCKeditorForProduct=Criação/Edição WYSIWIG da descrição e notas dos produtos/serviços -FCKeditorForProductDetails=WYSIWIG criação / edição de produtos detalha linhas para todas as entidades (propostas, pedidos, faturas, etc ...). Aviso: O uso dessa opção para este caso não é recomendado, pois pode criar problemas com caracteres especiais e formatação de página ao criar arquivos PDF. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= Criação/Edição WYSIWIG para emails em massa (Ferramentas->eMailing) FCKeditorForUserSignature=Criação/Edição WYSIWIG da assinatura do utilizador FCKeditorForMail=Criação/Edição WYSIWIG para todo o correio (exceto Ferramentas->eMailling) @@ -1680,7 +1682,7 @@ StockSetup=Configuração do módulo Stock IfYouUsePointOfSaleCheckModule=Se você usar o módulo Point of Sale (POS) fornecido por padrão ou um módulo externo, essa configuração pode ser ignorada pelo seu módulo POS. A maioria dos módulos PDV é projetada por padrão para criar uma fatura imediatamente e diminuir o estoque, independentemente das opções aqui. Portanto, se você precisar ou não de uma redução de estoque ao registrar uma venda no seu PDV, verifique também a configuração do seu módulo PDV. ##### Menu ##### MenuDeleted=Menu eliminado -Menu=Menu +Menu=Cardápio Menus=Menus TreeMenuPersonalized=Menus personalizados NotTopTreeMenuPersonalized=Menus personalizados não ligados a uma entrada do menu no topo @@ -1710,8 +1712,8 @@ TaxSetup=Configuração do módulo "Impostos, impostos sociais ou fiscais e divi OptionVatMode=Aplicação do IVA OptionVATDefault=Base padrão OptionVATDebitOption=Regime de competência -OptionVatDefaultDesc=VAT is due:
- on delivery of goods (based on invoice date)
- on payments for services -OptionVatDebitOptionDesc=VAT is due:
- on delivery of goods (based on invoice date)
- on invoice (debit) for services +OptionVatDefaultDesc=IVA devido:
- na entrega de bens (com base na data da fatura)
- nos pagamentos de serviços +OptionVatDebitOptionDesc=IVA devido:
- na entrega de mercadorias (com base na data da fatura)
- na fatura (débito) de serviços OptionPaymentForProductAndServices=Base de caixa para produtos e serviços OptionPaymentForProductAndServicesDesc=IVA é devido:
- em pagamento de mercadorias
- em pagamentos de serviços SummaryOfVatExigibilityUsedByDefault=Horário de elegibilidade do IVA por padrão de acordo com a opção escolhida: @@ -1736,22 +1738,23 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Definir automaticamente este valor padrão para o AGENDA_DEFAULT_FILTER_TYPE=Definir automaticamente esse tipo de evento no filtro de pesquisa da visualização da agenda AGENDA_DEFAULT_FILTER_STATUS=Definir automaticamente este status para eventos no filtro de pesquisa da visualização da agenda AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda -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 evento no navegador do usuário (quando a data do evento é atingida, cada usuário pode recusar isso da pergunta de confirmação do navegador) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Ativar notificação sonora +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Mostrar o objeto associado na vista de agenda ##### Clicktodial ##### ClickToDialSetup=Configuração do módulo "Click To Dial" ClickToDialUrlDesc=Uma chamada é efetuada quando o icon é clicado. No URL pode usar as tags:
__PHONETO__ que será substituída pelo número do destinatário
__PHONEFROM__ que será substituída pelo número do remetente
__LOGIN__ que será substituída pelo nome de utilizador da sua conta ClickToDial (definido no seu cartão de utilizador)
__PASS__ que será substituída pela palavra-passe da sua conta ClickToDial (definida no seu cartão de utilizador). -ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable. +ClickToDialDesc=Este módulo altera os números de telefone, ao usar um computador desktop, em links clicáveis. Um clique ligará para o número. Isso pode ser usado para iniciar a chamada telefônica ao usar um softphone em sua área de trabalho ou ao usar um sistema CTI baseado no protocolo SIP, por exemplo. Nota: Ao usar um smartphone, os números de telefone são sempre clicáveis. ClickToDialUseTelLink=Usar apenas um link "tel:" em números de telefone ClickToDialUseTelLinkDesc=Use esse método se os usuários tiverem um softphone ou uma interface de software instalada no mesmo computador que o navegador e chamados quando você clicar em um link em seu navegador que comece com "tel:". Se você precisar de uma solução de servidor completa (sem necessidade de instalação de software local), deverá definir isso como "Não" e preencher o próximo campo. ##### Point Of Sale (CashDesk) ##### -CashDesk=Point of Sale -CashDeskSetup=Point of Sales module setup +CashDesk=Ponto de venda +CashDeskSetup=Configuração do módulo de ponto de vendas CashDeskThirdPartyForSell=Terceiro genérico padrão a ser usado para vendas CashDeskBankAccountForSell=Conta a ser usada para receber pagamentos em dinheiro -CashDeskBankAccountForCheque=Default account to use to receive payments by check +CashDeskBankAccountForCheque=Conta padrão a ser usada para receber pagamentos em cheque CashDeskBankAccountForCB=Conta a ser usada para receber pagamentos por cartões de crédito CashDeskBankAccountForSumup=Default bank account to use to receive payments by SumUp CashDeskDoNotDecreaseStock=Desativar a redução de estoque quando uma venda é feita a partir do ponto de venda (se "não", a redução de estoque é feita para cada venda feita a partir do PDV, independentemente da opção definida no módulo Estoque). @@ -1781,7 +1784,7 @@ ApiKey=Chave para a API 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=Free text on check receipts +FreeLegalTextOnChequeReceipts=Texto livre em recibos de cheque BankOrderShow=Ordem de exibiçãode contas bancárias para países que utilizam "IBAN" BankOrderGlobal=Geral BankOrderGlobalDesc=Ordem de exibição geral @@ -1791,15 +1794,15 @@ ChequeReceiptsNumberingModule=Check Receipts Numbering Module ##### Multicompany ##### MultiCompanySetup=Configuração do módulo "Multi-empresa" ##### Suppliers ##### -SuppliersSetup=Vendor module setup -SuppliersCommandModel=Complete template of Purchase Order +SuppliersSetup=Configuração do módulo do fornecedor +SuppliersCommandModel=Modelo completo de pedido de compra SuppliersCommandModelMuscadet=Complete template of Purchase Order (old implementation of cornas template) -SuppliersInvoiceModel=Complete template of Vendor Invoice -SuppliersInvoiceNumberingModel=Vendor invoices numbering models +SuppliersInvoiceModel=Modelo completo de fatura do fornecedor +SuppliersInvoiceNumberingModel=Modelos de numeração de faturas de fornecedores IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval ##### GeoIPMaxmind ##### GeoIPMaxmindSetup=Configuração do módulo "GeoIP Maxmind" -PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
Examples:
/usr/local/share/GeoIP/GeoIP.dat
/usr/share/GeoIP/GeoIP.dat
/usr/share/GeoIP/GeoLite2-Country.mmdb +PathToGeoIPMaxmindCountryDataFile=Caminho para o arquivo que contém a tradução do Maxmind ip para o país.
Exemplos:
/usr/local/share/GeoIP/GeoIP.dat
/usr/share/GeoIP/GeoIP.dat
/usr/shareCountry.Geomm/Geomm2 NoteOnPathLocation=Note que o endereço IP de dados do país/arquivo deve estar dentro de um diretório do seu PHP (Verifique a configuração do PHP open_basedir e permissões de ficheiros de sistema). YouCanDownloadFreeDatFileTo=Você pode descarregar uma versão demo gratuita do ficheiro país Maxmind GeoIP em %s. YouCanDownloadAdvancedDatFileTo=Você também pode baixar uma versão mais completa, com atualizações do país arquivo GeoIP MaxMind em %s. @@ -1892,7 +1895,7 @@ ExpectedSize=Expected size CurrentSize=Current size ForcedConstants=Valores de constantes necessários MailToSendProposal=Orçamentos -MailToSendOrder=Sales orders +MailToSendOrder=Encomendas de venda MailToSendInvoice=Faturas a clientes MailToSendShipment=Envios MailToSendIntervention=Intervenções diff --git a/htdocs/langs/pt_PT/banks.lang b/htdocs/langs/pt_PT/banks.lang index 79c83ab9483..2401d4caf2a 100644 --- a/htdocs/langs/pt_PT/banks.lang +++ b/htdocs/langs/pt_PT/banks.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - banks Bank=Banco -MenuBankCash=Banks | Cash +MenuBankCash=Bancos Dinheiro MenuVariousPayment=Pagamentos diversos MenuNewVariousPayment=Novo pagamento diverso BankName=Nome do banco @@ -30,7 +30,7 @@ AllTime=Do início Reconciliation=Conciliação RIB=Conta bancária IBAN=Número IBAN -BIC=BIC/SWIFT code +BIC=Código BIC / SWIFT SwiftValid=BIC / SWIFT válido SwiftVNotalid=BIC/SWIFT inválido IbanValid=BAN válido @@ -45,11 +45,11 @@ AccountStatementShort=Extracto AccountStatements=Extractos LastAccountStatements=Últimos extractos bancários IOMonthlyReporting=Relatório mensal E/S -BankAccountDomiciliation=Bank address +BankAccountDomiciliation=endereço do banco BankAccountCountry=Conta do país BankAccountOwner=Nome do proprietário da Conta BankAccountOwnerAddress=Direcção do proprietário da Conta -RIBControlError=Integrity check of values failed. This means the information for this account number is not complete or is incorrect (check country, numbers and IBAN). +RIBControlError=Falha na verificação de integridade dos valores. Isso significa que as informações para este número de conta não estão completas ou estão incorretas (verifique o país, números e IBAN). CreateAccount=Criar Conta NewBankAccount=Nova conta NewFinancialAccount=Nova conta financeira @@ -98,7 +98,7 @@ AddBankRecordLong=Adicionar entrada manualmente Conciliated=Reconciliado ConciliatedBy=Conciliado por DateConciliating=Data Conciliação -BankLineConciliated=Entry reconciled with bank receipt +BankLineConciliated=Entrada reconciliada com recibo do banco Reconciled=Reconciliado NotReconciled=Não reconciliado CustomerInvoicePayment=Pagamento de cliente @@ -106,10 +106,10 @@ SupplierInvoicePayment=Pagamento de fornecedor SubscriptionPayment=Pagamento Assinatura WithdrawalPayment=Débito direto SocialContributionPayment=Pagamento da taxa social/fiscal -BankTransfer=Credit transfer -BankTransfers=Credit transfers +BankTransfer=Transferência de crédito +BankTransfers=Transferências de crédito MenuBankInternalTransfer=Transferência interna -TransferDesc=Transfer from one account to another, Dolibarr will write two records (a debit in source account and a credit in target account). The same amount (except sign), label and date will be used for this transaction) +TransferDesc=Transferência de uma conta para outra, Dolibarr escreverá dois registros (um débito na conta de origem e um crédito na conta de destino). O mesmo valor (exceto sinal), rótulo e data serão usados para esta transação) TransferFrom=De TransferTo=Para TransferFromToDone=A transferência de %s para %s de %s %s foi criado. @@ -141,7 +141,7 @@ BankTransactionLine=Entrada bancária AllAccounts=Todas as contas bancárias e de caixa BackToAccount=Voltar à Conta ShowAllAccounts=Mostrar para todas as Contas -FutureTransaction=Future transaction. Unable to reconcile. +FutureTransaction=Transação futura. Incapaz de reconciliar. SelectChequeTransactionAndGenerate=Selecione / filtrar cheques para incluir no recibo do cheque e clique em "Criar". InputReceiptNumber=Escolha o extrato bancário relacionado com a conciliação. Use um valor numérico classificável: YYYYMM ou YYYYMMDD EventualyAddCategory=Eventualmente, especifique uma categoria que deseja classificar os movimentos @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=Pagamentos diversos ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=Mandato SEPA YourSEPAMandate=Seu mandato SEPA FindYourSEPAMandate=Este é o seu mandato da SEPA para autorizar a nossa empresa a efetuar um pedido de débito direto ao seu banco. Devolva-o assinado (digitalização do documento assinado) ou envie-o por correio para @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/pt_PT/categories.lang b/htdocs/langs/pt_PT/categories.lang index 83d5b2c3f6d..bd0e39a4308 100644 --- a/htdocs/langs/pt_PT/categories.lang +++ b/htdocs/langs/pt_PT/categories.lang @@ -10,7 +10,7 @@ modify=Modificar Classify=Classificar CategoriesArea=Área de etiquetas/categorias ProductsCategoriesArea=Área de etiquetas/categorias de produtos/serviços -SuppliersCategoriesArea=Vendors tags/categories area +SuppliersCategoriesArea=Área de tags / categorias de fornecedores CustomersCategoriesArea=Área de etiquetas/categorias de clientes MembersCategoriesArea=Área de etiquetas/categorias de membros ContactsCategoriesArea=Área de etiquetas/categorias de contactos @@ -32,7 +32,7 @@ WasAddedSuccessfully=%s foi adicionado com sucesso. ObjectAlreadyLinkedToCategory=O elemento já se encontra associado a esta etiqueta/categoria. ProductIsInCategories=O produto/serviço está associado às seguintes etiquetas/categorias CompanyIsInCustomersCategories=O terceiro está associado às seguintes etiquetas/categorias de clientes/prospecções -CompanyIsInSuppliersCategories=This third party is linked to following vendors tags/categories +CompanyIsInSuppliersCategories=Este terceiro está vinculado às seguintes tags / categorias de fornecedores MemberIsInCategories=O terceiro está associado às seguintes etiquetas/categorias de membros ContactIsInCategories=Este contacto está associado às seguintes etiquetas/categorias de contactos ProductHasNoCategory=Este produto/serviço não se encontra associado a quaisquer etiquetas/categorias @@ -48,14 +48,14 @@ ContentsNotVisibleByAllShort=Conteúdo não visível por todos DeleteCategory=Eliminar etiqueta/categoria ConfirmDeleteCategory=Tem a certeza que quer eliminar esta etiqueta/categoria? NoCategoriesDefined=Sem etiqueta/categoria definida -SuppliersCategoryShort=Vendors tag/category +SuppliersCategoryShort=Tag / categoria de fornecedores CustomersCategoryShort=Etiquetas/categorias de clientes ProductsCategoryShort=Etiquetas/categorias de produtos MembersCategoryShort=Etiquetas/categorias de membros -SuppliersCategoriesShort=Vendors tags/categories +SuppliersCategoriesShort=Tags / categorias de fornecedores CustomersCategoriesShort=Etiquetas/catego. de clientes ProspectsCategoriesShort=Etiquetas/categorias de prospecções -CustomersProspectsCategoriesShort=Cust./Prosp. tags/categories +CustomersProspectsCategoriesShort=Cust./Prosp. tags / categorias ProductsCategoriesShort=Etiquetas/categorias de produtos MembersCategoriesShort=Etiquetas/categorias de membros ContactCategoriesShort=Etiquetas/Catego. de Contactos @@ -65,7 +65,7 @@ UsersCategoriesShort=Users tags/categories StockCategoriesShort=Warehouse tags/categories ThisCategoryHasNoItems=This category does not contain any items. CategId=ID de etiqueta/categoria -CatSupList=List of vendor tags/categories +CatSupList=Lista de tags / categorias de fornecedores CatCusList=Lista de etiquetas/categorias de clientes/prospecções CatProdList=Lista de etiquetas/categorias de produtos CatMemberList=Lista de etiquetas/categorias de membros @@ -81,10 +81,12 @@ CategoriesSetup=Configuração de etiquetas/categorias CategorieRecursiv=Ligar com a etiqueta/categoria pai automaticamente CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=Adicioanr o produto/serviço seguinte +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Mostrar etiqueta/categoria ByDefaultInList=Por predefinição na lista ChooseCategory=Escolha a categoria -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/pt_PT/companies.lang b/htdocs/langs/pt_PT/companies.lang index 473bd62d9a2..0c75b753e4c 100644 --- a/htdocs/langs/pt_PT/companies.lang +++ b/htdocs/langs/pt_PT/companies.lang @@ -19,8 +19,8 @@ ProspectionArea=Área de prospeção IdThirdParty=ID Terceiro IdCompany=Id Empresa IdContact=Id Contacto -ThirdPartyContacts=Third-party contacts -ThirdPartyContact=Third-party contact/address +ThirdPartyContacts=Contatos de terceiros +ThirdPartyContact=Contato / endereço de terceiros Company=Empresa CompanyName=Razão social AliasNames=Pseudónimo (comercial, marca registada, ...) @@ -28,19 +28,19 @@ AliasNameShort=Nome do alias Companies=Empresas CountryIsInEEC=País faz parte da Comunidade Económica Europeia PriceFormatInCurrentLanguage=Price display format in the current language and currency -ThirdPartyName=Third-party name +ThirdPartyName=Nome de terceiro ThirdPartyEmail=Third-party email -ThirdParty=Third-party -ThirdParties=Third-parties +ThirdParty=Terceiro +ThirdParties=Terceiros ThirdPartyProspects=Clientes Potenciais ThirdPartyProspectsStats=Clientes Potenciais ThirdPartyCustomers=Clientes ThirdPartyCustomersStats=Clientes ThirdPartyCustomersWithIdProf12=Clientes com %s ó %s ThirdPartySuppliers=Fornecedores -ThirdPartyType=Third-party type +ThirdPartyType=Tipo de terceiro Individual=Particular -ToCreateContactWithSameName=Will automatically create a contact/address with same information as the third party under the third party. In most cases, even if your third party is a physical person, creating a third party alone is enough. +ToCreateContactWithSameName=Criará automaticamente um contato / endereço com as mesmas informações do terceiro sob o terceiro. Na maioria dos casos, mesmo que seu terceiro seja uma pessoa física, criar um terceiro sozinho é suficiente. ParentCompany=Empresa-mãe Subsidiaries=Subsidiárias ReportByMonth=Relatório por mês @@ -71,7 +71,7 @@ Chat=Chat PhonePro=Telef. Profissional PhonePerso=Telef. particular PhoneMobile=Telemovel -No_Email=Refuse bulk emailings +No_Email=Recusar emails em massa Fax=Fax Zip=Código postal Town=Localidade @@ -81,7 +81,7 @@ DefaultLang=Idioma predefinido VATIsUsed=Imposto sobre vendas usado VATIsUsedWhenSelling=Isso define se esse terceiro inclui um imposto de venda ou não quando faz uma fatura para seus próprios clientes VATIsNotUsed=Não sujeito a IVA -CopyAddressFromSoc=Copy address from third-party details +CopyAddressFromSoc=Copie o endereço dos detalhes de terceiros ThirdpartyNotCustomerNotSupplierSoNoRef=Terceiros nem cliente nem fornecedor, nenhum objeto de referência disponível ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Third party neither customer nor vendor, discounts are not available PaymentBankAccount=Conta bancária de pagamentos @@ -124,7 +124,7 @@ ProfId1AT=ID Prof. 1 (USt.-IdNr) ProfId2AT=ID Prof. 2 (USt.-Nr) ProfId3AT=ID Prof. 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=ID Prof. 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=ID Prof. 1 (N° da Ordem) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=Número EORI ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscrição Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscrição Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=ID Prof. 1 (Número federal) ProfId4CH=ID Prof. 2 (Núm. Registo de Comércio) -ProfId5CH=- +ProfId5CH=Número EORI ProfId6CH=- ProfId1CL=ID Prof. 1 (R.U.T.) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=ID Prof. 1 (USt.-IdNr) ProfId2DE=ID Prof. 2 (USt.-NR) ProfId3DE=ID Prof. 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=Número EORI ProfId6DE=- ProfId1ES=ID Prof. 1 (CIF/NIF) ProfId2ES=ID Prof. 2 (Número de segurança social) ProfId3ES=ID Prof. 3 (CNAE) ProfId4ES=ID Prof. 4 (Número colegiado) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=ID Prof. 1 (SIREN) ProfId2FR=ID Prof. 2 (SIRET) ProfId3FR=ID Prof. 3 (NAF, antigo APE) ProfId4FR=ID Prof. 4 (RCS/RM) -ProfId5FR=Prof Id 5 +ProfId5FR=Número EORI ProfId6FR=- ProfId1GB=Número Registo ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=ID Prof. 3 (Imposto SRVC) ProfId4IN=ID Prof. 4 ProfId5IN=ID Prof. 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=ID Prof. 1 (R.C. Luxemburgo) ProfId2LU=ID Prof. 2 (Permissão comercial) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=ID Prof. 1 (R.C.) ProfId2MA=ID Prof. 2 (Patente) ProfId3MA=ID Prof. 3 (I.F.) ProfId4MA=ID Prof. 4 (C.N.S.S.) -ProfId5MA=ID Prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=ID Prof. 1 (R.F.C). ProfId2MX=ID Prof. 2 (R..P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=nummer KVK ProfId2NL=- ProfId3NL=- ProfId4NL=- -ProfId5NL=- +ProfId5NL=Número EORI ProfId6NL=- ProfId1PT=ID Prof. 1 (NIF) ProfId2PT=ID Prof. 2 (Núm. Segurança Social) ProfId3PT=ID Prof. 3 (Núm. Reg. Comercial) ProfId4PT=ID Prof. 4 (Conservatória) -ProfId5PT=- +ProfId5PT=Número EORI ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=ID Prof. 1 (OGRN) ProfId2RU=ID Prof. 2 (INN) @@ -262,8 +267,8 @@ ProfId1DZ=RC ProfId2DZ=Art. ProfId3DZ=NIF ProfId4DZ=NIS -VATIntra=VAT ID -VATIntraShort=VAT ID +VATIntra=ID IVA +VATIntraShort=ID IVA VATIntraSyntaxIsValid=Sintaxe Válida VATReturn=Retorno do IVA ProspectCustomer=Cliente Potencial/Cliente @@ -297,7 +302,7 @@ AddContact=Criar contacto AddContactAddress=Novo contacto/morada EditContact=Editar contato / endereço EditContactAddress=Editar contactos/endereços -Contact=Contact/Address +Contact=Endereço de contacto Contacts=Contactos ContactId=ID de contacto ContactsAddresses=Contato / Endereços @@ -326,7 +331,7 @@ ListOfContacts=Lista de Contactos ListOfContactsAddresses=Lista de Contactos ListOfThirdParties=Lista de Terceiros ShowCompany=Third Party -ShowContact=Contact-Address +ShowContact=Endereço de contacto ContactsAllShort=Todos (sem filtro) ContactType=Tipo de Contacto ContactForOrders=Contacto para Pedidos @@ -345,15 +350,16 @@ MyContacts=Os Meus Contactos Capital=Capital CapitalOf=Capital Social de %s EditCompany=Modificar Empresa -ThisUserIsNot=This user is not a prospect, customer or vendor +ThisUserIsNot=Este usuário não é um cliente potencial, ou fornecedor VATIntraCheck=Verificar -VATIntraCheckDesc=The VAT ID must include the country prefix. The link %s uses the European VAT checker service (VIES) which requires internet access from the Dolibarr server. +VATIntraCheckDesc=O ID do IVA deve incluir o prefixo do país. O link %s usa o serviço de verificador de IVA europeu (VIES) que requer acesso à Internet do servidor Dolibarr. VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do -VATIntraCheckableOnEUSite=Check the intra-Community VAT ID on the European Commission website +VATIntraCheckableOnEUSite=Verifique o ID do IVA intracomunitário no site da Comissão Europeia VATIntraManualCheck=Você também pode verificar manualmente no site da Comissão Europeia %s ErrorVATCheckMS_UNAVAILABLE=Verificação Impossivel. O serviço de verificação não é prestado pelo país membro (%s). -NorProspectNorCustomer=Not prospect, nor customer +NorProspectNorCustomer=Não é cliente potencial, nem cliente JuridicalStatus=Tipo de Entidade Legal +Workforce=Workforce Staff=Funcionários ProspectLevelShort=Cli. Potenc. ProspectLevel=Cliente Potencial @@ -375,7 +381,7 @@ TE_MEDIUM=Media TE_ADMIN=Administração Pública TE_SMALL=Pequena TE_RETAIL=Retalhista -TE_WHOLE=Wholesaler +TE_WHOLE=Grossista TE_PRIVATE=Indivíduo particular TE_OTHER=Outro StatusProspect-1=Não contactar @@ -394,13 +400,13 @@ ExportCardToFormat=Exportar ficha para o formato ContactNotLinkedToCompany=Contacto não vinculado a um Terceiro DolibarrLogin=Dolibarr - Iniciar Sessão NoDolibarrAccess=Sem Acesso -ExportDataset_company_1=Third-parties (companies/foundations/physical people) and their properties +ExportDataset_company_1=Terceiros (empresas / fundações / pessoas físicas) e suas propriedades ExportDataset_company_2=Contatos e suas propriedades -ImportDataset_company_1=Third-parties and their properties -ImportDataset_company_2=Third-parties additional contacts/addresses and attributes -ImportDataset_company_3=Third-parties Bank accounts +ImportDataset_company_1=Terceiros e suas propriedades +ImportDataset_company_2=Contactos / endereços e atributos adicionais de terceiros +ImportDataset_company_3=Contas bancárias de terceiros ImportDataset_company_4=Third-parties Sales representatives (assign sales representatives/users to companies) -PriceLevel=Price Level +PriceLevel=Nível de preço PriceLevelLabels=Price Level Labels DeliveryAddress=Direcção de Envío AddAddress=Adicionar Direcção @@ -425,7 +431,7 @@ ListSuppliersShort=Lista de Fornecedores ListProspectsShort=Lista de Perspectivas ListCustomersShort=Lista de Clientes ThirdPartiesArea=Terceiros / Contatos -LastModifiedThirdParties=Latest %s modified Third Parties +LastModifiedThirdParties=Últimos %s terceiros modificados UniqueThirdParties=Total de Terceiros InActivity=Aberto ActivityCeased=Fechado @@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor PaymentTypeBoth=Payment Type - Customer and Vendor MulticurrencyUsed=Use Multicurrency MulticurrencyCurrency=Moeda +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/pt_PT/hrm.lang b/htdocs/langs/pt_PT/hrm.lang index e53c8992cc4..dd249f092a0 100644 --- a/htdocs/langs/pt_PT/hrm.lang +++ b/htdocs/langs/pt_PT/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=Funcionários Employee=Funcionário NewEmployee=Novo funcionário +ListOfEmployees=Lista de funcionários diff --git a/htdocs/langs/pt_PT/languages.lang b/htdocs/langs/pt_PT/languages.lang index 31689948085..b84561e4f84 100644 --- a/htdocs/langs/pt_PT/languages.lang +++ b/htdocs/langs/pt_PT/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Espanhol (Panamá) Language_es_PY=Espanhol (Paraguai) Language_es_PE=Espanhol (Peru) Language_es_PR=Espanhol (Porto Rico) +Language_es_US=Spanish (USA) Language_es_UY=Espanhol (Uruguai) Language_es_GT=Espanhol (Guatemala) Language_es_VE=Espanhol (Venezuela) diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang index 6ec47dcf6fc..d49765da4c1 100644 --- a/htdocs/langs/pt_PT/main.lang +++ b/htdocs/langs/pt_PT/main.lang @@ -28,7 +28,7 @@ NoTemplateDefined=Nenhum modelo disponível para este tipo de e-mail AvailableVariables=Variáveis de substituição disponíveis NoTranslation=Sem tradução Translation=Tradução -EmptySearchString=Enter non empty search criterias +EmptySearchString=Introduza alguns critérios de pesquisa NoRecordFound=Nenhum foi encontrado nenhum registo NoRecordDeleted=Nenhum registo eliminado NotEnoughDataYet=Não existe dados suficientes @@ -51,21 +51,21 @@ ErrorFailedToSendMail=Erro ao envio do e-mail (emissor=%s, destinatário=%s) ErrorFileNotUploaded=Não foi possivel transferir o ficheiro ErrorInternalErrorDetected=Erro detectado ErrorWrongHostParameter=Parâmetro do hospedeiro inválido -ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post the form again. -ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child record. +ErrorYourCountryIsNotDefined=Seu país não está definido. Vá para Início-Configuração-Editar e guarde o formulário novamente. +ErrorRecordIsUsedByChild=A eliminação deste registo falhou. Este registo está a ser utilizado pelo menos num registo filho. ErrorWrongValue=Valor incorrecto ErrorWrongValueForParameterX=Valor incorrecto do parâmetro %s ErrorNoRequestInError=Nenhuma petição em erro -ErrorServiceUnavailableTryLater=Service not available at the moment. Try again later. +ErrorServiceUnavailableTryLater=O serviço não está disponível de momento. Tente mais tarde. ErrorDuplicateField=Duplicado num campo único -ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. Changes have been rolled back. -ErrorConfigParameterNotDefined=Parameter %s is not defined in the Dolibarr config file conf.php. +ErrorSomeErrorWereFoundRollbackIsDone=Foram encontrados alguns erros. As alterações não foram guardadas. +ErrorConfigParameterNotDefined=O parâmetro %snão está defenido no ficheiro de configuração conf.php do Dolibarr. ErrorCantLoadUserFromDolibarrDatabase=Impossivel encontrar o utilizador %s na base de dados do Dolibarr. ErrorNoVATRateDefinedForSellerCountry=Erro, nenhum tipo de IVA definido para o país '%s'. ErrorNoSocialContributionForSellerCountry=Erro, nenhum tipo de contribuição social definida para o país %s. ErrorFailedToSaveFile=Erro, o registo do ficheiro falhou. -ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of a existing warehouse -MaxNbOfRecordPerPage=Max. number of records per page +ErrorCannotAddThisParentWarehouse=Você está a tentar adicionar um armazém "pai" que já é um armazém "filho" de um armazém já existente. +MaxNbOfRecordPerPage=Número máximo de registos por página NotAuthorized=Não tem permissão para efetuar essa operação SetDate=Definir data SelectDate=Seleccionar uma data @@ -79,15 +79,15 @@ FileRenamed=O ficheiro foi renomeado com sucesso FileGenerated=O ficheiro foi gerado com sucesso FileSaved=O ficheiro foi guardado com sucesso FileUploaded=O ficheiro foi enviado com sucesso -FileTransferComplete=File(s) uploaded successfully +FileTransferComplete=Ficheiro(s) carregado(s) com sucesso FilesDeleted=Ficheiros eliminados com sucesso FileWasNotUploaded=Um ficheiro foi seleccionada para ser anexado, mas ainda não foi carregado. Clique em 'Adicionar este Ficheiro' para anexar. -NbOfEntries=No. of entries +NbOfEntries=N.º de entradas GoToWikiHelpPage=Consultar ajuda online (necessita de acesso à Internet) GoToHelpPage=Ir para páginas de ajuda RecordSaved=Registo Guardado RecordDeleted=Registo eliminado -RecordGenerated=Record generated +RecordGenerated=Registo gerado LevelOfFeature=Nivel de funções NotDefined=Não Definida DolibarrInHttpAuthenticationSoPasswordUseless=O modo de autenticação do Dolibarr está definido a %s no ficheiro de configuração conf.php.
Isto significa que a base-de-dados de palavras-passe é externa ao Dolibarr, por isso alterar o valor deste campo poderá não surtir qualquer efeito. @@ -97,8 +97,8 @@ PasswordForgotten=Esqueceu-se da sua palavra-passe? NoAccount=Não possui conta? SeeAbove=Ver acima HomeArea=Início -LastConnexion=Last login -PreviousConnexion=Previous login +LastConnexion=Último login +PreviousConnexion=Login anterior PreviousValue=Valor anterior ConnectedOnMultiCompany=Conectado sobre entidade ConnectedSince=Conectado desde @@ -114,14 +114,14 @@ InformationToHelpDiagnose=Esta informação pode ser útil para diagnosticar pro MoreInformation=Mais Informação TechnicalInformation=Informação técnica TechnicalID=ID Técnico -LineID=Line ID +LineID=ID da Linha NotePublic=Nota (pública) NotePrivate=Nota (privada) PrecisionUnitIsLimitedToXDecimals=Dolibarr está configurado para limitar a precisão dos preços unitarios a %s Decimais. DoTest=Teste ToFilter=Filtrar NoFilter=Sem filtro -WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance time. +WarningYouHaveAtLeastOneTaskLate=Atenção, tem pelo menos um elemento que excedeu o tempo de tolerância. yes=sim Yes=Sim no=Não @@ -155,9 +155,10 @@ RemoveLink=Remover hiperligação AddToDraft=Adicionar ao rascunho Update=Atualizar Close=Fechar +CloseAs=Definir estado como CloseBox=Remover widget do painel Confirm=Confirmar -ConfirmSendCardByMail=Do you really want to send the content of this card by mail to %s? +ConfirmSendCardByMail=De certeza que quer enviar o conteúdo deste cartão via mail para %s? Delete=Eliminar Remove=Remover Resiliate=Cancelar @@ -170,12 +171,12 @@ ToValidate=Por validar NotValidated=Não validado Save=Guardar SaveAs=Guardar Como -SaveAndStay=Save and stay -SaveAndNew=Save and new +SaveAndStay=Salvar +SaveAndNew=Salvar e criar novo TestConnection=Testar conexão ToClone=Clonar -ConfirmCloneAsk=Are you sure you want to clone the object %s? -ConfirmClone=Choose data you want to clone: +ConfirmCloneAsk=De certeza que quer clonar o objecto %s? +ConfirmClone=Escolha a data que quer clonar: NoCloneOptionsSpecified=Não existem dados definidos para clonar. Of=de Go=Avançar @@ -186,16 +187,17 @@ Hide=Ocultar ShowCardHere=Mostrar ficha Search=Procurar SearchOf=Procurar -SearchMenuShortCut=Ctrl + shift + f -QuickAdd=Quick add -QuickAddMenuShortCut=Ctrl + shift + l +SearchMenuShortCut=CTRL + Shift + F +QuickAdd=Adicionar rápido +QuickAddMenuShortCut=CTRL + Shift + I Valid=Confirmar Approve=Aprovar Disapprove=Desaprovar ReOpen=Reabrir -Upload=Upload +Upload=Carregar ToLink=Link Select=Selecionar +SelectAll=Seleccionar tudo Choose=Escolher Resize=Redimensionar ResizeOrCrop=Redimensionar ou Cortar @@ -210,7 +212,7 @@ Password=Senha PasswordRetype=Contrassenha NoteSomeFeaturesAreDisabled=Note que estão desativados muitos módulos/funções nesta demonstração. Name=Nome -NameSlashCompany=Name / Company +NameSlashCompany=Nome / Empresa Person=Pessoa Parameter=Parâmetro Parameters=Parâmetros @@ -232,8 +234,8 @@ Family=Familia Description=Descrição Designation=Designação DescriptionOfLine=Descrição da linha -DateOfLine=Date of line -DurationOfLine=Duration of line +DateOfLine=Data da linha +DurationOfLine=Duração da linha Model=Modelo de documento DefaultModel=Modelo de documento predefinido Action=Evento @@ -256,6 +258,7 @@ Cards=Fichas Card=Ficha Now=Agora HourStart=Hora de inicio +Deadline=Deadline Date=Data DateAndHour=Data e Hora DateToday=Data de hoje @@ -264,8 +267,10 @@ DateStart=Data de início DateEnd=Data de fim DateCreation=Data de Criação DateCreationShort=Data de criação +IPCreation=Creation IP DateModification=Data de Modificação DateModificationShort=Data de Modif. +IPModification=Modification IP DateLastModification=A última data de alteração DateValidation=Data de Validação DateClosing=Data de Encerramento @@ -319,6 +324,7 @@ Morning=Manhã Afternoon=Tarde Quadri=Trimestre MonthOfDay=Dia do mês +DaysOfWeek=Dias da semana HourShort=H MinuteShort=mn Rate=Tipo @@ -341,12 +347,12 @@ Copy=Copiar Paste=Colar Default=Predefinição DefaultValue=Valor Predefinido -DefaultValues=Default values/filters/sorting +DefaultValues=Valores por defeito/Fltros/Ordenar Price=Preço PriceCurrency=Preço (moeda) UnitPrice=Preço Unitário -UnitPriceHT=Unit price (excl.) -UnitPriceHTCurrency=Unit price (excl.) (currency) +UnitPriceHT=Preço por Unid (excl. IVA) +UnitPriceHTCurrency=Preço por unidade (Excl. IVA) (moeda) UnitPriceTTC=Preço Unitário PriceU=P.U. PriceUHT=P.U. (líquido) @@ -355,37 +361,38 @@ PriceUTTC=P.U. (inc. impostos) Amount=Montante AmountInvoice=Montante da Fatura AmountInvoiced=Montante faturado -AmountInvoicedHT=Amount invoiced (excl. tax) -AmountInvoicedTTC=Amount invoiced (inc. tax) +AmountInvoicedHT=Valor facturado (Excl. IVA) +AmountInvoicedTTC=Valor facturado (Inc. IVA) AmountPayment=Montatne do pagamento -AmountHTShort=Amount (excl.) +AmountHTShort=Valor (Excl. IVA) AmountTTCShort=Montante (IVA inc.) -AmountHT=Amount (excl. tax) +AmountHT=Valor (Excl. IVA) AmountTTC=Montante (IVA inc.) AmountVAT=Montante do IVA -MulticurrencyAlreadyPaid=Already paid, original currency +MulticurrencyAlreadyPaid=Pago, moeda original MulticurrencyRemainderToPay=Montante por pagar, moeda original MulticurrencyPaymentAmount=Montante do pagamento, moeda original -MulticurrencyAmountHT=Amount (excl. tax), original currency +MulticurrencyAmountHT=Valor (Excl. Iva), moeda original MulticurrencyAmountTTC=Montante (incl. impostos), moeda original MulticurrencyAmountVAT=Montante de imposto, moeda original +MulticurrencySubPrice=Valor sub-preço várias moedas AmountLT1=Valor do IVA 2 AmountLT2=Valor do IVA 3 AmountLT1ES=Montante RE AmountLT2ES=Montante IRPF AmountTotal=Montante Total AmountAverage=Montante médio -PriceQtyMinHT=Price quantity min. (excl. tax) -PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency) +PriceQtyMinHT=Preço para quandidade min. (excl. IVA) +PriceQtyMinHTCurrency=Preço da quantidade min. (excl. IVA) (moeda) Percentage=Percentagem Total=Total SubTotal=Subtotal -TotalHTShort=Total (excl.) -TotalHT100Short=Total 100%% (excl.) -TotalHTShortCurrency=Total (excl. in currency) +TotalHTShort=Total (excl. IVA) +TotalHT100Short=Total 100%% (excl. IVA) +TotalHTShortCurrency=Total (excl. IVA na moeda) TotalTTCShort=Total (IVA inc.) -TotalHT=Total (excl. tax) -TotalHTforthispage=Total (excl. tax) for this page +TotalHT=Total (excl. IVA) +TotalHTforthispage=Total desta página (excl. IVA) Totalforthispage=Total para esta página TotalTTC=Total (IVA inc.) TotalTTCToYourCredit=Total (IVA inc.) a crédito @@ -397,7 +404,7 @@ TotalLT1ES=Total de RE TotalLT2ES=Total IRPF TotalLT1IN=Total ICBS TotalLT2IN=Total IBSE -HT=Excl. tax +HT=Excl. IVA TTC=IVA incluido INCVATONLY=IVA inc. INCT=Todos os impostos incluídos @@ -413,7 +420,7 @@ LT1ES=RE LT2ES=IRPF LT1IN=ICBS LT2IN=IBSE -LT1GC=Additionnal cents +LT1GC=Centavos adicionais VATRate=Taxa IVA VATCode=Código da taxa de imposto VATNPR=Taxa de imposto NPR @@ -428,7 +435,7 @@ Modules=Módulos/Aplicações Option=Opção List=Lista FullList=Lista Completa -FullConversation=Full conversation +FullConversation=Conversa completa Statistics=Estatísticas OtherStatistics=Outras estatísticas Status=Estado @@ -448,16 +455,16 @@ ActionNotApplicable=Não aplicável ActionRunningNotStarted=Não Iniciado ActionRunningShort=Em progresso ActionDoneShort=Terminado -ActionUncomplete=Incomplete +ActionUncomplete=Incompleta LatestLinkedEvents=Os últimos %s eventos relacionados CompanyFoundation=Empresa/Organização Accountant=Contabilista ContactsForCompany=Contactos para este terceiro ContactsAddressesForCompany=Contactos/moradas para este terceiro AddressesForCompany=Moradas para este terceiro -ActionsOnCompany=Events for this third party -ActionsOnContact=Events for this contact/address -ActionsOnContract=Events for this contract +ActionsOnCompany=Eventos para este terceiro +ActionsOnContact=Eventos para este contacto/endereço +ActionsOnContract=Eventos para este contracto ActionsOnMember=Eventos sobre este membro ActionsOnProduct=Eventos sobre este produto NActionsLate=%s em atraso @@ -475,9 +482,9 @@ Generate=Gerar Duration=Duração TotalDuration=Duração total Summary=Resumo -DolibarrStateBoard=Database Statistics -DolibarrWorkBoard=Open Items -NoOpenedElementToProcess=No open element to process +DolibarrStateBoard=Estatísticas da Base de Dados +DolibarrWorkBoard=Items Abertos +NoOpenedElementToProcess=Nenhum elemento para processar Available=Disponível NotYetAvailable=Ainda não disponivel NotAvailable=Não disponivel @@ -487,13 +494,14 @@ By=Por From=De FromDate=De FromLocation=De +at=em to=Para To=Para and=e or=ou Other=Outro Others=Outros -OtherInformations=Other information +OtherInformations=Outras informações Quantity=quantidade Qty=Quant. ChangedBy=Modificado por @@ -507,11 +515,12 @@ Reporting=Relatório Reportings=Relatórios Draft=Rascunho Drafts=Rascunhos -StatusInterInvoiced=Invoiced +StatusInterInvoiced=Facturado Validated=Validado +ValidatedToProduce=Validado (para produção) Opened=Aberto -OpenAll=Open (All) -ClosedAll=Closed (All) +OpenAll=Abertos (Todos) +ClosedAll=Fechados (Todos) New=Novo Discount=Desconto Unknown=Desconhecido @@ -533,8 +542,8 @@ None=Nenhum NoneF=Nenhuma NoneOrSeveral=Nenhum ou vários Late=Atraso -LateDesc=An item is defined as Delayed as per the system configuration in menu Home - Setup - Alerts. -NoItemLate=No late item +LateDesc=Um item é defenido como Atrasado devido às configurações do sistema no menu Início - Configuração - Alertas. +NoItemLate=Nenhum item atrasado Photo=Foto Photos=Fotos AddPhoto=Adicionar foto @@ -653,21 +662,22 @@ FeatureNotYetSupported=Funcionalidade ainda não suportada CloseWindow=Fechar Janela Response=Resposta Priority=Prioridade -SendByMail=Send by email +SendByMail=Enviar via e-mail MailSentBy=Email enviado por +NotSent=Não enviado TextUsedInTheMessageBody=Texto utilizado no corpo da mensagem SendAcknowledgementByMail=Enviar email de confirmação SendMail=Enviar e-mail Email=Email NoEMail=Sem e-mail -AlreadyRead=Already read +AlreadyRead=Já lido NotRead=Não lido NoMobilePhone=Sem telefone móvel Owner=Proprietário FollowingConstantsWillBeSubstituted=As seguintes constantes serão substituidas pelo seu valor correspondente. Refresh=Actualizar BackToList=Voltar para a lista -BackToTree=Back to tree +BackToTree=Voltar para a árvore GoBack=Voltar CanBeModifiedIfOk=Pode ser modificado se for válido CanBeModifiedIfKo=Pode ser modificado senão for válido @@ -675,9 +685,9 @@ ValueIsValid=Valor Válido ValueIsNotValid=O valor não é válido RecordCreatedSuccessfully=Registo criado com sucesso RecordModifiedSuccessfully=Registo modificado com êxito -RecordsModified=%s record(s) modified -RecordsDeleted=%s record(s) deleted -RecordsGenerated=%s record(s) generated +RecordsModified=%s registo(s) modificado(s) +RecordsDeleted=%s registo(s) apagado(s) +RecordsGenerated=%s registo(s) gerado(s) AutomaticCode=Criação automática de código FeatureDisabled=Função Desactivada MoveBox=Mover widget @@ -688,14 +698,14 @@ Method=Método Receive=Receção CompleteOrNoMoreReceptionExpected=Complete ou nada mais é esperado ExpectedValue=Valor esperado -ExpectedQty=Expected Qty +ExpectedQty=Qtd. Esperada PartialWoman=Parcial TotalWoman=Total NeverReceived=Nunca Recebido Canceled=Cancelado YouCanChangeValuesForThisListFromDictionarySetup=Pode alterar estes valores para esta lista a partir do menu Configuração -> Dicionários YouCanChangeValuesForThisListFrom=Pode alterar os valores desta lista a partir do menu %s -YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record in module setup +YouCanSetDefaultValueInModuleSetup=Você pode defenir o valor por defeito utilizado aquando da criação de um novo registo na configuração do módulo Color=Cor Documents=Documentos Documents2=Documentos @@ -705,7 +715,7 @@ MenuECM=Documentos MenuAWStats=Estatisticas MenuMembers=Membros MenuAgendaGoogle=Agenda Google -MenuTaxesAndSpecialExpenses=Taxes | Special expenses +MenuTaxesAndSpecialExpenses=Taxas | Despesas Especiais ThisLimitIsDefinedInSetup=Límite Dolibarr (Menu inicio->configuração->segurança): %s Kb, PHP limit: %s Kb NoFileFound=Não existem documentos guardados nesta pasta CurrentUserLanguage=Idioma atual @@ -722,39 +732,39 @@ DateOfSignature=Data da assinatura HidePassword=Esconder password UnHidePassword=Mostrar caracteres da password Root=Raíz -RootOfMedias=Root of public medias (/medias) +RootOfMedias=Raiz de Múltimedia Públicos (/medias) Informations=Informação Page=Página Notes=Notas AddNewLine=Adicionar nova linha AddFile=Adicionar ficheiro -FreeZone=Free-text product -FreeLineOfType=Free-text item, type: +FreeZone=Produto de Texto Livre +FreeLineOfType=Item de Texto Livre, tipo: CloneMainAttributes=Copiar objeto com os seus atributos principais -ReGeneratePDF=Re-generate PDF +ReGeneratePDF=Regenerar PDF PDFMerge=PDF Merge Merge=Junção DocumentModelStandardPDF=Modelo PDF padrão PrintContentArea=Visualizar página para impressão área de conteúdo principal MenuManager=Gestão do menu -WarningYouAreInMaintenanceMode=Warning, you are in maintenance mode: only login %s is allowed to use the application in this mode. +WarningYouAreInMaintenanceMode=Atenção, você está em modo de manutenção: Só o login %s está autorizado a usar a aplicação neste modo. CoreErrorTitle=Erro de sistema CoreErrorMessage=Ocorreu um erro. Contacte o seu administrador do sistema de forma a que este proceda à análise do relatórios ou desative a opção $dolibarr_main_prod=1 para obter mais informação. CreditCard=Cartão de crédito ValidatePayment=Validar pagamento CreditOrDebitCard=Cartão de crédito ou débito FieldsWithAreMandatory=Os campos com %s são obrigatórios -FieldsWithIsForPublic=Fields with %s are shown in public list of members. If you don't want this, uncheck the "public" box. -AccordingToGeoIPDatabase=(according to GeoIP conversion) +FieldsWithIsForPublic=Campos com %s são mostrados na lista de membros pública. Se não desejar isto, desmarque a caixa "público". +AccordingToGeoIPDatabase=(de acordo com a conversão GeoIP) Line=Linha NotSupported=Não é suportado RequiredField=Campo obrigatório Result=Resultado ToTest=Teste -ValidateBefore=Item must be validated before using this feature +ValidateBefore=O item tem de ser validado antes de usar esta funcionalidade. Visibility=Visibilidade -Totalizable=Totalizable -TotalizableDesc=This field is totalizable in list +Totalizable=Totalizável +TotalizableDesc=Este campo é totalizável nesta lista Private=Privado Hidden=Oculto Resources=Recursos @@ -773,17 +783,17 @@ LinkTo=Associar a LinkToProposal=Associar ao orçamento LinkToOrder=Hiperligação para encomendar LinkToInvoice=Associar a fatura -LinkToTemplateInvoice=Link to template invoice -LinkToSupplierOrder=Link to purchase order -LinkToSupplierProposal=Link to vendor proposal -LinkToSupplierInvoice=Link to vendor invoice +LinkToTemplateInvoice=Link para a factura modelo +LinkToSupplierOrder=Link para a ordem de compra +LinkToSupplierProposal=Link para a proposta do fornecedor +LinkToSupplierInvoice=Link para a factura do fornecedor LinkToContract=Associar a contrato LinkToIntervention=Associar a intervenção -LinkToTicket=Link to ticket +LinkToTicket=Link para o ticket CreateDraft=Criar Rascunho SetToDraft=Voltar para o rascunho ClickToEdit=Clique para editar -ClickToRefresh=Click to refresh +ClickToRefresh=Clique para actualizar EditWithEditor=Editar com CKEditor EditWithTextEditor=Editar com editor de texto EditHTMLSource=Editar código-fonte HTML @@ -798,14 +808,14 @@ ByDay=Por dia BySalesRepresentative=Por representante de vendas LinkedToSpecificUsers=Associado ao contacto de um utilizador NoResults=Sem resultados -AdminTools=Admin Tools +AdminTools=Ferramentas de Administrador SystemTools=Ferramentas do sistema ModulesSystemTools=Módulos de ferramentas Test=Teste Element=Elemento NoPhotoYet=Sem imagem disponível ainda Dashboard=Painel -MyDashboard=My Dashboard +MyDashboard=O meu painel de controlo Deductible=Dedutível from=Emissor toward=relativamente a @@ -828,7 +838,7 @@ PrintFile=Imprimir Ficheiro %s ShowTransaction=Mostrar transação ShowIntervention=Mostrar intervenção ShowContract=Mostrar contrato -GoIntoSetupToChangeLogo=Go to Home - Setup - Company to change logo or go to Home - Setup - Display to hide. +GoIntoSetupToChangeLogo=Vá a Início - Configuração - Empresa para mudar o logo ou vá a Ínicio - Configuração - Aparência para escondê-lo. Deny=Negar Denied=Negada ListOf=Lista de %s @@ -836,60 +846,63 @@ ListOfTemplates=Lista de modelos Gender=Género Genderman=Homem Genderwoman=Mulher +Genderother=Outro ViewList=Ver Lista -ViewGantt=Gantt view -ViewKanban=Kanban view +ViewGantt=Vista de Gantt +ViewKanban=Vista de Kanban Mandatory=Obrigatório Hello=Olá GoodBye=Adeus Sincerely=Atenciosamente -ConfirmDeleteObject=Are you sure you want to delete this object? +ConfirmDeleteObject=Tem a certeza que quer eliminar este objecto? DeleteLine=Apagar a linha ConfirmDeleteLine=Tem a certeza que deseja eliminar esta linha? -ErrorPDFTkOutputFileNotFound=Error: the file was not generated. Please check that the 'pdftk' command is installed in a directory included in the $PATH environment variable (linux/unix only) or contact your system administrator. +ErrorPDFTkOutputFileNotFound=Erro: o ficheiro não foi gerado. Por favor verifique que o comando 'pdftk' está instalado numa directoria incluída na variável de ambiente $PATH (apenas linux/Unix) ou contacte o seu administrador de sistema. NoPDFAvailableForDocGenAmongChecked=Não existia documento PDF disponível para a geração de documentos entre os registos assinalados -TooManyRecordForMassAction=Too many records selected for mass action. The action is restricted to a list of %s records. +TooManyRecordForMassAction=Foram seleccionados muitos registos para esta acção múltipla. A acção está restrita a uma lista de %s registos. NoRecordSelected=Nenhum registo selecionado MassFilesArea=Área para os ficheiros criados através de ações em massa ShowTempMassFilesArea=Mostrar área para os ficheiros criados através de ações em massa -ConfirmMassDeletion=Bulk Delete confirmation -ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record(s)? +ConfirmMassDeletion=Confirmação de Múltiplas Eliminações +ConfirmMassDeletionQuestion=Tem a certeza de que quer apagar os %s registo(s) seleccionado(s)? RelatedObjects=Objetos relacionados ClassifyBilled=Classificar como faturado ClassifyUnbilled=Classificar como não faturado Progress=Progresso -ProgressShort=Progr. +ProgressShort=Prog. FrontOffice=Front office BackOffice=Back office -Submit=Submit +Submit=Enviar View=Vista Export=Exportar Exports=Exportados ExportFilteredList=Exportar lista filtrada ExportList=Exportar lista ExportOptions=Opções de exportação -IncludeDocsAlreadyExported=Include docs already exported -ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable -ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable -AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported -NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported +IncludeDocsAlreadyExported=Os documentos incluídos já foram exportados +ExportOfPiecesAlreadyExportedIsEnable=A exportação de pedaços já exportados está activada +ExportOfPiecesAlreadyExportedIsDisable=A exportação de pedaços já exportados está desactivada. +AllExportedMovementsWereRecordedAsExported=Todos os movimentos exportados foram marcados como exportados +NotAllExportedMovementsCouldBeRecordedAsExported=Nem todos os movimentos exportados foram marcados como exportados Miscellaneous=Diversos Calendar=Calendario GroupBy=Agrupar por... ViewFlatList=Vista de lista +ViewAccountList=Ver livro-mestre +ViewSubAccountList=Ver livro-mestre da subconta RemoveString=Remover texto '%s' -SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at https://transifex.com/projects/p/dolibarr/ to add your improvements. +SomeTranslationAreUncomplete=Alguns dos idiomas oferecidos podem estar apenas parcialmente traduzidos ou conter erros. Por favor ajude a corrigir o seu idioma registando-se em https://transifex.com/projects/p/dolibarr/ para adicionar as suas melhorias. DirectDownloadLink=Link de download direto (público/externo) DirectDownloadInternalLink=Link de download direto (precisa de ter sessão iniciada e precisa de permissões) Download=Download DownloadDocument=Download do documento ActualizeCurrency=Atualizar taxa de conversão da moeda Fiscalyear=Ano Fiscal -ModuleBuilder=Module and Application Builder +ModuleBuilder=Construtor de Módulos e Aplicações SetMultiCurrencyCode=Definir moeda BulkActions=Ações em massa ClickToShowHelp=Clique para mostrar o balão de ajuda -WebSite=Website +WebSite=Site da Web WebSites=Sites da Web WebSiteAccounts=Contas do site ExpenseReport=Relatório de despesas @@ -898,25 +911,25 @@ HR=RH HRAndBank=RH e Banco AutomaticallyCalculated=Calculado automaticamente TitleSetToDraft=Repôr para rascunho -ConfirmSetToDraft=Are you sure you want to go back to Draft status? +ConfirmSetToDraft=Tem a certeza que quer voltar ao estado de Rascunho? ImportId=ID de importação Events=Eventos -EMailTemplates=Email templates -FileNotShared=File not shared to external public +EMailTemplates=Modelos de e-mail +FileNotShared=Ficheiro não partilhado para o público exterior. Project=Projeto Projects=Projetos -LeadOrProject=Lead | Project -LeadsOrProjects=Leads | Projects -Lead=Lead -Leads=Leads -ListOpenLeads=List open leads -ListOpenProjects=List open projects -NewLeadOrProject=New lead or project +LeadOrProject=Pista | Projecto +LeadsOrProjects=Pistas | Projectos +Lead=Pista +Leads=Pistas +ListOpenLeads=Listar pistas em aberto +ListOpenProjects=Listar projectos em aberto +NewLeadOrProject=Nova pista ou projecto Rights=Permissões LineNb=Linha número IncotermLabel=Incoterms -TabLetteringCustomer=Customer lettering -TabLetteringSupplier=Vendor lettering +TabLetteringCustomer=Inscrição de Cliente +TabLetteringSupplier=Inscrição de fornecedor Monday=Segunda-feira Tuesday=Terça-feira Wednesday=Quarta-feira @@ -945,39 +958,39 @@ ShortThursday=Qui ShortFriday=Sex ShortSaturday=Sab ShortSunday=Dom -one=one -two=two -three=three -four=four -five=five -six=six -seven=seven -eight=eight -nine=nine -ten=ten -eleven=eleven -twelve=twelve -thirteen=thirdteen -fourteen=fourteen -fifteen=fifteen -sixteen=sixteen -seventeen=seventeen -eighteen=eighteen -nineteen=nineteen -twenty=twenty -thirty=thirty -forty=forty -fifty=fifty -sixty=sixty -seventy=seventy -eighty=eighty -ninety=ninety -hundred=hundred -thousand=thousand -million=million -billion=billion -trillion=trillion -quadrillion=quadrillion +one=um +two=dois +three=três +four=quatro +five=cinco +six=seis +seven=Sete +eight=oito +nine=nove +ten=dez +eleven=onze +twelve=doze +thirteen=terceiro +fourteen=quatorze +fifteen=quinze +sixteen=dezesseis +seventeen=dezessete +eighteen=dezoito +nineteen=dezenove +twenty=vinte +thirty=trinta +forty=quarenta +fifty=cinquenta +sixty=sessenta +seventy=setenta +eighty=oitenta +ninety=noventa +hundred=cem +thousand=mil +million=milhão +billion=bilhão +trillion=trilhão +quadrillion=quatrilhão SelectMailModel=Selecione um modelo de e-mail SetRef=Definir referência Select2ResultFoundUseArrows=Foram encontrados alguns resultados. Utilize as setas para selecionar o desejado. @@ -998,7 +1011,7 @@ SearchIntoMO=Ordens de Fabrico SearchIntoTasks=Tarefas SearchIntoCustomerInvoices=Faturas a clientes SearchIntoSupplierInvoices=Faturas do fornecedor -SearchIntoCustomerOrders=Sales orders +SearchIntoCustomerOrders=Encomendas de venda SearchIntoSupplierOrders=Ordens de compra SearchIntoCustomerProposals=Orçamentos SearchIntoSupplierProposals=Orçamentos de fornecedor @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Expedições do cliente SearchIntoExpenseReports=Relatórios de despesas SearchIntoLeaves=Sair SearchIntoTickets=Tickets +SearchIntoCustomerPayments=Pagamentos de clientes +SearchIntoVendorPayments=Pagamentos a fornecedores +SearchIntoMiscPayments=Pagamentos diversos CommentLink=Comentários NbComments=Número de comentários CommentPage=Espaço de comentários @@ -1015,7 +1031,7 @@ CommentAdded=Comentário adicionado CommentDeleted=Comentário eliminado Everybody=Todos PayedBy=Paga por -PayedTo=Paid to +PayedTo=Pago a Monthly=Mensal Quarterly=Trimestral Annual=Anual @@ -1025,61 +1041,69 @@ LocalAndRemote=Local e Remoto KeyboardShortcut=Atalho de teclado AssignedTo=Atribuído a Deletedraft=Eliminar rascunho -ConfirmMassDraftDeletion=Draft mass delete confirmation +ConfirmMassDraftDeletion=Confirmação de eliminação múltipla de rascunhos FileSharedViaALink=Ficheiro partilhado via link -SelectAThirdPartyFirst=Select a third party first... +SelectAThirdPartyFirst=Seleccione um terceiro em primeiro... YouAreCurrentlyInSandboxMode=Você está atualmente no modo %s "sandbox" Inventory=Inventário -AnalyticCode=Analytic code +AnalyticCode=Código analítico TMenuMRP=MRP -ShowMoreInfos=Show More Infos -NoFilesUploadedYet=Please upload a document first -SeePrivateNote=See private note -PaymentInformation=Payment information -ValidFrom=Valid from -ValidUntil=Valid until -NoRecordedUsers=No users -ToClose=To close +ShowMoreInfos=Mostrar Mais Informações +NoFilesUploadedYet=Por favor envie um documento em primeiro +SeePrivateNote=Ver nota privada +PaymentInformation=Informação de pagamento +ValidFrom=Válido desde +ValidUntil=Válido até +NoRecordedUsers=Sem utilizadores +ToClose=Para fechar ToProcess=Por processar -ToApprove=To approve -GlobalOpenedElemView=Global view -NoArticlesFoundForTheKeyword=No article found for the keyword '%s' -NoArticlesFoundForTheCategory=No article found for the category -ToAcceptRefuse=To accept | refuse +ToApprove=Para aprovar +GlobalOpenedElemView=Vista global +NoArticlesFoundForTheKeyword=Nenhum artigo encontrado para a palavra-chave '%s' +NoArticlesFoundForTheCategory=Nenhum artigo encontrado para a categoria +ToAcceptRefuse=Para aceitar | recusar ContactDefault_agenda=Evento ContactDefault_commande=Encomenda ContactDefault_contrat=Contrato ContactDefault_facture=Fatura ContactDefault_fichinter=Intervenção -ContactDefault_invoice_supplier=Supplier Invoice -ContactDefault_order_supplier=Purchase Order +ContactDefault_invoice_supplier=Factura de Fornecedor +ContactDefault_order_supplier=Ordem de Encomenda ContactDefault_project=Projeto ContactDefault_project_task=Tarefa ContactDefault_propal=Orçamento -ContactDefault_supplier_proposal=Supplier Proposal +ContactDefault_supplier_proposal=Proposta de Fornecedor ContactDefault_ticket=Ticket -ContactAddedAutomatically=Contact added from contact thirdparty roles -More=More -ShowDetails=Show details -CustomReports=Custom reports -StatisticsOn=Statistics on -SelectYourGraphOptionsFirst=Select your graph options to build a graph -Measures=Measures -XAxis=X-Axis -YAxis=Y-Axis -StatusOfRefMustBe=Status of %s must be %s -DeleteFileHeader=Confirm file delete -DeleteFileText=Do you really want delete this file? -ShowOtherLanguages=Show other languages -SwitchInEditModeToAddTranslation=Switch in edit mode to add translations for this language -NotUsedForThisCustomer=Not used for this customer -AmountMustBePositive=Amount must be positive -ByStatus=By status +ContactAddedAutomatically=Contacto adicionado a partir dos roles de contacto terceiro +More=Mais +ShowDetails=Mostrar detalhes +CustomReports=Relatórios personalizados +StatisticsOn=Estatísticas em +SelectYourGraphOptionsFirst=Seleccione as opções para criar um gráfico +Measures=Medidas +XAxis=Eixo X +YAxis=Eixo Y +StatusOfRefMustBe=Estado de %s tem que ser %s +DeleteFileHeader=Confirme a eliminação do ficheiro +DeleteFileText=Tem a certeza de que quer eliminar este ficheiro? +ShowOtherLanguages=Mostrar outros idiomas +SwitchInEditModeToAddTranslation=Mude para o modo de edição para adicionar traduções para este idioma +NotUsedForThisCustomer=Não utilizado para este cliente +AmountMustBePositive=Total deve ser positivo +ByStatus=Por estado InformationMessage=Informação -Used=Used -ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create -MODIFYInDolibarr=Record %s modified -DELETEInDolibarr=Record %s deleted -VALIDATEInDolibarr=Record %s validated -APPROVEDInDolibarr=Record %s approved +Used=Utilizado +ASAP=Tão Breve Quanto Possível (ASAP) +CREATEInDolibarr=Registo %s criado +MODIFYInDolibarr=Registo %s modificado +DELETEInDolibarr=Registo %s eliminado +VALIDATEInDolibarr=Registo %s validado +APPROVEDInDolibarr=Registo %s aprovado +DefaultMailModel=Modelo de correio por defeito +PublicVendorName=Nome público do fornecedor +DateOfBirth=Data de Nascimento +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=O token de segurança expirou pelo que esta acção foi cancelada. Por favor tente novamente. +UpToDate=Actualizado +OutOfDate=Desactualizado +EventReminder=Lembrete de evento +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/pt_PT/mrp.lang b/htdocs/langs/pt_PT/mrp.lang index a21cefc105c..60409d454a7 100644 --- a/htdocs/langs/pt_PT/mrp.lang +++ b/htdocs/langs/pt_PT/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Custo unitário TotalCost=Custo total BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/pt_PT/website.lang b/htdocs/langs/pt_PT/website.lang index f28fef66c3c..c18079450fb 100644 --- a/htdocs/langs/pt_PT/website.lang +++ b/htdocs/langs/pt_PT/website.lang @@ -31,7 +31,7 @@ AddWebsite=Adicionar site da Web Webpage=Página/recipiente da Web AddPage=Adicionar página/recipiente HomePage=Página Inicial -PageContainer=Página/recipiente +PageContainer=Página PreviewOfSiteNotYetAvailable=Pré-visualização do seu site %s ainda não disponível. Você deve primeiro ' Importar um modelo de site completo ' ou apenas ' Adicionar uma página / contêiner '. RequestedPageHasNoContentYet=Página solicitada com o ID %s ainda não tem conteúdo, ou o arquivo de cache .tpl.php foi removido. Edite o conteúdo da página para resolver isso. SiteDeleted=Web site '%s' excluído @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=Feed RSS RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang index 5a24001258b..db1f0e59b3f 100644 --- a/htdocs/langs/ro_RO/accountancy.lang +++ b/htdocs/langs/ro_RO/accountancy.lang @@ -339,6 +339,8 @@ Modelcsv_configurable=Exportați CSV configurabil Modelcsv_FEC=Exportă fişier FEC Modelcsv_Sage50_Swiss=Export pentru Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export pentru Gestinum (v3) +Modelcsv_Gestinumv5Export pentru Gestinum (v5) ChartofaccountsId=Id-ul listei de conturi ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang index a6e786caa7d..604e4a99a94 100644 --- a/htdocs/langs/ro_RO/admin.lang +++ b/htdocs/langs/ro_RO/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=Componenta PHP %seste încărcată PreloadOPCode=Componenta OPCode preîncărcată este utilizată AddRefInList=Afișați Lista de informatii a clientului/Furnizorului (selectați lista sau combobox) și cea mai mare parte a hiperlinkului.
Terții vor apărea cu un format de nume "CC12345 - SC45678 - The Big Company corp". în loc de "The Big Company corp". AddAdressInList=Afișați Lista de informatii a clientului/Furnizorului (selectați lista sau combobox).
Terții i vor apărea cu numele format din "Big Company corp - 21 jump street 123456 Big city - USA" în loc de "Big Company corp". +AddEmailPhoneTownInContactList=Afișați adresa de email de contact (sau telefoanele dacă nu este definită) și lista cu orașe (lista combo sau caseta combinată)
Contactele vor apărea cu formatul de nume "Dupond Durand - dupond.durand@email.com - Paris" sau "Dupond Durand - 06 07 59 65 66 - Paris" în loc de "Dupond Durand". AskForPreferredShippingMethod=Solicitați o metodă de transport preferată pentru terți. FieldEdition=Editarea campului %s FillThisOnlyIfRequired=Exemplu: +2 (completați numai dacă problemele decalajjului fusului orar sunt cunoscute) @@ -1420,6 +1421,7 @@ AdherentMailRequired=E-mail necesar pentru a crea un nou membru MemberSendInformationByMailByDefault=Validare pentru a trimite mail de confirmare a membrilor este în mod implicit VisitorCanChooseItsPaymentMode=Vizitatorul poate alege din modurile disponibile de plată MEMBER_REMINDER_EMAIL=Activați memento automat prin email de abonamente expirate. Notă: Modul %s trebuie să fie activat and setat corect pentru a trimite mementouri. +MembersDocModules=Șabloane documente pentru documentele generate din înregistrarea membrilor ##### LDAP setup ##### LDAPSetup=LDAP Setup LDAPGlobalParameters=Global parametrii @@ -1670,7 +1672,7 @@ AdvancedEditor=Editor avansat ActivateFCKeditor=Activaţi FCKeditor pentru: FCKeditorForCompany=WYSIWIG crearea / editie a companiilor şi de note descriere FCKeditorForProduct=WYSIWIG crearea / editie a produselor / serviciilor "descrierea şi nota -FCKeditorForProductDetails=WYSIWIG creare / editare de linii cu detalii ale produselor pentru toate entitățile (propuneri, comenzi, facturi, etc ...). Avertisment: utilizarea acestei opțiuni pentru acest caz nu este foarte recomandată, deoarece poate create probleme cu caracterele speciale and formatarea paginii la construirea fişierelor PDF. +FCKeditorForProductDetails=Crearea/editarea WYSIWIG a liniilor de detalii ale produselor pentru toate entitățile (propuneri, comenzi, facturi, etc.). Atenţie: Utilizarea acestei opțiuni pentru acest caz nu este serios recomandată, deoarece poate crea probleme cu caracterele speciale și formatarea paginilor atunci când creați fișiere PDF. FCKeditorForMailing= WYSIWIG crearea / ediţie de mailing FCKeditorForUserSignature=Creare/editare WYSIWIG a semnăturii utilizatorilor FCKeditorForMail=Crearea / editarea WYSIWIG pentru toate e-mailurile (cu excepția Tools-> eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Puneți automat această valoare implicită pentru AGENDA_DEFAULT_FILTER_TYPE=Puneți automat acest tip de eveniment în filtrul de căutare al vizualizării agendei AGENDA_DEFAULT_FILTER_STATUS=Puneți automat această stare pentru evenimentele din filtrul de căutare din vizualizarea agendei AGENDA_DEFAULT_VIEW=Ce vizualizare doriți să deschideți implicit atunci când selectați meniul Agenda -AGENDA_REMINDER_EMAIL=Activați memento-ul evenimentului de emailuri (opțiunea de reamintire / întârziere poate fi definită pe fiecare event). Nota: Modulul %s trebuie să fie activat and gestionat corect pentru a avea memento trimis la frecvența corectă. -AGENDA_REMINDER_BROWSER=Activați memento-ul evenimentului pe browser-ul utlizatorului (când se ajunge la data evenimentului, fiecare utilizator poate să refuze întrebarea de confirmare a browserului) +AGENDA_REMINDER_BROWSER=Activați memento-uri evenimente în browserul utilizatorului (Când este atinsă data de reamintire, browserul afișează un popup. Fiecare utilizator poate dezactiva astfel de notificări din configurarea sa de notificări browser). AGENDA_REMINDER_BROWSER_SOUND=Activați notificarea sonoră +AGENDA_REMINDER_EMAIL=Activați memento evenimente prin email (opțiunea de reamintire/întârziere poate fi definită pentru fiecare eveniment). +AGENDA_REMINDER_EMAIL_NOTE= Notă: Frecvența sarcinii %s trebuie să fie suficientă pentru a vă asigura că reamintirea este trimisă la momentul corect. AGENDA_SHOW_LINKED_OBJECT=Afișați un obiect asociat în vizualizarea agendei ##### Clicktodial ##### ClickToDialSetup=Click pentru a Dial modul setup diff --git a/htdocs/langs/ro_RO/banks.lang b/htdocs/langs/ro_RO/banks.lang index fc8de4eca78..5e85e7eb2bc 100644 --- a/htdocs/langs/ro_RO/banks.lang +++ b/htdocs/langs/ro_RO/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Plată diversă VariousPayments=Diverse plăţi ShowVariousPayment=Afişare plăţi diverse AddVariousPayment=Adaugă plată diversă +VariousPaymentId=ID plată diversă +VariousPaymentLabel=Etichetă plată diversă +ConfirmCloneVariousPayment=Confirmă clona unei plăţi diverse SEPAMandate=Mandat SEPA YourSEPAMandate=Mandatul dvs. SEPA FindYourSEPAMandate=Acesta este mandatul dvs. SEPA pentru a autoriza compania noastră să efectueze un ordin de debitare directă către banca dvs. Reveniți semnat (scanarea documentului semnat) sau trimiteți-l prin poștă la @@ -176,3 +179,4 @@ BankColorizeMovement=Colorează tranzacţiile BankColorizeMovementDesc=Dacă această funcţie este activată, poţi alege o culoare de fundal personalizată pentru tranzacţiile de debit sau de credit BankColorizeMovementName1=Culoarea de fundal pentru tranzacţiile de debit BankColorizeMovementName2=Culoarea de fundal pentru tranzacţiile de credit +IfYouDontReconcileDisableProperty= Dacă nu faceți reconcilieri bancare pe unele conturi bancare, dezactivați proprietatea "%s" de pe ele pentru a elimina acest avertisment.  diff --git a/htdocs/langs/ro_RO/categories.lang b/htdocs/langs/ro_RO/categories.lang index 9f3fd179ccf..921c1fbbdb8 100644 --- a/htdocs/langs/ro_RO/categories.lang +++ b/htdocs/langs/ro_RO/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Configurare tag-uri/categorii CategorieRecursiv=Asociere automată către tag/categorie părinte CategorieRecursivHelp=Dacă opțiunea este activă, când adăugați un produs într-o subcategorie, produsul va fi adăugat și în categoria părinte AddProductServiceIntoCategory=Adaugă următoarele produse/servicii +AddCustomerIntoCategory=Atribuire categorie clientului +AddSupplierIntoCategory=Atribuire categorie furnizorului ShowCategory=Arată tag/categorie ByDefaultInList=Implicit în listă ChooseCategory=Alegeți categoria StocksCategoriesArea=Categorii depozite ActionCommCategoriesArea=Categorii evenimente -WebsitePagesCategoriesArea=Categorii pagină-container +WebsitePagesCategoriesArea=Categorii Pagină-Container UseOrOperatorForCategories=Utilizează operatorul SAU pentru categorii diff --git a/htdocs/langs/ro_RO/companies.lang b/htdocs/langs/ro_RO/companies.lang index ff66f92a9e1..08129c19f16 100644 --- a/htdocs/langs/ro_RO/companies.lang +++ b/htdocs/langs/ro_RO/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id-ul 1 (USt.-IdNr) ProfId2AT=Prof Id-ul 2 (USt.-NR) ProfId3AT=Prof Id-ul 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=Nr EORI ProfId6AT=- ProfId1AU=Prof Id-ul 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof Id-ul 1 (Professionnel Număr) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=Nr EORI ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inregistrare Statala) @@ -144,11 +144,11 @@ ProfId3BR=IE (Inregistrare Municipala) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=Nr UID ProfId2CH=- ProfId3CH=Prof Id-ul 1 (Federal număr) ProfId4CH=Prof. ID 2 (Număr de înregistrare comercială) -ProfId5CH=- +ProfId5CH=Nr EORI ProfId6CH=- ProfId1CL=Prof. Id-ul 1 (RUT) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof Id-ul 1 (USt.-IdNr) ProfId2DE=Prof Id-ul 2 (USt.-NR) ProfId3DE=Prof Id-ul 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=Nr EORI ProfId6DE=- ProfId1ES=Id-ul prof. 1 (CIF/CNP) ProfId2ES=Prof. ID 2 (SSN) ProfId3ES=Id-ul prof. 3 (CNAE) ProfId4ES=Id-ul prof. 4 (Collegiate număr) -ProfId5ES=- +ProfId5ES=Nr EORI ProfId6ES=- ProfId1FR=Prof Id-ul 1 (SIREN) ProfId2FR=Prof Id-ul 2 (SIRET) ProfId3FR=Prof Id 3 (NAF, vechi APE) ProfId4FR=Prof Id 4 (RCS / RM) -ProfId5FR=Prof ID 5 +ProfId5FR=Nr EORI ProfId6FR=- ProfId1GB=Prof Id-ul 1 (numărul de înregistrare) ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id-ul 3 ProfId4IN=Id-ul prof. univ 4 ProfId5IN=Prof ID 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=Nr EORI ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Business permit) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=Nr EORI ProfId6LU=- ProfId1MA=Id prof. univ. 1 (RC) ProfId2MA=Id prof. univ. 2 (Patente) ProfId3MA=Id prof. univ. 3 (IF) ProfId4MA=Id prof. univ. 4 (CNSS) -ProfId5MA=Id-ul. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof. Id-ul 1 (RFC). ProfId2MX=Prof. Id-ul 2 (R.. P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK nummer ProfId2NL=- ProfId3NL=- ProfId4NL=- -ProfId5NL=- +ProfId5NL=Nr EORI ProfId6NL=- ProfId1PT=Prof Id-ul 1 (NIPC) ProfId2PT=Prof Id-ul 2 (Social Security Number) ProfId3PT=Prof Id 3 (Comerciale număr record) ProfId4PT=Prof Id 4 (Conservatorul) -ProfId5PT=- +ProfId5PT=Nr EORI ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Reg Com) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=Nr EORI ProfId6RO=- ProfId1RU=Prof. Id-ul 1 (OGRN) ProfId2RU=Prof. Id-ul 2 (DCI) @@ -354,6 +359,7 @@ VATIntraManualCheck=De asemenea, puteți verifica manual pe site-ul web al UE %s nu este încă disponibil. Mai întâi trebuie să ' Importați un șablon complet de site-uri web ' sau doar ' Adăugați o pagină / container '. RequestedPageHasNoContentYet=Pagina solicitată cu id %s nu are încă conținut, sau fișierul cache cache.php a fost eliminat. Editați conținutul paginii pentru a rezolva această problemă. SiteDeleted=Site-ul Web "%s" a fost șters @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Înlocuirea s-a făcut în %s pagini sau containere RSSFeed=Feed RSS RSSFeedDesc=Puteți obține un flux RSS al celor mai recente articole cu tipul 'blogpost' folosind această adresă URL PagesRegenerated=%s pagină(i) /container(e) regenerate +RegenerateWebsiteContent=Regenerați fișierele cache ale site-ului web +AllowedInFrames=Permis în Frame-uri diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang index 571f0a4e238..bc73a4d82a0 100644 --- a/htdocs/langs/ru_RU/accountancy.lang +++ b/htdocs/langs/ru_RU/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=По умолчанию для услуги DefaultForProduct=По умолчанию для товара CantSuggest=Can't suggest AccountancySetupDoneFromAccountancyMenu=Больше настроек бухгалтерии выполняется из меню %s -ConfigAccountingExpert=Конфигурация бухгалтерского модуля +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Журналирование -Journaux=Журналы +Journals=Журналы JournalFinancial=Финансовые журналы BackToChartofaccounts=Получаемый график счетов Chartofaccounts=Схема учётных записей +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Current dedicated account AssignDedicatedAccountingAccount=New account to assign InvoiceLabel=Invoice label @@ -33,8 +35,8 @@ OtherInfo=Дополнительная информация DeleteCptCategory=Удалить учётный счёт из группы ConfirmDeleteCptCategory=Вы действительно хотите удалить этот учетный счет из группы бухгалтерских счетов? JournalizationInLedgerStatus=Status of journalization -AlreadyInGeneralLedger=Already journalized in ledgers -NotYetInGeneralLedger=Not yet journalized in ledgers +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group DetailByAccount=Показать детали счета AccountWithNonZeroValues=Счета с ненулевыми значениями @@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC CountriesNotInEEC=Countries not in EEC CountriesInEECExceptMe=Countries in EEC except %s CountriesExceptMe=All countries except %s -AccountantFiles=Экспорт бухгалтерских документов +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup @@ -79,7 +83,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) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Выберите активный график счетов ChangeAndLoad=Change and load Addanaccount=Добавить бухгалтерский счёт @@ -89,6 +93,8 @@ SubledgerAccount=Subledger account SubledgerAccountLabel=Subledger account label ShowAccountingAccount=Show accounting account ShowAccountingJournal=Show accounting journal +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Учетный счет MenuDefaultAccounts=Default accounts MenuBankAccounts=Банковские счета @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding CreateMvts=Создать новую транзакцию UpdateMvts=Изменить транзакцию ValidTransaction=Validate transaction -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=Ledger +BookkeepingSubAccount=Subledger AccountBalance=Account balance ObjectsRef=Source object ref CAHTF=Total purchase vendor before tax @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Журнал продаж ACCOUNTING_PURCHASE_JOURNAL=Журнал платежей @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups ByYear=По годам NotMatch=Not Set -DeleteMvt=Delete Ledger lines +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=Year to delete DelJournal=Journal to delete -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Finance journal ExpenseReportsJournal=Expense reports journal DescFinanceJournal=Finance journal including all the types of payments by bank account -DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Account for VAT not defined ThirdpartyAccountNotDefined=Account for third party not defined ProductAccountNotDefined=Account for product not defined @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu %s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Export draft journal @@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Chart of accounts Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang index 173c3df8ca8..8894f182715 100644 --- a/htdocs/langs/ru_RU/admin.lang +++ b/htdocs/langs/ru_RU/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Запросить предпочтительный способ доставки для контрагентов. FieldEdition=Редакция поля %s FillThisOnlyIfRequired=Например, +2 (заполняйте это поле только тогда, когда ваш часовой пояс отличается от того, который используется на сервере) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Требуется электронная почта для MemberSendInformationByMailByDefault=Чекбокс отправить по почте подтверждение членов по умолчанию VisitorCanChooseItsPaymentMode=Посетитель может выбрать один из доступных способов оплаты MEMBER_REMINDER_EMAIL=Включить автоматическое напоминание по электронной почте о просроченных подписках. Примечание. Модуль %s должен быть включен и правильно настроен для отправки напоминаний. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=Установка LDAP LDAPGlobalParameters=Глобальные параметры @@ -1670,7 +1672,7 @@ AdvancedEditor=Расширенный редактор ActivateFCKeditor=Включить FCKeditor для: FCKeditorForCompany=WYSIWIG создание / издание компаний описание и сведения FCKeditorForProduct=WYSIWIG создания / выпуска продукции / услуг описание и сведения -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG создание / издание рассылок FCKeditorForUserSignature=Редактор WYSIWIG для создания/изменения подписи пользователя FCKeditorForMail=WYSIWIG создание/издание для всей почты (кроме Tools-> eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda -AGENDA_REMINDER_EMAIL=Включить напоминание о событиях по электронной почте (напоминание опции/задержки можно определить для каждого события). Примечание. Модуль %s должен быть включен и правильно настроен для отправки напоминания с правильной частотой. -AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Включить звуковое оповещение +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Показывать связанный объект в представлении повестки дня ##### Clicktodial ##### ClickToDialSetup=Настройка модуля Click To Dial diff --git a/htdocs/langs/ru_RU/banks.lang b/htdocs/langs/ru_RU/banks.lang index cc156c7a16d..8c02e198885 100644 --- a/htdocs/langs/ru_RU/banks.lang +++ b/htdocs/langs/ru_RU/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=Смешанные платежи ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=Мандат SEPA YourSEPAMandate=Ваш мандат SEPA FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/ru_RU/categories.lang b/htdocs/langs/ru_RU/categories.lang index 42f038aae94..c1fd9fc39d7 100644 --- a/htdocs/langs/ru_RU/categories.lang +++ b/htdocs/langs/ru_RU/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Настройка тегов/категорий CategorieRecursiv=Автоматическая ссылка на родительский тег/категорию CategorieRecursivHelp=Если опция включена, то при добавлении товара в подкатегорию товар также будет добавлен в родительскую категорию. AddProductServiceIntoCategory=Добавить следующий товар/услугу +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Показать тег/категорию ByDefaultInList=By default in list ChooseCategory=Выберите категорию -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/ru_RU/companies.lang b/htdocs/langs/ru_RU/companies.lang index c4389c9917f..53e53122d77 100644 --- a/htdocs/langs/ru_RU/companies.lang +++ b/htdocs/langs/ru_RU/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Проф ID 1 (USt.-IdNr) ProfId2AT=Проф Id 2 (USt.-NR) ProfId3AT=Проф ID 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Проф Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Проф Id 1 (Проф номер) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=Номер IE (Для Бразилии, государственной регистрации юридических лиц) @@ -144,11 +144,11 @@ ProfId3BR=Номер IM (для Бразилии) ProfId4BR=Номер CPF (Для Бразилии) #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Проф ID 1 (федеральный номер) ProfId4CH=Проф Id 2 (коммерческий Запись номер) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Проф Id 1 (БУТ) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Проф ID 1 (USt.-IdNr) ProfId2DE=Проф Id 2 (USt.-NR) ProfId3DE=Проф ID 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Проф Id 1 (CIF / NIF) ProfId2ES=Проф Id 2 (номер социального страхования) ProfId3ES=Проф Id 3 (CNAE) ProfId4ES=Проф Id 4 (Энциклопедический номер) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Проф Id 1 (SIREN) ProfId2FR=Проф Id 2 (SIRET) ProfId3FR=Проф Id 3 (NAF, старые APE) ProfId4FR=Проф Id 4 (RCS / РМ) -ProfId5FR=Проф Id 5 +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Проф ID 1 (регистрационный номер) ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Проф Id 3 ProfId4IN=Проф Id 4 ProfId5IN=Проф Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Я бы. проф. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Разрешенный бизнес) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id проф. 1 (RC) ProfId2MA=Id проф. 2 (Patente) ProfId3MA=Id проф. 3 (IF) ProfId4MA=Id проф. 4 (НКСО) -ProfId5MA=Id проф. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Проф Id 1 (RFC). ProfId2MX=Проф Id 2 (R.. P. ИМСС) @@ -220,13 +225,13 @@ ProfId1NL=KVK Nummer ProfId2NL=- ProfId3NL=- ProfId4NL=- -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Проф ID 1 (NIPC) ProfId2PT=Проф Id 2 (номера социального страхования) ProfId3PT=Проф Id 3 (коммерческий Запись номер) ProfId4PT=Проф Id 4 (Консерватория) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof Id 1 (ОГРН) ProfId2RU=Prof Id 2 (ИНН) @@ -354,6 +359,7 @@ VATIntraManualCheck=Вы также можете проверить его вр ErrorVATCheckMS_UNAVAILABLE=Проверка невозможна. Сервис проверки не предоставляется государством-членом ЕС (%s). NorProspectNorCustomer=Не потенциальный клиент, не клиент JuridicalStatus=Тип юридического лица +Workforce=Workforce Staff=Сотрудники ProspectLevelShort=Потенциальный ProspectLevel=Потенциальный клиент @@ -456,3 +462,8 @@ PaymentTermsSupplier=Условия оплаты - Поставщик PaymentTypeBoth=Payment Type - Customer and Vendor MulticurrencyUsed=Использовать Мультивалютность MulticurrencyCurrency=Валюта +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/ru_RU/hrm.lang b/htdocs/langs/ru_RU/hrm.lang index 8977520494d..6cc287f2927 100644 --- a/htdocs/langs/ru_RU/hrm.lang +++ b/htdocs/langs/ru_RU/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=Сотрудники Employee=Сотрудник NewEmployee=New employee +ListOfEmployees=List of employees diff --git a/htdocs/langs/ru_RU/languages.lang b/htdocs/langs/ru_RU/languages.lang index 6a544983929..124dfd0d308 100644 --- a/htdocs/langs/ru_RU/languages.lang +++ b/htdocs/langs/ru_RU/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Испанский (Парагвай) Language_es_PE=Испанский (Перу) Language_es_PR=Испанский (Пуэрто-Рико) +Language_es_US=Spanish (USA) Language_es_UY=Spanish (Uruguay) Language_es_GT=Spanish (Guatemala) Language_es_VE=Spanish (Venezuela) diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang index a5a59a9782a..bcd5f1ea608 100644 --- a/htdocs/langs/ru_RU/main.lang +++ b/htdocs/langs/ru_RU/main.lang @@ -155,6 +155,7 @@ RemoveLink=Удалить ссылку AddToDraft=Добавить к черновику Update=Обновить Close=Закрыть +CloseAs=Set status to CloseBox=Удалить виджет с Информ-панели Confirm=Подтвердить ConfirmSendCardByMail=Отправить содержимое этой карты по почте на %s ? @@ -196,6 +197,7 @@ ReOpen=Переоткрыть Upload=Загрузить ToLink=Ссылка Select=Выбор +SelectAll=Select all Choose=Выберите Resize=Изменение размера ResizeOrCrop=Изменение размера или обрезка @@ -256,6 +258,7 @@ Cards=Карточки Card=Карточка Now=Сейчас HourStart=Час начала +Deadline=Deadline Date=Дата DateAndHour=Дата и час DateToday=Сегодняшняя дата @@ -264,8 +267,10 @@ DateStart=Дата начала DateEnd=Дата окончания DateCreation=Дата создания DateCreationShort=Дата создания +IPCreation=Creation IP DateModification=Дата изменения DateModificationShort=Дата изм. +IPModification=Modification IP DateLastModification=Дата последнего изменения DateValidation=Дата проверки DateClosing=Дата закрытия @@ -319,6 +324,7 @@ Morning=Утро Afternoon=После полудня Quadri=Квартал MonthOfDay=Месяц дня +DaysOfWeek=Days of week HourShort=ч MinuteShort=мин. Rate=Курс @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Сумма платежа, в оригинально MulticurrencyAmountHT=Сумма (без налога), исходная валюта MulticurrencyAmountTTC=Сумма (с налогом), в исходной валюте MulticurrencyAmountVAT=Сумма налога, в исходной валюте +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Сумма налога 2 AmountLT2=Сумма налога 3 AmountLT1ES=Сумма RE @@ -487,6 +494,7 @@ By=Автор From=От FromDate=От FromLocation=От +at=at to=к To=к and=и @@ -509,6 +517,7 @@ Draft=Черновик Drafts=Черновики StatusInterInvoiced=Выставлен счет Validated=Подтверждено +ValidatedToProduce=Validated (To produce) Opened=Открытые OpenAll=Открыто (Все) ClosedAll=Закрыто (все) @@ -655,6 +664,7 @@ Response=Ответ Priority=Приоритет SendByMail=Послать по электронной почте MailSentBy=Email отправлен +NotSent=Не отправлено TextUsedInTheMessageBody=Текст Email SendAcknowledgementByMail=Отправить подтверждение на электронную почту SendMail=Отправить письмо @@ -836,6 +846,7 @@ ListOfTemplates=Список шаблонов Gender=Пол Genderman=Мужчина Genderwoman=Женщина +Genderother=Другое ViewList=Посмотреть список ViewGantt=Gantt view ViewKanban=Kanban view @@ -877,6 +888,8 @@ Miscellaneous=Разное Calendar=Календарь GroupBy=Группировка по... ViewFlatList=Вид плоским списком +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Удалить строку '%s' SomeTranslationAreUncomplete=Некоторые из предлагаемых языков пакетов могут быть переведены только частично или могут содержать ошибки. Пожалуйста, помогите исправить ваш язык, зарегистрировавшись по адресу https://transifex.com/projects/p/dolibarr/, чтобы добавить свои улучшения. DirectDownloadLink=Прямая ссылка для скачивания (общедоступная/внешняя) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Отгрузки клиентам SearchIntoExpenseReports=Отчёты о затратах SearchIntoLeaves=Отпуск SearchIntoTickets=Заявки +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Платежи поставщику +SearchIntoMiscPayments=Смешанные платежи CommentLink=Комментарии NbComments=Количество комментариев CommentPage=Комментарии @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Информация Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Дата рождения +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/ru_RU/mrp.lang b/htdocs/langs/ru_RU/mrp.lang index 712fb5dcb7c..5c5ff627f11 100644 --- a/htdocs/langs/ru_RU/mrp.lang +++ b/htdocs/langs/ru_RU/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/ru_RU/website.lang b/htdocs/langs/ru_RU/website.lang index 959d8a49727..4b46043e5a1 100644 --- a/htdocs/langs/ru_RU/website.lang +++ b/htdocs/langs/ru_RU/website.lang @@ -31,7 +31,7 @@ AddWebsite=Add website Webpage=Web page/container AddPage=Add page/container HomePage=Home Page -PageContainer=Page/container +PageContainer=Страница PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. 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. SiteDeleted=Web site '%s' deleted @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=RSS-канал RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/ru_UA/companies.lang b/htdocs/langs/ru_UA/companies.lang deleted file mode 100644 index 4f7719d61ea..00000000000 --- a/htdocs/langs/ru_UA/companies.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - companies -ProfId5MA=Id. prof. 5 (I.C.E.) diff --git a/htdocs/langs/sk_SK/accountancy.lang b/htdocs/langs/sk_SK/accountancy.lang index bac28ccc142..5b1f85a55c1 100644 --- a/htdocs/langs/sk_SK/accountancy.lang +++ b/htdocs/langs/sk_SK/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Default for service DefaultForProduct=Default for product CantSuggest=Can't suggest AccountancySetupDoneFromAccountancyMenu=Väčšina nastavení účtovníctva sa vykonáva z menu %s -ConfigAccountingExpert=Konfigurácia experta na účtovanie modulov +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Journalization -Journaux=časopisy +Journals=časopisy JournalFinancial=Finančné časopisy BackToChartofaccounts=Vráťte účtovnú schému Chartofaccounts=Účtovná schéma +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Aktuálny vyhradený účet AssignDedicatedAccountingAccount=New account to assign InvoiceLabel=Invoice label @@ -33,8 +35,8 @@ OtherInfo=Other information DeleteCptCategory=Remove accounting account from group ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group? JournalizationInLedgerStatus=Status of journalization -AlreadyInGeneralLedger=Already journalized in ledgers -NotYetInGeneralLedger=Not yet journalized in ledgers +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group DetailByAccount=Show detail by account AccountWithNonZeroValues=Accounts with non-zero values @@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC CountriesNotInEEC=Countries not in EEC CountriesInEECExceptMe=Countries in EEC except %s CountriesExceptMe=All countries except %s -AccountantFiles=Export accounting documents +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup @@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=KROK %s: Pridanie alebo úprava existujúcich transak AccountancyAreaDescClosePeriod=KROK %s: Zavrieť obdobie, takže nemôžeme robiť zmeny v budúcnosti. -TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Vyberte aktívnu účtovnú schému ChangeAndLoad=Zmeniť a načítať Addanaccount=Pridajte účtovníctvo @@ -89,6 +93,8 @@ SubledgerAccount=Subledger account SubledgerAccountLabel=Subledger account label ShowAccountingAccount=Show accounting account ShowAccountingJournal=Show accounting journal +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Účtovný účet bol navrhnutý MenuDefaultAccounts=Predvolené účty MenuBankAccounts=Bankové účty @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding CreateMvts=Vytvorte novú transakciu UpdateMvts=Úprava transakcie ValidTransaction=Validate transaction -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=Hlavná kniha +BookkeepingSubAccount=Subledger AccountBalance=Stav účtu ObjectsRef=Source object ref CAHTF=Total purchase vendor before tax @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Zakázať priame zaznamenávanie transakcie na bankov ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Predaj denníka ACCOUNTING_PURCHASE_JOURNAL=Zakúpte denník @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Účtovný účet čakania DONATION_ACCOUNTINGACCOUNT=Účtovný účet na registráciu darov ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups ByYear=Do roku NotMatch=Nenastavené -DeleteMvt=Odstrániť riadky knihy +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=Rok na zmazanie DelJournal=Žurnále na zmazanie -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Finančný časopis ExpenseReportsJournal=Expense reports journal DescFinanceJournal=Finančný denník vrátane všetkých druhov platieb prostredníctvom bankového účtu -DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Účet DPH nie je definovaný ThirdpartyAccountNotDefined=Účet tretej strany nie je definovaný ProductAccountNotDefined=Účet pre produkt nie je definovaný @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu %s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Export draft journal @@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Chart of accounts Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang index 518818d03ee..22c255b5c06 100644 --- a/htdocs/langs/sk_SK/admin.lang +++ b/htdocs/langs/sk_SK/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=Vydanie poľných %s FillThisOnlyIfRequired=Príklad: +2 ( vyplňte iba ak sú predpokladané problémy s časovým posunom ) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member MemberSendInformationByMailByDefault=Zaškrtávacie políčko poslať mailom potvrdenie členom (validácia alebo nové predplatné) je v predvolenom nastavení VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=Nastavenie LDAP LDAPGlobalParameters=Globálne parametre @@ -1670,7 +1672,7 @@ AdvancedEditor=Rozšírené editor ActivateFCKeditor=Aktivácia pokročilé editor pre: FCKeditorForCompany=WYSIWIG vytvorenie / edícii prvkami opisu a poznámku (s výnimkou výrobkov / služieb) FCKeditorForProduct=WYSIWIG vytvorenie / edícia produktov / služieb popis a poznámky -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG vytvorenie / edícia pre hromadné eMailings (Nástroje-> e-mailom) FCKeditorForUserSignature=WYSIWIG vytvorenie / edícia užívateľského podpisu FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting 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 user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view ##### Clicktodial ##### ClickToDialSetup=Kliknite pre Dial Nastavenie modulu diff --git a/htdocs/langs/sk_SK/banks.lang b/htdocs/langs/sk_SK/banks.lang index 340f65a45f2..471e6830858 100644 --- a/htdocs/langs/sk_SK/banks.lang +++ b/htdocs/langs/sk_SK/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=Miscellaneous payments ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA mandate YourSEPAMandate=Your SEPA mandate FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/sk_SK/categories.lang b/htdocs/langs/sk_SK/categories.lang index f5ebbca4b2e..1f28159b136 100644 --- a/htdocs/langs/sk_SK/categories.lang +++ b/htdocs/langs/sk_SK/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup CategorieRecursiv=Link with parent tag/category automatically CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=Add the following product/service +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Show tag/category ByDefaultInList=By default in list ChooseCategory=Choose category -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/sk_SK/companies.lang b/htdocs/langs/sk_SK/companies.lang index bb39a5cb9f6..1aae4a6f624 100644 --- a/htdocs/langs/sk_SK/companies.lang +++ b/htdocs/langs/sk_SK/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (ust-IdNr) ProfId2AT=Prof Id 2 (ust-Nr) ProfId3AT=Prof ID 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional číslo) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao obecnej) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof Id 1 (Federálne číslo) ProfId4CH=Prof Id 2 (obchodné Záznam číslo) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof Id 1 (RUT) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (ust-IdNr) ProfId2DE=Prof Id 2 (ust-Nr) ProfId3DE=Prof ID 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof Id 1 (CIF / NIF) ProfId2ES=Prof Id 2 (Číslo sociálneho poistenia) ProfId3ES=Prof ID 3 (CNAE) ProfId4ES=Prof Id 4 (Collegiate číslo) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof Id 1 (siréna) ProfId2FR=Prof Id 2 (SIRET) ProfId3FR=Prof ID 3 (NAF, starý APE) ProfId4FR=Prof Id 4 (RCS / RM) -ProfId5FR=- +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Registračné číslo ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof ID 3 (SRVC TAX) ProfId4IN=Prof Id 4 ProfId5IN=Prof Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Business permit) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (RC) ProfId2MA=Id prof. 2 (Patente) ProfId3MA=Id prof. 3 (IF) ProfId4MA=Id prof. 4 (CNSS) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof Id 1 (RFC). ProfId2MX=Prof Id 2 (R.. P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK Nummer ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof Id 1 (Nipča) ProfId2PT=Prof Id 2 (Číslo sociálneho poistenia) ProfId3PT=Prof ID 3 (obchodný Záznam číslo) ProfId4PT=Prof Id 4 (konzervatórium) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=Ninea @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof Id 1 (OGRN) ProfId2RU=Prof Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi ErrorVATCheckMS_UNAVAILABLE=Skontrolujte, nie je možné. Skontrolujte, služba nie je poskytovaná členským štátom (%s). NorProspectNorCustomer=Not prospect, nor customer JuridicalStatus=Legal Entity Type +Workforce=Workforce Staff=Employees ProspectLevelShort=Potenciál ProspectLevel=Prospect potenciál @@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor PaymentTypeBoth=Payment Type - Customer and Vendor MulticurrencyUsed=Use Multicurrency MulticurrencyCurrency=Mena +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/sk_SK/hrm.lang b/htdocs/langs/sk_SK/hrm.lang index 95c2e978d72..0ffa8afa438 100644 --- a/htdocs/langs/sk_SK/hrm.lang +++ b/htdocs/langs/sk_SK/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=Employees Employee=Zamestnanec NewEmployee=New employee +ListOfEmployees=List of employees diff --git a/htdocs/langs/sk_SK/languages.lang b/htdocs/langs/sk_SK/languages.lang index bc7dec6ceb7..dd48ea71d86 100644 --- a/htdocs/langs/sk_SK/languages.lang +++ b/htdocs/langs/sk_SK/languages.lang @@ -40,6 +40,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_US=Spanish (USA) Language_es_UY=Spanish (Uruguay) Language_es_GT=Spanish (Guatemala) Language_es_VE=Španielčina (Venezuela) diff --git a/htdocs/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang index eaa10c84a42..efb38289b90 100644 --- a/htdocs/langs/sk_SK/main.lang +++ b/htdocs/langs/sk_SK/main.lang @@ -155,6 +155,7 @@ RemoveLink=Remove link AddToDraft=Add to draft Update=Aktualizovať Close=Zavrieť +CloseAs=Nastaviť status na CloseBox=Remove widget from your dashboard Confirm=Potvrdiť ConfirmSendCardByMail=Do you really want to send the content of this card by mail to %s? @@ -196,6 +197,7 @@ ReOpen=Znovu otvoriť Upload=Upload ToLink=Odkaz Select=Vybrať +SelectAll=Select all Choose=Vybrať Resize=Zmena veľkosti ResizeOrCrop=Resize or Crop @@ -256,6 +258,7 @@ Cards=Karty Card=Karta Now=Teraz HourStart=Start hour +Deadline=Deadline Date=Dátum DateAndHour=Dátum a hodina DateToday=Today's date @@ -264,8 +267,10 @@ DateStart=Dátum začatia DateEnd=Dátum ukončenia DateCreation=Dátum vytvorenia DateCreationShort=Creat. date +IPCreation=Creation IP DateModification=Dátum zmeny DateModificationShort=Modify. dátum +IPModification=Modification IP DateLastModification=Latest modification date DateValidation=Dátum overenia DateClosing=Uzávierka @@ -319,6 +324,7 @@ Morning=Ráno Afternoon=Popoludní Quadri=Quadri MonthOfDay=Mesiaca odo dňa +DaysOfWeek=Days of week HourShort=H MinuteShort=mn Rate=Sadzba @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency MulticurrencyAmountHT=Amount (excl. tax), original currency MulticurrencyAmountTTC=Amount (inc. of tax), original currency MulticurrencyAmountVAT=Amount tax, original currency +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Čiastka dane z 2 AmountLT2=Čiastka dane 3 AmountLT1ES=Množstvo RE @@ -487,6 +494,7 @@ By=Podľa From=Z FromDate=Z FromLocation=Z +at=at to=na To=na and=a @@ -509,6 +517,7 @@ Draft=Návrh Drafts=Dáma StatusInterInvoiced=Invoiced Validated=Overené +ValidatedToProduce=Validated (To produce) Opened=Otvorení OpenAll=Open (All) ClosedAll=Closed (All) @@ -655,6 +664,7 @@ Response=Odpoveď Priority=Priorita SendByMail=Send by email MailSentBy=E-mail zaslaná +NotSent=Neposlal TextUsedInTheMessageBody=E-mail telo SendAcknowledgementByMail=Send confirmation email SendMail=Odoslať e-mail @@ -836,6 +846,7 @@ ListOfTemplates=List of templates Gender=Gender Genderman=Man Genderwoman=Woman +Genderother=Ostatné ViewList=Zobrazenie zoznamu ViewGantt=Gantt view ViewKanban=Kanban view @@ -877,6 +888,8 @@ Miscellaneous=Zmiešaný Calendar=Kalendár GroupBy=Group by... ViewFlatList=View flat list +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Remove string '%s' SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at https://transifex.com/projects/p/dolibarr/ to add your improvements. DirectDownloadLink=Direct download link (public/external) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments SearchIntoExpenseReports=Expense reports SearchIntoLeaves=Leave SearchIntoTickets=Tickets +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Vendor payments +SearchIntoMiscPayments=Miscellaneous payments CommentLink=Komentáre NbComments=Number of comments CommentPage=Comments space @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Informácie Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Dátum narodenia +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/sk_SK/mrp.lang b/htdocs/langs/sk_SK/mrp.lang index 863793063a0..f018be890cc 100644 --- a/htdocs/langs/sk_SK/mrp.lang +++ b/htdocs/langs/sk_SK/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/sk_SK/website.lang b/htdocs/langs/sk_SK/website.lang index 481b505a445..b2c84ed0d5b 100644 --- a/htdocs/langs/sk_SK/website.lang +++ b/htdocs/langs/sk_SK/website.lang @@ -31,7 +31,7 @@ AddWebsite=Add website Webpage=Web page/container AddPage=Add page/container HomePage=Home Page -PageContainer=Page/container +PageContainer=Strana PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. 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. SiteDeleted=Web site '%s' deleted @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=RSS Feed RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/sl_SI/accountancy.lang b/htdocs/langs/sl_SI/accountancy.lang index ed2ba10774e..93e33834eff 100644 --- a/htdocs/langs/sl_SI/accountancy.lang +++ b/htdocs/langs/sl_SI/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Default for service DefaultForProduct=Default for product CantSuggest=Can't suggest AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s -ConfigAccountingExpert=Konfiguracija modula računovodskega strokovnjaka +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Journalization -Journaux=Revije +Journals=Revije JournalFinancial=Finančne revije BackToChartofaccounts=Prikaz kontnega plana Chartofaccounts=Kontni plan +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Current dedicated account AssignDedicatedAccountingAccount=New account to assign InvoiceLabel=Invoice label @@ -33,8 +35,8 @@ OtherInfo=Other information DeleteCptCategory=Remove accounting account from group ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group? JournalizationInLedgerStatus=Status of journalization -AlreadyInGeneralLedger=Already journalized in ledgers -NotYetInGeneralLedger=Not yet journalized in ledgers +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group DetailByAccount=Show detail by account AccountWithNonZeroValues=Accounts with non-zero values @@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC CountriesNotInEEC=Countries not in EEC CountriesInEECExceptMe=Countries in EEC except %s CountriesExceptMe=All countries except %s -AccountantFiles=Export accounting documents +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup @@ -79,7 +83,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) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Select active chart of accounts ChangeAndLoad=Change and load Addanaccount=Dodaj računovodskega račun @@ -89,6 +93,8 @@ SubledgerAccount=Subledger account SubledgerAccountLabel=Subledger account label ShowAccountingAccount=Show accounting account ShowAccountingJournal=Show accounting journal +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Accounting account suggested MenuDefaultAccounts=Default accounts MenuBankAccounts=Bančni računi @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding CreateMvts=Create new transaction UpdateMvts=Modification of a transaction ValidTransaction=Validate transaction -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=Ledger +BookkeepingSubAccount=Subledger AccountBalance=Account balance ObjectsRef=Source object ref CAHTF=Total purchase vendor before tax @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Prodam revija ACCOUNTING_PURCHASE_JOURNAL=Nakup revij @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups ByYear=Po letih NotMatch=Not Set -DeleteMvt=Delete Ledger lines +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=Year to delete DelJournal=Journal to delete -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Finance journal ExpenseReportsJournal=Expense reports journal DescFinanceJournal=Finance journal including all the types of payments by bank account -DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Account for VAT not defined ThirdpartyAccountNotDefined=Account for third party not defined ProductAccountNotDefined=Account for product not defined @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu %s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Export draft journal @@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Chart of accounts Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang index b75f378da31..38d716f78eb 100644 --- a/htdocs/langs/sl_SI/admin.lang +++ b/htdocs/langs/sl_SI/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=%s premenjenih polj FillThisOnlyIfRequired=Primer: +2 (uporabite samo, če se pojavijo težave s časovno cono) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member MemberSendInformationByMailByDefault=Kontrolno polje za pošiljanje potrdil članom po pošti (potrditev ali nova naročnina) je privzeto označeno VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=Nastavitve LDAP LDAPGlobalParameters=Globalni parametri @@ -1670,7 +1672,7 @@ AdvancedEditor=Napredni urejevalnik ActivateFCKeditor=Aktiviranje FCKeditor za: FCKeditorForCompany=WYSIWIG kreiranje/urejanje opisa podjetij in opomb FCKeditorForProduct=WYSIWIG kreiranje/urejanje opisa proizvodov/storitev in opomb -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG kreiranje/urejanje pošte FCKeditorForUserSignature=WYSIWIG kreiranje/urejanje podpisa uporabnika FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting 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 user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view ##### Clicktodial ##### ClickToDialSetup=Nastavitve modula za klicanje s klikom diff --git a/htdocs/langs/sl_SI/banks.lang b/htdocs/langs/sl_SI/banks.lang index 43fa36818f8..a73db019812 100644 --- a/htdocs/langs/sl_SI/banks.lang +++ b/htdocs/langs/sl_SI/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=Miscellaneous payments ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA mandate YourSEPAMandate=Your SEPA mandate FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/sl_SI/categories.lang b/htdocs/langs/sl_SI/categories.lang index 02a3493bd0c..70060a70318 100644 --- a/htdocs/langs/sl_SI/categories.lang +++ b/htdocs/langs/sl_SI/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Nastavitev značk/kategorij CategorieRecursiv=Avtomatsko poveži z nadrejeno značko/kategorijo CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=Dodaj sledeči produkt/storitev +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Pokaži značko/kategorijo ByDefaultInList=Privzeto na seznamu ChooseCategory=Choose category -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/sl_SI/companies.lang b/htdocs/langs/sl_SI/companies.lang index f58b2dca981..c83ab2f3231 100644 --- a/htdocs/langs/sl_SI/companies.lang +++ b/htdocs/langs/sl_SI/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE== +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE() @@ -144,11 +144,11 @@ ProfId3BR=IM() ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof Id 1 (Federal number) ProfId4CH=Prof Id 2 (Commercial Record number) -ProfId5CH== +ProfId5CH=EORI number ProfId6CH=- ProfId1CL== ProfId2CL== @@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr) ProfId2DE=Prof Id 2 (USt.-Nr) ProfId3DE=Prof Id 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE== +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=(CNAE) ProfId2ES=(Social security number) ProfId3ES=(IAE) ProfId4ES=(Collegiate number) -ProfId5ES== +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof Id 1 (SIREN) ProfId2FR=Prof Id 2 (SIRET) ProfId3FR=Prof Id 3 (NAF, old APE) ProfId4FR=Prof Id 4 (RCS/RM) -ProfId5FR== +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Prof Id 1 (Registration Number) ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 ProfId4IN=Prof Id 4 ProfId5IN== ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxemburg) ProfId2LU=Id. prof. 2 (Dovoljenje za poslovanje) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA== ProfId2MA== ProfId3MA== ProfId4MA== -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX== ProfId2MX== @@ -220,13 +225,13 @@ ProfId1NL=KVK nummer ProfId2NL=- ProfId3NL=- ProfId4NL=- -ProfId5NL== +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof Id 2 (Social security number) ProfId3PT=Prof Id 3 (Commercial Record number) ProfId4PT=Prof Id 4 (Conservatory) -ProfId5PT== +ProfId5PT=EORI number ProfId6PT=- ProfId1SN== ProfId2SN== @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof ID 1 (OGRN) ProfId2RU=Prof Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi ErrorVATCheckMS_UNAVAILABLE=Kontrola ni možna. Država članica ne zagotavlja storitve poizvedbe (%s). NorProspectNorCustomer=Not prospect, nor customer JuridicalStatus=Legal Entity Type +Workforce=Workforce Staff=Employees ProspectLevelShort=Potencial ProspectLevel=Potencial možne stranke @@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor PaymentTypeBoth=Payment Type - Customer and Vendor MulticurrencyUsed=Use Multicurrency MulticurrencyCurrency=Valuta +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/sl_SI/hrm.lang b/htdocs/langs/sl_SI/hrm.lang index f6345d6389e..c5af09f3811 100644 --- a/htdocs/langs/sl_SI/hrm.lang +++ b/htdocs/langs/sl_SI/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=Employees Employee=Zaposleni NewEmployee=New employee +ListOfEmployees=List of employees diff --git a/htdocs/langs/sl_SI/languages.lang b/htdocs/langs/sl_SI/languages.lang index f449281f141..f625688f706 100644 --- a/htdocs/langs/sl_SI/languages.lang +++ b/htdocs/langs/sl_SI/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Španski (Paragvaj) Language_es_PE=Španski (Peru) Language_es_PR=Španščina (Portoriko) +Language_es_US=Spanish (USA) Language_es_UY=Spanish (Uruguay) Language_es_GT=Spanish (Guatemala) Language_es_VE=Spanish (Venezuela) diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang index 71d8cbb4ee9..f7d1c8a39d7 100644 --- a/htdocs/langs/sl_SI/main.lang +++ b/htdocs/langs/sl_SI/main.lang @@ -155,6 +155,7 @@ RemoveLink=Odstrani povezavo AddToDraft=Add to draft Update=Posodobi Close=Zapri +CloseAs=Set status to CloseBox=Remove widget from your dashboard Confirm=Potrdi ConfirmSendCardByMail=Do you really want to send the content of this card by mail to %s? @@ -196,6 +197,7 @@ ReOpen=Ponovno odpri Upload=Upload ToLink=Povezava Select=Dodaj kot lastnika +SelectAll=Select all Choose=Izbira Resize=Spremeni velikost ResizeOrCrop=Resize or Crop @@ -256,6 +258,7 @@ Cards=Kartice Card=Kartica Now=Zdaj HourStart=Ura začetka +Deadline=Deadline Date=Datum DateAndHour=Datum in ura DateToday=Današnji datum @@ -264,8 +267,10 @@ DateStart=Začetni datum DateEnd=Končni datum DateCreation=Datum kreiranja DateCreationShort=Datum ustvarjanja +IPCreation=Creation IP DateModification=Datum spremembe DateModificationShort=Dat.spr. +IPModification=Modification IP DateLastModification=Datum zadnje spremembe DateValidation=Datum potrditve DateClosing=Datum zaključka @@ -319,6 +324,7 @@ Morning=Jutro Afternoon=Popoldan Quadri=Četrtletje MonthOfDay=Dan v mesecu +DaysOfWeek=Days of week HourShort=H MinuteShort=Mn Rate=Stopnja @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency MulticurrencyAmountHT=Amount (excl. tax), original currency MulticurrencyAmountTTC=Amount (inc. of tax), original currency MulticurrencyAmountVAT=Amount tax, original currency +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Znesek davka 2 AmountLT2=Znesek davka 3 AmountLT1ES=Znesek RE @@ -487,6 +494,7 @@ By=Z From=Od FromDate=Izdajatelj FromLocation=Izdajatelj +at=at to=do To=do and=in @@ -509,6 +517,7 @@ Draft=Osnutek Drafts=Osnutki StatusInterInvoiced=Invoiced Validated=Potrjen +ValidatedToProduce=Validated (To produce) Opened=Odprt OpenAll=Open (All) ClosedAll=Closed (All) @@ -655,6 +664,7 @@ Response=Odgovor Priority=Prioriteta SendByMail=Send by email MailSentBy=Email poslal +NotSent=Ni poslan TextUsedInTheMessageBody=Vsebina Email-a SendAcknowledgementByMail=Send confirmation email SendMail=Pošlji e-pošto @@ -836,6 +846,7 @@ ListOfTemplates=Seznam predlog Gender=Spol Genderman=Moški Genderwoman=Ženska +Genderother=Ostalo ViewList=Glej seznam ViewGantt=Gantt view ViewKanban=Kanban view @@ -877,6 +888,8 @@ Miscellaneous=Razno Calendar=Koledar GroupBy=Group by... ViewFlatList=View flat list +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Remove string '%s' SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at https://transifex.com/projects/p/dolibarr/ to add your improvements. DirectDownloadLink=Direct download link (public/external) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments SearchIntoExpenseReports=Stroškovna poročila SearchIntoLeaves=Leave SearchIntoTickets=Tickets +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Plačila dobaviteljem +SearchIntoMiscPayments=Miscellaneous payments CommentLink=Komentarji NbComments=Number of comments CommentPage=Comments space @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Informacija Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Datum rojstva +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/sl_SI/mrp.lang b/htdocs/langs/sl_SI/mrp.lang index 863793063a0..f018be890cc 100644 --- a/htdocs/langs/sl_SI/mrp.lang +++ b/htdocs/langs/sl_SI/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/sl_SI/website.lang b/htdocs/langs/sl_SI/website.lang index 3971608e8ce..92889944fa4 100644 --- a/htdocs/langs/sl_SI/website.lang +++ b/htdocs/langs/sl_SI/website.lang @@ -31,7 +31,7 @@ AddWebsite=Add website Webpage=Web page/container AddPage=Add page/container HomePage=Home Page -PageContainer=Page/container +PageContainer=Stran PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. 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. SiteDeleted=Web site '%s' deleted @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=Vir RSS RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/sq_AL/accountancy.lang b/htdocs/langs/sq_AL/accountancy.lang index cd2bc3b934d..4e7da1a8564 100644 --- a/htdocs/langs/sq_AL/accountancy.lang +++ b/htdocs/langs/sq_AL/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Default for service DefaultForProduct=Default for product CantSuggest=Can't suggest AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s -ConfigAccountingExpert=Configuration of the module accounting expert +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Journalization -Journaux=Journals +Journals=Journals JournalFinancial=Financial journals BackToChartofaccounts=Return chart of accounts Chartofaccounts=Chart of accounts +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Current dedicated account AssignDedicatedAccountingAccount=New account to assign InvoiceLabel=Invoice label @@ -33,8 +35,8 @@ OtherInfo=Other information DeleteCptCategory=Remove accounting account from group ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group? JournalizationInLedgerStatus=Status of journalization -AlreadyInGeneralLedger=Already journalized in ledgers -NotYetInGeneralLedger=Not yet journalized in ledgers +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group DetailByAccount=Show detail by account AccountWithNonZeroValues=Accounts with non-zero values @@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC CountriesNotInEEC=Countries not in EEC CountriesInEECExceptMe=Countries in EEC except %s CountriesExceptMe=All countries except %s -AccountantFiles=Export accounting documents +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup @@ -79,7 +83,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) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Select active chart of accounts ChangeAndLoad=Change and load Addanaccount=Add an accounting account @@ -89,6 +93,8 @@ SubledgerAccount=Subledger account SubledgerAccountLabel=Subledger account label ShowAccountingAccount=Show accounting account ShowAccountingJournal=Show accounting journal +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Accounting account suggested MenuDefaultAccounts=Default accounts MenuBankAccounts=Bank accounts @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding CreateMvts=Create new transaction UpdateMvts=Modification of a transaction ValidTransaction=Validate transaction -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=Ledger +BookkeepingSubAccount=Subledger AccountBalance=Balanca e llogarisё ObjectsRef=Source object ref CAHTF=Total purchase vendor before tax @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Sell journal ACCOUNTING_PURCHASE_JOURNAL=Purchase journal @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups ByYear=By year NotMatch=Jo i vendosur -DeleteMvt=Delete Ledger lines +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=Viti qё do tё fshihet DelJournal=Journal to delete -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Finance journal ExpenseReportsJournal=Expense reports journal DescFinanceJournal=Finance journal including all the types of payments by bank account -DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Account for VAT not defined ThirdpartyAccountNotDefined=Account for third party not defined ProductAccountNotDefined=Account for product not defined @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu %s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Export draft journal @@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Chart of accounts Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang index ac862121b57..6ca94565b87 100644 --- a/htdocs/langs/sq_AL/admin.lang +++ b/htdocs/langs/sq_AL/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=Edition of field %s FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=LDAP Setup LDAPGlobalParameters=Global parameters @@ -1670,7 +1672,7 @@ AdvancedEditor=Advanced editor ActivateFCKeditor=Activate advanced editor for: FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services) FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing) FCKeditorForUserSignature=WYSIWIG creation/edition of user signature FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting 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 user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup diff --git a/htdocs/langs/sq_AL/banks.lang b/htdocs/langs/sq_AL/banks.lang index ba32fb7ee18..e131a6bbd10 100644 --- a/htdocs/langs/sq_AL/banks.lang +++ b/htdocs/langs/sq_AL/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=Miscellaneous payments ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA mandate YourSEPAMandate=Your SEPA mandate FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/sq_AL/categories.lang b/htdocs/langs/sq_AL/categories.lang index 9703aa35747..8acad1ef594 100644 --- a/htdocs/langs/sq_AL/categories.lang +++ b/htdocs/langs/sq_AL/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup CategorieRecursiv=Link with parent tag/category automatically CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=Add the following product/service +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Show tag/category ByDefaultInList=By default in list ChooseCategory=Choose category -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/sq_AL/companies.lang b/htdocs/langs/sq_AL/companies.lang index f74d48ced9d..f0fb358a3b8 100644 --- a/htdocs/langs/sq_AL/companies.lang +++ b/htdocs/langs/sq_AL/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof Id 1 (Federal number) ProfId4CH=Prof Id 2 (Commercial Record number) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof Id 1 (R.U.T.) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr) ProfId2DE=Prof Id 2 (USt.-Nr) ProfId3DE=Prof Id 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof Id 1 (CIF/NIF) ProfId2ES=Prof Id 2 (Social security number) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (Collegiate number) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof Id 1 (SIREN) ProfId2FR=Prof Id 2 (SIRET) ProfId3FR=Prof Id 3 (NAF, old APE) ProfId4FR=Prof Id 4 (RCS/RM) -ProfId5FR=- +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Registration Number ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX) ProfId4IN=Prof Id 4 ProfId5IN=Prof Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Business permit) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (R.C.) ProfId2MA=Id prof. 2 (Patente) ProfId3MA=Id prof. 3 (I.F.) ProfId4MA=Id prof. 4 (C.N.S.S.) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof Id 1 (R.F.C). ProfId2MX=Prof Id 2 (R..P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK nummer ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof Id 2 (Social security number) ProfId3PT=Prof Id 3 (Commercial Record number) ProfId4PT=Prof Id 4 (Conservatory) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof Id 1 (OGRN) ProfId2RU=Prof Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s). NorProspectNorCustomer=Not prospect, nor customer JuridicalStatus=Legal Entity Type +Workforce=Workforce Staff=Punonjësit ProspectLevelShort=Potential ProspectLevel=Prospect potential @@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor PaymentTypeBoth=Payment Type - Customer and Vendor MulticurrencyUsed=Use Multicurrency MulticurrencyCurrency=Currency +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/sq_AL/hrm.lang b/htdocs/langs/sq_AL/hrm.lang index b01b0e2aa4c..4ef88ad657a 100644 --- a/htdocs/langs/sq_AL/hrm.lang +++ b/htdocs/langs/sq_AL/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=Punonjësit Employee=Punonjës NewEmployee=Punonjës i ri +ListOfEmployees=List of employees diff --git a/htdocs/langs/sq_AL/languages.lang b/htdocs/langs/sq_AL/languages.lang index 84a95d47582..98d74a37c1a 100644 --- a/htdocs/langs/sq_AL/languages.lang +++ b/htdocs/langs/sq_AL/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Spanish (Paraguay) Language_es_PE=Spanish (Peru) Language_es_PR=Spanish (Puerto Rico) +Language_es_US=Spanish (USA) Language_es_UY=Spanish (Uruguay) Language_es_GT=Spanish (Guatemala) Language_es_VE=Spanish (Venezuela) diff --git a/htdocs/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang index f11e7e94095..b52a374d7d5 100644 --- a/htdocs/langs/sq_AL/main.lang +++ b/htdocs/langs/sq_AL/main.lang @@ -155,6 +155,7 @@ RemoveLink=Remove link AddToDraft=Add to draft Update=Update Close=Mbyll +CloseAs=Set status to CloseBox=Remove widget from your dashboard Confirm=Confirm ConfirmSendCardByMail=Do you really want to send the content of this card by mail to %s? @@ -196,6 +197,7 @@ ReOpen=Re-Open Upload=Upload ToLink=Link Select=Select +SelectAll=Select all Choose=Choose Resize=Resize ResizeOrCrop=Resize or Crop @@ -256,6 +258,7 @@ Cards=Cards Card=Card Now=Now HourStart=Start hour +Deadline=Deadline Date=Date DateAndHour=Date and hour DateToday=Data e sotme @@ -264,8 +267,10 @@ DateStart=Start date DateEnd=End date DateCreation=Creation date DateCreationShort=Creat. date +IPCreation=Creation IP DateModification=Modification date DateModificationShort=Modif. date +IPModification=Modification IP DateLastModification=Latest modification date DateValidation=Validation date DateClosing=Closing date @@ -319,6 +324,7 @@ Morning=Morning Afternoon=Afternoon Quadri=Quadri MonthOfDay=Month of the day +DaysOfWeek=Days of week HourShort=H MinuteShort=mn Rate=Rate @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency MulticurrencyAmountHT=Amount (excl. tax), original currency MulticurrencyAmountTTC=Amount (inc. of tax), original currency MulticurrencyAmountVAT=Amount tax, original currency +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Amount tax 2 AmountLT2=Amount tax 3 AmountLT1ES=Amount RE @@ -487,6 +494,7 @@ By=By From=From FromDate=From FromLocation=From +at=at to=to To=to and=and @@ -509,6 +517,7 @@ Draft=Draft Drafts=Drafts StatusInterInvoiced=Invoiced Validated=Validated +ValidatedToProduce=Validated (To produce) Opened=Hapur OpenAll=Open (All) ClosedAll=Closed (All) @@ -655,6 +664,7 @@ Response=Response Priority=Prioriteti SendByMail=Send by email MailSentBy=Email sent by +NotSent=Not sent TextUsedInTheMessageBody=Email body SendAcknowledgementByMail=Send confirmation email SendMail=Send email @@ -836,6 +846,7 @@ ListOfTemplates=List of templates Gender=Gjinia Genderman=Man Genderwoman=Woman +Genderother=Tjetër ViewList=List view ViewGantt=Gantt view ViewKanban=Kanban view @@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous Calendar=Calendar GroupBy=Group by... ViewFlatList=View flat list +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Remove string '%s' SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at https://transifex.com/projects/p/dolibarr/ to add your improvements. DirectDownloadLink=Direct download link (public/external) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments SearchIntoExpenseReports=Expense reports SearchIntoLeaves=Leave SearchIntoTickets=Tickets +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Vendor payments +SearchIntoMiscPayments=Miscellaneous payments CommentLink=Comments NbComments=Number of comments CommentPage=Comments space @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Information Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Date of birth +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/sq_AL/mrp.lang b/htdocs/langs/sq_AL/mrp.lang index 863793063a0..f018be890cc 100644 --- a/htdocs/langs/sq_AL/mrp.lang +++ b/htdocs/langs/sq_AL/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/sq_AL/website.lang b/htdocs/langs/sq_AL/website.lang index 4b5294d5e43..03e042e4be6 100644 --- a/htdocs/langs/sq_AL/website.lang +++ b/htdocs/langs/sq_AL/website.lang @@ -31,7 +31,7 @@ AddWebsite=Add website Webpage=Web page/container AddPage=Add page/container HomePage=Home Page -PageContainer=Page/container +PageContainer=Page PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. 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. SiteDeleted=Web site '%s' deleted @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=RSS Feed RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/sr_RS/accountancy.lang b/htdocs/langs/sr_RS/accountancy.lang index 04b94b6345d..66b404cdec9 100644 --- a/htdocs/langs/sr_RS/accountancy.lang +++ b/htdocs/langs/sr_RS/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Default for service DefaultForProduct=Default for product CantSuggest=Can't suggest AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s -ConfigAccountingExpert=Konfigurisanje mogula računovodstveni ekspert +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Journalization -Journaux=Izveštaji +Journals=Izveštaji JournalFinancial=Finansijski izveštaji BackToChartofaccounts=Vrati tabelu računa Chartofaccounts=Tabela računa +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Current dedicated account AssignDedicatedAccountingAccount=New account to assign InvoiceLabel=Invoice label @@ -33,8 +35,8 @@ OtherInfo=Other information DeleteCptCategory=Remove accounting account from group ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group? JournalizationInLedgerStatus=Status of journalization -AlreadyInGeneralLedger=Already journalized in ledgers -NotYetInGeneralLedger=Not yet journalized in ledgers +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group DetailByAccount=Show detail by account AccountWithNonZeroValues=Accounts with non-zero values @@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC CountriesNotInEEC=Countries not in EEC CountriesInEECExceptMe=Countries in EEC except %s CountriesExceptMe=All countries except %s -AccountantFiles=Export accounting documents +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup @@ -79,7 +83,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) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Select active chart of accounts ChangeAndLoad=Change and load Addanaccount=Dodaj računovodstveni nalog @@ -89,6 +93,8 @@ SubledgerAccount=Subledger account SubledgerAccountLabel=Subledger account label ShowAccountingAccount=Show accounting account ShowAccountingJournal=Show accounting journal +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Accounting account suggested MenuDefaultAccounts=Default accounts MenuBankAccounts=Računi u banci @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding CreateMvts=Create new transaction UpdateMvts=Modification of a transaction ValidTransaction=Validate transaction -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=Ledger +BookkeepingSubAccount=Subledger AccountBalance=Stanje računa ObjectsRef=Source object ref CAHTF=Total purchase vendor before tax @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Izveštaj prodaje ACCOUNTING_PURCHASE_JOURNAL=Izveštaj nabavke @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups ByYear=Po godini NotMatch=Not Set -DeleteMvt=Delete Ledger lines +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=Year to delete DelJournal=Journal to delete -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Finansijski izveštaji ExpenseReportsJournal=Expense reports journal DescFinanceJournal=Finansijski izveštaji uključujući sve vrste uplata preko bankovnog računa -DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Account for VAT not defined ThirdpartyAccountNotDefined=Account for third party not defined ProductAccountNotDefined=Account for product not defined @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu %s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Export draft journal @@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Chart of accounts Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang index 46a4915b7a7..842fbea4662 100644 --- a/htdocs/langs/sr_RS/admin.lang +++ b/htdocs/langs/sr_RS/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=Edition of field %s FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=LDAP Setup LDAPGlobalParameters=Global parameters @@ -1670,7 +1672,7 @@ AdvancedEditor=Advanced editor ActivateFCKeditor=Activate advanced editor for: FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services) FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing) FCKeditorForUserSignature=WYSIWIG creation/edition of user signature FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting 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 user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup diff --git a/htdocs/langs/sr_RS/banks.lang b/htdocs/langs/sr_RS/banks.lang index a2ab0dfea17..2939146c14e 100644 --- a/htdocs/langs/sr_RS/banks.lang +++ b/htdocs/langs/sr_RS/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=Miscellaneous payments ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA mandate YourSEPAMandate=Your SEPA mandate FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/sr_RS/categories.lang b/htdocs/langs/sr_RS/categories.lang index 4f1062f1d78..3467c78c1e5 100644 --- a/htdocs/langs/sr_RS/categories.lang +++ b/htdocs/langs/sr_RS/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=TPodešavanje naziva/kategorija CategorieRecursiv=Poveži sa nadređenim nazivom/kategorijom automatski CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=Dodaj sledeći proizvod/uslugu +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Prikaži naziv/kategoriju ByDefaultInList=Podrazumevano u listi ChooseCategory=Choose category -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/sr_RS/companies.lang b/htdocs/langs/sr_RS/companies.lang index e2232cac206..31db7cdc260 100644 --- a/htdocs/langs/sr_RS/companies.lang +++ b/htdocs/langs/sr_RS/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Profesionalni broj) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof Id 1 (Federal number) ProfId4CH=Prof Id 2 (Commercial Record number) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof Id 1 (R.U.T.) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr) ProfId2DE=Prof Id 2 (USt.-Nr) ProfId3DE=Prof Id 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof Id 1 (CIF/NIF) ProfId2ES=Prof Id 2 (Social security number) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (Collegiate number) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof Id 1 (SIREN) ProfId2FR=Prof Id 2 (SIRET) ProfId3FR=Prof Id 3 (NAF, old APE) ProfId4FR=Prof Id 4 (RCS/RM) -ProfId5FR=- +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Registration Number ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX) ProfId4IN=Prof Id 4 ProfId5IN=Prof Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luksemburg) ProfId2LU=Id. prof. 2 (Radna dozvola) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (R.C.) ProfId2MA=Id prof. 2 (Patente) ProfId3MA=Id prof. 3 (I.F.) ProfId4MA=Id prof. 4 (C.N.S.S.) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof Id 1 (R.F.C). ProfId2MX=Prof Id 2 (R..P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK nummer ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof Id 2 (Social security number) ProfId3PT=Prof Id 3 (Commercial Record number) ProfId4PT=Prof Id 4 (Conservatory) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof Id 1 (OGRN) ProfId2RU=Prof Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi ErrorVATCheckMS_UNAVAILABLE=Provera nije moguća. Servis nije dostupan za datu državu (%s). NorProspectNorCustomer=Not prospect, nor customer JuridicalStatus=Legal Entity Type +Workforce=Workforce Staff=Zaposleni ProspectLevelShort=Potencijal ProspectLevel=Potencijal kandidata @@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor PaymentTypeBoth=Payment Type - Customer and Vendor MulticurrencyUsed=Use Multicurrency MulticurrencyCurrency=Valuta +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/sr_RS/hrm.lang b/htdocs/langs/sr_RS/hrm.lang index ff6bf64c951..a16626d66d1 100644 --- a/htdocs/langs/sr_RS/hrm.lang +++ b/htdocs/langs/sr_RS/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=Zaposleni Employee=Zaposleni NewEmployee=Novi zaposleni +ListOfEmployees=Lista zaposlenih diff --git a/htdocs/langs/sr_RS/languages.lang b/htdocs/langs/sr_RS/languages.lang index 09da9c8b90a..8f0e9d14af7 100644 --- a/htdocs/langs/sr_RS/languages.lang +++ b/htdocs/langs/sr_RS/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Španski (Panama) Language_es_PY=Španski (Paragvaj) Language_es_PE=Španski (Peru) Language_es_PR=Španski (Porto Riko) +Language_es_US=Spanish (USA) Language_es_UY=Spanish (Uruguay) Language_es_GT=Spanish (Guatemala) Language_es_VE=Španski (Venecuela) diff --git a/htdocs/langs/sr_RS/main.lang b/htdocs/langs/sr_RS/main.lang index b5d9814035c..d6425161390 100644 --- a/htdocs/langs/sr_RS/main.lang +++ b/htdocs/langs/sr_RS/main.lang @@ -155,6 +155,7 @@ RemoveLink=Ukloni link AddToDraft=Add to draft Update=Ažuriraj Close=Zatvori +CloseAs=Postavi status na CloseBox=Remove widget from your dashboard Confirm=Potvrdi ConfirmSendCardByMail=Do you really want to send the content of this card by mail to %s? @@ -196,6 +197,7 @@ ReOpen=Ponovo otvori Upload=Upload ToLink=ink Select=Izaberi +SelectAll=Select all Choose=Izaberi Resize=Promeni veličinu ResizeOrCrop=Resize or Crop @@ -256,6 +258,7 @@ Cards=Kartice Card=Kartica Now=Sada HourStart=Vreme početka +Deadline=Deadline Date=Datum DateAndHour=Datum i vreme DateToday=Današnji datum @@ -264,8 +267,10 @@ DateStart=Datum početka DateEnd=Datum završetka DateCreation=Datum kreacije DateCreationShort=Datum kreiranja +IPCreation=Creation IP DateModification=Datum izmene DateModificationShort=Dat. izmene +IPModification=Modification IP DateLastModification=Latest modification date DateValidation=Datum odobrenja DateClosing=Datum zatvaranja @@ -319,6 +324,7 @@ Morning=Pre podne Afternoon=Posle podne Quadri=Quadri MonthOfDay=Mesec dana +DaysOfWeek=Days of week HourShort=H MinuteShort=mn Rate=Kurs @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency MulticurrencyAmountHT=Amount (excl. tax), original currency MulticurrencyAmountTTC=Iznos (sa PDV-om), originalna valuta MulticurrencyAmountVAT=Ukupno PDV, originalna valuta +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Iznos poreza 2 AmountLT2=Iznos poreza 3 AmountLT1ES=Iznos RE @@ -487,6 +494,7 @@ By=Do From=Od FromDate=Od FromLocation=Od +at=at to=do To=do and=i @@ -509,6 +517,7 @@ Draft=Draft Drafts=Draft StatusInterInvoiced=Invoiced Validated=Validirano +ValidatedToProduce=Validated (To produce) Opened=Otvoreno OpenAll=Open (All) ClosedAll=Closed (All) @@ -655,6 +664,7 @@ Response=Odgovor Priority=Prioritet SendByMail=Send by email MailSentBy=Mail poslao +NotSent=Nije poslat TextUsedInTheMessageBody=Sadržaj maila SendAcknowledgementByMail=Send confirmation email SendMail=Pošalji email @@ -836,6 +846,7 @@ ListOfTemplates=Lista templejtova Gender=Pol Genderman=Muško Genderwoman=Žensko +Genderother=Drugo ViewList=Prikaz liste ViewGantt=Gantt view ViewKanban=Kanban view @@ -877,6 +888,8 @@ Miscellaneous=Ostalo Calendar=Kalendar GroupBy=Group by... ViewFlatList=View flat list +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Remove string '%s' SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at https://transifex.com/projects/p/dolibarr/ to add your improvements. DirectDownloadLink=Direct download link (public/external) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments SearchIntoExpenseReports=Troškovi SearchIntoLeaves=Leave SearchIntoTickets=Tickets +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Vendor payments +SearchIntoMiscPayments=Miscellaneous payments CommentLink=Komentari NbComments=Number of comments CommentPage=Comments space @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Informacija Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Datum rođenja +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/sr_RS/mrp.lang b/htdocs/langs/sr_RS/mrp.lang index 863793063a0..f018be890cc 100644 --- a/htdocs/langs/sr_RS/mrp.lang +++ b/htdocs/langs/sr_RS/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/sr_RS/website.lang b/htdocs/langs/sr_RS/website.lang index 0ce58ab3043..0ff0213ef31 100644 --- a/htdocs/langs/sr_RS/website.lang +++ b/htdocs/langs/sr_RS/website.lang @@ -31,7 +31,7 @@ AddWebsite=Add website Webpage=Web page/container AddPage=Add page/container HomePage=Home Page -PageContainer=Page/container +PageContainer=Strana PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. 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. SiteDeleted=Web site '%s' deleted @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=RSS Feed RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang index 080f361671d..30f4f0325a6 100644 --- a/htdocs/langs/sv_SE/accountancy.lang +++ b/htdocs/langs/sv_SE/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Standard för service DefaultForProduct=Standard för produkter CantSuggest=Kan inte föreslå AccountancySetupDoneFromAccountancyMenu=De flesta inställningarna för bokföringen görs från menyn %s -ConfigAccountingExpert=Konfiguration av modulen redovisningsexpert +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Bokföring -Journaux=Loggböcker +Journals=Loggböcker JournalFinancial=Finansiella loggböcker BackToChartofaccounts=Avkastning kontoplan Chartofaccounts=Kontoplan +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Nuvarande dedikerat konto AssignDedicatedAccountingAccount=Nytt konto att tilldela InvoiceLabel=Faktura etikett @@ -33,8 +35,8 @@ OtherInfo=Övrig information DeleteCptCategory=Ta bort redovisningskontot från gruppen ConfirmDeleteCptCategory=Är du säker på att du vill ta bort det här kontot konto från kontokoncernen? JournalizationInLedgerStatus=Status för bokföring -AlreadyInGeneralLedger=Redan bokförd i huvudboken -NotYetInGeneralLedger=Ännu inte infört i huvudboken +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Gruppen är tom, kontrollera inställningen av den personliga redovisningsgruppen DetailByAccount=Visa detaljer efter konto AccountWithNonZeroValues=Konton med icke-nollvärden @@ -43,7 +45,9 @@ CountriesInEEC=Länder i EEG CountriesNotInEEC=Länder inte i EEG CountriesInEECExceptMe=Länder i EEG förutom %s CountriesExceptMe=Alla länder utom %s -AccountantFiles=Exportera redovisningsdokument +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Huvudsakliga bokföringskonto för kunder som inte definierats i installationen MainAccountForSuppliersNotDefined=Huvudkonton för leverantörer som inte definierats i installationen @@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=STEG %s: Lägg till eller redigera befintliga transak AccountancyAreaDescClosePeriod=STEG %s: Stäng period så vi kan inte göra ändringar i framtiden. -TheJournalCodeIsNotDefinedOnSomeBankAccount=Ett obligatoriskt steg i installationen var inte fullständigt (bokföringskodsloggbok inte definierad för alla bankkonton) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Välj aktivt diagram över konton ChangeAndLoad=Ändra och ladda Addanaccount=Lägg till ett redovisningskonto @@ -89,6 +93,8 @@ SubledgerAccount=Subledger account SubledgerAccountLabel=Subledger account label ShowAccountingAccount=Visa bokföringskonto ShowAccountingJournal=Visa loggböcker +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Redovisningskonto föreslås MenuDefaultAccounts=Standardkonton MenuBankAccounts=Bankkonton @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Utläggsrapport förbindande CreateMvts=Skapa ny transaktion UpdateMvts=Ändring av en transaktion ValidTransaction=Bekräfta transaktionen -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=Huvudbok +BookkeepingSubAccount=Subledger AccountBalance=Kontobalans ObjectsRef=Källobjekt ref CAHTF=Totalt köpleverantör före skatt @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Inaktivera direktinspelning av transaktion i bankkonto ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Aktivera utkastexport på loggbok ACCOUNTANCY_COMBO_FOR_AUX=Aktivera kombinationslista för dotterkonto (kan vara långsamt om du har många tredje parter) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Försäljningsloggbok ACCOUNTING_PURCHASE_JOURNAL=Inköpsloggbok @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Redovisningskonto för väntan DONATION_ACCOUNTINGACCOUNT=Redovisningskonto för att registrera donationer ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Redovisningskonto för att registrera prenumerationer +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=Av fördefinierade grupper ByPersonalizedAccountGroups=Av personliga grupper ByYear=Per år NotMatch=Inte inställd -DeleteMvt=Ta bort linjer +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=År att radera DelJournal=Loggbok att radera -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=Detta kommer att radera transaktionen från huvudboken (alla rader relaterade till samma transaktion kommer att raderas) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Finansloggbok ExpenseReportsJournal=Utläggsrapporter loggbok DescFinanceJournal=Finansbokföring inklusive alla typer av betalningar via bankkonto -DescJournalOnlyBindedVisible=Detta är en syn på posten som är bunden till ett bokföringskonto och kan spelas in i huvudboken. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Konto för moms inte definierad ThirdpartyAccountNotDefined=Konto för tredje part har inte definierats ProductAccountNotDefined=Konto för produkt som inte definierats @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=Denna loggboken används redan AccountingAccountForSalesTaxAreDefinedInto=Obs! Bokföringskonto för försäljningsskatt definieras i menyn %s - %s NumberOfAccountancyEntries=Antal poster NumberOfAccountancyMovements=Antal rörelser +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Exportera utkast till loggbok @@ -326,6 +339,8 @@ Modelcsv_configurable=Exportera CSV konfigurerbar Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Diagram över konton Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang index 1e73fcc03eb..067f3a478a2 100644 --- a/htdocs/langs/sv_SE/admin.lang +++ b/htdocs/langs/sv_SE/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Visa kund / leverantör ref. info lista (välj lista eller combobox) och de flesta av hyperlänken.
Tredje part kommer att visas med ett namnformat av "CC12345 - SC45678 - The Big Company corp." istället för "The Big Company Corp". AddAdressInList=Visa adresslista för kund / leverantörs adress (välj lista eller combobox)
Tredje parten kommer att visas med ett namnformat för "The Big Company Corp." - 21 Jump Street 123456 Big Town - USA "istället för" The Big Company Corp ". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Be om föredragen leveransmetod för tredje parter. FieldEdition=Edition av fält %s FillThisOnlyIfRequired=Exempel: +2 (fyll endast om tidszon offset problem är erfarna) @@ -1420,6 +1421,7 @@ AdherentMailRequired=E-post krävs för att skapa en ny medlem MemberSendInformationByMailByDefault=Kryssruta för att skicka e-post bekräftelse till medlemmar (bekräftande eller nya abonnemang) är aktiverat som standard VisitorCanChooseItsPaymentMode=Besökare kan välja mellan tillgängliga betalningssätt MEMBER_REMINDER_EMAIL=Aktivera automatisk påminnelse via e-post av utgått prenumerationer. Obs! Modul %s måste vara aktiverad och korrekt inställd för att skicka påminnelser. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=LDAP-inställningar LDAPGlobalParameters=Globala parametrar @@ -1670,7 +1672,7 @@ AdvancedEditor=Avancerad redaktör ActivateFCKeditor=Aktivera FCKeditor för: FCKeditorForCompany=WYSIWYG skapande / upplaga av Companie beskrivning och notera FCKeditorForProduct=WYSIWYG skapande / upplaga av produkter / tjänster: s beskrivning och anteckning -FCKeditorForProductDetails=WYSIWIG skapande / utgåva av produkter detaljeringslinjer för alla enheter (förslag, order, fakturor, etc ...). Varning! Användning av det här alternativet för det här fallet rekommenderas inte på allvar eftersom det kan skapa problem med specialtecken och sidformatering när du bygger PDF-filer. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWYG skapande / utgåva av försändelser FCKeditorForUserSignature=WYSIWYG skapande / upplaga av signatur FCKeditorForMail=WYSIWIG skapande / utgåva för all mail (utom Verktygs-> eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Ställ in det här standardvärdet för typ av hä AGENDA_DEFAULT_FILTER_TYPE=Ställ in denna typ av händelse automatiskt i sökfiltret i kalendervy AGENDA_DEFAULT_FILTER_STATUS=Ställ in denna status automatiskt för händelser i sökfilter i dagordning AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda -AGENDA_REMINDER_EMAIL=Aktivera händelsepåminnelse via e-postmeddelanden (påminnelse alternativ / fördröjning kan definieras på varje händelse). Obs! Modul %s måste vara aktiverad och korrekt inställd för att få påminnelse skickad med rätt frekvens. -AGENDA_REMINDER_BROWSER=Aktivera händelsepåminnelse på användarens webbläsare (när händelsedatum har uppnåtts kan varje användare neka det från webbläsarbekräftelsespåfrågan) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Aktivera ljudanmälan +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Visa länkat objekt i agendan ##### Clicktodial ##### ClickToDialSetup=Klicka för att Dial modul inställning diff --git a/htdocs/langs/sv_SE/banks.lang b/htdocs/langs/sv_SE/banks.lang index a0fcc10c5ea..dc82d075631 100644 --- a/htdocs/langs/sv_SE/banks.lang +++ b/htdocs/langs/sv_SE/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=Diverse betalningar ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA-mandatet YourSEPAMandate=Ditt SEPA-mandat FindYourSEPAMandate=Detta är ditt SEPA-mandat för att bemyndiga vårt företag att göra direkt debitering till din bank. Returnera det undertecknat (skanna av det signerade dokumentet) eller skicka det via post till @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/sv_SE/categories.lang b/htdocs/langs/sv_SE/categories.lang index 1c81710fbfc..f3c56936403 100644 --- a/htdocs/langs/sv_SE/categories.lang +++ b/htdocs/langs/sv_SE/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Taggar / kategorier inställning CategorieRecursiv=Länk med moderkort / kategori automatiskt CategorieRecursivHelp=Om alternativet är på, när du lägger till en produkt i en underkategori kommer produkten också att läggas till i kategorin förälder. AddProductServiceIntoCategory=Lägg till följande produkt / tjänst +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Visa tagg / kategori ByDefaultInList=Som standard i listan ChooseCategory=Välj kategori -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/sv_SE/companies.lang b/htdocs/langs/sv_SE/companies.lang index d0a123e72dd..57b74758a58 100644 --- a/htdocs/langs/sv_SE/companies.lang +++ b/htdocs/langs/sv_SE/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional antal) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof Id 1 (Federal antal) ProfId4CH=Prof Id 2 (Commercial Rekordmånga) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof Id 1 (RUT) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr) ProfId2DE=Prof Id 2 (USt.-Nr) ProfId3DE=Prof Id 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof Id 1 (CIF / NIF) ProfId2ES=Prof Id 2 (Social Security Number) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (Collegiate nummer) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof Id 1 (SIREN) ProfId2FR=Prof Id 2 (Siret) ProfId3FR=Prof Id 3 (NAF, gamla APE) ProfId4FR=Prof Id 4 (RCS / RM) -ProfId5FR=Prof ID 5 +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Registreringsnummer ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 ProfId4IN=Prof Id 4 ProfId5IN=Prof ID 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxemburg) ProfId2LU=Id. prof. 2 (affärstillstånd) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (RC) ProfId2MA=Id prof. 2 (Patent) ProfId3MA=Id prof. 3 (IF) ProfId4MA=Id prof. 4 (CNSS) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof Id 1 (RFC). ProfId2MX=Prof Id 2 (R.. P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KvK Nummer ProfId2NL=- ProfId3NL=- ProfId4NL=- -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof Id 2 (personnummer) ProfId3PT=Prof Id 3 (organisationsnummer) ProfId4PT=Prof Id 4 (konservatoriet) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=Ninea @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof Id 1 (OGRN) ProfId2RU=Prof Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=Du kan också kontrollera manuellt på Europeiska kommission ErrorVATCheckMS_UNAVAILABLE=Kontroll inte möjlig. Kontrollera om tjänsten tillhandahålls av medlemsstaten (%s). NorProspectNorCustomer=Inte utsikter, eller kund JuridicalStatus=Juridisk enhetstyp +Workforce=Workforce Staff=anställda ProspectLevelShort=Potentiella ProspectLevel=Prospect potential @@ -456,3 +462,8 @@ PaymentTermsSupplier=Betalningstid - Leverantör PaymentTypeBoth=Payment Type - Customer and Vendor MulticurrencyUsed=Använd multicurrency MulticurrencyCurrency=Valuta +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/sv_SE/hrm.lang b/htdocs/langs/sv_SE/hrm.lang index 4ee74d97f4c..8cf4dd076d8 100644 --- a/htdocs/langs/sv_SE/hrm.lang +++ b/htdocs/langs/sv_SE/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=anställda Employee=Anställd NewEmployee=Ny anställd +ListOfEmployees=List of employees diff --git a/htdocs/langs/sv_SE/languages.lang b/htdocs/langs/sv_SE/languages.lang index 8948b5489e8..3e1b532ef97 100644 --- a/htdocs/langs/sv_SE/languages.lang +++ b/htdocs/langs/sv_SE/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Spanska (panama) Language_es_PY=Spanska (Paraguay) Language_es_PE=Spanska (Peru) Language_es_PR=Spanska (Puerto Rico) +Language_es_US=Spanish (USA) Language_es_UY=Spanska (uruguay) Language_es_GT=Spanish (Guatemala) Language_es_VE=Spanska (Venezuela) diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang index a87178c34c9..4820abfdd05 100644 --- a/htdocs/langs/sv_SE/main.lang +++ b/htdocs/langs/sv_SE/main.lang @@ -155,6 +155,7 @@ RemoveLink=Ta bort länk AddToDraft=Lägg till i utkast Update=Uppdatera Close=Stäng +CloseAs=Set status to CloseBox=Ta bort widget från din instrumentpanel Confirm=Bekräfta ConfirmSendCardByMail=Vill du verkligen skicka innehållet på detta kort via mail till %s ? @@ -196,6 +197,7 @@ ReOpen=Öppnar igen Upload=Ladda upp ToLink=Länk Select=Välj +SelectAll=Select all Choose=Välj Resize=Ändra storlek ResizeOrCrop=Ändra storlek eller beskära @@ -256,6 +258,7 @@ Cards=Kort Card=Kort Now=Nu HourStart=Start timme +Deadline=Deadline Date=Datum DateAndHour=Datum och timme DateToday=Dagens datum @@ -264,8 +267,10 @@ DateStart=Startdatum DateEnd=Slutdatum DateCreation=Datum för skapande DateCreationShort=Creat. datum +IPCreation=Creation IP DateModification=Ändringsdatum DateModificationShort=Ändr. datum +IPModification=Modification IP DateLastModification=Senaste ändringsdatum DateValidation=Bekräftelsesdatum DateClosing=Sista dag @@ -319,6 +324,7 @@ Morning=Morgon Afternoon=Eftermiddag Quadri=Quadri MonthOfDay=Dagens månad +DaysOfWeek=Days of week HourShort=H MinuteShort=mn Rate=Sats @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Betalningsbelopp, ursprunglig valuta MulticurrencyAmountHT=Belopp (exkl. Skatt), ursprunglig valuta MulticurrencyAmountTTC=Belopp (inkl. Skatt), ursprunglig valuta MulticurrencyAmountVAT=Belopp skatt, ursprunglig valuta +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Belopp skatt 2 AmountLT2=Belopp skatt 3 AmountLT1ES=Belopp RE @@ -487,6 +494,7 @@ By=Genom att From=Från FromDate=Från FromLocation=Från +at=at to=till To=till and=och @@ -509,6 +517,7 @@ Draft=Utkast Drafts=Utkast StatusInterInvoiced=faktureras Validated=Bekräftat +ValidatedToProduce=Validated (To produce) Opened=Öppen OpenAll=Öppna alla) ClosedAll=Stängt (Alla) @@ -655,6 +664,7 @@ Response=Svar Priority=Prioritet SendByMail=Skicka via e-post MailSentBy=E-post skickas med +NotSent=Skickades inte TextUsedInTheMessageBody=E-organ SendAcknowledgementByMail=Skicka bekräftelsemail SendMail=Skicka e-post @@ -836,6 +846,7 @@ ListOfTemplates=Lista över mallar Gender=Kön Genderman=Man Genderwoman=Kvinna +Genderother=Andra ViewList=Visa lista ViewGantt=Gantt view ViewKanban=Kanban view @@ -877,6 +888,8 @@ Miscellaneous=Diverse Calendar=Kalender GroupBy=Grupp av... ViewFlatList=Visa plattlista +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Ta bort strängen '%s' SomeTranslationAreUncomplete=Några av de språk som erbjuds kan bara översättas delvis eller kan innehålla fel. Snälla hjälp att korrigera ditt språk genom att registrera dig på https://transifex.com/projects/p/dolibarr/ för att lägga till dina förbättringar. DirectDownloadLink=Direkt nedladdningslänk (offentlig / extern) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Kundförsändelser SearchIntoExpenseReports=Räkningar SearchIntoLeaves=Lämna SearchIntoTickets=biljetter +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Leverantörsbetalningar +SearchIntoMiscPayments=Diverse betalningar CommentLink=Kommentarer NbComments=Antal kommentarer CommentPage=Kommentarer utrymme @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Information Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Födelsedatum +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/sv_SE/mrp.lang b/htdocs/langs/sv_SE/mrp.lang index 825615ed23b..fb36e45f2f3 100644 --- a/htdocs/langs/sv_SE/mrp.lang +++ b/htdocs/langs/sv_SE/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/sv_SE/website.lang b/htdocs/langs/sv_SE/website.lang index b9aaf7978d0..7770506abfb 100644 --- a/htdocs/langs/sv_SE/website.lang +++ b/htdocs/langs/sv_SE/website.lang @@ -31,7 +31,7 @@ AddWebsite=Lägg till webbplats Webpage=Webbsida / container AddPage=Lägg till sida / behållare HomePage=Webbsida -PageContainer=Sida / behållare +PageContainer=Sida PreviewOfSiteNotYetAvailable=Förhandsgranskning av din webbplats %s ej tillgänglig än. Du måste först ' Importera en fullständig webbplatsmall ' eller bara ' Lägg till en sida / behållare '. RequestedPageHasNoContentYet=Den begärda sidan med id %s har inget innehåll ännu, eller cachefilen .tpl.php har tagits bort. Redigera innehållet på sidan för att lösa detta. SiteDeleted=Webbplatsen '%s' raderas @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=RSS-flöde RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/sw_SW/accountancy.lang b/htdocs/langs/sw_SW/accountancy.lang index 7b59e33b296..3211a0b62df 100644 --- a/htdocs/langs/sw_SW/accountancy.lang +++ b/htdocs/langs/sw_SW/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Default for service DefaultForProduct=Default for product CantSuggest=Can't suggest AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s -ConfigAccountingExpert=Configuration of the module accounting expert +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Journalization -Journaux=Journals +Journals=Journals JournalFinancial=Financial journals BackToChartofaccounts=Return chart of accounts Chartofaccounts=Chart of accounts +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Current dedicated account AssignDedicatedAccountingAccount=New account to assign InvoiceLabel=Invoice label @@ -33,8 +35,8 @@ OtherInfo=Other information DeleteCptCategory=Remove accounting account from group ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group? JournalizationInLedgerStatus=Status of journalization -AlreadyInGeneralLedger=Already journalized in ledgers -NotYetInGeneralLedger=Not yet journalized in ledgers +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group DetailByAccount=Show detail by account AccountWithNonZeroValues=Accounts with non-zero values @@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC CountriesNotInEEC=Countries not in EEC CountriesInEECExceptMe=Countries in EEC except %s CountriesExceptMe=All countries except %s -AccountantFiles=Export accounting documents +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup @@ -79,7 +83,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) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Select active chart of accounts ChangeAndLoad=Change and load Addanaccount=Add an accounting account @@ -89,6 +93,8 @@ SubledgerAccount=Subledger account SubledgerAccountLabel=Subledger account label ShowAccountingAccount=Show accounting account ShowAccountingJournal=Show accounting journal +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Accounting account suggested MenuDefaultAccounts=Default accounts MenuBankAccounts=Bank accounts @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding CreateMvts=Create new transaction UpdateMvts=Modification of a transaction ValidTransaction=Validate transaction -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=Ledger +BookkeepingSubAccount=Subledger AccountBalance=Account balance ObjectsRef=Source object ref CAHTF=Total purchase vendor before tax @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Sell journal ACCOUNTING_PURCHASE_JOURNAL=Purchase journal @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups ByYear=By year NotMatch=Not Set -DeleteMvt=Delete Ledger lines +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=Year to delete DelJournal=Journal to delete -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Finance journal ExpenseReportsJournal=Expense reports journal DescFinanceJournal=Finance journal including all the types of payments by bank account -DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Account for VAT not defined ThirdpartyAccountNotDefined=Account for third party not defined ProductAccountNotDefined=Account for product not defined @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu %s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Export draft journal @@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Chart of accounts Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang index 0d3a7174232..f1c41a3b62b 100644 --- a/htdocs/langs/sw_SW/admin.lang +++ b/htdocs/langs/sw_SW/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=Edition of field %s FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=LDAP Setup LDAPGlobalParameters=Global parameters @@ -1670,7 +1672,7 @@ AdvancedEditor=Advanced editor ActivateFCKeditor=Activate advanced editor for: FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services) FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing) FCKeditorForUserSignature=WYSIWIG creation/edition of user signature FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting 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 user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup diff --git a/htdocs/langs/sw_SW/banks.lang b/htdocs/langs/sw_SW/banks.lang index 75f9549dca5..9500a5b8b2e 100644 --- a/htdocs/langs/sw_SW/banks.lang +++ b/htdocs/langs/sw_SW/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=Miscellaneous payments ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA mandate YourSEPAMandate=Your SEPA mandate FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/sw_SW/categories.lang b/htdocs/langs/sw_SW/categories.lang index 9bb71984ecf..ba37a43b4ec 100644 --- a/htdocs/langs/sw_SW/categories.lang +++ b/htdocs/langs/sw_SW/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup CategorieRecursiv=Link with parent tag/category automatically CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=Add the following product/service +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Show tag/category ByDefaultInList=By default in list ChooseCategory=Choose category -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/sw_SW/companies.lang b/htdocs/langs/sw_SW/companies.lang index 92674363ced..dadff6a7894 100644 --- a/htdocs/langs/sw_SW/companies.lang +++ b/htdocs/langs/sw_SW/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof Id 1 (Federal number) ProfId4CH=Prof Id 2 (Commercial Record number) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof Id 1 (R.U.T.) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr) ProfId2DE=Prof Id 2 (USt.-Nr) ProfId3DE=Prof Id 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof Id 1 (CIF/NIF) ProfId2ES=Prof Id 2 (Social security number) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (Collegiate number) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof Id 1 (SIREN) ProfId2FR=Prof Id 2 (SIRET) ProfId3FR=Prof Id 3 (NAF, old APE) ProfId4FR=Prof Id 4 (RCS/RM) -ProfId5FR=- +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Registration Number ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX) ProfId4IN=Prof Id 4 ProfId5IN=Prof Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Business permit) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (R.C.) ProfId2MA=Id prof. 2 (Patente) ProfId3MA=Id prof. 3 (I.F.) ProfId4MA=Id prof. 4 (C.N.S.S.) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof Id 1 (R.F.C). ProfId2MX=Prof Id 2 (R..P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK nummer ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof Id 2 (Social security number) ProfId3PT=Prof Id 3 (Commercial Record number) ProfId4PT=Prof Id 4 (Conservatory) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof Id 1 (OGRN) ProfId2RU=Prof Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s). NorProspectNorCustomer=Not prospect, nor customer JuridicalStatus=Legal Entity Type +Workforce=Workforce Staff=Employees ProspectLevelShort=Potential ProspectLevel=Prospect potential @@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor PaymentTypeBoth=Payment Type - Customer and Vendor MulticurrencyUsed=Use Multicurrency MulticurrencyCurrency=Currency +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/sw_SW/hrm.lang b/htdocs/langs/sw_SW/hrm.lang index 6cc7f6bef24..3b8f137e103 100644 --- a/htdocs/langs/sw_SW/hrm.lang +++ b/htdocs/langs/sw_SW/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=Employees Employee=Employee NewEmployee=New employee +ListOfEmployees=List of employees diff --git a/htdocs/langs/sw_SW/languages.lang b/htdocs/langs/sw_SW/languages.lang index ee8df25c9ec..dbecd23ad26 100644 --- a/htdocs/langs/sw_SW/languages.lang +++ b/htdocs/langs/sw_SW/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Kihispania (Paraguay) Language_es_PE=Spanish (Peru) Language_es_PR=Kihispania (Puerto Rico) +Language_es_US=Spanish (USA) Language_es_UY=Spanish (Uruguay) Language_es_GT=Spanish (Guatemala) Language_es_VE=Spanish (Venezuela) diff --git a/htdocs/langs/sw_SW/main.lang b/htdocs/langs/sw_SW/main.lang index 0af5c66f0e0..96c68cdcfa3 100644 --- a/htdocs/langs/sw_SW/main.lang +++ b/htdocs/langs/sw_SW/main.lang @@ -155,6 +155,7 @@ RemoveLink=Remove link AddToDraft=Add to draft Update=Update Close=Close +CloseAs=Set status to CloseBox=Remove widget from your dashboard Confirm=Confirm ConfirmSendCardByMail=Do you really want to send the content of this card by mail to %s? @@ -196,6 +197,7 @@ ReOpen=Re-Open Upload=Upload ToLink=Link Select=Select +SelectAll=Select all Choose=Choose Resize=Resize ResizeOrCrop=Resize or Crop @@ -256,6 +258,7 @@ Cards=Cards Card=Card Now=Now HourStart=Start hour +Deadline=Deadline Date=Date DateAndHour=Date and hour DateToday=Today's date @@ -264,8 +267,10 @@ DateStart=Start date DateEnd=End date DateCreation=Creation date DateCreationShort=Creat. date +IPCreation=Creation IP DateModification=Modification date DateModificationShort=Modif. date +IPModification=Modification IP DateLastModification=Latest modification date DateValidation=Validation date DateClosing=Closing date @@ -319,6 +324,7 @@ Morning=Morning Afternoon=Afternoon Quadri=Quadri MonthOfDay=Month of the day +DaysOfWeek=Days of week HourShort=H MinuteShort=mn Rate=Rate @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency MulticurrencyAmountHT=Amount (excl. tax), original currency MulticurrencyAmountTTC=Amount (inc. of tax), original currency MulticurrencyAmountVAT=Amount tax, original currency +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Amount tax 2 AmountLT2=Amount tax 3 AmountLT1ES=Amount RE @@ -487,6 +494,7 @@ By=By From=From FromDate=From FromLocation=From +at=at to=to To=to and=and @@ -509,6 +517,7 @@ Draft=Draft Drafts=Drafts StatusInterInvoiced=Invoiced Validated=Validated +ValidatedToProduce=Validated (To produce) Opened=Open OpenAll=Open (All) ClosedAll=Closed (All) @@ -655,6 +664,7 @@ Response=Response Priority=Priority SendByMail=Send by email MailSentBy=Email sent by +NotSent=Not sent TextUsedInTheMessageBody=Email body SendAcknowledgementByMail=Send confirmation email SendMail=Send email @@ -836,6 +846,7 @@ ListOfTemplates=List of templates Gender=Gender Genderman=Man Genderwoman=Woman +Genderother=Other ViewList=List view ViewGantt=Gantt view ViewKanban=Kanban view @@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous Calendar=Calendar GroupBy=Group by... ViewFlatList=View flat list +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Remove string '%s' SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at https://transifex.com/projects/p/dolibarr/ to add your improvements. DirectDownloadLink=Direct download link (public/external) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments SearchIntoExpenseReports=Expense reports SearchIntoLeaves=Leave SearchIntoTickets=Tickets +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Vendor payments +SearchIntoMiscPayments=Miscellaneous payments CommentLink=Comments NbComments=Number of comments CommentPage=Comments space @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Information Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Date of birth +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/sw_SW/mrp.lang b/htdocs/langs/sw_SW/mrp.lang index 863793063a0..f018be890cc 100644 --- a/htdocs/langs/sw_SW/mrp.lang +++ b/htdocs/langs/sw_SW/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/sw_SW/website.lang b/htdocs/langs/sw_SW/website.lang index 4b5294d5e43..03e042e4be6 100644 --- a/htdocs/langs/sw_SW/website.lang +++ b/htdocs/langs/sw_SW/website.lang @@ -31,7 +31,7 @@ AddWebsite=Add website Webpage=Web page/container AddPage=Add page/container HomePage=Home Page -PageContainer=Page/container +PageContainer=Page PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. 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. SiteDeleted=Web site '%s' deleted @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=RSS Feed RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/th_TH/accountancy.lang b/htdocs/langs/th_TH/accountancy.lang index bef58b499b2..4c4d303f11c 100644 --- a/htdocs/langs/th_TH/accountancy.lang +++ b/htdocs/langs/th_TH/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Default for service DefaultForProduct=Default for product CantSuggest=Can't suggest AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s -ConfigAccountingExpert=การกำหนดค่าของบัญชีโมดูลผู้เชี่ยวชาญ +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Journalization -Journaux=วารสาร +Journals=วารสาร JournalFinancial=วารสารการเงิน BackToChartofaccounts=กลับผังบัญชี Chartofaccounts=ผังบัญชี +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Current dedicated account AssignDedicatedAccountingAccount=New account to assign InvoiceLabel=Invoice label @@ -33,8 +35,8 @@ OtherInfo=Other information DeleteCptCategory=Remove accounting account from group ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group? JournalizationInLedgerStatus=Status of journalization -AlreadyInGeneralLedger=Already journalized in ledgers -NotYetInGeneralLedger=Not yet journalized in ledgers +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group DetailByAccount=Show detail by account AccountWithNonZeroValues=Accounts with non-zero values @@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC CountriesNotInEEC=Countries not in EEC CountriesInEECExceptMe=Countries in EEC except %s CountriesExceptMe=All countries except %s -AccountantFiles=Export accounting documents +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup @@ -79,7 +83,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) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Select active chart of accounts ChangeAndLoad=Change and load Addanaccount=เพิ่มบัญชีบัญชี @@ -89,6 +93,8 @@ SubledgerAccount=Subledger account SubledgerAccountLabel=Subledger account label ShowAccountingAccount=Show accounting account ShowAccountingJournal=Show accounting journal +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Accounting account suggested MenuDefaultAccounts=Default accounts MenuBankAccounts=บัญชีเงินฝากธนาคาร @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding CreateMvts=Create new transaction UpdateMvts=Modification of a transaction ValidTransaction=Validate transaction -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=Ledger +BookkeepingSubAccount=Subledger AccountBalance=Account balance ObjectsRef=Source object ref CAHTF=Total purchase vendor before tax @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=ขายวารสาร ACCOUNTING_PURCHASE_JOURNAL=วารสารการสั่งซื้อ @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups ByYear=โดยปี NotMatch=Not Set -DeleteMvt=Delete Ledger lines +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=Year to delete DelJournal=Journal to delete -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Finance journal ExpenseReportsJournal=Expense reports journal DescFinanceJournal=Finance journal including all the types of payments by bank account -DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Account for VAT not defined ThirdpartyAccountNotDefined=Account for third party not defined ProductAccountNotDefined=Account for product not defined @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu %s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Export draft journal @@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Chart of accounts Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang index a8c5c2991ab..c50cf3e78cf 100644 --- a/htdocs/langs/th_TH/admin.lang +++ b/htdocs/langs/th_TH/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=ฉบับของสนาม% s FillThisOnlyIfRequired=ตัวอย่าง: 2 (กรอกข้อมูลเฉพาะในกรณีที่เขตเวลาชดเชยปัญหาที่มีประสบการณ์) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member MemberSendInformationByMailByDefault=ช่องทำเครื่องหมายยืนยันที่จะส่งอีเมลไปยังสมาชิก (การตรวจสอบหรือการสมัครสมาชิกใหม่) เป็นตามค่าเริ่มต้น VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=ติดตั้ง LDAP LDAPGlobalParameters=พารามิเตอร์ทั่วโลก @@ -1670,7 +1672,7 @@ AdvancedEditor=ตกแต่ง ActivateFCKeditor=เปิดใช้งานขั้นสูงสำหรับบรรณาธิการ: FCKeditorForCompany=WYSIWIG สร้าง / ฉบับคำอธิบายองค์ประกอบและทราบ (ยกเว้นผลิตภัณฑ์ / บริการ) FCKeditorForProduct=สร้าง WYSIWIG / รุ่นของผลิตภัณฑ์ / คำอธิบายการบริการและการบันทึก -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= สร้าง WYSIWIG / รุ่นสำหรับ eMailings มวล (Tools-> ส่งอีเมล) FCKeditorForUserSignature=สร้าง WYSIWIG / ฉบับลายเซ็นของผู้ใช้ FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting 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 user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view ##### Clicktodial ##### ClickToDialSetup=คลิกเพื่อกดติดตั้งโมดูล diff --git a/htdocs/langs/th_TH/banks.lang b/htdocs/langs/th_TH/banks.lang index 2f7f880ef42..fd3ab8f2696 100644 --- a/htdocs/langs/th_TH/banks.lang +++ b/htdocs/langs/th_TH/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=Miscellaneous payments ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA mandate YourSEPAMandate=Your SEPA mandate FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/th_TH/categories.lang b/htdocs/langs/th_TH/categories.lang index 6c0b56b024b..1e978741186 100644 --- a/htdocs/langs/th_TH/categories.lang +++ b/htdocs/langs/th_TH/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=แท็ก / ประเภทการติดตั้ง CategorieRecursiv=การเชื่อมโยงที่มีแท็กแม่ / หมวดหมู่โดยอัตโนมัติ CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=เพิ่มสินค้า / บริการดังต่อไปนี้ +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=แสดงแท็ก / หมวดหมู่ ByDefaultInList=โดยค่าเริ่มต้นในรายการ ChooseCategory=Choose category -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/th_TH/companies.lang b/htdocs/langs/th_TH/companies.lang index acdb1123b2d..698f595ebaf 100644 --- a/htdocs/langs/th_TH/companies.lang +++ b/htdocs/langs/th_TH/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=ศหมายเลข 1 (USt. -IdNr) ProfId2AT=ศหมายเลข 2 (USt. -Nr) ProfId3AT=ศหมายเลข 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=ศหมายเลข 1 (เอบี) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=ศหมายเลข 1 (หมายเลขมืออาชี ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao เทศบาล) ProfId4BR=ซีพีเอฟ #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=ศหมายเลข 1 (หมายเลขของรัฐบาลกลาง) ProfId4CH=ศหมายเลข 2 (Record พาณิชย์จำนวน) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=ศหมายเลข 1 (RUT) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=ศหมายเลข 1 (USt. -IdNr) ProfId2DE=ศหมายเลข 2 (USt. -Nr) ProfId3DE=ศหมายเลข 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=ศหมายเลข 1 (CIF / NIF) ProfId2ES=ศหมายเลข 2 (หมายเลขประกันสังคม) ProfId3ES=ศหมายเลข 3 (CNAE) ProfId4ES=ศหมายเลข 4 (วิทยาลัยจำนวน) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=ศหมายเลข 1 (ไซเรน) ProfId2FR=ศหมายเลข 2 (SIRET) ProfId3FR=ศหมายเลข 3 (NAF, APE เก่า) ProfId4FR=ศหมายเลข 4 (RCS / RM) -ProfId5FR=- +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=ทะเบียนเลขที่ ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=ศหมายเลข 3 (SRVC ภาษี) ProfId4IN=ศหมายเลข 4 ProfId5IN=Id ศ 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Business permit) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=ศ Id 1 (RC) ProfId2MA=ศ Id 2 (Patente) ProfId3MA=ศ Id 3 (IF) ProfId4MA=ศ Id 4 (CNSS) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Id ศที่ 1 (RFC) ProfId2MX=ศหมายเลข 2 (R..P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK Nummer ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=ศหมายเลข 1 (NIPC) ProfId2PT=ศหมายเลข 2 (หมายเลขประกันสังคม) ProfId3PT=ศหมายเลข 3 (Record พาณิชย์จำนวน) ProfId4PT=ศหมายเลข 4 (เรือน) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=ศหมายเลข 1 (OGRN) ProfId2RU=ศหมายเลข 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi ErrorVATCheckMS_UNAVAILABLE=ตรวจสอบไม่ได้ บริการตรวจสอบไม่ได้ให้โดยรัฐสมาชิก (% s) NorProspectNorCustomer=Not prospect, nor customer JuridicalStatus=Legal Entity Type +Workforce=Workforce Staff=Employees ProspectLevelShort=ที่อาจเกิดขึ้น ProspectLevel=Prospect ที่มีศักยภาพ @@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor PaymentTypeBoth=Payment Type - Customer and Vendor MulticurrencyUsed=Use Multicurrency MulticurrencyCurrency=เงินตรา +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/th_TH/hrm.lang b/htdocs/langs/th_TH/hrm.lang index 1139da27b97..d449dc659a7 100644 --- a/htdocs/langs/th_TH/hrm.lang +++ b/htdocs/langs/th_TH/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=Employees Employee=ลูกจ้าง NewEmployee=New employee +ListOfEmployees=List of employees diff --git a/htdocs/langs/th_TH/languages.lang b/htdocs/langs/th_TH/languages.lang index 85ebcd69f94..da1747a0a47 100644 --- a/htdocs/langs/th_TH/languages.lang +++ b/htdocs/langs/th_TH/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=สเปน (ปารากวัย) Language_es_PE=เสปน (เปรู) Language_es_PR=สเปน (เปอร์โตริโก) +Language_es_US=Spanish (USA) Language_es_UY=Spanish (Uruguay) Language_es_GT=Spanish (Guatemala) Language_es_VE=Spanish (Venezuela) diff --git a/htdocs/langs/th_TH/main.lang b/htdocs/langs/th_TH/main.lang index 0ed430072db..71d84671325 100644 --- a/htdocs/langs/th_TH/main.lang +++ b/htdocs/langs/th_TH/main.lang @@ -155,6 +155,7 @@ RemoveLink=Remove link AddToDraft=Add to draft Update=ปรับปรุง Close=ใกล้ +CloseAs=Set status to CloseBox=Remove widget from your dashboard Confirm=ยืนยัน ConfirmSendCardByMail=Do you really want to send the content of this card by mail to %s? @@ -196,6 +197,7 @@ ReOpen=Re: เปิด Upload=Upload ToLink=ลิงค์ Select=เลือก +SelectAll=Select all Choose=เลือก Resize=การปรับขนาด ResizeOrCrop=Resize or Crop @@ -256,6 +258,7 @@ Cards=การ์ด Card=บัตร Now=ตอนนี้ HourStart=เริ่มต้นชั่วโมง +Deadline=Deadline Date=วันที่ DateAndHour=วันที่และชั่วโมง DateToday=Today's date @@ -264,8 +267,10 @@ DateStart=วันที่เริ่มต้น DateEnd=วันที่สิ้นสุด DateCreation=วันที่สร้าง DateCreationShort=Creat. date +IPCreation=Creation IP DateModification=วันที่แก้ไข DateModificationShort=Modif วันที่ +IPModification=Modification IP DateLastModification=Latest modification date DateValidation=วันที่ตรวจสอบ DateClosing=วันปิดสมุดทะเบียน @@ -319,6 +324,7 @@ Morning=ตอนเช้า Afternoon=บ่าย Quadri=Quadri MonthOfDay=เดือนของวัน +DaysOfWeek=Days of week HourShort=H MinuteShort=ล้าน Rate=ประเมิน @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency MulticurrencyAmountHT=Amount (excl. tax), original currency MulticurrencyAmountTTC=Amount (inc. of tax), original currency MulticurrencyAmountVAT=Amount tax, original currency +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=จำนวนเงินภาษี 2 AmountLT2=จำนวนเงินภาษี 3 AmountLT1ES=จำนวน RE @@ -487,6 +494,7 @@ By=โดย From=จาก FromDate=จาก FromLocation=จาก +at=at to=ไปยัง To=ไปยัง and=และ @@ -509,6 +517,7 @@ Draft=ร่าง Drafts=ร่าง StatusInterInvoiced=Invoiced Validated=ผ่านการตรวจสอบ +ValidatedToProduce=Validated (To produce) Opened=เปิด OpenAll=Open (All) ClosedAll=Closed (All) @@ -655,6 +664,7 @@ Response=คำตอบ Priority=ลำดับความสำคัญ SendByMail=Send by email MailSentBy=อีเมล์ที่ส่งมาจาก +NotSent=ส่งไม่ได้ TextUsedInTheMessageBody=ร่างกายอีเมล์ SendAcknowledgementByMail=Send confirmation email SendMail=ส่งอีเมล @@ -836,6 +846,7 @@ ListOfTemplates=รายชื่อของแม่แบบ Gender=Gender Genderman=คน Genderwoman=หญิง +Genderother=อื่น ๆ ViewList=มุมมองรายการ ViewGantt=Gantt view ViewKanban=Kanban view @@ -877,6 +888,8 @@ Miscellaneous=เบ็ดเตล็ด Calendar=ปฏิทิน GroupBy=Group by... ViewFlatList=View flat list +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Remove string '%s' SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at https://transifex.com/projects/p/dolibarr/ to add your improvements. DirectDownloadLink=Direct download link (public/external) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments SearchIntoExpenseReports=รายงานค่าใช้จ่าย SearchIntoLeaves=Leave SearchIntoTickets=Tickets +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Vendor payments +SearchIntoMiscPayments=Miscellaneous payments CommentLink=ความคิดเห็น NbComments=Number of comments CommentPage=Comments space @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=ข้อมูล Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=วันเกิด +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/th_TH/mrp.lang b/htdocs/langs/th_TH/mrp.lang index 863793063a0..f018be890cc 100644 --- a/htdocs/langs/th_TH/mrp.lang +++ b/htdocs/langs/th_TH/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/th_TH/website.lang b/htdocs/langs/th_TH/website.lang index 551758dc204..d905e966535 100644 --- a/htdocs/langs/th_TH/website.lang +++ b/htdocs/langs/th_TH/website.lang @@ -31,7 +31,7 @@ AddWebsite=Add website Webpage=Web page/container AddPage=Add page/container HomePage=Home Page -PageContainer=Page/container +PageContainer=หน้า PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. 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. SiteDeleted=Web site '%s' deleted @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=RSS Feed RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/tr_TR/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang index 73ebe7cb877..9abb47b577e 100644 --- a/htdocs/langs/tr_TR/accountancy.lang +++ b/htdocs/langs/tr_TR/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Hizmet için varsayılan DefaultForProduct=Ürün için varsayılan CantSuggest=Öneri yok AccountancySetupDoneFromAccountancyMenu=Muhasebenin çoğu kurulumu %s menüsünden yapılır. -ConfigAccountingExpert=Hesap uzmanı modülü yapılandırması +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Günlükleme -Journaux=Günlükler +Journals=Günlükler JournalFinancial=Mali günlükler BackToChartofaccounts=Hesap planı cirosu Chartofaccounts=Hesap planı +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Mevcut özel hesap AssignDedicatedAccountingAccount=Atanacak yeni hesap InvoiceLabel=Fatura etiketi @@ -33,8 +35,8 @@ OtherInfo=Diğer Bilgiler DeleteCptCategory=Muhasebe hesabını gruptan kaldırın ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group? JournalizationInLedgerStatus=Günlükleme durumu -AlreadyInGeneralLedger=Zaten defterlerde tutulmuş -NotYetInGeneralLedger=Henüz büyük defterde muhasebeleştirilmedi +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group DetailByAccount=Hesaba göre detayları göster AccountWithNonZeroValues=Sıfır olmayan değerlere sahip hesaplar @@ -43,7 +45,9 @@ CountriesInEEC=Avrupa Ekonomi Topluluğu'ndaki Ülkeler CountriesNotInEEC=Avrupa Ekonomi Topluluğu'nda Olmayan Ülkeler CountriesInEECExceptMe=%s hariç Avrupa Ekonomi Topluluğu ülkeleri CountriesExceptMe=%s hariç tüm ülkeler -AccountantFiles=Muhasebe belgelerini dışa aktarma +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Müşteriler için ana muhasebe hesabı kurulumda tanımlı değil MainAccountForSuppliersNotDefined=Tedarikçiler için ana muhasebe hesabı kurulumda tanımlı değil @@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=ADIM %s: İşlemler ekleyin ya da mevcut işlemleri d AccountancyAreaDescClosePeriod=ADIM %s: Dönemi kapatın, böylece ileride bir değişiklik yapamayız. -TheJournalCodeIsNotDefinedOnSomeBankAccount=Kurulumda zorunlu bir adım tamamlanmadı (muhasebe kodu günlüğü tüm banka hesapları için tanımlı değil) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Etkin hesap planı seç ChangeAndLoad=Değiştir ve yükle Addanaccount=Muhasebe hesabı ekle @@ -89,6 +93,8 @@ SubledgerAccount=Yardımcı defter hesabı SubledgerAccountLabel=Subledger account label ShowAccountingAccount=Muhasebe hesabını göster ShowAccountingJournal=Muhasebe günlüğünü göster +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Önerilen muhasebe hesabı MenuDefaultAccounts=Varsayılan hesaplar MenuBankAccounts=Banka hesapları @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Gider raporu bağlama CreateMvts=Yeni işlem oluştur UpdateMvts=İşlemi değiştir ValidTransaction=İşlemi doğrula -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=Büyük Defter +BookkeepingSubAccount=Subledger AccountBalance=Hesap bakiyesi ObjectsRef=Source object ref CAHTF=Total purchase vendor before tax @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Satış günlüğü ACCOUNTING_PURCHASE_JOURNAL=Alış günlüğü @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Muhasebe hesabının bekletilmesi DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=Önceden tanımlanmış gruplar tarafından ByPersonalizedAccountGroups=Kişiselleştirilmiş gruplar tarafından ByYear=Yıla göre NotMatch=Ayarlanmamış -DeleteMvt=Büyük defter satırlarını sil +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=Silinecek yıl DelJournal=Silinecek günlük -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Finance journal ExpenseReportsJournal=Gider raporları günlüğü DescFinanceJournal=Banka hesabından yapılan tüm ödeme türlerini içeren finans günlüğü -DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=KDV için hesap tanımlı değil ThirdpartyAccountNotDefined=Üçüncü parti için hesap tanımlı değil ProductAccountNotDefined=Ürün için hesap tanımlı değil @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu %s - %s NumberOfAccountancyEntries=Girişlerin sayısı NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Export draft journal @@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Hesap planı Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang index 720e1c1573f..fc4430e87ca 100644 --- a/htdocs/langs/tr_TR/admin.lang +++ b/htdocs/langs/tr_TR/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Üçüncü Partiler için tercih edilen gönderme yöntemini isteyin. FieldEdition=%s Alanının düzenlenmesi FillThisOnlyIfRequired=Örnek: +2 (saat dilimi farkını yalnız zaman farkı sorunları yaşıyorsanız kullanın) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Yeni bir üye oluşturmak için e-posta gereklidir MemberSendInformationByMailByDefault=Üyelere onay epostası (doğrulama ya da yeni abonelik) göndermek için onay kutusu varsayılan olarak açıktır VisitorCanChooseItsPaymentMode=Ziyaretçi kişi mevcut ödeme türlerinden birini seçebilir MEMBER_REMINDER_EMAIL=Süresi dolmuş abonelikler için mail yoluyla otomatik hatırlatıcıyı etkinleştir. Not: Hatırlatıcıyı gönderebilmek için %s modülü etkinleştirilmiş ve doğru bir şekilde yapılandırılmış olmalıdır. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=LDAP Kurulumu LDAPGlobalParameters=Genel parametreler @@ -1670,7 +1672,7 @@ AdvancedEditor=Gelişmiş editör ActivateFCKeditor=Gelişmiş düzenleyiciyi şunun için etkinleştir: FCKeditorForCompany=Öğe açıklamaları ve notları için WYSIWIG oluşturma/düzenleme (ürünler/hizmetler hariç) FCKeditorForProduct=Ürünlerin/hizmetlerin açıklamaları ve notlar için WYSIWIG oluşturma/düzenleme -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= Toplu e-postalar için WYSIWIG oluşturma/düzenleme (Araçlar->E-postalamalar) FCKeditorForUserSignature=Kullanıcı imzasının WYSIWIG olarak oluşturulması/düzenlenmesi FCKeditorForMail=Tüm mailler için WYSIWIG oluşturma/düzenleme (Araçlar->E-postalamalar hariç) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting 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 user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Sesli bildirimi etkinleştir +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Bağlantılı nesneyi gündem görünümünde göster ##### Clicktodial ##### ClickToDialSetup=TıklaAra modülü kurulumu diff --git a/htdocs/langs/tr_TR/banks.lang b/htdocs/langs/tr_TR/banks.lang index e056ab77f35..00371009950 100644 --- a/htdocs/langs/tr_TR/banks.lang +++ b/htdocs/langs/tr_TR/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Çeşitli ödeme VariousPayments=Çeşitli ödemeler ShowVariousPayment=Çeşitli ödemeyi göster AddVariousPayment=Çeşitli ödeme ekle +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA yetkisi YourSEPAMandate=SEPA yetkiniz FindYourSEPAMandate=Bu, firmamızın bankanıza otomatik ödeme talimatı verebilme yetkisi için SEPA yetkinizdir. İmzalayarak iade edin (imzalı belgeyi tarayarak) veya e-mail ile gönderin @@ -176,3 +179,4 @@ BankColorizeMovement=Hareketleri renklendir BankColorizeMovementDesc=Bu işlev etkinleştirilirse, borçlandırma veya kredi hareketleri için belirli bir arka plan rengi seçebilirsiniz BankColorizeMovementName1=Borç hareketi için arka plan rengi BankColorizeMovementName2=Kredi hareketi için arka plan rengi +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/tr_TR/categories.lang b/htdocs/langs/tr_TR/categories.lang index 7e182978296..94a510df93f 100644 --- a/htdocs/langs/tr_TR/categories.lang +++ b/htdocs/langs/tr_TR/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Etiket/kategori ayarları CategorieRecursiv=Otomatik ana etiketli/kategorili bağlantı CategorieRecursivHelp=Bu seçenek aktifse, alt bir kategoriye ürün eklediğinizde bu ürün aynı zamanda üst kategoriye de eklenecektir. AddProductServiceIntoCategory=Aşağıdaki ürünü/hizmeti ekle +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Etiketi/kategoriyi göster ByDefaultInList=B listede varsayılana göre ChooseCategory=Kategori seç -StocksCategoriesArea=Depo Kategorileri Alanı -ActionCommCategoriesArea=Etkinlik Kategorileri Alanı -WebsitePagesCategoriesArea=Sayfa-Konteyner Kategorileri Alanı +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Kategoriler için veya operatör kullanın diff --git a/htdocs/langs/tr_TR/companies.lang b/htdocs/langs/tr_TR/companies.lang index 9b5651fd60d..1a0b08308e6 100644 --- a/htdocs/langs/tr_TR/companies.lang +++ b/htdocs/langs/tr_TR/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof No 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof No 1 (Profesyonel no) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=CNPJ ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof No 1 (Federal no) ProfId4CH=Prof No 2 (Ticaret Kayıt numarası) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof Id 1 (RUT) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof No 1 (Ust.-IdNr) ProfId2DE=Prof No 2 (Ust.-Nr) ProfId3DE=Prof No 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof Id 1 (CIF/NIF) ProfId2ES=Prof Id 2 (Sosyal güvenlik numarası) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (Üst noı) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof No 1 (SIREN) ProfId2FR=Prof No 2 (SIRET) ProfId3FR=Prof No 3 (NAF, eski APE) ProfId4FR=Prof No 4 (RCS/RM) -ProfId5FR=Prof Id 5 +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Kayıt numarası ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 ProfId4IN=Prof Id 4 ProfId5IN=Prof Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Lüksemburg) ProfId2LU=Id. prof. 2 (İş izini) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (RC) ProfId2MA=Id prof. 2 (patente) ProfId3MA=Id prof. 3 (IF) ProfId4MA=Id prof. 4 (CNSS) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof. Id 1 (RFC). ProfId2MX=Prof Id 2 (R.. P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK nummer ProfId2NL=- ProfId3NL=- ProfId4NL=- -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof No 1 (NIPC) ProfId2PT=Prof No 2 (Sosyal güvenlik numarası) ProfId3PT=Prof No 3 (Ticaret Kayıt numarası) ProfId4PT=Prof No 4 (Conservatory) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof Id 1 (OGRN) ProfId2RU=Prof Id 2 (INN) diff --git a/htdocs/langs/tr_TR/hrm.lang b/htdocs/langs/tr_TR/hrm.lang index d7878459e1f..93d2a7e56da 100644 --- a/htdocs/langs/tr_TR/hrm.lang +++ b/htdocs/langs/tr_TR/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=Çalışanlar Employee=Çalışan NewEmployee=Yeni çalışan +ListOfEmployees=Çalışanlar listesi diff --git a/htdocs/langs/tr_TR/languages.lang b/htdocs/langs/tr_TR/languages.lang index 9946ec0de27..3d30573a595 100644 --- a/htdocs/langs/tr_TR/languages.lang +++ b/htdocs/langs/tr_TR/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=İspanyolca (Panama) Language_es_PY=İspanyolca (Paraguay) Language_es_PE=İspanyolca (Peru) Language_es_PR=İspanyolca (Porto Riko) +Language_es_US=Spanish (USA) Language_es_UY=İspanyolca (Uruguay) Language_es_GT=Spanish (Guatemala) Language_es_VE=İspanyolca (Venezuela) diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang index c2b51ead847..ecc538bf1dc 100644 --- a/htdocs/langs/tr_TR/main.lang +++ b/htdocs/langs/tr_TR/main.lang @@ -155,6 +155,7 @@ RemoveLink=Bağlantıyı kaldır AddToDraft=Taslağa ekle Update=Güncelle Close=Kapat +CloseAs=Durumu buna ayarlayın CloseBox=Gösterge panelinizden ekran etiketini kaldırın Confirm=Onayla ConfirmSendCardByMail=Bu kartın içeriğini e-posta ile %s adresine gerçekten göndermek istiyor musunuz? @@ -196,6 +197,7 @@ ReOpen=Yeniden aç Upload=Yükle ToLink=Bağlantıla Select=Seç +SelectAll=Select all Choose=Seç Resize=Yeniden boyutlandır ResizeOrCrop=Yeniden Boyutlandır veya Kırp @@ -256,6 +258,7 @@ Cards=Kartlar Card=Kart Now=Şimdi HourStart=Başlama saati +Deadline=Deadline Date=Tarih DateAndHour=Tarih ve saat DateToday=Bugünün tarihi @@ -264,8 +267,10 @@ DateStart=Başlangıç tarihi DateEnd=Bitiş tarihi DateCreation=Oluşturma tarihi DateCreationShort=Oluşt. tarihi +IPCreation=Creation IP DateModification=Değiştirme tarihi DateModificationShort=Değiş. tarihi +IPModification=Modification IP DateLastModification=Son değiştirilme tarihi DateValidation=Doğrulama tarihi DateClosing=Kapanış tarihi @@ -319,6 +324,7 @@ Morning=Sabah Afternoon=Öğleden sonra Quadri=Çeyrek MonthOfDay=Ayın günü +DaysOfWeek=Days of week HourShort=H MinuteShort=ay Rate=Oran @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Ödeme tutarı, orijinal para birimi MulticurrencyAmountHT=Tutar (KDV hariç), ilk para birimi MulticurrencyAmountTTC=Tutar (vergi dahil), ilk para birimi MulticurrencyAmountVAT=Toplam vergi, ilk para birimi +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Vergi 2 tutarı AmountLT2=Vergi 3 tutarı AmountLT1ES=RE Tutarı @@ -487,6 +494,7 @@ By=Tarafından From=Başlama FromDate=Gönderen FromLocation=Gönderen +at=at to=Bitiş To=Bitiş and=ve @@ -509,6 +517,7 @@ Draft=Taslak Drafts=Taslaklar StatusInterInvoiced=Faturalanmış Validated=Doğrulanmış +ValidatedToProduce=Validated (To produce) Opened=Açık OpenAll=Açık (Tümü) ClosedAll=Kapalı (Tümü) @@ -655,6 +664,7 @@ Response=Yanıt Priority=Öncelik SendByMail=E-posta ile gönder MailSentBy=E-postayı gönderen +NotSent=Gönderilmedi TextUsedInTheMessageBody=E-posta gövdesi SendAcknowledgementByMail=Onay e-postası gönder SendMail=E-posta gönder @@ -836,6 +846,7 @@ ListOfTemplates=Şablon listesi Gender=Cinsiyet Genderman=Adam Genderwoman=Kadın +Genderother=Diğer ViewList=Liste görünümü ViewGantt=Gantt view ViewKanban=Kanban view @@ -877,6 +888,8 @@ Miscellaneous=Çeşitli Calendar=Takvim GroupBy=Gruplandır... ViewFlatList=Düz listeyi incele +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString='%s' dizisini kaldır SomeTranslationAreUncomplete=Sunulan dillerden bazıları sadece kısmen çevrilmiş olabilir veya çeviri hatalarına sahip olabilir. Lütfen https://transifex.com/projects/p/dolibarr/ adresi üzerinden kayıt yaparak dilinizdeki çeviri hatalarını düzeltmeye yardımcı olun ve yazılımın gelişimine katkıda bulunun. DirectDownloadLink=Direkt indirme linki (herkese açık/harici) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Müşteri sevkiyatları SearchIntoExpenseReports=Gider raporları SearchIntoLeaves=İzin SearchIntoTickets=Destek Bildirimleri +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Tedarikçi ödemeleri +SearchIntoMiscPayments=Çeşitli ödemeler CommentLink=Açıklamalar NbComments=Yorum sayısı CommentPage=Yorumlar alanı @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Bilgi Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Doğum Tarihi +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/tr_TR/mrp.lang b/htdocs/langs/tr_TR/mrp.lang index cddec242985..b68f85e39d9 100644 --- a/htdocs/langs/tr_TR/mrp.lang +++ b/htdocs/langs/tr_TR/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/tr_TR/website.lang b/htdocs/langs/tr_TR/website.lang index fedbdb7da88..65378d92d62 100644 --- a/htdocs/langs/tr_TR/website.lang +++ b/htdocs/langs/tr_TR/website.lang @@ -31,7 +31,7 @@ AddWebsite=Web sitesi ekle Webpage=Web sayfası/kapsayıcı AddPage=Sayfa/kapsayıcı ekle HomePage=Ana Sayfa -PageContainer=Sayfa/kapsayıcı +PageContainer=Sayfa PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. RequestedPageHasNoContentYet=İstenen %s kimlik numaralı sayfa henüz bir içeriğe sahip değil, önbellek dosyası .tpl.php kaldırıldı. Bu sorunu çözmek için sayfa içeriğini düzenleyin. SiteDeleted='%s' web sitesi silindi @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=RSS Besleme RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/uk_UA/accountancy.lang b/htdocs/langs/uk_UA/accountancy.lang index af0f2f5295b..f99b2780e48 100644 --- a/htdocs/langs/uk_UA/accountancy.lang +++ b/htdocs/langs/uk_UA/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Default for service DefaultForProduct=Default for product CantSuggest=Can't suggest AccountancySetupDoneFromAccountancyMenu=Більшість налаштувань обліку здійснюється у меню %s -ConfigAccountingExpert=Configuration of the module accounting expert +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Журналізація -Journaux=Журнали +Journals=Журнали JournalFinancial=Фінансові журнали BackToChartofaccounts=Return chart of accounts Chartofaccounts=Chart of accounts +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Current dedicated account AssignDedicatedAccountingAccount=New account to assign InvoiceLabel=Invoice label @@ -33,8 +35,8 @@ OtherInfo=Інша інформація DeleteCptCategory=Видалити обліковий рахунок з групи ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group? JournalizationInLedgerStatus=Статус журналізації -AlreadyInGeneralLedger=Уже журнальовані в головній книзі -NotYetInGeneralLedger=Ще не журнальовані в головній книзі +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Група порожня, перевірте налаштування персоніфікованої облікової групи DetailByAccount=Показати відомості по рахунку AccountWithNonZeroValues=Рахунки з ненульовими значеннями @@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC CountriesNotInEEC=Countries not in EEC CountriesInEECExceptMe=Countries in EEC except %s CountriesExceptMe=All countries except %s -AccountantFiles=Export accounting documents +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup @@ -79,7 +83,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) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Select active chart of accounts ChangeAndLoad=Change and load Addanaccount=Add an accounting account @@ -89,6 +93,8 @@ SubledgerAccount=Subledger account SubledgerAccountLabel=Subledger account label ShowAccountingAccount=Show accounting account ShowAccountingJournal=Show accounting journal +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Accounting account suggested MenuDefaultAccounts=Default accounts MenuBankAccounts=Bank accounts @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding CreateMvts=Create new transaction UpdateMvts=Modification of a transaction ValidTransaction=Validate transaction -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=Ledger +BookkeepingSubAccount=Subledger AccountBalance=Account balance ObjectsRef=Source object ref CAHTF=Total purchase vendor before tax @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Sell journal ACCOUNTING_PURCHASE_JOURNAL=Purchase journal @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups ByYear=By year NotMatch=Not Set -DeleteMvt=Delete Ledger lines +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=Year to delete DelJournal=Journal to delete -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Finance journal ExpenseReportsJournal=Expense reports journal DescFinanceJournal=Finance journal including all the types of payments by bank account -DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Account for VAT not defined ThirdpartyAccountNotDefined=Account for third party not defined ProductAccountNotDefined=Account for product not defined @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu %s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Export draft journal @@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Chart of accounts Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang index 9e5f47242d8..d04882db68a 100644 --- a/htdocs/langs/uk_UA/admin.lang +++ b/htdocs/langs/uk_UA/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=Edition of field %s FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=LDAP Setup LDAPGlobalParameters=Global parameters @@ -1670,7 +1672,7 @@ AdvancedEditor=Advanced editor ActivateFCKeditor=Activate advanced editor for: FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services) FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing) FCKeditorForUserSignature=WYSIWIG creation/edition of user signature FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting 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 user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup diff --git a/htdocs/langs/uk_UA/banks.lang b/htdocs/langs/uk_UA/banks.lang index 1049496a2d7..676fdcd7500 100644 --- a/htdocs/langs/uk_UA/banks.lang +++ b/htdocs/langs/uk_UA/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=Miscellaneous payments ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA mandate YourSEPAMandate=Your SEPA mandate FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/uk_UA/categories.lang b/htdocs/langs/uk_UA/categories.lang index 9bb71984ecf..ba37a43b4ec 100644 --- a/htdocs/langs/uk_UA/categories.lang +++ b/htdocs/langs/uk_UA/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup CategorieRecursiv=Link with parent tag/category automatically CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=Add the following product/service +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Show tag/category ByDefaultInList=By default in list ChooseCategory=Choose category -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/uk_UA/companies.lang b/htdocs/langs/uk_UA/companies.lang index cba4ef7dbda..7bb65732df0 100644 --- a/htdocs/langs/uk_UA/companies.lang +++ b/htdocs/langs/uk_UA/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof Id 1 (Federal number) ProfId4CH=Prof Id 2 (Commercial Record number) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof Id 1 (R.U.T.) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr) ProfId2DE=Prof Id 2 (USt.-Nr) ProfId3DE=Prof Id 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof Id 1 (CIF/NIF) ProfId2ES=Prof Id 2 (Social security number) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (Collegiate number) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof Id 1 (SIREN) ProfId2FR=Prof Id 2 (SIRET) ProfId3FR=Prof Id 3 (NAF, old APE) ProfId4FR=Prof Id 4 (RCS/RM) -ProfId5FR=- +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Registration Number ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX) ProfId4IN=Prof Id 4 ProfId5IN=Prof Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Business permit) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (R.C.) ProfId2MA=Id prof. 2 (Patente) ProfId3MA=Id prof. 3 (I.F.) ProfId4MA=Id prof. 4 (C.N.S.S.) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof Id 1 (R.F.C). ProfId2MX=Prof Id 2 (R..P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK nummer ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof Id 2 (Social security number) ProfId3PT=Prof Id 3 (Commercial Record number) ProfId4PT=Prof Id 4 (Conservatory) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof Id 1 (OGRN) ProfId2RU=Prof Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s). NorProspectNorCustomer=Not prospect, nor customer JuridicalStatus=Legal Entity Type +Workforce=Workforce Staff=Employees ProspectLevelShort=Potential ProspectLevel=Prospect potential @@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor PaymentTypeBoth=Payment Type - Customer and Vendor MulticurrencyUsed=Use Multicurrency MulticurrencyCurrency=Currency +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/uk_UA/hrm.lang b/htdocs/langs/uk_UA/hrm.lang index 6cc7f6bef24..3b8f137e103 100644 --- a/htdocs/langs/uk_UA/hrm.lang +++ b/htdocs/langs/uk_UA/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=Employees Employee=Employee NewEmployee=New employee +ListOfEmployees=List of employees diff --git a/htdocs/langs/uk_UA/languages.lang b/htdocs/langs/uk_UA/languages.lang index 79195062114..40a7330e156 100644 --- a/htdocs/langs/uk_UA/languages.lang +++ b/htdocs/langs/uk_UA/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Іспанська (Панама) Language_es_PY=Іспанська (Парагвай) Language_es_PE=Іспанська (Перу) Language_es_PR=Іспанська (Пуерто-Ріко) +Language_es_US=Spanish (USA) Language_es_UY=Іспанська (Уругвай) Language_es_GT=Spanish (Guatemala) Language_es_VE=Іспанська (Венесуела) diff --git a/htdocs/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang index 62ebc2ddfd0..2f257767cd7 100644 --- a/htdocs/langs/uk_UA/main.lang +++ b/htdocs/langs/uk_UA/main.lang @@ -155,6 +155,7 @@ RemoveLink=Remove link AddToDraft=Add to draft Update=Update Close=Close +CloseAs=Set status to CloseBox=Remove widget from your dashboard Confirm=Confirm ConfirmSendCardByMail=Do you really want to send the content of this card by mail to %s? @@ -196,6 +197,7 @@ ReOpen=Re-Open Upload=Upload ToLink=Link Select=Select +SelectAll=Select all Choose=Choose Resize=Resize ResizeOrCrop=Resize or Crop @@ -256,6 +258,7 @@ Cards=Cards Card=Card Now=Now HourStart=Start hour +Deadline=Deadline Date=Date DateAndHour=Дата та час DateToday=Today's date @@ -264,8 +267,10 @@ DateStart=Start date DateEnd=End date DateCreation=Creation date DateCreationShort=Creat. date +IPCreation=Creation IP DateModification=Modification date DateModificationShort=Modif. date +IPModification=Modification IP DateLastModification=Latest modification date DateValidation=Validation date DateClosing=Closing date @@ -319,6 +324,7 @@ Morning=Morning Afternoon=Afternoon Quadri=Quadri MonthOfDay=Month of the day +DaysOfWeek=Days of week HourShort=H MinuteShort=mn Rate=Rate @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency MulticurrencyAmountHT=Amount (excl. tax), original currency MulticurrencyAmountTTC=Amount (inc. of tax), original currency MulticurrencyAmountVAT=Amount tax, original currency +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Amount tax 2 AmountLT2=Amount tax 3 AmountLT1ES=Amount RE @@ -487,6 +494,7 @@ By=By From=Продавець FromDate=Продавець FromLocation=Продавець +at=at to=to To=to and=and @@ -509,6 +517,7 @@ Draft=Проект Drafts=Drafts StatusInterInvoiced=Invoiced Validated=Підтверджений +ValidatedToProduce=Validated (To produce) Opened=Open OpenAll=Open (All) ClosedAll=Closed (All) @@ -655,6 +664,7 @@ Response=Response Priority=Priority SendByMail=Send by email MailSentBy=Email sent by +NotSent=Not sent TextUsedInTheMessageBody=Email body SendAcknowledgementByMail=Send confirmation email SendMail=Send email @@ -836,6 +846,7 @@ ListOfTemplates=List of templates Gender=Gender Genderman=Man Genderwoman=Woman +Genderother=Інший ViewList=List view ViewGantt=Gantt view ViewKanban=Kanban view @@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous Calendar=Календар GroupBy=Group by... ViewFlatList=View flat list +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Remove string '%s' SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at https://transifex.com/projects/p/dolibarr/ to add your improvements. DirectDownloadLink=Direct download link (public/external) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments SearchIntoExpenseReports=Expense reports SearchIntoLeaves=Leave SearchIntoTickets=Заявки +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Vendor payments +SearchIntoMiscPayments=Miscellaneous payments CommentLink=Comments NbComments=Number of comments CommentPage=Comments space @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Information Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Date of birth +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/uk_UA/mrp.lang b/htdocs/langs/uk_UA/mrp.lang index 863793063a0..f018be890cc 100644 --- a/htdocs/langs/uk_UA/mrp.lang +++ b/htdocs/langs/uk_UA/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/uk_UA/website.lang b/htdocs/langs/uk_UA/website.lang index ae15864ce90..ebd59dac2fa 100644 --- a/htdocs/langs/uk_UA/website.lang +++ b/htdocs/langs/uk_UA/website.lang @@ -31,7 +31,7 @@ AddWebsite=Add website Webpage=Web page/container AddPage=Add page/container HomePage=Home Page -PageContainer=Page/container +PageContainer=Page PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. 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. SiteDeleted=Web site '%s' deleted @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=RSS Feed RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/uz_UZ/accountancy.lang b/htdocs/langs/uz_UZ/accountancy.lang index 7b59e33b296..3211a0b62df 100644 --- a/htdocs/langs/uz_UZ/accountancy.lang +++ b/htdocs/langs/uz_UZ/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Default for service DefaultForProduct=Default for product CantSuggest=Can't suggest AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s -ConfigAccountingExpert=Configuration of the module accounting expert +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Journalization -Journaux=Journals +Journals=Journals JournalFinancial=Financial journals BackToChartofaccounts=Return chart of accounts Chartofaccounts=Chart of accounts +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Current dedicated account AssignDedicatedAccountingAccount=New account to assign InvoiceLabel=Invoice label @@ -33,8 +35,8 @@ OtherInfo=Other information DeleteCptCategory=Remove accounting account from group ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group? JournalizationInLedgerStatus=Status of journalization -AlreadyInGeneralLedger=Already journalized in ledgers -NotYetInGeneralLedger=Not yet journalized in ledgers +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group DetailByAccount=Show detail by account AccountWithNonZeroValues=Accounts with non-zero values @@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC CountriesNotInEEC=Countries not in EEC CountriesInEECExceptMe=Countries in EEC except %s CountriesExceptMe=All countries except %s -AccountantFiles=Export accounting documents +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup @@ -79,7 +83,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) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Select active chart of accounts ChangeAndLoad=Change and load Addanaccount=Add an accounting account @@ -89,6 +93,8 @@ SubledgerAccount=Subledger account SubledgerAccountLabel=Subledger account label ShowAccountingAccount=Show accounting account ShowAccountingJournal=Show accounting journal +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Accounting account suggested MenuDefaultAccounts=Default accounts MenuBankAccounts=Bank accounts @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding CreateMvts=Create new transaction UpdateMvts=Modification of a transaction ValidTransaction=Validate transaction -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=Ledger +BookkeepingSubAccount=Subledger AccountBalance=Account balance ObjectsRef=Source object ref CAHTF=Total purchase vendor before tax @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Sell journal ACCOUNTING_PURCHASE_JOURNAL=Purchase journal @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups ByYear=By year NotMatch=Not Set -DeleteMvt=Delete Ledger lines +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=Year to delete DelJournal=Journal to delete -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Finance journal ExpenseReportsJournal=Expense reports journal DescFinanceJournal=Finance journal including all the types of payments by bank account -DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Account for VAT not defined ThirdpartyAccountNotDefined=Account for third party not defined ProductAccountNotDefined=Account for product not defined @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu %s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Export draft journal @@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Chart of accounts Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang index 0d3a7174232..f1c41a3b62b 100644 --- a/htdocs/langs/uz_UZ/admin.lang +++ b/htdocs/langs/uz_UZ/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=Edition of field %s FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=LDAP Setup LDAPGlobalParameters=Global parameters @@ -1670,7 +1672,7 @@ AdvancedEditor=Advanced editor ActivateFCKeditor=Activate advanced editor for: FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services) FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing) FCKeditorForUserSignature=WYSIWIG creation/edition of user signature FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting 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 user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup diff --git a/htdocs/langs/uz_UZ/banks.lang b/htdocs/langs/uz_UZ/banks.lang index 75f9549dca5..9500a5b8b2e 100644 --- a/htdocs/langs/uz_UZ/banks.lang +++ b/htdocs/langs/uz_UZ/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=Miscellaneous payments ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA mandate YourSEPAMandate=Your SEPA mandate FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/uz_UZ/categories.lang b/htdocs/langs/uz_UZ/categories.lang index 9bb71984ecf..ba37a43b4ec 100644 --- a/htdocs/langs/uz_UZ/categories.lang +++ b/htdocs/langs/uz_UZ/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup CategorieRecursiv=Link with parent tag/category automatically CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=Add the following product/service +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Show tag/category ByDefaultInList=By default in list ChooseCategory=Choose category -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/uz_UZ/companies.lang b/htdocs/langs/uz_UZ/companies.lang index 92674363ced..dadff6a7894 100644 --- a/htdocs/langs/uz_UZ/companies.lang +++ b/htdocs/langs/uz_UZ/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof Id 1 (Federal number) ProfId4CH=Prof Id 2 (Commercial Record number) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof Id 1 (R.U.T.) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr) ProfId2DE=Prof Id 2 (USt.-Nr) ProfId3DE=Prof Id 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof Id 1 (CIF/NIF) ProfId2ES=Prof Id 2 (Social security number) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (Collegiate number) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof Id 1 (SIREN) ProfId2FR=Prof Id 2 (SIRET) ProfId3FR=Prof Id 3 (NAF, old APE) ProfId4FR=Prof Id 4 (RCS/RM) -ProfId5FR=- +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Registration Number ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX) ProfId4IN=Prof Id 4 ProfId5IN=Prof Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Business permit) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (R.C.) ProfId2MA=Id prof. 2 (Patente) ProfId3MA=Id prof. 3 (I.F.) ProfId4MA=Id prof. 4 (C.N.S.S.) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof Id 1 (R.F.C). ProfId2MX=Prof Id 2 (R..P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK nummer ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof Id 2 (Social security number) ProfId3PT=Prof Id 3 (Commercial Record number) ProfId4PT=Prof Id 4 (Conservatory) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof Id 1 (OGRN) ProfId2RU=Prof Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s). NorProspectNorCustomer=Not prospect, nor customer JuridicalStatus=Legal Entity Type +Workforce=Workforce Staff=Employees ProspectLevelShort=Potential ProspectLevel=Prospect potential @@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor PaymentTypeBoth=Payment Type - Customer and Vendor MulticurrencyUsed=Use Multicurrency MulticurrencyCurrency=Currency +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/uz_UZ/hrm.lang b/htdocs/langs/uz_UZ/hrm.lang index 6cc7f6bef24..3b8f137e103 100644 --- a/htdocs/langs/uz_UZ/hrm.lang +++ b/htdocs/langs/uz_UZ/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=Employees Employee=Employee NewEmployee=New employee +ListOfEmployees=List of employees diff --git a/htdocs/langs/uz_UZ/languages.lang b/htdocs/langs/uz_UZ/languages.lang index cc80b9f1719..ba187326705 100644 --- a/htdocs/langs/uz_UZ/languages.lang +++ b/htdocs/langs/uz_UZ/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Spanish (Paraguay) Language_es_PE=Spanish (Peru) Language_es_PR=Spanish (Puerto Rico) +Language_es_US=Spanish (USA) Language_es_UY=Spanish (Uruguay) Language_es_GT=Spanish (Guatemala) Language_es_VE=Spanish (Venezuela) diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang index 127dffb310d..cc76ba88d89 100644 --- a/htdocs/langs/uz_UZ/main.lang +++ b/htdocs/langs/uz_UZ/main.lang @@ -155,6 +155,7 @@ RemoveLink=Remove link AddToDraft=Add to draft Update=Update Close=Close +CloseAs=Set status to CloseBox=Remove widget from your dashboard Confirm=Confirm ConfirmSendCardByMail=Do you really want to send the content of this card by mail to %s? @@ -196,6 +197,7 @@ ReOpen=Re-Open Upload=Upload ToLink=Link Select=Select +SelectAll=Select all Choose=Choose Resize=Resize ResizeOrCrop=Resize or Crop @@ -256,6 +258,7 @@ Cards=Cards Card=Card Now=Now HourStart=Start hour +Deadline=Deadline Date=Date DateAndHour=Date and hour DateToday=Today's date @@ -264,8 +267,10 @@ DateStart=Start date DateEnd=End date DateCreation=Creation date DateCreationShort=Creat. date +IPCreation=Creation IP DateModification=Modification date DateModificationShort=Modif. date +IPModification=Modification IP DateLastModification=Latest modification date DateValidation=Validation date DateClosing=Closing date @@ -319,6 +324,7 @@ Morning=Morning Afternoon=Afternoon Quadri=Quadri MonthOfDay=Month of the day +DaysOfWeek=Days of week HourShort=H MinuteShort=mn Rate=Rate @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency MulticurrencyAmountHT=Amount (excl. tax), original currency MulticurrencyAmountTTC=Amount (inc. of tax), original currency MulticurrencyAmountVAT=Amount tax, original currency +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Amount tax 2 AmountLT2=Amount tax 3 AmountLT1ES=Amount RE @@ -487,6 +494,7 @@ By=By From=From FromDate=From FromLocation=From +at=at to=to To=to and=and @@ -509,6 +517,7 @@ Draft=Draft Drafts=Drafts StatusInterInvoiced=Invoiced Validated=Validated +ValidatedToProduce=Validated (To produce) Opened=Open OpenAll=Open (All) ClosedAll=Closed (All) @@ -655,6 +664,7 @@ Response=Response Priority=Priority SendByMail=Send by email MailSentBy=Email sent by +NotSent=Not sent TextUsedInTheMessageBody=Email body SendAcknowledgementByMail=Send confirmation email SendMail=Send email @@ -836,6 +846,7 @@ ListOfTemplates=List of templates Gender=Gender Genderman=Man Genderwoman=Woman +Genderother=Other ViewList=List view ViewGantt=Gantt view ViewKanban=Kanban view @@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous Calendar=Calendar GroupBy=Group by... ViewFlatList=View flat list +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Remove string '%s' SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at https://transifex.com/projects/p/dolibarr/ to add your improvements. DirectDownloadLink=Direct download link (public/external) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments SearchIntoExpenseReports=Expense reports SearchIntoLeaves=Leave SearchIntoTickets=Tickets +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Vendor payments +SearchIntoMiscPayments=Miscellaneous payments CommentLink=Comments NbComments=Number of comments CommentPage=Comments space @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Information Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Date of birth +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/uz_UZ/mrp.lang b/htdocs/langs/uz_UZ/mrp.lang index 863793063a0..f018be890cc 100644 --- a/htdocs/langs/uz_UZ/mrp.lang +++ b/htdocs/langs/uz_UZ/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/uz_UZ/website.lang b/htdocs/langs/uz_UZ/website.lang index 4b5294d5e43..03e042e4be6 100644 --- a/htdocs/langs/uz_UZ/website.lang +++ b/htdocs/langs/uz_UZ/website.lang @@ -31,7 +31,7 @@ AddWebsite=Add website Webpage=Web page/container AddPage=Add page/container HomePage=Home Page -PageContainer=Page/container +PageContainer=Page PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. 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. SiteDeleted=Web site '%s' deleted @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=RSS Feed RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/vi_VN/accountancy.lang b/htdocs/langs/vi_VN/accountancy.lang index 0c59133574f..0426ce8fd0b 100644 --- a/htdocs/langs/vi_VN/accountancy.lang +++ b/htdocs/langs/vi_VN/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Mặc định cho dịch vụ DefaultForProduct=Mặc định cho sản phẩm CantSuggest=Không thể gợi ý AccountancySetupDoneFromAccountancyMenu=Hầu hết các thiết lập của kế toán được thực hiện từ menu %s -ConfigAccountingExpert=Cấu hình của các chuyên gia kế toán mô-đun +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Ghi sổ nhật ký -Journaux=Sổ nhật ký kế toán +Journals=Sổ nhật ký kế toán JournalFinancial=Nhật ký tài chính BackToChartofaccounts=Quay trở lại hệ thống tài khoản Chartofaccounts=Hệ thống tài khoản +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Tài khoản vãng lai chuyên dụng AssignDedicatedAccountingAccount=Tài khoản mới để chỉ định InvoiceLabel=Nhãn hóa đơn @@ -33,8 +35,8 @@ OtherInfo=Thông tin khác DeleteCptCategory=Xóa tài khoản kế toán khỏi nhóm ConfirmDeleteCptCategory=Bạn có chắc chắn muốn xóa tài khoản kế toán này khỏi nhóm tài khoản kế toán không? JournalizationInLedgerStatus=Tình trạng của sổ nhật ký -AlreadyInGeneralLedger=Đã được ghi nhật ký trong sổ cái -NotYetInGeneralLedger=Chưa được ghi nhật ký trong sổ cải +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Nhóm trống rỗng, kiểm tra thiết lập nhóm kế toán đã được cá nhân hóa DetailByAccount=Hiển thị chi tiết theo tài khoản AccountWithNonZeroValues=Tài khoản có giá trị khác không @@ -43,7 +45,9 @@ CountriesInEEC=Các nước trong EEC CountriesNotInEEC=Các nước không thuộc EEC CountriesInEECExceptMe=Các quốc gia trong EEC ngoại trừ %s CountriesExceptMe=Tất cả các quốc gia trừ %s -AccountantFiles=Xuât dữ các chứng từ kế toán +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Tài khoản kế toán chính cho khách hàng không được định nghĩa trong thiết lập MainAccountForSuppliersNotDefined=Tài khoản kế toán chính cho các nhà cung cấp không được định nghĩa trong thiết lập @@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=BƯỚC %s: Thêm hoặc chỉnh sửa các giao dị AccountancyAreaDescClosePeriod=BƯỚC %s: Đóng khoảng thời gian để chúng ta không thể sửa đổi trong tương lai. -TheJournalCodeIsNotDefinedOnSomeBankAccount=Một bắt buộc trong thiết lập chưa hoàn tất (mã nhật ký kế toán không được xác định cho tất cả các tài khoản ngân hàng) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Chọn biểu đồ tài khoản đang hoạt động ChangeAndLoad=Thay đổi và tải Addanaccount=Thêm một tài khoản kế toán @@ -89,6 +93,8 @@ SubledgerAccount=Tài khoản sổ phụ SubledgerAccountLabel=Nhãn tài khoản sổ phụ ShowAccountingAccount=Hiển thị tài khoản kế toán ShowAccountingJournal=Hiển thị nhật ký kế toán +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Đề xuất tài khoản kế toán MenuDefaultAccounts=Tài khoản mặc định MenuBankAccounts=Tài khoản ngân hàng @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Ràng buộc báo cáo chi phí CreateMvts=Tạo giao dịch mới UpdateMvts=Sửa đổi giao dịch ValidTransaction=Xác nhận giao dịch -WriteBookKeeping=Đăng ký giao dịch trong Sổ Cái +WriteBookKeeping=Register transactions in accounting Bookkeeping=Sổ cái +BookkeepingSubAccount=Subledger AccountBalance=Số dư tài khoản ObjectsRef=Tham chiếu đối tượng nguồn CAHTF=Tổng số mua từ nhà cung cấp trước thuế @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Vô hiệu hóa ghi trực tiếp giao dịch trong t ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Cho phép xuất dữ liệu bản nháp trong nhật ký ACCOUNTANCY_COMBO_FOR_AUX=Bật danh sách kết hợp cho tài khoản công ty con (có thể chậm nếu bạn có nhiều bên thứ ba) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Nhật ký bán hàng ACCOUNTING_PURCHASE_JOURNAL=Nhật ký mua hàng @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Tài khoản kế toán chờ DONATION_ACCOUNTINGACCOUNT=Tài khoản kế toán cho đăng ký quyên góp. ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Tài khoản kế toán để đăng ký tham gia +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Tài khoản kế toán theo mặc định cho các sản phẩm đã mua (được sử dụng nếu không được xác định trong bảng sản phẩm) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Tài khoản kế toán theo mặc định cho các sản phẩm đã mua trong EEC (được sử dụng nếu không được xác định trong bảng sản phẩm) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Tài khoản kế toán theo mặc định cho các sản phẩm đã mua và được nhập ra khỏi EEC (được sử dụng nếu không được xác định trong bảng sản phẩm) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=Theo nhóm được xác định trước ByPersonalizedAccountGroups=Theo nhóm đã cá nhân hóa ByYear=Theo năm NotMatch=Không được thiết lập -DeleteMvt=Xóa các dòng Sổ cái +DeleteMvt=Delete some operation lines from accounting DelMonth=Tháng cần xóa DelYear=Năm cần xóa DelJournal=Nhật ký cần xóa -ConfirmDeleteMvt=Điều này sẽ xóa tất cả các dòng của Sổ cái cho năm / tháng và / hoặc từ một nhật ký cụ thể (Ít nhất một tiêu chí là bắt buộc). Bạn sẽ phải sử dụng lại tính năng 'Đăng ký trong kế toán' để có bản ghi bị xóa trong sổ cái. -ConfirmDeleteMvtPartial=Điều này sẽ xóa giao dịch khỏi Sổ Cái (tất cả các dòng liên quan đến cùng một giao dịch sẽ bị xóa) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Nhật ký tài chính ExpenseReportsJournal=Nhật ký báo cáo chi phí DescFinanceJournal=Nhật ký tài chính bao gồm tất cả các loại thanh toán bằng tài khoản ngân hàng -DescJournalOnlyBindedVisible=Đây là chế độ xem bản ghi được ràng buộc với tài khoản kế toán và có thể được ghi vào Sổ Cái. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Tài khoản cho thuế VAT chưa được xác định ThirdpartyAccountNotDefined=Tài khoản cho bên thứ ba chưa được xác định ProductAccountNotDefined=Tài khoản cho sản phẩm chưa được xác định @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=Nhật ký này đã được sử dụng AccountingAccountForSalesTaxAreDefinedInto=Lưu ý: Tài khoản kế toán thuế VAT được xác định trong menu %s - %s NumberOfAccountancyEntries=Số lượng mục NumberOfAccountancyMovements=Số lượng kết chuyển +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Xuất dữ liệu bản nháp nhật ký @@ -326,6 +339,8 @@ Modelcsv_configurable=Xuất dữ liệu cấu hình CSV Modelcsv_FEC=Xuất dữ liệu FEC Modelcsv_Sage50_Swiss=Xuất dữ liệu cho Sage 50 Thụy Sĩ Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=ID Hệ thống tài khoản ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang index dc39c610f25..ef784047979 100644 --- a/htdocs/langs/vi_VN/admin.lang +++ b/htdocs/langs/vi_VN/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=Thành phần PHP %s được tải PreloadOPCode=Tải sẵn OPCode được sử dụng AddRefInList=Hiển thị danh sách thông tin tham chiếu khách hàng/nhà cung cấp (chọn danh sách hoặc combobox) và hầu hết các siêu liên kết.
Các bên thứ ba sẽ xuất hiện với định dạng tên là "CC12345 - SC45678 - Công ty lớn." thay vì "Công ty lớn". AddAdressInList=Hiển thị danh sách thông tin địa chỉ khách hàng/nhà cung cấp (chọn danh sách hoặc hộp tổ hợp)
Các bên thứ ba sẽ xuất hiện với định dạng tên là "The Big Company corp. - 21 jump street 123456 Big town - USA" thay vì "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Yêu cầu phương thức vận chuyển ưa thích cho bên thứ ba. FieldEdition=Biên soạn của trường %s FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Yêu cầu email để tạo thành viên mới MemberSendInformationByMailByDefault=Hộp kiểm để gửi thư xác nhận cho các thành viên (xác nhận hoặc đăng ký mới) là theo mặc định VisitorCanChooseItsPaymentMode=Khách truy cập có thể chọn từ các chế độ thanh toán có sẵn MEMBER_REMINDER_EMAIL=Cho phép nhắc nhở tự động qua email của các thuê bao đã hết hạn. Lưu ý: Mô-đun %s phải được bật và thiết lập chính xác để gửi lời nhắc. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=Thiết lập LDAP LDAPGlobalParameters=Các thông số toàn cầu @@ -1670,7 +1672,7 @@ AdvancedEditor=Trình soạn thảo nâng cao ActivateFCKeditor=Kích hoạt trình soạn thảo nâng cao cho: FCKeditorForCompany=WYSIWIG tạo / sửa của các yếu tố mô tả và ghi chú (trừ các sản phẩm / dịch vụ) FCKeditorForProduct=WYSIWIG tạo / sửa của sản phẩm / dịch vụ mô tả và ghi chú -FCKeditorForProductDetails=WYSIWIG tạo/soạn sản phẩm cho tất cả các thực thể (đề xuất, đơn đặt hàng, hóa đơn, v.v ...). Cảnh báo: Không nên sử dụng tùy chọn này cho trường hợp này vì nó có thể gây ra sự cố với các ký tự đặc biệt và định dạng trang khi xây dựng tệp PDF. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Công cụ->eMailing) FCKeditorForUserSignature=WYSIWIG tạo / sửa chữ ký người sử dụng FCKeditorForMail=WYSIWIG tạo/soạn thảo cho tất cả thư (ngoại trừ Công cụ-> Gửi thư điện tử) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Tự động đặt giá trị mặc định này AGENDA_DEFAULT_FILTER_TYPE=Tự động đặt loại sự kiện này trong bộ lọc tìm kiếm của chế độ xem chương trình nghị sự AGENDA_DEFAULT_FILTER_STATUS=Tự động đặt trạng thái này cho các sự kiện trong bộ lọc tìm kiếm của chế độ xem chương trình nghị sự AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda -AGENDA_REMINDER_EMAIL=Bật nhắc nhở sự kiện bằng email (tùy chọn nhắc nhở / trì hoãn có thể được xác định trên mỗi sự kiện). Lưu ý: Mô-đun %s phải được bật và thiết lập chính xác để có lời nhắc được gửi ở tần số chính xác. -AGENDA_REMINDER_BROWSER=Bật nhắc nhở sự kiện trên trình duyệt của người dùng (khi đạt đến ngày sự kiện, mỗi người dùng có thể từ chối câu hỏi này từ câu hỏi xác nhận trình duyệt) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Bật thông báo âm thanh +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Hiển thị đối tượng được liên kết vào chế độ xem chương trình nghị sự ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup diff --git a/htdocs/langs/vi_VN/banks.lang b/htdocs/langs/vi_VN/banks.lang index 4e5a49b93db..162d7062272 100644 --- a/htdocs/langs/vi_VN/banks.lang +++ b/htdocs/langs/vi_VN/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Thanh toán khác VariousPayments=Các thanh toán khác ShowVariousPayment=Hiển thị thanh toán khác AddVariousPayment=Thêm thanh toán khác +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=Ủy quyền SEPA YourSEPAMandate=Ủy quyền SEPA của bạn FindYourSEPAMandate=Đây là ủy quyền SEPA của bạn để ủy quyền cho công ty chúng tôi thực hiện lệnh ghi nợ trực tiếp vào ngân hàng của bạn. Trả lại nó đã ký (quét tài liệu đã ký) hoặc gửi thư đến @@ -176,3 +179,4 @@ BankColorizeMovement=Tô màu cho các kết chuyển BankColorizeMovementDesc=Nếu chức năng này được bật, bạn có thể chọn màu nền cụ thể cho các kết chuyển ghi nợ hoặc tín dụng BankColorizeMovementName1=Màu nền cho kết chuyển ghi nợ BankColorizeMovementName2=Màu nền cho kết chuyển ghi có +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/vi_VN/categories.lang b/htdocs/langs/vi_VN/categories.lang index 903711aa4ce..bb15ed66bb6 100644 --- a/htdocs/langs/vi_VN/categories.lang +++ b/htdocs/langs/vi_VN/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Thiết lập thẻ/ danh mục CategorieRecursiv=Tự động liên kết với thẻ/ danh mục cha CategorieRecursivHelp=Nếu tùy chọn được bật, khi bạn thêm sản phẩm vào danh mục con, sản phẩm cũng sẽ được thêm vào danh mục cha. AddProductServiceIntoCategory=Thêm sản phẩm / dịch vụ sau đây +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Hiển thị thẻ/ danh mục ByDefaultInList=Theo mặc định trong danh sách ChooseCategory=Chọn danh mục -StocksCategoriesArea=Khu vực Danh mục Kho -ActionCommCategoriesArea=Khu vực danh mục sự kiện -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Sử dụng hoặc điều hành các danh mục diff --git a/htdocs/langs/vi_VN/companies.lang b/htdocs/langs/vi_VN/companies.lang index b826fca3864..e559f40ecb5 100644 --- a/htdocs/langs/vi_VN/companies.lang +++ b/htdocs/langs/vi_VN/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof Id 1 (Federal number) ProfId4CH=Prof Id 2 (Commercial Record number) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof Id 1 (R.U.T.) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr) ProfId2DE=Prof Id 2 (USt.-Nr) ProfId3DE=Prof Id 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof Id 1 (CIF/NIF) ProfId2ES=Prof Id 2 (Social security number) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (Collegiate number) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof Id 1 (SIREN) ProfId2FR=Prof Id 2 (SIRET) ProfId3FR=Prof Id 3 (NAF, old APE) ProfId4FR=Prof Id 4 (RCS/RM) -ProfId5FR=- +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Registration Number ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX) ProfId4IN=Prof Id 4 ProfId5IN=Prof Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Giấy phép kinh doanh) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (R.C.) ProfId2MA=Id prof. 2 (Patente) ProfId3MA=Id prof. 3 (I.F.) ProfId4MA=Id prof. 4 (C.N.S.S.) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof Id 1 (R.F.C). ProfId2MX=Prof Id 2 (R..P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK nummer ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof Id 2 (Social security number) ProfId3PT=Prof Id 3 (Commercial Record number) ProfId4PT=Prof Id 4 (Conservatory) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (NaN) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof Id 1 (OGRN) ProfId2RU=Prof Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=Bạn cũng có thể kiểm tra thủ công trên trang web ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s). NorProspectNorCustomer=Không phải triển vọng, cũng không phải khách hàng JuridicalStatus=Loại pháp nhân +Workforce=Workforce Staff=Nhân viên ProspectLevelShort=Tiềm năng ProspectLevel=KH tiềm năng @@ -456,3 +462,8 @@ PaymentTermsSupplier=Điều khoản thanh toán - Nhà cung cấp PaymentTypeBoth=Loại thanh toán - Khách hàng và nhà cung cấp MulticurrencyUsed=Sử dụng đa tiền tệ MulticurrencyCurrency=Tiền tệ +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/vi_VN/hrm.lang b/htdocs/langs/vi_VN/hrm.lang index 7977420fa15..cbac0b87e6e 100644 --- a/htdocs/langs/vi_VN/hrm.lang +++ b/htdocs/langs/vi_VN/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=Nhân viên Employee=Nhân viên NewEmployee=Tạo nhân viên +ListOfEmployees=List of employees diff --git a/htdocs/langs/vi_VN/languages.lang b/htdocs/langs/vi_VN/languages.lang index 78ad1328ac4..c9dd762ef9f 100644 --- a/htdocs/langs/vi_VN/languages.lang +++ b/htdocs/langs/vi_VN/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Tây Ban Nha (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_US=Spanish (USA) Language_es_UY=Tây Ban Nha (Uruguay) Language_es_GT=Spanish (Guatemala) Language_es_VE=Tây Ban Nha (Venezuela) diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang index 00071856294..4a0fe321d58 100644 --- a/htdocs/langs/vi_VN/main.lang +++ b/htdocs/langs/vi_VN/main.lang @@ -155,6 +155,7 @@ RemoveLink=Xóa liên kết AddToDraft=Thêm vào nháp Update=Cập nhật Close=Đóng +CloseAs=Đặt trạng thái thành CloseBox=Xóa widget khỏi bảng điều khiển của bạn Confirm=Xác nhận ConfirmSendCardByMail=Bạn có thực sự muốn gửi nội dung của thẻ này bằng thư đến %s không? @@ -196,6 +197,7 @@ ReOpen=Mở lại Upload=Tải lên ToLink=Liên kết Select=Chọn +SelectAll=Select all Choose=Lựa Resize=Đổi kích thước ResizeOrCrop=Thay đổi kích thước hoặc cắt @@ -256,6 +258,7 @@ Cards=Thẻ Card=Thẻ Now=Bây giờ HourStart=Giờ bắt đầu +Deadline=Deadline Date=Ngày DateAndHour=Ngày và giờ DateToday=Ngày hôm nay @@ -264,8 +267,10 @@ DateStart=Ngày bắt đầu DateEnd=Ngày kết thúc DateCreation=Ngày tạo DateCreationShort=Ngày tạo +IPCreation=Creation IP DateModification=Ngày điều chỉnh DateModificationShort=Ngày điều chỉnh +IPModification=Modification IP DateLastModification=Ngày sửa đổi mới nhất DateValidation=Ngày xác nhận DateClosing=Ngày kết thúc @@ -319,6 +324,7 @@ Morning=Sáng Afternoon=Chiều Quadri=Quý MonthOfDay=Tháng của ngày +DaysOfWeek=Days of week HourShort=H MinuteShort=mn Rate=Tỷ lệ @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Số tiền thanh toán, nguyên tệ MulticurrencyAmountHT=Số tiền (chưa thuế), nguyên tệ MulticurrencyAmountTTC=Số tiền (gồm thuế), nguyên tệ MulticurrencyAmountVAT=Số tiền thuế, nguyên tệ +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Số tiền thuế 2 AmountLT2=Số tiền thuế 3 AmountLT1ES=Amount RE @@ -487,6 +494,7 @@ By=Theo From=Từ FromDate=Từ FromLocation=Từ +at=at to=đến To=đến and=và @@ -509,6 +517,7 @@ Draft=Dự thảo Drafts=Dự thảo StatusInterInvoiced=Đã xuất hóa đơn Validated=Đã xác nhận +ValidatedToProduce=Validated (To produce) Opened=Mở OpenAll=Mở (Tất cả) ClosedAll=Đã đóng (Tất cả) @@ -655,6 +664,7 @@ Response=Đáp trả Priority=Ưu tiên SendByMail=Gửi bằng email MailSentBy=Email gửi bởi +NotSent=Chưa được gửi TextUsedInTheMessageBody=Thân email SendAcknowledgementByMail=Gửi email xác nhận SendMail=Gửi email @@ -836,6 +846,7 @@ ListOfTemplates=Danh sách các mẫu Gender=Giới tính Genderman=Nam Genderwoman=Nữ +Genderother=Khác ViewList=Danh sách xem ViewGantt=Xem dạng Gantt ViewKanban=Xem dạng Kanban @@ -877,6 +888,8 @@ Miscellaneous=Linh tinh Calendar=Lịch GroupBy=Nhóm bởi ... ViewFlatList=Xem danh sách phẳng +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Xóa chuỗi '%s' SomeTranslationAreUncomplete=Một số ngôn ngữ được cung cấp có thể chỉ được dịch một phần hoặc có thể có lỗi. Vui lòng giúp sửa ngôn ngữ của bạn bằng cách đăng ký tại https://transifex.com/projects/p/dolibarr/ để thêm các cải tiến của bạn. DirectDownloadLink=Liên kết tải xuống trực tiếp (public/external) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Lô hàng của khách hàng SearchIntoExpenseReports=Báo cáo chi tiêu SearchIntoLeaves=Nghỉ SearchIntoTickets=Vé +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Thanh toán của nhà cung cấp +SearchIntoMiscPayments=Thanh toán khác CommentLink=Chú thích NbComments=Số lượng nhận xét CommentPage=Không gian nhận xét @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Thông tin Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Ngày tháng năm sinh +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/vi_VN/mrp.lang b/htdocs/langs/vi_VN/mrp.lang index b0c45503e5b..5ca0bd1ddbf 100644 --- a/htdocs/langs/vi_VN/mrp.lang +++ b/htdocs/langs/vi_VN/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/vi_VN/website.lang b/htdocs/langs/vi_VN/website.lang index ac3e22bfd90..5d047fe8420 100644 --- a/htdocs/langs/vi_VN/website.lang +++ b/htdocs/langs/vi_VN/website.lang @@ -31,7 +31,7 @@ AddWebsite=Thêm trang web Webpage=Trang web / vùng chứa AddPage=Thêm trang / vùng chứa HomePage=Trang chủ -PageContainer=Trang / vùng chứa +PageContainer=Trang PreviewOfSiteNotYetAvailable=Xem trước trang web của bạn %s chưa có sẵn. Trước tiên, bạn phải ' Nhập mẫu trang web đầy đủ ' hoặc chỉ ' Thêm trang / vùng chứa '. RequestedPageHasNoContentYet=Trang được yêu cầu có id %s chưa có nội dung hoặc tệp bộ đệm .tpl.php đã bị xóa. Chỉnh sửa nội dung của trang để giải quyết điều này. SiteDeleted=Trang web '%s' đã bị xóa @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=RSS Feed RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/zh_CN/accountancy.lang b/htdocs/langs/zh_CN/accountancy.lang index 1a235bd6572..9a49f373c52 100644 --- a/htdocs/langs/zh_CN/accountancy.lang +++ b/htdocs/langs/zh_CN/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=默认服务 DefaultForProduct=默认产品 CantSuggest=无法建议 AccountancySetupDoneFromAccountancyMenu=大多数会计设置都是从​​菜单%s完成的 -ConfigAccountingExpert=会计专家模块的配置 +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=记帐 -Journaux=日记帐 +Journals=日记帐 JournalFinancial=财务总监日记帐 BackToChartofaccounts=返回会计科目表 Chartofaccounts=会计科目表 +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=当前专用帐户 AssignDedicatedAccountingAccount=要分配的新帐户 InvoiceLabel=发票标签 @@ -33,8 +35,8 @@ OtherInfo=其他信息 DeleteCptCategory=从组中删除会计帐户 ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group? JournalizationInLedgerStatus=记帐状态 -AlreadyInGeneralLedger=已经在分类账中记录 -NotYetInGeneralLedger=尚未在分类账中记录 +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=组为空，检查个性化会计组的设置 DetailByAccount=按帐户显示详细信息 AccountWithNonZeroValues=具有非零值的帐户 @@ -43,7 +45,9 @@ CountriesInEEC=欧共体国家 CountriesNotInEEC=非欧共体国家 CountriesInEECExceptMe=欧共体国家除了%s CountriesExceptMe=除%s以外的所有国家/地区 -AccountantFiles=Export accounting documents +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=未在设置中定义的顾客的主要会计科目 MainAccountForSuppliersNotDefined=未在设置中定义的供应商的主要会计科目 @@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=步骤%s：添加或编辑现有交易并生成报告 AccountancyAreaDescClosePeriod=STEP %s：关闭期间，以便禁止修改。 -TheJournalCodeIsNotDefinedOnSomeBankAccount=设置中的必要步骤未完成（未为所有银行帐户定义会计代码日记帐） +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=选择活动的会计科目表 ChangeAndLoad=改变和加载 Addanaccount=添加一个会计科目 @@ -89,6 +93,8 @@ SubledgerAccount=Subledger account SubledgerAccountLabel=Subledger account label ShowAccountingAccount=显示会计科目 ShowAccountingJournal=显示会计日常报表 +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=建议会计科目 MenuDefaultAccounts=默认帐户 MenuBankAccounts=银行帐户 @@ -110,8 +116,9 @@ ExpenseReportsVentilation=费用报告绑定 CreateMvts=创建新交易 UpdateMvts=修改交易 ValidTransaction=验证交易 -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=分类帐 +BookkeepingSubAccount=Subledger AccountBalance=账目平衡 ObjectsRef=源对象引用 CAHTF=Total purchase vendor before tax @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=禁止在银行帐户中直接记录交易 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=在日记帐上启用草稿导出 ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=销售日记帐 ACCOUNTING_PURCHASE_JOURNAL=采购日记帐 @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=会计科目-等待 DONATION_ACCOUNTINGACCOUNT=会计科目-登记捐款 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=按预定义的组 ByPersonalizedAccountGroups=通过个性化团体 ByYear=在今年 NotMatch=未设定 -DeleteMvt=删除分类帐行 +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=删除整年 DelJournal=日记帐删除 -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=这将从分类帐中删除该交易（将删除与同一交易相关的所有行） +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=财务账 ExpenseReportsJournal=费用报告日常报表 DescFinanceJournal=财务账包括全部银行账户付款类型 -DescJournalOnlyBindedVisible=这是记录的视图，它绑定到会计帐户并可以记录到分类帐中。 +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=未定义增值税的帐户 ThirdpartyAccountNotDefined=未定义的第三方帐户 ProductAccountNotDefined=未定义产品的帐户 @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=该日常报表已经使用 AccountingAccountForSalesTaxAreDefinedInto=注意：销售税的会计科目已定义到菜单 %s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=导出日常报表草稿 @@ -326,6 +339,8 @@ Modelcsv_configurable=导出CSV可配置 Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=会计科目表ID ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang index 338f79e1683..c84a23958aa 100644 --- a/htdocs/langs/zh_CN/admin.lang +++ b/htdocs/langs/zh_CN/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=%s 字段的编辑 FillThisOnlyIfRequired=例如：+2 (请只在时区错误问题出现时填写) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member MemberSendInformationByMailByDefault=设置向会员发送邮件确认(会员确认或添加订阅)复选框默认为启用 VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=LDAP 设置 LDAPGlobalParameters=全局参数 @@ -1670,7 +1672,7 @@ AdvancedEditor=高级编辑 ActivateFCKeditor=为以下为功能启用高级编辑器功能: FCKeditorForCompany=描述及注解采用所见即所得的方式建立或编辑(不含产品及服务) FCKeditorForProduct=产品/服务的描述及注解采用所见即所得的方式建立或编辑 -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= 以所见即所得方式创建/编辑群发邮件(工具->电邮寄送) FCKeditorForUserSignature=以所见即所得方式创建/编辑用户签名 FCKeditorForMail=所有邮件的WYSIWIG创建/版本（工具 - > eMailing除外） @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda -AGENDA_REMINDER_EMAIL=通过电子邮件启用事件提醒（可以在每个事件上定义提醒选项/延迟）。注意：必须启用模块 %s 并正确设置才能以正确的频率发送提醒。 -AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=启用声音通知 +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=将链接对象显示在议程视图中 ##### Clicktodial ##### ClickToDialSetup=点击拨号模块设置 diff --git a/htdocs/langs/zh_CN/banks.lang b/htdocs/langs/zh_CN/banks.lang index 6573e296ee9..6f2afe060cc 100644 --- a/htdocs/langs/zh_CN/banks.lang +++ b/htdocs/langs/zh_CN/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=杂项付款 ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA授权 YourSEPAMandate=您的SEPA授权 FindYourSEPAMandate=这是您的SEPA授权，授权我们公司向您的银行直接扣款。返回签名（扫描签名文档）或通过邮件发送给 @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/zh_CN/categories.lang b/htdocs/langs/zh_CN/categories.lang index 5015ed42455..dbd3530d85b 100644 --- a/htdocs/langs/zh_CN/categories.lang +++ b/htdocs/langs/zh_CN/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=标签/分类设置 CategorieRecursiv=自动链接到父标签/分类 CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=添加下面的产品/服务 +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=显示标签/分类 ByDefaultInList=按默认列表 ChooseCategory=选择类别 -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/zh_CN/companies.lang b/htdocs/langs/zh_CN/companies.lang index 4dc4159c7a0..d2a0362c3fa 100644 --- a/htdocs/langs/zh_CN/companies.lang +++ b/htdocs/langs/zh_CN/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (专业号码) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE(国家注册) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof Id 1 (Federal number) ProfId4CH=Prof Id 2 (Commercial Record number) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof Id 1 (R.U.T.) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr) ProfId2DE=Prof Id 2 (USt.-Nr) ProfId3DE=Prof Id 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof Id 1 (CIF/NIF) ProfId2ES=Prof Id 2 (社保号) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (Collegiate number) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof Id 1 (SIREN) ProfId2FR=Prof Id 2 (SIRET) ProfId3FR=Prof Id 3 (NAF, old APE) ProfId4FR=Prof Id 4 (RCS/RM) -ProfId5FR=教授标识5 +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Registration Number ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX) ProfId4IN=Prof Id 4 ProfId5IN=教授标识5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Business permit) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (R.C.) ProfId2MA=Id prof. 2 (Patente) ProfId3MA=Id prof. 3 (I.F.) ProfId4MA=Id prof. 4 (C.N.S.S.) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof Id 1 (R.F.C). ProfId2MX=Prof Id 2 (R..P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK nummer ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof Id 2 (社保号) ProfId3PT=Prof Id 3 (Commercial Record number) ProfId4PT=Prof Id 4 (Conservatory) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=钢筋混凝土 ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof Id 1 (OGRN) ProfId2RU=Prof Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi ErrorVATCheckMS_UNAVAILABLE=检查不可能的。检查服务是没有提供的会员国（%s）中。 NorProspectNorCustomer=Not prospect, nor customer JuridicalStatus=Legal Entity Type +Workforce=Workforce Staff=雇员 ProspectLevelShort=潜力 ProspectLevel=潜在的准客户 @@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor PaymentTypeBoth=Payment Type - Customer and Vendor MulticurrencyUsed=Use Multicurrency MulticurrencyCurrency=货币 +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/zh_CN/hrm.lang b/htdocs/langs/zh_CN/hrm.lang index feb3ddf3eb8..bb00a894f4c 100644 --- a/htdocs/langs/zh_CN/hrm.lang +++ b/htdocs/langs/zh_CN/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=雇员 Employee=雇员 NewEmployee=新建雇员 +ListOfEmployees=List of employees diff --git a/htdocs/langs/zh_CN/languages.lang b/htdocs/langs/zh_CN/languages.lang index b70928b0819..40a45ccfaec 100644 --- a/htdocs/langs/zh_CN/languages.lang +++ b/htdocs/langs/zh_CN/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Spanish（巴拿马） Language_es_PY=西班牙语（巴拉圭） Language_es_PE=西班牙语（秘鲁） Language_es_PR=西班牙语（波多黎各） +Language_es_US=Spanish (USA) Language_es_UY=西班牙语（乌拉圭） Language_es_GT=Spanish (Guatemala) Language_es_VE=Spanish (Venezuela) diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang index cfa3a26ae4b..ba5ab7c1706 100644 --- a/htdocs/langs/zh_CN/main.lang +++ b/htdocs/langs/zh_CN/main.lang @@ -155,6 +155,7 @@ RemoveLink=移除链接 AddToDraft=添加到草稿 Update=更新 Close=关闭 +CloseAs=设置状态 CloseBox=将插件从你的看板中移除 Confirm=确认 ConfirmSendCardByMail=Do you really want to send the content of this card by mail to %s? @@ -196,6 +197,7 @@ ReOpen=重新开放 Upload=Upload ToLink=链接 Select=选取 +SelectAll=Select all Choose=选择 Resize=调整大小 ResizeOrCrop=调整大小或裁剪 @@ -256,6 +258,7 @@ Cards=信息卡 Card=信息卡 Now=现在 HourStart=开始时间 +Deadline=Deadline Date=日期 DateAndHour=日期与小时 DateToday=今天的日期 @@ -264,8 +267,10 @@ DateStart=开始日期 DateEnd=结束日期 DateCreation=创建日期 DateCreationShort=创建日期 +IPCreation=Creation IP DateModification=变更日期 DateModificationShort=变更日期 +IPModification=Modification IP DateLastModification=最后修改日期 DateValidation=验证日期 DateClosing=截止日期 @@ -319,6 +324,7 @@ Morning=早上 Afternoon=中午 Quadri=四 MonthOfDay=本月的一天 +DaysOfWeek=Days of week HourShort=时 MinuteShort=分 Rate=税率 @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=付款金额，原始货币 MulticurrencyAmountHT=Amount (excl. tax), original currency MulticurrencyAmountTTC=金额（包括税），原始货币 MulticurrencyAmountVAT=金额税，原始货币 +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=税额2 AmountLT2=税额3 AmountLT1ES=RE 额 @@ -487,6 +494,7 @@ By=由 From=从 FromDate=从 FromLocation=从 +at=at to=至 To=至 and=和 @@ -509,6 +517,7 @@ Draft=草稿 Drafts=草稿 StatusInterInvoiced=Invoiced Validated=批准 +ValidatedToProduce=Validated (To produce) Opened=打开 OpenAll=Open (All) ClosedAll=Closed (All) @@ -655,6 +664,7 @@ Response=反应 Priority=优先级 SendByMail=Send by email MailSentBy=电子邮件发送者： +NotSent=不发送 TextUsedInTheMessageBody=电子邮件正文 SendAcknowledgementByMail=发送确认邮件 SendMail=发送电子邮件 @@ -836,6 +846,7 @@ ListOfTemplates=模板列表 Gender=性别 Genderman=男人 Genderwoman=女人 +Genderother=其他 ViewList=列表视图 ViewGantt=Gantt view ViewKanban=Kanban view @@ -877,6 +888,8 @@ Miscellaneous=各项设定 Calendar=日历 GroupBy=分组： ViewFlatList=查看全部列表 +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=删除字符串'%s' SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at https://transifex.com/projects/p/dolibarr/ to add your improvements. DirectDownloadLink=直接下载链接（公共/外部） @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=客户运输 SearchIntoExpenseReports=费用报表 SearchIntoLeaves=Leave SearchIntoTickets=票据 +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Vendor payments +SearchIntoMiscPayments=杂项付款 CommentLink=说明 NbComments=评论数量 CommentPage=评论空间 @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=信息 Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=生日 +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/zh_CN/mrp.lang b/htdocs/langs/zh_CN/mrp.lang index 863793063a0..f018be890cc 100644 --- a/htdocs/langs/zh_CN/mrp.lang +++ b/htdocs/langs/zh_CN/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/zh_CN/website.lang b/htdocs/langs/zh_CN/website.lang index 7cf9bdab8ef..847c0ea30c2 100644 --- a/htdocs/langs/zh_CN/website.lang +++ b/htdocs/langs/zh_CN/website.lang @@ -31,7 +31,7 @@ AddWebsite=添加网站 Webpage=网页/容器 AddPage=添加页面/容器 HomePage=主页 -PageContainer=页/容器 +PageContainer=页面 PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. RequestedPageHasNoContentYet=ID为%s的请求页面尚无内容，或者删除了缓存文件.tpl.php。编辑页面内容以解决此问题。 SiteDeleted=Web site '%s' deleted @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=RSS 源 RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/zh_HK/accountancy.lang b/htdocs/langs/zh_HK/accountancy.lang index 7b59e33b296..3211a0b62df 100644 --- a/htdocs/langs/zh_HK/accountancy.lang +++ b/htdocs/langs/zh_HK/accountancy.lang @@ -18,12 +18,14 @@ DefaultForService=Default for service DefaultForProduct=Default for product CantSuggest=Can't suggest AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s -ConfigAccountingExpert=Configuration of the module accounting expert +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=Journalization -Journaux=Journals +Journals=Journals JournalFinancial=Financial journals BackToChartofaccounts=Return chart of accounts Chartofaccounts=Chart of accounts +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=Current dedicated account AssignDedicatedAccountingAccount=New account to assign InvoiceLabel=Invoice label @@ -33,8 +35,8 @@ OtherInfo=Other information DeleteCptCategory=Remove accounting account from group ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group? JournalizationInLedgerStatus=Status of journalization -AlreadyInGeneralLedger=Already journalized in ledgers -NotYetInGeneralLedger=Not yet journalized in ledgers +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=Group is empty, check setup of the personalized accounting group DetailByAccount=Show detail by account AccountWithNonZeroValues=Accounts with non-zero values @@ -43,7 +45,9 @@ CountriesInEEC=Countries in EEC CountriesNotInEEC=Countries not in EEC CountriesInEECExceptMe=Countries in EEC except %s CountriesExceptMe=All countries except %s -AccountantFiles=Export accounting documents +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup @@ -79,7 +83,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) +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=Select active chart of accounts ChangeAndLoad=Change and load Addanaccount=Add an accounting account @@ -89,6 +93,8 @@ SubledgerAccount=Subledger account SubledgerAccountLabel=Subledger account label ShowAccountingAccount=Show accounting account ShowAccountingJournal=Show accounting journal +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=Accounting account suggested MenuDefaultAccounts=Default accounts MenuBankAccounts=Bank accounts @@ -110,8 +116,9 @@ ExpenseReportsVentilation=Expense report binding CreateMvts=Create new transaction UpdateMvts=Modification of a transaction ValidTransaction=Validate transaction -WriteBookKeeping=Register transactions in Ledger +WriteBookKeeping=Register transactions in accounting Bookkeeping=Ledger +BookkeepingSubAccount=Subledger AccountBalance=Account balance ObjectsRef=Source object ref CAHTF=Total purchase vendor before tax @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Enable draft export on journal ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow if you have a lot of third parties) ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=Sell journal ACCOUNTING_PURCHASE_JOURNAL=Purchase journal @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet) ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet) @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=By predefined groups ByPersonalizedAccountGroups=By personalized groups ByYear=By year NotMatch=Not Set -DeleteMvt=Delete Ledger lines +DeleteMvt=Delete some operation lines from accounting DelMonth=Month to delete DelYear=Year to delete DelJournal=Journal to delete -ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger. -ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted) +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=Finance journal ExpenseReportsJournal=Expense reports journal DescFinanceJournal=Finance journal including all the types of payments by bank account -DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Ledger. +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=Account for VAT not defined ThirdpartyAccountNotDefined=Account for third party not defined ProductAccountNotDefined=Account for product not defined @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=This journal is already use AccountingAccountForSalesTaxAreDefinedInto=Note: Accounting account for Sales tax are defined into menu %s - %s NumberOfAccountancyEntries=Number of entries NumberOfAccountancyMovements=Number of movements +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=Export draft journal @@ -326,6 +339,8 @@ Modelcsv_configurable=Export CSV Configurable Modelcsv_FEC=Export FEC Modelcsv_Sage50_Swiss=Export for Sage 50 Switzerland Modelcsv_winfic=Export Winfic - eWinfic - WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=Chart of accounts Id ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/zh_HK/admin.lang b/htdocs/langs/zh_HK/admin.lang index 0d3a7174232..f1c41a3b62b 100644 --- a/htdocs/langs/zh_HK/admin.lang +++ b/htdocs/langs/zh_HK/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP component %s is loaded PreloadOPCode=Preloaded OPCode is used AddRefInList=Display Customer/Vendor ref. info list (select list or combobox) and most of hyperlink.
Third Parties will appear with a name format of "CC12345 - SC45678 - The Big Company corp." instead of "The Big Company corp". AddAdressInList=Display Customer/Vendor adress info list (select list or combobox)
Third Parties will appear with a name format of "The Big Company corp. - 21 jump street 123456 Big town - USA" instead of "The Big Company corp". +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties. FieldEdition=Edition of field %s FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) @@ -1420,6 +1421,7 @@ AdherentMailRequired=Email required to create a new member MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default VisitorCanChooseItsPaymentMode=Visitor can choose from available payment modes MEMBER_REMINDER_EMAIL=Enable automatic reminder by email of expired subscriptions. Note: Module %s must be enabled and correctly setup to send reminders. +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=LDAP Setup LDAPGlobalParameters=Global parameters @@ -1670,7 +1672,7 @@ AdvancedEditor=Advanced editor ActivateFCKeditor=Activate advanced editor for: FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services) FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing) FCKeditorForUserSignature=WYSIWIG creation/edition of user signature FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=Automatically set this default value for type of e AGENDA_DEFAULT_FILTER_TYPE=Automatically set this type of event in search filter of agenda view AGENDA_DEFAULT_FILTER_STATUS=Automatically set this status for events in search filter of agenda view AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting 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 user's browser (when event date is reached, each user is able to refuse this from the browser confirmation question) +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=Enable sound notification +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view ##### Clicktodial ##### ClickToDialSetup=Click To Dial module setup diff --git a/htdocs/langs/zh_HK/banks.lang b/htdocs/langs/zh_HK/banks.lang index 75f9549dca5..9500a5b8b2e 100644 --- a/htdocs/langs/zh_HK/banks.lang +++ b/htdocs/langs/zh_HK/banks.lang @@ -166,6 +166,9 @@ VariousPayment=Miscellaneous payment VariousPayments=Miscellaneous payments ShowVariousPayment=Show miscellaneous payment AddVariousPayment=Add miscellaneous payment +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=SEPA mandate YourSEPAMandate=Your SEPA mandate FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to @@ -176,3 +179,4 @@ BankColorizeMovement=Colorize movements BankColorizeMovementDesc=If this function is enable, you can choose specific background color for debit or credit movements BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName2=Background color for credit movement +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/zh_HK/categories.lang b/htdocs/langs/zh_HK/categories.lang index 9bb71984ecf..ba37a43b4ec 100644 --- a/htdocs/langs/zh_HK/categories.lang +++ b/htdocs/langs/zh_HK/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=Tags/categories setup CategorieRecursiv=Link with parent tag/category automatically CategorieRecursivHelp=If option is on, when you add a product into a subcategory, product will also be added into the parent category. AddProductServiceIntoCategory=Add the following product/service +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=Show tag/category ByDefaultInList=By default in list ChooseCategory=Choose category -StocksCategoriesArea=Warehouses Categories Area -ActionCommCategoriesArea=Events Categories Area -WebsitePagesCategoriesArea=Page-Container Categories Area +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=Use or operator for categories diff --git a/htdocs/langs/zh_HK/companies.lang b/htdocs/langs/zh_HK/companies.lang index 92674363ced..dadff6a7894 100644 --- a/htdocs/langs/zh_HK/companies.lang +++ b/htdocs/langs/zh_HK/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (Handelsregister-Nr.) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (Professional number) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (Inscricao Estadual) @@ -144,11 +144,11 @@ ProfId3BR=IM (Inscricao Municipal) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof Id 1 (Federal number) ProfId4CH=Prof Id 2 (Commercial Record number) -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof Id 1 (R.U.T.) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr) ProfId2DE=Prof Id 2 (USt.-Nr) ProfId3DE=Prof Id 3 (Handelsregister-Nr.) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof Id 1 (CIF/NIF) ProfId2ES=Prof Id 2 (Social security number) ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (Collegiate number) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof Id 1 (SIREN) ProfId2FR=Prof Id 2 (SIRET) ProfId3FR=Prof Id 3 (NAF, old APE) ProfId4FR=Prof Id 4 (RCS/RM) -ProfId5FR=- +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=Registration Number ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX) ProfId4IN=Prof Id 4 ProfId5IN=Prof Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg) ProfId2LU=Id. prof. 2 (Business permit) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (R.C.) ProfId2MA=Id prof. 2 (Patente) ProfId3MA=Id prof. 3 (I.F.) ProfId4MA=Id prof. 4 (C.N.S.S.) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof Id 1 (R.F.C). ProfId2MX=Prof Id 2 (R..P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK nummer ProfId2NL=- ProfId3NL=- ProfId4NL=Burgerservicenummer (BSN) -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof Id 2 (Social security number) ProfId3PT=Prof Id 3 (Commercial Record number) ProfId4PT=Prof Id 4 (Conservatory) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof Id 1 (OGRN) ProfId2RU=Prof Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s). NorProspectNorCustomer=Not prospect, nor customer JuridicalStatus=Legal Entity Type +Workforce=Workforce Staff=Employees ProspectLevelShort=Potential ProspectLevel=Prospect potential @@ -456,3 +462,8 @@ PaymentTermsSupplier=Payment Term - Vendor PaymentTypeBoth=Payment Type - Customer and Vendor MulticurrencyUsed=Use Multicurrency MulticurrencyCurrency=Currency +InEEC=Europe (EEC) +RestOfEurope=Rest of Europe (EEC) +OutOfEurope=Out of Europe (EEC) +CurrentOutstandingBillLate=Current outstanding bill late +BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS. diff --git a/htdocs/langs/zh_HK/hrm.lang b/htdocs/langs/zh_HK/hrm.lang index 6cc7f6bef24..3b8f137e103 100644 --- a/htdocs/langs/zh_HK/hrm.lang +++ b/htdocs/langs/zh_HK/hrm.lang @@ -16,3 +16,4 @@ DictionaryFunction=HRM - Job positions Employees=Employees Employee=Employee NewEmployee=New employee +ListOfEmployees=List of employees diff --git a/htdocs/langs/zh_HK/languages.lang b/htdocs/langs/zh_HK/languages.lang index cc80b9f1719..ba187326705 100644 --- a/htdocs/langs/zh_HK/languages.lang +++ b/htdocs/langs/zh_HK/languages.lang @@ -40,6 +40,7 @@ Language_es_PA=Spanish (Panama) Language_es_PY=Spanish (Paraguay) Language_es_PE=Spanish (Peru) Language_es_PR=Spanish (Puerto Rico) +Language_es_US=Spanish (USA) Language_es_UY=Spanish (Uruguay) Language_es_GT=Spanish (Guatemala) Language_es_VE=Spanish (Venezuela) diff --git a/htdocs/langs/zh_HK/main.lang b/htdocs/langs/zh_HK/main.lang index 0af5c66f0e0..96c68cdcfa3 100644 --- a/htdocs/langs/zh_HK/main.lang +++ b/htdocs/langs/zh_HK/main.lang @@ -155,6 +155,7 @@ RemoveLink=Remove link AddToDraft=Add to draft Update=Update Close=Close +CloseAs=Set status to CloseBox=Remove widget from your dashboard Confirm=Confirm ConfirmSendCardByMail=Do you really want to send the content of this card by mail to %s? @@ -196,6 +197,7 @@ ReOpen=Re-Open Upload=Upload ToLink=Link Select=Select +SelectAll=Select all Choose=Choose Resize=Resize ResizeOrCrop=Resize or Crop @@ -256,6 +258,7 @@ Cards=Cards Card=Card Now=Now HourStart=Start hour +Deadline=Deadline Date=Date DateAndHour=Date and hour DateToday=Today's date @@ -264,8 +267,10 @@ DateStart=Start date DateEnd=End date DateCreation=Creation date DateCreationShort=Creat. date +IPCreation=Creation IP DateModification=Modification date DateModificationShort=Modif. date +IPModification=Modification IP DateLastModification=Latest modification date DateValidation=Validation date DateClosing=Closing date @@ -319,6 +324,7 @@ Morning=Morning Afternoon=Afternoon Quadri=Quadri MonthOfDay=Month of the day +DaysOfWeek=Days of week HourShort=H MinuteShort=mn Rate=Rate @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=Payment amount, original currency MulticurrencyAmountHT=Amount (excl. tax), original currency MulticurrencyAmountTTC=Amount (inc. of tax), original currency MulticurrencyAmountVAT=Amount tax, original currency +MulticurrencySubPrice=Amount sub price multi currency AmountLT1=Amount tax 2 AmountLT2=Amount tax 3 AmountLT1ES=Amount RE @@ -487,6 +494,7 @@ By=By From=From FromDate=From FromLocation=From +at=at to=to To=to and=and @@ -509,6 +517,7 @@ Draft=Draft Drafts=Drafts StatusInterInvoiced=Invoiced Validated=Validated +ValidatedToProduce=Validated (To produce) Opened=Open OpenAll=Open (All) ClosedAll=Closed (All) @@ -655,6 +664,7 @@ Response=Response Priority=Priority SendByMail=Send by email MailSentBy=Email sent by +NotSent=Not sent TextUsedInTheMessageBody=Email body SendAcknowledgementByMail=Send confirmation email SendMail=Send email @@ -836,6 +846,7 @@ ListOfTemplates=List of templates Gender=Gender Genderman=Man Genderwoman=Woman +Genderother=Other ViewList=List view ViewGantt=Gantt view ViewKanban=Kanban view @@ -877,6 +888,8 @@ Miscellaneous=Miscellaneous Calendar=Calendar GroupBy=Group by... ViewFlatList=View flat list +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=Remove string '%s' SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at https://transifex.com/projects/p/dolibarr/ to add your improvements. DirectDownloadLink=Direct download link (public/external) @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=Customer shipments SearchIntoExpenseReports=Expense reports SearchIntoLeaves=Leave SearchIntoTickets=Tickets +SearchIntoCustomerPayments=Customer payments +SearchIntoVendorPayments=Vendor payments +SearchIntoMiscPayments=Miscellaneous payments CommentLink=Comments NbComments=Number of comments CommentPage=Comments space @@ -1078,8 +1094,16 @@ ByStatus=By status InformationMessage=Information Used=Used ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create +CREATEInDolibarr=Record %s created MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor +DateOfBirth=Date of birth +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again. +UpToDate=Up-to-date +OutOfDate=Out-of-date +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/zh_HK/mrp.lang b/htdocs/langs/zh_HK/mrp.lang index 863793063a0..f018be890cc 100644 --- a/htdocs/langs/zh_HK/mrp.lang +++ b/htdocs/langs/zh_HK/mrp.lang @@ -77,3 +77,4 @@ UnitCost=Unit cost TotalCost=Total cost BOMTotalCost=The cost to produce this BOM based on cost of each quantity and product to consume (use Cost price if defined, else Average Weighted Price if defined, else the Best purchase price) GoOnTabProductionToProduceFirst=You must first have started the production to close a Manufacturing Order (See tab '%s'). But you can Cancel it. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/zh_HK/website.lang b/htdocs/langs/zh_HK/website.lang index 4b5294d5e43..03e042e4be6 100644 --- a/htdocs/langs/zh_HK/website.lang +++ b/htdocs/langs/zh_HK/website.lang @@ -31,7 +31,7 @@ AddWebsite=Add website Webpage=Web page/container AddPage=Add page/container HomePage=Home Page -PageContainer=Page/container +PageContainer=Page PreviewOfSiteNotYetAvailable=Preview of your website %s not yet available. You must first 'Import a full website template' or just 'Add a page/container'. 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. SiteDeleted=Web site '%s' deleted @@ -135,3 +135,5 @@ ReplacementDoneInXPages=Replacement done in %s pages or containers RSSFeed=RSS Feed RSSFeedDesc=You can get a RSS feed of latest articles with type 'blogpost' using this URL PagesRegenerated=%s page(s)/container(s) regenerated +RegenerateWebsiteContent=Regenerate web site cache files +AllowedInFrames=Allowed in Frames diff --git a/htdocs/langs/zh_TW/accountancy.lang b/htdocs/langs/zh_TW/accountancy.lang index c169b603290..bf49bbd2fba 100644 --- a/htdocs/langs/zh_TW/accountancy.lang +++ b/htdocs/langs/zh_TW/accountancy.lang @@ -18,23 +18,25 @@ DefaultForService=服務的預設 DefaultForProduct=產品的預設 CantSuggest=無法建議 AccountancySetupDoneFromAccountancyMenu=從%s選單的大部分會計設定已完成 -ConfigAccountingExpert=會計專家模組的組態 +ConfigAccountingExpert=Configuration of the module accounting (double entry) Journalization=註冊到日記帳 -Journaux=日記帳 +Journals=日記帳 JournalFinancial=財務日記帳 BackToChartofaccounts=回到會計科目表 Chartofaccounts=會計科目表 +ChartOfSubaccounts=Chart of individual accounts +ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger CurrentDedicatedAccountingAccount=目前的專用帳戶 AssignDedicatedAccountingAccount=新帳戶指派給 InvoiceLabel=發票標籤 -OverviewOfAmountOfLinesNotBound=行數金額的概述未綁定到會計帳戶 -OverviewOfAmountOfLinesBound=行數金額的概述已綁定到會計帳戶 +OverviewOfAmountOfLinesNotBound=行金額的總攬未綁定到會計帳戶 +OverviewOfAmountOfLinesBound=行金額的總攬已綁定到會計帳戶 OtherInfo=其他資訊 DeleteCptCategory=從群組移除會計帳戶 ConfirmDeleteCptCategory=您確定要從會計帳戶組中刪除此會計帳戶嗎？ JournalizationInLedgerStatus=日誌狀態 -AlreadyInGeneralLedger=已經記錄在分類帳了 -NotYetInGeneralLedger=尚未記錄至分類帳 +AlreadyInGeneralLedger=Already transferred in accounting journals and ledger +NotYetInGeneralLedger=Not yet transferred in accouting journals and ledger GroupIsEmptyCheckSetup=群組是空的，檢查個人化會計群組的設定 DetailByAccount=依帳戶顯示細節 AccountWithNonZeroValues=非零值的帳戶 @@ -43,7 +45,9 @@ CountriesInEEC=歐盟國家 CountriesNotInEEC=非歐盟國家 CountriesInEECExceptMe=除了%s以外的歐盟國家 CountriesExceptMe=除了%s以外的所有國家 -AccountantFiles=輸出會計文件 +AccountantFiles=Export source documents +ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s. +VueByAccountAccounting=View by accounting account MainAccountForCustomersNotDefined=在設定中客戶的主要會計帳戶尚未定義 MainAccountForSuppliersNotDefined=在設定中供應商的主要會計帳戶尚未定義 @@ -79,7 +83,7 @@ AccountancyAreaDescAnalyze=步驟%s：新增或編輯現有交易並生成報告 AccountancyAreaDescClosePeriod=步驟%s：關帳期，因此我們之後無法進行修改。 -TheJournalCodeIsNotDefinedOnSomeBankAccount=設定中的強制性步驟尚未完成（未為所有銀行帳戶定義會計代碼日記帳） +TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts) Selectchartofaccounts=選擇有效的會計科目表 ChangeAndLoad=修改並載入 Addanaccount=新增會計科目 @@ -89,6 +93,8 @@ SubledgerAccount=子帳帳戶 SubledgerAccountLabel=子帳帳戶標籤 ShowAccountingAccount=顯示會計項目 ShowAccountingJournal=顯示會計日記帳 +ShowAccountingAccountInLedger=Show accounting account in ledger +ShowAccountingAccountInJournals=Show accounting account in journals AccountAccountingSuggest=建議的會計項目 MenuDefaultAccounts=預設會計項目 MenuBankAccounts=銀行帳戶 @@ -110,8 +116,9 @@ ExpenseReportsVentilation=費用報表的關聯 CreateMvts=建立新的交易 UpdateMvts=交易的修改 ValidTransaction=驗證交易 -WriteBookKeeping=在總帳中記錄交易 +WriteBookKeeping=Register transactions in accounting Bookkeeping=總帳 +BookkeepingSubAccount=Subledger AccountBalance=帳戶餘額 ObjectsRef=參考的來源物件 CAHTF=稅前總採購供應商 @@ -150,6 +157,7 @@ BANK_DISABLE_DIRECT_INPUT=停用銀行帳戶中直接記錄交易 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=在日記帳上啟用草稿匯出 ACCOUNTANCY_COMBO_FOR_AUX=為子公司帳戶啟用組合列表（如果您有很多合作方，可能會很慢） ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting. +ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default ACCOUNTING_SELL_JOURNAL=銷售日記帳 ACCOUNTING_PURCHASE_JOURNAL=採購日記帳 @@ -169,6 +177,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=等待的會計科目 DONATION_ACCOUNTINGACCOUNT=註冊捐款的會計科目 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=用於註冊訂閱的會計科目 +ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit + ACCOUNTING_PRODUCT_BUY_ACCOUNT=所購買產品的預設會計科目（如果在產品表中未定義則使用） ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=預設情況下，在EEC中所購買產品的會計帳戶（如果未在產品單中定義則使用） ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=預設情況下，用於在EEC以外購買產品並且輸入產品的會計帳戶（如果在產品表中未定義，則使用） @@ -203,16 +213,16 @@ ByPredefinedAccountGroups=依大類 ByPersonalizedAccountGroups=依個人化大類 ByYear=依年度 NotMatch=未設定 -DeleteMvt=刪除總帳行 +DeleteMvt=Delete some operation lines from accounting DelMonth=刪除月份 DelYear=刪除年度 DelJournal=刪除日記帳 -ConfirmDeleteMvt=這將刪特定日記帳中所有分類帳行的年/月（至少需要一個條件）。您將必須重新使用“註冊未會計”功能，才能將已刪除的記錄重新存入分類帳。 -ConfirmDeleteMvtPartial=這將從總帳中刪除交易（與同一交易相關的所有行都將被刪除） +ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger. +ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted) FinanceJournal=財務日記帳 ExpenseReportsJournal=費用報表日記帳 DescFinanceJournal=財務日記帳包含由銀行帳戶支出的全部付款資料。 -DescJournalOnlyBindedVisible=檢視此記錄的已關聯的會計項目及總帳的記錄 +DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger. VATAccountNotDefined=營業稅帳戶未定義 ThirdpartyAccountNotDefined=未定義的合作方科目 ProductAccountNotDefined=產品會計科目未定義 @@ -305,6 +315,9 @@ ErrorAccountingJournalIsAlreadyUse=此日記帳已使用 AccountingAccountForSalesTaxAreDefinedInto=注意：銷項稅額的會計項目定義到選單 %s - %s NumberOfAccountancyEntries=條目數 NumberOfAccountancyMovements=移動次數 +ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting) +ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting) ## Export ExportDraftJournal=匯出日記帳草稿 @@ -326,6 +339,8 @@ Modelcsv_configurable=匯出為可設置CSV Modelcsv_FEC=匯出為FEC Modelcsv_Sage50_Swiss=匯出為Sage 50 Switzerland Modelcsv_winfic=匯出Winfic-eWinfic-WinSis Compta +Modelcsv_Gestinumv3=Export for Gestinum (v3) +Modelcsv_Gestinumv5Export for Gestinum (v5) ChartofaccountsId=會計項目表ID ## Tools - Init accounting account on product / service diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang index b2a21e07ad1..833e0197a6b 100644 --- a/htdocs/langs/zh_TW/admin.lang +++ b/htdocs/langs/zh_TW/admin.lang @@ -1314,6 +1314,7 @@ PHPModuleLoaded=PHP組件%s已載入 PreloadOPCode=已使用預載入OPCode AddRefInList=顯示客戶/供應商參考訊息清單（選擇清單或組合框）和大多數超連結。
合作方將以“ CC12345-SC45678-The Big Company corp。”的名稱格式出現。而不是“The Big Company corp”。 AddAdressInList=顯示客戶/供應商地址訊息清單（選擇清單或組合框）
合作方將以“ The Big Company corp。-21 jump street 123456 Big town-USA”的名稱格式出現，而不是“ The Big Company corp”。 +AddEmailPhoneTownInContactList=Display Contact email (or phones if not defined) and town info list (select list or combobox)
Contacts will appear with a name format of "Dupond Durand - dupond.durand@email.com - Paris" or "Dupond Durand - 06 07 59 65 66 - Paris" instead of "Dupond Durand". AskForPreferredShippingMethod=要求合作方使用首選的運輸方式。 FieldEdition=欗位 %s編輯 FillThisOnlyIfRequired=例如： +2 (若遇到時區偏移問題時才填寫) @@ -1420,6 +1421,7 @@ AdherentMailRequired=建立新會員需要電子郵件 MemberSendInformationByMailByDefault=已勾選預設傳送電子郵件驗證成員（驗證或新訂閲） VisitorCanChooseItsPaymentMode=訪客可以選擇可用的付款方式 MEMBER_REMINDER_EMAIL=以電子郵件啟動自動提醒過期的訂閱。注意：必須啟用模組%s並正確設定才能發送提醒。 +MembersDocModules=Document templates for documents generated from member record ##### LDAP setup ##### LDAPSetup=LDAP 設定 LDAPGlobalParameters=全域參數 @@ -1670,7 +1672,7 @@ AdvancedEditor=進階編輯器 ActivateFCKeditor=啟用進階編輯器： FCKeditorForCompany=所見即所得建立/編輯元件的描述和註釋（產品/服務除外） FCKeditorForProduct=所見即所得產品/服務建立/編輯的描述和說明 -FCKeditorForProductDetails=所見即所得為所有項目（提案，訂單，發票等）建立/編輯產品明細行。 警告：在這種情況下，強烈建議不要使用此選項，因為在產生PDF文件時，它會產生特殊字元和頁面格式的問題。 +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. FCKeditorForMailing= 以所見即所得建立/編輯電子郵件 ( 工具 --> 電子郵件 ) FCKeditorForUserSignature=以所見即所得建立/編輯用戶簽名檔 FCKeditorForMail=以所見即所得建立/編輯全部電子郵件( 除了工具 --> 電子郵件) @@ -1736,9 +1738,10 @@ AGENDA_USE_EVENT_TYPE_DEFAULT=在事件建立表單中自動為事件類型設 AGENDA_DEFAULT_FILTER_TYPE=在應辦事項視圖的搜索過濾器中自動設定此類事件 AGENDA_DEFAULT_FILTER_STATUS=在應辦事項視圖的搜索過濾器中自動為事件設定此狀態 AGENDA_DEFAULT_VIEW=Which view do you want to open by default when selecting menu Agenda -AGENDA_REMINDER_EMAIL=通過電子郵件啟用事件提醒（可以在每個事件上定義提醒選項/延遲）。注意：必須啟用模組%s並正確設定，以正確的頻率發送提醒。 -AGENDA_REMINDER_BROWSER=在用戶的瀏覽器上啟用事件提醒（到達事件日期時，每個用戶都可以從瀏覽器確認問題中拒絕此事件） +AGENDA_REMINDER_BROWSER=Enable event reminder on user's browser (When remind date is reached, a popup is shown by the browser. Each user can disable such notifications from its browser notification setup). AGENDA_REMINDER_BROWSER_SOUND=啟用音效警告 +AGENDA_REMINDER_EMAIL=Enable event reminder by emails (remind option/delay can be defined on each event). +AGENDA_REMINDER_EMAIL_NOTE=Note: The frequency of the task %s must be enough to be sure that the remind are sent at the correct moment. AGENDA_SHOW_LINKED_OBJECT=顯示已連結項目到行程的檢視中 ##### Clicktodial ##### ClickToDialSetup=點擊撥號模組設定 diff --git a/htdocs/langs/zh_TW/banks.lang b/htdocs/langs/zh_TW/banks.lang index ffb9fd89d96..9efdccb1287 100644 --- a/htdocs/langs/zh_TW/banks.lang +++ b/htdocs/langs/zh_TW/banks.lang @@ -166,6 +166,9 @@ VariousPayment=雜項付款 VariousPayments=雜項付款 ShowVariousPayment=顯示雜項付款 AddVariousPayment=新增雜項付款 +VariousPaymentId=Miscellaneous payment ID +VariousPaymentLabel=Miscellaneous payment label +ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment SEPAMandate=歐洲統一支付區要求 YourSEPAMandate=您的歐洲統一支付區要求 FindYourSEPAMandate=這是您SEPA的授權，授權我們公司向您的銀行直接付款。退還已簽名（掃描已簽名文檔）或通過郵件發送至 @@ -176,3 +179,4 @@ BankColorizeMovement=動作顏色 BankColorizeMovementDesc=如果啟用此功能，則可以為借款方或貸款方動作選擇特定的背景顏色 BankColorizeMovementName1=借款方動作的背景顏色 BankColorizeMovementName2=貸款方動作的背景顏色 +IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. diff --git a/htdocs/langs/zh_TW/categories.lang b/htdocs/langs/zh_TW/categories.lang index 1d165cde697..6935e5275bb 100644 --- a/htdocs/langs/zh_TW/categories.lang +++ b/htdocs/langs/zh_TW/categories.lang @@ -81,10 +81,12 @@ CategoriesSetup=標籤/類別設定 CategorieRecursiv=自動連結到母標籤/母類別 CategorieRecursivHelp=如果啟用此選項，當將產品增加到子類別時，產品也會增加到母類別中。 AddProductServiceIntoCategory=新增以下產品/服務 +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier ShowCategory=顯示標籤/類別 ByDefaultInList=預設在清單中 ChooseCategory=選擇類別 -StocksCategoriesArea=倉庫類別區域 -ActionCommCategoriesArea=事件類別區 -WebsitePagesCategoriesArea=頁面容器類別區域 +StocksCategoriesArea=Warehouses Categories +ActionCommCategoriesArea=Events Categories +WebsitePagesCategoriesArea=Page-Container Categories UseOrOperatorForCategories=類別的使用或運算 diff --git a/htdocs/langs/zh_TW/companies.lang b/htdocs/langs/zh_TW/companies.lang index 9d1d0ab5a22..1d83ed486ae 100644 --- a/htdocs/langs/zh_TW/companies.lang +++ b/htdocs/langs/zh_TW/companies.lang @@ -124,7 +124,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr) ProfId2AT=Prof Id 2 (USt.-Nr) ProfId3AT=Prof Id 3 (商業登記號碼) ProfId4AT=- -ProfId5AT=- +ProfId5AT=EORI number ProfId6AT=- ProfId1AU=Prof Id 1 (ABN) ProfId2AU=- @@ -136,7 +136,7 @@ ProfId1BE=Prof Id 1 (專業號碼) ProfId2BE=- ProfId3BE=- ProfId4BE=- -ProfId5BE=- +ProfId5BE=EORI number ProfId6BE=- ProfId1BR=- ProfId2BR=IE (國家註冊) @@ -144,11 +144,11 @@ ProfId3BR=IM (市政登記) ProfId4BR=CPF #ProfId5BR=CNAE #ProfId6BR=INSS -ProfId1CH=- +ProfId1CH=UID-Nummer ProfId2CH=- ProfId3CH=Prof Id 1（聯邦碼） ProfId4CH=Prof Id 2（商業記錄碼） -ProfId5CH=- +ProfId5CH=EORI number ProfId6CH=- ProfId1CL=Prof Id 1 (R.U.T.) ProfId2CL=- @@ -166,19 +166,19 @@ ProfId1DE=Prof Id 1 (USt.-IdNr) ProfId2DE=Prof Id 2 (USt.-Nr) ProfId3DE=Prof Id 3 (商業登記號碼) ProfId4DE=- -ProfId5DE=- +ProfId5DE=EORI number ProfId6DE=- ProfId1ES=Prof Id 1 (CIF/NIF) ProfId2ES=Prof Id 2 （社會安全號碼） ProfId3ES=Prof Id 3 (CNAE) ProfId4ES=Prof Id 4 (學院編號) -ProfId5ES=- +ProfId5ES=EORI number ProfId6ES=- ProfId1FR=Prof Id 1 (SIREN) ProfId2FR=Prof Id 2 (SIRET) ProfId3FR=Prof Id 3 (NAF, old APE) ProfId4FR=Prof Id 4 (RCS/RM) -ProfId5FR=- +ProfId5FR=EORI number ProfId6FR=- ProfId1GB=註冊號 ProfId2GB=- @@ -198,17 +198,22 @@ ProfId3IN=Prof Id 3 (SRVC TAX) ProfId4IN=Prof Id 4 ProfId5IN=Prof Id 5 ProfId6IN=- +ProfId1IT=- +ProfId2IT=- +ProfId3IT=- +ProfId4IT=- +ProfId5IT=EORI number ProfId1LU=Id. prof. 1 (R.C.S.盧森堡) ProfId2LU=Id. prof. 2 (營業執照) ProfId3LU=- ProfId4LU=- -ProfId5LU=- +ProfId5LU=EORI number ProfId6LU=- ProfId1MA=Id prof. 1 (R.C.) ProfId2MA=Id prof. 2 (Patente) ProfId3MA=Id prof. 3 (I.F.) ProfId4MA=Id prof. 4 (C.N.S.S.) -ProfId5MA=Id. prof. 5 (I.C.E.) +ProfId5MA=Id prof. 5 (I.C.E.) ProfId6MA=- ProfId1MX=Prof Id 1 (R.F.C). ProfId2MX=Prof Id 2 (R..P. IMSS) @@ -220,13 +225,13 @@ ProfId1NL=KVK數字 ProfId2NL=- ProfId3NL=- ProfId4NL=- -ProfId5NL=- +ProfId5NL=EORI number ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) ProfId2PT=Prof Id 2（社會安全號碼） ProfId3PT=Prof Id 3（商業記錄碼） ProfId4PT=Prof Id 4 (音樂學院) -ProfId5PT=- +ProfId5PT=EORI number ProfId6PT=- ProfId1SN=RC ProfId2SN=NINEA @@ -249,8 +254,8 @@ ProfId6US=- ProfId1RO=Prof Id 1 (CUI) ProfId2RO=Prof Id 2 (Nr. Înmatriculare) ProfId3RO=Prof Id 3 (CAEN) -ProfId4RO=- -ProfId5RO=Prof Id 5 (EUID) +ProfId4RO=Prof Id 5 (EUID) +ProfId5RO=EORI number ProfId6RO=- ProfId1RU=Prof Id 1 (OGRN) ProfId2RU=Prof Id 2 (INN) @@ -354,6 +359,7 @@ VATIntraManualCheck=您也可在歐盟網站以人工方式確認%s？ @@ -196,6 +197,7 @@ ReOpen=重新公開 Upload=上傳 ToLink=連線 Select=選擇 +SelectAll=Select all Choose=選擇 Resize=調整大小 ResizeOrCrop=調整大小或裁剪 @@ -256,6 +258,7 @@ Cards=資訊卡 Card=資訊卡 Now=現在 HourStart=開始(時) +Deadline=Deadline Date=日期 DateAndHour=日期及小時 DateToday=今日日期 @@ -264,8 +267,10 @@ DateStart=開始日期 DateEnd=結束日期 DateCreation=建立日期 DateCreationShort=建立日 +IPCreation=Creation IP DateModification=修改日期 DateModificationShort=修改日 +IPModification=Modification IP DateLastModification=最新修改日期 DateValidation=驗證日期 DateClosing=關閉日期 @@ -319,6 +324,7 @@ Morning=上午 Afternoon=下午 Quadri=季 MonthOfDay=當天的月份 +DaysOfWeek=星期幾 HourShort=時 MinuteShort=分 Rate=稅率 @@ -356,7 +362,7 @@ Amount=金額 AmountInvoice=發票金額 AmountInvoiced=已開發票金額 AmountInvoicedHT=開票金額（不含稅） -AmountInvoicedTTC=Amount invoiced (inc. tax) +AmountInvoicedTTC=開票金額（含稅） AmountPayment=付款金額 AmountHTShort=金額（不含） AmountTTCShort=金額(含稅) @@ -369,6 +375,7 @@ MulticurrencyPaymentAmount=付款金額, 原來幣別 MulticurrencyAmountHT=金額（不含稅），原來幣別 MulticurrencyAmountTTC=金額(含稅), 原來幣別 MulticurrencyAmountVAT=稅金, 原來幣別 +MulticurrencySubPrice=金額子價格多種貨幣 AmountLT1=稅金 2 AmountLT2=稅金 3 AmountLT1ES=RE 金額 @@ -487,6 +494,7 @@ By=由 From=從 FromDate=從 FromLocation=從 +at=at to=至 To=至 and=和 @@ -509,6 +517,7 @@ Draft=草案 Drafts=草案 StatusInterInvoiced=已開票 Validated=已驗證 +ValidatedToProduce=已驗證（生產） Opened=開放 OpenAll=開放（全部） ClosedAll=已關閉（全部） @@ -655,6 +664,7 @@ Response=反應 Priority=優先權 SendByMail=以電子郵件寄送 MailSentBy=寄件人 +NotSent=不發送 TextUsedInTheMessageBody=電子郵件正文 SendAcknowledgementByMail=傳送確認電子郵件 SendMail=傳送電子郵件 @@ -688,7 +698,7 @@ Method=方法 Receive=收到 CompleteOrNoMoreReceptionExpected=完成或沒有更多的預期 ExpectedValue=期望值 -ExpectedQty=Expected Qty +ExpectedQty=預期數量 PartialWoman=部分 TotalWoman=全部 NeverReceived=從未收到 @@ -705,7 +715,7 @@ MenuECM=文件 MenuAWStats=AWStats 軟體 MenuMembers=會員 MenuAgendaGoogle=Google 行事曆 -MenuTaxesAndSpecialExpenses=Taxes | Special expenses +MenuTaxesAndSpecialExpenses=稅金|特別費用 ThisLimitIsDefinedInSetup=Dolibarr 的限制（選單 首頁 - 設定 - 安全）： %s Kb, PHP的限制：%s Kb NoFileFound=此資料夾沒有任何檔案 CurrentUserLanguage=目前語言 @@ -728,7 +738,7 @@ Page=頁面 Notes=備註 AddNewLine=新增一行 AddFile=新增檔案 -FreeZone=Free-text product +FreeZone=自由文字產品 FreeLineOfType=自由輸入項目，輸入： CloneMainAttributes=複製物件時複製主要屬性 ReGeneratePDF=重新產生PDF @@ -806,7 +816,7 @@ Element=元件 NoPhotoYet=還沒有圖片 Dashboard=資訊板 MyDashboard=我的資訊板 -Deductible=免賠額 +Deductible=可減免 from=從 toward=往 Access=存取 @@ -836,6 +846,7 @@ ListOfTemplates=範本清單 Gender=性別 Genderman=男 Genderwoman=女 +Genderother=其他 ViewList=檢視清單 ViewGantt=甘特圖 ViewKanban=看板圖 @@ -877,6 +888,8 @@ Miscellaneous=雜項 Calendar=行事曆 GroupBy=群組依... ViewFlatList=檢視平面清單 +ViewAccountList=View ledger +ViewSubAccountList=View subaccount ledger RemoveString=移除字串‘%s’ SomeTranslationAreUncomplete=提供的某些語言可能僅被部分翻譯，或者可能包含錯誤。請通過註冊https://transifex.com/projects/p/dolibarr/來進行改進，以幫助修正您的語言。 DirectDownloadLink=直接下載連結(公共/外部) @@ -945,38 +958,38 @@ ShortThursday=Th ShortFriday=Fr ShortSaturday=Sa ShortSunday=Su -one=one -two=two -three=three -four=four -five=five -six=six -seven=seven -eight=eight -nine=nine -ten=ten -eleven=eleven -twelve=twelve -thirteen=thirdteen -fourteen=fourteen -fifteen=fifteen -sixteen=sixteen -seventeen=seventeen -eighteen=eighteen -nineteen=nineteen -twenty=twenty -thirty=thirty -forty=forty -fifty=fifty -sixty=sixty -seventy=seventy -eighty=eighty -ninety=ninety -hundred=hundred -thousand=thousand -million=million -billion=billion -trillion=trillion +one=一 +two=二 +three=三 +four=四 +five=五 +six=六 +seven=七 +eight=八 +nine=九 +ten=十 +eleven=十一 +twelve=十二 +thirteen=十三 +fourteen=十四 +fifteen=十五 +sixteen=十六 +seventeen=十七 +eighteen=十八 +nineteen=十九 +twenty=二十 +thirty=三十 +forty=四十 +fifty=五十 +sixty=六十 +seventy=七十 +eighty=八十 +ninety=九十 +hundred=百 +thousand=千 +million=百萬 +billion=十億 +trillion=兆 quadrillion=quadrillion SelectMailModel=選擇一個電子郵件範本 SetRef=設定參考 @@ -1008,6 +1021,9 @@ SearchIntoCustomerShipments=客戶出貨 SearchIntoExpenseReports=費用報告 SearchIntoLeaves=休假 SearchIntoTickets=服務單 +SearchIntoCustomerPayments=客戶付款 +SearchIntoVendorPayments=供應商付款 +SearchIntoMiscPayments=雜項付款 CommentLink=註解 NbComments=註解數 CommentPage=註解空間 @@ -1043,8 +1059,8 @@ ToClose=關閉 ToProcess=處理 ToApprove=核准 GlobalOpenedElemView=全域顯示 -NoArticlesFoundForTheKeyword=沒有關於 '%s'的文章 -NoArticlesFoundForTheCategory=找不到該類別的文章 +NoArticlesFoundForTheKeyword=沒有關於 '%s'的物品 +NoArticlesFoundForTheCategory=找不到該類別的物品 ToAcceptRefuse=同意 | 拒絕 ContactDefault_agenda=事件 ContactDefault_commande=訂單 @@ -1076,10 +1092,18 @@ NotUsedForThisCustomer=未用於此客戶 AmountMustBePositive=金額必須為正 ByStatus=依狀態 InformationMessage=資訊 -Used=Used +Used=已使用 ASAP=As Soon As Possible -CREATEInDolibarr=Record %s create -MODIFYInDolibarr=Record %s modified -DELETEInDolibarr=Record %s deleted -VALIDATEInDolibarr=Record %s validated -APPROVEDInDolibarr=Record %s approved +CREATEInDolibarr=記錄%s已建立 +MODIFYInDolibarr=記錄%s已修改 +DELETEInDolibarr=記錄%s已刪除 +VALIDATEInDolibarr=記錄%s已驗證 +APPROVEDInDolibarr=記錄%s已批准 +DefaultMailModel=預設信件模型 +PublicVendorName=供應商的公開名稱 +DateOfBirth=出生日期 +SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=安全許可證已過期，因此操作已被取消。請再試一次。 +UpToDate=最新 +OutOfDate=過期 +EventReminder=Event Reminder +UpdateForAllLines=Update for all lines diff --git a/htdocs/langs/zh_TW/mrp.lang b/htdocs/langs/zh_TW/mrp.lang index c64db7996a6..f52b8abeb1b 100644 --- a/htdocs/langs/zh_TW/mrp.lang +++ b/htdocs/langs/zh_TW/mrp.lang @@ -77,3 +77,4 @@ UnitCost=單位成本 TotalCost=總計花費 BOMTotalCost=根據每個要消耗的數量和產品的成本產生此BOM的成本（如果定義則使用“成本價”，如果定義則使用“平均加權價格”，否則使用“最佳採購價”） GoOnTabProductionToProduceFirst=您必須先開始生產才能關閉生產訂單（請參見分頁“ %s”）。但是您可以取消它。 +ErrorAVirtualProductCantBeUsedIntoABomOrMo=A kit can't be used into a BOM or a MO diff --git a/htdocs/langs/zh_TW/website.lang b/htdocs/langs/zh_TW/website.lang index d791d1976c7..6a62024abd5 100644 --- a/htdocs/langs/zh_TW/website.lang +++ b/htdocs/langs/zh_TW/website.lang @@ -31,7 +31,7 @@ AddWebsite=新增網站 Webpage=網頁/容器 AddPage=新增 頁面/容器 HomePage=首頁 -PageContainer=頁面/容器 +PageContainer=頁面 PreviewOfSiteNotYetAvailable=您的網站%s預覽尚不可用。您必須先“ 導入完整的網站模板 ”或僅“ 新增頁面/容器 ”。 RequestedPageHasNoContentYet=要求ID為%s的頁面尚無內容，或暫存檔案.tpl.php被刪除。編輯頁面內容以解決此問題。 SiteDeleted=網站'%s'已刪除 @@ -135,3 +135,5 @@ ReplacementDoneInXPages=在%s頁面或容器中已完成替換 RSSFeed=RSS 訂閱 RSSFeedDesc=您可以使用此網址獲得類型為“ blogpost”的最新文章RSS feed。 PagesRegenerated=已重新產生%s頁面/容器 +RegenerateWebsiteContent=重新產生網站快取檔案 +AllowedInFrames=Allowed in Frames diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index e576b379a6c..9771784828b 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -3025,6 +3025,10 @@ tr.nocellnopadd td.nobordernopadding, tr.nocellnopadd td.nocellnopadd .unsetcolor { color: unset !important; } + +.smallpaddingimp { + padding: 4px !important; +} .nopaddingleft { padding-: 0px; } diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index f9922cf5b2f..8d0721e8aad 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -2998,6 +2998,10 @@ tr.nocellnopadd td.nobordernopadding, tr.nocellnopadd td.nocellnopadd .unsetcolor { color: unset !important; } + +.smallpaddingimp { + padding: 4px !important; +} .nopaddingleft { padding-: 0px; } From 9fed0ca9706ad493de4385a1d2dc907d0d6a8c33 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 30 Nov 2020 18:33:58 +0100 Subject: [PATCH 076/297] test --- htdocs/api/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/api/index.php b/htdocs/api/index.php index 2fba9fbb554..f605ff11d85 100644 --- a/htdocs/api/index.php +++ b/htdocs/api/index.php @@ -45,7 +45,7 @@ if (!$res) die("Include of main fails"); require_once DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/AutoLoader.php'; -call_user_func(function () { +call_user_func(function() { $loader = Luracast\Restler\AutoLoader::instance(); spl_autoload_register($loader); return $loader; From fc91e70e47a61e59144afddf05b04462b48fa90d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 30 Nov 2020 18:37:07 +0100 Subject: [PATCH 077/297] Update modFacture.class.php --- htdocs/core/modules/modFacture.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php index c58752395d3..8f4172112b5 100644 --- a/htdocs/core/modules/modFacture.class.php +++ b/htdocs/core/modules/modFacture.class.php @@ -112,7 +112,7 @@ class modFacture extends DolibarrModules 0=>array('file'=>'box_factures_imp.php', 'enabledbydefaulton'=>'Home'), 1=>array('file'=>'box_factures.php', 'enabledbydefaulton'=>'Home'), 2=>array('file'=>'box_graph_invoices_permonth.php', 'enabledbydefaulton'=>'Home'), - 3=>array('file'=>'box_customers_outstanding_bill_reached.php','enabledbydefaulton'=>'Home') + 3=>array('file'=>'box_customers_outstanding_bill_reached.php', 'enabledbydefaulton'=>'Home') ); // Cronjobs From beafcd61fd1ac54ebd184c18baeeb0faabdeeab6 Mon Sep 17 00:00:00 2001 From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com> Date: Mon, 30 Nov 2020 19:18:19 +0100 Subject: [PATCH 078/297] Update ChangeLog For developers: section for hooks --- ChangeLog | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4745cea7736..17cebdf9a73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -178,10 +178,8 @@ NEW: #15065 Add option to put the product label in bold in the PDF templates if For developers: --------------- -NEW: Hook on propal card NEW: add __MEMBER_TYPE__ substitution key NEW: add function dolButtonToOpenUrlInDialogPopup() to be able to open page into a popup -NEW: add hooks on stats pages NEW: show line number on intervention card (via MAIN_VIEW_LINE_NUMBER) NEW: API get contacts list of a given order NEW: API endpoint getContacts and Clean results @@ -210,9 +208,7 @@ NEW: standardizes API thirdparties by email like other object NEW: Thirdparty REST API: endpoint to set price level NEW: use new category API for project list view NEW: Triggers Attributes and Attributes values -NEW: add hooks on newpayment page to allow external payment modules NEW: added incoterms data into the substitution array -NEW: add formConfirm hook on product page NEW: add send context for ticket NEW: add a message in error_log after detection of SQL or script injection NEW: add two hooks printFieldListFrom and printFieldSearchParam @@ -220,6 +216,12 @@ NEW: add __TYPE__ substitution key NEW: add validation of MX domain for emails NEW: calculate the virtual stock in transverse mode ( not on getEntity('commande'), ... but on getEntity('stock') ) +HOOKs +NEW: Hook on propal card +NEW: add hooks on newpayment page to allow external payment modules +NEW: add hooks on stats pages +NEW: add formConfirm hook on product page + WARNING: @@ -240,6 +242,7 @@ Following changes may create regressions for some external modules, but were nec * Depreciate all methods with name ->valide(). Use instead methods ->validate(). + ***** ChangeLog for 12.0.3 compared to 12.0.2 ***** FIX: 10.0 - when the mime file name is different from the filesystem name, the attachment name should be the mime filename FIX: 11.0 - expenses lines overlapping the total amounts frame From cf2dd28a21910e8367eeb78c5c2d9053c4f3b32a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 30 Nov 2020 19:14:18 +0100 Subject: [PATCH 079/297] Fix warning when setup not complete. --- htdocs/admin/mails.php | 21 ++++++++----- htdocs/core/menus/standard/eldy.lib.php | 41 +++++++++++++++---------- htdocs/langs/en_US/admin.lang | 3 +- htdocs/langs/en_US/errors.lang | 1 + 4 files changed, 41 insertions(+), 25 deletions(-) diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index e8b2b7bdc10..77f4d14dc77 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -178,6 +178,7 @@ if ($action == 'edit') jQuery("#MAIN_MAIL_EMAIL_DKIM_DOMAIN").prop("disabled", true); jQuery("#MAIN_MAIL_EMAIL_DKIM_SELECTOR").prop("disabled", true); jQuery("#MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY").prop("disabled", true); + jQuery(".smtp_method").hide(); jQuery(".dkim").hide(); '; if ($linuxlike) @@ -191,7 +192,7 @@ if ($action == 'edit') print ' jQuery("#MAIN_MAIL_SMTP_SERVER").prop("disabled", true); jQuery("#MAIN_MAIL_SMTP_PORT").prop("disabled", true); - jQuery("#smtp_server_mess").hide(); + jQuery("#smtp_server_mess").hide(); jQuery("#smtp_port_mess").hide();'; } print ' @@ -220,7 +221,8 @@ if ($action == 'edit') jQuery("#MAIN_MAIL_SMTP_PORT").show(); jQuery("#smtp_server_mess").hide(); jQuery("#smtp_port_mess").hide(); - jQuery(".dkim").hide(); + jQuery(".smtp_method").show(); + jQuery(".dkim").hide(); } if (jQuery("#MAIN_MAIL_SENDMODE").val()==\'swiftmailer\') { @@ -246,6 +248,7 @@ if ($action == 'edit') jQuery("#MAIN_MAIL_SMTP_PORT").show(); jQuery("#smtp_server_mess").hide(); jQuery("#smtp_port_mess").hide(); + jQuery(".smtp_method").show(); jQuery(".dkim").show(); } } @@ -318,13 +321,15 @@ if ($action == 'edit') print ''; // Host server - print ''; - if (!$conf->use_javascript_ajax && $linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail') - { + print ''; + if (!$conf->use_javascript_ajax && $linuxlike && $conf->global->MAIN_MAIL_SENDMODE == 'mail') { + print ''; print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike"); print ''; print ''.$langs->trans("SeeLocalSendMailSetup").''; + print ''; } else { + print ''; $mainserver = (!empty($conf->global->MAIN_MAIL_SMTP_SERVER) ? $conf->global->MAIN_MAIL_SMTP_SERVER : ''); $smtpserver = ini_get('SMTP') ?ini_get('SMTP') : $langs->transnoentities("Undefined"); if ($linuxlike) print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike"); @@ -333,17 +338,19 @@ if ($action == 'edit') // SuperAdministrator access only if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity)) { - print ''; + print ''; print ''; print ''.$langs->trans("SeeLocalSendMailSetup").''; + print ' '.$langs->trans("SeeLinkToOnlineDocumentation").''; } else { $text = !empty($mainserver) ? $mainserver : $smtpserver; $htmltext = $langs->trans("ContactSuperAdminForChange"); print $form->textwithpicto($text, $htmltext, 1, 'superadmin'); print ''; } + print ''; } - print ''; + print ''; // Port print ''; diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 94b7d0f1a2d..a94fe759125 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -717,17 +717,18 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM $langs->loadLangs(array("admin", "help")); $warnpicto = ''; - if (empty($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY)) + if (!empty($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY)) { $langs->load("errors"); - $warnpicto = ' '.img_warning($langs->trans("WarningMandatorySetupNotComplete")); + $warnpicto = img_warning($langs->trans("WarningMandatorySetupNotComplete")); } $newmenu->add("/admin/company.php?mainmenu=home", $langs->trans("MenuCompanySetup").$warnpicto, 1); + $warnpicto = ''; - 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 + if (1 || 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")); + $warnpicto = img_warning($langs->trans("WarningMandatorySetupNotComplete")); } $newmenu->add("/admin/modules.php?mainmenu=home", $langs->trans("Modules").$warnpicto, 1); $newmenu->add("/admin/ihm.php?mainmenu=home", $langs->trans("GUISetup"), 1); @@ -740,7 +741,18 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM $newmenu->add("/admin/security_other.php?mainmenu=home", $langs->trans("Security"), 1); $newmenu->add("/admin/limits.php?mainmenu=home", $langs->trans("MenuLimits"), 1); $newmenu->add("/admin/pdf.php?mainmenu=home", $langs->trans("PDF"), 1); - $newmenu->add("/admin/mails.php?mainmenu=home", $langs->trans("Emails"), 1); + + $warnpicto = ''; + if ($conf->global->MAIN_MAIL_SENDMODE == 'mail' && empty($conf->global->MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP)) { + $langs->load("errors"); + $warnpicto = img_warning($langs->trans("WarningPHPMailD")); + } + if (in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmail')) && empty($conf->global->MAIN_MAIL_SMTP_SERVER)) { + $langs->load("errors"); + $warnpicto = img_warning($langs->trans("ErrorSetupOfEmailsNotComplete")); + } + + $newmenu->add("/admin/mails.php?mainmenu=home", $langs->trans("Emails").$warnpicto, 1); $newmenu->add("/admin/sms.php?mainmenu=home", $langs->trans("SMS"), 1); $newmenu->add("/admin/dict.php?mainmenu=home", $langs->trans("Dictionary"), 1); $newmenu->add("/admin/const.php?mainmenu=home", $langs->trans("OtherSetup"), 1); @@ -1985,17 +1997,14 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($menu_array[$i]['enabled'])) $showmenu = false; // Begin of new left menu block - if (empty($menu_array[$i]['level']) && $showmenu) - { + if (empty($menu_array[$i]['level']) && $showmenu) { $altok++; $blockvmenuopened = true; $lastopened = true; - for ($j = ($i + 1); $j < $num; $j++) - { + for ($j = ($i + 1); $j < $num; $j++) { if (empty($menu_array[$j]['level'])) $lastopened = false; } - if ($altok % 2 == 0) - { + if ($altok % 2 == 0) { print '
'."\n"; } else { print '
'."\n"; @@ -2005,10 +2014,8 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM // Add tabulation $tabstring = ''; $tabul = ($menu_array[$i]['level'] - 1); - if ($tabul > 0) - { - for ($j = 0; $j < $tabul; $j++) - { + if ($tabul > 0) { + for ($j = 0; $j < $tabul; $j++) { $tabstring .= '   '; } } @@ -2048,7 +2055,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM if ($menu_array[$i]['enabled']) // Enabled so visible { print '
'.$tabstring; - if ($shorturlwithoutparam) print ''; + if ($shorturlwithoutparam) print ''; else print ''; print ($menu_array[$i]['prefix'] ? $menu_array[$i]['prefix'] : '').$menu_array[$i]['titre']; if ($shorturlwithoutparam) print ''; @@ -2077,7 +2084,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM if ($menu_array[$i]['enabled'] && $lastlevel0 == 'enabled') // Enabled so visible, except if parent was not enabled. { print '
'.$tabstring; - if ($shorturlwithoutparam) print ''; + if ($shorturlwithoutparam) print ''; else print ''; print $menu_array[$i]['titre']; if ($shorturlwithoutparam) print ''; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 1445de07d24..83b5a70de44 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -2083,4 +2083,5 @@ CountryIfSpecificToOneCountry=Country (if specific to a given country) YouMayFindSecurityAdviceHere=You may find security advisory here ModuleActivatedMayExposeInformation=This module may expose sensitive data. If you don't need it, disable it. ModuleActivatedDoNotUseInProduction=A module designed for the development has been enabled. Do not enable it on a production environment. -CombinationsSeparator=Separator character for product combinations \ No newline at end of file +CombinationsSeparator=Separator character for product combinations +SeeLinkToOnlineDocumentation=See link to online documention on top menu for examples \ No newline at end of file diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang index b13a229f10d..255bce66531 100644 --- a/htdocs/langs/en_US/errors.lang +++ b/htdocs/langs/en_US/errors.lang @@ -49,6 +49,7 @@ ErrorFieldsRequired=Some required fields were not filled. ErrorSubjectIsRequired=The email topic is required ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter safe_mode is enabled on this PHP, check that Dolibarr php files owns to web server user (or group). ErrorNoMailDefinedForThisUser=No mail defined for this user +ErrorSetupOfEmailsNotComplete=Setup of emails is not complete ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display. ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'. ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id. From de718837e4bfcc7437732d6dca578ea20d2668c5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 30 Nov 2020 19:43:43 +0100 Subject: [PATCH 080/297] Fix warnings --- htdocs/core/class/CMailFile.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php index e500a5eaba7..e7bcb208a1e 100644 --- a/htdocs/core/class/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -298,7 +298,7 @@ class CMailFile if (!empty($this->sendcontext)) { $smtpContextKey = strtoupper($this->sendcontext); $keyForSMTPSendMode = 'MAIN_MAIL_SENDMODE_'.$smtpContextKey; - $smtpContextSendMode = $conf->global->{$keyForSMTPSendMode}; + $smtpContextSendMode = empty($conf->global->{$keyForSMTPSendMode}) ? '' : $conf->global->{$keyForSMTPSendMode}; if (!empty($smtpContextSendMode) && $smtpContextSendMode != 'default') { $keyforsslseflsigned = 'MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_'.$smtpContextKey; } @@ -657,7 +657,7 @@ class CMailFile if (!empty($this->sendcontext)) { $smtpContextKey = strtoupper($this->sendcontext); $keyForSMTPSendMode = 'MAIN_MAIL_SENDMODE_'.$smtpContextKey; - $smtpContextSendMode = $conf->global->{$keyForSMTPSendMode}; + $smtpContextSendMode = empty($conf->global->{$keyForSMTPSendMode}) ? '' : $conf->global->{$keyForSMTPSendMode}; if (!empty($smtpContextSendMode) && $smtpContextSendMode != 'default') { $keyforsmtpserver = 'MAIN_MAIL_SMTP_SERVER_'.$smtpContextKey; $keyforsmtpport = 'MAIN_MAIL_SMTP_PORT_'.$smtpContextKey; From 3cc439d26f76f2dd1271dccce8d013e819ccd14c Mon Sep 17 00:00:00 2001 From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com> Date: Mon, 30 Nov 2020 19:43:53 +0100 Subject: [PATCH 081/297] Update README - Install InnoSetup For example by running isetup-5.5.8.exe (https://www.jrsoftware.org) https://files.jrsoftware.org/is/5/ - Separation lines for better reading. --- build/README | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/build/README b/build/README index f7e8ebfe60b..14f2b92ae39 100644 --- a/build/README +++ b/build/README @@ -1,48 +1,62 @@ README (English) + +Path: /dolibarr/build/README + ################################################## Building packages ################################################## All sub-directories of "build" directory contains files (setup or binary tools) required to build automatically Dolibarr packages. -There are several tools: +There are several tools: - To build full Dolibarr packages, launch the script > Launch command perl makepack-dolibarr.pl -Note: Prerequisites to build tgz, debian, rpm package +-------------------------------------------------------------------------------------------------- + + +Prerequisites to build tgz, debian, rpm package: + > apt-get install tar dpkg dpatch p7zip-full rpm zip -Note: Prerequisites to build autoexe DoliWamp package: + +-------------------------------------------------------------------------------------------------- + +Prerequisites to build autoexe DoliWamp package: > apt-get install wine q4wine > Launch "wine cmd" to check a drive Z: pointing to / exists. > Install InnoSetup - For example by running isetup-5.3.9.exe (http://www.jrsoftware.org) + For example by running isetup-5.5.8.exe (https://www.jrsoftware.org) https://files.jrsoftware.org/is/5/ > Install WampServer into "C:\wamp64" to have Apache, PHP and MariaDB - For example by running wampserver3.2.0_x64.exe (http://www.wampserver.com). See file build/exe/doliwamp.iss to know the doliwamp version currently setup. + For example by running wampserver3.2.0_x64.exe (https://www.wampserver.com). + See file build/exe/doliwamp.iss to know the doliwamp version currently setup. > Add path to ISCC into PATH windows var: Launch wine cmd, then regedit and add entry int HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment\PATH > To build manually the .exe from Windows (running from makepack-dolibarr.pl script is however recommanded), open file build/exe/doliwamp.iss and click on button "Compile". The .exe file will be build into directory build. - +-------------------------------------------------------------------------------------------------- - To build a theme package, launch the script > perl makepack-dolibarrtheme.pl +-------------------------------------------------------------------------------------------------- - To build a package for a module, launch the script > perl makepack-dolibarrmodule.pl +-------------------------------------------------------------------------------------------------- - To build developper documentation, launch the script > perl dolibarr-doxygen-build.pl +-------------------------------------------------------------------------------------------------- Note: The build directory and all its contents is absolutely not required to make Dolibarr working. From 81b40c9cdfe1660abb4aeef169a27be4bbeff192 Mon Sep 17 00:00:00 2001 From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com> Date: Mon, 30 Nov 2020 20:07:23 +0100 Subject: [PATCH 082/297] Update README.md add: - Multi-Language Support extend: - APIs (REST, SOAP) --- README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 139bdc00b6a..29f7da1792b 100644 --- a/README.md +++ b/README.md @@ -140,15 +140,18 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog) ### Other general features - Localization in most major languages +- Multi-Language Support - Multi-Users and groups with finely grained rights -- Multi-currency -- Multi-company by adding of an external module +- Multi-Currency +- Multi-Company (by adding of an external module) + - Very user friendly and easy to use - customizable Dashboard - Highly customizable: enable only the modules you need, add user personalized fields, choose your skin, several menu managers (can be used by internal users as a back-office with a particular menu, or by external users as a front-office with another one) -- APIs +- APIs (REST, SOAP) - Code that is easy to understand, maintain and develop (PHP with no heavy framework; trigger and hook architecture) + - Support a lot of country specific features: - Spanish Tax RE and ISPF - French NPR VAT rate (VAT called "Non Perçue Récupérable" for DOM-TOM) From 2707c0b89b9bcdb078d4e923c9f934884f77c60a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 30 Nov 2020 20:13:42 +0100 Subject: [PATCH 083/297] Look and feel v13 --- htdocs/core/class/commonobject.class.php | 5 ++++- htdocs/core/class/html.form.class.php | 24 +++++++++++------------ htdocs/core/tpl/objectline_create.tpl.php | 4 +++- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 6127319d537..64cf44e10c1 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -6728,7 +6728,7 @@ abstract class CommonObject * @param array $params Optional parameters. Example: array('style'=>'class="oddeven"', 'colspan'=>$colspan) * @param string $keysuffix Suffix string to add after name and id of field (can be used to avoid duplicate names) * @param string $keyprefix Prefix string to add before name and id of field (can be used to avoid duplicate names) - * @param string $onetrtd All fields in same tr td (TODO field not used ?) + * @param string $onetrtd All fields in same tr td. Used by objectline_create.tpl.php for example. * @return string */ public function showOptionals($extrafields, $mode = 'view', $params = null, $keysuffix = '', $keyprefix = '', $onetrtd = 0) @@ -6894,6 +6894,9 @@ abstract class CommonObject $helptoshow = $langs->trans($extrafields->attributes[$this->table_element]['help'][$key]); $out .= ''; + if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { + $out .= ''; + } $out .= ''; $out .= $formproject->select_projects($socid, $selected, $htmlname, $maxlength, 0, 1, $discard_closed, $forcefocus, 0, 0, '', 1); - $out .= ''; + $out .= ''; $out .= ''; } else { if ($selected) @@ -4591,7 +4591,7 @@ class Form print ''; print ''; $this->select_conditions_paiements($selected, $htmlname, -1, $addempty); - print ''; + print ''; print ''; } else { if ($selected) @@ -4624,7 +4624,7 @@ class Form print ''; print ''; $this->selectAvailabilityDelay($selected, $htmlname, -1, $addempty); - print ''; + print ''; print ''; } else { if ($selected) @@ -4656,7 +4656,7 @@ class Form print ''; print ''; $this->selectInputReason($selected, $htmlname, -1, $addempty); - print ''; + print ''; print ''; } else { if ($selected) @@ -4705,7 +4705,7 @@ class Form $ret .= ''; $ret .= $this->selectDate($selected, $htmlname, $displayhour, $displaymin, 1, 'form'.$htmlname, 1, 0); $ret .= ''; - $ret .= ''; + $ret .= ''; $ret .= ''; } else { if ($displayhour) $ret .= dol_print_date($selected, 'dayhour'); @@ -4739,7 +4739,7 @@ class Form print ''; print ''; print $this->select_dolusers($selected, $htmlname, 1, $exclude, 0, $include); - print ''; + print ''; print ''; } else { if ($selected) @@ -4777,7 +4777,7 @@ class Form print ''; print ''; $this->select_types_paiements($selected, $htmlname, $filtertype, 0, $addempty, 0, 0, $active); - print ''; + print ''; print ''; } else { if ($selected) @@ -4809,7 +4809,7 @@ class Form print ''; print ''; $this->selectTransportMode($selected, $htmlname, 2, $addempty, 0, 0, $active); - print ''; + print ''; print ''; } else { @@ -4842,7 +4842,7 @@ class Form print ''; print ''; print $this->selectMultiCurrency($selected, $htmlname, 0); - print ''; + print ''; print ''; } else { dol_include_once('/core/lib/company.lib.php'); @@ -4875,7 +4875,7 @@ class Form print ''; print ''; print ' '; - print ''; + print ''; print ''; } else { if (!empty($rate)) @@ -5008,7 +5008,7 @@ class Form print ''.$addcontact.''; } print ''; - print ''; + print ''; print ''; } else { if ($selected) @@ -5050,7 +5050,7 @@ class Form $out .= ''; $out .= ''; $out .= $this->select_company($selected, $htmlname, $filter, $showempty, $showtype, $forcecombo, $events); - $out .= ''; + $out .= ''; $out .= ''; } else { if ($selected) diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php index bc6f3313168..f028c00d704 100644 --- a/htdocs/core/tpl/objectline_create.tpl.php +++ b/htdocs/core/tpl/objectline_create.tpl.php @@ -419,7 +419,9 @@ if (is_object($objectline)) { if ((!empty($conf->service->enabled) || ($object->element == 'contrat')) && $dateSelector && GETPOST('type') != '0') // We show date field if required { print ''."\n"; - if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { print ''; } + if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { + print ''; + } print ''; $date_start = dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), 0, GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear')); $date_end = dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), 0, GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear')); From 99e4aab46e5ca8edb063c71bf9ab9aae5b3e21c5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 30 Nov 2020 20:31:22 +0100 Subject: [PATCH 084/297] CSS --- htdocs/core/lib/functions.lib.php | 2 +- htdocs/societe/class/societe.class.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index f594cdd052c..3cee55b78f2 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3350,7 +3350,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ // Define $color $arrayconvpictotocolor = array( 'address'=>'#6c6aa8', 'building'=>'#6c6aa8', 'bom'=>'#a69944', - 'companies'=>'#6c6aa8', 'company'=>'#6c6aa8', 'contact'=>'#37a', 'dynamicprice'=>'#a69944', + 'companies'=>'#6c6aa8', 'company'=>'#6c6aa8', 'contact'=>'#6c6aa8', 'dynamicprice'=>'#a69944', 'edit'=>'#444', 'note'=>'#999', 'error'=>'', 'help'=>'#bbb', 'listlight'=>'#999', 'dolly'=>'#a69944', 'dollyrevert'=>'#a69944', 'lot'=>'#a69944', 'map-marker-alt'=>'#aaa', 'mrp'=>'#a69944', 'product'=>'#a69944', 'service'=>'#a69944', 'stock'=>'#a69944', diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 6a819aa37f8..6b1ca1ad3a6 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -2533,7 +2533,7 @@ class Societe extends CommonObject $langs->load('companies'); $statusType = 'status4'; - if ($status == 0) $statusType = 'status5'; + if ($status == 0) $statusType = 'status6'; if (empty($this->labelStatus) || empty($this->labelStatusShort)) { From fc97e9fe4f6d4e37855273f4eb6799a8722a423c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 1 Dec 2020 01:38:06 +0100 Subject: [PATCH 085/297] Fix trans --- htdocs/langs/nl_BE/companies.lang | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/htdocs/langs/nl_BE/companies.lang b/htdocs/langs/nl_BE/companies.lang index a0db9d21665..b62eb40a97c 100644 --- a/htdocs/langs/nl_BE/companies.lang +++ b/htdocs/langs/nl_BE/companies.lang @@ -34,18 +34,8 @@ WrongSupplierCode=Leverancierscode ongeldig SupplierCodeModel=Leverancierscode-model ProfId6=Professionele ID 6 ProfId2AR=Prof Id 2 (Inkomsten voor belastingen) -ProfId2AU=-- -ProfId3AU=-- -ProfId4AU=-- -ProfId2BE=-- -ProfId3BE=-- -ProfId4BE=-- -ProfId2CH=-- ProfId3CH=Prof id 1 (Federaal nummer) -ProfId4DE=-- ProfId2ES=Prof Id 2 (INSZ-nummer) -ProfId2GB=-- -ProfId4GB=-- ProfId1LU=Prof. Id. 1 (R.S.C. Luxemburg) ProfId2LU=Prof. Id. 2 (zakelijke vergunning) ProfId2MA=Id prof. 2 (Patent) From aab7056b6f3a974f6e50121996947e5761aafd5b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 1 Dec 2020 01:57:40 +0100 Subject: [PATCH 086/297] Fix phpcs --- htdocs/api/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/api/index.php b/htdocs/api/index.php index f605ff11d85..2fba9fbb554 100644 --- a/htdocs/api/index.php +++ b/htdocs/api/index.php @@ -45,7 +45,7 @@ if (!$res) die("Include of main fails"); require_once DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/AutoLoader.php'; -call_user_func(function() { +call_user_func(function () { $loader = Luracast\Restler\AutoLoader::instance(); spl_autoload_register($loader); return $loader; From d0cb9bc4edb72d09491aeb30f1846991ee7efd25 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 1 Dec 2020 02:34:24 +0100 Subject: [PATCH 087/297] Debug price_rule page. --- htdocs/product/admin/dynamic_prices.php | 4 +- htdocs/product/admin/price_rules.php | 52 ++++++++++++------------- 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/htdocs/product/admin/dynamic_prices.php b/htdocs/product/admin/dynamic_prices.php index 228157a7be8..bae21309022 100644 --- a/htdocs/product/admin/dynamic_prices.php +++ b/htdocs/product/admin/dynamic_prices.php @@ -178,7 +178,7 @@ if ($action != 'create_updater' && $action != 'edit_updater') print ''.$entry->code.''; print ''.$entry->description.''; print ''.price($entry->value).''; - print 'id.'">'.img_edit().'  '; + print 'id.'">'.img_edit().'  '; print 'id.'">'.img_delete().''; print ''; } @@ -269,7 +269,7 @@ if ($action != 'create_variable' && $action != 'edit_variable') print ''.$entry->parameters.''; print ''.$entry->update_interval.''; print ''.$entry->getLastUpdated().''; - print 'id.'">'.img_edit().'  '; + print 'id.'">'.img_edit().'  '; print 'id.'">'.img_delete().''; print ''; } diff --git a/htdocs/product/admin/price_rules.php b/htdocs/product/admin/price_rules.php index 5b5743a742b..a38245d32c7 100644 --- a/htdocs/product/admin/price_rules.php +++ b/htdocs/product/admin/price_rules.php @@ -15,8 +15,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * Page to set how to autocalculate price for each level when option - * PRODUCT_MULTIPRICE is on. + * Page to set how to autocalculate price for each level when option PRODUCT_MULTIPRICE is on. + * This page is a tab in the setup of module Product if option PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL is set. */ require '../../main.inc.php'; @@ -32,6 +32,8 @@ $action = GETPOST('action', 'aZ09'); if (!$user->admin || (empty($conf->product->enabled) && empty($conf->service->enabled))) accessforbidden(); +$error = 0; + /** * Actions @@ -55,6 +57,7 @@ if ($action == 'update') { $i_var_percent = 0; + // Set $i_var_percent, the percent of price for level compared to an other level if ($i != 1) { $i_var_percent = (float) price2num($var_percent[$i]); } @@ -67,15 +70,12 @@ if ($action == 'update') { $check2 = $i_var_min_percent; } else { $check1 = $i_fk_level >= 1 && $i_fk_level <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; - $check2 = $i_var_percent && $i_var_min_percent; + $check2 = $i_var_percent && ($i_var_min_percent || (string) $i_var_min_percent === '0'); } - if (!$check1 || !$check2) { + if (empty($i_var_percent) && empty($i_var_min_percent)) { //If the level is between range but percent fields are empty, then we ensure it does not exist in DB - if ($check1) { - $db->query("DELETE FROM ".MAIN_DB_PREFIX."product_pricerules WHERE level = ".((int) $i)); - } - + $db->query("DELETE FROM ".MAIN_DB_PREFIX."product_pricerules WHERE level = ".((int) $i)); continue; } @@ -89,11 +89,14 @@ if ($action == 'update') { if (!$db->query($sql)) { setEventMessages($langs->trans('ErrorSavingChanges'), null, 'errors'); + $error++; } } } - setEventMessages($langs->trans("RecordSaved"), null, 'mesgs'); + if (!$error) { + setEventMessages($langs->trans("RecordSaved"), null, 'mesgs'); + } } @@ -133,32 +136,19 @@ print ''; print ''; $head = product_admin_prepare_head(); -print dol_get_fiche_head($head, 'generator', $tab, 0, 'product'); +print dol_get_fiche_head($head, 'generator', $tab, -1, 'product'); -print $langs->trans("MultiPriceRuleDesc").'

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

'; -print load_fiche_titre($langs->trans('MultipriceRules'), '', ''); - -//Array that contains the number of prices available +// Array that contains the number of prices available $price_options = array(); for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) { $price_options[$i] = $langs->trans('SellingPrice').' '.$i; } - -$genPriceOptions = function ($level) use ($price_options) { - - $return = array(); - - for ($i = 1; $i < $level; $i++) { - $return[$i] = $price_options[$i]; - } - - return $return; -}; ?> - +
@@ -181,7 +171,15 @@ $genPriceOptions = function ($level) use ($price_options) { '; + print ''; } // Action column print ''; @@ -1330,8 +1330,8 @@ if ($resql) // Status if (!empty($arrayfields['c.fk_statut']['checked'])) { - print ''; - if (!$i) $totalarray['nbfield']++; + print ''; + if (!$i) $totalarray['nbfield']++; } // Action column diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php index 70eecf02bbf..6e5e022c651 100644 --- a/htdocs/commande/stats/index.php +++ b/htdocs/commande/stats/index.php @@ -306,7 +306,7 @@ if ($mode == 'customer') } if ($mode == 'supplier') { - $formorder->selectSupplierOrderStatus((strstr($object_status, ',') ? -1 : $object_status), 0, 'object_status'); + $formorder->selectSupplierOrderStatus((strstr($object_status, ',') ? -1 : $object_status), 0, 'object_status'); } print ''; // Year diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 0f138833ae6..20be732da17 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -119,7 +119,7 @@ class Facture extends CommonInvoice * @var int Date expected for delivery * @deprecated */ - public $date_livraison; // deprecated; Use delivery_date instead. + public $date_livraison; // deprecated; Use delivery_date instead. public $delivery_date; // Date expected of shipment (date starting shipment, not the reception that occurs some days after) @@ -1331,7 +1331,7 @@ class Facture extends CommonInvoice $this->availability_id = $object->availability_id; $this->demand_reason_id = $object->demand_reason_id; $this->delivery_date = (empty($object->delivery_date) ? $object->date_livraison : $object->delivery_date); - $this->date_livraison = $object->delivery_date; // deprecated + $this->date_livraison = $object->delivery_date; // deprecated $this->fk_delivery_address = $object->fk_delivery_address; // deprecated $this->contact_id = $object->contact_id; $this->ref_client = $object->ref_client; diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index b693238924f..09acbcb7eb7 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -223,7 +223,7 @@ if ($conf->global->INVOICE_USE_SITUATION && $conf->global->INVOICE_USE_RETAINED_ } // Extra fields -include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_array_fields.tpl.php'; +include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php'; $object->fields = dol_sort_array($object->fields, 'position'); $arrayfields = dol_sort_array($arrayfields, 'position'); diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index 792ff73bcd3..7e852846d5c 100644 --- a/htdocs/compta/facture/prelevement.php +++ b/htdocs/compta/facture/prelevement.php @@ -632,10 +632,10 @@ if ($object->id > 0) print "\n
\n"; $buttonlabel = $langs->trans("MakeWithdrawRequest"); - $user_perms=$user->rights->prelevement->bons->creer; + $user_perms = $user->rights->prelevement->bons->creer; if ($type == 'bank-transfer') { $buttonlabel = $langs->trans("MakeBankTransferOrder"); - $user_perms=$user->rights->paymentbybanktransfer->create; + $user_perms = $user->rights->paymentbybanktransfer->create; } // Add a transfer request diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php index 21bf795079a..fb2f114b579 100644 --- a/htdocs/compta/prelevement/class/bonprelevement.class.php +++ b/htdocs/compta/prelevement/class/bonprelevement.class.php @@ -164,12 +164,12 @@ class BonPrelevement extends CommonObject $result = 0; } else { $result = -1; - $this->errors[] = get_class($this)."::AddFacture " . $this->db->lasterror; + $this->errors[] = get_class($this)."::AddFacture ".$this->db->lasterror; dol_syslog(get_class($this)."::AddFacture Error $result"); } } else { $result = -2; - $this->errors[]=get_class($this)."::AddFacture linedid Empty"; + $this->errors[] = get_class($this)."::AddFacture linedid Empty"; dol_syslog(get_class($this)."::AddFacture Error $result"); } } else { @@ -247,7 +247,7 @@ class BonPrelevement extends CommonObject $line_id = $this->db->last_insert_id(MAIN_DB_PREFIX."prelevement_lignes"); $result = 0; } else { - $this->errors[]=get_class($this)."::addline Error -2 " .$this->db->lasterror; + $this->errors[] = get_class($this)."::addline Error -2 ".$this->db->lasterror; dol_syslog(get_class($this)."::addline Error -2"); $result = -2; } @@ -1124,7 +1124,7 @@ class BonPrelevement extends CommonObject if (!$resql) { $error++; - $this->errors[]=$this->db->lasterror(); + $this->errors[] = $this->db->lasterror(); dol_syslog(__METHOD__."::Update Error=".$this->db->lasterror(), LOG_ERR); } } diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index 16f7ea82f36..5b8c708b1b2 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -203,7 +203,7 @@ if (!empty($conf->socialnetworks->enabled)) { } // Extra fields -include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_array_fields.tpl.php'; +include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php'; $object->fields = dol_sort_array($object->fields, 'position'); $arrayfields = dol_sort_array($arrayfields, 'position'); diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php index ad36a6e5ee7..80f16cb037d 100644 --- a/htdocs/core/actions_addupdatedelete.inc.php +++ b/htdocs/core/actions_addupdatedelete.inc.php @@ -62,7 +62,7 @@ if ($action == 'add' && !empty($permissiontoadd)) // Ignore special fields if (in_array($key, array('rowid', 'entity', 'import_key'))) continue; if (in_array($key, array('date_creation', 'tms', 'fk_user_creat', 'fk_user_modif'))) { - if (!in_array(abs($val['visible']), array(1, 3))) continue; // Only 1 and 3 that are case to create + if (!in_array(abs($val['visible']), array(1, 3))) continue; // Only 1 and 3 that are case to create } // Set value to insert @@ -146,7 +146,7 @@ if ($action == 'update' && !empty($permissiontoadd)) // Ignore special fields if (in_array($key, array('rowid', 'entity', 'import_key'))) continue; if (in_array($key, array('date_creation', 'tms', 'fk_user_creat', 'fk_user_modif'))) { - if (!in_array(abs($val['visible']), array(1, 3, 4))) continue; // Only 1 and 3 and 4 that are case to update + if (!in_array(abs($val['visible']), array(1, 3, 4))) continue; // Only 1 and 3 and 4 that are case to update } // Set value to update diff --git a/htdocs/core/actions_extrafields.inc.php b/htdocs/core/actions_extrafields.inc.php index 3181ea882da..d5936a6dadb 100644 --- a/htdocs/core/actions_extrafields.inc.php +++ b/htdocs/core/actions_extrafields.inc.php @@ -374,7 +374,7 @@ if ($action == 'update') GETPOST('computed_value', 'alpha'), (GETPOST('entitycurrentorall', 'alpha') ? 0 : ''), GETPOST('langfile'), - GETPOST('enabled', 'alpha'), + GETPOST('enabled', 'alpha'), (GETPOST('totalizable', 'alpha') ? 1 : 0), GETPOST('printable', 'alpha') ); diff --git a/htdocs/core/boxes/box_birthdays.php b/htdocs/core/boxes/box_birthdays.php index 7c33ace20ab..dcb3fefe13a 100644 --- a/htdocs/core/boxes/box_birthdays.php +++ b/htdocs/core/boxes/box_birthdays.php @@ -89,7 +89,7 @@ class box_birthdays extends ModeleBoxes $sql = "SELECT u.rowid, u.firstname, u.lastname, u.birth"; $sql .= " FROM ".MAIN_DB_PREFIX."user as u"; $sql .= " WHERE u.entity IN (".getEntity('user').")"; - $sql.= " AND u.statut = 1"; + $sql .= " AND u.statut = 1"; $sql .= dolSqlDateFilter('u.birth', 0, $tmparray['mon'], 0); $sql .= " ORDER BY u.birth ASC"; $sql .= $this->db->plimit($max, 0); diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php index a0564e3be0b..631c88d2123 100644 --- a/htdocs/core/class/commondocgenerator.class.php +++ b/htdocs/core/class/commondocgenerator.class.php @@ -123,7 +123,7 @@ abstract class CommonDocGenerator if ($member->photo) { $logotouse = $conf->adherent->dir_output.'/'.get_exdir(0, 0, 0, 1, $member, 'user').'/photos/'.$member->photo; } else { - $logotouse = DOL_DOCUMENT_ROOT . '/public/theme/common/nophoto.png'; + $logotouse = DOL_DOCUMENT_ROOT.'/public/theme/common/nophoto.png'; } $array_member = array( @@ -585,7 +585,7 @@ abstract class CommonDocGenerator 'line_product_ref'=>(empty($line->product_ref) ? '' : $line->product_ref), 'line_product_ref_fourn'=>(empty($line->ref_fourn) ? '' : $line->ref_fourn), // for supplier doc lines - 'line_product_label'=>(empty($line->product_label) ? '' :$line->product_label), + 'line_product_label'=>(empty($line->product_label) ? '' : $line->product_label), 'line_product_type'=>(empty($line->product_type) ? '' : $line->product_type), 'line_product_barcode'=>(empty($line->product_barcode) ? '' : $line->product_barcode), @@ -1342,7 +1342,7 @@ abstract class CommonDocGenerator if (!empty($fields)) { // Sort extrafields by rank - uasort($fields, function ($a, $b) { + uasort($fields, function($a, $b) { return ($a->rank > $b->rank) ? 1 : -1; }); diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 64cf44e10c1..9d2317d3c2c 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -5092,7 +5092,7 @@ abstract class CommonObject global $conf, $extrafields; if (empty($rowid)) $rowid = $this->id; - if (empty($rowid) && isset($this->rowid)) $rowid = $this->rowid; // deprecated + if (empty($rowid) && isset($this->rowid)) $rowid = $this->rowid; // deprecated // To avoid SQL errors. Probably not the better solution though if (!$this->table_element) { @@ -5939,7 +5939,7 @@ abstract class CommonObject $out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1); } elseif (in_array($type, array('duration'))) { $out = $form->select_duration($keyprefix.$key.$keysuffix, $value, 0, 'text', 0, 1); - } elseif (in_array($type, array('int', 'integer'))) { + } elseif (in_array($type, array('int', 'integer'))) { $tmp = explode(',', $size); $newsize = $tmp[0]; $out = ''; @@ -5949,7 +5949,7 @@ abstract class CommonObject $out = ''; } elseif (in_array($type, array('mail', 'phone', 'url'))) { $out = ''; - } elseif (preg_match('/^text/', $type)) { + } elseif (preg_match('/^text/', $type)) { if (!preg_match('/search_/', $keyprefix)) // If keyprefix is search_ or search_options_, we must just use a simple text field { require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; @@ -8060,7 +8060,7 @@ abstract class CommonObject // Delete llx_ecm_files if (!$error) { $res = $this->deleteEcmFiles(1); // Deleting files physically is done later with the dol_delete_dir_recursive - if (! $res) { + if (!$res) { $error++; } } @@ -8492,7 +8492,7 @@ abstract class CommonObject // Delete ecm_files extrafields $sql = "DELETE FROM ".MAIN_DB_PREFIX."ecm_files_extrafields WHERE fk_object IN ("; $sql .= " SELECT rowid FROM ".MAIN_DB_PREFIX."ecm_files WHERE filename LIKE '".$this->db->escape($this->ref)."%'"; - $sql .= " AND filepath = '".$this->db->escape($element)."/".$this->db->escape($this->ref)."' AND entity = ".$conf->entity; // No need of getEntity here + $sql .= " AND filepath = '".$this->db->escape($element)."/".$this->db->escape($this->ref)."' AND entity = ".$conf->entity; // No need of getEntity here $sql .= ")"; if (!$this->db->query($sql)) { @@ -8504,7 +8504,7 @@ abstract class CommonObject // Delete ecm_files $sql = "DELETE FROM ".MAIN_DB_PREFIX."ecm_files"; $sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%'"; - $sql .= " AND filepath = '".$this->db->escape($element)."/".$this->db->escape($this->ref)."' AND entity = ".$conf->entity; // No need of getEntity here + $sql .= " AND filepath = '".$this->db->escape($element)."/".$this->db->escape($this->ref)."' AND entity = ".$conf->entity; // No need of getEntity here if (!$this->db->query($sql)) { $this->error = $this->db->lasterror(); diff --git a/htdocs/core/class/dolgeoip.class.php b/htdocs/core/class/dolgeoip.class.php index 215a1710b82..98fbe62e4c5 100644 --- a/htdocs/core/class/dolgeoip.class.php +++ b/htdocs/core/class/dolgeoip.class.php @@ -98,7 +98,7 @@ class DolGeoIP //print 'function_exists(geoip_country_code_by_name))='.function_exists('geoip_country_code_by_name'); //print geoip_database_info(); } else { - $this->gi = ''; // For avoid error + $this->gi = ''; // For avoid error } } diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php index 1b8a9eb3291..16c133f9dab 100644 --- a/htdocs/core/class/events.class.php +++ b/htdocs/core/class/events.class.php @@ -141,7 +141,7 @@ class Events // extends CommonObject // Clean parameters $this->description = trim($this->description); - if (empty($this->user_agent)) $this->user_agent = (empty($_SERVER['HTTP_USER_AGENT'])?'':$_SERVER['HTTP_USER_AGENT']); + if (empty($this->user_agent)) $this->user_agent = (empty($_SERVER['HTTP_USER_AGENT']) ? '' : $_SERVER['HTTP_USER_AGENT']); // Check parameters if (empty($this->description)) { $this->error = 'ErrorBadValueForParameterCreateEventDesc'; return -1; } diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 5e8173b2b94..edde06227ba 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -1490,7 +1490,7 @@ class Form $out .= ajax_combobox($htmlid, $events, $conf->global->CONTACT_USE_SEARCH_TO_SELECT); } - if ($htmlname != 'none' && !$options_only) $out .= ''; if (($showempty == 1 || ($showempty == 3 && $num > 1)) && !$multiple) $out .= ''; if ($showempty == 2) $out .= ''; @@ -1523,7 +1523,7 @@ class Form if (!empty($contact_town)) $extendedInfos[] = $contact_town; elseif (!empty($company_town)) $extendedInfos[] = $company_town; $extendedInfos = implode(' - ', $extendedInfos); - if (!empty($extendedInfos)) $extendedInfos = ' - ' . $extendedInfos; + if (!empty($extendedInfos)) $extendedInfos = ' - '.$extendedInfos; } $contactstatic->id = $obj->rowid; @@ -1540,7 +1540,7 @@ class Form $out .= ''; @@ -1548,7 +1548,7 @@ class Form $out .= ''; @@ -1556,7 +1556,7 @@ class Form } else { if (in_array($obj->rowid, $selected)) { - $out .= $contactstatic->getFullName($langs) . $extendedInfos; + $out .= $contactstatic->getFullName($langs).$extendedInfos; if ($showfunction && $obj->poste) $out .= ' ('.$obj->poste.')'; if (($showsoc > 0) && $obj->company) $out .= ' - ('.$obj->company.')'; } diff --git a/htdocs/core/class/html.formorder.class.php b/htdocs/core/class/html.formorder.class.php index a0e1da55c7f..be169106621 100644 --- a/htdocs/core/class/html.formorder.class.php +++ b/htdocs/core/class/html.formorder.class.php @@ -62,11 +62,11 @@ class FormOrder extends Form $options[$value] = $tmpsupplierorder->getLibStatut($short); } - if (is_array($selected)) $selectedarray = $selected; - else $selectedarray = explode(',', $selected); + if (is_array($selected)) $selectedarray = $selected; + else $selectedarray = explode(',', $selected); - print Form::multiselectarray($hmlname, $options, $selectedarray, 0); - } + print Form::multiselectarray($hmlname, $options, $selectedarray, 0); + } /** * Return list of input method (mode used to receive order, like order received by email, fax, online) diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php index ab7bf604446..3c0aa7fba9e 100644 --- a/htdocs/core/class/translate.class.php +++ b/htdocs/core/class/translate.class.php @@ -623,7 +623,7 @@ class Translate // We replace some HTML tags by __xx__ to avoid having them encoded by htmlentities because // we want to keep '"' '' '' '' '' '
' '< ' '' that are reliable HTML tags inside translation strings. $str = str_replace( - array('"', '', '', '', '', '', '
', '', '< ', '>'), // We accept '< ' but not '<'. We can accept however '>' + array('"', '', '', '', '', '', '
', '', '< ', '>'), // We accept '< ' but not '<'. We can accept however '>' array('__quot__', '__tagbold__', '__tagboldend__', '__tagbold__', '__tagboldend__', '__taga__', '__tagaend__', '__tagbr__', '__tagspan__', '__tagspanend__', '__lt__', '__gt__'), $str ); @@ -745,7 +745,7 @@ class Translate */ public function transcountrynoentities($str, $countrycode) { - if (! empty($this->tab_translate["$str$countrycode"])) return $this->transnoentities("$str$countrycode"); + if (!empty($this->tab_translate["$str$countrycode"])) return $this->transnoentities("$str$countrycode"); else return $this->transnoentities($str); } diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 3cee55b78f2..7523d2f5d77 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -272,7 +272,7 @@ function GETPOSTISSET($paramname) $isset = true; } } else { - $isset = (isset($_POST[$paramname]) || isset($_GET[$paramname])); // We must keep $_POST and $_GET here + $isset = (isset($_POST[$paramname]) || isset($_GET[$paramname])); // We must keep $_POST and $_GET here } return $isset; @@ -1289,11 +1289,11 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename = */ function dolButtonToOpenUrlInDialogPopup($name, $label, $buttonstring, $url, $disabled = '') { - if (strpos($url, '?') > 0) { - $url .= '&dol_hide_topmenu=1&dol_hide_leftmenu=1&dol_openinpopup=1'; - } else { - $url .= '?dol_hide_menuinpopup=1&dol_hide_leftmenu=1&dol_openinpopup=1'; - } + if (strpos($url, '?') > 0) { + $url .= '&dol_hide_topmenu=1&dol_hide_leftmenu=1&dol_openinpopup=1'; + } else { + $url .= '?dol_hide_menuinpopup=1&dol_hide_leftmenu=1&dol_openinpopup=1'; + } //print ''; $out = ''.$buttonstring.''; @@ -4139,7 +4139,7 @@ function dol_print_error($db = '', $error = '', $errors = null) print $out; } else { if (empty($langs->defaultlang)) $langs->setDefaultLang(); - $langs->loadLangs(array("main", "errors")); // Reload main because language may have been set only on previous line so we have to reload files we need. + $langs->loadLangs(array("main", "errors")); // Reload main because language may have been set only on previous line so we have to reload files we need. // This should not happen, except if there is a bug somewhere. Enabled and check log in such case. print 'This website or feature is currently temporarly not available or failed after a technical error.

This may be due to a maintenance operation. Current status of operation are on next line...

'."\n"; print $langs->trans("DolibarrHasDetectedError").'. '; @@ -5592,7 +5592,7 @@ function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart = ' // In a future, we may distribut directories on several levels depending on setup and object. // Here, $object->id, $object->ref and $modulepart are required. //var_dump($modulepart); - if (! in_array($modulepart, array('product'))) { // Test to remove + if (!in_array($modulepart, array('product'))) { // Test to remove $path = dol_sanitizeFileName(empty($object->ref) ? $object->id : $object->ref); } } @@ -6294,7 +6294,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null, if (is_object($object) && ($object->element == 'adherent' || $object->element == 'member') && $object->id > 0) { - $birthday = (empty($object->birth) ? '': dol_print_date($object->birth, 'day')); + $birthday = (empty($object->birth) ? '' : dol_print_date($object->birth, 'day')); $substitutionarray['__MEMBER_ID__'] = (isset($object->id) ? $object->id : ''); if (method_exists($object, 'getCivilityLabel')) $substitutionarray['__MEMBER_CIVILITY__'] = $object->getCivilityLabel(); @@ -6694,7 +6694,7 @@ function complete_substitutions_array(&$substitutionarray, $outputlangs, $object // to list all tags in odt template $tags = ''; foreach ($substitutionarray as $key => $value) { - $tags .= '{' . $key . '} => ' . $value ."\n"; + $tags .= '{'.$key.'} => '.$value."\n"; } $substitutionarray = array_merge($substitutionarray, array('__ALL_TAGS__' => $tags)); } diff --git a/htdocs/core/lib/phpsessionindb.lib.php b/htdocs/core/lib/phpsessionindb.lib.php index d0e96434d00..f2e7d42597e 100644 --- a/htdocs/core/lib/phpsessionindb.lib.php +++ b/htdocs/core/lib/phpsessionindb.lib.php @@ -150,7 +150,7 @@ function dolSessionGC($max_lifetime) $time_stamp = dol_now(); - $delete_query = "DELETE FROM ".MAIN_DB_PREFIX."session"; + $delete_query = "DELETE FROM ".MAIN_DB_PREFIX."session"; $delete_query .= " WHERE last_accessed < '".$dbsession->idate($time_stamp - $max_lifetime)."'"; $resql = $dbsession->query($delete_query); diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index 10789d2b367..736044fafe7 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -485,7 +485,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t $taskstatic->fk_statut = $lines[$i]->status; $taskstatic->date_start = $lines[$i]->date_start; $taskstatic->date_end = $lines[$i]->date_end; - $taskstatic->datee = $lines[$i]->date_end; // deprecated + $taskstatic->datee = $lines[$i]->date_end; // deprecated $taskstatic->planned_workload = $lines[$i]->planned_workload; $taskstatic->duration_effective = $lines[$i]->duration; @@ -1319,7 +1319,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr global $daytoparse; $tmparray = dol_getdate($daytoparse, true); // detail of current day - $idw = ($tmparray['wday'] - (empty($conf->global->MAIN_START_WEEK)?0:1)); + $idw = ($tmparray['wday'] - (empty($conf->global->MAIN_START_WEEK) ? 0 : 1)); global $numstartworkingday, $numendworkingday; $cssweekend = ''; if ((($idw + 1) < $numstartworkingday) || (($idw + 1) > $numendworkingday)) // This is a day is not inside the setup of working days, so we use a week-end css. diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index e005c93e976..32c58f21eac 100644 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -420,7 +420,7 @@ class pdf_crabe extends ModelePDFFactures $tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10); // Incoterm - if (! empty($conf->incoterm->enabled)) + if (!empty($conf->incoterm->enabled)) { $desc_incoterms = $object->getIncotermsForPDF(); if ($desc_incoterms) diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php index 959cb45a77e..36dc3ca8f13 100644 --- a/htdocs/core/modules/import/import_csv.modules.php +++ b/htdocs/core/modules/import/import_csv.modules.php @@ -605,7 +605,7 @@ class ImportCsv extends ModeleImports $errorforthistable++; $error++; } else { - $newval = $arrayrecord[($key - 1)]['val']; //We get new value computed. + $newval = $arrayrecord[($key - 1)]['val']; //We get new value computed. } } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric') { $newval = price2num($newval); diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php index 5502508d350..858dc8e1076 100644 --- a/htdocs/core/modules/import/import_xlsx.modules.php +++ b/htdocs/core/modules/import/import_xlsx.modules.php @@ -639,7 +639,7 @@ class ImportXlsx extends ModeleImports $errorforthistable++; $error++; } else { - $newval = $arrayrecord[($key - 1)]['val']; //We get new value computed. + $newval = $arrayrecord[($key - 1)]['val']; //We get new value computed. } } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric') { $newval = price2num($newval); diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php index 694c77b8881..4b397df65e4 100644 --- a/htdocs/core/modules/modUser.class.php +++ b/htdocs/core/modules/modUser.class.php @@ -258,10 +258,10 @@ class modUser extends DolibarrModules $keyforselect = 'user'; $keyforelement = 'user'; $keyforaliasextra = 'extra'; include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php'; if (empty($conf->adherent->enabled)) - { - unset($this->export_fields_array[$r]['u.fk_member']); - unset($this->export_entities_array[$r]['u.fk_member']); - } + { + unset($this->export_fields_array[$r]['u.fk_member']); + unset($this->export_entities_array[$r]['u.fk_member']); + } $this->export_sql_start[$r] = 'SELECT DISTINCT '; $this->export_sql_end[$r] = ' FROM '.MAIN_DB_PREFIX.'user as u'; $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user_extrafields as extra ON u.rowid = extra.fk_object'; diff --git a/htdocs/core/tpl/extrafields_list_array_fields.tpl.php b/htdocs/core/tpl/extrafields_list_array_fields.tpl.php index 54cb8cbc93b..6e68dd94bea 100644 --- a/htdocs/core/tpl/extrafields_list_array_fields.tpl.php +++ b/htdocs/core/tpl/extrafields_list_array_fields.tpl.php @@ -9,10 +9,10 @@ if (empty($conf) || !is_object($conf)) exit; } -if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey=$object->table_element; +if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey = $object->table_element; // Loop to show all columns of extrafields from $obj, $extrafields and $db -if (! empty($extrafieldsobjectkey)) // $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ... +if (!empty($extrafieldsobjectkey)) // $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ... { if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']) > 0) { if (empty($extrafieldsobjectprefix)) $extrafieldsobjectprefix = 'ef.'; diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php index e1bcaf85034..48c9614dea6 100644 --- a/htdocs/core/triggers/interface_20_all_Logevents.class.php +++ b/htdocs/core/triggers/interface_20_all_Logevents.class.php @@ -174,7 +174,7 @@ class InterfaceLogevents extends DolibarrTriggers $event->dateevent = $date; $event->label = $text; $event->description = $desc; - $event->user_agent = (empty($_SERVER["HTTP_USER_AGENT"])?'':$_SERVER["HTTP_USER_AGENT"]); + $event->user_agent = (empty($_SERVER["HTTP_USER_AGENT"]) ? '' : $_SERVER["HTTP_USER_AGENT"]); $result = $event->create($user); if ($result > 0) { diff --git a/htdocs/document.php b/htdocs/document.php index c48a0363f78..060722e8d5b 100644 --- a/htdocs/document.php +++ b/htdocs/document.php @@ -245,7 +245,7 @@ if (!file_exists($fullpath_original_file_osencoded)) // Hooks if (!is_object($hookmanager)) { - include_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php'; + include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; $hookmanager = new HookManager($this->db); } $hookmanager->initHooks(array('document')); @@ -254,9 +254,9 @@ $parameters = array('ecmfile' => $ecmfile, 'modulepart' => $modulepart, 'origina 'filename' => $filename, 'fullpath_original_file_osencoded' => $fullpath_original_file_osencoded); $reshook = $hookmanager->executeHooks('downloadDocument', $parameters); // Note that $action and $object may have been if ($reshook < 0) { - $errors = $hookmanager->error . (is_array($hookmanager->errors) ? (!empty($hookmanager->error) ? ', ' : '') . join($separator, $hookmanager->errors) : ''); - dol_syslog("document.php - Errors when executing the hook 'downloadDocument' : " . $errors); - print "ErrorDownloadDocumentHooks: " . $errors; + $errors = $hookmanager->error.(is_array($hookmanager->errors) ? (!empty($hookmanager->error) ? ', ' : '').join($separator, $hookmanager->errors) : ''); + dol_syslog("document.php - Errors when executing the hook 'downloadDocument' : ".$errors); + print "ErrorDownloadDocumentHooks: ".$errors; exit; } diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index 907b7ea9051..09a46f94bb8 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -620,7 +620,7 @@ class Expedition extends CommonObject $this->getUrlTrackingStatus($obj->tracking_number); // Thirdparty - $result = $this->fetch_thirdparty(); // TODO Remove this + $result = $this->fetch_thirdparty(); // TODO Remove this // Retrieve extrafields $this->fetch_optionals(); diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php index 77a62bf8561..eaae2438b55 100644 --- a/htdocs/expedition/list.php +++ b/htdocs/expedition/list.php @@ -133,7 +133,7 @@ $arrayfields = array( ); // Extra fields -include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_array_fields.tpl.php'; +include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php'; $object->fields = dol_sort_array($object->fields, 'position'); $arrayfields = dol_sort_array($arrayfields, 'position'); diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php index c61dff46b38..ac1d052486f 100644 --- a/htdocs/expensereport/class/expensereport.class.php +++ b/htdocs/expensereport/class/expensereport.class.php @@ -1101,7 +1101,7 @@ class ExpenseReport extends CommonObject $tabletodelete = $this->table_element_line; //$sqlef = "DELETE FROM ".MAIN_DB_PREFIX.$tabletodelete."_extrafields WHERE fk_object IN (SELECT rowid FROM ".MAIN_DB_PREFIX.$tabletodelete." WHERE ".$this->fk_element." = ".$this->id.")"; $sql = "DELETE FROM ".MAIN_DB_PREFIX.$tabletodelete." WHERE ".$this->fk_element." = ".$this->id; - if (! $this->db->query($sql)) { + if (!$this->db->query($sql)) { $error++; $this->error = $this->db->lasterror(); $this->errors[] = $this->error; @@ -1134,7 +1134,7 @@ class ExpenseReport extends CommonObject if (!$error) { $sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element." WHERE rowid = ".$this->id; $res = $this->db->query($sql); - if (! $res) { + if (!$res) { $error++; $this->error = $this->db->lasterror(); $this->errors[] = $this->error; @@ -1145,7 +1145,7 @@ class ExpenseReport extends CommonObject // Delete record into ECM index and physically if (!$error) { $res = $this->deleteEcmFiles(0); // Deleting files physically is done later with the dol_delete_dir_recursive - if (! $res) { + if (!$res) { $error++; } } @@ -1186,7 +1186,7 @@ class ExpenseReport extends CommonObject $this->db->rollback(); return -1; } - } + } /** * Set to status validate diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 6fe473cc12f..b03faf7f629 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -363,7 +363,7 @@ class CommandeFournisseur extends CommonOrder $this->date_approve = $this->db->jdate($obj->date_approve); $this->date_approve2 = $this->db->jdate($obj->date_approve2); $this->date_commande = $this->db->jdate($obj->date_commande); // date we make the order to supplier - $this->date_livraison = $this->db->jdate($obj->delivery_date); // deprecated + $this->date_livraison = $this->db->jdate($obj->delivery_date); // deprecated $this->delivery_date = $this->db->jdate($obj->delivery_date); $this->remise_percent = $obj->remise_percent; $this->methode_commande_id = $obj->fk_input_method; diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index cf6543c96e0..abb6245fa22 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -1143,9 +1143,9 @@ if (empty($reshook)) $object->cond_reglement_id = GETPOST('cond_reglement_id'); $object->mode_reglement_id = GETPOST('mode_reglement_id'); $object->fk_account = GETPOST('fk_account', 'int'); - $object->note_private = GETPOST('note_private', 'restricthtml'); + $object->note_private = GETPOST('note_private', 'restricthtml'); $object->note_public = GETPOST('note_public', 'restricthtml'); - $object->date_livraison = $datelivraison; // deprecated + $object->date_livraison = $datelivraison; // deprecated $object->delivery_date = $datelivraison; $object->fk_incoterms = GETPOST('incoterm_id', 'int'); $object->location_incoterms = GETPOST('location_incoterms', 'alpha'); diff --git a/htdocs/index.php b/htdocs/index.php index 706e9a1a1ef..887baa04e78 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -595,7 +595,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) { $valid_dashboardlines = array(); foreach ($dashboardlines as $workboardid => $tmp) { if ($tmp instanceof WorkboardResponse) { - $tmp->id = $workboardid; // Complete the object to add its id into its name + $tmp->id = $workboardid; // Complete the object to add its id into its name $valid_dashboardlines[$workboardid] = $tmp; } } diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 782685daeba..1724ae9dd42 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -995,7 +995,7 @@ if (!defined('NOLOGIN')) $user->getrights(); } -dol_syslog("--- Access to ".$_SERVER["REQUEST_METHOD"].' '.$_SERVER["PHP_SELF"].' - action='.GETPOST('action', 'aZ09').', massaction='.GETPOST('massaction', 'aZ09').' NOTOKENRENEWAL='.(defined('NOTOKENRENEWAL')?constant('NOTOKENRENEWAL'):'')); +dol_syslog("--- Access to ".$_SERVER["REQUEST_METHOD"].' '.$_SERVER["PHP_SELF"].' - action='.GETPOST('action', 'aZ09').', massaction='.GETPOST('massaction', 'aZ09').' NOTOKENRENEWAL='.(defined('NOTOKENRENEWAL') ?constant('NOTOKENRENEWAL') : '')); //Another call for easy debugg //dol_syslog("Access to ".$_SERVER["PHP_SELF"].' GET='.join(',',array_keys($_GET)).'->'.join(',',$_GET).' POST:'.join(',',array_keys($_POST)).'->'.join(',',$_POST)); @@ -1702,8 +1702,8 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead $title = $langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage' : 'GoToHelpPage').'...'; if ($mode == 'wiki') { $title .= '
'.$langs->trans("PageWiki").' '.dol_escape_htmltag('"'.strtr($helppage, '_', ' ').'"'); - if ($helppresent) $title.= ' ('.$langs->trans("DedicatedPageAvailable").')'; - else $title.= ' ('.$langs->trans("HomePage").')'; + if ($helppresent) $title .= ' ('.$langs->trans("DedicatedPageAvailable").')'; + else $title .= ' ('.$langs->trans("HomePage").')'; } $text .= 'assertLessThan($result, 0); @@ -175,15 +175,15 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase */ public function testMyObjectDelete($id) { - global $conf,$user,$langs,$db; - $conf=$this->savconf; - $user=$this->savuser; - $langs=$this->savlangs; - $db=$this->savdb; + global $conf, $user, $langs, $db; + $conf = $this->savconf; + $user = $this->savuser; + $langs = $this->savlangs; + $db = $this->savdb; - $localobject=new MyObject($this->savdb); - $result=$localobject->fetch($id); - $result=$localobject->delete($user); + $localobject = new MyObject($this->savdb); + $result = $localobject->fetch($id); + $result = $localobject->delete($user); print __METHOD__." id=".$id." result=".$result."\n"; $this->assertLessThan($result, 0); diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 3c76d25df8b..8fd41228b83 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -4238,15 +4238,15 @@ class Product extends CommonObject if ($mode == 0) { $sql .= " WHERE pa.fk_product_fils = ".$this->id." OR pa.fk_product_pere = ".$this->id; } elseif ($mode == -1) { - $sql .= " WHERE pa.fk_product_fils = ".$this->id; // We are a child, so we found lines that link to parents (can have several parents) + $sql .= " WHERE pa.fk_product_fils = ".$this->id; // We are a child, so we found lines that link to parents (can have several parents) } elseif ($mode == 1) { - $sql .= " WHERE pa.fk_product_pere = ".$this->id; // We are a parent, so we found lines that link to children (can have several children) + $sql .= " WHERE pa.fk_product_pere = ".$this->id; // We are a parent, so we found lines that link to children (can have several children) } $resql = $this->db->query($sql); if ($resql) { $obj = $this->db->fetch_object($resql); - if ($obj) { $nb = $obj->nb; } + if ($obj) { $nb = $obj->nb; } } else { return -1; } diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index d30c10408f1..4853d04f120 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -610,17 +610,17 @@ if ($id > 0 || $ref) '; } - if (!empty($conf->multicurrency->enabled)) { - // Currency - print '
'; - print ''; - print ''; + if (!empty($conf->multicurrency->enabled)) { + // Currency + print ''; + print ''; + print ''; // Currency price qty min print ''; diff --git a/htdocs/product/list.php b/htdocs/product/list.php index 12a6c807515..86b8b62fc81 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -243,7 +243,7 @@ if ($conf->global->PRODUIT_MULTIPRICES) { //var_dump($arraypricelevel); // Extra fields -include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_array_fields.tpl.php'; +include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php'; $object->fields = dol_sort_array($object->fields, 'position'); $arrayfields = dol_sort_array($arrayfields, 'position'); @@ -1283,58 +1283,58 @@ if ($resql) // Multiprices if (! empty($conf->global->PRODUIT_MULTIPRICES)) { - if (! isset($productpricescache)) { - $productpricescache=array(); - } - if (! isset($productpricescache[$obj->rowid])) { - $productpricescache[$obj->rowid] = array(); - } + if (! isset($productpricescache)) { + $productpricescache=array(); + } + if (! isset($productpricescache[$obj->rowid])) { + $productpricescache[$obj->rowid] = array(); + } - if ($obj->tosell) - { - // Make 1 request for all price levels (without filter on price_level) and saved result into an cache array - // then reuse the cache array if we need prices for other price levels - $sqlp = "SELECT p.rowid, p.fk_product, p.price, p.price_ttc, p.price_level, p.date_price, p.price_base_type"; - $sqlp .= " FROM ".MAIN_DB_PREFIX."product_price as p"; - $sqlp .= " WHERE fk_product = ".$obj->rowid; - $sqlp .= " ORDER BY p.date_price DESC, p.rowid DESC, p.price_level ASC"; - $resultp = $db->query($sqlp); - if ($resultp) - { - $nump = $db->num_rows($resultp); - $j = 0; - while ($j < $nump) - { - $objp = $db->fetch_object($resultp); + if ($obj->tosell) + { + // Make 1 request for all price levels (without filter on price_level) and saved result into an cache array + // then reuse the cache array if we need prices for other price levels + $sqlp = "SELECT p.rowid, p.fk_product, p.price, p.price_ttc, p.price_level, p.date_price, p.price_base_type"; + $sqlp .= " FROM ".MAIN_DB_PREFIX."product_price as p"; + $sqlp .= " WHERE fk_product = ".$obj->rowid; + $sqlp .= " ORDER BY p.date_price DESC, p.rowid DESC, p.price_level ASC"; + $resultp = $db->query($sqlp); + if ($resultp) + { + $nump = $db->num_rows($resultp); + $j = 0; + while ($j < $nump) + { + $objp = $db->fetch_object($resultp); - if (empty($productpricescache[$obj->rowid][$objp->price_level])) - { - $productpricescache[$obj->rowid][$objp->price_level]['price'] = $objp->price; - $productpricescache[$obj->rowid][$objp->price_level]['price_ttc'] = $objp->price_ttc; - $productpricescache[$obj->rowid][$objp->price_level]['price_base_type'] = $objp->price_base_type; - } + if (empty($productpricescache[$obj->rowid][$objp->price_level])) + { + $productpricescache[$obj->rowid][$objp->price_level]['price'] = $objp->price; + $productpricescache[$obj->rowid][$objp->price_level]['price_ttc'] = $objp->price_ttc; + $productpricescache[$obj->rowid][$objp->price_level]['price_base_type'] = $objp->price_base_type; + } - $j++; - } + $j++; + } - $db->free($resultp); - } else { - dol_print_error($db); - } - } + $db->free($resultp); + } else { + dol_print_error($db); + } + } foreach ($arraypricelevel as $key => $value) { if (!empty($arrayfields['p.sellprice'.$key]['checked'])) { print ''; if (!$i) $totalarray['nbfield']++; diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 74d6946d6e4..a4c5de4c47d 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -112,7 +112,7 @@ if (empty($reshook)) // We must define tva_tx, npr and local taxes $tva_tx = $tva_tx_txt; - $reg = array(); + $reg = array(); $vatratecode = ''; if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg)) { @@ -330,7 +330,7 @@ if (empty($reshook)) 'price' => $newprice, 'price_min' => $newprice_min, 'price_base_type' => $newpricebase, - 'default_vat_code' => $vatratecode, + 'default_vat_code' => $vatratecode, 'vat_tx' => $tva_tx, // default_vat_code should be used in priority in a future 'npr' => $npr, // default_vat_code should be used in priority in a future 'localtaxes_array' => array('0'=>$localtax1_type, '1'=>$localtax1, '2'=>$localtax2_type, '3'=>$localtax2) // default_vat_code should be used in priority in a future diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php index 38cc5fedd88..535da42eeba 100644 --- a/htdocs/product/stock/card.php +++ b/htdocs/product/stock/card.php @@ -102,7 +102,7 @@ if (empty($reshook)) $object->address = (string) GETPOST("address", "alpha"); $object->zip = (string) GETPOST("zipcode", "alpha"); $object->town = (string) GETPOST("town", "alpha"); - $object->country_id = GETPOST("country_id"); + $object->country_id = GETPOST("country_id"); $object->phone = (string) GETPOST("phone", "alpha"); $object->fax = (string) GETPOST("fax", "alpha"); diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php index 8e13553113a..c97c56b2887 100644 --- a/htdocs/product/stock/class/mouvementstock.class.php +++ b/htdocs/product/stock/class/mouvementstock.class.php @@ -159,7 +159,7 @@ class MouvementStock extends CommonObject dol_syslog(get_class($this)."::_create start userid=$user->id, fk_product=$fk_product, warehouse_id=$entrepot_id, qty=$qty, type=$type, price=$price, label=$label, inventorycode=$inventorycode, datem=".$datem.", eatby=".$eatby.", sellby=".$sellby.", batch=".$batch.", skip_batch=".$skip_batch); // Clean parameters - $price = price2num($price, 'MU'); // Clean value for the casse we receive a float zero value, to have it a real zero value. + $price = price2num($price, 'MU'); // Clean value for the casse we receive a float zero value, to have it a real zero value. if (empty($price)) $price = 0; $now = (!empty($datem) ? $datem : dol_now()); diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php index 76724dfd80f..9e15a580358 100644 --- a/htdocs/projet/activity/perday.php +++ b/htdocs/projet/activity/perday.php @@ -620,7 +620,7 @@ if ($test) $isavailable[$daytoparse] = array('morning'=>false, 'afternoon'=>fals $tmparray = dol_getdate($daytoparse, true); // detail of current day // For monday, must be 0 for monday if MAIN_START_WEEK = 1, must be 1 for monday if MAIN_START_WEEK = 0 -$idw = ($tmparray['wday'] - (empty($conf->global->MAIN_START_WEEK)?0:1)); +$idw = ($tmparray['wday'] - (empty($conf->global->MAIN_START_WEEK) ? 0 : 1)); // numstartworkingday and numendworkingday are default start and end date of working days (1 means sunday if MAIN_START_WEEK is 0, 1 means monday if MAIN_START_WEEK is 1) $cssweekend = ''; if ((($idw + 1) < $numstartworkingday) || (($idw + 1) > $numendworkingday)) // This is a day is not inside the setup of working days, so we use a week-end css. diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index d1d02db3485..d71ac0852bc 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -922,7 +922,7 @@ class Task extends CommonObject $tasks[$i]->planned_workload = $obj->planned_workload; if ($includebilltime) { - $tasks[$i]->tobill = $obj->tobill; + $tasks[$i]->tobill = $obj->tobill; $tasks[$i]->billed = $obj->billed; } diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index 9939d8f0d32..e076bee598d 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -963,7 +963,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0) print $langs->trans('InvoiceToUse'); print ''; print ''; print ''; /*print ''; diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php index b52cc3afe84..07e32b64432 100644 --- a/htdocs/reception/class/reception.class.php +++ b/htdocs/reception/class/reception.class.php @@ -390,7 +390,7 @@ class Reception extends CommonObject $this->ref = $obj->ref; $this->socid = $obj->socid; $this->ref_supplier = $obj->ref_supplier; - $this->ref_ext = $obj->ref_ext; + $this->ref_ext = $obj->ref_ext; $this->statut = $obj->fk_statut; $this->user_author_id = $obj->fk_user_author; $this->date_creation = $this->db->jdate($obj->date_creation); diff --git a/htdocs/recruitment/recruitmentcandidature_card.php b/htdocs/recruitment/recruitmentcandidature_card.php index 8c76fdbb28e..9d05674d656 100644 --- a/htdocs/recruitment/recruitmentcandidature_card.php +++ b/htdocs/recruitment/recruitmentcandidature_card.php @@ -247,7 +247,7 @@ if (empty($reshook)) $nuser->personal_mobile = $object->phone; $nuser->birth = $object->date_birth; $nuser->salary = $object->remuneration_proposed; - $nuser->fk_user = $jobposition->fk_user_supervisor; // Supervisor + $nuser->fk_user = $jobposition->fk_user_supervisor; // Supervisor $result = $nuser->create($user); diff --git a/htdocs/recruitment/recruitmentjobposition_list.php b/htdocs/recruitment/recruitmentjobposition_list.php index c942975a91d..1891d9ce822 100644 --- a/htdocs/recruitment/recruitmentjobposition_list.php +++ b/htdocs/recruitment/recruitmentjobposition_list.php @@ -269,20 +269,20 @@ $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $objec $sql .= $hookmanager->resPrint; /* If a group by is required */ -$sql.= " GROUP BY "; +$sql .= " GROUP BY "; foreach ($object->fields as $key => $val) { - $sql.='t.'.$key.', '; + $sql .= 't.'.$key.', '; } // Add fields from extrafields -if (! empty($extrafields->attributes[$object->table_element]['label'])) { - foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : ''); +if (!empty($extrafields->attributes[$object->table_element]['label'])) { + foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : ''); } // Add where from hooks -$parameters=array(); -$reshook=$hookmanager->executeHooks('printFieldListGroupBy', $parameters); // Note that $action and $object may have been modified by hook -$sql.=$hookmanager->resPrint; -$sql=preg_replace('/,\s*$/', '', $sql); +$parameters = array(); +$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters); // Note that $action and $object may have been modified by hook +$sql .= $hookmanager->resPrint; +$sql = preg_replace('/,\s*$/', '', $sql); $sql .= $db->order($sortfield, $sortorder); diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php index ac26eed537a..49b58d61d08 100644 --- a/htdocs/societe/admin/societe.php +++ b/htdocs/societe/admin/societe.php @@ -813,14 +813,14 @@ print ''; print ''; print ''; -print ''; +print ''; print ''; print ''; diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php index 56e774e7a9b..5a843e9856a 100644 --- a/htdocs/societe/list.php +++ b/htdocs/societe/list.php @@ -214,7 +214,7 @@ $arrayfields = array( 's.import_key'=>array('label'=>"ImportId", 'checked'=>0, 'position'=>1100), ); // Extra fields -include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_array_fields.tpl.php'; +include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php'; $object->fields = dol_sort_array($object->fields, 'position'); $arrayfields = dol_sort_array($arrayfields, 'position'); diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php index 893748deee7..ade660ef1b4 100644 --- a/htdocs/supplier_proposal/card.php +++ b/htdocs/supplier_proposal/card.php @@ -257,7 +257,7 @@ if (empty($reshook)) { if ($object->fetch(GETPOST('copie_supplier_proposal')) > 0) { $object->ref = GETPOST('ref'); - $object->date_livraison = $date_delivery; // deprecated + $object->date_livraison = $date_delivery; // deprecated $object->delivery_date = $date_delivery; $object->shipping_method_id = GETPOST('shipping_method_id', 'int'); $object->cond_reglement_id = GETPOST('cond_reglement_id'); diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php index 9a6ed7e1d38..b46ed476629 100644 --- a/htdocs/supplier_proposal/class/supplier_proposal.class.php +++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php @@ -1240,7 +1240,7 @@ class SupplierProposal extends CommonObject $this->datev = $this->db->jdate($obj->datev); // TODO deprecated $this->date_creation = $this->db->jdate($obj->datec); //Creation date $this->date_validation = $this->db->jdate($obj->datev); //Validation date - $this->date_livraison = $this->db->jdate($obj->delivery_date); // deprecated + $this->date_livraison = $this->db->jdate($obj->delivery_date); // deprecated $this->delivery_date = $this->db->jdate($obj->delivery_date); $this->shipping_method_id = ($obj->fk_shipping_method > 0) ? $obj->fk_shipping_method : null; diff --git a/htdocs/takepos/floors.php b/htdocs/takepos/floors.php index 9e6f9d2a448..72f25a86ce4 100644 --- a/htdocs/takepos/floors.php +++ b/htdocs/takepos/floors.php @@ -64,8 +64,8 @@ if ($action == "getTables") $rows = array(); while ($row = $db->fetch_array($resql)) { $invoice = new Facture($db); - $result=$invoice->fetch('', '(PROV-POS'.$_SESSION['takeposterminal'].'-'.$row['rowid'].')'); - if ($result>0) $row['occupied']="red"; + $result = $invoice->fetch('', '(PROV-POS'.$_SESSION['takeposterminal'].'-'.$row['rowid'].')'); + if ($result > 0) $row['occupied'] = "red"; $rows[] = $row; } echo json_encode($rows); diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php index 81da82087ec..f5e40806f5a 100644 --- a/htdocs/takepos/invoice.php +++ b/htdocs/takepos/invoice.php @@ -420,9 +420,9 @@ if ($action == 'creditnote') } } -if ($action == 'history' || $action=='creditnote') +if ($action == 'history' || $action == 'creditnote') { - if ($action=='creditnote') $placeid = $creditnote->id; + if ($action == 'creditnote') $placeid = $creditnote->id; else $placeid = (int) GETPOST('placeid', 'int'); $invoice = new Facture($db); $invoice->fetch($placeid); @@ -679,8 +679,8 @@ if ($action == "order" and $placeid != 0) } $sql = "SELECT label FROM ".MAIN_DB_PREFIX."takepos_floor_tables where rowid=".((int) $place); - $resql = $db->query($sql); - $row = $db->fetch_object($resql); + $resql = $db->query($sql); + $row = $db->fetch_object($resql); $headerorder = '
'.$langs->trans('Place').' '.$row->label.'
trans('PriceLevel') ?> trans('Price') ?> - trans('PercentVariationOver', Form::selectarray("fk_level[$i]", $genPriceOptions($i), (isset($rules[$i]) ? $rules[$i]->fk_level : null))) ?> + trans('PercentVariationOver', '{s1}'); + $texttoshow = str_replace('{s1}', Form::selectarray("fk_level[$i]", $return, (isset($rules[$i]) ? $rules[$i]->fk_level : null)), $texttoshow); + print $texttoshow; + ?> From fc5dc0865dddc528538eebf9dafd9c4bda609ea4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 1 Dec 2020 02:37:22 +0100 Subject: [PATCH 088/297] Trans --- htdocs/langs/en_US/products.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang index 00f08a0804e..8c30b2e02c1 100644 --- a/htdocs/langs/en_US/products.lang +++ b/htdocs/langs/en_US/products.lang @@ -241,7 +241,7 @@ AlwaysUseFixedPrice=Use the fixed price PriceByQuantity=Different prices by quantity DisablePriceByQty=Disable prices by quantity PriceByQuantityRange=Quantity range -MultipriceRules=Price segment rules +MultipriceRules=Automatic prices for segment UseMultipriceRules=Use price segment rules (defined into product module setup) to auto calculate prices of all other segments according to first segment PercentVariationOver=%% variation over %s PercentDiscountOver=%% discount over %s From 6df4954b20a83077a7dbdff18236d1dcca5e5360 Mon Sep 17 00:00:00 2001 From: Scrutinizer Auto-Fixer Date: Tue, 1 Dec 2020 01:41:19 +0000 Subject: [PATCH 089/297] Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com --- htdocs/accountancy/bookkeeping/list.php | 14 +- .../accountancy/bookkeeping/listbyaccount.php | 6 +- .../bookkeeping/listbysubaccount.php | 4 +- .../class/accountancyexport.class.php | 316 +++--- htdocs/accountancy/journal/sellsjournal.php | 24 +- htdocs/adherents/class/adherent.class.php | 4 +- htdocs/adherents/class/subscription.class.php | 8 +- htdocs/api/class/api_access.class.php | 6 +- htdocs/api/class/api_documents.class.php | 4 +- htdocs/api/index.php | 6 +- htdocs/categories/viewcat.php | 2 +- htdocs/comm/action/class/actioncomm.class.php | 4 +- htdocs/comm/index.php | 2 +- htdocs/comm/propal/card.php | 2 +- htdocs/comm/propal/class/propal.class.php | 10 +- htdocs/comm/propal/list.php | 2 +- htdocs/commande/card.php | 2 +- htdocs/commande/class/commande.class.php | 12 +- htdocs/commande/list.php | 122 +-- htdocs/commande/stats/index.php | 2 +- htdocs/compta/facture/class/facture.class.php | 4 +- htdocs/compta/facture/list.php | 2 +- htdocs/compta/facture/prelevement.php | 4 +- .../class/bonprelevement.class.php | 8 +- htdocs/contact/list.php | 2 +- htdocs/core/actions_addupdatedelete.inc.php | 4 +- htdocs/core/actions_extrafields.inc.php | 2 +- htdocs/core/boxes/box_birthdays.php | 2 +- .../core/class/commondocgenerator.class.php | 6 +- htdocs/core/class/commonobject.class.php | 12 +- htdocs/core/class/dolgeoip.class.php | 2 +- htdocs/core/class/events.class.php | 2 +- htdocs/core/class/html.form.class.php | 10 +- htdocs/core/class/html.formorder.class.php | 8 +- htdocs/core/class/translate.class.php | 4 +- htdocs/core/lib/functions.lib.php | 20 +- htdocs/core/lib/phpsessionindb.lib.php | 2 +- htdocs/core/lib/project.lib.php | 4 +- .../modules/facture/doc/pdf_crabe.modules.php | 2 +- .../modules/import/import_csv.modules.php | 2 +- .../modules/import/import_xlsx.modules.php | 2 +- htdocs/core/modules/modUser.class.php | 8 +- .../tpl/extrafields_list_array_fields.tpl.php | 4 +- .../interface_20_all_Logevents.class.php | 2 +- htdocs/document.php | 8 +- htdocs/expedition/class/expedition.class.php | 2 +- htdocs/expedition/list.php | 2 +- .../class/expensereport.class.php | 8 +- .../class/fournisseur.commande.class.php | 2 +- htdocs/fourn/commande/card.php | 4 +- htdocs/index.php | 2 +- htdocs/main.inc.php | 6 +- .../modulebuilder/template/myobject_list.php | 2 +- .../template/test/phpunit/MyObjectTest.php | 30 +- htdocs/product/class/product.class.php | 6 +- htdocs/product/fournisseurs.php | 22 +- htdocs/product/list.php | 84 +- htdocs/product/price.php | 4 +- htdocs/product/stock/card.php | 2 +- .../stock/class/mouvementstock.class.php | 2 +- htdocs/projet/activity/perday.php | 2 +- htdocs/projet/class/task.class.php | 2 +- htdocs/projet/tasks/time.php | 2 +- htdocs/reception/class/reception.class.php | 2 +- .../recruitmentcandidature_card.php | 2 +- .../recruitmentjobposition_list.php | 16 +- htdocs/societe/admin/societe.php | 6 +- htdocs/societe/list.php | 2 +- htdocs/supplier_proposal/card.php | 2 +- .../class/supplier_proposal.class.php | 2 +- htdocs/takepos/floors.php | 4 +- htdocs/takepos/invoice.php | 14 +- htdocs/ticket/class/api_tickets.class.php | 974 +++++++++--------- htdocs/ticket/list.php | 10 +- htdocs/user/list.php | 2 +- htdocs/website/class/website.class.php | 2 +- htdocs/zapier/class/api_zapier.class.php | 2 +- scripts/emailings/reset-invalid-emails.php | 18 +- 78 files changed, 960 insertions(+), 960 deletions(-) diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php index 418dcc18f73..92de49d66ed 100644 --- a/htdocs/accountancy/bookkeeping/list.php +++ b/htdocs/accountancy/bookkeeping/list.php @@ -632,19 +632,19 @@ $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $obj if (empty($reshook)) { // Button re-export if (!empty($conf->global->ACCOUNTING_REEXPORT)) { - $newcardbutton = '' . img_picto($langs->trans("Activated"), 'switch_on') . ' '; + $newcardbutton = ''.img_picto($langs->trans("Activated"), 'switch_on').' '; } else { - $newcardbutton = '' . img_picto($langs->trans("Disabled"), 'switch_off') . ' '; + $newcardbutton = ''.img_picto($langs->trans("Disabled"), 'switch_off').' '; } - $newcardbutton .= '' . $langs->trans("IncludeDocsAlreadyExported") . ''; + $newcardbutton .= ''.$langs->trans("IncludeDocsAlreadyExported").''; - $newcardbutton .= dolGetButtonTitle($buttonLabel, $langs->trans("ExportFilteredList") . ' (' . $listofformat[$formatexportset] . ')', 'fa fa-file-export paddingleft', $_SERVER["PHP_SELF"] . '?action=export_file' . ($param ? '&' . $param : ''), $user->rights->accounting->mouvements->export); + $newcardbutton .= dolGetButtonTitle($buttonLabel, $langs->trans("ExportFilteredList").' ('.$listofformat[$formatexportset].')', 'fa fa-file-export paddingleft', $_SERVER["PHP_SELF"].'?action=export_file'.($param ? '&'.$param : ''), $user->rights->accounting->mouvements->export); - $newcardbutton .= dolGetButtonTitle($langs->trans('ViewFlatList'), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT . '/accountancy/bookkeeping/list.php?' . $param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected')); - $newcardbutton .= dolGetButtonTitle($langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT . '/accountancy/bookkeeping/listbyaccount.php?' . $param, '', 1, array('morecss' => 'marginleftonly')); + $newcardbutton .= dolGetButtonTitle($langs->trans('ViewFlatList'), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?'.$param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected')); + $newcardbutton .= dolGetButtonTitle($langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?'.$param, '', 1, array('morecss' => 'marginleftonly')); $url = './card.php?action=create'; - if (!empty($socid)) $url .= '&socid=' . $socid; + if (!empty($socid)) $url .= '&socid='.$socid; $newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', $url, '', $user->rights->accounting->mouvements->creer); } diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php index 80d8b4961c8..18661f8a887 100644 --- a/htdocs/accountancy/bookkeeping/listbyaccount.php +++ b/htdocs/accountancy/bookkeeping/listbyaccount.php @@ -379,12 +379,12 @@ print ''; $parameters = array(); $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook if (empty($reshook)) { - $newcardbutton = dolGetButtonTitle($langs->trans('ViewFlatList'), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT . '/accountancy/bookkeeping/list.php?' . $param); - $newcardbutton .= dolGetButtonTitle($langs->trans('VueByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT . '/accountancy/bookkeeping/listbyaccount.php?' . $param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected')); + $newcardbutton = dolGetButtonTitle($langs->trans('ViewFlatList'), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?'.$param); + $newcardbutton .= dolGetButtonTitle($langs->trans('VueByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?'.$param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected')); $newcardbutton .= '   '; - $newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', DOL_URL_ROOT . '/accountancy/bookkeeping/card.php?action=create'); + $newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?action=create'); } if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage); diff --git a/htdocs/accountancy/bookkeeping/listbysubaccount.php b/htdocs/accountancy/bookkeeping/listbysubaccount.php index 0a70034aaa6..3bc0351b09b 100644 --- a/htdocs/accountancy/bookkeeping/listbysubaccount.php +++ b/htdocs/accountancy/bookkeeping/listbysubaccount.php @@ -380,8 +380,8 @@ print ''; $parameters = array(); $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook if (empty($reshook)) { - $newcardbutton = dolGetButtonTitle($langs->trans('ViewAccountList'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT . '/accountancy/bookkeeping/listbyaccount.php', '', 1, array('morecss' => 'marginleftonly btnTitleSelected')); - $newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', DOL_URL_ROOT . '/accountancy/bookkeeping/card.php?action=create'); + $newcardbutton = dolGetButtonTitle($langs->trans('ViewAccountList'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php', '', 1, array('morecss' => 'marginleftonly btnTitleSelected')); + $newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?action=create'); } if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage); diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php index 51e66f3360c..3423f096794 100644 --- a/htdocs/accountancy/class/accountancyexport.class.php +++ b/htdocs/accountancy/class/accountancyexport.class.php @@ -57,8 +57,8 @@ class AccountancyExport public static $EXPORT_TYPE_OPENCONCERTO = 100; public static $EXPORT_TYPE_LDCOMPTA = 110; public static $EXPORT_TYPE_LDCOMPTA10 = 120; - public static $EXPORT_TYPE_GESTINUMV3 = 130; - public static $EXPORT_TYPE_GESTINUMV5 = 135; + public static $EXPORT_TYPE_GESTINUMV3 = 130; + public static $EXPORT_TYPE_GESTINUMV5 = 135; public static $EXPORT_TYPE_FEC = 1000; @@ -115,11 +115,11 @@ class AccountancyExport self::$EXPORT_TYPE_AGIRIS => $langs->trans('Modelcsv_agiris'), self::$EXPORT_TYPE_OPENCONCERTO => $langs->trans('Modelcsv_openconcerto'), self::$EXPORT_TYPE_SAGE50_SWISS => $langs->trans('Modelcsv_Sage50_Swiss'), - self::$EXPORT_TYPE_CHARLEMAGNE => $langs->trans('Modelcsv_charlemagne'), + self::$EXPORT_TYPE_CHARLEMAGNE => $langs->trans('Modelcsv_charlemagne'), self::$EXPORT_TYPE_LDCOMPTA => $langs->trans('Modelcsv_LDCompta'), self::$EXPORT_TYPE_LDCOMPTA10 => $langs->trans('Modelcsv_LDCompta10'), - self::$EXPORT_TYPE_GESTINUMV3 => $langs->trans('Modelcsv_Gestinum_v3'), - self::$EXPORT_TYPE_GESTINUMV5 => $langs->trans('Modelcsv_Gestinum_v5'), + self::$EXPORT_TYPE_GESTINUMV3 => $langs->trans('Modelcsv_Gestinum_v3'), + self::$EXPORT_TYPE_GESTINUMV5 => $langs->trans('Modelcsv_Gestinum_v5'), self::$EXPORT_TYPE_FEC => $langs->trans('Modelcsv_FEC'), ); @@ -148,12 +148,12 @@ class AccountancyExport self::$EXPORT_TYPE_COGILOG => 'cogilog', self::$EXPORT_TYPE_AGIRIS => 'agiris', self::$EXPORT_TYPE_OPENCONCERTO => 'openconcerto', - self::$EXPORT_TYPE_SAGE50_SWISS => 'sage50ch', - self::$EXPORT_TYPE_CHARLEMAGNE => 'charlemagne', - self::$EXPORT_TYPE_LDCOMPTA => 'ldcompta', - self::$EXPORT_TYPE_LDCOMPTA10 => 'ldcompta10', - self::$EXPORT_TYPE_GESTINUMV3 => 'gestinumv3', - self::$EXPORT_TYPE_GESTINUMV5 => 'gestinumv5', + self::$EXPORT_TYPE_SAGE50_SWISS => 'sage50ch', + self::$EXPORT_TYPE_CHARLEMAGNE => 'charlemagne', + self::$EXPORT_TYPE_LDCOMPTA => 'ldcompta', + self::$EXPORT_TYPE_LDCOMPTA10 => 'ldcompta10', + self::$EXPORT_TYPE_GESTINUMV3 => 'gestinumv3', + self::$EXPORT_TYPE_GESTINUMV5 => 'gestinumv5', self::$EXPORT_TYPE_FEC => 'fec', ); @@ -208,9 +208,9 @@ class AccountancyExport self::$EXPORT_TYPE_AGIRIS => array( 'label' => $langs->trans('Modelcsv_agiris'), ), - self::$EXPORT_TYPE_OPENCONCERTO => array( - 'label' => $langs->trans('Modelcsv_openconcerto'), - ), + self::$EXPORT_TYPE_OPENCONCERTO => array( + 'label' => $langs->trans('Modelcsv_openconcerto'), + ), self::$EXPORT_TYPE_SAGE50_SWISS => array( 'label' => $langs->trans('Modelcsv_Sage50_Swiss'), ), @@ -218,18 +218,18 @@ class AccountancyExport 'label' => $langs->trans('Modelcsv_charlemagne'), 'ACCOUNTING_EXPORT_FORMAT' => 'txt', ), - self::$EXPORT_TYPE_LDCOMPTA => array( - 'label' => $langs->trans('Modelcsv_LDCompta'), - ), + self::$EXPORT_TYPE_LDCOMPTA => array( + 'label' => $langs->trans('Modelcsv_LDCompta'), + ), self::$EXPORT_TYPE_LDCOMPTA10 => array( - 'label' => $langs->trans('Modelcsv_LDCompta10'), - ), - self::$EXPORT_TYPE_GESTINUMV3 => array( - 'label' => $langs->trans('Modelcsv_Gestinumv3'), - ), - self::$EXPORT_TYPE_GESTINUMV5 => array( - 'label' => $langs->trans('Modelcsv_Gestinumv5'), - ), + 'label' => $langs->trans('Modelcsv_LDCompta10'), + ), + self::$EXPORT_TYPE_GESTINUMV3 => array( + 'label' => $langs->trans('Modelcsv_Gestinumv3'), + ), + self::$EXPORT_TYPE_GESTINUMV5 => array( + 'label' => $langs->trans('Modelcsv_Gestinumv5'), + ), self::$EXPORT_TYPE_FEC => array( 'label' => $langs->trans('Modelcsv_FEC'), 'ACCOUNTING_EXPORT_FORMAT' => 'txt', @@ -307,21 +307,21 @@ class AccountancyExport case self::$EXPORT_TYPE_CHARLEMAGNE : $this->exportCharlemagne($TData); break; - case self::$EXPORT_TYPE_LDCOMPTA : - $this->exportLDCompta($TData); - break; - case self::$EXPORT_TYPE_LDCOMPTA10 : - $this->exportLDCompta10($TData); - break; - case self::$EXPORT_TYPE_GESTINUMV3 : - $this->exportGestimumV3($TData); - break; - case self::$EXPORT_TYPE_GESTINUMV5 : - $this->exportGestimumV5($TData); - break; - case self::$EXPORT_TYPE_FEC : - $this->exportFEC($TData); - break; + case self::$EXPORT_TYPE_LDCOMPTA : + $this->exportLDCompta($TData); + break; + case self::$EXPORT_TYPE_LDCOMPTA10 : + $this->exportLDCompta10($TData); + break; + case self::$EXPORT_TYPE_GESTINUMV3 : + $this->exportGestimumV3($TData); + break; + case self::$EXPORT_TYPE_GESTINUMV5 : + $this->exportGestimumV5($TData); + break; + case self::$EXPORT_TYPE_FEC : + $this->exportFEC($TData); + break; default: $this->errors[] = $langs->trans('accountancy_error_modelnotfound'); break; @@ -1484,136 +1484,136 @@ class AccountancyExport } } - /** - * Export format : Gestimum V3 - * - * @param array $objectLines data - * - * @return void - */ - public function exportGestimumV3($objectLines) + /** + * Export format : Gestimum V3 + * + * @param array $objectLines data + * + * @return void + */ + public function exportGestimumV3($objectLines) { - global $langs; + global $langs; - $this->separator = ','; + $this->separator = ','; - $invoices_infos = array(); - $supplier_invoices_infos = array(); - foreach ($objectLines as $line) { - $date = dol_print_date($line->doc_date, '%d/%m/%Y'); + $invoices_infos = array(); + $supplier_invoices_infos = array(); + foreach ($objectLines as $line) { + $date = dol_print_date($line->doc_date, '%d/%m/%Y'); - $invoice_ref = $line->doc_ref; - $company_name = ""; + $invoice_ref = $line->doc_ref; + $company_name = ""; - if (($line->doc_type == 'customer_invoice' || $line->doc_type == 'supplier_invoice') && $line->fk_doc > 0) { - if (($line->doc_type == 'customer_invoice' && !isset($invoices_infos[$line->fk_doc])) || - ($line->doc_type == 'supplier_invoice' && !isset($supplier_invoices_infos[$line->fk_doc]))) { - if ($line->doc_type == 'customer_invoice') { - // Get new customer invoice ref and company name - $sql = 'SELECT f.facnumber, s.nom FROM ' . MAIN_DB_PREFIX . 'facture as f'; - $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'societe AS s ON f.fk_soc = s.rowid'; - $sql .= ' WHERE f.rowid = ' . $line->fk_doc; - $resql = $this->db->query($sql); - if ($resql) { - if ($obj = $this->db->fetch_object($resql)) { - // Save invoice infos - $invoices_infos[$line->fk_doc] = array('ref' => $obj->facnumber, 'company_name' => $obj->nom); - $invoice_ref = $obj->facnumber; - $company_name = $obj->nom; - } - } - } else { - // Get new supplier invoice ref and company name - $sql = 'SELECT ff.ref, s.nom FROM ' . MAIN_DB_PREFIX . 'facture_fourn as ff'; - $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'societe AS s ON ff.fk_soc = s.rowid'; - $sql .= ' WHERE ff.rowid = ' . $line->fk_doc; - $resql = $this->db->query($sql); - if ($resql) { - if ($obj = $this->db->fetch_object($resql)) { - // Save invoice infos - $supplier_invoices_infos[$line->fk_doc] = array('ref' => $obj->ref, 'company_name' => $obj->nom); - $invoice_ref = $obj->ref; - $company_name = $obj->nom; - } - } - } - } elseif ($line->doc_type == 'customer_invoice') { - // Retrieve invoice infos - $invoice_ref = $invoices_infos[$line->fk_doc]['ref']; - $company_name = $invoices_infos[$line->fk_doc]['company_name']; - } else { - // Retrieve invoice infos - $invoice_ref = $supplier_invoices_infos[$line->fk_doc]['ref']; - $company_name = $supplier_invoices_infos[$line->fk_doc]['company_name']; - } - } + if (($line->doc_type == 'customer_invoice' || $line->doc_type == 'supplier_invoice') && $line->fk_doc > 0) { + if (($line->doc_type == 'customer_invoice' && !isset($invoices_infos[$line->fk_doc])) || + ($line->doc_type == 'supplier_invoice' && !isset($supplier_invoices_infos[$line->fk_doc]))) { + if ($line->doc_type == 'customer_invoice') { + // Get new customer invoice ref and company name + $sql = 'SELECT f.facnumber, s.nom FROM ' . MAIN_DB_PREFIX . 'facture as f'; + $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'societe AS s ON f.fk_soc = s.rowid'; + $sql .= ' WHERE f.rowid = ' . $line->fk_doc; + $resql = $this->db->query($sql); + if ($resql) { + if ($obj = $this->db->fetch_object($resql)) { + // Save invoice infos + $invoices_infos[$line->fk_doc] = array('ref' => $obj->facnumber, 'company_name' => $obj->nom); + $invoice_ref = $obj->facnumber; + $company_name = $obj->nom; + } + } + } else { + // Get new supplier invoice ref and company name + $sql = 'SELECT ff.ref, s.nom FROM ' . MAIN_DB_PREFIX . 'facture_fourn as ff'; + $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'societe AS s ON ff.fk_soc = s.rowid'; + $sql .= ' WHERE ff.rowid = ' . $line->fk_doc; + $resql = $this->db->query($sql); + if ($resql) { + if ($obj = $this->db->fetch_object($resql)) { + // Save invoice infos + $supplier_invoices_infos[$line->fk_doc] = array('ref' => $obj->ref, 'company_name' => $obj->nom); + $invoice_ref = $obj->ref; + $company_name = $obj->nom; + } + } + } + } elseif ($line->doc_type == 'customer_invoice') { + // Retrieve invoice infos + $invoice_ref = $invoices_infos[$line->fk_doc]['ref']; + $company_name = $invoices_infos[$line->fk_doc]['company_name']; + } else { + // Retrieve invoice infos + $invoice_ref = $supplier_invoices_infos[$line->fk_doc]['ref']; + $company_name = $supplier_invoices_infos[$line->fk_doc]['company_name']; + } + } - print $line->id . $this->separator; - print $date . $this->separator; - print substr($line->code_journal, 0, 4) . $this->separator; + print $line->id . $this->separator; + print $date . $this->separator; + print substr($line->code_journal, 0, 4) . $this->separator; - if ((substr($line->numero_compte, 0, 3) == '411') || (substr($line->numero_compte, 0, 3) == '401')) { - print length_accountg($line->subledger_account) . $this->separator; - } else { - print substr(length_accountg($line->numero_compte), 0, 15) . $this->separator; - } - //Libellé Auto - print $this->separator; - //print '"'.dol_trunc(str_replace('"', '', $line->label_operation),40,'right','UTF-8',1).'"' . $this->separator; - //Libellé manuel - print dol_trunc(str_replace('"', '', $invoice_ref . (!empty($company_name) ? ' - ' : '') . $company_name), 40, 'right', 'UTF-8', 1) . $this->separator; - //Numéro de pièce - print dol_trunc(str_replace('"', '', $line->piece_num), 10, 'right', 'UTF-8', 1) . $this->separator; - //Devise - print 'EUR' . $this->separator; - //Montant - print price2num(abs($line->montant)) . $this->separator; - //Sens - print $line->sens . $this->separator; - //Code lettrage - print $this->separator; - //Date Echéance - print $date; - print $this->end_line; - } - } + if ((substr($line->numero_compte, 0, 3) == '411') || (substr($line->numero_compte, 0, 3) == '401')) { + print length_accountg($line->subledger_account) . $this->separator; + } else { + print substr(length_accountg($line->numero_compte), 0, 15) . $this->separator; + } + //Libellé Auto + print $this->separator; + //print '"'.dol_trunc(str_replace('"', '', $line->label_operation),40,'right','UTF-8',1).'"' . $this->separator; + //Libellé manuel + print dol_trunc(str_replace('"', '', $invoice_ref . (!empty($company_name) ? ' - ' : '') . $company_name), 40, 'right', 'UTF-8', 1) . $this->separator; + //Numéro de pièce + print dol_trunc(str_replace('"', '', $line->piece_num), 10, 'right', 'UTF-8', 1) . $this->separator; + //Devise + print 'EUR' . $this->separator; + //Montant + print price2num(abs($line->montant)) . $this->separator; + //Sens + print $line->sens . $this->separator; + //Code lettrage + print $this->separator; + //Date Echéance + print $date; + print $this->end_line; + } + } - /** - * Export format : Gestimum V5 - * - * @param array $objectLines data - * - * @return void - */ - public function exportGestimumV5($objectLines) + /** + * Export format : Gestimum V5 + * + * @param array $objectLines data + * + * @return void + */ + public function exportGestimumV5($objectLines) { - $this->separator = ','; + $this->separator = ','; - foreach ($objectLines as $line) { - $date = dol_print_date($line->doc_date, '%d%m%Y'); + foreach ($objectLines as $line) { + $date = dol_print_date($line->doc_date, '%d%m%Y'); - print $line->id . $this->separator; - print $date . $this->separator; - print substr($line->code_journal, 0, 4) . $this->separator; - if ((substr($line->numero_compte, 0, 3) == '411') || (substr($line->numero_compte, 0, 3) == '401')) { - print length_accountg($line->subledger_account) . $this->separator; - } else { - print substr(length_accountg($line->numero_compte), 0, 15) . $this->separator; - } - print $this->separator; - //print '"'.dol_trunc(str_replace('"', '', $line->label_operation),40,'right','UTF-8',1).'"' . $this->separator; - print '"'.dol_trunc(str_replace('"', '', $line->doc_ref), 40, 'right', 'UTF-8', 1).'"' . $this->separator; - print '"'.dol_trunc(str_replace('"', '', $line->piece_num), 10, 'right', 'UTF-8', 1).'"'.$this->separator; - print price2num($line->montant).$this->separator; - print $line->sens.$this->separator; - print $date . $this->separator; - print $this->separator; - print $this->separator; - print 'EUR'; - print $this->end_line; - } - } + print $line->id . $this->separator; + print $date . $this->separator; + print substr($line->code_journal, 0, 4) . $this->separator; + if ((substr($line->numero_compte, 0, 3) == '411') || (substr($line->numero_compte, 0, 3) == '401')) { + print length_accountg($line->subledger_account) . $this->separator; + } else { + print substr(length_accountg($line->numero_compte), 0, 15) . $this->separator; + } + print $this->separator; + //print '"'.dol_trunc(str_replace('"', '', $line->label_operation),40,'right','UTF-8',1).'"' . $this->separator; + print '"'.dol_trunc(str_replace('"', '', $line->doc_ref), 40, 'right', 'UTF-8', 1).'"' . $this->separator; + print '"'.dol_trunc(str_replace('"', '', $line->piece_num), 10, 'right', 'UTF-8', 1).'"'.$this->separator; + print price2num($line->montant).$this->separator; + print $line->sens.$this->separator; + print $date . $this->separator; + print $this->separator; + print $this->separator; + print 'EUR'; + print $this->end_line; + } + } /** * trunc diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php index b1331cd1dc7..9f44e02aafa 100644 --- a/htdocs/accountancy/journal/sellsjournal.php +++ b/htdocs/accountancy/journal/sellsjournal.php @@ -621,18 +621,18 @@ if ($action == 'exportcsv') { // ISO and not UTF8 ! foreach ($arrayofvat[$key] as $k => $mt) { if ($mt) { - print '"' . $key . '"' . $sep; - print '"' . $date . '"' . $sep; - print '"' . $val["ref"] . '"' . $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 '"' . $langs->trans("VAT") . ' - ' . join(', ', $def_tva[$key][$k]) . ' %"' . $sep; - print '"' . utf8_decode(dol_trunc($companystatic->name, 16)) . ' - ' . $invoicestatic->ref . ' - ' . $langs->trans("VAT") . join(', ', $def_tva[$key][$k]) . ' %' . ($numtax ? ' - Localtax ' . $numtax : '') . '"' . $sep; - print '"' . ($mt < 0 ? price(-$mt) : '') . '"' . $sep; - print '"' . ($mt >= 0 ? price($mt) : '') . '"' . $sep; - print '"' . $journal . '"'; + print '"'.$key.'"'.$sep; + print '"'.$date.'"'.$sep; + print '"'.$val["ref"].'"'.$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 '"'.$langs->trans("VAT").' - '.join(', ', $def_tva[$key][$k]).' %"'.$sep; + print '"'.utf8_decode(dol_trunc($companystatic->name, 16)).' - '.$invoicestatic->ref.' - '.$langs->trans("VAT").join(', ', $def_tva[$key][$k]).' %'.($numtax ? ' - Localtax '.$numtax : '').'"'.$sep; + print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep; + print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep; + print '"'.$journal.'"'; print "\n"; } } diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 15494596e0f..0e57b274258 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -79,8 +79,8 @@ class Adherent extends CommonObject public $pass; /** - * @var string Clear password in database (defined if DATABASE_PWD_ENCRYPTED=0) - */ + * @var string Clear password in database (defined if DATABASE_PWD_ENCRYPTED=0) + */ public $pass_indatabase; /** diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php index 713812b639b..b6349bf9dc2 100644 --- a/htdocs/adherents/class/subscription.class.php +++ b/htdocs/adherents/class/subscription.class.php @@ -250,10 +250,10 @@ class Subscription extends CommonObject $this->db->begin(); - if (!is_numeric($this->amount)) { - $this->error = 'BadValueForParameterAmount'; - return -1; - } + if (!is_numeric($this->amount)) { + $this->error = 'BadValueForParameterAmount'; + return -1; + } $sql = "UPDATE ".MAIN_DB_PREFIX."subscription SET "; $sql .= " fk_type = ".$this->fk_type.","; diff --git a/htdocs/api/class/api_access.class.php b/htdocs/api/class/api_access.class.php index e7b8ac8536b..926a51456c7 100644 --- a/htdocs/api/class/api_access.class.php +++ b/htdocs/api/class/api_access.class.php @@ -19,9 +19,9 @@ // Create the autoloader for Luracast require_once DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/AutoLoader.php'; call_user_func(function () { - $loader = Luracast\Restler\AutoLoader::instance(); - spl_autoload_register($loader); - return $loader; + $loader = Luracast\Restler\AutoLoader::instance(); + spl_autoload_register($loader); + return $loader; }); require_once DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/iAuthenticate.php'; diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php index 9408898a984..550d78068a4 100644 --- a/htdocs/api/class/api_documents.class.php +++ b/htdocs/api/class/api_documents.class.php @@ -475,7 +475,7 @@ class Documents extends DolibarrApi $upload_dir = $conf->categorie->multidir_output[$object->entity].'/'.get_exdir($object->id, 2, 0, 0, $object, 'category').$object->id."/photos/".dol_sanitizeFileName($object->ref); } elseif ($modulepart == 'ecm') { - throw new RestException(500, 'Modulepart Ecm not implemented yet.'); + throw new RestException(500, 'Modulepart Ecm not implemented yet.'); // // require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php'; // if (!DolibarrApiAccess::$user->rights->ecm->read) { @@ -634,7 +634,7 @@ class Documents extends DolibarrApi require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; $object = new Propal($this->db); } else { - // TODO Implement additional moduleparts + // TODO Implement additional moduleparts throw new RestException(500, 'Modulepart '.$modulepart.' not implemented yet.'); } diff --git a/htdocs/api/index.php b/htdocs/api/index.php index 2fba9fbb554..2c85533fd11 100644 --- a/htdocs/api/index.php +++ b/htdocs/api/index.php @@ -46,9 +46,9 @@ if (!$res) die("Include of main fails"); require_once DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/AutoLoader.php'; call_user_func(function () { - $loader = Luracast\Restler\AutoLoader::instance(); - spl_autoload_register($loader); - return $loader; + $loader = Luracast\Restler\AutoLoader::instance(); + spl_autoload_register($loader); + return $loader; }); require_once DOL_DOCUMENT_ROOT.'/api/class/api.class.php'; diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index 7f673a1ecff..864de6e2e98 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -294,7 +294,7 @@ if ($user->rights->categorie->creer) if ($user->rights->categorie->supprimer) { - print 'id.'&type='.$type.'">'.$langs->trans("Delete").''; + print 'id.'&type='.$type.'">'.$langs->trans("Delete").''; } print ""; diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index b7b25e28d3c..5a9b0afa336 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -524,7 +524,7 @@ class ActionComm extends CommonObject $resql = $this->db->query($sql); if ($resql) { - $this->ref =$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."actioncomm", "id"); + $this->ref = $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."actioncomm", "id"); // Now insert assigned users if (!$error) @@ -2186,7 +2186,7 @@ class ActionComm extends CommonObject $this->db->commit(); return 0; } else { - $this->db->commit(); // We commit also on error, to have the error message recorded. + $this->db->commit(); // We commit also on error, to have the error message recorded. $this->error = 'Nb of emails sent : '.$nbMailSend.', '.(!empty($errorsMsg)) ? join(', ', $errorsMsg) : $error; return $error; } diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 8ce38ba4ea3..7524de9055f 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -233,7 +233,7 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa $supplierproposalstatic->total_ht = $obj->total_ht; $supplierproposalstatic->total_tva = $obj->total_tva; $supplierproposalstatic->total_ttc = $obj->total_ttc; - $supplierproposalstatic->statut = $obj->status; + $supplierproposalstatic->statut = $obj->status; $companystatic->id = $obj->socid; $companystatic->name = $obj->name; diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php index 4742aebfde0..db64dd65fe9 100644 --- a/htdocs/comm/propal/card.php +++ b/htdocs/comm/propal/card.php @@ -343,7 +343,7 @@ if (empty($reshook)) $object->ref = GETPOST('ref'); $object->datep = $datep; $object->date = $datep; - $object->date_livraison = $date_delivery; // deprecated + $object->date_livraison = $date_delivery; // deprecated $object->delivery_date = $date_delivery; $object->availability_id = GETPOST('availability_id'); $object->demand_reason_id = GETPOST('demand_reason_id'); diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index e906c4163d6..c761f8b3321 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -155,7 +155,7 @@ class Propal extends CommonObject * @var int Date expected for delivery * @deprecated */ - public $date_livraison; // deprecated; Use delivery_date instead. + public $date_livraison; // deprecated; Use delivery_date instead. /** * @var integer|string $delivery_date; @@ -1503,7 +1503,7 @@ class Propal extends CommonObject $this->date = $this->db->jdate($obj->dp); // Proposal date $this->datep = $this->db->jdate($obj->dp); // deprecated $this->fin_validite = $this->db->jdate($obj->dfv); - $this->date_livraison = $this->db->jdate($obj->delivery_date); // deprecated + $this->date_livraison = $this->db->jdate($obj->delivery_date); // deprecated $this->delivery_date = $this->db->jdate($obj->delivery_date); $this->shipping_method_id = ($obj->fk_shipping_method > 0) ? $obj->fk_shipping_method : null; $this->availability_id = $obj->fk_availability; @@ -2922,7 +2922,7 @@ class Propal extends CommonObject $tabletodelete = $this->table_element_line; $sqlef = "DELETE FROM ".MAIN_DB_PREFIX.$tabletodelete."_extrafields WHERE fk_object IN (SELECT rowid FROM ".MAIN_DB_PREFIX.$tabletodelete." WHERE ".$this->fk_element." = ".$this->id.")"; $sql = "DELETE FROM ".MAIN_DB_PREFIX.$tabletodelete." WHERE ".$this->fk_element." = ".$this->id; - if (! $this->db->query($sqlef) || ! $this->db->query($sql)) { + if (!$this->db->query($sqlef) || !$this->db->query($sql)) { $error++; $this->error = $this->db->lasterror(); $this->errors[] = $this->error; @@ -2955,7 +2955,7 @@ class Propal extends CommonObject if (!$error) { $sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element." WHERE rowid = ".$this->id; $res = $this->db->query($sql); - if (! $res) { + if (!$res) { $error++; $this->error = $this->db->lasterror(); $this->errors[] = $this->error; @@ -2966,7 +2966,7 @@ class Propal extends CommonObject // Delete record into ECM index and physically if (!$error) { $res = $this->deleteEcmFiles(0); // Deleting files physically is done later with the dol_delete_dir_recursive - if (! $res) { + if (!$res) { $error++; } } diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index bba2d61a422..d8f523f16da 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -188,7 +188,7 @@ $arrayfields = array( 'p.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000), ); // Extra fields -include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_array_fields.tpl.php'; +include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php'; /* diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 16e53e0a23b..a583b370ac9 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -276,7 +276,7 @@ if (empty($reshook)) $object->fk_account = GETPOST('fk_account', 'int'); $object->availability_id = GETPOST('availability_id'); $object->demand_reason_id = GETPOST('demand_reason_id'); - $object->date_livraison = $datelivraison; // deprecated + $object->date_livraison = $datelivraison; // deprecated $object->delivery_date = $datelivraison; $object->shipping_method_id = GETPOST('shipping_method_id', 'int'); $object->warehouse_id = GETPOST('warehouse_id', 'int'); diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index f2734b5b8b6..506cf84c8fd 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -184,7 +184,7 @@ class Commande extends CommonOrder * @var int Date expected for delivery * @deprecated */ - public $date_livraison; // deprecated; Use delivery_date instead. + public $date_livraison; // deprecated; Use delivery_date instead. public $delivery_date; // Date expected of shipment (date starting shipment, not the reception that occurs some days after) @@ -1359,7 +1359,7 @@ class Commande extends CommonOrder $this->fk_account = $object->fk_account; $this->availability_id = $object->availability_id; $this->demand_reason_id = $object->demand_reason_id; - $this->date_livraison = $object->date_livraison; // deprecated + $this->date_livraison = $object->date_livraison; // deprecated $this->delivery_date = $object->date_livraison; $this->shipping_method_id = $object->shipping_method_id; $this->warehouse_id = $object->warehouse_id; @@ -1867,7 +1867,7 @@ class Commande extends CommonOrder $this->availability = $obj->availability_label; $this->demand_reason_id = $obj->fk_input_reason; $this->demand_reason_code = $obj->demand_reason_code; - $this->date_livraison = $this->db->jdate($obj->delivery_date); // deprecated + $this->date_livraison = $this->db->jdate($obj->delivery_date); // deprecated $this->delivery_date = $this->db->jdate($obj->delivery_date); $this->shipping_method_id = ($obj->fk_shipping_method > 0) ? $obj->fk_shipping_method : null; $this->warehouse_id = ($obj->fk_warehouse > 0) ? $obj->fk_warehouse : null; @@ -3358,7 +3358,7 @@ class Commande extends CommonOrder $tabletodelete = $this->table_element_line; $sqlef = "DELETE FROM ".MAIN_DB_PREFIX.$tabletodelete."_extrafields WHERE fk_object IN (SELECT rowid FROM ".MAIN_DB_PREFIX.$tabletodelete." WHERE ".$this->fk_element." = ".$this->id.")"; $sql = "DELETE FROM ".MAIN_DB_PREFIX.$tabletodelete." WHERE ".$this->fk_element." = ".$this->id; - if (! $this->db->query($sqlef) || ! $this->db->query($sql)) { + if (!$this->db->query($sqlef) || !$this->db->query($sql)) { $error++; $this->error = $this->db->lasterror(); $this->errors[] = $this->error; @@ -3391,7 +3391,7 @@ class Commande extends CommonOrder if (!$error) { $sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element." WHERE rowid = ".$this->id; $res = $this->db->query($sql); - if (! $res) { + if (!$res) { $error++; $this->error = $this->db->lasterror(); $this->errors[] = $this->error; @@ -3402,7 +3402,7 @@ class Commande extends CommonOrder // Delete record into ECM index and physically if (!$error) { $res = $this->deleteEcmFiles(0); // Deleting files physically is done later with the dol_delete_dir_recursive - if (! $res) { + if (!$res) { $error++; } } diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index 9a7a0dfff70..53359a0cb5e 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -143,37 +143,37 @@ if (empty($user->socid)) $fieldstosearchall["c.note_private"] = "NotePrivate"; $checkedtypetiers = 0; $arrayfields = array( 'c.ref'=>array('label'=>"Ref", 'checked'=>1, 'position'=>5), - 'c.ref_client'=>array('label'=>"RefCustomerOrder", 'checked'=>-1, 'position'=>10), - 'p.ref'=>array('label'=>"ProjectRef", 'checked'=>1, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1), 'position'=>20), - 'p.title'=>array('label'=>"ProjectLabel", 'checked'=>0, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1), 'position'=>25), - 's.nom'=>array('label'=>"ThirdParty", 'checked'=>1, 'position'=>30), - 's.town'=>array('label'=>"Town", 'checked'=>1, 'position'=>35), - 's.zip'=>array('label'=>"Zip", 'checked'=>1, 'position'=>40), - 'state.nom'=>array('label'=>"StateShort", 'checked'=>0, 'position'=>45), - 'country.code_iso'=>array('label'=>"Country", 'checked'=>0, 'position'=>50), - 'typent.code'=>array('label'=>"ThirdPartyType", 'checked'=>$checkedtypetiers, 'position'=>55), - 'c.date_commande'=>array('label'=>"OrderDateShort", 'checked'=>1, 'position'=>60), - 'c.date_delivery'=>array('label'=>"DateDeliveryPlanned", 'checked'=>1, 'enabled'=>empty($conf->global->ORDER_DISABLE_DELIVERY_DATE), 'position'=>65), - 'c.total_ht'=>array('label'=>"AmountHT", 'checked'=>1, 'position'=>75), - 'c.total_vat'=>array('label'=>"AmountVAT", 'checked'=>0, 'position'=>80), - 'c.total_ttc'=>array('label'=>"AmountTTC", 'checked'=>0, 'position'=>85), - 'c.multicurrency_code'=>array('label'=>'Currency', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>90), - 'c.multicurrency_tx'=>array('label'=>'CurrencyRate', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>95), - 'c.multicurrency_total_ht'=>array('label'=>'MulticurrencyAmountHT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>100), - 'c.multicurrency_total_vat'=>array('label'=>'MulticurrencyAmountVAT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>105), - 'c.multicurrency_total_ttc'=>array('label'=>'MulticurrencyAmountTTC', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>110), - 'u.login'=>array('label'=>"Author", 'checked'=>1, 'position'=>10, 'position'=>115), - 'c.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500, 'position'=>120), - 'c.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500, 'position'=>125), - 'c.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>500, 'position'=>130), - 'c.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'position'=>510, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PUBLIC_NOTES)), 'position'=>135), - 'c.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'position'=>511, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PRIVATE_NOTES)), 'position'=>140), - 'c.facture'=>array('label'=>"Billed", 'checked'=>1, 'position'=>990, 'enabled'=>(empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)), 'position'=>145), - 'shippable'=>array('label'=>"Shippable", 'checked'=>1, 'position'=>995, 'enabled'=>(!empty($conf->expedition->enabled)), 'position'=>150), - 'c.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000, 'position'=>155) + 'c.ref_client'=>array('label'=>"RefCustomerOrder", 'checked'=>-1, 'position'=>10), + 'p.ref'=>array('label'=>"ProjectRef", 'checked'=>1, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1), 'position'=>20), + 'p.title'=>array('label'=>"ProjectLabel", 'checked'=>0, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1), 'position'=>25), + 's.nom'=>array('label'=>"ThirdParty", 'checked'=>1, 'position'=>30), + 's.town'=>array('label'=>"Town", 'checked'=>1, 'position'=>35), + 's.zip'=>array('label'=>"Zip", 'checked'=>1, 'position'=>40), + 'state.nom'=>array('label'=>"StateShort", 'checked'=>0, 'position'=>45), + 'country.code_iso'=>array('label'=>"Country", 'checked'=>0, 'position'=>50), + 'typent.code'=>array('label'=>"ThirdPartyType", 'checked'=>$checkedtypetiers, 'position'=>55), + 'c.date_commande'=>array('label'=>"OrderDateShort", 'checked'=>1, 'position'=>60), + 'c.date_delivery'=>array('label'=>"DateDeliveryPlanned", 'checked'=>1, 'enabled'=>empty($conf->global->ORDER_DISABLE_DELIVERY_DATE), 'position'=>65), + 'c.total_ht'=>array('label'=>"AmountHT", 'checked'=>1, 'position'=>75), + 'c.total_vat'=>array('label'=>"AmountVAT", 'checked'=>0, 'position'=>80), + 'c.total_ttc'=>array('label'=>"AmountTTC", 'checked'=>0, 'position'=>85), + 'c.multicurrency_code'=>array('label'=>'Currency', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>90), + 'c.multicurrency_tx'=>array('label'=>'CurrencyRate', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>95), + 'c.multicurrency_total_ht'=>array('label'=>'MulticurrencyAmountHT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>100), + 'c.multicurrency_total_vat'=>array('label'=>'MulticurrencyAmountVAT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>105), + 'c.multicurrency_total_ttc'=>array('label'=>'MulticurrencyAmountTTC', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>110), + 'u.login'=>array('label'=>"Author", 'checked'=>1, 'position'=>10, 'position'=>115), + 'c.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500, 'position'=>120), + 'c.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500, 'position'=>125), + 'c.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>500, 'position'=>130), + 'c.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'position'=>510, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PUBLIC_NOTES)), 'position'=>135), + 'c.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'position'=>511, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PRIVATE_NOTES)), 'position'=>140), + 'c.facture'=>array('label'=>"Billed", 'checked'=>1, 'position'=>990, 'enabled'=>(empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)), 'position'=>145), + 'shippable'=>array('label'=>"Shippable", 'checked'=>1, 'position'=>995, 'enabled'=>(!empty($conf->expedition->enabled)), 'position'=>150), + 'c.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000, 'position'=>155) ); // Extra fields -include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_array_fields.tpl.php'; +include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php'; $object->fields = dol_sort_array($object->fields, 'position'); $arrayfields = dol_sort_array($arrayfields, 'position'); @@ -448,10 +448,10 @@ if ($resql) if ($search_status != '') $param .= '&search_status='.urlencode($search_status); if ($search_datecloture_start) $param .= '&search_datecloture_start='.urlencode($search_datecloture_start); if ($search_datecloture_end) $param .= '&search_datecloture_end='.urlencode($search_datecloture_end); - if ($search_dateorder_start) $param .= '&search_dateorder_start_day=' . dol_print_date($search_dateorder_start, '%d') . '&search_dateorder_start_month=' . dol_print_date($search_dateorder_start, '%m') . '&search_dateorder_start_year=' . dol_print_date($search_dateorder_start, '%Y'); - if ($search_dateorder_end) $param .= '&search_dateorder_end_day=' . dol_print_date($search_dateorder_end, '%d') . '&search_dateorder_end_month=' . dol_print_date($search_dateorder_end, '%m') . '&search_dateorder_end_year=' . dol_print_date($search_dateorder_end, '%Y'); - if ($search_datedelivery_start) $param .= '&search_datedelivery_start_day=' . dol_print_date($search_datedelivery_start, '%d') . '&search_datedelivery_start_month=' . dol_print_date($search_datedelivery_start, '%m') . '&search_datedelivery_start_year=' . dol_print_date($search_datedelivery_start, '%Y'); - if ($search_datedelivery_end) $param .= '&search_datedelivery_end_day=' . dol_print_date($search_datedelivery_end, '%d') . '&search_datedelivery_end_month=' . dol_print_date($search_datedelivery_end, '%m') . '&search_datedelivery_end_year=' . dol_print_date($search_datedelivery_end, '%Y'); + if ($search_dateorder_start) $param .= '&search_dateorder_start_day='.dol_print_date($search_dateorder_start, '%d').'&search_dateorder_start_month='.dol_print_date($search_dateorder_start, '%m').'&search_dateorder_start_year='.dol_print_date($search_dateorder_start, '%Y'); + if ($search_dateorder_end) $param .= '&search_dateorder_end_day='.dol_print_date($search_dateorder_end, '%d').'&search_dateorder_end_month='.dol_print_date($search_dateorder_end, '%m').'&search_dateorder_end_year='.dol_print_date($search_dateorder_end, '%Y'); + if ($search_datedelivery_start) $param .= '&search_datedelivery_start_day='.dol_print_date($search_datedelivery_start, '%d').'&search_datedelivery_start_month='.dol_print_date($search_datedelivery_start, '%m').'&search_datedelivery_start_year='.dol_print_date($search_datedelivery_start, '%Y'); + if ($search_datedelivery_end) $param .= '&search_datedelivery_end_day='.dol_print_date($search_datedelivery_end, '%d').'&search_datedelivery_end_month='.dol_print_date($search_datedelivery_end, '%m').'&search_datedelivery_end_year='.dol_print_date($search_datedelivery_end, '%Y'); if ($search_ref) $param .= '&search_ref='.urlencode($search_ref); if ($search_company) $param .= '&search_company='.urlencode($search_company); if ($search_ref_customer) $param .= '&search_ref_customer='.urlencode($search_ref_customer); @@ -836,7 +836,7 @@ if ($resql) { print ''; //print $form->selectyesno('search_shippable', $search_shippable, 1, 0, 1, 1); - if (! empty($conf->global->ORDER_SHIPABLE_STATUS_DISABLED_BY_DEFAULT)) { + if (!empty($conf->global->ORDER_SHIPABLE_STATUS_DISABLED_BY_DEFAULT)) { print ''; print $langs->trans('ShowShippableStatus'); } else { @@ -854,17 +854,17 @@ if ($resql) // Status if (!empty($arrayfields['c.fk_statut']['checked'])) { - print ''; - $liststatus = array( - Commande::STATUS_DRAFT=>$langs->trans("StatusOrderDraftShort"), - Commande::STATUS_VALIDATED=>$langs->trans("StatusOrderValidated"), - Commande::STATUS_SHIPMENTONPROCESS=>$langs->trans("StatusOrderSentShort"), - Commande::STATUS_CLOSED=>$langs->trans("StatusOrderDelivered"), - -3=>$langs->trans("StatusOrderValidatedShort").'+'.$langs->trans("StatusOrderSentShort").'+'.$langs->trans("StatusOrderDelivered"), - Commande::STATUS_CANCELED=>$langs->trans("StatusOrderCanceledShort") - ); - print $form->selectarray('search_status', $liststatus, $search_status, -4, 0, 0, '', 0, 0, 0, '', 'maxwidth100', 1); - print ''; + $liststatus = array( + Commande::STATUS_DRAFT=>$langs->trans("StatusOrderDraftShort"), + Commande::STATUS_VALIDATED=>$langs->trans("StatusOrderValidated"), + Commande::STATUS_SHIPMENTONPROCESS=>$langs->trans("StatusOrderSentShort"), + Commande::STATUS_CLOSED=>$langs->trans("StatusOrderDelivered"), + -3=>$langs->trans("StatusOrderValidatedShort").'+'.$langs->trans("StatusOrderSentShort").'+'.$langs->trans("StatusOrderDelivered"), + Commande::STATUS_CANCELED=>$langs->trans("StatusOrderCanceledShort") + ); + print $form->selectarray('search_status', $liststatus, $search_status, -4, 0, 0, '', 0, 0, 0, '', 'maxwidth100', 1); + print ''; @@ -950,7 +950,7 @@ if ($resql) $generic_commande->statut = $obj->fk_statut; $generic_commande->billed = $obj->billed; $generic_commande->date = $db->jdate($obj->date_commande); - $generic_commande->date_livraison = $db->jdate($obj->date_delivery); // deprecated + $generic_commande->date_livraison = $db->jdate($obj->date_delivery); // deprecated $generic_commande->delivery_date = $db->jdate($obj->date_delivery); $generic_commande->ref_client = $obj->ref_client; $generic_commande->total_ht = $obj->total_ht; @@ -1235,7 +1235,7 @@ if ($resql) // Get local and virtual stock and store it into cache if (empty($productstat_cache[$generic_commande->lines[$lig]->fk_product])) { - $generic_product->load_stock('nobatch'); // ->load_virtual_stock() is already included into load_stock() + $generic_product->load_stock('nobatch'); // ->load_virtual_stock() is already included into load_stock() $productstat_cache[$generic_commande->lines[$lig]->fk_product]['stock_reel'] = $generic_product->stock_reel; $productstat_cachevirtual[$generic_commande->lines[$lig]->fk_product]['stock_reel'] = $generic_product->stock_theorique; } else { @@ -1245,9 +1245,9 @@ if ($resql) if (empty($conf->global->SHIPPABLE_ORDER_ICON_IN_LIST)) // Default code. Default should be this case. { - $text_info .= $generic_commande->lines[$lig]->qty . ' X ' . $generic_commande->lines[$lig]->product_ref . ' ' . dol_trunc($generic_commande->lines[$lig]->product_label, 25); - $text_info .= ' - ' . $langs->trans("Stock") . ': ' . $generic_product->stock_reel . ''; - $text_info .= ' - ' . $langs->trans("VirtualStock") . ': ' . $generic_product->stock_theorique . ''; + $text_info .= $generic_commande->lines[$lig]->qty.' X '.$generic_commande->lines[$lig]->product_ref.' '.dol_trunc($generic_commande->lines[$lig]->product_label, 25); + $text_info .= ' - '.$langs->trans("Stock").': '.$generic_product->stock_reel.''; + $text_info .= ' - '.$langs->trans("VirtualStock").': '.$generic_product->stock_theorique.''; $text_info .= '
'; if ($generic_commande->lines[$lig]->qty > $generic_product->stock_reel) { @@ -1281,20 +1281,20 @@ if ($resql) $stock_order_supplier = $generic_product->stats_commande_fournisseur['qty']; } } - $text_info .= $generic_commande->lines[$lig]->qty . ' X ' . $generic_commande->lines[$lig]->ref . ' ' . dol_trunc($generic_commande->lines[$lig]->product_label, 25); - $text_stock_reel = $generic_product->stock_reel . '/' . $stock_order; + $text_info .= $generic_commande->lines[$lig]->qty.' X '.$generic_commande->lines[$lig]->ref.' '.dol_trunc($generic_commande->lines[$lig]->product_label, 25); + $text_stock_reel = $generic_product->stock_reel.'/'.$stock_order; if ($stock_order > $generic_product->stock_reel && !($generic_product->stock_reel < $generic_commande->lines[$lig]->qty)) { $warning++; - $text_warning .= '' . $langs->trans('Available') . ' : ' . $text_stock_reel . ''; + $text_warning .= ''.$langs->trans('Available').' : '.$text_stock_reel.''; } if ($generic_product->stock_reel < $generic_commande->lines[$lig]->qty) { $notshippable++; - $text_info .= '' . $langs->trans('Available') . ' : ' . $text_stock_reel . ''; + $text_info .= ''.$langs->trans('Available').' : '.$text_stock_reel.''; } else { - $text_info .= '' . $langs->trans('Available') . ' : ' . $text_stock_reel . ''; + $text_info .= ''.$langs->trans('Available').' : '.$text_stock_reel.''; } if (!empty($conf->fournisseur->enabled)) { - $text_info .= ' ' . $langs->trans('SupplierOrder') . ' : ' . $stock_order_supplier . '
'; + $text_info .= ' '.$langs->trans('SupplierOrder').' : '.$stock_order_supplier.'
'; } else { $text_info .= '
'; } @@ -1303,10 +1303,10 @@ if ($resql) } if ($notshippable == 0) { $text_icon = img_picto('', 'dolly', '', false, 0, 0, '', 'green paddingleft'); - $text_info = $langs->trans('Shippable') . '
' . $text_info; + $text_info = $langs->trans('Shippable').'
'.$text_info; } else { $text_icon = img_picto('', 'dolly', '', false, 0, 0, '', 'error paddingleft'); - $text_info = $langs->trans('NonShippable') . '
' . $text_info; + $text_info = $langs->trans('NonShippable').'
'.$text_info; } } @@ -1314,7 +1314,7 @@ if ($resql) print $form->textwithtooltip('', $text_info, 2, 1, $text_icon, '', 2); } if ($warning) { // Always false in default mode - print $form->textwithtooltip('', $langs->trans('NotEnoughForAllOrders') . '
' . $text_warning, 2, 1, img_picto('', 'error'), '', 2); + print $form->textwithtooltip('', $langs->trans('NotEnoughForAllOrders').'
'.$text_warning, 2, 1, img_picto('', 'error'), '', 2); } } print '		'.$generic_commande->LibStatut($obj->fk_statut, $obj->billed, 5, 1).''.$generic_commande->LibStatut($obj->fk_statut, $obj->billed, 5, 1).'
'.$langs->trans("Currency").''; - $currencycodetouse = GETPOST('multicurrency_code') ?GETPOST('multicurrency_code') : (isset($object->fourn_multicurrency_code) ? $object->fourn_multicurrency_code : ''); - if (empty($currencycodetouse) && $object->fourn_multicurrency_tx == 1) $currencycodetouse = $conf->currency; - print $form->selectMultiCurrency($currencycodetouse, "multicurrency_code", 1); - print '   '.$langs->trans("CurrencyRate").' '; - print ''; - print '
'.$langs->trans("Currency").''; + $currencycodetouse = GETPOST('multicurrency_code') ?GETPOST('multicurrency_code') : (isset($object->fourn_multicurrency_code) ? $object->fourn_multicurrency_code : ''); + if (empty($currencycodetouse) && $object->fourn_multicurrency_tx == 1) $currencycodetouse = $conf->currency; + print $form->selectMultiCurrency($currencycodetouse, "multicurrency_code", 1); + print '   '.$langs->trans("CurrencyRate").' '; + print ''; + print '
'.$langs->trans("PriceQtyMinCurrency").''; - if (! empty($productpricescache[$obj->rowid])) + if (!empty($productpricescache[$obj->rowid])) { - if ($productpricescache[$obj->rowid][$key]['price_base_type'] == 'TTC') { - print price($productpricescache[$obj->rowid][$key]['price_ttc']).' '.$langs->trans("TTC"); - } else { - print price($productpricescache[$obj->rowid][$key]['price']).' '.$langs->trans("HT"); - } + if ($productpricescache[$obj->rowid][$key]['price_base_type'] == 'TTC') { + print price($productpricescache[$obj->rowid][$key]['price_ttc']).' '.$langs->trans("TTC"); + } else { + print price($productpricescache[$obj->rowid][$key]['price']).' '.$langs->trans("HT"); + } } print ''; - $form->selectInvoice('invoice', '', 'invoiceid', 24, 0, $langs->trans('NewInvoice'), 1, 0, 0, 'maxwidth500', '', 'all'); + $form->selectInvoice('invoice', '', 'invoiceid', 24, 0, $langs->trans('NewInvoice'), 1, 0, 0, 'maxwidth500', '', 'all'); print '
' . $langs->trans("AddEmailPhoneTownInContactList") . ''.$langs->trans("AddEmailPhoneTownInContactList").' '; if (!empty($conf->global->CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST)) { - print ''; + print ''; print img_picto($langs->trans("Activated"), 'switch_on'); } else { - print ''; + print ''; print img_picto($langs->trans("Disabled"), 'switch_off'); } print '
'; $footerorder = '
'.$langs->trans("Label").''.$langs->trans("Qty").'
'.dol_print_date(dol_now(), 'dayhour').'
'; $order_receipt_printer1 = ""; @@ -858,7 +858,7 @@ $(document).ready(function() { global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true){ + if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) { ?> $.ajax({ type: "POST", @@ -880,7 +880,7 @@ if ($action == "order" and $order_receipt_printer1 != "") { } if ($action == "order" and $order_receipt_printer2 != "") { - if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true){ + if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) { ?> $.ajax({ type: "POST", @@ -902,7 +902,7 @@ if ($action == "order" and $order_receipt_printer2 != "") { } if ($action == "order" and $order_receipt_printer3 != "") { - if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true){ + if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) { ?> $.ajax({ type: "POST", diff --git a/htdocs/ticket/class/api_tickets.class.php b/htdocs/ticket/class/api_tickets.class.php index 5ba67060552..4a0bcbe7b92 100644 --- a/htdocs/ticket/class/api_tickets.class.php +++ b/htdocs/ticket/class/api_tickets.class.php @@ -29,544 +29,544 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/ticket.lib.php'; */ class Tickets extends DolibarrApi { - /** - * @var array $FIELDS Mandatory fields, checked when create and update object - */ - public static $FIELDS = array( - 'subject', - 'message' - ); + /** + * @var array $FIELDS Mandatory fields, checked when create and update object + */ + public static $FIELDS = array( + 'subject', + 'message' + ); - /** - * @var array $FIELDS_MESSAGES Mandatory fields, checked when create and update object - */ - public static $FIELDS_MESSAGES = array( - 'track_id', - 'message' - ); + /** + * @var array $FIELDS_MESSAGES Mandatory fields, checked when create and update object + */ + public static $FIELDS_MESSAGES = array( + 'track_id', + 'message' + ); - /** - * @var Ticket $ticket {@type Ticket} - */ - public $ticket; + /** + * @var Ticket $ticket {@type Ticket} + */ + public $ticket; - /** - * Constructor - */ - public function __construct() - { - global $db; - $this->db = $db; - $this->ticket = new Ticket($this->db); - } + /** + * Constructor + */ + public function __construct() + { + global $db; + $this->db = $db; + $this->ticket = new Ticket($this->db); + } - /** - * Get properties of a Ticket object. - * - * Return an array with ticket informations - * - * @param int $id ID of ticket - * @return array|mixed Data without useless information - * - * @throws RestException 401 - * @throws RestException 403 - * @throws RestException 404 - */ - public function get($id) - { - return $this->getCommon($id, '', ''); - } + /** + * Get properties of a Ticket object. + * + * Return an array with ticket informations + * + * @param int $id ID of ticket + * @return array|mixed Data without useless information + * + * @throws RestException 401 + * @throws RestException 403 + * @throws RestException 404 + */ + public function get($id) + { + return $this->getCommon($id, '', ''); + } - /** - * Get properties of a Ticket object from track id - * - * Return an array with ticket informations - * - * @param string $track_id Tracking ID of ticket - * @return array|mixed Data without useless information - * - * @url GET track_id/{track_id} - * - * @throws RestException 401 - * @throws RestException 403 - * @throws RestException 404 - */ - public function getByTrackId($track_id) - { - return $this->getCommon(0, $track_id, ''); - } + /** + * Get properties of a Ticket object from track id + * + * Return an array with ticket informations + * + * @param string $track_id Tracking ID of ticket + * @return array|mixed Data without useless information + * + * @url GET track_id/{track_id} + * + * @throws RestException 401 + * @throws RestException 403 + * @throws RestException 404 + */ + public function getByTrackId($track_id) + { + return $this->getCommon(0, $track_id, ''); + } - /** - * Get properties of a Ticket object from ref - * - * Return an array with ticket informations - * - * @param string $ref Reference for ticket - * @return array|mixed Data without useless information - * - * @url GET ref/{ref} - * - * @throws RestException 401 - * @throws RestException 403 - * @throws RestException 404 - */ - public function getByRef($ref) - { - try { - return $this->getCommon(0, '', $ref); - } catch (Exception $e) - { - throw $e; - } - } + /** + * Get properties of a Ticket object from ref + * + * Return an array with ticket informations + * + * @param string $ref Reference for ticket + * @return array|mixed Data without useless information + * + * @url GET ref/{ref} + * + * @throws RestException 401 + * @throws RestException 403 + * @throws RestException 404 + */ + public function getByRef($ref) + { + try { + return $this->getCommon(0, '', $ref); + } catch (Exception $e) + { + throw $e; + } + } - /** - * Get properties of a Ticket object - * Return an array with ticket informations - * - * @param int $id ID of ticket - * @param string $track_id Tracking ID of ticket - * @param string $ref Reference for ticket - * @return array|mixed Data without useless information - */ - private function getCommon($id = 0, $track_id = '', $ref = '') - { - if (!DolibarrApiAccess::$user->rights->ticket->read) { - throw new RestException(403); - } + /** + * Get properties of a Ticket object + * Return an array with ticket informations + * + * @param int $id ID of ticket + * @param string $track_id Tracking ID of ticket + * @param string $ref Reference for ticket + * @return array|mixed Data without useless information + */ + private function getCommon($id = 0, $track_id = '', $ref = '') + { + if (!DolibarrApiAccess::$user->rights->ticket->read) { + throw new RestException(403); + } - // Check parameters - if (($id < 0) && !$track_id && !$ref) { - throw new RestException(401, 'Wrong parameters'); - } + // Check parameters + if (($id < 0) && !$track_id && !$ref) { + throw new RestException(401, 'Wrong parameters'); + } if ($id == 0) { $result = $this->ticket->initAsSpecimen(); } else { $result = $this->ticket->fetch($id, $ref, $track_id); } - if (!$result) { - throw new RestException(404, 'Ticket not found'); - } + if (!$result) { + throw new RestException(404, 'Ticket not found'); + } - // String for user assigned - if ($this->ticket->fk_user_assign > 0) { - $userStatic = new User($this->db); - $userStatic->fetch($this->ticket->fk_user_assign); - $this->ticket->fk_user_assign_string = $userStatic->firstname.' '.$userStatic->lastname; - } + // String for user assigned + if ($this->ticket->fk_user_assign > 0) { + $userStatic = new User($this->db); + $userStatic->fetch($this->ticket->fk_user_assign); + $this->ticket->fk_user_assign_string = $userStatic->firstname.' '.$userStatic->lastname; + } - // Messages of ticket - $messages = array(); - $this->ticket->loadCacheMsgsTicket(); - if (is_array($this->ticket->cache_msgs_ticket) && count($this->ticket->cache_msgs_ticket) > 0) { - $num = count($this->ticket->cache_msgs_ticket); - $i = 0; - while ($i < $num) { - if ($this->ticket->cache_msgs_ticket[$i]['fk_user_author'] > 0) { - $user_action = new User($this->db); - $user_action->fetch($this->ticket->cache_msgs_ticket[$i]['fk_user_author']); - } + // Messages of ticket + $messages = array(); + $this->ticket->loadCacheMsgsTicket(); + if (is_array($this->ticket->cache_msgs_ticket) && count($this->ticket->cache_msgs_ticket) > 0) { + $num = count($this->ticket->cache_msgs_ticket); + $i = 0; + while ($i < $num) { + if ($this->ticket->cache_msgs_ticket[$i]['fk_user_author'] > 0) { + $user_action = new User($this->db); + $user_action->fetch($this->ticket->cache_msgs_ticket[$i]['fk_user_author']); + } - // Now define messages - $messages[] = array( - 'id' => $this->ticket->cache_msgs_ticket[$i]['id'], - 'fk_user_action' => $this->ticket->cache_msgs_ticket[$i]['fk_user_author'], - 'fk_user_action_socid' => $user_action->socid, - 'fk_user_action_string' => dolGetFirstLastname($user_action->firstname, $user_action->lastname), - 'message' => $this->ticket->cache_msgs_ticket[$i]['message'], - 'datec' => $this->ticket->cache_msgs_ticket[$i]['datec'], - 'private' => $this->ticket->cache_msgs_ticket[$i]['private'] - ); - $i++; - } - $this->ticket->messages = $messages; - } + // Now define messages + $messages[] = array( + 'id' => $this->ticket->cache_msgs_ticket[$i]['id'], + 'fk_user_action' => $this->ticket->cache_msgs_ticket[$i]['fk_user_author'], + 'fk_user_action_socid' => $user_action->socid, + 'fk_user_action_string' => dolGetFirstLastname($user_action->firstname, $user_action->lastname), + 'message' => $this->ticket->cache_msgs_ticket[$i]['message'], + 'datec' => $this->ticket->cache_msgs_ticket[$i]['datec'], + 'private' => $this->ticket->cache_msgs_ticket[$i]['private'] + ); + $i++; + } + $this->ticket->messages = $messages; + } - // History - $history = array(); - $this->ticket->loadCacheLogsTicket(); - if (is_array($this->ticket->cache_logs_ticket) && count($this->ticket->cache_logs_ticket) > 0) { - $num = count($this->ticket->cache_logs_ticket); - $i = 0; - while ($i < $num) { - if ($this->ticket->cache_logs_ticket[$i]['fk_user_create'] > 0) { - $user_action = new User($this->db); - $user_action->fetch($this->ticket->cache_logs_ticket[$i]['fk_user_create']); - } + // History + $history = array(); + $this->ticket->loadCacheLogsTicket(); + if (is_array($this->ticket->cache_logs_ticket) && count($this->ticket->cache_logs_ticket) > 0) { + $num = count($this->ticket->cache_logs_ticket); + $i = 0; + while ($i < $num) { + if ($this->ticket->cache_logs_ticket[$i]['fk_user_create'] > 0) { + $user_action = new User($this->db); + $user_action->fetch($this->ticket->cache_logs_ticket[$i]['fk_user_create']); + } - // Now define messages - $history[] = array( - 'id' => $this->ticket->cache_logs_ticket[$i]['id'], - 'fk_user_author' => $this->ticket->cache_msgs_ticket[$i]['fk_user_author'], - 'fk_user_action' => $this->ticket->cache_logs_ticket[$i]['fk_user_create'], - 'fk_user_action_string' => dolGetFirstLastname($user_action->firstname, $user_action->lastname), - 'message' => $this->ticket->cache_logs_ticket[$i]['message'], - 'datec' => $this->ticket->cache_logs_ticket[$i]['datec'], - ); - $i++; - } - $this->ticket->history = $history; - } + // Now define messages + $history[] = array( + 'id' => $this->ticket->cache_logs_ticket[$i]['id'], + 'fk_user_author' => $this->ticket->cache_msgs_ticket[$i]['fk_user_author'], + 'fk_user_action' => $this->ticket->cache_logs_ticket[$i]['fk_user_create'], + 'fk_user_action_string' => dolGetFirstLastname($user_action->firstname, $user_action->lastname), + 'message' => $this->ticket->cache_logs_ticket[$i]['message'], + 'datec' => $this->ticket->cache_logs_ticket[$i]['datec'], + ); + $i++; + } + $this->ticket->history = $history; + } - if (!DolibarrApi::_checkAccessToResource('ticket', $this->ticket->id)) { - throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); - } - return $this->_cleanObjectDatas($this->ticket); - } + if (!DolibarrApi::_checkAccessToResource('ticket', $this->ticket->id)) { + throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); + } + return $this->_cleanObjectDatas($this->ticket); + } - /** - * List tickets - * - * Get a list of tickets - * - * @param int $socid Filter list with thirdparty ID - * @param string $sortfield Sort field - * @param string $sortorder Sort order - * @param int $limit Limit for list - * @param int $page Page number - * @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101') and (t.fk_statut:=:1)" - * - * @return array Array of ticket objects - * - */ - public function index($socid = 0, $sortfield = "t.rowid", $sortorder = "ASC", $limit = 100, $page = 0, $sqlfilters = '') - { - global $db, $conf; + /** + * List tickets + * + * Get a list of tickets + * + * @param int $socid Filter list with thirdparty ID + * @param string $sortfield Sort field + * @param string $sortorder Sort order + * @param int $limit Limit for list + * @param int $page Page number + * @param string $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101') and (t.fk_statut:=:1)" + * + * @return array Array of ticket objects + * + */ + public function index($socid = 0, $sortfield = "t.rowid", $sortorder = "ASC", $limit = 100, $page = 0, $sqlfilters = '') + { + global $db, $conf; - $obj_ret = array(); + $obj_ret = array(); - if (!$socid && DolibarrApiAccess::$user->socid) { - $socid = DolibarrApiAccess::$user->socid; - } + if (!$socid && DolibarrApiAccess::$user->socid) { + $socid = DolibarrApiAccess::$user->socid; + } - // If the internal user must only see his customers, force searching by him - if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) { - $search_sale = DolibarrApiAccess::$user->id; - } + // If the internal user must only see his customers, force searching by him + if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) { + $search_sale = DolibarrApiAccess::$user->id; + } - $sql = "SELECT t.rowid"; - if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $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."ticket as t"; + $sql = "SELECT t.rowid"; + if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $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."ticket as t"; - if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $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 - } + if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $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('ticket', 1).')'; - if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) { - $sql .= " AND t.fk_soc = sc.fk_soc"; - } - if ($socid > 0) { - $sql .= " AND t.fk_soc = ".$socid; - } - if ($search_sale > 0) { - $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale - } + $sql .= ' WHERE t.entity IN ('.getEntity('ticket', 1).')'; + if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) { + $sql .= " AND t.fk_soc = sc.fk_soc"; + } + if ($socid > 0) { + $sql .= " AND t.fk_soc = ".$socid; + } + 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).")"; - } + // 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 .= $this->db->order($sortfield, $sortorder); + $sql .= $this->db->order($sortfield, $sortorder); - if ($limit) { - if ($page < 0) { - $page = 0; - } - $offset = $limit * $page; + if ($limit) { + if ($page < 0) { + $page = 0; + } + $offset = $limit * $page; - $sql .= $this->db->plimit($limit, $offset); - } + $sql .= $this->db->plimit($limit, $offset); + } - $result = $this->db->query($sql); - if ($result) { - $num = $this->db->num_rows($result); - $i = 0; - while ($i < $num) { - $obj = $this->db->fetch_object($result); - $ticket_static = new Ticket($this->db); - if ($ticket_static->fetch($obj->rowid)) { - if ($ticket_static->fk_user_assign > 0) { - $userStatic = new User($this->db); - $userStatic->fetch($ticket_static->fk_user_assign); - $ticket_static->fk_user_assign_string = $userStatic->firstname.' '.$userStatic->lastname; - } - $obj_ret[] = $this->_cleanObjectDatas($ticket_static); - } - $i++; - } - } else { - throw new RestException(503, 'Error when retrieve ticket list'); - } - if (!count($obj_ret)) { - throw new RestException(404, 'No ticket found'); - } - return $obj_ret; - } + $result = $this->db->query($sql); + if ($result) { + $num = $this->db->num_rows($result); + $i = 0; + while ($i < $num) { + $obj = $this->db->fetch_object($result); + $ticket_static = new Ticket($this->db); + if ($ticket_static->fetch($obj->rowid)) { + if ($ticket_static->fk_user_assign > 0) { + $userStatic = new User($this->db); + $userStatic->fetch($ticket_static->fk_user_assign); + $ticket_static->fk_user_assign_string = $userStatic->firstname.' '.$userStatic->lastname; + } + $obj_ret[] = $this->_cleanObjectDatas($ticket_static); + } + $i++; + } + } else { + throw new RestException(503, 'Error when retrieve ticket list'); + } + if (!count($obj_ret)) { + throw new RestException(404, 'No ticket found'); + } + return $obj_ret; + } - /** - * Create ticket object - * - * @param array $request_data Request datas - * @return int ID of ticket - */ - public function post($request_data = null) - { - $ticketstatic = new Ticket($this->db); - if (!DolibarrApiAccess::$user->rights->ticket->write) { - throw new RestException(401); - } - // Check mandatory fields - $result = $this->_validate($request_data); + /** + * Create ticket object + * + * @param array $request_data Request datas + * @return int ID of ticket + */ + public function post($request_data = null) + { + $ticketstatic = new Ticket($this->db); + if (!DolibarrApiAccess::$user->rights->ticket->write) { + throw new RestException(401); + } + // Check mandatory fields + $result = $this->_validate($request_data); - foreach ($request_data as $field => $value) { - $this->ticket->$field = $value; - } - if (empty($this->ticket->ref)) { - $this->ticket->ref = $ticketstatic->getDefaultRef(); - } - if (empty($this->ticket->track_id)) { - $this->ticket->track_id = generate_random_id(16); - } + foreach ($request_data as $field => $value) { + $this->ticket->$field = $value; + } + if (empty($this->ticket->ref)) { + $this->ticket->ref = $ticketstatic->getDefaultRef(); + } + if (empty($this->ticket->track_id)) { + $this->ticket->track_id = generate_random_id(16); + } - if ($this->ticket->create(DolibarrApiAccess::$user) < 0) { - throw new RestException(500, "Error creating ticket", array_merge(array($this->ticket->error), $this->ticket->errors)); - } + if ($this->ticket->create(DolibarrApiAccess::$user) < 0) { + throw new RestException(500, "Error creating ticket", array_merge(array($this->ticket->error), $this->ticket->errors)); + } - return $this->ticket->id; - } + return $this->ticket->id; + } - /** - * Create ticket object - * - * @param array $request_data Request datas - * @return int ID of ticket - * - */ - public function postNewMessage($request_data = null) - { - $ticketstatic = new Ticket($this->db); - if (!DolibarrApiAccess::$user->rights->ticket->write) { - throw new RestException(401); - } - // Check mandatory fields - $result = $this->_validateMessage($request_data); + /** + * Create ticket object + * + * @param array $request_data Request datas + * @return int ID of ticket + * + */ + public function postNewMessage($request_data = null) + { + $ticketstatic = new Ticket($this->db); + if (!DolibarrApiAccess::$user->rights->ticket->write) { + throw new RestException(401); + } + // Check mandatory fields + $result = $this->_validateMessage($request_data); - foreach ($request_data as $field => $value) { - $this->ticket->$field = $value; - } - $ticketMessageText = $this->ticket->message; - $result = $this->ticket->fetch('', '', $this->ticket->track_id); - if (!$result) { - throw new RestException(404, 'Ticket not found'); - } - $this->ticket->message = $ticketMessageText; - if (!$this->ticket->createTicketMessage(DolibarrApiAccess::$user)) { - throw new RestException(500); - } - return $this->ticket->id; - } + foreach ($request_data as $field => $value) { + $this->ticket->$field = $value; + } + $ticketMessageText = $this->ticket->message; + $result = $this->ticket->fetch('', '', $this->ticket->track_id); + if (!$result) { + throw new RestException(404, 'Ticket not found'); + } + $this->ticket->message = $ticketMessageText; + if (!$this->ticket->createTicketMessage(DolibarrApiAccess::$user)) { + throw new RestException(500); + } + return $this->ticket->id; + } - /** - * Update ticket - * - * @param int $id Id of ticket to update - * @param array $request_data Datas - * @return int - * - */ - public function put($id, $request_data = null) - { - if (!DolibarrApiAccess::$user->rights->ticket->write) { - throw new RestException(401); - } + /** + * Update ticket + * + * @param int $id Id of ticket to update + * @param array $request_data Datas + * @return int + * + */ + public function put($id, $request_data = null) + { + if (!DolibarrApiAccess::$user->rights->ticket->write) { + throw new RestException(401); + } - $result = $this->ticket->fetch($id); - if (!$result) { - throw new RestException(404, 'Ticket not found'); - } + $result = $this->ticket->fetch($id); + if (!$result) { + throw new RestException(404, 'Ticket not found'); + } - if (!DolibarrApi::_checkAccessToResource('ticket', $this->ticket->id)) { - throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); - } + if (!DolibarrApi::_checkAccessToResource('ticket', $this->ticket->id)) { + throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); + } - foreach ($request_data as $field => $value) { - $this->ticket->$field = $value; - } + foreach ($request_data as $field => $value) { + $this->ticket->$field = $value; + } - if ($this->ticket->update($id, DolibarrApiAccess::$user)) { - return $this->get($id); - } + if ($this->ticket->update($id, DolibarrApiAccess::$user)) { + return $this->get($id); + } - return false; - } + return false; + } - /** - * Delete ticket - * - * @param int $id Ticket ID - * @return array - * - */ - public function delete($id) - { - if (!DolibarrApiAccess::$user->rights->ticket->delete) { - throw new RestException(401); - } - $result = $this->ticket->fetch($id); - if (!$result) { - throw new RestException(404, 'Ticket not found'); - } + /** + * Delete ticket + * + * @param int $id Ticket ID + * @return array + * + */ + public function delete($id) + { + if (!DolibarrApiAccess::$user->rights->ticket->delete) { + throw new RestException(401); + } + $result = $this->ticket->fetch($id); + if (!$result) { + throw new RestException(404, 'Ticket not found'); + } - if (!DolibarrApi::_checkAccessToResource('ticket', $this->ticket->id)) { - throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); - } + if (!DolibarrApi::_checkAccessToResource('ticket', $this->ticket->id)) { + throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login); + } - if (!$this->ticket->delete($id)) { - throw new RestException(500); - } + if (!$this->ticket->delete($id)) { + throw new RestException(500); + } - return array( - 'success' => array( - 'code' => 200, - 'message' => 'Ticket deleted' - ) - ); - } + return array( + 'success' => array( + 'code' => 200, + 'message' => 'Ticket deleted' + ) + ); + } - /** - * Validate fields before create or update object - * - * @param array $data Data to validate - * @return array - * - * @throws RestException - */ - private function _validate($data) - { - $ticket = array(); - foreach (Tickets::$FIELDS as $field) { - if (!isset($data[$field])) { - throw new RestException(400, "$field field missing"); - } - $ticket[$field] = $data[$field]; - } - return $ticket; - } + /** + * Validate fields before create or update object + * + * @param array $data Data to validate + * @return array + * + * @throws RestException + */ + private function _validate($data) + { + $ticket = array(); + foreach (Tickets::$FIELDS as $field) { + if (!isset($data[$field])) { + throw new RestException(400, "$field field missing"); + } + $ticket[$field] = $data[$field]; + } + return $ticket; + } - /** - * Validate fields before create or update object message - * - * @param array $data Data to validate - * @return array - * - * @throws RestException - */ - private function _validateMessage($data) - { - $ticket = array(); - foreach (Tickets::$FIELDS_MESSAGES as $field) { - if (!isset($data[$field])) { - throw new RestException(400, "$field field missing"); - } - $ticket[$field] = $data[$field]; - } - return $ticket; - } + /** + * Validate fields before create or update object message + * + * @param array $data Data to validate + * @return array + * + * @throws RestException + */ + private function _validateMessage($data) + { + $ticket = array(); + foreach (Tickets::$FIELDS_MESSAGES as $field) { + if (!isset($data[$field])) { + throw new RestException(400, "$field field missing"); + } + $ticket[$field] = $data[$field]; + } + return $ticket; + } - // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore - /** - * Clean sensible object datas - * - * @param Object $object Object to clean - * @return Object Object with cleaned properties - * - * @todo use an array for properties to clean - * - */ - protected function _cleanObjectDatas($object) - { - // phpcs:enable - $object = parent::_cleanObjectDatas($object); + // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore + /** + * Clean sensible object datas + * + * @param Object $object Object to clean + * @return Object Object with cleaned properties + * + * @todo use an array for properties to clean + * + */ + protected function _cleanObjectDatas($object) + { + // phpcs:enable + $object = parent::_cleanObjectDatas($object); - // Other attributes to clean - $attr2clean = array( - "contact", - "contact_id", - "ref_previous", - "ref_next", - "ref_ext", - "table_element_line", - "statut", - "country", - "country_id", - "country_code", - "barcode_type", - "barcode_type_code", - "barcode_type_label", - "barcode_type_coder", - "mode_reglement_id", - "cond_reglement_id", - "cond_reglement", - "fk_delivery_address", - "shipping_method_id", - "modelpdf", - "fk_account", - "note_public", - "note_private", - "note", - "total_ht", - "total_tva", - "total_localtax1", - "total_localtax2", - "total_ttc", - "fk_incoterms", - "label_incoterms", - "location_incoterms", - "name", - "lastname", - "firstname", - "civility_id", - "canvas", - "cache_msgs_ticket", - "cache_logs_ticket", - "cache_types_tickets", - "cache_category_tickets", - "regeximgext", - "statuts_short", - "statuts" - ); - foreach ($attr2clean as $toclean) { - unset($object->$toclean); - } + // Other attributes to clean + $attr2clean = array( + "contact", + "contact_id", + "ref_previous", + "ref_next", + "ref_ext", + "table_element_line", + "statut", + "country", + "country_id", + "country_code", + "barcode_type", + "barcode_type_code", + "barcode_type_label", + "barcode_type_coder", + "mode_reglement_id", + "cond_reglement_id", + "cond_reglement", + "fk_delivery_address", + "shipping_method_id", + "modelpdf", + "fk_account", + "note_public", + "note_private", + "note", + "total_ht", + "total_tva", + "total_localtax1", + "total_localtax2", + "total_ttc", + "fk_incoterms", + "label_incoterms", + "location_incoterms", + "name", + "lastname", + "firstname", + "civility_id", + "canvas", + "cache_msgs_ticket", + "cache_logs_ticket", + "cache_types_tickets", + "cache_category_tickets", + "regeximgext", + "statuts_short", + "statuts" + ); + foreach ($attr2clean as $toclean) { + unset($object->$toclean); + } - // If object has lines, remove $db property - if (isset($object->lines) && count($object->lines) > 0) { - $nboflines = count($object->lines); - for ($i = 0; $i < $nboflines; $i++) { - $this->_cleanObjectDatas($object->lines[$i]); - } - } + // If object has lines, remove $db property + if (isset($object->lines) && count($object->lines) > 0) { + $nboflines = count($object->lines); + for ($i = 0; $i < $nboflines; $i++) { + $this->_cleanObjectDatas($object->lines[$i]); + } + } - // 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); - } - } - } - return $object; - } + // 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); + } + } + } + return $object; + } } diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php index bd28149627f..fc1cca1aa0f 100644 --- a/htdocs/ticket/list.php +++ b/htdocs/ticket/list.php @@ -112,7 +112,7 @@ foreach ($object->fields as $key => $val) if (!empty($val['visible'])) $arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>$val['enabled'], 'position'=>$val['position']); } // Extra fields -include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_array_fields.tpl.php'; +include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php'; $object->fields = dol_sort_array($object->fields, 'position'); $arrayfields = dol_sort_array($arrayfields, 'position'); @@ -316,7 +316,7 @@ if ($socid > 0) foreach ($search as $key => $val) { - if ($key == 'fk_statut' && !empty($search['fk_statut'])) + if ($key == 'fk_statut' && !empty($search['fk_statut'])) { $newarrayofstatus = array(); foreach ($search['fk_statut'] as $key2 => $val2) { @@ -636,9 +636,9 @@ foreach ($object->fields as $key => $val) $formTicket->selectSeveritiesTickets(dol_escape_htmltag($search[$key]), 'search_'.$key.'', '', 2, 1, 1, 0, ($val['css'] ? $val['css'] : 'maxwidth150')); print ''; } elseif ($key == 'fk_user_assign' || $key == 'fk_user_create') { - print ''; - print $form->select_dolusers($search[$key], 'search_'.$key, 1, null, 0, '', '', '0', 0, 0, '', 0, '', ($val['css'] ? $val['css'] : 'maxwidth150')); - print ''; + print ''; + print $form->select_dolusers($search[$key], 'search_'.$key, 1, null, 0, '', '', '0', 0, 0, '', 0, '', ($val['css'] ? $val['css'] : 'maxwidth150')); + print ''; } elseif ($key == 'fk_statut') { $arrayofstatus = array(); $arrayofstatus['openall'] = '-- '.$langs->trans('OpenAll').' --'; diff --git a/htdocs/user/list.php b/htdocs/user/list.php index d17507b3b33..126bfd0bac1 100644 --- a/htdocs/user/list.php +++ b/htdocs/user/list.php @@ -343,7 +343,7 @@ if ($search_thirdparty != '') $sql .= natural_search(array('s.nom'), $search_thi if ($search_login != '') $sql .= natural_search("u.login", $search_login); if ($search_lastname != '') $sql .= natural_search("u.lastname", $search_lastname); if ($search_firstname != '') $sql .= natural_search("u.firstname", $search_firstname); -if ($search_gender != '' && $search_gender != '-1') $sql .= " AND u.gender = '".$db->escape($search_gender)."'"; // Cannot use natural_search as looking for %man% also includes woman +if ($search_gender != '' && $search_gender != '-1') $sql .= " AND u.gender = '".$db->escape($search_gender)."'"; // Cannot use natural_search as looking for %man% also includes woman if (is_numeric($search_employee) && $search_employee >= 0) { $sql .= ' AND u.employee = '.(int) $search_employee; } diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php index 631de0a5fa8..42b39e7e902 100644 --- a/htdocs/website/class/website.class.php +++ b/htdocs/website/class/website.class.php @@ -882,7 +882,7 @@ class Website extends CommonObject global $user; $this->id = 0; - $this->specimen =1; + $this->specimen = 1; $this->entity = 1; $this->ref = 'myspecimenwebsite'; $this->description = 'A specimen website'; diff --git a/htdocs/zapier/class/api_zapier.class.php b/htdocs/zapier/class/api_zapier.class.php index bb3e42f5f05..945a6a69a8f 100644 --- a/htdocs/zapier/class/api_zapier.class.php +++ b/htdocs/zapier/class/api_zapier.class.php @@ -244,7 +244,7 @@ class ZapierApi extends DolibarrApi $fields = array( 'url', ); - dol_syslog("API Zapier create hook receive : " . print_r($request_data, true), LOG_DEBUG); + dol_syslog("API Zapier create hook receive : ".print_r($request_data, true), LOG_DEBUG); $result = $this->validate($request_data, $fields); foreach ($request_data as $field => $value) { diff --git a/scripts/emailings/reset-invalid-emails.php b/scripts/emailings/reset-invalid-emails.php index ed10aded257..59c7e5372dd 100755 --- a/scripts/emailings/reset-invalid-emails.php +++ b/scripts/emailings/reset-invalid-emails.php @@ -77,12 +77,12 @@ if (!$myfile) } $tmp = 1; -while ($tmp!=null) +while ($tmp != null) { - $groupofemails=array(); - for ($i=0; $i < MAXEMAILS; $i++) + $groupofemails = array(); + for ($i = 0; $i < MAXEMAILS; $i++) { - $tmp =fgets($myfile); + $tmp = fgets($myfile); if ($tmp == null) { break; @@ -99,7 +99,7 @@ while ($tmp!=null) { // Loop on each record and update the email to null if email into $groupofemails - $sql=$sql_base."societe as s SET s.email = NULL WHERE s.email = '".$db->escape($email)."';"; + $sql = $sql_base."societe as s SET s.email = NULL WHERE s.email = '".$db->escape($email)."';"; $db->query($sql); } @@ -107,7 +107,7 @@ while ($tmp!=null) { // Loop on each record and update the email to null if email into $groupofemails - $sql=$sql_base."socpeople as s SET s.email = NULL WHERE s.email = '".$db->escape($email)."';"; + $sql = $sql_base."socpeople as s SET s.email = NULL WHERE s.email = '".$db->escape($email)."';"; $db->query($sql); } @@ -115,7 +115,7 @@ while ($tmp!=null) { // Loop on each record and update the email to null if email into $groupofemails - $sql=$sql_base."user as u SET u.email = NULL WHERE u.email = '".$db->escape($email)."';"; + $sql = $sql_base."user as u SET u.email = NULL WHERE u.email = '".$db->escape($email)."';"; $db->query($sql); } @@ -123,8 +123,8 @@ while ($tmp!=null) { // Loop on each record and update the email to null if email into $groupofemails - $sql=$sql_base."adherent as a SET a.email = NULL WHERE a.email = '".$db->escape($email)."';"; - $resql=$db->query($sql); + $sql = $sql_base."adherent as a SET a.email = NULL WHERE a.email = '".$db->escape($email)."';"; + $resql = $db->query($sql); } echo $email; } From 7d966d7a491cacade4761f4ec516bdff38114551 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Tue, 1 Dec 2020 01:42:18 +0000 Subject: [PATCH 090/297] Fixing style errors. --- htdocs/core/class/commondocgenerator.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php index 631c88d2123..49a303208a8 100644 --- a/htdocs/core/class/commondocgenerator.class.php +++ b/htdocs/core/class/commondocgenerator.class.php @@ -1342,7 +1342,7 @@ abstract class CommonDocGenerator if (!empty($fields)) { // Sort extrafields by rank - uasort($fields, function($a, $b) { + uasort($fields, function ($a, $b) { return ($a->rank > $b->rank) ? 1 : -1; }); From 28cb5d05ff1e51ece2bd3263d4e2ef02548a9667 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 1 Dec 2020 03:02:19 +0100 Subject: [PATCH 091/297] Trans --- htdocs/langs/en_US/mails.lang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang index 42ff04a6ae0..906394eb9c1 100644 --- a/htdocs/langs/en_US/mails.lang +++ b/htdocs/langs/en_US/mails.lang @@ -129,8 +129,8 @@ NotificationsAuto=Notifications Auto. NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company ANotificationsWillBeSent=1 automatic notification will be sent by email SomeNotificationsWillBeSent=%s automatic notifications will be sent by email -AddNewNotification=Activate a new automatic email notification target/event -ListOfActiveNotifications=List all active targets/events for automatic email notification +AddNewNotification=Subscribe to a new automatic email notification (target/event) +ListOfActiveNotifications=List all active subscriptions (targets/events) for automatic email notification ListOfNotificationsDone=List all automatic email notifications sent MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. From 242379255b01af9a9f1a181a7503c810ef098802 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 1 Dec 2020 03:14:54 +0100 Subject: [PATCH 092/297] CSS --- htdocs/theme/eldy/global.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 9771784828b..a3e71882264 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -2551,7 +2551,7 @@ img.userphotosmall { /* size for user photo in lists */ vertical-align: middle; background-color: #FFF; } -img.userphoto[alt="Gravatar avatar"] { +img.userphoto[alt="Gravatar avatar"], img.photouserphoto.dropdown-user-image[alt="Gravatar avatar"] { background: #fff; } .span-icon-user { From 7b02aa4c38022d7e3de2bef41c34e6f2caf5a0ba Mon Sep 17 00:00:00 2001 From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com> Date: Tue, 1 Dec 2020 09:28:24 +0100 Subject: [PATCH 093/297] Update checkVatService.xml http -> https at --- htdocs/societe/checkvat/checkVatService.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/societe/checkvat/checkVatService.xml b/htdocs/societe/checkvat/checkVatService.xml index 373775c2487..b6d7661cdc6 100644 --- a/htdocs/societe/checkvat/checkVatService.xml +++ b/htdocs/societe/checkvat/checkVatService.xml @@ -167,7 +167,7 @@ - + From 20aa1e29f60c166050d1d95f73a4369137ae14aa Mon Sep 17 00:00:00 2001 From: lvessiller Date: Tue, 1 Dec 2020 09:58:55 +0100 Subject: [PATCH 094/297] NEW address column in company list --- htdocs/societe/list.php | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php index 5a843e9856a..48a01a94390 100644 --- a/htdocs/societe/list.php +++ b/htdocs/societe/list.php @@ -72,6 +72,7 @@ $search_customer_code = trim(GETPOST('search_customer_code', 'alpha')); $search_supplier_code = trim(GETPOST('search_supplier_code', 'alpha')); $search_account_customer_code = trim(GETPOST('search_account_customer_code', 'alpha')); $search_account_supplier_code = trim(GETPOST('search_account_supplier_code', 'alpha')); +$search_address = trim(GETPOST('search_address', 'alpha')); $search_town = trim(GETPOST("search_town", 'alpha')); $search_zip = trim(GETPOST("search_zip", 'alpha')); $search_state = trim(GETPOST("search_state", 'alpha')); @@ -186,6 +187,7 @@ $arrayfields = array( 's.code_fournisseur'=>array('label'=>"SupplierCodeShort", 'position'=>11, 'checked'=>$checkedsuppliercode, 'enabled'=>(!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))), 's.code_compta'=>array('label'=>"CustomerAccountancyCodeShort", 'position'=>13, 'checked'=>$checkedcustomeraccountcode), 's.code_compta_fournisseur'=>array('label'=>"SupplierAccountancyCodeShort", 'position'=>14, 'checked'=>$checkedsupplieraccountcode, 'enabled'=>(!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))), + 's.address'=>array('label'=>"Address", 'position'=>19, 'checked'=>1), 's.town'=>array('label'=>"Town", 'position'=>20, 'checked'=>1), 's.zip'=>array('label'=>"Zip", 'position'=>21, 'checked'=>1), 'state.nom'=>array('label'=>"State", 'position'=>22, 'checked'=>0), @@ -289,6 +291,7 @@ if (empty($reshook)) $search_supplier_code = ''; $search_account_customer_code = ''; $search_account_supplier_code = ''; + $search_address = ''; $search_town = ""; $search_zip = ""; $search_state = ""; @@ -386,7 +389,7 @@ if ($resql) } } else dol_print_error($db); -$sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.barcode, s.town, s.zip, s.datec, s.code_client, s.code_fournisseur, s.logo,"; +$sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.barcode, s.address, s.town, s.zip, s.datec, s.code_client, s.code_fournisseur, s.logo,"; $sql .= " s.entity,"; $sql .= " st.libelle as stcomm, st.picto as stcomm_picto, s.fk_stcomm as stcomm_id, s.fk_prospectlevel, s.prefix_comm, s.client, s.fournisseur, s.canvas, s.status as status,"; $sql .= " s.email, s.phone, s.fax, s.url, s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4 as idprof4, s.idprof5 as idprof5, s.idprof6 as idprof6, s.tva_intra, s.fk_pays,"; @@ -448,6 +451,7 @@ if ($search_customer_code) $sql .= natural_search("s.code_client", $search_custo if ($search_supplier_code) $sql .= natural_search("s.code_fournisseur", $search_supplier_code); if ($search_account_customer_code) $sql .= natural_search("s.code_compta", $search_account_customer_code); if ($search_account_supplier_code) $sql .= natural_search("s.code_compta_fournisseur", $search_account_supplier_code); +if ($search_address) $sql.= natural_search('s.address', $search_address); if ($search_town) $sql .= natural_search("s.town", $search_town); if (strlen($search_zip)) $sql .= natural_search("s.zip", $search_zip); if ($search_state) $sql .= natural_search("state.nom", $search_state); @@ -545,6 +549,7 @@ if ($search_sale > 0) $param .= '&search_sale='.urlencode($search_sale); if ($search_id > 0) $param .= "&search_id=".urlencode($search_id); if ($search_nom != '') $param .= "&search_nom=".urlencode($search_nom); if ($search_alias != '') $param .= "&search_alias=".urlencode($search_alias); +if ($search_address != '') $param .= '&search_address=' . urlencode($search_address); if ($search_town != '') $param .= "&search_town=".urlencode($search_town); if ($search_zip != '') $param .= "&search_zip=".urlencode($search_zip); if ($search_phone != '') $param .= "&search_phone=".urlencode($search_phone); @@ -766,6 +771,13 @@ if (!empty($arrayfields['s.code_compta_fournisseur']['checked'])) print ''; print ''; } +// Address +if (!empty($arrayfields['s.address']['checked'])) +{ + print ''; + print ''; + print ''; +} // Town if (!empty($arrayfields['s.town']['checked'])) { @@ -975,6 +987,7 @@ if (!empty($arrayfields['s.code_client']['checked'])) print_liste_fi if (!empty($arrayfields['s.code_fournisseur']['checked'])) print_liste_field_titre($arrayfields['s.code_fournisseur']['label'], $_SERVER["PHP_SELF"], "s.code_fournisseur", "", $param, '', $sortfield, $sortorder); if (!empty($arrayfields['s.code_compta']['checked'])) print_liste_field_titre($arrayfields['s.code_compta']['label'], $_SERVER["PHP_SELF"], "s.code_compta", "", $param, '', $sortfield, $sortorder); if (!empty($arrayfields['s.code_compta_fournisseur']['checked'])) print_liste_field_titre($arrayfields['s.code_compta_fournisseur']['label'], $_SERVER["PHP_SELF"], "s.code_compta_fournisseur", "", $param, '', $sortfield, $sortorder); +if (!empty($arrayfields['s.address']['checked'])) print_liste_field_titre($arrayfields['s.address']['label'], $_SERVER['PHP_SELF'], 's.address', '', $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); if (!empty($arrayfields['state.nom']['checked'])) print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder); @@ -1103,6 +1116,12 @@ while ($i < min($num, $limit)) print ''.$obj->code_compta_fournisseur.''; if (!$i) $totalarray['nbfield']++; } + // Address + if (!empty($arrayfields['s.address']['checked'])) + { + print ''.$obj->address.''; + if (!$i) $totalarray['nbfield']++; + } // Town if (!empty($arrayfields['s.town']['checked'])) { From 3b3f9acdbb6cced9372afaad9fafa9fb01f55c1d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 1 Dec 2020 11:35:30 +0100 Subject: [PATCH 095/297] Remove warning --- htdocs/core/class/CMailFile.class.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php index e7bcb208a1e..b2149cd187f 100644 --- a/htdocs/core/class/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -58,6 +58,8 @@ class CMailFile public $alternative_boundary; public $deliveryreceipt; + public $atleastonefile; + public $eol; public $eol2; @@ -338,8 +340,7 @@ class CMailFile $text_body = $this->write_body($msg); // Add attachments to text_encoded - if ($this->atleastonefile) - { + if (!empty($this->atleastonefile)) { $files_encoded = $this->write_files($filename_list, $mimetype_list, $mimefilename_list); } @@ -401,7 +402,7 @@ class CMailFile } } - if ($this->atleastonefile) + if (!empty($this->atleastonefile)) { foreach ($filename_list as $i => $val) { @@ -530,7 +531,7 @@ class CMailFile $this->message->addPart(dol_nl2br($msg), 'text/html'); } - if ($this->atleastonefile) + if (!empty($this->atleastonefile)) { foreach ($filename_list as $i => $val) { From 3538e485a8fa309deeb7f361393c4ba768524092 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 1 Dec 2020 11:38:46 +0100 Subject: [PATCH 096/297] Fix phpunit --- htdocs/takepos/invoice.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php index cee4a1495db..9dbbbb44f1d 100644 --- a/htdocs/takepos/invoice.php +++ b/htdocs/takepos/invoice.php @@ -583,7 +583,7 @@ if ($action == "delete") { // We delete the lines $resdeletelines = 1; - foreach($invoice->lines as $line){ + foreach($invoice->lines as $line) { $tmpres = $invoice->deleteline($line->id); if ($tmpres < 0) { $resdeletelines = 0; @@ -595,12 +595,9 @@ if ($action == "delete") { $sql .= " WHERE ref='(PROV-POS".$db->escape($_SESSION["takeposterminal"]."-".$place).")'"; $resql1 = $db->query($sql); - if ($resdeletelines && $resql1) - { + if ($resdeletelines && $resql1) { $db->commit(); - } - else - { + } else { $db->rollback(); } From f847425f23252a2b59ddd92c0d50f7234be8b428 Mon Sep 17 00:00:00 2001 From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com> Date: Tue, 1 Dec 2020 13:48:18 +0100 Subject: [PATCH 097/297] Update llx_accounting_abc.sql --- .../install/mysql/data/llx_accounting_abc.sql | 77 +++++++++++++------ 1 file changed, 52 insertions(+), 25 deletions(-) diff --git a/htdocs/install/mysql/data/llx_accounting_abc.sql b/htdocs/install/mysql/data/llx_accounting_abc.sql index d3f9ad5fd69..9118b7a4651 100644 --- a/htdocs/install/mysql/data/llx_accounting_abc.sql +++ b/htdocs/install/mysql/data/llx_accounting_abc.sql @@ -8,7 +8,12 @@ -- Copyright (C) 2011-2018 Alexandre Spangaro -- Copyright (C) 2015-2017 Juanjo Menent -- Copyright (C) 2018 Abbes bahfir +-- Copyright (C) 2020 Udo Tamm -- +-- +-------------------------------------------------------------------------------------- +-- License +-- ####### -- 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 @@ -22,14 +27,25 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see . -- --- +-------------------------------------------------------------------------------------- +-- Comment +-- ####### +-- (EN) +-- Do not place a comment at the end of the line, this file is parsed at the end of the line. +-- from the install and all '--' are removed. -- +-- (FR) -- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors -- de l'install et tous les sigles '--' sont supprimés. -- +-------------------------------------------------------------------------------------- +-- PCG = Plan Comptable Général (FR) - General Accounting Plan (EN) +-------------------------------------------------------------------------------------- +-- Accounting Journals + INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('VT', 'ACCOUNTING_SELL_JOURNAL', 2, 1, 1); INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('AC', 'ACCOUNTING_PURCHASE_JOURNAL', 3, 1, 1); INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('BQ', 'FinanceJournal', 4, 1, 1); @@ -39,6 +55,9 @@ INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES INSERT INTO llx_accounting_journal (code, label, nature, active, entity) VALUES ('INV', 'InventoryJournal', 8, 1, 1); + +-- Accounting Charts / Plans (Templates) for Countries + -- Description of chart of account FR PCG99-ABREGE INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 1, 'PCG99-ABREGE', 'The simple accountancy french plan', 1); -- Description of chart of account FR PCG99-BASE @@ -56,8 +75,9 @@ INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUE -- Description of chart of account ES PCG08-PYME INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 4, 'PCG08-PYME', 'The PYME accountancy spanish plan', 1); --- Description of chart of account DE SKR03 +-- Description of chart of account DE SKR-03 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 5, 'SKR03', 'Standardkontenrahmen SKR 03', 1); +-- Description of chart of account DE SKR-04 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 5, 'SKR04', 'Standardkontenrahmen SKR 04', 1); -- Description of chart of account CH PCG_SUISSE @@ -69,6 +89,18 @@ INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUE -- 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); +-- Description of chart of account MA PCG +INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 12, 'PCG', 'The Moroccan chart of accounts', 1); + +-- Description of chart of account DZ NSCF +INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 13, 'NSCF', 'Nouveau système comptable financier', 1); + +-- Description of chart of account NL NL-VERKORT +INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 17, 'NL-VERKORT', 'Verkort rekeningschema', 1); + +-- Description of chart of account SE BAS-K1-MINI +INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 20, 'BAS-K1-MINI', 'The Swedish mini chart of accounts', 1); + -- Description of chart of account AT AT-BASE INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 41, 'AT-BASE', 'Plan Austria', 1); @@ -78,54 +110,60 @@ INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUE -- Description of chart of account DK DK-STD INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 80, 'DK-STD', 'Standardkontoplan fra SKAT', 1); +-- Description of chart of account EC EC-SUPERCIAS +INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 84, 'EC-SUPERCIAS', 'Plan de cuentas Ecuador', 1); + + -- Description of chart of account LU PCN-LUXEMBURG INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (140, 'PCN-LUXEMBURG', 'Plan comptable normalisé Luxembourgeois', 1); --- Description of chart of account MA PCG -INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 12, 'PCG', 'The Moroccan chart of accounts', 1); --- Description of chart of account SE BAS-K1-MINI -INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 20, 'BAS-K1-MINI', 'The Swedish mini chart of accounts', 1); +-- Description of chart of account RO RO-BASE +INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (188, 'RO-BASE', 'Plan de conturi romanesc', 1); + + --DELETE FROM llx_accounting_system WHERE pcg_version = 'SYSCOHADA'; +-- Plans SYSCOAHA Western Africa -- sorted alphabetical by countries abbreviations + -- Description of chart of account BJ SYSCOHADA INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 49,'SYSCOHADA-BJ', 'Plan comptable Ouest-Africain', 1); -- Description of chart of account BF SYSCOHADA INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 60,'SYSCOHADA-BF', 'Plan comptable Ouest-Africain', 1); --- Description of chart of account CM SYSCOHADA -INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 24,'SYSCOHADA-CM', 'Plan comptable Ouest-Africain', 1); +-- Description of chart of account CD SYSCOHADA +INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 73,'SYSCOHADA-CD', 'Plan comptable Ouest-Africain', 1); -- Description of chart of account CF SYSCOHADA INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 65,'SYSCOHADA-CF', 'Plan comptable Ouest-Africain', 1); --- Description of chart of account KM SYSCOHADA -INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 71,'SYSCOHADA-KM', 'Plan comptable Ouest-Africain', 1); - -- Description of chart of account CG SYSCOHADA INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 72,'SYSCOHADA-CG', 'Plan comptable Ouest-Africain', 1); -- Description of chart of account CI SYSCOHADA INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 21,'SYSCOHADA-CI', 'Plan comptable Ouest-Africain', 1); +-- Description of chart of account CM SYSCOHADA +INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 24,'SYSCOHADA-CM', 'Plan comptable Ouest-Africain', 1); + -- Description of chart of account GA SYSCOHADA INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 16,'SYSCOHADA-GA', 'Plan comptable Ouest-Africain', 1); -- Description of chart of account GQ SYSCOHADA INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 87,'SYSCOHADA-GQ', 'Plan comptable Ouest-Africain', 1); +-- Description of chart of account KM SYSCOHADA +INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 71,'SYSCOHADA-KM', 'Plan comptable Ouest-Africain', 1); + -- Description of chart of account ML SYSCOHADA INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (147,'SYSCOHADA-ML', 'Plan comptable Ouest-Africain', 1); -- Description of chart of account NE SYSCOHADA INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (168,'SYSCOHADA-NE', 'Plan comptable Ouest-Africain', 1); --- Description of chart of account CD SYSCOHADA -INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 73,'SYSCOHADA-CD', 'Plan comptable Ouest-Africain', 1); - -- Description of chart of account SN SYSCOHADA INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 22,'SYSCOHADA-SN', 'Plan comptable Ouest-Africain', 1); @@ -135,14 +173,3 @@ INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUE -- Description of chart of account TG SYSCOHADA INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 15,'SYSCOHADA-TG', 'Plan comptable Ouest-Africain', 1); --- Description of chart of account RO RO-BASE -INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 188, 'RO-BASE', 'Plan de conturi romanesc', 1); - --- Description of chart of account DZ NSCF -INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 13, 'NSCF', 'Nouveau système comptable financier', 1); - --- Description of chart of account NL NL-VERKORT -INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 17, 'NL-VERKORT', 'Verkort rekeningschema', 1); - --- Description of chart of account EC EC-SUPERCIAS -INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 84, 'EC-SUPERCIAS', 'Plan de cuentas Ecuador', 1); \ No newline at end of file From 9d1da25f0361981be3cdaf91efbc82fd45a80dc1 Mon Sep 17 00:00:00 2001 From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com> Date: Tue, 1 Dec 2020 13:57:33 +0100 Subject: [PATCH 098/297] Update llx_const.sql --- htdocs/install/mysql/data/llx_const.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql index 99da23f53a5..7cd039a2c19 100644 --- a/htdocs/install/mysql/data/llx_const.sql +++ b/htdocs/install/mysql/data/llx_const.sql @@ -47,17 +47,17 @@ insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_U -- Hidden but specific to one entity insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_ENABLE_OVERWRITE_TRANSLATION','1','chaine','Enable translation overwrite',0,1); insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_ENABLE_DEFAULT_VALUES','1','chaine','Enable default value overwrite',0,1); -insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MONNAIE','EUR','chaine','Monnaie',0,1); +insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MONNAIE','EUR','chaine','Currency',0,1); insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MAIL_SMTP_SERVER','','chaine','Host or ip address for SMTP server',0,1); insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MAIL_SMTP_PORT','','chaine','Port for SMTP server',0,1); -insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MAIL_EMAIL_FROM','robot@domain.com','chaine','EMail emetteur pour les emails automatiques Dolibarr',0,1); +insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MAIL_EMAIL_FROM','robot@domain.com','chaine','email emitter for Dolibarr automatic emails',0,1); -- -- IHM -- -insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_SIZE_LISTE_LIMIT','25','chaine','Longueur maximum des listes',0,0); -insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_SIZE_SHORTLIST_LIMIT','3','chaine','Longueur maximum des listes courtes (fiche client)',0,0); +insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_SIZE_LISTE_LIMIT','25','chaine','Maximum length of lists',0,0); +insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_SIZE_SHORTLIST_LIMIT','3','chaine','Maximum length of short lists',0,0); insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MENU_STANDARD','eldy_menu.php','chaine','Menu manager for internal users',0,0); insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_MENUFRONT_STANDARD','eldy_menu.php','chaine','Menu manager for external users',0,0); From c215764627616bf16d8b23782e6fc13bf2bc89cc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 1 Dec 2020 15:45:19 +0100 Subject: [PATCH 099/297] Fix phpcs --- htdocs/takepos/invoice.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php index 9dbbbb44f1d..db6745e8885 100644 --- a/htdocs/takepos/invoice.php +++ b/htdocs/takepos/invoice.php @@ -583,7 +583,7 @@ if ($action == "delete") { // We delete the lines $resdeletelines = 1; - foreach($invoice->lines as $line) { + foreach ($invoice->lines as $line) { $tmpres = $invoice->deleteline($line->id); if ($tmpres < 0) { $resdeletelines = 0; From 3632a7a02ac65df5ea95fd08e8a4356fc2b23245 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 1 Dec 2020 15:50:59 +0100 Subject: [PATCH 100/297] Fix warning --- htdocs/societe/class/societe.class.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 6b1ca1ad3a6..38c6479d0f2 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -3115,10 +3115,10 @@ class Societe extends CommonObject // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps /** - * Returns if a profid sould be verified + * Returns if a profid sould be verified to be unique * - * @param int $idprof 1,2,3,4,5,6 (Exemple: 1=siren,2=siret,3=naf,4=rcs/rm,5=idprof5,6=idprof6) - * @return boolean true , false + * @param int $idprof 1,2,3,4,5,6 (Example: 1=siren, 2=siret, 3=naf, 4=rcs/rm, 5=eori, 6=idprof6) + * @return boolean true if the ID must be unique */ public function id_prof_verifiable($idprof) { @@ -3128,22 +3128,22 @@ class Societe extends CommonObject switch ($idprof) { case 1: - $ret = (!$conf->global->SOCIETE_IDPROF1_UNIQUE ?false:true); + $ret = (empty($conf->global->SOCIETE_IDPROF1_UNIQUE) ? false : true); break; case 2: - $ret = (!$conf->global->SOCIETE_IDPROF2_UNIQUE ?false:true); + $ret = (empty($conf->global->SOCIETE_IDPROF2_UNIQUE) ? false : true); break; case 3: - $ret = (!$conf->global->SOCIETE_IDPROF3_UNIQUE ?false:true); + $ret = (empty($conf->global->SOCIETE_IDPROF3_UNIQUE) ? false : true); break; case 4: - $ret = (!$conf->global->SOCIETE_IDPROF4_UNIQUE ?false:true); + $ret = (empty($conf->global->SOCIETE_IDPROF4_UNIQUE) ? false : true); break; case 5: - $ret = (!$conf->global->SOCIETE_IDPROF5_UNIQUE ?false:true); + $ret = (empty($conf->global->SOCIETE_IDPROF5_UNIQUE) ? false : true); break; case 6: - $ret = (!$conf->global->SOCIETE_IDPROF6_UNIQUE ?false:true); + $ret = (empty($conf->global->SOCIETE_IDPROF6_UNIQUE) ? false : true); break; default: $ret = false; From c0c03f5270a8afb79d52386a01365af9bdcde5c6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 1 Dec 2020 15:59:54 +0100 Subject: [PATCH 101/297] Fix allow tag
into translation strings --- htdocs/core/class/translate.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php index 3c0aa7fba9e..4202191b39a 100644 --- a/htdocs/core/class/translate.class.php +++ b/htdocs/core/class/translate.class.php @@ -623,8 +623,8 @@ class Translate // We replace some HTML tags by __xx__ to avoid having them encoded by htmlentities because // we want to keep '"' '' '' '' '' '
' '< ' '' that are reliable HTML tags inside translation strings. $str = str_replace( - array('"', '', '', '', '', '', '
', '', '< ', '>'), // We accept '< ' but not '<'. We can accept however '>' - array('__quot__', '__tagbold__', '__tagboldend__', '__tagbold__', '__tagboldend__', '__taga__', '__tagaend__', '__tagbr__', '__tagspan__', '__tagspanend__', '__lt__', '__gt__'), + array('"', '', '', '
', '
', '', '', '', '
', '', '< ', '>'), // We accept '< ' but not '<'. We can accept however '>' + array('__quot__', '__tagbold__', '__tagboldend__', '__tagcenter__', '__tagcenterend__', '__tagbold__', '__tagboldend__', '__taga__', '__tagaend__', '__tagbr__', '__tagspan__', '__tagspanend__', '__lt__', '__gt__'), $str ); @@ -638,8 +638,8 @@ class Translate // Restore reliable HTML tags into original translation string $str = str_replace( - array('__quot__', '__tagbold__', '__tagboldend__', '__taga__', '__tagaend__', '__tagbr__', '__tagspan__', '__tagspanend__', '__lt__', '__gt__'), - array('"', '', '', '', '
', '', '< ', '> '), + array('__quot__', '__tagbold__', '__tagboldend__', '__tagcenter__', '__tagcenterend__', '__taga__', '__tagaend__', '__tagbr__', '__tagspan__', '__tagspanend__', '__lt__', '__gt__'), + array('"', '', '', '
', '
', '', '
', '', '< ', '> '), $str ); From c8b0570c90425be9ab4f4a10671ddc1159fe4a0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric?= <35066297+c3do@users.noreply.github.com> Date: Tue, 1 Dec 2020 16:32:36 +0100 Subject: [PATCH 102/297] NEW API: Get the list of ordering reasons --- htdocs/api/class/api_setup.class.php | 65 ++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php index 4516d2e1d45..9045626bde4 100644 --- a/htdocs/api/class/api_setup.class.php +++ b/htdocs/api/class/api_setup.class.php @@ -111,6 +111,71 @@ class Setup extends DolibarrApi return $list; } + /** + * Get the list of ordering reasons. + * + * @param string $sortfield Sort field + * @param string $sortorder Sort order + * @param int $limit Number of items per page + * @param int $page Page number {@min 0} + * @param int $active Payment type is active or not {@min 0} {@max 1} + * @param string $sqlfilters SQL criteria to filter with. Syntax example "(t.code:=:'OrderByWWW')" + * + * @url GET dictionary/ordering_reasons + * + * @return array [List of ordering reasons] + * + * @throws RestException 400 + */ + public function getOrderingReasons($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '') + { + $list = array(); + + if (!DolibarrApiAccess::$user->rights->commande->lire) { + throw new RestException(401); + } + + $sql = "SELECT rowid, code, label, module"; + $sql .= " FROM ".MAIN_DB_PREFIX."c_input_reason as t"; + $sql .= " WHERE t.active = ".$active; + // Add sql filters + if ($sqlfilters) + { + if (!DolibarrApi::_checkFilters($sqlfilters)) + { + throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters); + } + $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)'; + $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")"; + } + + + $sql .= $this->db->order($sortfield, $sortorder); + + if ($limit) { + if ($page < 0) { + $page = 0; + } + $offset = $limit * $page; + + $sql .= $this->db->plimit($limit, $offset); + } + + $result = $this->db->query($sql); + + if ($result) { + $num = $this->db->num_rows($result); + $min = min($num, ($limit <= 0 ? $num : $limit)); + for ($i = 0; $i < $min; $i++) { + $list[] = $this->db->fetch_object($result); + } + } else { + throw new RestException(400, $this->db->lasterror()); + } + + return $list; + } + /** * Get the list of payments types. * From 7788157b199a9c61397bb8fa582a14aa1040c2b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric?= <35066297+c3do@users.noreply.github.com> Date: Tue, 1 Dec 2020 16:55:43 +0100 Subject: [PATCH 103/297] API orders: Update demand reason on order update --- htdocs/commande/class/api_orders.class.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php index 71a26eea698..2f4eb6ea996 100644 --- a/htdocs/commande/class/api_orders.class.php +++ b/htdocs/commande/class/api_orders.class.php @@ -623,6 +623,12 @@ class Orders extends DolibarrApi throw new RestException(400, 'Error while updating availability'); } + // Update demand reason + if (!empty($this->commande->demand_reason_id) && $this->commande->demand_reason_id > 0) { + if ($this->commande->demand_reason($this->commande->demand_reason_id) < 0) + throw new RestException(400, 'Error while updating demand reason'); + } + if ($this->commande->update(DolibarrApiAccess::$user) > 0) { return $this->get($id); From c5ff32c2d2178f677d16384f4b3c2d51bdd27a20 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 1 Dec 2020 17:01:35 +0100 Subject: [PATCH 104/297] Fix accept and into translation strings --- htdocs/core/class/translate.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php index 4202191b39a..7655d6033d9 100644 --- a/htdocs/core/class/translate.class.php +++ b/htdocs/core/class/translate.class.php @@ -623,8 +623,8 @@ class Translate // We replace some HTML tags by __xx__ to avoid having them encoded by htmlentities because // we want to keep '"' '' '' '' '' '
' '< ' '' that are reliable HTML tags inside translation strings. $str = str_replace( - array('"', '', '', '
', '
', '', '', '', '
', '', '< ', '>'), // We accept '< ' but not '<'. We can accept however '>' - array('__quot__', '__tagbold__', '__tagboldend__', '__tagcenter__', '__tagcenterend__', '__tagbold__', '__tagboldend__', '__taga__', '__tagaend__', '__tagbr__', '__tagspan__', '__tagspanend__', '__lt__', '__gt__'), + array('"', '', '', '', '', '', '', '
', '
', '', '', '', '
', '', '< ', '>'), // We accept '< ' but not '<'. We can accept however '>' + array('__quot__', '__tagb__', '__tagbend__', '__tagu__', '__taguend__', '__tagi__', '__tagiend__', '__tagcenter__', '__tagcenterend__', '__tagb__', '__tagbend__', '__taga__', '__tagaend__', '__tagbr__', '__tagspan__', '__tagspanend__', '__lt__', '__gt__'), $str ); @@ -638,8 +638,8 @@ class Translate // Restore reliable HTML tags into original translation string $str = str_replace( - array('__quot__', '__tagbold__', '__tagboldend__', '__tagcenter__', '__tagcenterend__', '__taga__', '__tagaend__', '__tagbr__', '__tagspan__', '__tagspanend__', '__lt__', '__gt__'), - array('"', '', '', '
', '
', '', '
', '', '< ', '> '), + array('__quot__', '__tagb__', '__tagbend__', '__tagu__', '__taguend__', '__tagi__', '__tagiend__', '__tagcenter__', '__tagcenterend__', '__taga__', '__tagaend__', '__tagbr__', '__tagspan__', '__tagspanend__', '__lt__', '__gt__'), + array('"', '', '', '', '', '', '', '
', '
', '', '
', '', '< ', '> '), $str ); From ea1393a7cb7c607814ce2734d7f2d1e41c0c794b Mon Sep 17 00:00:00 2001 From: Marcio Zebedeu Date: Tue, 1 Dec 2020 19:29:11 +0100 Subject: [PATCH 105/297] New add VAT RAT for Angola VAT rate support for Angola was added. --- htdocs/install/mysql/data/llx_c_tva.sql | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql index 19c6070eb2a..08e327d5ce1 100644 --- a/htdocs/install/mysql/data/llx_c_tva.sql +++ b/htdocs/install/mysql/data/llx_c_tva.sql @@ -366,6 +366,10 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 1 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 132, 13, '9','0','TVA 9%',1); insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 133, 13, '19','0','TVA 19%', 1); +-- ANGOLA (id country=35) +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 351, 35, '0','0','VAT Rate 0', 1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 352, 35, '7','0','VAT reduced rate',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 353, 35, '14','0','VAT standard rate',1); -- Example of code to insert a vat rate 0 for each country --delete from llx_c_tva where rowid = 1181; -- to delete a record that does not follow rules for rowid (fk_pays+'1') From 3caf65ce6f9b9da799925aa52fd247252d20df55 Mon Sep 17 00:00:00 2001 From: Stephane Lesage Date: Tue, 1 Dec 2020 19:30:09 +0100 Subject: [PATCH 106/297] Create/Edit extra-field with multi-line text area for computed value --- htdocs/core/tpl/admin_extrafields_add.tpl.php | 7 +++++-- htdocs/core/tpl/admin_extrafields_edit.tpl.php | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php index 6c25b5c07b5..fca100b2e07 100644 --- a/htdocs/core/tpl/admin_extrafields_add.tpl.php +++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php @@ -180,11 +180,14 @@ $langs->load("modulebuilder"); trans("LanguageFile"); ?> + global->MAIN_STORE_COMPUTED_EXTRAFIELDS)) { ?> - textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc"), 1, 'help', '', 0, 2, 'tooltipcompute'); ?> + textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc"), 1, 'help', '', 0, 2, 'tooltipcompute'); ?> - textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc")).$form->textwithpicto($langs->trans("Computedpersistent"), $langs->trans("ComputedpersistentDesc"), 1, 'warning'); ?> + textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc")).$form->textwithpicto($langs->trans("Computedpersistent"), $langs->trans("ComputedpersistentDesc"), 1, 'warning'); ?> + + trans("DefaultValue").' ('.$langs->trans("Database").')'; ?> diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php index 191b4cf40c8..3af89dcede5 100644 --- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php +++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php @@ -263,11 +263,14 @@ else trans("LanguageFile"); ?> + global->MAIN_STORE_COMPUTED_EXTRAFIELDS)) { ?> - textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc"), 1, 'help', '', 0, 2, 'tooltipcompute'); ?> + textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc"), 1, 'help', '', 0, 2, 'tooltipcompute'); ?> - textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc")).$form->textwithpicto($langs->trans("Computedpersistent"), $langs->trans("ComputedpersistentDesc"), 1, 'warning'); ?> + textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc")).$form->textwithpicto($langs->trans("Computedpersistent"), $langs->trans("ComputedpersistentDesc"), 1, 'warning'); ?> + + trans("DefaultValue").' ('.$langs->trans("Database").')'; ?> From de9a32972fa910c86e2878516f0331282375d36a Mon Sep 17 00:00:00 2001 From: Marcio Zebedeu Date: Tue, 1 Dec 2020 19:48:49 +0100 Subject: [PATCH 107/297] New currency for Angolan added Support for Angolan currency added --- htdocs/install/mysql/data/llx_c_currencies.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/install/mysql/data/llx_c_currencies.sql b/htdocs/install/mysql/data/llx_c_currencies.sql index 41cb07416bb..d05015721c8 100644 --- a/htdocs/install/mysql/data/llx_c_currencies.sql +++ b/htdocs/install/mysql/data/llx_c_currencies.sql @@ -37,6 +37,7 @@ INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'ALL', '[76,101,107]', 1, 'Albania Lek'); INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'DZD', NULL, 1, 'Algeria Dinar'); +INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'AOA', NULL, 1, 'Angola Kwanza'); INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'AFN', '[1547]', 1, 'Afghanistan Afghani'); INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'ARS', '[36]', 1, 'Argentino Peso'); INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'AWG', '[402]', 1, 'Aruba Guilder'); From 800f8977b95b3ede565f5cf7480499da5e967e17 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 1 Dec 2020 20:00:02 +0100 Subject: [PATCH 108/297] Fix tooltips --- htdocs/website/index.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/htdocs/website/index.php b/htdocs/website/index.php index f2734483acb..3a8e8bda794 100644 --- a/htdocs/website/index.php +++ b/htdocs/website/index.php @@ -3009,7 +3009,7 @@ if ($action == 'editcss') print dol_get_fiche_head(); - print ''."\n"; + print ''."\n"; print ''; // Website @@ -3039,8 +3039,8 @@ if ($action == 'editcss') // Other languages print ''; @@ -3049,10 +3049,11 @@ if ($action == 'editcss') // VirtualHost print '\n"; +// Numpad show labels for icons +print '\n"; + // Direct Payment print ''; + $stringtoprint .= ''; + $stringtoprint .= ''; + $stringtoprint .= "\n"; + } + } + if ($conf->use_javascript_ajax) { + include_once DOL_DOCUMENT_ROOT . '/core/class/dolgraph.class.php'; + $dolgraph = new DolGraph(); + $dolgraph->SetData($dataseries); + $dolgraph->SetDataColor(array_values($colorseriesstat)); + $dolgraph->setShowLegend(2); + $dolgraph->setShowPercent(1); + $dolgraph->SetType(array('pie')); + $dolgraph->SetHeight('200'); + $dolgraph->draw('idgraphstatus'); + $stringtoprint .= $dolgraph->show($totaloppnb ? 0 : 1); + } + $stringtoprint .= ''; + + $line = 0; + $this->info_box_contents[$line][] = array( + 'tr' => 'class="nohover left "', + 'text' => '' + ); + $this->info_box_contents[$line][] = array( + 'tr' => 'class="nohover left "', + 'text' => '' + ); + $line++; + $this->info_box_contents[$line][] = array( + 'tr' => '', + 'td' => 'class="center nopaddingleftimp nopaddingrightimp" colspan="2"', + 'text' => $stringtoprint + ); + $line++; + $this->info_box_contents[$line][] = array( + 'tr' => 'class="oddeven"', + 'td' => 'class="left "', + 'maxlength' => 500, + 'text' => $langs->trans("OpportunityTotalAmount") . ' (' . $langs->trans("WonLostExcluded") . ')' + ); + $this->info_box_contents[$line][] = array( + 'tr' => 'class="oddeven"', + 'td' => 'class="right "', + 'maxlength' => 500, + 'text' => price($totalamount, 0, '', 1, -1, -1, $conf->currency) + ); + $line++; + $this->info_box_contents[$line][] = array( + 'tr' => 'class="oddeven"', + 'td' => 'class="left "', + 'maxlength' => 500, + 'text' => $form->textwithpicto($langs->trans("OpportunityPonderatedAmount").' ('.$langs->trans("WonLostExcluded").')', $langs->trans("OpportunityPonderatedAmountDesc"), 1) + + ); + $this->info_box_contents[$line][] = array( + 'td' => 'class="right "', + 'maxlength' => 500, + 'text' => price(price2num($ponderated_opp_amount, 'MT'), 0, '', 1, -1, -1, $conf->currency) + ); + } else { + $this->info_box_contents[0][0] = array( + 'td' => 'class="center opacitymedium"', + 'text' => $langs->trans("NoRecordedCustomers") + ); + } + } else { + $this->info_box_contents[0][0] = array( + 'td' => '', + 'text' => $langs->trans("ReadPermissionNotAllowed") + ); + } + } + + /** + * Method to show box + * + * @param array $head Array with properties of box title + * @param array $contents Array with properties of box lines + * @param int $nooutput No $stringtoprint .=, only return string + * @return string + */ + public function showBox($head = null, $contents = null, $nooutput = 0) + { + return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); + } +} diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php index af6398c7a6d..fcd3e2e1e22 100644 --- a/htdocs/core/modules/modProjet.class.php +++ b/htdocs/core/modules/modProjet.class.php @@ -146,6 +146,8 @@ class modProjet extends DolibarrModules $r++; $this->boxes[$r][1] = "box_validated_projects.php"; $r++; + $this->boxes[$r][1] = "box_funnel_of_prospection.php"; + $r++; // Permissions $this->rights = array(); From 409b73fe2c16fd1568e275cf0a9f8b1c09c303d6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 2 Dec 2020 15:16:04 +0100 Subject: [PATCH 123/297] FIX #15582 --- .../box_customers_outstanding_bill_reached.php | 14 ++++++++------ htdocs/install/mysql/migration/12.0.0-13.0.0.sql | 1 + htdocs/langs/en_US/boxes.lang | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php index 24690895ff5..f4f4d5015cc 100644 --- a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php +++ b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php @@ -106,7 +106,7 @@ class box_customers_outstanding_bill_reached extends ModeleBoxes $sql .= " AND s.outstanding_limit > 0"; $sql .= " AND s.rowid IN (SELECT fk_soc from ".MAIN_DB_PREFIX."facture as f WHERE f.fk_statut = 1 and f.fk_soc = s.rowid)"; $sql .= " ORDER BY s.tms DESC"; - $sql .= $this->db->plimit($max, 0); + //$sql .= $this->db->plimit($max, 0); dol_syslog(get_class($this)."::loadBox", LOG_DEBUG); $result = $this->db->query($sql); @@ -114,10 +114,13 @@ class box_customers_outstanding_bill_reached extends ModeleBoxes { $num = $this->db->num_rows($result); + $nboutstandingbillreachedcustomers = 0; + $line = 0; while ($line < $num) { $objp = $this->db->fetch_object($result); + $datec = $this->db->jdate($objp->datec); $datem = $this->db->jdate($objp->tms); $thirdpartystatic->id = $objp->socid; @@ -136,22 +139,21 @@ class box_customers_outstanding_bill_reached extends ModeleBoxes $outstandingtotal = $thirdpartystatic->getOutstandingBills()['opened']; $outstandinglimit = $thirdpartystatic->outstanding_limit; - $nboutstandingbillreachedcustomers = 0; - if ($outstandingtotal >= $outstandinglimit) { - $this->info_box_contents[$line][] = array( + $this->info_box_contents[$nboutstandingbillreachedcustomers][] = array( 'td' => '', - 'text' => $thirdpartystatic->getNomUrl(1), + 'text' => $thirdpartystatic->getNomUrl(1, 'customer'), 'asis' => 1, ); - $this->info_box_contents[$line][] = array( + $this->info_box_contents[$nboutstandingbillreachedcustomers][] = array( 'td' => 'class="right" width="18"', 'text' => $thirdpartystatic->LibStatut($objp->status, 3) ); $nboutstandingbillreachedcustomers++; } + $line++; } diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql index 18802301e5a..7d3118fe891 100644 --- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql +++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql @@ -542,3 +542,4 @@ CREATE TABLE llx_session( user_agent varchar(128) NULL )ENGINE=innodb; +INSERT INTO llx_boxes_def(file, entity) VALUES ('box_customers_outstanding_bill_reached', 1); diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang index 75f8eb14f49..502a3642afe 100644 --- a/htdocs/langs/en_US/boxes.lang +++ b/htdocs/langs/en_US/boxes.lang @@ -46,7 +46,7 @@ BoxTitleLastModifiedDonations=Latest %s modified donations BoxTitleLastModifiedExpenses=Latest %s modified expense reports BoxTitleLatestModifiedBoms=Latest %s modified BOMs BoxTitleLatestModifiedMos=Latest %s modified Manufacturing Orders -BoxTitleLastOutstandingBillReached=Latest %s customers with maximum outstanding exceeded +BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded BoxGlobalActivity=Global activity (invoices, proposals, orders) BoxGoodCustomers=Good customers BoxTitleGoodCustomers=%s Good customers From ea1c55cf1e1ce149c42176c30822f2c88560816e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 2 Dec 2020 15:16:20 +0100 Subject: [PATCH 124/297] Fix widgets that has disappeared --- htdocs/core/boxes/box_last_modified_ticket.php | 2 +- htdocs/core/boxes/box_last_ticket.php | 2 +- htdocs/core/boxes/box_lastlogin.php | 2 +- htdocs/index.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/core/boxes/box_last_modified_ticket.php b/htdocs/core/boxes/box_last_modified_ticket.php index 2950eb9cfd8..94734894ad7 100644 --- a/htdocs/core/boxes/box_last_modified_ticket.php +++ b/htdocs/core/boxes/box_last_modified_ticket.php @@ -204,6 +204,6 @@ class box_last_modified_ticket extends ModeleBoxes */ public function showBox($head = null, $contents = null, $nooutput = 0) { - parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); + return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } } diff --git a/htdocs/core/boxes/box_last_ticket.php b/htdocs/core/boxes/box_last_ticket.php index 9ada300901c..268a6861524 100644 --- a/htdocs/core/boxes/box_last_ticket.php +++ b/htdocs/core/boxes/box_last_ticket.php @@ -202,6 +202,6 @@ class box_last_ticket extends ModeleBoxes */ public function showBox($head = null, $contents = null, $nooutput = 0) { - parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); + return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } } diff --git a/htdocs/core/boxes/box_lastlogin.php b/htdocs/core/boxes/box_lastlogin.php index b45986387a8..c3ddb0fcdff 100644 --- a/htdocs/core/boxes/box_lastlogin.php +++ b/htdocs/core/boxes/box_lastlogin.php @@ -111,6 +111,6 @@ class box_lastlogin extends ModeleBoxes */ public function showBox($head = null, $contents = null, $nooutput = 0) { - parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); + return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput); } } diff --git a/htdocs/index.php b/htdocs/index.php index 887baa04e78..33fd93e649e 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -888,7 +888,7 @@ print '
'; /* - * Show boxes + * Show widgets (boxes) */ $boxlist .= '
'; From 5bdd52500d5255ff2fa0f79d08106be1b949b016 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 2 Dec 2020 15:47:56 +0100 Subject: [PATCH 125/297] Fix warning --- htdocs/societe/class/societe.class.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 38c6479d0f2..73c41aeb782 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -3241,7 +3241,7 @@ class Societe extends CommonObject // si son index (position dans la chaîne en commence à 0 au premier caractère) est impair // on double sa valeur et si cette dernière est supérieure à 9, on lui retranche 9 // on ajoute cette valeur à la somme totale - + $sum = 0; for ($index = 0; $index < 9; $index++) { $number = (int) $chaine[$index]; @@ -3266,7 +3266,7 @@ class Societe extends CommonObject // si son index (position dans la chaîne en commence à 0 au premier caractère) est pair // on double sa valeur et si cette dernière est supérieure à 9, on lui retranche 9 // on ajoute cette valeur à la somme totale - + $sum = 0; for ($index = 0; $index < 14; $index++) { $number = (int) $chaine[$index]; @@ -3343,10 +3343,6 @@ class Societe extends CommonObject $string = trim($this->idprof1); $string = preg_replace('/(\s)/', '', $string); - for ($i = 0; $i < 9; $i++) { - $num[$i] = substr($string, $i, 1); - } - //Check NIF if (preg_match('/(^[0-9]{9}$)/', $string)) { return 1; From 8a86593b13d5f6bd5d2d86748e1f5a52ade29bd8 Mon Sep 17 00:00:00 2001 From: lmarcouiller Date: Wed, 2 Dec 2020 16:24:01 +0100 Subject: [PATCH 126/297] Fix a bug in bank's graph with option and mode --- htdocs/compta/bank/graph.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php index 524877746f8..f4fa779fd7d 100644 --- a/htdocs/compta/bank/graph.php +++ b/htdocs/compta/bank/graph.php @@ -771,11 +771,11 @@ print '
'; - $htmltext = ''; - print $form->textwithpicto($langs->trans('OtherLanguages'), $htmltext, 1, 'help', '', 0, 2, 'WEBSITE_OTHERLANG'); + $htmltext = $langs->trans("Example").': fr,de,sv,it,pt'; + print $form->textwithpicto($langs->trans('OtherLanguages'), $htmltext, 1, 'help', '', 0, 2); print ''; print ''; print '
'; - $htmltext = $langs->trans("SetHereVirtualHost", DOL_DATA_ROOT.'/website/'.$websitekey.''); + $htmltext = $langs->trans("SetHereVirtualHost", DOL_DATA_ROOT.'/website/{s1}'.$websitekey.'{s2}'); + $htmltext = str_replace(array('{s1}', '{s2}'), array('', ''), $htmltext); $htmltext .= '
'; - $htmltext .= '
'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT); - $htmltext .= '
'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT.'/website
'.DOL_DATA_ROOT.'/medias'); + $htmltext .= '
'.$langs->transnoentitiesnoconv("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT); + $htmltext .= '
'.$langs->transnoentitiesnoconv("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT.'/website
'.DOL_DATA_ROOT.'/medias'); print $form->textwithpicto($langs->trans('Virtualhost'), $htmltext, 1, 'help', '', 0, 2, 'virtualhosttooltip'); print '		'; From f7a8a02b9833ebc514ac3f03c28f2c991f5c88d0 Mon Sep 17 00:00:00 2001 From: Marcio Zebedeu Date: Tue, 1 Dec 2020 20:07:58 +0100 Subject: [PATCH 109/297] Update llx_c_tva.sql --- htdocs/install/mysql/data/llx_c_tva.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql index 08e327d5ce1..793b29ab640 100644 --- a/htdocs/install/mysql/data/llx_c_tva.sql +++ b/htdocs/install/mysql/data/llx_c_tva.sql @@ -368,7 +368,7 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 1 -- ANGOLA (id country=35) insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 351, 35, '0','0','VAT Rate 0', 1); -insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 352, 35, '7','0','VAT reduced rate',1); +insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 352, 35, '7','0','VAT reduced rate',1); insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 353, 35, '14','0','VAT standard rate',1); -- Example of code to insert a vat rate 0 for each country From 1c4876b417d24e80aa380a7deaf179afc302aa5b Mon Sep 17 00:00:00 2001 From: Stephane Lesage Date: Tue, 1 Dec 2020 21:17:03 +0100 Subject: [PATCH 110/297] more transporters in llx_c_shipment_mode.sql --- htdocs/install/mysql/data/llx_c_shipment_mode.sql | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/htdocs/install/mysql/data/llx_c_shipment_mode.sql b/htdocs/install/mysql/data/llx_c_shipment_mode.sql index af3cf09f9f8..e5026f8d2f7 100644 --- a/htdocs/install/mysql/data/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/data/llx_c_shipment_mode.sql @@ -37,3 +37,9 @@ INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (6,'KIALA','KIALA','Relais Kiala','http://www.kiala.fr/tnt/delivery/{TRACKID}', 0); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (7,'GLS','GLS','General Logistics Systems','https://gls-group.eu/FR/fr/suivi-colis?match={TRACKID}', 0); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (8,'CHRONO','Chronopost','Chronopost','http://www.chronopost.fr/expedier/inputLTNumbersNoJahia.do?listeNumeros={TRACKID}', 0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (9,'INPERSON', 'In person at your site', NULL, NULL, 0, NULL), +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (10,'FEDEX', 'Fedex', NULL, 'https://www.fedex.com/apps/fedextrack/index.html?tracknumbers={TRACKID}', 0, NULL), +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (11,'TNT', 'TNT', NULL, 'https://www.tnt.com/express/fr_fr/site/outils-expedition/suivi.html?searchType=con&cons=={TRACKID}', 0, NULL), +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (12,'DHL', 'DHL', NULL, 'https://www.dhl.com/fr-fr/home/tracking/tracking-global-forwarding.html?submit=1&tracking-id={TRACKID}', 0, NULL), +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (13,'DPD', 'DPD', NULL, 'https://www.dpd.fr/trace/{TRACKID}', 0, NULL), +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (14,'MAINFREIGHT', 'Mainfreight', NULL, 'https://www.mainfreight.com/track?{TRACKID}', 0, NULL); From 80a5882d9ef14eacb7b586f9a241cf108084f817 Mon Sep 17 00:00:00 2001 From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com> Date: Tue, 1 Dec 2020 23:04:36 +0100 Subject: [PATCH 111/297] Update ChangeLog NEW: VAT rate for Angola #15606 --- ChangeLog | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 17cebdf9a73..637a8a27407 100644 --- a/ChangeLog +++ b/ChangeLog @@ -167,7 +167,8 @@ NEW: Thirdparty module : box on customer/supplier tab for invoice outsantding am NEW: ticket classification on create from email collector NEW: Ticket message notifications when edited from public interface NEW: translate classification labels in ticket -NEW: Add VAT and juridical status for Algeria +NEW: VAT rate for Angola #15606 +NEW: VAT and juridical status for Algeria NEW: VAT report - Invert constant to show by default zero VAT in reports NEW: website page fields selection NEW: Weighing Scale compatibility with TakePOS connector @@ -211,7 +212,6 @@ NEW: Triggers Attributes and Attributes values NEW: added incoterms data into the substitution array NEW: add send context for ticket NEW: add a message in error_log after detection of SQL or script injection -NEW: add two hooks printFieldListFrom and printFieldSearchParam NEW: add __TYPE__ substitution key NEW: add validation of MX domain for emails NEW: calculate the virtual stock in transverse mode ( not on getEntity('commande'), ... but on getEntity('stock') ) @@ -221,6 +221,7 @@ NEW: Hook on propal card NEW: add hooks on newpayment page to allow external payment modules NEW: add hooks on stats pages NEW: add formConfirm hook on product page +NEW: add two hooks printFieldListFrom and printFieldSearchParam WARNING: @@ -269,7 +270,7 @@ FIX: Look and feel v12: First tab must be name of object FIX: missing entity check FIX: missing param for hook FIX: Missing transaction on PO actions -FIX: MySql Strict mode +FIX: MySQL Strict mode FIX: param entity in html form file FIX: Problems on FEC format FIX: round stock value on product list From 8944670c03df10896025464de4bacabbfeea0502 Mon Sep 17 00:00:00 2001 From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com> Date: Wed, 2 Dec 2020 08:28:16 +0100 Subject: [PATCH 112/297] Update llx_accounting_account_ca.sql subtype_pcg removed --- .../mysql/data/llx_accounting_account_ca.sql | 306 +++++++++--------- 1 file changed, 153 insertions(+), 153 deletions(-) diff --git a/htdocs/install/mysql/data/llx_accounting_account_ca.sql b/htdocs/install/mysql/data/llx_accounting_account_ca.sql index 45d856414c5..e219ad7e67f 100644 --- a/htdocs/install/mysql/data/llx_accounting_account_ca.sql +++ b/htdocs/install/mysql/data/llx_accounting_account_ca.sql @@ -32,157 +32,157 @@ -- ID 1000 - 9999 -- ADD 1400000 to rowid # Do no remove this comment -- -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1000,'CA-ENG-BASE','ASSETS', 'XXXXXX', '1', '0', 'Assets', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 2000,'CA-ENG-BASE','LIABILITIES', 'XXXXXX', '2', '0', 'Liabilities', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 3000,'CA-ENG-BASE','CAPITAL', 'XXXXXX', '3', '0', 'Equity', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 4000,'CA-ENG-BASE','INCOME', 'XXXXXX', '4', '0', 'Revenue', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 5000,'CA-ENG-BASE','COGS', 'XXXXXX', '5', '0', 'Cost of Goods Sold', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 6000,'CA-ENG-BASE','EXPENSE', 'XXXXXX', '6', '0', 'Expenses', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1000,'CA-ENG-BASE','ASSETS', '1', '0', 'Assets', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 2000,'CA-ENG-BASE','LIABILITIES', '2', '0', 'Liabilities', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 3000,'CA-ENG-BASE','CAPITAL', '3', '0', 'Equity', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4000,'CA-ENG-BASE','INCOME', '4', '0', 'Revenue', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 5000,'CA-ENG-BASE','COGS', '5', '0', 'Cost of Goods Sold', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 6000,'CA-ENG-BASE','EXPENSE', '6', '0', 'Expenses', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1010, 'CA-ENG-BASE', 'ASSETS', 'CASH', '1010', '1000', 'Cash', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1011, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1030', '1000', 'Investments and Securities', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1012, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1100', '1000', 'Accounts Receivable', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1013, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1120', '1000', 'Other Receivables', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1014, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1140', '1000', 'Allowance for Doubtful Accounts', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1015, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1160', '1000', 'Customers Account Receivable', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1016, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1200', '1000', 'Raw Materials Inventory', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1017, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1220', '1000', 'Supplies Inventory', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1018, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1240', '1000', 'Work in Progress Inventory', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1019, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1260', '1000', 'Finished Goods Inventory', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1020, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1300', '1000', 'Prepaid Expenses', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1021, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1350', '1000', 'Employee Advances', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1022, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1400', '1000', 'Notes Receivable - Current', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1023, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1430', '1000', 'Prepaid Interest', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1024, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1450', '1000', 'Other Current Assets', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1025, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1500', '1000', 'Furniture and Fixtures', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1026, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1520', '1000', 'Equipment', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1027, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1540', '1000', 'Vehicles', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1028, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1560', '1000', 'Other Depreciable Property', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1029, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1580', '1000', 'Buildings', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1030, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1600', '1000', 'Building Improvements', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1031, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1620', '1000', 'Land', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1032, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1640', '1000', 'Accumulated Depreciation, Furniture and Fixtures', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1033, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1660', '1000', 'Accumulated Depreciation, Equipment', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1034, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1680', '1000', 'Accumulated Depreciation, Vehicles', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1035, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1700', '1000', 'Accumulated Depreciation, Buildings', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1036, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1720', '1000', 'Accumulated Depreciation, Building Improvements', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1037, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1740', '1000', 'Accumulated Depreciation, Other', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1038, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1760', '1000', 'Goods and Services Tax (GST) Receivable', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1039, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1800', '1000', 'Harmonized Sales Tax (HST) Receivable', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1040, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1820', '1000', 'Provincial Sales Tax (PST) Receivable', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1041, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1840', '1000', 'Québec Sales Tax (QST) Receivable', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1042, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1860', '1000', 'Deposits', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1043, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1880', '1000', 'Accumulated Amortization', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1044, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1900', '1000', 'Notes Receivable - Non-current', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1045, 'CA-ENG-BASE', 'ASSETS', 'XXXXXX', '1940', '1000', 'Other Non-current Assets', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1046, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2100', '2000', 'Accounts Payable', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1047, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2200', '2000', 'Accrued Expenses', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1048, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2300', '2000', 'Current Financial Debts', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1049, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2320', '2000', 'Employment Insurance Payable', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1050, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2321', '2000', 'Employment insurance (EI) Employees Contribution', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1051, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2322', '2000', 'Employment insurance (EI) Employer Contribution', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1052, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2340', '2000', 'Federal Income Tax', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1053, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2350', '2000', 'Annuities Payable', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1054, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2351', '2000', 'Annuities - Employee Contribution', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1055, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2352', '2000', 'Annuities - Employer Contribution', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1056, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2360', '2000', 'Health Services Fund Payable', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1057, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2370', '2000', 'Labour Health and Safety Payable', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1058, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2380', '2000', 'Labour Standards to Pay', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1059, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2390', '2000', 'Parental Insurance Plan Payable', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1060, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2391', '2000', 'Parental Insurance Plan Payable - Employee Contribution', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1061, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2392', '2000', 'Parental Insurance Plan Payable - Employer Contribution', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1062, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2400', '2000', 'Provincial Income Tax', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1063, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2410', '2000', 'Other Accounts Payable', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1064, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2420', '2000', 'Goods and Services Tax (GST) Payable', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1065, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2430', '2000', 'Harmonized Sales Tax (HST) Payable', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1066, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2440', '2000', 'Provincial Sales Tax (PST) Payable', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1067, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2450', '2000', 'Québec Sales Tax (QST) Payable', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1068, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2460', '2000', 'Other Taxes Payable', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1069, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2470', '2000', 'Employee Benefits Payable', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1070, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2480', '2000', 'Deposits from Customers', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1071, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2490', '2000', 'Other Current Liabilities', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1072, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2500', '2000', 'Notes Payable', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1073, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2600', '2000', 'Land Payable', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1074, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2630', '2000', 'Equipment Payable', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1075, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2660', '2000', 'Vehicles Payable', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1076, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2700', '2000', 'Bank Loans Payable', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1077, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2730', '2000', 'Non-current Financial Debts', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1078, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2760', '2000', 'Other Non-current Liabilities', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1079, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2800', '2000', 'Deferred Revenue', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1080, 'CA-ENG-BASE', 'LIABILITIES', 'XXXXXX', '2900', '2000', 'Deferred Fees', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1081, 'CA-ENG-BASE', 'CAPITAL', 'XXXXXX', '3100', '3000', 'Common Shares', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1082, 'CA-ENG-BASE', 'CAPITAL', 'XXXXXX', '3200', '3000', 'Preferred Shares (Voting)', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1083, 'CA-ENG-BASE', 'CAPITAL', 'XXXXXX', '3300', '3000', 'Preferred Shares (Non-voting)', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1084, 'CA-ENG-BASE', 'CAPITAL', 'XXXXXX', '3400', '3000', 'Contributed Surplus', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1085, 'CA-ENG-BASE', 'CAPITAL', 'XXXXXX', '3500', '3000', 'Retained Earnings', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1086, 'CA-ENG-BASE', 'CAPITAL', 'XXXXXX', '3600', '3000', 'Dividends', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1087, 'CA-ENG-BASE', 'INCOME', 'XXXXXX', '4100', '4000', 'Harmonized Provinces Sales', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1088, 'CA-ENG-BASE', 'INCOME', 'XXXXXX', '4200', '4000', 'Non-Harmonized Provinces Sales', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1089, 'CA-ENG-BASE', 'INCOME', 'XXXXXX', '4300', '4000', 'Inside Sales', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1090, 'CA-ENG-BASE', 'INCOME', 'XXXXXX', '4400', '4000', 'International Sales', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1091, 'CA-ENG-BASE', 'INCOME', 'XXXXXX', '4500', '4000', 'Reimbursible Expenses', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1092, 'CA-ENG-BASE', 'INCOME', 'XXXXXX', '4600', '4000', 'Shipping Charges Reimbursed', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1093, 'CA-ENG-BASE', 'INCOME', 'XXXXXX', '4700', '4000', 'Other Operating Revenues', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1094, 'CA-ENG-BASE', 'INCOME', 'XXXXXX', '4800', '4000', 'Interests', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1095, 'CA-ENG-BASE', 'INCOME', 'XXXXXX', '4900', '4000', 'Other Non-operating Revenues', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1096, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5010', '5000', 'Inside Purchases', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1097, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5050', '5000', 'International Purchases', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1098, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5100', '5000', 'Purchases in Harmonized Provinces', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1099, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5150', '5000', 'Purchases in Non-harmonized Provinces', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1100, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5200', '5000', 'Direct Labor Costs', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1101, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5250', '5000', 'Indirect Labor Costs', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1102, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5270', '5000', 'Heat and Power', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1103, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5300', '5000', 'Commissions', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1104, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5350', '5000', 'Miscellaneous Factory Costs', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1105, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5400', '5000', 'Cost of Goods Sold, Salaries and Wages', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1106, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5450', '5000', 'Cost of Goods Sold, Contract Labor', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1107, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5500', '5000', 'Cost of Goods Sold, Freight', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1108, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5550', '5000', 'Cost of Goods Sold, Other', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1109, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5600', '5000', 'Inventory Adjustments', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1110, 'CA-ENG-BASE', 'COGS', 'XXXXXX', '5700', '5000', 'Purchase Returns and Allowances', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1111, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6010', '6000', 'Federal Income Tax', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1112, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6020', '6000', 'Health Services Fund', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1113, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6030', '6000', 'Holidays', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1114, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6040', '6000', 'Labour Health and Safety', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1115, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6050', '6000', 'Labour Standards', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1116, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6060', '6000', 'Parental Insurance', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1117, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6080', '6000', 'Provincial Income Tax', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1118, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6100', '6000', 'Salaries, wages', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1119, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6130', '6000', 'Employee Benefit Expense, Pension Plans', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1120, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6160', '6000', 'Employee Benefit Expense, Profit Sharing Plan', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1121, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6180', '6000', 'Employee Benefit Expense, Other', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1122, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6200', '6000', 'Commissions and Fees Expense', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1123, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6230', '6000', 'Annuities', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1124, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6250', '6000', 'Employment Insurance', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1125, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6280', '6000', 'Insurance Expense, Product Liability', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1126, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6300', '6000', 'Insurance Expense, Vehicle', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1127, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6340', '6000', 'Payroll Tax Expense', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1128, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6360', '6000', 'Penalties and Fines Expense', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1129, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6380', '6000', 'Other Taxes', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1130, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6400', '6000', 'Advertising Expense', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1131, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6420', '6000', 'Amortization Expense', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1132, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6460', '6000', 'Auto Expenses', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1133, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6480', '6000', 'Legal and Professional Expense', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1134, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6500', '6000', 'Licenses Expense', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1135, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6520', '6000', 'Maintenance Expense', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1136, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6540', '6000', 'Repair and Maintenance Expense, Office', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1137, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6560', '6000', 'Repair and Maintenance Expense, Vehicle', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1138, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6580', '6000', 'Office Supplies Expense', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1139, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6600', '6000', 'Telephone Expense', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1140, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6610', '6000', 'Training Expense', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1141, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6630', '6000', 'Travel Expense', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1142, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6650', '6000', 'Utilities Expense', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1143, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6670', '6000', 'Postage Expense', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1144, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6690', '6000', 'Freight Expense', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1145, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6700', '6000', 'Rent or Lease Expense', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1146, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6720', '6000', 'Meals and Entertainment Expense', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1147, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6730', '6000', 'Gain/Loss on Sale of Assets', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1148, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6740', '6000', 'Depreciation Expense', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1149, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6750', '6000', 'Bad Debt Expense', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1150, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6760', '6000', 'Bank Fees', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1151, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6790', '6000', 'Loss on Non-sufficient Funds Checks', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1152, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6800', '6000', 'Gifts Expense', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1153, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6820', '6000', 'Charitable Contributions Expense', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1154, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6840', '6000', 'Other Operating Expense', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1155, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6860', '6000', 'Interests Expense', 1); -INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, active) VALUES (__ENTITY__, 1156, 'CA-ENG-BASE', 'EXPENSE', 'XXXXXX', '6900', '6000', 'Other Non-operating Expense', 1); \ No newline at end of file +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1010, 'CA-ENG-BASE', 'ASSETS', '1010', '1000', 'Cash', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1011, 'CA-ENG-BASE', 'ASSETS', '1030', '1000', 'Investments and Securities', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1012, 'CA-ENG-BASE', 'ASSETS', '1100', '1000', 'Accounts Receivable', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1013, 'CA-ENG-BASE', 'ASSETS', '1120', '1000', 'Other Receivables', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1014, 'CA-ENG-BASE', 'ASSETS', '1140', '1000', 'Allowance for Doubtful Accounts', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1015, 'CA-ENG-BASE', 'ASSETS', '1160', '1000', 'Customers Account Receivable', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1016, 'CA-ENG-BASE', 'ASSETS', '1200', '1000', 'Raw Materials Inventory', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1017, 'CA-ENG-BASE', 'ASSETS', '1220', '1000', 'Supplies Inventory', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1018, 'CA-ENG-BASE', 'ASSETS', '1240', '1000', 'Work in Progress Inventory', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1019, 'CA-ENG-BASE', 'ASSETS', '1260', '1000', 'Finished Goods Inventory', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1020, 'CA-ENG-BASE', 'ASSETS', '1300', '1000', 'Prepaid Expenses', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1021, 'CA-ENG-BASE', 'ASSETS', '1350', '1000', 'Employee Advances', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1022, 'CA-ENG-BASE', 'ASSETS', '1400', '1000', 'Notes Receivable - Current', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1023, 'CA-ENG-BASE', 'ASSETS', '1430', '1000', 'Prepaid Interest', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1024, 'CA-ENG-BASE', 'ASSETS', '1450', '1000', 'Other Current Assets', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1025, 'CA-ENG-BASE', 'ASSETS', '1500', '1000', 'Furniture and Fixtures', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1026, 'CA-ENG-BASE', 'ASSETS', '1520', '1000', 'Equipment', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1027, 'CA-ENG-BASE', 'ASSETS', '1540', '1000', 'Vehicles', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1028, 'CA-ENG-BASE', 'ASSETS', '1560', '1000', 'Other Depreciable Property', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1029, 'CA-ENG-BASE', 'ASSETS', '1580', '1000', 'Buildings', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1030, 'CA-ENG-BASE', 'ASSETS', '1600', '1000', 'Building Improvements', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1031, 'CA-ENG-BASE', 'ASSETS', '1620', '1000', 'Land', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1032, 'CA-ENG-BASE', 'ASSETS', '1640', '1000', 'Accumulated Depreciation, Furniture and Fixtures', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1033, 'CA-ENG-BASE', 'ASSETS', '1660', '1000', 'Accumulated Depreciation, Equipment', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1034, 'CA-ENG-BASE', 'ASSETS', '1680', '1000', 'Accumulated Depreciation, Vehicles', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1035, 'CA-ENG-BASE', 'ASSETS', '1700', '1000', 'Accumulated Depreciation, Buildings', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1036, 'CA-ENG-BASE', 'ASSETS', '1720', '1000', 'Accumulated Depreciation, Building Improvements', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1037, 'CA-ENG-BASE', 'ASSETS', '1740', '1000', 'Accumulated Depreciation, Other', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1038, 'CA-ENG-BASE', 'ASSETS', '1760', '1000', 'Goods and Services Tax (GST) Receivable', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1039, 'CA-ENG-BASE', 'ASSETS', '1800', '1000', 'Harmonized Sales Tax (HST) Receivable', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1040, 'CA-ENG-BASE', 'ASSETS', '1820', '1000', 'Provincial Sales Tax (PST) Receivable', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1041, 'CA-ENG-BASE', 'ASSETS', '1840', '1000', 'Québec Sales Tax (QST) Receivable', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1042, 'CA-ENG-BASE', 'ASSETS', '1860', '1000', 'Deposits', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1043, 'CA-ENG-BASE', 'ASSETS', '1880', '1000', 'Accumulated Amortization', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1044, 'CA-ENG-BASE', 'ASSETS', '1900', '1000', 'Notes Receivable - Non-current', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1045, 'CA-ENG-BASE', 'ASSETS', '1940', '1000', 'Other Non-current Assets', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1046, 'CA-ENG-BASE', 'LIABILITIES', '2100', '2000', 'Accounts Payable', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1047, 'CA-ENG-BASE', 'LIABILITIES', '2200', '2000', 'Accrued Expenses', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1048, 'CA-ENG-BASE', 'LIABILITIES', '2300', '2000', 'Current Financial Debts', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1049, 'CA-ENG-BASE', 'LIABILITIES', '2320', '2000', 'Employment Insurance Payable', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1050, 'CA-ENG-BASE', 'LIABILITIES', '2321', '2000', 'Employment insurance (EI) Employees Contribution', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1051, 'CA-ENG-BASE', 'LIABILITIES', '2322', '2000', 'Employment insurance (EI) Employer Contribution', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1052, 'CA-ENG-BASE', 'LIABILITIES', '2340', '2000', 'Federal Income Tax', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1053, 'CA-ENG-BASE', 'LIABILITIES', '2350', '2000', 'Annuities Payable', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1054, 'CA-ENG-BASE', 'LIABILITIES', '2351', '2000', 'Annuities - Employee Contribution', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1055, 'CA-ENG-BASE', 'LIABILITIES', '2352', '2000', 'Annuities - Employer Contribution', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1056, 'CA-ENG-BASE', 'LIABILITIES', '2360', '2000', 'Health Services Fund Payable', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1057, 'CA-ENG-BASE', 'LIABILITIES', '2370', '2000', 'Labour Health and Safety Payable', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1058, 'CA-ENG-BASE', 'LIABILITIES', '2380', '2000', 'Labour Standards to Pay', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1059, 'CA-ENG-BASE', 'LIABILITIES', '2390', '2000', 'Parental Insurance Plan Payable', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1060, 'CA-ENG-BASE', 'LIABILITIES', '2391', '2000', 'Parental Insurance Plan Payable - Employee Contribution', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1061, 'CA-ENG-BASE', 'LIABILITIES', '2392', '2000', 'Parental Insurance Plan Payable - Employer Contribution', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1062, 'CA-ENG-BASE', 'LIABILITIES', '2400', '2000', 'Provincial Income Tax', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1063, 'CA-ENG-BASE', 'LIABILITIES', '2410', '2000', 'Other Accounts Payable', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1064, 'CA-ENG-BASE', 'LIABILITIES', '2420', '2000', 'Goods and Services Tax (GST) Payable', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1065, 'CA-ENG-BASE', 'LIABILITIES', '2430', '2000', 'Harmonized Sales Tax (HST) Payable', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1066, 'CA-ENG-BASE', 'LIABILITIES', '2440', '2000', 'Provincial Sales Tax (PST) Payable', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1067, 'CA-ENG-BASE', 'LIABILITIES', '2450', '2000', 'Québec Sales Tax (QST) Payable', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1068, 'CA-ENG-BASE', 'LIABILITIES', '2460', '2000', 'Other Taxes Payable', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1069, 'CA-ENG-BASE', 'LIABILITIES', '2470', '2000', 'Employee Benefits Payable', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1070, 'CA-ENG-BASE', 'LIABILITIES', '2480', '2000', 'Deposits from Customers', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1071, 'CA-ENG-BASE', 'LIABILITIES', '2490', '2000', 'Other Current Liabilities', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1072, 'CA-ENG-BASE', 'LIABILITIES', '2500', '2000', 'Notes Payable', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1073, 'CA-ENG-BASE', 'LIABILITIES', '2600', '2000', 'Land Payable', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1074, 'CA-ENG-BASE', 'LIABILITIES', '2630', '2000', 'Equipment Payable', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1075, 'CA-ENG-BASE', 'LIABILITIES', '2660', '2000', 'Vehicles Payable', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1076, 'CA-ENG-BASE', 'LIABILITIES', '2700', '2000', 'Bank Loans Payable', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1077, 'CA-ENG-BASE', 'LIABILITIES', '2730', '2000', 'Non-current Financial Debts', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1078, 'CA-ENG-BASE', 'LIABILITIES', '2760', '2000', 'Other Non-current Liabilities', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1079, 'CA-ENG-BASE', 'LIABILITIES', '2800', '2000', 'Deferred Revenue', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1080, 'CA-ENG-BASE', 'LIABILITIES', '2900', '2000', 'Deferred Fees', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1081, 'CA-ENG-BASE', 'CAPITAL', '3100', '3000', 'Common Shares', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1082, 'CA-ENG-BASE', 'CAPITAL', '3200', '3000', 'Preferred Shares (Voting)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1083, 'CA-ENG-BASE', 'CAPITAL', '3300', '3000', 'Preferred Shares (Non-voting)', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1084, 'CA-ENG-BASE', 'CAPITAL', '3400', '3000', 'Contributed Surplus', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1085, 'CA-ENG-BASE', 'CAPITAL', '3500', '3000', 'Retained Earnings', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1086, 'CA-ENG-BASE', 'CAPITAL', '3600', '3000', 'Dividends', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1087, 'CA-ENG-BASE', 'INCOME', '4100', '4000', 'Harmonized Provinces Sales', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1088, 'CA-ENG-BASE', 'INCOME', '4200', '4000', 'Non-Harmonized Provinces Sales', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1089, 'CA-ENG-BASE', 'INCOME', '4300', '4000', 'Inside Sales', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1090, 'CA-ENG-BASE', 'INCOME', '4400', '4000', 'International Sales', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1091, 'CA-ENG-BASE', 'INCOME', '4500', '4000', 'Reimbursible Expenses', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1092, 'CA-ENG-BASE', 'INCOME', '4600', '4000', 'Shipping Charges Reimbursed', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1093, 'CA-ENG-BASE', 'INCOME', '4700', '4000', 'Other Operating Revenues', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1094, 'CA-ENG-BASE', 'INCOME', '4800', '4000', 'Interests', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1095, 'CA-ENG-BASE', 'INCOME', '4900', '4000', 'Other Non-operating Revenues', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1096, 'CA-ENG-BASE', 'COGS', '5010', '5000', 'Inside Purchases', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1097, 'CA-ENG-BASE', 'COGS', '5050', '5000', 'International Purchases', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1098, 'CA-ENG-BASE', 'COGS', '5100', '5000', 'Purchases in Harmonized Provinces', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1099, 'CA-ENG-BASE', 'COGS', '5150', '5000', 'Purchases in Non-harmonized Provinces', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1100, 'CA-ENG-BASE', 'COGS', '5200', '5000', 'Direct Labor Costs', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1101, 'CA-ENG-BASE', 'COGS', '5250', '5000', 'Indirect Labor Costs', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1102, 'CA-ENG-BASE', 'COGS', '5270', '5000', 'Heat and Power', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1103, 'CA-ENG-BASE', 'COGS', '5300', '5000', 'Commissions', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1104, 'CA-ENG-BASE', 'COGS', '5350', '5000', 'Miscellaneous Factory Costs', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1105, 'CA-ENG-BASE', 'COGS', '5400', '5000', 'Cost of Goods Sold, Salaries and Wages', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1106, 'CA-ENG-BASE', 'COGS', '5450', '5000', 'Cost of Goods Sold, Contract Labor', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1107, 'CA-ENG-BASE', 'COGS', '5500', '5000', 'Cost of Goods Sold, Freight', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1108, 'CA-ENG-BASE', 'COGS', '5550', '5000', 'Cost of Goods Sold, Other', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1109, 'CA-ENG-BASE', 'COGS', '5600', '5000', 'Inventory Adjustments', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1110, 'CA-ENG-BASE', 'COGS', '5700', '5000', 'Purchase Returns and Allowances', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1111, 'CA-ENG-BASE', 'EXPENSE', '6010', '6000', 'Federal Income Tax', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1112, 'CA-ENG-BASE', 'EXPENSE', '6020', '6000', 'Health Services Fund', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1113, 'CA-ENG-BASE', 'EXPENSE', '6030', '6000', 'Holidays', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1114, 'CA-ENG-BASE', 'EXPENSE', '6040', '6000', 'Labour Health and Safety', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1115, 'CA-ENG-BASE', 'EXPENSE', '6050', '6000', 'Labour Standards', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1116, 'CA-ENG-BASE', 'EXPENSE', '6060', '6000', 'Parental Insurance', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1117, 'CA-ENG-BASE', 'EXPENSE', '6080', '6000', 'Provincial Income Tax', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1118, 'CA-ENG-BASE', 'EXPENSE', '6100', '6000', 'Salaries, wages', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1119, 'CA-ENG-BASE', 'EXPENSE', '6130', '6000', 'Employee Benefit Expense, Pension Plans', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1120, 'CA-ENG-BASE', 'EXPENSE', '6160', '6000', 'Employee Benefit Expense, Profit Sharing Plan', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1121, 'CA-ENG-BASE', 'EXPENSE', '6180', '6000', 'Employee Benefit Expense, Other', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1122, 'CA-ENG-BASE', 'EXPENSE', '6200', '6000', 'Commissions and Fees Expense', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1123, 'CA-ENG-BASE', 'EXPENSE', '6230', '6000', 'Annuities', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1124, 'CA-ENG-BASE', 'EXPENSE', '6250', '6000', 'Employment Insurance', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1125, 'CA-ENG-BASE', 'EXPENSE', '6280', '6000', 'Insurance Expense, Product Liability', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1126, 'CA-ENG-BASE', 'EXPENSE', '6300', '6000', 'Insurance Expense, Vehicle', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1127, 'CA-ENG-BASE', 'EXPENSE', '6340', '6000', 'Payroll Tax Expense', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1128, 'CA-ENG-BASE', 'EXPENSE', '6360', '6000', 'Penalties and Fines Expense', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1129, 'CA-ENG-BASE', 'EXPENSE', '6380', '6000', 'Other Taxes', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1130, 'CA-ENG-BASE', 'EXPENSE', '6400', '6000', 'Advertising Expense', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1131, 'CA-ENG-BASE', 'EXPENSE', '6420', '6000', 'Amortization Expense', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1132, 'CA-ENG-BASE', 'EXPENSE', '6460', '6000', 'Auto Expenses', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1133, 'CA-ENG-BASE', 'EXPENSE', '6480', '6000', 'Legal and Professional Expense', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1134, 'CA-ENG-BASE', 'EXPENSE', '6500', '6000', 'Licenses Expense', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1135, 'CA-ENG-BASE', 'EXPENSE', '6520', '6000', 'Maintenance Expense', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1136, 'CA-ENG-BASE', 'EXPENSE', '6540', '6000', 'Repair and Maintenance Expense, Office', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1137, 'CA-ENG-BASE', 'EXPENSE', '6560', '6000', 'Repair and Maintenance Expense, Vehicle', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1138, 'CA-ENG-BASE', 'EXPENSE', '6580', '6000', 'Office Supplies Expense', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1139, 'CA-ENG-BASE', 'EXPENSE', '6600', '6000', 'Telephone Expense', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1140, 'CA-ENG-BASE', 'EXPENSE', '6610', '6000', 'Training Expense', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1141, 'CA-ENG-BASE', 'EXPENSE', '6630', '6000', 'Travel Expense', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1142, 'CA-ENG-BASE', 'EXPENSE', '6650', '6000', 'Utilities Expense', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1143, 'CA-ENG-BASE', 'EXPENSE', '6670', '6000', 'Postage Expense', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1144, 'CA-ENG-BASE', 'EXPENSE', '6690', '6000', 'Freight Expense', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1145, 'CA-ENG-BASE', 'EXPENSE', '6700', '6000', 'Rent or Lease Expense', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1146, 'CA-ENG-BASE', 'EXPENSE', '6720', '6000', 'Meals and Entertainment Expense', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1147, 'CA-ENG-BASE', 'EXPENSE', '6730', '6000', 'Gain/Loss on Sale of Assets', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1148, 'CA-ENG-BASE', 'EXPENSE', '6740', '6000', 'Depreciation Expense', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1149, 'CA-ENG-BASE', 'EXPENSE', '6750', '6000', 'Bad Debt Expense', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1150, 'CA-ENG-BASE', 'EXPENSE', '6760', '6000', 'Bank Fees', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1151, 'CA-ENG-BASE', 'EXPENSE', '6790', '6000', 'Loss on Non-sufficient Funds Checks', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1152, 'CA-ENG-BASE', 'EXPENSE', '6800', '6000', 'Gifts Expense', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1153, 'CA-ENG-BASE', 'EXPENSE', '6820', '6000', 'Charitable Contributions Expense', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1154, 'CA-ENG-BASE', 'EXPENSE', '6840', '6000', 'Other Operating Expense', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1155, 'CA-ENG-BASE', 'EXPENSE', '6860', '6000', 'Interests Expense', 1); +INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1156, 'CA-ENG-BASE', 'EXPENSE', '6900', '6000', 'Other Non-operating Expense', 1); From e19d0c9eeaeadd9c18b3fc39f3522c30db10a24f Mon Sep 17 00:00:00 2001 From: teleassist <30868208+teleassist@users.noreply.github.com> Date: Wed, 2 Dec 2020 09:07:24 +0100 Subject: [PATCH 113/297] Add translation Add translation for option TakeposNumpadForcePaymentLabels --- htdocs/langs/en_US/cashdesk.lang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang index 549646ab110..c0245790e76 100644 --- a/htdocs/langs/en_US/cashdesk.lang +++ b/htdocs/langs/en_US/cashdesk.lang @@ -122,4 +122,5 @@ GiftReceipt=Gift receipt ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first AllowDelayedPayment=Allow delayed payment PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts -WeighingScale=Weighing scale \ No newline at end of file +WeighingScale=Weighing scale +TakeposNumpadForcePaymentLabels=Show text with icons of payment buttons of numpad From 7e9a12a2f8bef1f6947522654e1470661844f054 Mon Sep 17 00:00:00 2001 From: teleassist <30868208+teleassist@users.noreply.github.com> Date: Wed, 2 Dec 2020 09:19:18 +0100 Subject: [PATCH 114/297] Add TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS Add option TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS to show labels at the bottom of payment icons of the numpad --- htdocs/takepos/admin/setup.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php index 88911f10b7d..bd4c18bda0c 100644 --- a/htdocs/takepos/admin/setup.php +++ b/htdocs/takepos/admin/setup.php @@ -307,6 +307,13 @@ print ''; print ajax_constantonoff("TAKEPOS_NUMPAD_USE_PAYMENT_ICON", array(), $conf->entity, 0, 0, 1, 0); print "
'; +print $langs->trans('TakeposNumpadForcePaymentLabels'); +print ''; +print ajax_constantonoff("TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS", array(), $conf->entity, 0, 0, 1, 0); +print "
'; print $langs->trans('DirectPaymentButton'); From 0730cab90fd9357477c6aebfd9728f0e5becc31b Mon Sep 17 00:00:00 2001 From: teleassist <30868208+teleassist@users.noreply.github.com> Date: Wed, 2 Dec 2020 09:38:30 +0100 Subject: [PATCH 115/297] Add class for icons labels --- htdocs/takepos/css/pos.css.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/htdocs/takepos/css/pos.css.php b/htdocs/takepos/css/pos.css.php index 416980633ca..4b1f4c0bbb7 100644 --- a/htdocs/takepos/css/pos.css.php +++ b/htdocs/takepos/css/pos.css.php @@ -125,6 +125,10 @@ button.calcbutton2 { border-radius: 3px; } +button.calcbutton2 .iconwithlabel { + padding-bottom: 10px; +} + button.calcbutton3 { display: inline-block; position: relative; From dd2d5259de40db7803bdddf11c86b2b40f489d59 Mon Sep 17 00:00:00 2001 From: teleassist <30868208+teleassist@users.noreply.github.com> Date: Wed, 2 Dec 2020 09:46:53 +0100 Subject: [PATCH 116/297] Add icons labels for payment buttons Add labels to icons when TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS is set --- htdocs/takepos/pay.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php index b0e745e2211..31acc4433c6 100644 --- a/htdocs/takepos/pay.php +++ b/htdocs/takepos/pay.php @@ -286,6 +286,7 @@ print ''; + if(!empty($conf->global->TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS)) $payLabel = ' iconwithlabel'; + print ''; } else { print ''; } @@ -309,6 +311,7 @@ print ''; + if(!empty($conf->global->TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS)) $payLabel = ' iconwithlabel'; + print ''; } else { $button = array_pop($action_buttons); print ''; @@ -333,6 +337,7 @@ print ''; + if(!empty($conf->global->TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS)) $payLabel = ' iconwithlabel'; + print ''; } else { $button = array_pop($action_buttons); print ''; From 87ee62c2ff8c503069f62b816c9b9d475d4599d6 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Wed, 2 Dec 2020 08:54:33 +0000 Subject: [PATCH 117/297] Fixing style errors. --- htdocs/takepos/pay.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php index 31acc4433c6..89b936bef6c 100644 --- a/htdocs/takepos/pay.php +++ b/htdocs/takepos/pay.php @@ -298,7 +298,7 @@ print ''; } else { print ''; @@ -323,7 +323,7 @@ print ''; } else { $button = array_pop($action_buttons); @@ -349,7 +349,7 @@ print ''; } else { $button = array_pop($action_buttons); From 73edd081dd7a256c3b2c3225f7099823668d16d9 Mon Sep 17 00:00:00 2001 From: Marcio Zebedeu Date: Wed, 2 Dec 2020 12:04:35 +0100 Subject: [PATCH 118/297] New Support for Angolan currency added Support for Region Angola added --- htdocs/install/mysql/data/llx_10_c_regions.sql | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql index bbb7af35bb7..43d2652298f 100644 --- a/htdocs/install/mysql/data/llx_10_c_regions.sql +++ b/htdocs/install/mysql/data/llx_10_c_regions.sql @@ -380,3 +380,7 @@ insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,931, insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,932, '新',0,'新疆维吾尔自治区'); insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,933, '港',0,'香港特别行政区'); insert into llx_c_regions (fk_pays,code_region,cheflieu,tncc,nom) values (9,934, '澳',0,'澳门特别行政区'); + +-- Regions Angola (rowid country=35) +INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES (35, 35001, 'AO', NULL, 'Angola'); + From 561c7438bc3b3d4830544f52c91160647cdf4f7e Mon Sep 17 00:00:00 2001 From: Marcio Zebedeu Date: Wed, 2 Dec 2020 12:36:15 +0100 Subject: [PATCH 119/297] New Add Angola City name Angola province/city support added --- .../mysql/data/llx_20_c_departements.sql | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql index 54ab237c9b8..00f30fab0be 100644 --- a/htdocs/install/mysql/data/llx_20_c_departements.sql +++ b/htdocs/install/mysql/data/llx_20_c_departements.sql @@ -1606,3 +1606,23 @@ INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('20204', 'SI038', NULL, NULL, 'UPPER CARNIOLA', 'Upper Carniola'); INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('20204', 'SI043', NULL, NULL, 'GORIZIA', 'Gorizia'); INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('20204', 'SI044', NULL, NULL, 'COASTAL–KARST', 'Coastal–Karst'); + +-- Provinces (postal districts) Angola (rowid country=35) +INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-ABO', NULL, NULL, 'BENGO', 'Bengo'); +INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-BGU', NULL, NULL, 'BENGUELA', 'Benguela'); +INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-BIE', NULL, NULL, 'BIÉ', 'Bié'); +INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-CAB', NULL, NULL, 'CABINDA', 'Cabinda'); +INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-CCU', NULL, NULL, 'KUANDO KUBANGO', 'Kuando Kubango'); +INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-CNO', NULL, NULL, 'KWANZA NORTE', 'Kwanza Norte'); +INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-CUS', NULL, NULL, 'KWANZA SUL', 'Kwanza Sul'); +INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-CNN', NULL, NULL, 'CUNENE', 'Cunene'); +INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-HUA', NULL, NULL, 'HUAMBO', 'Huambo'); +INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-HUI', NULL, NULL, 'HUÍLA', 'Huila'); +INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-LUA', NULL, NULL, 'LUANDA', 'Luanda'); +INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-LNO', NULL, NULL, 'LUNDA-NORTE', 'Lunda-Norte'); +INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-LSU',NULL, NULL, 'LUNDA-SUL', 'Lunda-Sul'); +INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-MAL', NULL, NULL, 'MALANGE', 'Malange'); +INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-MOX', NULL, NULL, 'MOXICO', 'Moxico'); +INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-NAM', NULL, NULL, 'NAMÍBE', 'Namíbe'); +INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-UIG', NULL, NULL, 'UÍGE', 'Uíge'); +INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ('35001', 'AO-ZAI', NULL, NULL, 'ZAÍRE', 'Zaíre'); From 49be354c3e12ad96036f46a2d1f288776dcf9aab Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 2 Dec 2020 14:05:17 +0100 Subject: [PATCH 120/297] Fix warning --- htdocs/core/class/commonobject.class.php | 27 ++++++++---------------- 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 9d2317d3c2c..243d4d57f7c 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -5417,26 +5417,20 @@ abstract class CommonObject $sql .= ",".$attributeKey; } // We must insert a default value for fields for other entities that are mandatory to avoid not null error - if (is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'])) - { - foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as $tmpkey => $tmpval) - { - if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey])) // If field not already added previously - { + if (!empty($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities']) && is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'])) { + foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as $tmpkey => $tmpval) { + if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey])) { // If field not already added previously $sql .= ",".$tmpkey; } } } $sql .= ") VALUES (".$this->id; - foreach ($new_array_options as $key => $value) - { + foreach ($new_array_options as $key => $value) { $attributeKey = substr($key, 8); // Remove 'options_' prefix // Add field of attribute - if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator) - { - if ($new_array_options[$key] != '' || $new_array_options[$key] == '0') - { + if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') { // Only for other type than separator) + if ($new_array_options[$key] != '' || $new_array_options[$key] == '0') { $sql .= ",'".$this->db->escape($new_array_options[$key])."'"; } else { $sql .= ",null"; @@ -5444,12 +5438,9 @@ abstract class CommonObject } } // We must insert a default value for fields for other entities that are mandatory to avoid not null error - if (is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'])) - { - foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as $tmpkey => $tmpval) - { - if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey])) // If field not already added previously - { + if (!empty($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities']) && is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'])) { + foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as $tmpkey => $tmpval) { + if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey])) { // If field not already added previously if (in_array($tmpval, array('int', 'double', 'price'))) $sql .= ", 0"; else $sql .= ", ''"; } From 25bedc34971abddab215c70f54899425691b8d4f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 2 Dec 2020 14:09:03 +0100 Subject: [PATCH 121/297] Fix warning --- htdocs/core/menus/standard/eldy.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index a94fe759125..52f9a60d2be 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -717,7 +717,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM $langs->loadLangs(array("admin", "help")); $warnpicto = ''; - if (!empty($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY)) + if (empty($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY)) { $langs->load("errors"); $warnpicto = img_warning($langs->trans("WarningMandatorySetupNotComplete")); @@ -725,7 +725,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM $newmenu->add("/admin/company.php?mainmenu=home", $langs->trans("MenuCompanySetup").$warnpicto, 1); $warnpicto = ''; - if (1 || 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 + 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")); From c7a31b245815a1277853669ac7c2e788303ba73b Mon Sep 17 00:00:00 2001 From: lmarcouiller Date: Wed, 2 Dec 2020 14:42:56 +0100 Subject: [PATCH 122/297] new widget funnel of prospection --- .../core/boxes/box_funnel_of_prospection.php | 268 ++++++++++++++++++ htdocs/core/modules/modProjet.class.php | 2 + 2 files changed, 270 insertions(+) create mode 100644 htdocs/core/boxes/box_funnel_of_prospection.php diff --git a/htdocs/core/boxes/box_funnel_of_prospection.php b/htdocs/core/boxes/box_funnel_of_prospection.php new file mode 100644 index 00000000000..6e63a80353c --- /dev/null +++ b/htdocs/core/boxes/box_funnel_of_prospection.php @@ -0,0 +1,268 @@ + + * Copyright (C) 2014 Marcos García + * Copyright (C) 2015 Frederic France + * Copyright (C) 2016 Juan José Menent + * Copyright (C) 2020 Pierre Ardoin + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/core/boxes/box_funnel_of_prospection.php + * \ingroup projet + * \brief Module to show the funnel of prospection + */ +include_once DOL_DOCUMENT_ROOT . "/core/boxes/modules_boxes.php"; + +/** + * Class to manage the box to show last projet + */ +class box_funnel_of_prospection extends ModeleBoxes +{ + public $boxcode = "FunnelOfProspection"; + public $boximg = "object_projectpub"; + public $boxlabel = "BoxFunnelOfProspection"; + public $depends = array("projet"); + + /** + * @var DoliDB Database handler. + */ + public $db; + + public $param; + + public $info_box_head = array(); + public $info_box_contents = array(); + + /** + * Constructor + * + * @param DoliDB $db Database handler + * @param string $param More parameters + */ + public function __construct($db, $param = '') + { + global $user, $langs, $conf; + + // Load translation files required by the page + $langs->loadLangs(array('boxes', 'projects')); + + $this->db = $db; + + $this->hidden = !($user->rights->projet->lire); + } + + /** + * Load data for box to show them later + * + * @param int $max Maximum number of records to load + * @return void + */ + public function loadBox($max = 5) + { + global $conf; + include DOL_DOCUMENT_ROOT . '/theme/' . $conf->theme . '/theme_vars.inc.php'; + $listofoppstatus = array(); + $listofopplabel = array(); + $listofoppcode = array(); + $colorseriesstat = array(); + $sql = "SELECT cls.rowid, cls.code, cls.percent, cls.label"; + $sql .= " FROM " . MAIN_DB_PREFIX . "c_lead_status as cls"; + $sql .= " WHERE active=1"; + $resql = $this->db->query($sql); + if ($resql) { + $num = $this->db->num_rows($resql); + $i = 0; + + while ($i < $num) { + $objp = $this->db->fetch_object($resql); + $listofoppstatus[$objp->rowid] = $objp->percent; + $listofopplabel[$objp->rowid] = $objp->label; + $listofoppcode[$objp->rowid] = $objp->code; + switch ($objp->code) { + case 'PROSP': + $colorseriesstat[$objp->rowid] = "-" . $badgeStatus0; + break; + case 'QUAL': + $colorseriesstat[$objp->rowid] = "-" . $badgeStatus1; + break; + case 'PROPO': + $colorseriesstat[$objp->rowid] = $badgeStatus1; + break; + case 'NEGO': + $colorseriesstat[$objp->rowid] = $badgeStatus4; + break; + case 'LOST': + $colorseriesstat[$objp->rowid] = $badgeStatus9; + break; + case 'WON': + $colorseriesstat[$objp->rowid] = $badgeStatus6; + break; + default: + $colorseriesstat[$objp->rowid] = $badgeStatus2; + break; + } + $i++; + } + } else dol_print_error($this->db); + + global $conf, $user, $langs; + + $this->max = $max; + + $this->info_box_head = array( + 'text' => $langs->trans("Statistics") . ' - ' . $langs->trans("OpportunitiesStatusForOpenedProjects"), + $max + ); + + if ($user->rights->projet->lire || !empty($conf->global->PROJECT_USE_OPPORTUNITIES)) { + $sql = "SELECT p.fk_opp_status as opp_status, cls.code, COUNT(p.rowid) as nb, SUM(p.opp_amount) as opp_amount, SUM(p.opp_amount * p.opp_percent) as ponderated_opp_amount"; + $sql .= " FROM " . MAIN_DB_PREFIX . "projet as p, " . MAIN_DB_PREFIX . "c_lead_status as cls"; + $sql .= " WHERE p.entity IN (" . getEntity('project') . ")"; + $sql .= " AND p.fk_opp_status = cls.rowid"; + $sql .= " AND p.fk_statut = 1"; // Opend projects only + $sql .= " GROUP BY p.fk_opp_status, cls.code"; + $resql = $this->db->query($sql); + + $form = new Form($ths->db); + if ($resql) { + $num = $this->db->num_rows($resql); + $i = 0; + + $totalnb = 0; + $totaloppnb = 0; + $totalamount = 0; + $ponderated_opp_amount = 0; + $valsnb = array(); + $valsamount = array(); + $dataseries = array(); + + while ($i < $num) { + $obj = $this->db->fetch_object($resql); + if ($obj) { + $valsnb[$obj->opp_status] = $obj->nb; + $valsamount[$obj->opp_status] = $obj->opp_amount; + $totalnb += $obj->nb; + if ($obj->opp_status) $totaloppnb += $obj->nb; + if (!in_array($obj->code, array('WON', 'LOST'))) { + $totalamount += $obj->opp_amount; + $ponderated_opp_amount += $obj->ponderated_opp_amount; + } + } + $i++; + } + $this->db->free($resql); + $ponderated_opp_amount = $ponderated_opp_amount / 100; + + $stringtoprint = ''; + $stringtoprint .= '
'; + $listofstatus = array_keys($listofoppstatus); + foreach ($listofstatus as $status) { + $labelStatus = ''; + + $code = dol_getIdFromCode($this->db, $status, 'c_lead_status', 'rowid', 'code'); + if ($code) $labelStatus = $langs->transnoentitiesnoconv("OppStatus" . $code); + if (empty($labelStatus)) $labelStatus = $listofopplabel[$status]; + + $dataseries[] = array($labelStatus, (isset($valsamount[$status]) ? (float) $valsamount[$status] : 0)); + if (!$conf->use_javascript_ajax) { + $stringtoprint .= '
' . $labelStatus . '' . price((isset($valsamount[$status]) ? (float) $valsamount[$status] : 0), 0, '', 1, -1, -1, $conf->currency) . '
'; print ' -global->MAIN_STORE_COMPUTED_EXTRAFIELDS)) { ?> - + - + - - diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php index 3af89dcede5..191b4cf40c8 100644 --- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php +++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php @@ -263,14 +263,11 @@ else -global->MAIN_STORE_COMPUTED_EXTRAFIELDS)) { ?> - + - + - - From d88173d7baceaa66646c92420aa390636fefce6d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 2 Dec 2020 19:13:32 +0100 Subject: [PATCH 130/297] Fix bad column --- htdocs/core/class/commonobject.class.php | 2 +- htdocs/install/mysql/tables/llx_c_input_reason.sql | 2 ++ htdocs/projet/card.php | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index ec03bb66524..33ac1aba696 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -6889,7 +6889,7 @@ abstract class CommonObject $helptoshow = $langs->trans($extrafields->attributes[$this->table_element]['help'][$key]); $out .= ''; - if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { + if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER) && $action == 'view') { $out .= ''; } $out .= ''; // Date value for bank @@ -305,16 +305,6 @@ if ($action == 'create') print ''; print ''; - // Project - if (!empty($conf->projet->enabled)) - { - $formproject = new FormProjets($db); - - print ''; - } - // Bank if (!empty($conf->banque->enabled)) { @@ -340,6 +330,16 @@ if ($action == 'create') print ''."\n"; } + // Project + if (!empty($conf->projet->enabled)) + { + $formproject = new FormProjets($db); + + print ''; + } + // Other attributes $parameters = array(); $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook @@ -476,9 +476,8 @@ if ($id) print dol_get_fiche_end(); - /* - * Action buttons - */ + // Action buttons + print '
'."\n"; if ($object->rappro == 0) { diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php index 3ef6531e6fd..726710f52de 100644 --- a/htdocs/salaries/list.php +++ b/htdocs/salaries/list.php @@ -113,17 +113,17 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON s.fk_bank = b.rowid"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid,"; $sql .= " ".MAIN_DB_PREFIX."user as u"; $sql .= " WHERE u.rowid = s.fk_user"; -$sql .= " AND s.entity = ".$conf->entity; +$sql .= " AND s.entity IN (".getEntity('payment_salaries').")"; if (empty($user->rights->salaries->readall)) $sql .= " AND s.fk_user IN (".join(',', $childids).")"; // Search criteria -if ($search_ref) $sql .= " AND s.rowid=".$search_ref; +if ($search_ref) $sql .= " AND s.rowid=".((int) $search_ref); if ($search_user) $sql .= natural_search(array('u.login', 'u.lastname', 'u.firstname', 'u.email'), $search_user); if ($search_label) $sql .= natural_search(array('s.label'), $search_label); if ($search_date_start) $sql .= " AND s.datep >= '".$db->idate($search_date_start)."'"; if ($search_date_end) $sql .= " AND s.datep <= '".$db->idate($search_date_end)."'"; if ($search_amount) $sql .= natural_search("s.amount", $search_amount, 1); -if ($search_account > 0) $sql .= " AND b.fk_account=".$search_account; +if ($search_account > 0) $sql .= " AND b.fk_account=".((int) $search_account); if ($filtre) { $filtre = str_replace(":", "=", $filtre); $sql .= " AND ".$filtre; diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 7a40af26ac0..3288571d2a7 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -342,8 +342,8 @@ class User extends CommonObject public $fields = array( 'rowid'=>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'index'=>1, 'position'=>1, 'comment'=>'Id'), - 'lastname'=>array('type'=>'varchar(50)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>20, 'searchall'=>1, 'comment'=>'Reference of object'), - 'firstname'=>array('type'=>'varchar(50)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'), + 'lastname'=>array('type'=>'varchar(50)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>20, 'searchall'=>1), + 'firstname'=>array('type'=>'varchar(50)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1), ); diff --git a/htdocs/user/list.php b/htdocs/user/list.php index 257bcd4c6be..1a85ed309db 100644 --- a/htdocs/user/list.php +++ b/htdocs/user/list.php @@ -109,45 +109,32 @@ if (!empty($conf->api->enabled)) // Definition of fields for list $arrayfields = array( - 'u.login'=>array('label'=>$langs->trans("Login"), 'checked'=>1), - 'u.lastname'=>array('label'=>$langs->trans("Lastname"), 'checked'=>1), - 'u.firstname'=>array('label'=>$langs->trans("Firstname"), 'checked'=>1), - 'u.gender'=>array('label'=>$langs->trans("Gender"), 'checked'=>0), - 'u.employee'=>array('label'=>$langs->trans("Employee"), 'checked'=>($mode == 'employee' ? 1 : 0)), - 'u.accountancy_code'=>array('label'=>$langs->trans("AccountancyCode"), 'checked'=>0), - 'u.email'=>array('label'=>$langs->trans("EMail"), 'checked'=>1), - 'u.api_key'=>array('label'=>$langs->trans("ApiKey"), 'checked'=>0, "enabled"=>($conf->api->enabled && $user->admin)), - 'u.fk_soc'=>array('label'=>$langs->trans("Company"), 'checked'=>1), - 'u.entity'=>array('label'=>$langs->trans("Entity"), 'checked'=>1, 'enabled'=>(!empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))), - 'u.fk_user'=>array('label'=>$langs->trans("HierarchicalResponsible"), 'checked'=>1), - 'u.datelastlogin'=>array('label'=>$langs->trans("LastConnexion"), 'checked'=>1, 'position'=>100), - 'u.datepreviouslogin'=>array('label'=>$langs->trans("PreviousConnexion"), 'checked'=>0, 'position'=>110), - 'u.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500), - 'u.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500), - 'u.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000), + 'u.login'=>array('label'=>"Login", 'checked'=>1, 'position'=>10), + 'u.lastname'=>array('label'=>"Lastname", 'checked'=>1, 'position'=>15), + 'u.firstname'=>array('label'=>"Firstname", 'checked'=>1, 'position'=>20), + 'u.entity'=>array('label'=>"Entity", 'checked'=>1, 'position'=>50, 'enabled'=>(!empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))), + 'u.gender'=>array('label'=>"Gender", 'checked'=>0, 'position'=>22), + 'u.employee'=>array('label'=>"Employee", 'checked'=>($mode == 'employee' ? 1 : 0), 'position'=>25), + 'u.fk_user'=>array('label'=>"HierarchicalResponsible", 'checked'=>1, 'position'=>27), + 'u.accountancy_code'=>array('label'=>"AccountancyCode", 'checked'=>0, 'position'=>30), + 'u.email'=>array('label'=>"EMail", 'checked'=>1, 'position'=>35), + 'u.api_key'=>array('label'=>"ApiKey", 'checked'=>0, 'position'=>40, "enabled"=>($conf->api->enabled && $user->admin)), + 'u.fk_soc'=>array('label'=>"Company", 'checked'=>1, 'position'=>45), + 'u.salary'=>array('label'=>"Salary", 'checked'=>1, 'position'=>80, 'enabled'=>($conf->salaries->enabled && !empty($user->rights->salaries->readall))), + 'u.datelastlogin'=>array('label'=>"LastConnexion", 'checked'=>1, 'position'=>100), + 'u.datepreviouslogin'=>array('label'=>"PreviousConnexion", 'checked'=>0, 'position'=>110), + 'u.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500), + 'u.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500), + 'u.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000), ); // Extra fields -if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) -{ - foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) - { - if (!empty($extrafields->attributes[$object->table_element]['list'][$key])) { - $arrayfields["ef.".$key] = array( - 'label'=>$extrafields->attributes[$object->table_element]['label'][$key], - 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), - 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], - 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]), - 'langfile'=>$extrafields->attributes[$object->table_element]['langfile'][$key], - 'help'=>$extrafields->attributes[$object->table_element]['help'][$key] - ); - } - } -} +include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_array_fields.tpl.php'; + $object->fields = dol_sort_array($object->fields, 'position'); $arrayfields = dol_sort_array($arrayfields, 'position'); // Init search fields -$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); +$sall = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml')); $search_user = GETPOST('search_user', 'alpha'); $search_login = GETPOST('search_login', 'alpha'); $search_lastname = GETPOST('search_lastname', 'alpha'); @@ -183,6 +170,8 @@ if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) $error = 0; +$childids = $user->getAllChildIds(1); + /* * Actions @@ -308,7 +297,7 @@ if ($contextpage == 'employeelist' && $search_employee == 1) { $user2 = new User($db); $sql = "SELECT DISTINCT u.rowid, u.lastname, u.firstname, u.admin, u.fk_soc, u.login, u.email, u.api_key, u.accountancy_code, u.gender, u.employee, u.photo,"; -$sql .= " u.datelastlogin, u.datepreviouslogin,"; +$sql .= " u.salary, u.datelastlogin, u.datepreviouslogin,"; $sql .= " u.ldap_sid, u.statut, u.entity,"; $sql .= " u.tms as date_update, u.datec as date_creation,"; $sql .= " u2.rowid as id2, u2.login as login2, u2.firstname as firstname2, u2.lastname as lastname2, u2.admin as admin2, u2.fk_soc as fk_soc2, u2.email as email2, u2.gender as gender2, u2.photo as photo2, u2.entity as entity2, u2.statut as statut2,"; @@ -356,6 +345,7 @@ if ($catid > 0) $sql .= " AND cu.fk_categorie = ".((int) $catid); if ($catid == -2) $sql .= " AND cu.fk_categorie IS NULL"; if ($search_categ > 0) $sql .= " AND cu.fk_categorie = ".$db->escape($search_categ); if ($search_categ == -2) $sql .= " AND cu.fk_categorie IS NULL"; +if ($mode == 'employee' && empty($user->rights->salaries->readall)) $sql .= " AND s.fk_user IN (".join(',', $childids).")"; // Add where from extra fields include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php'; // Add where from hooks @@ -541,6 +531,13 @@ if (!empty($arrayfields['u.employee']['checked'])) print $form->selectyesno('search_employee', $search_employee, 1, false, 1); print ''; } +// Supervisor +if (!empty($arrayfields['u.fk_user']['checked'])) +{ + print '
'; +} if (!empty($arrayfields['u.accountancy_code']['checked'])) { print ''; @@ -561,12 +558,9 @@ if (!empty($arrayfields['u.entity']['checked'])) { print ''; } -// Supervisor -if (!empty($arrayfields['u.fk_user']['checked'])) +if (!empty($arrayfields['u.salary']['checked'])) { - print ''; + print ''; } if (!empty($arrayfields['u.datelastlogin']['checked'])) { @@ -615,12 +609,13 @@ if (!empty($arrayfields['u.lastname']['checked'])) print_liste_field_titre if (!empty($arrayfields['u.firstname']['checked'])) print_liste_field_titre("FirstName", $_SERVER['PHP_SELF'], "u.firstname", $param, "", "", $sortfield, $sortorder); if (!empty($arrayfields['u.gender']['checked'])) print_liste_field_titre("Gender", $_SERVER['PHP_SELF'], "u.gender", $param, "", "", $sortfield, $sortorder); if (!empty($arrayfields['u.employee']['checked'])) print_liste_field_titre("Employee", $_SERVER['PHP_SELF'], "u.employee", $param, "", "", $sortfield, $sortorder); +if (!empty($arrayfields['u.fk_user']['checked'])) print_liste_field_titre("HierarchicalResponsible", $_SERVER['PHP_SELF'], "u.fk_user", $param, "", "", $sortfield, $sortorder); if (!empty($arrayfields['u.accountancy_code']['checked'])) print_liste_field_titre("AccountancyCode", $_SERVER['PHP_SELF'], "u.accountancy_code", $param, "", "", $sortfield, $sortorder); if (!empty($arrayfields['u.email']['checked'])) print_liste_field_titre("EMail", $_SERVER['PHP_SELF'], "u.email", $param, "", "", $sortfield, $sortorder); if (!empty($arrayfields['u.api_key']['checked'])) print_liste_field_titre("ApiKey", $_SERVER['PHP_SELF'], "u.api_key", $param, "", "", $sortfield, $sortorder); if (!empty($arrayfields['u.fk_soc']['checked'])) print_liste_field_titre("Company", $_SERVER['PHP_SELF'], "u.fk_soc", $param, "", "", $sortfield, $sortorder); if (!empty($arrayfields['u.entity']['checked'])) print_liste_field_titre("Entity", $_SERVER['PHP_SELF'], "u.entity", $param, "", "", $sortfield, $sortorder); -if (!empty($arrayfields['u.fk_user']['checked'])) print_liste_field_titre("HierarchicalResponsible", $_SERVER['PHP_SELF'], "u.fk_user", $param, "", "", $sortfield, $sortorder); +if (!empty($arrayfields['u.salary']['checked'])) print_liste_field_titre("Salary", $_SERVER['PHP_SELF'], "u.salary", $param, "", "", $sortfield, $sortorder, 'right '); if (!empty($arrayfields['u.datelastlogin']['checked'])) print_liste_field_titre("LastConnexion", $_SERVER['PHP_SELF'], "u.datelastlogin", $param, "", '', $sortfield, $sortorder, 'center '); if (!empty($arrayfields['u.datepreviouslogin']['checked'])) print_liste_field_titre("PreviousConnexion", $_SERVER['PHP_SELF'], "u.datepreviouslogin", $param, "", '', $sortfield, $sortorder, 'center '); // Extra fields @@ -713,6 +708,37 @@ while ($i < ($limit ? min($num, $limit) : $num)) print ''; if (!$i) $totalarray['nbfield']++; } + + // Supervisor + if (!empty($arrayfields['u.fk_user']['checked'])) + { + // Resp + print ''; + if (!$i) $totalarray['nbfield']++; + } + if (!empty($arrayfields['u.accountancy_code']['checked'])) { print ''; @@ -763,34 +789,12 @@ while ($i < ($limit ? min($num, $limit) : $num)) if (!$i) $totalarray['nbfield']++; } } - // Supervisor - if (!empty($arrayfields['u.fk_user']['checked'])) + + // Salary + if (!empty($arrayfields['u.salary']['checked'])) { - // Resp - print ''; - if (!$i) $totalarray['nbfield']++; + print ''; + if (!$i) $totalarray['nbfield']++; } // Date last login From 62e3b5d214a0e559ecd0acf6c452969dcab9b1e6 Mon Sep 17 00:00:00 2001 From: teleassist Date: Thu, 3 Dec 2020 10:04:21 +0100 Subject: [PATCH 136/297] Revert "Add translation" This reverts commit e19d0c9eeaeadd9c18b3fc39f3522c30db10a24f. --- htdocs/langs/en_US/cashdesk.lang | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang index c0245790e76..549646ab110 100644 --- a/htdocs/langs/en_US/cashdesk.lang +++ b/htdocs/langs/en_US/cashdesk.lang @@ -122,5 +122,4 @@ GiftReceipt=Gift receipt ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first AllowDelayedPayment=Allow delayed payment PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts -WeighingScale=Weighing scale -TakeposNumpadForcePaymentLabels=Show text with icons of payment buttons of numpad +WeighingScale=Weighing scale \ No newline at end of file From 450b04c1ad14131d1185b1d230042ed453218349 Mon Sep 17 00:00:00 2001 From: teleassist Date: Thu, 3 Dec 2020 10:04:28 +0100 Subject: [PATCH 137/297] Revert "Add TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS" This reverts commit 7e9a12a2f8bef1f6947522654e1470661844f054. --- htdocs/takepos/admin/setup.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php index bd4c18bda0c..88911f10b7d 100644 --- a/htdocs/takepos/admin/setup.php +++ b/htdocs/takepos/admin/setup.php @@ -307,13 +307,6 @@ print '\n"; -// Numpad show labels for icons -print '\n"; - // Direct Payment print ''; - $stringtoprint .= ''; - $stringtoprint .= ''; - $stringtoprint .= "\n"; + $dataseries[] = array($labelStatus, (isset($valsamount[$status]) ? (float) $valsamount[$status] : 0)); + if (!$conf->use_javascript_ajax) { + $stringtoprint .= ''; + $stringtoprint .= ''; + $stringtoprint .= ''; + $stringtoprint .= "\n"; + } } } if ($conf->use_javascript_ajax) { @@ -231,7 +225,7 @@ class box_funnel_of_prospection extends ModeleBoxes 'tr' => 'class="oddeven"', 'td' => 'class="left "', 'maxlength' => 500, - 'text' => $form->textwithpicto($langs->trans("OpportunityPonderatedAmount").' ('.$langs->trans("WonLostExcluded").')', $langs->trans("OpportunityPonderatedAmountDesc"), 1) + 'text' => $form->textwithpicto($langs->trans("OpportunityPonderatedAmount") . ' (' . $langs->trans("WonLostExcluded") . ')', $langs->trans("OpportunityPonderatedAmountDesc"), 1) ); $this->info_box_contents[$line][] = array( diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql index 18802301e5a..7b5fc0aab22 100644 --- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql +++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql @@ -439,7 +439,6 @@ INSERT INTO llx_c_product_nature (code, label, active) VALUES (1, 'Finished', 1) ALTER TABLE llx_product MODIFY COLUMN finished tinyint DEFAULT NULL; ALTER TABLE llx_product ADD CONSTRAINT fk_product_finished FOREIGN KEY (finished) REFERENCES llx_c_product_nature (code); - -- MIGRATION TO DO AFTER RENAMING AN OBJECT -- drop constraint @@ -542,3 +541,5 @@ CREATE TABLE llx_session( user_agent varchar(128) NULL )ENGINE=innodb; +INSERT INTO llx_boxes_def(file,entity) VALUES ('box_funnel_of_prospection.php',1); +INSERT INTO llx_boxes (box_id, position, box_order, maxline, params) VALUES ((SELECT b.rowid FROM llx_boxes_def as b WHERE file = 'box_funnel_of_prospection.php'), 0, 0, NULL, NULL); diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang index 75f8eb14f49..40fdc11ba32 100644 --- a/htdocs/langs/en_US/boxes.lang +++ b/htdocs/langs/en_US/boxes.lang @@ -50,6 +50,7 @@ BoxTitleLastOutstandingBillReached=Latest %s customers with maximum outstanding BoxGlobalActivity=Global activity (invoices, proposals, orders) BoxGoodCustomers=Good customers BoxTitleGoodCustomers=%s Good customers +BoxTitleFunnelOfProspection=Amount of prospection by status FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s LastRefreshDate=Latest refresh date NoRecordedBookmarks=No bookmarks defined. From f6adb6ae5530cda5e1e1910fbdf018de41defda7 Mon Sep 17 00:00:00 2001 From: teleassist <30868208+teleassist@users.noreply.github.com> Date: Thu, 3 Dec 2020 10:12:03 +0100 Subject: [PATCH 139/297] Update pay.php Always show labels with payment icons --- htdocs/takepos/pay.php | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php index 89b936bef6c..ab621a964b5 100644 --- a/htdocs/takepos/pay.php +++ b/htdocs/takepos/pay.php @@ -286,7 +286,6 @@ print ''; + print ''; } else { print ''; } @@ -311,7 +309,6 @@ print ''; + print ''; } else { $button = array_pop($action_buttons); print ''; @@ -337,7 +333,6 @@ print ''; + print ''; } else { $button = array_pop($action_buttons); print ''; From dd54d28dc6197ce5b8812fee6a9aa140d49ef82b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 3 Dec 2020 10:13:13 +0100 Subject: [PATCH 140/297] Debug v13 --- htdocs/bom/bom_list.php | 17 +- htdocs/core/tpl/contacts.tpl.php | 4 +- htdocs/projet/info.php | 4 +- htdocs/projet/list.php | 24 +- htdocs/salaries/list.php | 563 +++++++++++++++++++++---------- htdocs/ticket/agenda.php | 4 +- htdocs/ticket/messaging.php | 4 +- 7 files changed, 396 insertions(+), 224 deletions(-) diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php index 1135f5df5dd..8f8c13f2556 100644 --- a/htdocs/bom/bom_list.php +++ b/htdocs/bom/bom_list.php @@ -383,21 +383,6 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $ llxHeader('', $title, $help_url); -// Example : Adding jquery code -print ''; - $arrayofselected = is_array($toselect) ? $toselect : array(); $param = ''; @@ -469,7 +454,7 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); -print '
'; // You can use div-table-responsive-no-min if you dont need reserved height for your table +print '
'; print '
'.$morehtml.'     '; if ($mode == 'showalltime') { - print ''; + print ''; print $langs->trans("GoBack"); print ''; } else { - print ''; + print ''; print $langs->trans("ShowAllTimeBalance"); print ''; } @@ -793,7 +793,7 @@ if ($mode == 'standard') if ($nextmonth > 12) { $nextmonth = 1; $nextyear++; } // For month - $link = "".img_previous('', 'class="valignbottom"')." ".$langs->trans("Month")." ".img_next('', 'class="valignbottom"').""; + $link = "".img_previous('', 'class="valignbottom"')." ".$langs->trans("Month")." ".img_next('', 'class="valignbottom"').""; print '
'.$link.'
'; print '
'; @@ -807,7 +807,7 @@ if ($mode == 'standard') // For year $prevyear = $year - 1; $nextyear = $year + 1; - $link = "".img_previous('', 'class="valignbottom"')." ".$langs->trans("Year")." ".img_next('', 'class="valignbottom"').""; + $link = "".img_previous('', 'class="valignbottom"')." ".$langs->trans("Year")." ".img_next('', 'class="valignbottom"').""; print '
'.$link.'
'; From 9e18997e64ec3b4ef7ec360c1cf17a67c9dd8331 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 2 Dec 2020 16:35:43 +0100 Subject: [PATCH 127/297] FIX #15595 --- htdocs/compta/facture/card-rec.php | 14 ++++++++++++-- htdocs/compta/facture/card.php | 2 +- htdocs/core/class/commonobject.class.php | 6 +++++- htdocs/langs/en_US/errors.lang | 1 + htdocs/langs/fr_FR/errors.lang | 1 + 5 files changed, 20 insertions(+), 4 deletions(-) diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php index 4f754fbd173..11dec142a17 100644 --- a/htdocs/compta/facture/card-rec.php +++ b/htdocs/compta/facture/card-rec.php @@ -117,6 +117,8 @@ $usercancreatewithdrarequest = $user->rights->prelevement->bons->creer; $now = dol_now(); +$error = 0; + /* * Actions @@ -287,13 +289,21 @@ if (empty($reshook)) elseif ($action == 'setref' && $user->rights->facture->creer) { //var_dump(GETPOST('ref', 'alpha'));exit; - $result = $object->setValueFrom('titre', GETPOST('ref', 'alpha'), '', null, 'text', '', $user, 'BILLREC_MODIFY'); + $result = $object->setValueFrom('titre', $ref, '', null, 'text', '', $user, 'BILLREC_MODIFY'); if ($result > 0) { $object->titre = GETPOST('ref', 'alpha'); // deprecated $object->title = GETPOST('ref', 'alpha'); $object->ref = $object->title; - } else dol_print_error($db, $object->error, $object->errors); + } else { + $error++; + if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') { + $langs->load("errors"); + setEventMessages($langs->trans('ErrorRefAlreadyExists', $ref), null, 'errors'); + } else { + setEventMessages($object->error, $object->errors, 'errors'); + } + } } // Set bank account elseif ($action == 'setbankaccount' && $user->rights->facture->creer) { diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index def74e173a3..110db6d8166 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -4074,7 +4074,7 @@ if ($action == 'create') print $object->getLibType(); print ''; if ($object->module_source) { - print ' ('.$langs->trans("POS").' '.$object->module_source.' - '.$langs->trans("Terminal").' '.$object->pos_source.')'; + print ' ('.$langs->trans("POS").' '.ucfirst($object->module_source).' - '.$langs->trans("Terminal").' '.$object->pos_source.')'; } if ($object->type == Facture::TYPE_REPLACEMENT) { $facreplaced = new Facture($db); diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 243d4d57f7c..ec03bb66524 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -1817,7 +1817,11 @@ abstract class CommonObject return -2; } } else { - $this->error = $this->db->lasterror(); + if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') { + $this->error = 'DB_ERROR_RECORD_ALREADY_EXISTS'; + } else { + $this->error = $this->db->lasterror(); + } $this->db->rollback(); return -1; } diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang index 255bce66531..2413e6d76ba 100644 --- a/htdocs/langs/en_US/errors.lang +++ b/htdocs/langs/en_US/errors.lang @@ -8,6 +8,7 @@ ErrorBadEMail=Email %s is wrong ErrorBadMXDomain=Email %s seems wrong (domain has no valid MX record) ErrorBadUrl=Url %s is wrong ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing. +ErrorRefAlreadyExists=Reference %s already exists. ErrorLoginAlreadyExists=Login %s already exists. ErrorGroupAlreadyExists=Group %s already exists. ErrorRecordNotFound=Record not found. diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang index 97d3e48f512..abd1c6ec9f9 100644 --- a/htdocs/langs/fr_FR/errors.lang +++ b/htdocs/langs/fr_FR/errors.lang @@ -7,6 +7,7 @@ ErrorButCommitIsDone=Erreurs trouvées mais on valide malgré tout ErrorBadEMail=email %s invalide ErrorBadUrl=Url %s invalide ErrorBadValueForParamNotAString=Mauvaise valeur de paramètre. Ceci arrive lors d'une tentative de traduction d'une clé non renseignée. +ErrorRefAlreadyExists=La référence %s existe déjà. ErrorLoginAlreadyExists=L'identifiant %s existe déjà. ErrorGroupAlreadyExists=Le groupe %s existe déjà. ErrorRecordNotFound=Enregistrement non trouvé. From 6440dcbd93787a090ddf938edab17dcf4a9c0b57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 2 Dec 2020 18:21:13 +0100 Subject: [PATCH 128/297] doxygen --- htdocs/zapier/class/hook.class.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/htdocs/zapier/class/hook.class.php b/htdocs/zapier/class/hook.class.php index 8e6d3fa725f..5d5a9c84eda 100644 --- a/htdocs/zapier/class/hook.class.php +++ b/htdocs/zapier/class/hook.class.php @@ -212,9 +212,14 @@ class Hook extends CommonObject public $label; /** - * @var string amount + * @var string url of webhook */ - public $amount; + public $url; + + /** + * @var int ID of user owner webhook + */ + public $fk_user; /** * @var int Status From a2dca42965f1f64c6d32699bd7302d1863b71d7e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 2 Dec 2020 18:55:55 +0100 Subject: [PATCH 129/297] Revert "Create/Edit extra-field with multi-line text area for computed value" --- htdocs/core/tpl/admin_extrafields_add.tpl.php | 7 ++----- htdocs/core/tpl/admin_extrafields_edit.tpl.php | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php index fca100b2e07..6c25b5c07b5 100644 --- a/htdocs/core/tpl/admin_extrafields_add.tpl.php +++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php @@ -180,14 +180,11 @@ $langs->load("modulebuilder");
trans("LanguageFile"); ?>
textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc"), 1, 'help', '', 0, 2, 'tooltipcompute'); ?>
textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc"), 1, 'help', '', 0, 2, 'tooltipcompute'); ?>
textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc")).$form->textwithpicto($langs->trans("Computedpersistent"), $langs->trans("ComputedpersistentDesc"), 1, 'warning'); ?>
textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc")).$form->textwithpicto($langs->trans("Computedpersistent"), $langs->trans("ComputedpersistentDesc"), 1, 'warning'); ?>
trans("DefaultValue").' ('.$langs->trans("Database").')'; ?>
trans("LanguageFile"); ?>
textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc"), 1, 'help', '', 0, 2, 'tooltipcompute'); ?>
textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc"), 1, 'help', '', 0, 2, 'tooltipcompute'); ?>
textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc")).$form->textwithpicto($langs->trans("Computedpersistent"), $langs->trans("ComputedpersistentDesc"), 1, 'warning'); ?>
textwithpicto($langs->trans("ComputedFormula"), $langs->trans("ComputedFormulaDesc")).$form->textwithpicto($langs->trans("Computedpersistent"), $langs->trans("ComputedpersistentDesc"), 1, 'warning'); ?>
trans("DefaultValue").' ('.$langs->trans("Database").')'; ?>
Date: Wed, 2 Dec 2020 19:34:04 +0100 Subject: [PATCH 132/297] FIX #15590 manually --- htdocs/core/modules/modProduct.class.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php index 87f11decb5e..b029448cd58 100644 --- a/htdocs/core/modules/modProduct.class.php +++ b/htdocs/core/modules/modProduct.class.php @@ -194,7 +194,7 @@ class modProduct extends DolibarrModules ); if (is_object($mysoc) && $mysoc->useNPR()) $this->export_fields_array[$r]['p.recuperableonly'] = 'NPR'; if (!empty($conf->fournisseur->enabled) || !empty($conf->margin->enabled)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.cost_price'=>'CostPrice')); - if (!empty($conf->stock->enabled)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.stock'=>'Stock', 'p.seuil_stock_alerte'=>'StockLimit', 'p.desiredstock'=>'DesiredStock', 'p.pmp'=>'PMPValue')); + if (!empty($conf->stock->enabled)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.tobatch'=>'ManageLotSerial', 'p.stock'=>'Stock', 'p.seuil_stock_alerte'=>'StockLimit', 'p.desiredstock'=>'DesiredStock', 'p.pmp'=>'PMPValue')); if (!empty($conf->barcode->enabled)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.barcode'=>'BarCode')); $keyforselect = 'product'; $keyforelement = 'product'; $keyforaliasextra = 'extra'; include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php'; @@ -216,7 +216,7 @@ class modProduct extends DolibarrModules 'p.price_base_type'=>"Text", 'p.price'=>"Numeric", 'p.price_ttc'=>"Numeric", 'p.tva_tx'=>'Numeric', 'p.datec'=>'Date', 'p.tms'=>'Date' ); - if (!empty($conf->stock->enabled)) $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.stock'=>'Numeric', 'p.seuil_stock_alerte'=>'Numeric', 'p.desiredstock'=>'Numeric', 'p.pmp'=>'Numeric', 'p.cost_price'=>'Numeric')); + if (!empty($conf->stock->enabled)) $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.tobatch'=>'Numeric', 'p.stock'=>'Numeric', 'p.seuil_stock_alerte'=>'Numeric', 'p.desiredstock'=>'Numeric', 'p.pmp'=>'Numeric', 'p.cost_price'=>'Numeric')); if (!empty($conf->barcode->enabled)) $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.barcode'=>'Text')); if (!empty($conf->fournisseur->enabled)) $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('s.nom'=>'Text', 'pf.ref_fourn'=>'Text', 'pf.unitprice'=>'Numeric', 'pf.quantity'=>'Numeric', 'pf.remise_percent'=>'Numeric', 'pf.delivery_time_days'=>'Numeric')); if (!empty($conf->global->MAIN_MULTILANGS)) $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('l.lang'=>'Text', 'l.label'=>'Text', 'l.description'=>'Text', 'l.note'=>'Text')); @@ -559,6 +559,7 @@ class modProduct extends DolibarrModules ); //clauses copied from import_fields_array if (!empty($conf->stock->enabled)) $import_sample = array_merge($import_sample, array( + 'p.tobatch'=>"0 (don't use) / 1 (use batch/serial number)", 'p.seuil_stock_alerte' => '', 'p.pmp' => '0', 'p.desiredstock' => '' From 46171a6ec8eb434c139e6130582c0ba3d0b39b11 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 2 Dec 2020 21:27:15 +0100 Subject: [PATCH 133/297] Fix option MAIN_USE_COMPANY_NAME_OF_CONTACT --- .../modules/bom/doc/doc_generic_bom_odt.modules.php | 7 ++++--- .../commande/doc/doc_generic_order_odt.modules.php | 8 ++++---- .../modules/commande/doc/pdf_einstein.modules.php | 5 ++--- .../commande/doc/pdf_eratosthene.modules.php | 3 +-- .../doc/doc_generic_contract_odt.modules.php | 5 ++--- .../modules/contract/doc/pdf_strato.modules.php | 5 ++--- .../core/modules/delivery/doc/pdf_storm.modules.php | 5 ++--- .../modules/delivery/doc/pdf_typhon.modules.php | 5 ++--- .../doc/doc_generic_shipment_odt.modules.php | 7 +++---- .../modules/expedition/doc/pdf_espadon.modules.php | 5 ++--- .../modules/expedition/doc/pdf_merou.modules.php | 3 +-- .../modules/expedition/doc/pdf_rouget.modules.php | 5 ++--- .../facture/doc/doc_generic_invoice_odt.modules.php | 5 ++--- .../core/modules/facture/doc/pdf_crabe.modules.php | 5 ++--- .../core/modules/facture/doc/pdf_sponge.modules.php | 5 ++--- .../modules/fichinter/doc/pdf_soleil.modules.php | 5 ++--- .../member/doc/doc_generic_member_odt.class.php | 3 +-- .../modules/mrp/doc/doc_generic_mo_odt.modules.php | 9 ++++----- .../product/doc/doc_generic_product_odt.modules.php | 6 ++---- .../doc/doc_generic_proposal_odt.modules.php | 6 +++--- .../core/modules/propale/doc/pdf_azur.modules.php | 5 ++--- .../core/modules/propale/doc/pdf_cyan.modules.php | 5 ++--- .../doc/doc_generic_reception_odt.modules.php | 13 ++++++++----- .../modules/reception/doc/pdf_squille.modules.php | 5 ++--- .../stock/doc/doc_generic_stock_odt.modules.php | 3 +-- .../supplier_invoice/doc/pdf_canelle.modules.php | 5 ++--- .../doc/doc_generic_supplier_order_odt.modules.php | 6 +++--- .../supplier_order/doc/pdf_cornas.modules.php | 5 ++--- .../supplier_order/doc/pdf_muscadet.modules.php | 5 ++--- .../doc_generic_supplier_proposal_odt.modules.php | 9 +++------ .../supplier_proposal/doc/pdf_aurore.modules.php | 13 ++++++++----- .../user/doc/doc_generic_user_odt.modules.php | 6 +++--- .../doc/doc_generic_usergroup_odt.modules.php | 6 +++--- .../doc/doc_generic_myobject_odt.modules.php | 6 +++--- .../mymodule/doc/pdf_standard_myobject.modules.php | 2 +- ...c_generic_recruitmentjobposition_odt.modules.php | 6 +++--- .../pdf_standard_recruitmentjobposition.modules.php | 2 +- 37 files changed, 94 insertions(+), 115 deletions(-) diff --git a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php index 750f1a7ab39..b5e1fc80a1d 100644 --- a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php +++ b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php @@ -294,10 +294,11 @@ class doc_generic_bom_odt extends ModelePDFBom if (!empty($usecontact)) { // On peut utiliser le nom de la societe du contact - if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact; - else { + if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { + $socobject = $object->contact; + } else { $socobject = $object->thirdparty; - // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use + // if we have a CUSTOMER contact and we dont use as recipient we store the contact object for later use $contactobject = $object->contact; } } else { diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php index eb2c8121397..3165760b541 100644 --- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php +++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php @@ -305,11 +305,11 @@ class doc_generic_order_odt extends ModelePDFCommandes $contactobject = null; if (!empty($usecontact)) { - // On peut utiliser le nom de la societe du contact - if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact; - else { + if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { + $socobject = $object->contact; + } else { $socobject = $object->thirdparty; - // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use + // if we have a CUSTOMER contact and we dont use as recipient we store the contact object for later use $contactobject = $object->contact; } } else { diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php index 3536daab5eb..5a0bbc30327 100644 --- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php @@ -1446,9 +1446,8 @@ class pdf_einstein extends ModelePDFCommandes $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)) { + // Recipient name + if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { $thirdparty = $object->contact; } else { $thirdparty = $object->thirdparty; diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php index 7fda31f4c71..97354c5c266 100644 --- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php @@ -1628,8 +1628,7 @@ class pdf_eratosthene extends ModelePDFCommandes } //Recipient name - // On peut utiliser le nom de la societe du contact - if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) { + if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { $thirdparty = $object->contact; } else { $thirdparty = $object->thirdparty; 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 7a0b1f91109..edad675857f 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 @@ -291,12 +291,11 @@ class doc_generic_contract_odt extends ModelePDFContract // Recipient name $contactobject = null; if (!empty($usecontact)) { - // On peut utiliser le nom de la societe du contact - if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) { + if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { $socobject = $object->contact; } else { $socobject = $object->thirdparty; - // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use + // if we have a CUSTOMER contact and we dont use as recipient we store the contact object for later use $contactobject = $object->contact; } } else { diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php index 08fefaf5634..e28cd62efae 100644 --- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php +++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php @@ -711,9 +711,8 @@ class pdf_strato extends ModelePDFContract $this->recipient = $object->thirdparty; - //Recipient name - // You can use the name of the contact company - if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) { + // Recipient name + if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { $thirdparty = $object->contact; } else { $thirdparty = $object->thirdparty; diff --git a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php index e6da731fb21..d6376e6cd17 100644 --- a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php +++ b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php @@ -860,9 +860,8 @@ class pdf_storm extends ModelePDFDeliveryOrder $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)) { + // Recipient name + if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { $thirdparty = $object->contact; } else { $thirdparty = $object->thirdparty; diff --git a/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php b/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php index 8b7c899af91..3b8baa107ad 100644 --- a/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php +++ b/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php @@ -850,9 +850,8 @@ class pdf_typhon extends ModelePDFDeliveryOrder $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)) { + // Recipient name + if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { $thirdparty = $object->contact; } else { $thirdparty = $object->thirdparty; diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php index 039ef128cd7..254bb5bf377 100644 --- a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php +++ b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php @@ -304,12 +304,11 @@ class doc_generic_shipment_odt extends ModelePdfExpedition // Recipient name $contactobject = null; if (!empty($usecontact)) { - // On peut utiliser le nom de la societe du contact - if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) + if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { $socobject = $object->contact; - else { + } else { $socobject = $object->thirdparty; - // if we have a SHIIPPING contact and we dont use it as recipient we store the contact object for later use + // if we have a SHIPPING contact and we dont use as recipient we store the contact object for later use $contactobject = $object->contact; } } else { diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php index a48e28ecef6..5cdeaa693a7 100644 --- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php @@ -1020,9 +1020,8 @@ class pdf_espadon extends ModelePdfExpedition $result = $object->fetch_contact($arrayidcontact[0]); } - //Recipient name - // You can use the name of the contact company - if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) { + // Recipient name + if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { $thirdparty = $object->contact; } else { $thirdparty = $object->thirdparty; diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php index be163ea4c18..f530121ec08 100644 --- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php @@ -678,8 +678,7 @@ class pdf_merou extends ModelePdfExpedition } // Recipient name - // You can use the name of the contact company - if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) { + if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { $thirdparty = $object->contact; } else { $thirdparty = $object->thirdparty; diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php index 8b0dd134d65..a43c6aba352 100644 --- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php @@ -1054,9 +1054,8 @@ class pdf_rouget extends ModelePdfExpedition $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)) { + // Recipient name + if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { $thirdparty = $object->contact; } else { $thirdparty = $object->thirdparty; diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php index 1d4b65fdb32..f2f4ee31823 100644 --- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php +++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php @@ -305,10 +305,9 @@ class doc_generic_invoice_odt extends ModelePDFFactures // Recipient name $contactobject = null; if (!empty($usecontact)) { - // On peut utiliser le nom de la societe du contact - if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) + if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { $socobject = $object->contact; - else { + } else { $socobject = $object->thirdparty; // if we have a BILLING contact and we dont use it as recipient we store the contact object for later use $contactobject = $object->contact; diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index 32c58f21eac..f1c90305bef 100644 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -1842,9 +1842,8 @@ class pdf_crabe extends ModelePDFFactures $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)) { + // Recipient name + if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { $thirdparty = $object->contact; } else { $thirdparty = $object->thirdparty; diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php index 66035df58db..4087e3db098 100644 --- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php @@ -2108,9 +2108,8 @@ class pdf_sponge extends ModelePDFFactures $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)) { + // Recipient name + if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { $thirdparty = $object->contact; } else { $thirdparty = $object->thirdparty; diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php index c79b2ac4137..622cd0b2250 100644 --- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php +++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php @@ -665,9 +665,8 @@ class pdf_soleil extends ModelePDFFicheinter $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)) { + // Recipient name + if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { $thirdparty = $object->contact; } else { $thirdparty = $object->thirdparty; diff --git a/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php b/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php index 6d2f2772610..be91acd7a3f 100644 --- a/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php +++ b/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php @@ -280,8 +280,7 @@ class doc_generic_member_odt extends ModelePDFMember // Recipient name if (!empty($usecontact)) { - // On peut utiliser le nom de la societe du contact - if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) { + if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { $socobject = $object->contact; } else { $socobject = $object->thirdparty; diff --git a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php index 84f225dfb6e..eeaeb2c8e54 100644 --- a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php +++ b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php @@ -298,11 +298,10 @@ class doc_generic_mo_odt extends ModelePDFMo // Recipient name $contactobject = null; - if (!empty($usecontact)) - { - // On peut utiliser le nom de la societe du contact - if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact; - else { + if (!empty($usecontact)) { + if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { + $socobject = $object->contact; + } else { $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; 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 d017a559b37..ef5e97997f9 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 @@ -315,10 +315,8 @@ class doc_generic_product_odt extends ModelePDFProduct // Recipient name $contactobject = null; - if (!empty($usecontact)) - { - // On peut utiliser le nom de la societe du contact - if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) { + if (!empty($usecontact)) { + if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { $socobject = $object->contact; } else { $socobject = $object->thirdparty; diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php index 59df720269b..b27e94b46b7 100644 --- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php +++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php @@ -334,9 +334,9 @@ class doc_generic_proposal_odt extends ModelePDFPropales $contactobject = null; if (!empty($usecontact)) { - // On peut utiliser le nom de la societe du contact - if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact; - else { + if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { + $socobject = $object->contact; + } else { $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; diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php index a5a6b850f7f..a889dec7815 100644 --- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php +++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php @@ -1618,9 +1618,8 @@ class pdf_azur extends ModelePDFPropales $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)) { + // Recipient name + if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { $thirdparty = $object->contact; } else { $thirdparty = $object->thirdparty; diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php index 1baf9712cdb..119932949b2 100644 --- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php +++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php @@ -1729,9 +1729,8 @@ class pdf_cyan extends ModelePDFPropales $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)) { + // Recipient name + if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { $thirdparty = $object->contact; } else { $thirdparty = $object->thirdparty; diff --git a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php index 45bfabe4b62..1105a5f6d4c 100644 --- a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php +++ b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php @@ -294,11 +294,14 @@ class doc_generic_reception_odt extends ModelePdfReception } // Recipient name - if (!empty($usecontact)) - { - // 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->thirdparty; + if (!empty($usecontact)) { + if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { + $socobject = $object->contact; + } else { + $socobject = $object->thirdparty; + // if we have a BILLING contact and we dont use it as recipient we store the contact object for later use + $contactobject = $object->contact; + } } else { $socobject = $object->thirdparty; } diff --git a/htdocs/core/modules/reception/doc/pdf_squille.modules.php b/htdocs/core/modules/reception/doc/pdf_squille.modules.php index 446b03daf0a..8043f9f9ba6 100644 --- a/htdocs/core/modules/reception/doc/pdf_squille.modules.php +++ b/htdocs/core/modules/reception/doc/pdf_squille.modules.php @@ -944,9 +944,8 @@ class pdf_squille extends ModelePdfReception $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)) { + // Recipient name + if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { $thirdparty = $object->contact; } else { $thirdparty = $object->thirdparty; diff --git a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php index 89a5ea9d784..1b3053aaaaf 100644 --- a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php +++ b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php @@ -306,8 +306,7 @@ class doc_generic_stock_odt extends ModelePDFStock $contactobject = null; if (!empty($usecontact)) { - // On peut utiliser le nom de la societe du contact - if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) { + if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { $socobject = $object->contact; } else { $socobject = $object->thirdparty; diff --git a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php index 5e2e4380a0b..7a3ecf88e19 100644 --- a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php +++ b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php @@ -1209,9 +1209,8 @@ class pdf_canelle extends ModelePDFSuppliersInvoices $result = $object->fetch_contact($arrayidcontact[0]); } - //Recipient name - // We can use the name of the contact's company - if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) { + // Recipient name + if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { $thirdparty = $object->contact; } else { $thirdparty = $mysoc; diff --git a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php index 37f773783cc..18c3a9a3574 100644 --- a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php +++ b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php @@ -295,9 +295,9 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders $contactobject = null; if (!empty($usecontact)) { - // On peut utiliser le nom de la societe du contact - if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact; - else { + if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { + $socobject = $object->contact; + } else { $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; diff --git a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php index 0d66fe5b83b..3a4bc56f64a 100644 --- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php +++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php @@ -1371,9 +1371,8 @@ class pdf_cornas extends ModelePDFSuppliersOrders $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)) { + // Recipient name + if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { $thirdparty = $object->contact; } else { $thirdparty = $object->thirdparty; diff --git a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php index bc91d690f36..c8edef0679c 100644 --- a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php +++ b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php @@ -1283,9 +1283,8 @@ class pdf_muscadet extends ModelePDFSuppliersOrders $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)) { + // Recipient name + if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { $thirdparty = $object->contact; } else { $thirdparty = $object->thirdparty; diff --git a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php index b5efe6801ff..918f5fd9215 100644 --- a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php +++ b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php @@ -330,15 +330,12 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal // Recipient name $contactobject = null; - if (!empty($usecontact)) - { - // On peut utiliser le nom de la societe du contact - if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) - { + if (!empty($usecontact)) { + if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { $socobject = $object->contact; } else { $socobject = $object->thirdparty; - // if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use + // if we have a BILLING contact and we dont use it as recipient we store the contact object for later use $contactobject = $object->contact; } } else { 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 3aafb09aa86..8c82198999a 100644 --- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php +++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php @@ -1417,14 +1417,17 @@ class pdf_aurore extends ModelePDFSupplierProposal // Recipient name if (!empty($usecontact)) { - // On peut utiliser le nom de la societe du contact - if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname; - else $socname = $object->thirdparty->name; - $carac_client_name = $outputlangs->convToOutputCharset($socname); + if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { + $socname = $object->contact->socname; + } else { + $socname = $object->thirdparty->name; + } } else { - $carac_client_name = $outputlangs->convToOutputCharset($object->thirdparty->name); + $socname = $object->thirdparty->name; } + $carac_client_name = pdfBuildThirdpartyName($socname, $outputlangs); + $carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, 'target', $object); // Show recipient 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 771231e6041..2a326282fa0 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 @@ -323,9 +323,9 @@ class doc_generic_user_odt extends ModelePDFUser // Recipient name if (!empty($usecontact)) { - // On peut utiliser le nom de la societe du contact - if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact; - else { + if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { + $socobject = $object->contact; + } else { $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; 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 3cbce44511f..6fcc6160a97 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 @@ -314,9 +314,9 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup // Recipient name if (!empty($usecontact)) { - // On peut utiliser le nom de la societe du contact - if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact; - else { + if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { + $socobject = $object->contact; + } else { $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; diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php index 80b4f4ecb5a..d6cb191a405 100644 --- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php +++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php @@ -299,9 +299,9 @@ class doc_generic_myobject_odt extends ModelePDFMyObject $contactobject = null; if (!empty($usecontact)) { - // On peut utiliser le nom de la societe du contact - if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact; - else { + if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { + $socobject = $object->contact; + } else { $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; diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php index e8e39ec2adb..fbab4d53b0f 100644 --- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php +++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php @@ -1091,7 +1091,7 @@ class pdf_standard_myobject extends ModelePDFMyObject } // Recipient name - if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) { + if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { $thirdparty = $object->contact; } else { $thirdparty = $object->thirdparty; diff --git a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php index 6e9788c2e9f..be36b96682c 100644 --- a/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php +++ b/htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php @@ -299,9 +299,9 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi $contactobject = null; if (!empty($usecontact)) { - // On peut utiliser le nom de la societe du contact - if (!empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socobject = $object->contact; - else { + if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { + $socobject = $object->contact; + } else { $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; diff --git a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php index af62344296b..cad6888f7c5 100644 --- a/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php +++ b/htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php @@ -1002,7 +1002,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio } // Recipient name - /*if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) { + /*if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) { $thirdparty = $object->contact; } else { $thirdparty = $object->thirdparty; From 17d5bb5cd450f659634dbf4e6e79d03a5cd9b8ea Mon Sep 17 00:00:00 2001 From: Florian Mortgat Date: Wed, 2 Dec 2020 22:25:08 +0100 Subject: [PATCH 134/297] FIX 12.0 - error when displaying lines on order after adding a line if both MAIN_MULTILANGS and MAIN_DISABLE_PDF_AUTOUPDATE are activated --- htdocs/commande/card.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 8ba4620b108..2c5157ff228 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -966,6 +966,8 @@ if (empty($reshook)) } $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); + } else { + $object->fetch_thirdparty(); } unset($_POST['prod_entry_mode']); From 9137713056a504de874ff6a401ad2206efdd87cc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 3 Dec 2020 00:40:41 +0100 Subject: [PATCH 135/297] Debug v13 --- htdocs/salaries/card.php | 29 ++++--- htdocs/salaries/list.php | 6 +- htdocs/user/class/user.class.php | 4 +- htdocs/user/list.php | 138 ++++++++++++++++--------------- 4 files changed, 90 insertions(+), 87 deletions(-) diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php index 487757ad567..7fb8427a517 100644 --- a/htdocs/salaries/card.php +++ b/htdocs/salaries/card.php @@ -1,6 +1,6 @@ - * Copyright (C) 2014 Laurent Destailleur + * Copyright (C) 2014-2020 Laurent Destailleur * Copyright (C) 2015 Jean-François Ferry * Copyright (C) 2015 Charlie BENKE * Copyright (C) 2018 Frédéric France @@ -265,7 +265,7 @@ if ($action == 'create') // Date payment print '
'; print $form->editfieldkey('DatePayment', 'datep', '', $object, 0, 'string', '', 1).''; - print $form->selectDate((empty($datep) ?-1 : $datep), "datep", '', '', '', 'add', 1, 1); + print $form->selectDate((empty($datep) ? '' : $datep), "datep", 0, 0, 0, 'add', 1, 1); print '
'.$langs->trans("Project").''; - $formproject->select_projects(-1, $projectid, 'fk_project', 0, 0, 1, 1); - print '
'.$langs->trans("Project").''; + $formproject->select_projects(-1, $projectid, 'fk_project', 0, 0, 1, 1); + print '
'; + print $form->select_dolusers($search_supervisor, 'search_supervisor', 1, array(), 0, '', 0, 0, 0, 0, '', 0, '', 'maxwidth200'); + print ''; - print $form->select_dolusers($search_supervisor, 'search_supervisor', 1, array(), 0, '', 0, 0, 0, 0, '', 0, '', 'maxwidth200'); - print ''.yn($obj->employee).''; + if ($obj->login2) + { + $user2->id = $obj->id2; + $user2->login = $obj->login2; + $user2->lastname = $obj->lastname2; + $user2->firstname = $obj->firstname2; + $user2->gender = $obj->gender2; + $user2->photo = $obj->photo2; + $user2->admin = $obj->admin2; + $user2->email = $obj->email2; + $user2->socid = $obj->fk_soc2; + $user2->statut = $obj->statut2; + print $user2->getNomUrl(-1, '', 0, 0, 24, 0, '', '', 1); + if (!empty($conf->multicompany->enabled) && $obj->admin2 && !$obj->entity2) + { + print img_picto($langs->trans("SuperAdministrator"), 'redstar', 'class="valignmiddle paddingleft"'); + } elseif ($obj->admin2) + { + print img_picto($langs->trans("Administrator"), 'star', 'class="valignmiddle paddingleft"'); + } + } + print ''.$obj->accountancy_code.''; - if ($obj->login2) - { - $user2->id = $obj->id2; - $user2->login = $obj->login2; - $user2->lastname = $obj->lastname2; - $user2->firstname = $obj->firstname2; - $user2->gender = $obj->gender2; - $user2->photo = $obj->photo2; - $user2->admin = $obj->admin2; - $user2->email = $obj->email2; - $user2->socid = $obj->fk_soc2; - $user2->statut = $obj->statut2; - print $user2->getNomUrl(-1, '', 0, 0, 24, 0, '', '', 1); - if (!empty($conf->multicompany->enabled) && $obj->admin2 && !$obj->entity2) - { - print img_picto($langs->trans("SuperAdministrator"), 'redstar', 'class="valignmiddle paddingleft"'); - } elseif ($obj->admin2) - { - print img_picto($langs->trans("Administrator"), 'star', 'class="valignmiddle paddingleft"'); - } - } - print ''.($obj->salary ? price($obj->salary) : '').''; print ajax_constantonoff("TAKEPOS_NUMPAD_USE_PAYMENT_ICON", array(), $conf->entity, 0, 0, 1, 0); print "
'; -print $langs->trans('TakeposNumpadForcePaymentLabels'); -print ''; -print ajax_constantonoff("TAKEPOS_NUMPAD_FORCE_PAYMENT_ICONS_LABELS", array(), $conf->entity, 0, 0, 1, 0); -print "
'; print $langs->trans('DirectPaymentButton'); From 032116b23511601561fce10f67f797dc543b576b Mon Sep 17 00:00:00 2001 From: lmarcouiller Date: Thu, 3 Dec 2020 10:11:16 +0100 Subject: [PATCH 138/297] changes to not diplay won and lost and add on migration --- .../core/boxes/box_funnel_of_prospection.php | 38 ++++++++----------- .../install/mysql/migration/12.0.0-13.0.0.sql | 3 +- htdocs/langs/en_US/boxes.lang | 1 + 3 files changed, 19 insertions(+), 23 deletions(-) diff --git a/htdocs/core/boxes/box_funnel_of_prospection.php b/htdocs/core/boxes/box_funnel_of_prospection.php index 6e63a80353c..7062509a13b 100644 --- a/htdocs/core/boxes/box_funnel_of_prospection.php +++ b/htdocs/core/boxes/box_funnel_of_prospection.php @@ -33,7 +33,7 @@ class box_funnel_of_prospection extends ModeleBoxes { public $boxcode = "FunnelOfProspection"; public $boximg = "object_projectpub"; - public $boxlabel = "BoxFunnelOfProspection"; + public $boxlabel = "BoxTitleFunnelOfProspection"; public $depends = array("projet"); /** @@ -104,12 +104,6 @@ class box_funnel_of_prospection extends ModeleBoxes case 'NEGO': $colorseriesstat[$objp->rowid] = $badgeStatus4; break; - case 'LOST': - $colorseriesstat[$objp->rowid] = $badgeStatus9; - break; - case 'WON': - $colorseriesstat[$objp->rowid] = $badgeStatus6; - break; default: $colorseriesstat[$objp->rowid] = $badgeStatus2; break; @@ -133,6 +127,7 @@ class box_funnel_of_prospection extends ModeleBoxes $sql .= " WHERE p.entity IN (" . getEntity('project') . ")"; $sql .= " AND p.fk_opp_status = cls.rowid"; $sql .= " AND p.fk_statut = 1"; // Opend projects only + $sql .= " AND cls.code NOT IN ('WON', 'LOST')"; $sql .= " GROUP BY p.fk_opp_status, cls.code"; $resql = $this->db->query($sql); @@ -156,10 +151,8 @@ class box_funnel_of_prospection extends ModeleBoxes $valsamount[$obj->opp_status] = $obj->opp_amount; $totalnb += $obj->nb; if ($obj->opp_status) $totaloppnb += $obj->nb; - if (!in_array($obj->code, array('WON', 'LOST'))) { - $totalamount += $obj->opp_amount; - $ponderated_opp_amount += $obj->ponderated_opp_amount; - } + $totalamount += $obj->opp_amount; + $ponderated_opp_amount += $obj->ponderated_opp_amount; } $i++; } @@ -171,17 +164,18 @@ class box_funnel_of_prospection extends ModeleBoxes $listofstatus = array_keys($listofoppstatus); foreach ($listofstatus as $status) { $labelStatus = ''; + if ($status != 7 && $status != 6) { + $code = dol_getIdFromCode($this->db, $status, 'c_lead_status', 'rowid', 'code'); + if ($code) $labelStatus = $langs->transnoentitiesnoconv("OppStatus" . $code); + if (empty($labelStatus)) $labelStatus = $listofopplabel[$status]; - $code = dol_getIdFromCode($this->db, $status, 'c_lead_status', 'rowid', 'code'); - if ($code) $labelStatus = $langs->transnoentitiesnoconv("OppStatus" . $code); - if (empty($labelStatus)) $labelStatus = $listofopplabel[$status]; - - $dataseries[] = array($labelStatus, (isset($valsamount[$status]) ? (float) $valsamount[$status] : 0)); - if (!$conf->use_javascript_ajax) { - $stringtoprint .= '
' . $labelStatus . '' . price((isset($valsamount[$status]) ? (float) $valsamount[$status] : 0), 0, '', 1, -1, -1, $conf->currency) . '
' . $labelStatus . '' . price((isset($valsamount[$status]) ? (float) $valsamount[$status] : 0), 0, '', 1, -1, -1, $conf->currency) . '
'."\n"; diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php index fc24f1aa02a..a1abc3a9240 100644 --- a/htdocs/core/tpl/contacts.tpl.php +++ b/htdocs/core/tpl/contacts.tpl.php @@ -239,8 +239,8 @@ foreach (array('internal', 'external') as $source) } -$sortfield = GETPOST("sortfield", "alpha"); -$sortorder = GETPOST("sortorder", 'alpha'); +$sortfield = GETPOST("sortfield", "aZ09comma"); +$sortorder = GETPOST("sortorder", 'aZ09comma'); if (!$sortfield) $sortfield = "nature"; if (!$sortorder) $sortorder = "asc"; diff --git a/htdocs/projet/info.php b/htdocs/projet/info.php index ba1b0629365..5b408717f40 100644 --- a/htdocs/projet/info.php +++ b/htdocs/projet/info.php @@ -37,8 +37,8 @@ $socid = GETPOST('socid', 'int'); $action = GETPOST('action', 'aZ09'); $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit; -$sortfield = GETPOST("sortfield", "alpha"); -$sortorder = GETPOST("sortorder", 'alpha'); +$sortfield = GETPOST("sortfield", "aZ09comma"); +$sortorder = GETPOST("sortorder", 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int'); $page = is_numeric($page) ? $page : 0; $page = $page == -1 ? 0 : $page; diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php index 63bb21527e5..586d78ae7b3 100644 --- a/htdocs/projet/list.php +++ b/htdocs/projet/list.php @@ -67,8 +67,8 @@ if (!$user->rights->projet->lire) accessforbidden(); $diroutputmassaction = $conf->projet->dir_output.'/temp/massgeneration/'.$user->id; $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit; -$sortfield = GETPOST("sortfield", "alpha"); -$sortorder = GETPOST("sortorder", 'alpha'); +$sortfield = GETPOST("sortfield", "aZ09comma"); +$sortorder = GETPOST("sortorder", 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int'); $page = is_numeric($page) ? $page : 0; $page = $page == -1 ? 0 : $page; @@ -144,15 +144,7 @@ $fieldstosearchall['s.nom'] = "ThirdPartyName"; $arrayfields = array(); foreach ($object->fields as $key => $val) { // If $val['visible']==0, then we never show the field - if (empty($val['visible'])) { - continue; - } - - $arrayfields['p.'.$key] = array( - 'label'=>$val['label'], - 'checked'=>(($val['visible'] < 0) ? 0 : 1), - 'enabled'=>($val['enabled'] && ($val['visible'] != 3)), - 'position'=>$val['position']); + if (!empty($val['visible'])) $arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>($val['enabled'] && ($val['visible'] != 3)), 'position'=>$val['position']); } // Add none object fields to fields for list @@ -165,8 +157,14 @@ if (is_array($extrafields->attributes[$object->table_element]['label']) && count { foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) { - if (!empty($extrafields->attributes[$object->table_element]['list'][$key])) - $arrayfields["ef.".$key] = array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key])); + if (!empty($extrafields->attributes[$object->table_element]['list'][$key])) { + $arrayfields["ef.".$key] = array( + 'label'=>$extrafields->attributes[$object->table_element]['label'][$key], + 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), + 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], + 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]) + ); + } } } diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php index 726710f52de..135e2f53080 100644 --- a/htdocs/salaries/list.php +++ b/htdocs/salaries/list.php @@ -31,7 +31,42 @@ if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/account // Load translation files required by the page $langs->loadLangs(array("compta", "salaries", "bills", "hrm")); +$action = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ... +$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists) +$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ? +$confirm = GETPOST('confirm', 'alpha'); // Result of a confirmation +$cancel = GETPOST('cancel', 'alpha'); // We click on a Cancel button +$toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list +$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'bomlist'; // 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') + +// Load variable for pagination $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit; +$sortfield = GETPOST('sortfield', 'aZ09comma'); +$sortorder = GETPOST('sortorder', 'aZ09comma'); +$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int'); +if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; } // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action +$offset = $limit * $page; +$pageprev = $page - 1; +$pagenext = $page + 1; +if (!$sortfield) $sortfield = "s.datep,s.rowid"; +if (!$sortorder) $sortorder = "DESC,DESC"; + +// Initialize technical objects +$object = new PaymentSalary($db); +$extrafields = new ExtraFields($db); +$diroutputmassaction = $conf->user->dir_output.'/temp/massgeneration/'.$user->id; +$hookmanager->initHooks(array('salarieslist')); // Note that conf->hooks_modules contains array + +// Fetch optionals attributes and labels +$extrafields->fetch_name_optionals_label($object->table_element); + +$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_'); + +if (!$sortfield) $sortfield = "s.datep,s.rowid"; +if (!$sortorder) $sortorder = "DESC,DESC"; + $search_ref = GETPOST('search_ref', 'int'); $search_user = GETPOST('search_user', 'alpha'); $search_label = GETPOST('search_label', 'alpha'); @@ -40,30 +75,19 @@ $search_date_end = dol_mktime(23, 59, 59, GETPOST('search_date_endmonth', 'int') $search_amount = GETPOST('search_amount', 'alpha'); $search_account = GETPOST('search_account', 'int'); -$sortfield = GETPOST("sortfield", 'alpha'); -$sortorder = GETPOST("sortorder", 'alpha'); -$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : 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; -if (!$sortfield) $sortfield = "s.datep,s.rowid"; -if (!$sortorder) $sortorder = "DESC,DESC"; -$optioncss = GETPOST('optioncss', 'alpha'); - $filtre = GETPOST("filtre", 'restricthtml'); -if (!GETPOST('typeid', 'int')) +if (!GETPOST('search_type_id', 'int')) { $newfiltre = str_replace('filtre=', '', $filtre); $filterarray = explode('-', $newfiltre); foreach ($filterarray as $val) { $part = explode(':', $val); - if ($part[0] == 's.fk_typepayment') $typeid = $part[1]; + if ($part[0] == 's.fk_typepayment') $search_type_id = $part[1]; } } else { - $typeid = GETPOST('typeid', 'int'); + $search_type_id = GETPOST('search_type_id', 'int'); } $childids = $user->getAllChildIds(1); @@ -73,36 +97,92 @@ $socid = GETPOST("socid", "int"); if ($user->socid) $socid = $user->socid; $result = restrictedArea($user, 'salaries', '', '', ''); +// Initialize array of search criterias +$search_all = GETPOST("search_all", 'alpha'); +$search = array(); +foreach ($object->fields as $key => $val) +{ + if (GETPOST('search_'.$key, 'alpha') !== '') $search[$key] = GETPOST('search_'.$key, 'alpha'); +} + +// List of fields to search into when doing a "search in all" +$fieldstosearchall = array(); +foreach ($object->fields as $key => $val) +{ + if ($val['searchall']) $fieldstosearchall['t.'.$key] = $val['label']; +} + +$permissiontoread = $user->rights->salaries->read; +$permissiontoadd = $user->rights->salaries->write; +$permissiontodelete = $user->rights->salaries->delete; /* * Actions */ -if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers -{ - $search_ref = ""; - $search_user = ""; - $search_label = ""; - $search_date_start = ''; - $search_date_end = ''; - $search_amount = ""; - $search_account = ''; - $typeid = ""; -} +if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; } +if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; } +$parameters = array(); +$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); + +if (empty($reshook)) +{ + // Selection of new fields + 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 test are required to be compatible with all browsers + { + $search_ref = ""; + $search_user = ""; + $search_label = ""; + $search_date_start = ''; + $search_date_end = ''; + $search_amount = ""; + $search_account = ''; + $search_type_id = ""; + } + if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha') + || GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha')) + { + $massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation + } + + // Mass actions + $objectclass = 'PaymentSalary'; + $objectlabel = 'SalariesPayments'; + $permissiontoread = $user->rights->salaries->read; + $permissiontodelete = $user->rights->salaries->delete; + $uploaddir = $conf->bom->dir_output; + include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php'; + + // Validate records + if (!$error && $massaction == 'buildsepa' && $permissiontoadd) + { + $objecttmp = new $objectclass($db); + + // TODO + } +} /* * View */ -llxHeader('', $langs->trans("Salaries")); - $form = new Form($db); $salstatic = new PaymentSalary($db); $userstatic = new User($db); $accountstatic = new Account($db); +$now = dol_now(); + +//$help_url="EN:Module_BillOfMaterials|FR:Module_BillOfMaterials_FR|ES:Módulo_BillOfMaterials"; +$help_url = ''; +$title = $langs->trans('SalariesPayments'); + $sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.email, u.admin, u.salary as current_salary, u.fk_soc as fk_soc, u.statut as status,"; $sql .= " s.rowid, s.fk_user, s.amount, s.salary, s.label, s.datep as datep, s.datev as datev, s.fk_typepayment as type, s.num_payment, s.fk_bank,"; $sql .= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel,"; @@ -128,195 +208,304 @@ if ($filtre) { $filtre = str_replace(":", "=", $filtre); $sql .= " AND ".$filtre; } -if ($typeid) { - $sql .= " AND s.fk_typepayment=".$typeid; +if ($search_type_id) { + $sql .= " AND s.fk_typepayment=".$search_type_id; } $sql .= $db->order($sortfield, $sortorder); -//$sql.= " GROUP BY u.rowid, u.lastname, u.firstname, s.rowid, s.fk_user, s.amount, s.label, s.datev, s.fk_typepayment, s.num_payment, pst.code"; -$totalnboflines = 0; -$result = $db->query($sql); -if ($result) +// Count total nb of records +$nbtotalofrecords = ''; +if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) { - $totalnboflines = $db->num_rows($result); + $resql = $db->query($sql); + $nbtotalofrecords = $db->num_rows($resql); + if (($page * $limit) > $nbtotalofrecords) // if total of record found is smaller than page * limit, goto and load page 0 + { + $page = 0; + $offset = 0; + } } -$sql .= $db->plimit($limit + 1, $offset); - - -$result = $db->query($sql); -if ($result) +// if total of record found is smaller than limit, no need to do paging and to restart another select with limits set. +if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit))) { - $num = $db->num_rows($result); - $i = 0; - $total = 0; + $num = $nbtotalofrecords; +} else { + if ($limit) $sql .= $db->plimit($limit + 1, $offset); - $param = ''; - if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage; - if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit; - if ($typeid) $param .= '&typeid='.$typeid; - if ($optioncss != '') $param .= '&optioncss='.$optioncss; + $resql = $db->query($sql); + if (!$resql) + { + dol_print_error($db); + exit; + } - $url = DOL_URL_ROOT.'/salaries/card.php?action=create'; - if (!empty($socid)) $url .= '&socid='.$socid; - $newcardbutton = dolGetButtonTitle($langs->trans('NewSalaryPayment'), '', 'fa fa-plus-circle', $url, '', $user->rights->salaries->write); + $num = $db->num_rows($resql); +} - print ''; - if ($optioncss != '') print ''; - print ''; - print ''; - print ''; - print ''; - print ''; +// Output page +// -------------------------------------------------------------------- - print_barre_liste($langs->trans("SalariesPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'object_payment', 0, $newcardbutton, '', $limit, 0, 0, 1); +llxHeader('', $title, $help_url); - print '
'; - print '
'."\n"; +$arrayofselected = is_array($toselect) ? $toselect : array(); - print ''; - // Ref - print ''; - // Employee +$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_type_id) $param .= '&search_type_id='.urlencode($search_type_id); +if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss); +if ($search_ref) $param .= '&search_ref='.urlencode($search_ref); +if ($search_user > 0) $param .= '&search_user='.urlencode($search_user); +if ($search_label) $param .= '&search_label='.urlencode($search_label); +if ($search_account) $param .= '&search_account='.urlencode($search_account); +if ($search_date_start) $param .= '&search_date_startday='.urlencode(GETPOST('search_date_startday', 'int')).'&search_date_startmonth='.urlencode(GETPOST('search_date_startmonth', 'int')).'&search_date_startyear='.urlencode(GETPOST('search_date_startyear', 'int')); +if ($search_date_end) $param .= '&search_date_endday='.urlencode(GETPOST('search_date_endday', 'int')).'&search_date_endmonth='.urlencode(GETPOST('search_date_endmonth', 'int')).'&search_date_endyear='.urlencode(GETPOST('search_date_endyear', 'int')); +// Add $param from extra fields +include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; + +// List of mass actions available +$arrayofmassactions = array( + //'presend'=>$langs->trans("SendByMail"), + 'buildsepa'=>$langs->trans("BuildSepa"), +); +//if ($permissiontodelete) $arrayofmassactions['predelete'] = ''.$langs->trans("Delete"); +if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array(); +$massactionbutton = $form->selectMassAction('', $arrayofmassactions); + +print ''; +if ($optioncss != '') print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; + +$url = DOL_URL_ROOT.'/salaries/card.php?action=create'; +if (!empty($socid)) $url .= '&socid='.$socid; +$newcardbutton = dolGetButtonTitle($langs->trans('NewSalaryPayment'), '', 'fa fa-plus-circle', $url, '', $user->rights->salaries->write); + +print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $totalnboflines, 'object_payment', 0, $newcardbutton, '', $limit, 0, 0, 1); + +$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; +//$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields +$selectedfields = ''; +$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : ''); + +print '
'; +print '
'; - print ''; - print '
'."\n"; + +// Fields title search +// -------------------------------------------------------------------- +print ''; +// Ref +print ''; +// Employee +print ''; +// Label +print ''; +// Date +print ''; +// Type +print ''; +// Account +if (!empty($conf->banque->enabled)) +{ print ''; - // Label - print ''; - // Date - print ''; +} +// Amount +print ''; + +// Extra fields +include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php'; + +// Fields from hook +$parameters = array('arrayfields'=>$arrayfields); +$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook +print $hookmanager->resPrint; +// Action column +print ''; +print ''."\n"; + + +// Fields title label +// -------------------------------------------------------------------- +print ''; +print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "s.rowid", "", $param, "", $sortfield, $sortorder); +print_liste_field_titre("Employee", $_SERVER["PHP_SELF"], "u.rowid", "", $param, "", $sortfield, $sortorder); +print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "s.label", "", $param, 'class="left"', $sortfield, $sortorder); +print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "s.datep,s.rowid", "", $param, 'align="center"', $sortfield, $sortorder); +print_liste_field_titre("PaymentMode", $_SERVER["PHP_SELF"], "type", "", $param, 'class="left"', $sortfield, $sortorder); +if (!empty($conf->banque->enabled)) print_liste_field_titre("BankAccount", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder); +print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "s.amount", "", $param, 'class="right"', $sortfield, $sortorder); +// Extra fields +include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php'; +// Hook fields +$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder); +$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook +print $hookmanager->resPrint; +// Action column +print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n"; +print ''."\n"; + + +// Detect if we need a fetch on each output line +$needToFetchEachLine = 0; +if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) +{ + foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val) + { + if (preg_match('/\$object/', $val)) $needToFetchEachLine++; // There is at least one compute field that use $object + } +} + +// Loop on record +// -------------------------------------------------------------------- +$i = 0; +$total = 0; +$totalarray = array(); +while ($i < ($limit ? min($num, $limit) : $num)) +{ + $obj = $db->fetch_object($resql); + if (empty($obj)) break; // Should not happen + + // Store properties in $object + $object->setVarsFromFetchObj($obj); + + // Show here line of result + print ''; + + $userstatic->id = $obj->uid; + $userstatic->lastname = $obj->lastname; + $userstatic->firstname = $obj->firstname; + $userstatic->admin = $obj->admin; + $userstatic->login = $obj->login; + $userstatic->email = $obj->email; + $userstatic->socid = $obj->fk_soc; + $userstatic->statut = $obj->status; + + $salstatic->id = $obj->rowid; + $salstatic->ref = $obj->rowid; + + // Ref + print "\n"; + if (!$i) $totalarray['nbfield']++; + + // Employee + print "\n"; + if (!$i) $totalarray['nbfield']++; + + // Label payment + print "\n"; + if (!$i) $totalarray['nbfield']++; + + // Date payment + print '\n"; + if (!$i) $totalarray['nbfield']++; + // Type - print ''; + print ''; + if (!$i) $totalarray['nbfield']++; + // Account if (!empty($conf->banque->enabled)) { - print ''; - } - // Amount - print ''; - - print ''; - - print ''; - print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "s.rowid", "", $param, "", $sortfield, $sortorder); - print_liste_field_titre("Employee", $_SERVER["PHP_SELF"], "u.rowid", "", $param, "", $sortfield, $sortorder); - print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "s.label", "", $param, 'class="left"', $sortfield, $sortorder); - print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "s.datep,s.rowid", "", $param, 'align="center"', $sortfield, $sortorder); - print_liste_field_titre("PaymentMode", $_SERVER["PHP_SELF"], "type", "", $param, 'class="left"', $sortfield, $sortorder); - if (!empty($conf->banque->enabled)) print_liste_field_titre("BankAccount", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder); - print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "s.amount", "", $param, 'class="right"', $sortfield, $sortorder); - print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch '); - print "\n"; - - print "\n"; - - while ($i < min($num, $limit)) - { - $obj = $db->fetch_object($result); - - print ''; - - $userstatic->id = $obj->uid; - $userstatic->lastname = $obj->lastname; - $userstatic->firstname = $obj->firstname; - $userstatic->admin = $obj->admin; - $userstatic->login = $obj->login; - $userstatic->email = $obj->email; - $userstatic->socid = $obj->fk_soc; - $userstatic->statut = $obj->status; - - $salstatic->id = $obj->rowid; - $salstatic->ref = $obj->rowid; - - // Ref - print "\n"; - if (!$i) $totalarray['nbfield']++; - - // Employee - print "\n"; - if (!$i) $totalarray['nbfield']++; - - // Label payment - print "\n"; - if (!$i) $totalarray['nbfield']++; - - // Date payment - print '\n"; - if (!$i) $totalarray['nbfield']++; - - // Type - print ''; - if (!$i) $totalarray['nbfield']++; - - // Account - if (!empty($conf->banque->enabled)) + print ''; - if (!$i) $totalarray['nbfield']++; - } - - // Amount - print ''; + $accountstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1); + } + $accountstatic->label = $obj->blabel; + print $accountstatic->getNomUrl(1); + } else print ' '; + print ''; if (!$i) $totalarray['nbfield']++; - if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalttcfield'; - $totalarray['val']['totalttcfield'] += $obj->amount; - - print ''; - - if (!$i) $totalarray['nbfield']++; - - print "\n"; - - $i++; } - // Show total line - include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php'; + // Amount + print ''; + if (!$i) $totalarray['nbfield']++; + if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalttcfield'; + $totalarray['val']['totalttcfield'] += $obj->amount; - print "
'; +print ''; +print ''; +print ''; +print ''; +print '
'; +print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From')); +print '
'; +print '
'; +print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to')); +print '
'; +print '		'; +$form->select_types_paiements($search_type_id, 'search_type_id', '', 0, 1, 1, 16); +print ''; - print ''; - print ''; - print '
'; - print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From')); - print '
'; - print '
'; - print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to')); - print '
'; + $form->select_comptes($search_account, 'search_account', 0, '', 1); print '		'; +$searchpicto = $form->showFilterButtons(); +print $searchpicto; +print '
".$salstatic->getNomUrl(1)."".$userstatic->getNomUrl(1)."".dol_trunc($obj->label, 40)."'.dol_print_date($db->jdate($obj->datep), 'day')."'; - $form->select_types_paiements($typeid, 'typeid', '', 0, 1, 1, 16); - print ''.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.''; - $form->select_comptes($search_account, 'search_account', 0, '', 1); - print ''; - $searchpicto = $form->showFilterAndCheckAddButtons(0); - print $searchpicto; - print '
".$salstatic->getNomUrl(1)."".$userstatic->getNomUrl(1)."".dol_trunc($obj->label, 40)."'.dol_print_date($db->jdate($obj->datep), 'day')."'.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.''; + if ($obj->fk_bank > 0) { - print ''; - if ($obj->fk_bank > 0) + //$accountstatic->fetch($obj->fk_bank); + $accountstatic->id = $obj->bid; + $accountstatic->ref = $obj->bref; + $accountstatic->number = $obj->bnumber; + + if (!empty($conf->accounting->enabled)) { - //$accountstatic->fetch($obj->fk_bank); - $accountstatic->id = $obj->bid; - $accountstatic->ref = $obj->bref; - $accountstatic->number = $obj->bnumber; + $accountstatic->account_number = $obj->account_number; - if (!empty($conf->accounting->enabled)) - { - $accountstatic->account_number = $obj->account_number; + $accountingjournal = new AccountingJournal($db); + $accountingjournal->fetch($obj->fk_accountancy_journal); - $accountingjournal = new AccountingJournal($db); - $accountingjournal->fetch($obj->fk_accountancy_journal); - - $accountstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1); - } - $accountstatic->label = $obj->blabel; - print $accountstatic->getNomUrl(1); - } else print ' '; - print ''.price($obj->amount).'
'.price($obj->amount).'
"; - print '
'; - print ''; + // Extra fields + include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php'; + // Fields from hook + $parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray); + $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook + print $hookmanager->resPrint; + // Action column + print ''; + if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined + { + $selected = 0; + if (in_array($object->id, $arrayofselected)) $selected = 1; + print ''; + } + print ''; + if (!$i) $totalarray['nbfield']++; - $db->free($result); -} else { - dol_print_error($db); + print ''."\n"; + + $i++; } +// Show total line +include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php'; + + +// If no record found +if ($num == 0) +{ + $colspan = 1; + foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; } + print ''.$langs->trans("NoRecordFound").''; +} + + +$db->free($resql); + +$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql); +$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook +print $hookmanager->resPrint; + +print ''."\n"; +print '
'."\n"; + +print ''."\n"; + + + // End of page llxFooter(); $db->close(); diff --git a/htdocs/ticket/agenda.php b/htdocs/ticket/agenda.php index b14e5b718ba..be68e1f68ee 100644 --- a/htdocs/ticket/agenda.php +++ b/htdocs/ticket/agenda.php @@ -41,8 +41,8 @@ $socid = GETPOST('socid', 'int'); $action = GETPOST('action', 'aZ09'); $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit; -$sortfield = GETPOST("sortfield", "alpha"); -$sortorder = GETPOST("sortorder", 'alpha'); +$sortfield = GETPOST("sortfield", "aZ09comma"); +$sortorder = GETPOST("sortorder", 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int'); $page = is_numeric($page) ? $page : 0; $page = $page == -1 ? 0 : $page; diff --git a/htdocs/ticket/messaging.php b/htdocs/ticket/messaging.php index af6f78fe98c..49f15412965 100644 --- a/htdocs/ticket/messaging.php +++ b/htdocs/ticket/messaging.php @@ -41,8 +41,8 @@ $socid = GETPOST('socid', 'int'); $action = GETPOST('action', 'aZ09'); $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit; -$sortfield = GETPOST("sortfield", "alpha"); -$sortorder = GETPOST("sortorder", 'alpha'); +$sortfield = GETPOST("sortfield", "aZ09comma"); +$sortorder = GETPOST("sortorder", 'aZ09comma'); $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int'); $page = is_numeric($page) ? $page : 0; $page = $page == -1 ? 0 : $page; From 56d5cd040238a04280c465b0417639cc232b43e5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 3 Dec 2020 10:22:17 +0100 Subject: [PATCH 141/297] Fix missing .php into name of boxes added into llx_boxes_def --- ChangeLog | 1 + htdocs/install/mysql/migration/12.0.0-13.0.0.sql | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 637a8a27407..2d0fd358c2b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ NEW: Accountancy - change menu disposition NEW: Accountancy - on transfers, select the periodicity by default NEW: Accountancy - Add export for Gestinum (v3 & v5) NEW: new currency rate editor +NEW: add a widget to show the customers with outstanding limits reached NEW: add 2 rules for emailcollector: Message send/not sent from Dolibarr NEW: add a counter of number of words for pages in website module NEW: add alert before changing thirdparty in TakePOS diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql index 7d3118fe891..4a804e5fe4a 100644 --- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql +++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql @@ -542,4 +542,4 @@ CREATE TABLE llx_session( user_agent varchar(128) NULL )ENGINE=innodb; -INSERT INTO llx_boxes_def(file, entity) VALUES ('box_customers_outstanding_bill_reached', 1); +INSERT INTO llx_boxes_def(file, entity) VALUES ('box_customers_outstanding_bill_reached.php', 1); From e08f6aeb2be50bd115cee54cf0e17687613aa556 Mon Sep 17 00:00:00 2001 From: lmarcouiller Date: Thu, 3 Dec 2020 11:00:29 +0100 Subject: [PATCH 142/297] Fix #15383 --- htdocs/core/boxes/box_funnel_of_prospection.php | 13 +++++++++---- htdocs/install/mysql/migration/12.0.0-13.0.0.sql | 1 - 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/htdocs/core/boxes/box_funnel_of_prospection.php b/htdocs/core/boxes/box_funnel_of_prospection.php index 7062509a13b..fa65e696fa6 100644 --- a/htdocs/core/boxes/box_funnel_of_prospection.php +++ b/htdocs/core/boxes/box_funnel_of_prospection.php @@ -104,6 +104,9 @@ class box_funnel_of_prospection extends ModeleBoxes case 'NEGO': $colorseriesstat[$objp->rowid] = $badgeStatus4; break; + case 'WON': + $colorseriesstat[$objp->rowid] = $badgeStatus6; + break; default: $colorseriesstat[$objp->rowid] = $badgeStatus2; break; @@ -127,7 +130,7 @@ class box_funnel_of_prospection extends ModeleBoxes $sql .= " WHERE p.entity IN (" . getEntity('project') . ")"; $sql .= " AND p.fk_opp_status = cls.rowid"; $sql .= " AND p.fk_statut = 1"; // Opend projects only - $sql .= " AND cls.code NOT IN ('WON', 'LOST')"; + $sql .= " AND cls.code NOT IN ('LOST')"; $sql .= " GROUP BY p.fk_opp_status, cls.code"; $resql = $this->db->query($sql); @@ -151,8 +154,10 @@ class box_funnel_of_prospection extends ModeleBoxes $valsamount[$obj->opp_status] = $obj->opp_amount; $totalnb += $obj->nb; if ($obj->opp_status) $totaloppnb += $obj->nb; - $totalamount += $obj->opp_amount; - $ponderated_opp_amount += $obj->ponderated_opp_amount; + if (!in_array($obj->code, array('WON', 'LOST'))) { + $totalamount += $obj->opp_amount; + $ponderated_opp_amount += $obj->ponderated_opp_amount; + } } $i++; } @@ -164,7 +169,7 @@ class box_funnel_of_prospection extends ModeleBoxes $listofstatus = array_keys($listofoppstatus); foreach ($listofstatus as $status) { $labelStatus = ''; - if ($status != 7 && $status != 6) { + if ($status != 7) { $code = dol_getIdFromCode($this->db, $status, 'c_lead_status', 'rowid', 'code'); if ($code) $labelStatus = $langs->transnoentitiesnoconv("OppStatus" . $code); if (empty($labelStatus)) $labelStatus = $listofopplabel[$status]; diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql index fc8ac7ce102..5865a3e7919 100644 --- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql +++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql @@ -544,7 +544,6 @@ CREATE TABLE llx_session( INSERT INTO llx_boxes_def(file,entity) VALUES ('box_funnel_of_prospection.php',1); -INSERT INTO llx_boxes (box_id, position, box_order, maxline, params) VALUES ((SELECT b.rowid FROM llx_boxes_def as b WHERE file = 'box_funnel_of_prospection.php'), 0, 0, NULL, NULL); INSERT INTO llx_boxes_def(file, entity) VALUES ('box_customers_outstanding_bill_reached.php', 1); From 3d21a00f2ba289bc5d6876c951e5ce79ae873e9d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 3 Dec 2020 11:03:02 +0100 Subject: [PATCH 143/297] Removed not working code --- htdocs/salaries/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php index 135e2f53080..26477900be2 100644 --- a/htdocs/salaries/list.php +++ b/htdocs/salaries/list.php @@ -266,7 +266,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php'; // List of mass actions available $arrayofmassactions = array( //'presend'=>$langs->trans("SendByMail"), - 'buildsepa'=>$langs->trans("BuildSepa"), + //'buildsepa'=>$langs->trans("BuildSepa"), // TODO ); //if ($permissiontodelete) $arrayofmassactions['predelete'] = ''.$langs->trans("Delete"); if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array(); From 28ac9764389ca5e6b68192181dc3367b534d91dd Mon Sep 17 00:00:00 2001 From: lmarcouiller Date: Thu, 3 Dec 2020 11:14:58 +0100 Subject: [PATCH 144/297] Show won on graph --- htdocs/core/boxes/box_funnel_of_prospection.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/core/boxes/box_funnel_of_prospection.php b/htdocs/core/boxes/box_funnel_of_prospection.php index fa65e696fa6..c4cebfcf68a 100644 --- a/htdocs/core/boxes/box_funnel_of_prospection.php +++ b/htdocs/core/boxes/box_funnel_of_prospection.php @@ -174,7 +174,7 @@ class box_funnel_of_prospection extends ModeleBoxes if ($code) $labelStatus = $langs->transnoentitiesnoconv("OppStatus" . $code); if (empty($labelStatus)) $labelStatus = $listofopplabel[$status]; - $dataseries[] = array($labelStatus, (isset($valsamount[$status]) ? (float) $valsamount[$status] : 0)); + $dataseries[] = array($labelStatus,(isset($valsamount[$status]) ? (float) $valsamount[$status] : 0)); if (!$conf->use_javascript_ajax) { $stringtoprint .= ''; $stringtoprint .= '' . $labelStatus . ''; @@ -188,6 +188,7 @@ class box_funnel_of_prospection extends ModeleBoxes $dolgraph = new DolGraph(); $dolgraph->SetData($dataseries); $dolgraph->SetDataColor(array_values($colorseriesstat)); + //$dolgraph->SetLegend(array('PROSP',$dataseries['PROSP'])); $dolgraph->setShowLegend(2); $dolgraph->setShowPercent(1); $dolgraph->SetType(array('pie')); From 748630eb2590588bd853d62d777cd2a6ca13f63e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 3 Dec 2020 11:15:06 +0100 Subject: [PATCH 145/297] FIX Better error message when IMAP connection fails --- htdocs/admin/emailcollector_card.php | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php index fd3361515fb..11f5dcd3bc3 100644 --- a/htdocs/admin/emailcollector_card.php +++ b/htdocs/admin/emailcollector_card.php @@ -223,21 +223,6 @@ $help_url = "EN:Module_EMail_Collector|FR:Module_Collecteur_de_courrier_électro llxHeader('', 'EmailCollector', $help_url); -// Example : Adding jquery code -print ''; - // Part to create if ($action == 'create') { print load_fiche_titre($langs->trans("NewEmailCollector", $langs->transnoentitiesnoconv("EmailCollector"))); From 0fd865d8afb6b64fcfe8f926a2131ffba47c9fb5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 3 Dec 2020 11:16:02 +0100 Subject: [PATCH 146/297] FIX Better error message with IMAP when connection fails --- htdocs/admin/emailcollector_card.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php index 80161eaadc6..b7c7e4abca2 100644 --- a/htdocs/admin/emailcollector_card.php +++ b/htdocs/admin/emailcollector_card.php @@ -448,6 +448,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea if (!$connection) { $morehtml .= 'Failed to open IMAP connection '.$connectstringsource; + $morehtml .= '
'.imap_last_error(); } else { From b324425db815d4a90a7f11c43d7f241a5b39c2e0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 3 Dec 2020 11:19:41 +0100 Subject: [PATCH 147/297] code comment --- htdocs/admin/emailcollector_card.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php index b7c7e4abca2..07cd5be7b78 100644 --- a/htdocs/admin/emailcollector_card.php +++ b/htdocs/admin/emailcollector_card.php @@ -449,6 +449,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea { $morehtml .= 'Failed to open IMAP connection '.$connectstringsource; $morehtml .= '
'.imap_last_error(); + //var_dump(imap_errors()) } else { From 1ec3d4cfdf4699892ad61cb6cfedbe3b82a99492 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 3 Dec 2020 13:19:35 +0100 Subject: [PATCH 148/297] CSS --- htdocs/admin/agenda_other.php | 2 +- htdocs/admin/bank.php | 2 +- htdocs/admin/bom.php | 2 +- htdocs/admin/commande.php | 2 +- htdocs/admin/contract.php | 2 +- htdocs/admin/delivery.php | 2 +- htdocs/admin/expedition.php | 2 +- htdocs/admin/expensereport.php | 2 +- htdocs/admin/facture.php | 2 +- htdocs/admin/fichinter.php | 2 +- htdocs/admin/holiday.php | 2 +- htdocs/admin/mrp.php | 2 +- htdocs/admin/paymentbybanktransfer.php | 2 +- htdocs/admin/prelevement.php | 2 +- htdocs/admin/propal.php | 2 +- htdocs/admin/reception_setup.php | 2 +- htdocs/admin/stock.php | 2 +- htdocs/admin/supplier_invoice.php | 2 +- htdocs/admin/supplier_order.php | 2 +- htdocs/admin/supplier_payment.php | 2 +- htdocs/admin/supplier_proposal.php | 2 +- htdocs/admin/user.php | 2 +- htdocs/admin/usergroup.php | 2 +- htdocs/core/lib/functions.lib.php | 17 +++++++++-------- .../expedition/doc/pdf_espadon.modules.php | 4 ++-- .../expedition/doc/pdf_merou.modules.php | 6 +++--- .../expedition/doc/pdf_rouget.modules.php | 4 ++-- htdocs/modulebuilder/template/admin/setup.php | 2 +- 28 files changed, 40 insertions(+), 39 deletions(-) diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php index 2ffbf15d7ce..c1f77f4995e 100644 --- a/htdocs/admin/agenda_other.php +++ b/htdocs/admin/agenda_other.php @@ -292,7 +292,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) print $form->textwithpicto('', $htmltooltip, 1, 0); print ''; print ''; - print ''.img_object($langs->trans("Preview"), 'order').''; + print ''.img_object($langs->trans("Preview"), 'pdf').''; print ''; print "\n"; diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php index 88babe27385..d21ffdb1630 100644 --- a/htdocs/admin/bank.php +++ b/htdocs/admin/bank.php @@ -391,7 +391,7 @@ foreach ($dirmodels as $reldir) { // Preview print ''; if ($module->type == 'pdf') { - print ''.img_object($langs->trans("Preview"), 'bill').''; + print ''.img_object($langs->trans("Preview"), 'pdf').''; } else { print img_object($langs->trans("PreviewNotAvailable"), 'generic'); } diff --git a/htdocs/admin/bom.php b/htdocs/admin/bom.php index 19ca39c21f3..34c3af89c53 100644 --- a/htdocs/admin/bom.php +++ b/htdocs/admin/bom.php @@ -414,7 +414,7 @@ foreach ($dirmodels as $reldir) print ''; if ($module->type == 'pdf') { - print ''.img_object($langs->trans("Preview"), 'bill').''; + print ''.img_object($langs->trans("Preview"), 'pdf').''; } else { print img_object($langs->trans("PreviewNotAvailable"), 'generic'); } diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index daf015f68eb..25a220e8e2d 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -484,7 +484,7 @@ foreach ($dirmodels as $reldir) print ''; if ($module->type == 'pdf') { - print ''.img_object($langs->trans("Preview"), 'bill').''; + print ''.img_object($langs->trans("Preview"), 'pdf').''; } else { print img_object($langs->trans("PreviewNotAvailable"), 'generic'); } diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php index 517a547cea6..b5e4c0ddf45 100644 --- a/htdocs/admin/contract.php +++ b/htdocs/admin/contract.php @@ -414,7 +414,7 @@ foreach ($dirmodels as $reldir) print ''; if ($module->type == 'pdf') { - print ''.img_object($langs->trans("Preview"), 'contract').''; + print ''.img_object($langs->trans("Preview"), 'pdf').''; } else { print img_object($langs->trans("PreviewNotAvailable"), 'generic'); } diff --git a/htdocs/admin/delivery.php b/htdocs/admin/delivery.php index 3707c395437..b1606268205 100644 --- a/htdocs/admin/delivery.php +++ b/htdocs/admin/delivery.php @@ -398,7 +398,7 @@ foreach ($dirmodels as $reldir) print ''; if ($module->type == 'pdf') { - print ''.img_object($langs->trans("Preview"), 'sending').''; + print ''.img_object($langs->trans("Preview"), 'pdf').''; } else { print img_object($langs->trans("PreviewNotAvailable"), 'generic'); } diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php index 9e65af2d06c..9a09c62b818 100644 --- a/htdocs/admin/expedition.php +++ b/htdocs/admin/expedition.php @@ -415,7 +415,7 @@ foreach ($dirmodels as $reldir) print ''; if ($module->type == 'pdf') { - print 'scandir.'&label='.urlencode($module->name).'">'.img_object($langs->trans("Preview"), 'sending').''; + print 'scandir.'&label='.urlencode($module->name).'">'.img_object($langs->trans("Preview"), 'pdf').''; } else { print img_object($langs->trans("PreviewNotAvailable"), 'generic'); } diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php index 8ffd4ab58c0..a93f5c3c608 100644 --- a/htdocs/admin/expensereport.php +++ b/htdocs/admin/expensereport.php @@ -411,7 +411,7 @@ foreach ($dirmodels as $reldir) print ''; if ($module->type == 'pdf') { - print ''.img_object($langs->trans("Preview"), 'intervention').''; + print ''.img_object($langs->trans("Preview"), 'pdf').''; } else { print img_object($langs->trans("PreviewNotAvailable"), 'generic'); } diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index 7da8044ee07..00dcb7c3180 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -549,7 +549,7 @@ foreach ($dirmodels as $reldir) print ''; if ($module->type == 'pdf') { - print ''.img_object($langs->trans("Preview"), 'bill').''; + print ''.img_object($langs->trans("Preview"), 'pdf').''; } else { print img_object($langs->trans("PreviewNotAvailable"), 'generic'); } diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php index 3d9e23cf61c..e3178d946a0 100644 --- a/htdocs/admin/fichinter.php +++ b/htdocs/admin/fichinter.php @@ -467,7 +467,7 @@ foreach ($dirmodels as $reldir) print ''; if ($module->type == 'pdf') { - print ''.img_object($langs->trans("Preview"), 'intervention').''; + print ''.img_object($langs->trans("Preview"), 'pdf').''; } else { print img_object($langs->trans("PreviewNotAvailable"), 'generic'); } diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php index 9a3845ace5b..eca8319d661 100644 --- a/htdocs/admin/holiday.php +++ b/htdocs/admin/holiday.php @@ -426,7 +426,7 @@ foreach ($dirmodels as $reldir) print ''; if ($module->type == 'pdf') { - print ''.img_object($langs->trans("Preview"), 'contract').''; + print ''.img_object($langs->trans("Preview"), 'pdf').''; } else { print img_object($langs->trans("PreviewNotAvailable"), 'generic'); } diff --git a/htdocs/admin/mrp.php b/htdocs/admin/mrp.php index 36e5eaf1efc..af6210eee1f 100644 --- a/htdocs/admin/mrp.php +++ b/htdocs/admin/mrp.php @@ -415,7 +415,7 @@ foreach ($dirmodels as $reldir) print ''; if ($module->type == 'pdf') { - print ''.img_object($langs->trans("Preview"), 'bill').''; + print ''.img_object($langs->trans("Preview"), 'pdf').''; } else { print img_object($langs->trans("PreviewNotAvailable"), 'generic'); } diff --git a/htdocs/admin/paymentbybanktransfer.php b/htdocs/admin/paymentbybanktransfer.php index 0ea8db95aec..cd0db2a1def 100644 --- a/htdocs/admin/paymentbybanktransfer.php +++ b/htdocs/admin/paymentbybanktransfer.php @@ -340,7 +340,7 @@ foreach ($dirmodels as $reldir) print ''; if ($module->type == 'pdf') { - print ''.img_object($langs->trans("Preview"),'bill').''; + print ''.img_object($langs->trans("Preview"), 'pdf').''; } else { diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php index 97a45c77a42..72e116ab3a7 100644 --- a/htdocs/admin/prelevement.php +++ b/htdocs/admin/prelevement.php @@ -347,7 +347,7 @@ foreach ($dirmodels as $reldir) print ''; if ($module->type == 'pdf') { - print ''.img_object($langs->trans("Preview"),'bill').''; + print ''.img_object($langs->trans("Preview"), 'pdf').''; } else { diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php index e88ed6a4864..78c22e7b397 100644 --- a/htdocs/admin/propal.php +++ b/htdocs/admin/propal.php @@ -444,7 +444,7 @@ foreach ($dirmodels as $reldir) print ''; if ($module->type == 'pdf') { - print ''.img_object($langs->trans("Preview"), 'bill').''; + print ''.img_object($langs->trans("Preview"), 'pdf').''; } else { print img_object($langs->trans("PreviewNotAvailable"), 'generic'); } diff --git a/htdocs/admin/reception_setup.php b/htdocs/admin/reception_setup.php index c095994832d..5da0dd84630 100644 --- a/htdocs/admin/reception_setup.php +++ b/htdocs/admin/reception_setup.php @@ -424,7 +424,7 @@ foreach ($dirmodels as $reldir) print ''; if ($module->type == 'pdf') { - print 'scandir.'&label='.urlencode($module->name).'">'.img_object($langs->trans("Preview"), 'reception').''; + print 'scandir.'&label='.urlencode($module->name).'">'.img_object($langs->trans("Preview"), 'pdf').''; } else { print img_object($langs->trans("PreviewNotAvailable"), 'generic'); } diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php index 134aeb663b4..031b0ef102f 100644 --- a/htdocs/admin/stock.php +++ b/htdocs/admin/stock.php @@ -638,7 +638,7 @@ foreach ($dirmodels as $reldir) print ''; if ($module->type == 'pdf') { - print ''.img_object($langs->trans("Preview"), 'bill').''; + print ''.img_object($langs->trans("Preview"), 'pdf').''; } else { print img_object($langs->trans("PreviewNotAvailable"), 'generic'); } diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php index 384deec0b62..8df357df07e 100644 --- a/htdocs/admin/supplier_invoice.php +++ b/htdocs/admin/supplier_invoice.php @@ -426,7 +426,7 @@ foreach ($dirmodels as $reldir) print $form->textwithpicto('', $htmltooltip, 1, 0); print ''; print ''; - print ''.img_object($langs->trans("Preview"), 'order').''; + print ''.img_object($langs->trans("Preview"), 'pdf').''; print ''; print "\n"; diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php index 0125bb58fdb..e2433c5348b 100644 --- a/htdocs/admin/supplier_order.php +++ b/htdocs/admin/supplier_order.php @@ -439,7 +439,7 @@ foreach ($dirmodels as $reldir) print $form->textwithpicto('', $htmltooltip, 1, 0); print ''; print ''; - print ''.img_object($langs->trans("Preview"), 'order').''; + print ''.img_object($langs->trans("Preview"), 'pdf').''; print ''; print "\n"; diff --git a/htdocs/admin/supplier_payment.php b/htdocs/admin/supplier_payment.php index ab3093a02f7..3408496de31 100644 --- a/htdocs/admin/supplier_payment.php +++ b/htdocs/admin/supplier_payment.php @@ -412,7 +412,7 @@ foreach ($dirmodels as $reldir) print $form->textwithpicto('', $htmltooltip, 1, 0); print ''; print ''; - print ''.img_object($langs->trans("Preview"), 'order').''; + print ''.img_object($langs->trans("Preview"), 'pdf').''; print ''; print "\n"; diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php index 77a78fe0aa8..0855a41cf8f 100644 --- a/htdocs/admin/supplier_proposal.php +++ b/htdocs/admin/supplier_proposal.php @@ -437,7 +437,7 @@ foreach ($dirmodels as $reldir) print ''; if ($module->type == 'pdf') { - print ''.img_object($langs->trans("Preview"), 'bill').''; + print ''.img_object($langs->trans("Preview"), 'pdf').''; } else { print img_object($langs->trans("PreviewNotAvailable"), 'generic'); } diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php index ea39cc1dce9..ea6cdf2b6f8 100644 --- a/htdocs/admin/user.php +++ b/htdocs/admin/user.php @@ -312,7 +312,7 @@ foreach ($dirmodels as $reldir) print ''; if ($module->type == 'pdf') { - print ''.img_object($langs->trans("Preview"), 'contract').''; + print ''.img_object($langs->trans("Preview"), 'pdf').''; } else { print img_object($langs->trans("PreviewNotAvailable"), 'generic'); } diff --git a/htdocs/admin/usergroup.php b/htdocs/admin/usergroup.php index dd12584b276..0725cc83f18 100644 --- a/htdocs/admin/usergroup.php +++ b/htdocs/admin/usergroup.php @@ -241,7 +241,7 @@ foreach ($dirmodels as $reldir) print ''; if ($module->type == 'pdf') { - print ''.img_object($langs->trans("Preview"), 'contract').''; + print ''.img_object($langs->trans("Preview"), 'pdf').''; } else { print img_object($langs->trans("PreviewNotAvailable"), 'generic'); } diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 7523d2f5d77..1143766f451 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3221,14 +3221,15 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ 'object_cash-register', 'object_company', 'object_contact', 'object_contract', 'object_donation', 'object_dynamicprice', 'object_globe', 'object_holiday', 'object_hrm', 'object_invoice', 'object_intervention', 'object_label', 'object_margin', 'object_money-bill-alt', 'object_multicurrency', 'object_order', 'object_payment', - 'object_lot', 'object_mrp', 'object_payment', 'object_product', 'object_propal', - 'object_other', 'object_paragraph', 'object_poll', 'object_printer', 'object_project', 'object_projectpub', 'object_propal', 'object_resource', 'object_rss', 'object_projecttask', + 'object_lot', 'object_mrp', 'object_other', + 'object_payment', 'object_pdf', 'object_product', 'object_propal', + 'object_paragraph', 'object_poll', 'object_printer', 'object_project', 'object_projectpub', 'object_propal', 'object_resource', 'object_rss', 'object_projecttask', 'object_recruitmentjobposition', 'object_recruitmentcandidature', 'object_shipment', 'object_share-alt', 'object_supplier_invoice', 'object_supplier_invoicea', 'object_supplier_invoiced', 'object_supplier_order', 'object_supplier_proposal', 'object_service', 'object_stock', 'object_technic', 'object_ticket', 'object_trip', 'object_user', 'object_group', 'object_member', 'object_phoning', 'object_phoning_mobile', 'object_phoning_fax', 'object_email', 'object_website', 'off', 'on', 'order', - 'paiment', 'play', 'playdisabled', 'previous', 'poll', 'printer', 'product', 'propal', 'projecttask', 'stock', 'resize', 'service', 'stats', 'trip', + 'paiment', 'play', 'pdf', 'playdisabled', 'previous', 'poll', 'printer', 'product', 'propal', 'projecttask', 'stock', 'resize', 'service', 'stats', 'trip', 'setup', 'share-alt', 'sign-out', 'split', 'stripe-s', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'vcard', 'wrench', 'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp', 'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top', 'commercial', 'companies', @@ -3240,18 +3241,18 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ 'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda' ) )) { + $pictowithouttext = str_replace('object_', '', $pictowithouttext); + $fakey = $pictowithouttext; $facolor = ''; $fasize = ''; $fa = 'fas'; - if (in_array($pictowithouttext, array('clock', 'object_generic', 'note', 'off', 'on', 'object_bookmark', 'bookmark', 'vcard'))) { + if (in_array($pictowithouttext, array('clock', 'generic', 'object_generic', 'pdf', 'note', 'off', 'on', 'object_bookmark', 'bookmark', 'vcard'))) { $fa = 'far'; } if (in_array($pictowithouttext, array('black-tie', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'stripe-s', 'youtube', 'google-plus-g', 'whatsapp'))) { $fa = 'fab'; } - $pictowithouttext = str_replace('object_', '', $pictowithouttext); - $arrayconvpictotofa = array( 'account'=>'university', 'accountline'=>'receipt', 'accountancy'=>'money-check-alt', 'action'=>'calendar-alt', 'add'=>'plus-circle', 'address'=> 'address-book', 'bank_account'=>'university', 'bill'=>'file-invoice-dollar', 'billa'=>'file-excel', 'supplier_invoicea'=>'file-excel', 'billd'=>'file-medical', 'supplier_invoiced'=>'file-medical', 'bom'=>'cubes', @@ -3271,10 +3272,10 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ 'intervention'=>'ambulance', 'invoice'=>'file-invoice-dollar', 'multicurrency'=>'dollar-sign', 'order'=>'file-invoice', 'error'=>'exclamation-triangle', 'warning'=>'exclamation-triangle', 'other'=>'square', - 'playdisabled'=>'play', 'poll'=>'check-double', 'preview'=>'binoculars', 'project'=>'sitemap', 'projectpub'=>'sitemap', 'projecttask'=>'tasks', 'propal'=>'file-signature', + 'playdisabled'=>'play', 'pdf'=>'file-pdf', 'poll'=>'check-double', 'preview'=>'binoculars', 'project'=>'sitemap', 'projectpub'=>'sitemap', 'projecttask'=>'tasks', 'propal'=>'file-signature', + 'payment'=>'money-check-alt', 'phoning'=>'phone', 'phoning_mobile'=>'mobile-alt', 'phoning_fax'=>'fax', 'previous'=>'arrow-alt-circle-left', 'printer'=>'print', 'product'=>'cube', 'service'=>'concierge-bell', 'recruitmentjobposition'=>'id-card-alt', 'recruitmentcandidature'=>'id-badge', 'resize'=>'crop', 'supplier_order'=>'dol-order_supplier', 'supplier_proposal'=>'file-signature', - 'payment'=>'money-check-alt', 'phoning'=>'phone', 'phoning_mobile'=>'mobile-alt', 'phoning_fax'=>'fax', 'previous'=>'arrow-alt-circle-left', 'printer'=>'print', 'product'=>'cube', 'service'=>'concierge-bell', 'refresh'=>'redo', 'resource'=>'laptop-house', 'shipment'=>'dolly', 'stock'=>'box-open', 'stats' => 'chart-bar', 'split'=>'code-branch', 'supplier_invoice'=>'file-invoice-dollar', 'technic'=>'cogs', 'ticket'=>'ticket-alt', 'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach', diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php index 5cdeaa693a7..165e83a8e87 100644 --- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php @@ -166,14 +166,14 @@ class pdf_espadon extends ModelePdfExpedition if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1'; // Load traductions files required by page - $outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch")); + $outputlangs->loadLangs(array("main", "bills", "orders", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch")); global $outputlangsbis; $outputlangsbis = null; if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) { $outputlangsbis = new Translate('', $conf); $outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE); - $outputlangsbis->loadLangs(array("main", "bills", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch")); + $outputlangsbis->loadLangs(array("main", "bills", "orders", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch")); } $nblines = count($object->lines); diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php index f530121ec08..bad252bf799 100644 --- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php @@ -453,7 +453,7 @@ class pdf_merou extends ModelePdfExpedition $default_font_size = pdf_getPDFFontSize($outputlangs); // Translations - $langs->loadLangs(array("main", "bills")); + $langs->loadLangs(array("main", "bills", "orders")); if (empty($hidetop)) { @@ -620,12 +620,12 @@ class pdf_merou extends ModelePdfExpedition $pdf->SetFont('', 'B', $default_font_size - 3); $pdf->SetTextColor(0, 0, 0); - $pdf->MultiCell(50, 8, $outputlangs->transnoentities("DateDeliveryPlanned")." : ".dol_print_date($object->date_delivery, 'day', false, $outputlangs, true), '', 'L'); + $pdf->MultiCell(70, 8, $outputlangs->transnoentities("DateDeliveryPlanned")." : ".dol_print_date($object->date_delivery, 'day', false, $outputlangs, true), '', 'L'); $pdf->SetXY($blSocX - 80, $blSocY + 20); $pdf->SetFont('', 'B', $default_font_size - 3); $pdf->SetTextColor(0, 0, 0); - $pdf->MultiCell(50, 8, $outputlangs->transnoentities("TrackingNumber")." : ".$object->tracking_number, '', 'L'); + $pdf->MultiCell(70, 8, $outputlangs->transnoentities("TrackingNumber")." : ".$object->tracking_number, '', 'L'); // Deliverer $pdf->SetXY($blSocX - 80, $blSocY + 23); diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php index a43c6aba352..6698495f983 100644 --- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php @@ -142,8 +142,8 @@ class pdf_rouget extends ModelePdfExpedition // Define position of columns $this->posxdesc = $this->marge_gauche + 1; - $this->posxweightvol = $this->page_largeur - $this->marge_droite - 78; - $this->posxqtyordered = $this->page_largeur - $this->marge_droite - 56; + $this->posxweightvol = $this->page_largeur - $this->marge_droite - 82; + $this->posxqtyordered = $this->page_largeur - $this->marge_droite - 60; $this->posxqtytoship = $this->page_largeur - $this->marge_droite - 28; $this->posxpuht = $this->page_largeur - $this->marge_droite; diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php index c17f4a0095d..420eb13940d 100644 --- a/htdocs/modulebuilder/template/admin/setup.php +++ b/htdocs/modulebuilder/template/admin/setup.php @@ -495,7 +495,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) { print ''; if ($module->type == 'pdf') { - print ''.img_object($langs->trans("Preview"), 'generic').''; + print ''.img_object($langs->trans("Preview"), 'pdf').''; } else { print img_object($langs->trans("PreviewNotAvailable"), 'generic'); } From 068587fcee84f7016418ca4064243758a98010e4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 3 Dec 2020 14:30:07 +0100 Subject: [PATCH 149/297] Update card.php --- htdocs/commande/card.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 2c5157ff228..d9817dc38c3 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -953,7 +953,8 @@ if (empty($reshook)) if ($result > 0) { $ret = $object->fetch($object->id); // Reload to get new records - + $object->fetch_thirdparty(); + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { // Define output language $outputlangs = $langs; @@ -966,8 +967,6 @@ if (empty($reshook)) } $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref); - } else { - $object->fetch_thirdparty(); } unset($_POST['prod_entry_mode']); From 1f58b49aea03418c9e3bcd65db5a613a300a0ca9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 3 Dec 2020 14:31:39 +0100 Subject: [PATCH 150/297] No xml inside HTML --- htdocs/takepos/pay.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php index ab621a964b5..0d80eeffbc0 100644 --- a/htdocs/takepos/pay.php +++ b/htdocs/takepos/pay.php @@ -297,7 +297,7 @@ print ''; + print ''; } else { print ''; } @@ -320,7 +320,7 @@ print ''; + print ''; } else { $button = array_pop($action_buttons); print ''; @@ -344,7 +344,7 @@ print ''; + print ''; } else { $button = array_pop($action_buttons); print ''; From 5bd6d6f388c6cbfaa84500bdf33df99f271cca53 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 3 Dec 2020 14:34:15 +0100 Subject: [PATCH 151/297] Look and feel v13 --- htdocs/comm/action/card.php | 4 ++-- htdocs/comm/action/index.php | 6 +++--- htdocs/compta/bank/card.php | 4 ++-- htdocs/core/class/extrafields.class.php | 4 ++-- htdocs/core/class/html.form.class.php | 8 ++++++-- htdocs/core/lib/functions.lib.php | 2 +- htdocs/margin/customerMargins.php | 2 +- htdocs/margin/productMargins.php | 2 +- htdocs/product/card.php | 4 ++-- htdocs/product/stock/card.php | 4 ++-- htdocs/theme/eldy/global.inc.php | 2 ++ htdocs/website/index.php | 2 +- 12 files changed, 25 insertions(+), 19 deletions(-) diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 1a61a4a0c82..f26ad2a36e2 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -1104,7 +1104,7 @@ if ($action == 'create') // Categories print ''.$langs->trans("Categories").''; $cate_arbo = $form->select_all_categories(Categorie::TYPE_ACTIONCOMM, '', 'parent', 64, 0, 1); - print $form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, 'minwidth300 quatrevingtpercent', 0, 0); + print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, 'minwidth300 quatrevingtpercent widthcentpercentminusx', 0, 0); print ""; } @@ -1578,7 +1578,7 @@ if ($id > 0) foreach ($cats as $cat) { $arrayselected[] = $cat->id; } - print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%'); + print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0); print ""; } diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index f540a8d6e4e..83b3c0514aa 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -1492,19 +1492,19 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa if ($nonew <= 0) { - print '
'; + print '
'; print ''; if ($showinfo) print dol_print_date($curtime, 'daytextshort'); else print dol_print_date($curtime, '%d'); print ''; - print '
'; + print '
'; if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create) { print ''; // Explicit link, usefull for nojs interfaces print img_picto($langs->trans("NewAction"), 'edit_add.png'); print ''; } - print '
'."\n"; + print '
'."\n"; } if ($nonew < 0) diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php index 813e0baa1b7..30e483fdfa9 100644 --- a/htdocs/compta/bank/card.php +++ b/htdocs/compta/bank/card.php @@ -407,7 +407,7 @@ if ($action == 'create') $arrayselected[] = $cat->id; } } - print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%'); + print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0); print ""; } @@ -904,7 +904,7 @@ if ($action == 'create') $arrayselected[] = $cat->id; } } - print $form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, '', 0, '100%'); + print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0); print ""; } diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 87cee951170..d041aba45f4 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -1937,10 +1937,10 @@ class ExtraFields $out .= ''; } diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php index 26d540e4093..c304a00ce3f 100644 --- a/htdocs/stripe/admin/stripe.php +++ b/htdocs/stripe/admin/stripe.php @@ -169,6 +169,7 @@ print ''.$langs->trans("StripeDesc")."
\n" print '
'; +print '
'; print ''; print ''; print ''; @@ -177,7 +178,7 @@ print ''; print "\n"; print ''; -print '
'.$langs->trans("AccountParameter").'
'; +print ''; print $langs->trans("StripeLiveEnabled").''; if ($conf->use_javascript_ajax) { print ajax_constantonoff('STRIPE_LIVE'); @@ -209,9 +210,9 @@ if (empty($conf->stripeconnect->enabled)) } print ''; print '   '.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx'; - $out = img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForTestWebhook").' '; + $out = img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForTestWebhook").' '; $url = dol_buildpath('/public/stripe/ipn.php?test', 3); - $out .= ''; + $out .= ''; $out .= ajax_autoselect("onlinetestwebhookurl", 0); print '
'.$out; print '		'; @@ -278,9 +279,9 @@ if (empty($conf->stripeconnect->enabled)) } print ''; print '   '.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx'; - $out = img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForLiveWebhook").' '; + $out = img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForLiveWebhook").' '; $url = dol_buildpath('/public/stripe/ipn.php', 3); - $out .= ''; + $out .= ''; $out .= ajax_autoselect("onlinelivewebhookurl", 0); print '
'.$out; print '		'; @@ -321,13 +322,15 @@ if (empty($conf->stripeconnect->enabled)) print '
'; +print '
'; print '
'; +print '
'; print ''; print ''; -print ''; +print ''; print ''; print "\n"; @@ -339,11 +342,12 @@ print ''; print ''; print ''; @@ -437,6 +441,19 @@ print ''.$langs->trans("Example").': myemail@myserver.com, Payment service <myemail2@myserver2.com>'; print ''; +print '
'.$langs->trans("UsageParameter").''.$langs->trans("UsageParameter").''.$langs->trans("Value").'
'; print $langs->trans("StripeUserAccountForActions").''; -print $form->select_dolusers($conf->global->STRIPE_USER_ACCOUNT_FOR_ACTIONS, 'STRIPE_USER_ACCOUNT_FOR_ACTIONS', 0); +print img_picto('', 'user').$form->select_dolusers($conf->global->STRIPE_USER_ACCOUNT_FOR_ACTIONS, 'STRIPE_USER_ACCOUNT_FOR_ACTIONS', 0); print '
'; print $langs->trans("BankAccount").''; +print img_picto('', 'bank_account').' '; $form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS, 'STRIPE_BANK_ACCOUNT_FOR_PAYMENTS', 0, '', 1); print '
'; +print '
'; + +print '
'; + +print '
'; +print ''; + +print ''; +print ''; +print ''; +print "\n"; + // Payment token for URL print ''; print '
'.$langs->trans("UrlGenerationParameters").''.$langs->trans("Value").'
'; print $langs->trans("SecurityToken").''; @@ -461,6 +478,7 @@ if ($conf->use_javascript_ajax) { print '
'; +print '
'; print dol_get_fiche_end(); @@ -481,12 +499,14 @@ if (!empty($conf->use_javascript_ajax)) { print "\n".''; } From 4f826fae2641398d12fffea32570bea9634c7ff7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 7 Dec 2020 12:15:59 +0100 Subject: [PATCH 265/297] Fix warnings --- htdocs/core/modules/modExpedition.class.php | 4 +-- htdocs/core/modules/modPropale.class.php | 4 +-- htdocs/exports/class/export.class.php | 34 ++++++++++++--------- test/phpunit/AllTests.php | 8 ++--- test/phpunit/ExportTest.php | 4 +-- test/phpunit/ImportTest.php | 2 +- test/phpunit/ScriptsTest.php | 14 ++++++++- 7 files changed, 43 insertions(+), 27 deletions(-) diff --git a/htdocs/core/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php index 8d11989f02a..54fecd1a5af 100644 --- a/htdocs/core/modules/modExpedition.class.php +++ b/htdocs/core/modules/modExpedition.class.php @@ -291,7 +291,7 @@ class modExpedition extends DolibarrModules $this->export_sql_end[$r] = ' FROM '.MAIN_DB_PREFIX.'expedition as c'; $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'expedition_extrafields as extra ON c.rowid = extra.fk_object,'; $this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'societe as s'; - if (!$user->rights->societe->client->voir) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid'; + if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid'; $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid'; $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,'; $this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'expeditiondet as ed'; @@ -306,7 +306,7 @@ class modExpedition extends DolibarrModules } $this->export_sql_end[$r] .= ' WHERE c.fk_soc = s.rowid AND c.rowid = ed.fk_expedition AND ed.fk_origin_line = cd.rowid'; $this->export_sql_end[$r] .= ' AND c.entity IN ('.getEntity('expedition').')'; - if (!$user->rights->societe->client->voir) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id; + if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id; } diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php index f06496e781a..f1de32bd1a9 100644 --- a/htdocs/core/modules/modPropale.class.php +++ b/htdocs/core/modules/modPropale.class.php @@ -241,7 +241,7 @@ class modPropale extends DolibarrModules $this->export_sql_end[$r] = ' FROM '.MAIN_DB_PREFIX.'societe as s '; $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra4 ON s.rowid = extra4.fk_object'; - if (!$user->rights->societe->client->voir) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid'; + if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid'; $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,'; $this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'propal as c'; $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pj ON c.fk_projet = pj.rowid'; @@ -254,7 +254,7 @@ class modPropale extends DolibarrModules $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra3 on p.rowid = extra3.fk_object'; $this->export_sql_end[$r] .= ' WHERE c.fk_soc = s.rowid AND c.rowid = cd.fk_propal'; $this->export_sql_end[$r] .= ' AND c.entity IN ('.getEntity('propal').')'; - if (!$user->rights->societe->client->voir) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id; + if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id; // Imports //-------- diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php index cf63b85879c..3ecece7e886 100644 --- a/htdocs/exports/class/export.class.php +++ b/htdocs/exports/class/export.class.php @@ -35,6 +35,8 @@ class Export */ public $db; + public $error; + public $array_export_code = array(); // Tableau de "idmodule_numlot" public $array_export_module = array(); // Tableau de "nom de modules" public $array_export_label = array(); // Tableau de "libelle de lots" @@ -139,11 +141,10 @@ class Export { $perm = $val; //print_r("$perm[0]-$perm[1]-$perm[2]
"); - if (!empty($perm[2])) - { - $bool = $user->rights->{$perm[0]}->{$perm[1]}->{$perm[2]}; + if (!empty($perm[2])) { + $bool = isset($user->rights->{$perm[0]}->{$perm[1]}->{$perm[2]}) ? $user->rights->{$perm[0]}->{$perm[1]}->{$perm[2]} : false; } else { - $bool = $user->rights->{$perm[0]}->{$perm[1]}; + $bool = isset($user->rights->{$perm[0]}->{$perm[1]}) ? $user->rights->{$perm[0]}->{$perm[1]} : false; } if ($perm[0] == 'user' && $user->admin) $bool = true; if (!$bool) break; @@ -185,14 +186,14 @@ class Export // Tableau des operations speciales sur champ $this->array_export_special[$i] = (!empty($module->export_special_array[$r]) ? $module->export_special_array[$r] : ''); // Array of examples - $this->array_export_examplevalues[$i] = $module->export_examplevalues_array[$r]; + $this->array_export_examplevalues[$i] = (!empty($module->export_examplevalues_array[$r]) ? $module->export_examplevalues_array[$r] : null); // Array of help tooltips $this->array_export_help[$i] = (!empty($module->export_help_array[$r]) ? $module->export_help_array[$r] : ''); // Requete sql du dataset $this->array_export_sql_start[$i] = $module->export_sql_start[$r]; $this->array_export_sql_end[$i] = $module->export_sql_end[$r]; - $this->array_export_sql_order[$i] = $module->export_sql_order[$r]; + $this->array_export_sql_order[$i] = (!empty($module->export_sql_order[$r]) ? $module->export_sql_order[$r] : null); //$this->array_export_sql[$i]=$module->export_sql[$r]; dol_syslog(get_class($this)."::load_arrays loaded for module ".$modulename." with index ".$i.", dataset=".$module->export_code[$r].", nb of fields=".(!empty($module->export_fields_code[$r]) ?count($module->export_fields_code[$r]) : '')); @@ -580,9 +581,12 @@ class Export if ($resql) { //$this->array_export_label[$indice] - if ($conf->global->EXPORT_PREFIX_SPEC) + if (!empty($conf->global->EXPORT_PREFIX_SPEC)) { $filename = $conf->global->EXPORT_PREFIX_SPEC."_".$datatoexport; - else $filename = "export_".$datatoexport; + } + else { + $filename = "export_".$datatoexport; + } $filename .= '.'.$objmodel->getDriverExtension(); $dirname = $conf->export->dir_temp.'/'.$user->id; @@ -598,7 +602,7 @@ class Export $objmodel->write_header($outputlangs); // Genere ligne de titre - $objmodel->write_title($this->array_export_fields[$indice], $array_selected, $outputlangs, $this->array_export_TypeFields[$indice]); + $objmodel->write_title($this->array_export_fields[$indice], $array_selected, $outputlangs, isset($this->array_export_TypeFields[$indice]) ? $this->array_export_TypeFields[$indice] : null); while ($obj = $this->db->fetch_object($resql)) { @@ -651,18 +655,20 @@ class Export } $obj->$alias = $remaintopay; } else { - // TODO FIXME Export of compute field does not work. $obj containt $obj->alias_field and formulat will contains $obj->field + // TODO FIXME + // Export of compute field does not work. $obj contains $obj->alias_field and formula may contains $obj->field + // Also the formula may contains objects of class that are not loaded. $computestring = $this->array_export_special[$indice][$key]; - $tmp = dol_eval($computestring, 1, 0); - $obj->$alias = $tmp; + //$tmp = dol_eval($computestring, 1, 0); + //$obj->$alias = $tmp; - $this->error = "ERROPNOTSUPPORTED. Operation ".$this->array_export_special[$indice][$key]." not supported. Export of 'computed' extrafields is not yet supported, please remove field."; + $this->error = "ERROPNOTSUPPORTED. Operation ".$computestring." not supported. Export of 'computed' extrafields is not yet supported, please remove field."; return -1; } } } // end of special operation processing - $objmodel->write_record($array_selected, $obj, $outputlangs, $this->array_export_TypeFields[$indice]); + $objmodel->write_record($array_selected, $obj, $outputlangs, isset($this->array_export_TypeFields[$indice]) ? $this->array_export_TypeFields[$indice] : null); } // Genere en-tete diff --git a/test/phpunit/AllTests.php b/test/phpunit/AllTests.php index 0d195560d1c..163bf320075 100644 --- a/test/phpunit/AllTests.php +++ b/test/phpunit/AllTests.php @@ -242,11 +242,6 @@ class AllTests require_once dirname(__FILE__).'/ScriptsTest.php'; $suite->addTestSuite('ScriptsTest'); - require_once dirname(__FILE__).'/FormAdminTest.php'; - $suite->addTestSuite('FormAdminTest'); - require_once dirname(__FILE__).'/FormTest.php'; - $suite->addTestSuite('FormTest'); - require_once dirname(__FILE__).'/ModulesTest.php'; // At end because it's the longer $suite->addTestSuite('ModulesTest'); @@ -254,8 +249,11 @@ class AllTests // GUI require_once dirname(__FILE__).'/FormAdminTest.php'; $suite->addTestSuite('FormAdminTest'); + require_once dirname(__FILE__).'/FormTest.php'; + $suite->addTestSuite('FormTest'); + // Payment services require_once dirname(__FILE__).'/PaypalTest.php'; $suite->addTestSuite('PaypalTest'); require_once dirname(__FILE__).'/StripeTest.php'; diff --git a/test/phpunit/ExportTest.php b/test/phpunit/ExportTest.php index 2a3cb079baf..0f5b0bd82e3 100644 --- a/test/phpunit/ExportTest.php +++ b/test/phpunit/ExportTest.php @@ -149,7 +149,7 @@ class ExportTest extends PHPUnit\Framework\TestCase $file = "export_".$model.".modules.php"; $classname = "Export".$model; require_once $dir.$file; - $objmodel = new $classname($this->db); + $objmodel = new $classname($db); // First test without option USE_STRICT_CSV_RULES unset($conf->global->USE_STRICT_CSV_RULES); @@ -364,7 +364,7 @@ class ExportTest extends PHPUnit\Framework\TestCase $sql = ""; $result=$objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql); $expectedresult = 1; - $this->assertEquals($expectedresult, $result, "Call build_file() to export ".$exportfile.' failed'); + $this->assertEquals($expectedresult, $result, "Call build_file() to export ".$exportfile.' failed: '.$objexport->error); $result=dol_is_file($exportfile); $this->assertTrue($result, 'File '.$exportfile.' not found'); } diff --git a/test/phpunit/ImportTest.php b/test/phpunit/ImportTest.php index ce689fda4a4..e9bf019740c 100644 --- a/test/phpunit/ImportTest.php +++ b/test/phpunit/ImportTest.php @@ -140,7 +140,7 @@ class ImportTest extends PHPUnit\Framework\TestCase // TODO // Run import on file and check the record with field "auto" are filled // according to option - + $this->assertEquals(0, 0); return true; } diff --git a/test/phpunit/ScriptsTest.php b/test/phpunit/ScriptsTest.php index 16884214418..82d1ee28e39 100644 --- a/test/phpunit/ScriptsTest.php +++ b/test/phpunit/ScriptsTest.php @@ -68,7 +68,7 @@ class ScriptsTest extends PHPUnit\Framework\TestCase * Constructor * We save global variables into local variables * - * @return SecurityTest + * @return ScriptsTest */ public function __construct() { @@ -152,6 +152,10 @@ class ScriptsTest extends PHPUnit\Framework\TestCase $db=$this->savdb; $script=dirname(__FILE__).'/../../scripts/bank/export-bank-receipts.php BANKDUMMY RECEIPTDUMMY excel2007 lang=fr_FR'; + + $returnvar = 0; + $output = array(); + $result=exec($script, $output, $returnvar); print __METHOD__." result=".$result."\n"; @@ -187,6 +191,8 @@ class ScriptsTest extends PHPUnit\Framework\TestCase $this->assertEquals($result,'Failed to find bank account with ref BANKDUMMY.'); $this->assertEquals($returnvar,255); */ + $this->assertEquals(0, 0); + return ''; } @@ -204,6 +210,9 @@ class ScriptsTest extends PHPUnit\Framework\TestCase $langs=$this->savlangs; $db=$this->savdb; + $returnvar = 0; + $output = array(); + $script=dirname(__FILE__).'/../../scripts/contracts/email_expire_services_to_customers.php test thirdparties'; $result=exec($script, $output, $returnvar); print __METHOD__." result=".$result."\n"; @@ -242,6 +251,9 @@ class ScriptsTest extends PHPUnit\Framework\TestCase $langs=$this->savlangs; $db=$this->savdb; + $returnvar = 0; + $output = array(); + $script=dirname(__FILE__).'/../../scripts/invoices/email_unpaid_invoices_to_customers.php test thirdparties'; $result=exec($script, $output, $returnvar); print __METHOD__." result=".$result."\n"; From ca2ce88bd2c0446a3025580121c5d5bf975b856a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 7 Dec 2020 13:29:56 +0100 Subject: [PATCH 266/297] Fix warning --- .../core/triggers/interface_50_modTicket_TicketEmail.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php index 3743d044e44..f6157c38edc 100644 --- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php +++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php @@ -132,8 +132,9 @@ class InterfaceTicketEmail extends DolibarrTriggers $langs->load('ticket'); // Send email to notification email - $sendto = $conf->global->TICKET_NOTIFICATION_EMAIL_TO; if (!empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO) && empty($object->context['disableticketemail'])) { + $sendto = empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO) ? '' : $conf->global->TICKET_NOTIFICATION_EMAIL_TO; + if ($sendto) { // Init to avoid errors $filepath = array(); From f21fc43e7efd730bca9d31e17371b1313a129759 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 7 Dec 2020 14:25:49 +0100 Subject: [PATCH 267/297] Fix label of field --- htdocs/core/menus/standard/eldy.lib.php | 3 +- htdocs/user/card.php | 70 ++++++++++++------------- 2 files changed, 36 insertions(+), 37 deletions(-) diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index b103a309f59..c9a3ba48dab 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -360,10 +360,11 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout = // HRM $tmpentry = array( - 'enabled'=>(!empty($conf->hrm->enabled) || !empty($conf->holiday->enabled) || !empty($conf->deplacement->enabled) || !empty($conf->expensereport->enabled) || !empty($conf->recruitment->enabled)), + 'enabled'=>(!empty($conf->hrm->enabled) || (!empty($conf->holiday->enabled)) || !empty($conf->deplacement->enabled) || !empty($conf->expensereport->enabled) || !empty($conf->recruitment->enabled)), 'perms'=>(!empty($user->rights->hrm->employee->read) || !empty($user->rights->holiday->write) || !empty($user->rights->deplacement->lire) || !empty($user->rights->expensereport->lire) || !empty($user->rights->recruitment->recruitmentjobposition->read)), 'module'=>'hrm|holiday|deplacement|expensereport|recruitment' ); + $menu_arr[] = array( 'name' => 'HRM', 'link' => '/hrm/index.php?mainmenu=hrm&leftmenu=', diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 8934d8d87ec..9d676c9423f 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -930,12 +930,6 @@ if ($action == 'create' || $action == 'adduserldap') print "\n"; } - // Type - print ''.$langs->trans("Type").''; - print ''; - print $form->textwithpicto($langs->trans("Internal"), $langs->trans("InternalExternalDesc"), 1, 'help', '', 0, 2); - print ''; - // Gender print ''.$langs->trans("Gender").''; print ''; @@ -983,6 +977,11 @@ if ($action == 'create' || $action == 'adduserldap') print "\n"; } + // External user + print ''.$langs->trans("ExternalUser").' ?'; + print ''; + print $form->textwithpicto($langs->trans("Internal"), $langs->trans("InternalExternalDesc"), 1, 'help', '', 0, 2); + print ''; print '
'; @@ -2196,36 +2195,6 @@ if ($action == 'create' || $action == 'adduserldap') print ''; } - // Type - print ''; - print ''; - // Gender print ''; print '\n"; } + // External user ? + print ''; + print ''; print '
'.$langs->trans("Type").''; - if ($user->id == $object->id || !$user->admin) - { - // Read mode - $type = $langs->trans("Internal"); - if ($object->socid) $type = $langs->trans("External"); - print $form->textwithpicto($type, $langs->trans("InternalExternalDesc")); - if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')'; - } else { - // Select mode - $type = 0; - if ($object->contact_id) $type = $object->contact_id; - - if ($object->socid > 0 && !($object->contact_id > 0)) { // external user but no link to a contact - print img_picto('', 'company').$form->select_company($object->socid, 'socid', '', ' '); - print img_picto('', 'contact').$form->selectcontacts(0, 0, 'contactid', 1, '', '', 1, '', false, 1); - if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')'; - } elseif ($object->socid > 0 && $object->contact_id > 0) { // external user with a link to a contact - print img_picto('', 'company').$form->select_company(0, 'socid', '', ' '); // We keep thirdparty empty, contact is already set - print img_picto('', 'contact').$form->selectcontacts(0, $object->contact_id, 'contactid', 1, '', '', 1, '', false, 1); - if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')'; - } else { // $object->socid is not > 0 here - print img_picto('', 'company').$form->select_company(0, 'socid', '', ' '); // We keep thirdparty empty, contact is already set - print img_picto('', 'contact').$form->selectcontacts(0, 0, 'contactid', 1, '', '', 1, '', false, 1); - } - } - print '
'.$langs->trans("Gender").''; @@ -2306,6 +2275,35 @@ if ($action == 'create' || $action == 'adduserldap') print "
'.$langs->trans("ExternalUser").' ?'; + if ($user->id == $object->id || !$user->admin) + { + // Read mode + $type = $langs->trans("Internal"); + if ($object->socid) $type = $langs->trans("External"); + print $form->textwithpicto($type, $langs->trans("InternalExternalDesc")); + if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')'; + } else { + // Select mode + $type = 0; + if ($object->contact_id) $type = $object->contact_id; + + if ($object->socid > 0 && !($object->contact_id > 0)) { // external user but no link to a contact + print img_picto('', 'company').$form->select_company($object->socid, 'socid', '', ' '); + print img_picto('', 'contact').$form->selectcontacts(0, 0, 'contactid', 1, '', '', 1, '', false, 1); + if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')'; + } elseif ($object->socid > 0 && $object->contact_id > 0) { // external user with a link to a contact + print img_picto('', 'company').$form->select_company(0, 'socid', '', ' '); // We keep thirdparty empty, contact is already set + print img_picto('', 'contact').$form->selectcontacts(0, $object->contact_id, 'contactid', 1, '', '', 1, '', false, 1); + if ($object->ldap_sid) print ' ('.$langs->trans("DomainUser").')'; + } else { // $object->socid is not > 0 here + print img_picto('', 'company').$form->select_company(0, 'socid', '', ' '); // We keep thirdparty empty, contact is already set + print img_picto('', 'contact').$form->selectcontacts(0, 0, 'contactid', 1, '', '', 1, '', false, 1); + } + } + print '
'; From 2457d07d1a327edfdd8c645968d8effb306f7d05 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 7 Dec 2020 14:29:51 +0100 Subject: [PATCH 268/297] Fix permission on creation of leave requests --- htdocs/holiday/card.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php index 11d3c70c4a8..3de5c2a5e19 100644 --- a/htdocs/holiday/card.php +++ b/htdocs/holiday/card.php @@ -148,11 +148,11 @@ if (empty($reshook)) $description = trim(GETPOST('description', 'restricthtml')); // Check that leave is for a user inside the hierarchy or advanced permission for all is set - if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->expensereport->creer)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->expensereport->writeall_advance))) { + if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->holiday->create)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->holiday->writeall_advance))) { $error++; setEventMessages($langs->trans("NotEnoughPermission"), null, 'errors'); } else { - if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)) { + if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->holiday->writeall_advance)) { if (!in_array($fuserid, $childids)) { $error++; setEventMessages($langs->trans("UserNotInHierachy"), null, 'errors'); From 936699786a208dd3d9d2ae5d1d8cc973ce454644 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 7 Dec 2020 14:44:20 +0100 Subject: [PATCH 269/297] Fix translation --- htdocs/holiday/card.php | 2 +- htdocs/hrm/index.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php index 3de5c2a5e19..3899990b425 100644 --- a/htdocs/holiday/card.php +++ b/htdocs/holiday/card.php @@ -973,7 +973,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') $nb_type = $object->getCPforUser($user->id, $val['rowid']); $nb_holiday += $nb_type; - $out .= ' - '.($langs->trans($val['code']) != $val['code'] ? $langs->trans($val['code']) : $val['label']).': '.($nb_type ?price2num($nb_type) : 0).'
'; + $out .= ' - '.($langs->trans($val['code']) != $val['code'] ? $langs->trans($val['code']) : $val['label']).': '.($nb_type ? price2num($nb_type) : 0).'
'; //$out .= ' - '.$val['label'].': '.($nb_type ?price2num($nb_type) : 0).'
'; } print $langs->trans('SoldeCPUser', round($nb_holiday, 5)).'
'; diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php index 3ec2a3b898f..f0bbb442acc 100644 --- a/htdocs/hrm/index.php +++ b/htdocs/hrm/index.php @@ -153,7 +153,7 @@ if (!empty($conf->holiday->enabled)) { $nb_type = $holiday->getCPforUser($user->id, $val['rowid']); $nb_holiday += $nb_type; - $out .= ' - '.$val['label'].': '.($nb_type ?price2num($nb_type) : 0).'
'; + $out .= ' - '.($langs->trans($val['code']) != $val['code'] ? $langs->trans($val['code']) : $val['label']).': '.($nb_type ? price2num($nb_type) : 0).'
'; } print $langs->trans('SoldeCPUser', round($nb_holiday, 5)).'
'; print $out; From e18035c0fc2541e43a51a596b1a4697346a1eadc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 7 Dec 2020 14:46:33 +0100 Subject: [PATCH 270/297] Fix bad permission on module holiday --- htdocs/holiday/card.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php index 3899990b425..500d678d357 100644 --- a/htdocs/holiday/card.php +++ b/htdocs/holiday/card.php @@ -148,7 +148,7 @@ if (empty($reshook)) $description = trim(GETPOST('description', 'restricthtml')); // Check that leave is for a user inside the hierarchy or advanced permission for all is set - if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->holiday->create)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->holiday->writeall_advance))) { + if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->holiday->write)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->holiday->writeall_advance))) { $error++; setEventMessages($langs->trans("NotEnoughPermission"), null, 'errors'); } else { @@ -962,8 +962,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') print ''."\n"; print ''."\n"; - if (empty($conf->global->HOLIDAY_HIDE_BALANCE)) - { + if (empty($conf->global->HOLIDAY_HIDE_BALANCE)) { print dol_get_fiche_head('', '', '', -1); $out = ''; @@ -980,8 +979,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') print $out; print dol_get_fiche_end(); - } elseif (!is_numeric($conf->global->HOLIDAY_HIDE_BALANCE)) - { + } elseif (!is_numeric($conf->global->HOLIDAY_HIDE_BALANCE)) { print $langs->trans($conf->global->HOLIDAY_HIDE_BALANCE).'
'; } From cc44ce7dddf31627c9ef52191799ff8f8f85df62 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 7 Dec 2020 15:35:38 +0100 Subject: [PATCH 271/297] Fix warning --- .../core/triggers/interface_50_modTicket_TicketEmail.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php index f6157c38edc..7bb8988e18e 100644 --- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php +++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php @@ -247,7 +247,7 @@ class InterfaceTicketEmail extends DolibarrTriggers $message_customer .= '

'.$langs->trans('TicketNewEmailBodyInfosTrackUrlCustomer').' : '.$url_public_ticket.'

'; $message_customer .= '

'.$langs->trans('TicketEmailPleaseDoNotReplyToThisEmail').'

'; - $from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>'; + $from = (empty($conf->global->MAIN_INFO_SOCIETE_NOM) ? '' : $conf->global->MAIN_INFO_SOCIETE_NOM.' ').'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>'; $replyto = $from; $trackid = 'tic'.$object->id; From e77413e1e4640286d9c34015839f8c18e5281c91 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 7 Dec 2020 15:36:37 +0100 Subject: [PATCH 272/297] Fix warning --- htdocs/core/class/CMailFile.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php index b2149cd187f..faf0a294dfe 100644 --- a/htdocs/core/class/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -242,6 +242,7 @@ class CMailFile { $this->html = $msg; + $findimg = 0; if (!empty($conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS)) { $findimg = $this->findHtmlImages($dolibarr_main_data_root.'/medias'); From 3fb63e6a4b8846eb8a4353efccdbfd827cfc290b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 7 Dec 2020 15:51:22 +0100 Subject: [PATCH 273/297] Look and feel v13 --- htdocs/admin/limits.php | 12 ++- htdocs/core/lib/admin.lib.php | 37 +++++---- htdocs/core/menus/standard/empty.php | 112 +++++++++------------------ 3 files changed, 64 insertions(+), 97 deletions(-) diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php index 43c4cc84776..34da6f7d34e 100644 --- a/htdocs/admin/limits.php +++ b/htdocs/admin/limits.php @@ -100,9 +100,12 @@ if ($action == 'update') $form = new Form($db); -llxHeader(); +$title = $langs->trans("LimitsSetup"); +$help_url = ''; -print load_fiche_titre($langs->trans("LimitsSetup"), '', 'title_setup'); +llxHeader('', $title, $help_url); + +print load_fiche_titre($title, '', 'title_setup'); $aCurrencies = array($conf->currency); // Default currency always first position @@ -125,7 +128,8 @@ if (!empty($conf->multicurrency->enabled) && !empty($conf->global->MULTICURRENCY if (!empty($aCurrencies) && count($aCurrencies) > 1) { $head = multicurrencyLimitPrepareHead($aCurrencies); - print dol_get_fiche_head($head, $currencycode, '', -1, "multicurrency"); + + print dol_get_fiche_head($head, $currencycode, '', -1, ''); } } @@ -172,6 +176,7 @@ if ($action == 'edit') print ''; print '
'; } else { + print '
'; print '
'; print ''; @@ -191,6 +196,7 @@ if ($action == 'edit') print ''; print '
'.$langs->trans("Parameter").''.$langs->trans("Value").'
'.(isset($conf->global->$mainroundingruletot) ? $conf->global->$mainroundingruletot : $conf->global->MAIN_ROUNDING_RULE_TOT).'
'; + print '
'; print '
'; print ''.$langs->trans("Modify").''; diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php index b8cdf8cd085..704a4496d03 100644 --- a/htdocs/core/lib/admin.lib.php +++ b/htdocs/core/lib/admin.lib.php @@ -924,30 +924,33 @@ function purgeSessions($mysessionid) dol_syslog('admin.lib:purgeSessions mysessionid='.$mysessionid.' sessPath='.$sessPath); $error = 0; - $dh = @opendir(dol_osencode($sessPath)); - while (($file = @readdir($dh)) !== false) { - if ($file != "." && $file != "..") { - $fullpath = $sessPath.$file; - if (!@is_dir($fullpath)) { - $sessValues = file_get_contents($fullpath); // get raw session data - if (preg_match('/dol_login/i', $sessValues) && // limit to dolibarr session - preg_match('/dol_entity\|s:([0-9]+):"('.$conf->entity.')"/i', $sessValues) && // limit to current entity - preg_match('/dol_company\|s:([0-9]+):"('.$conf->global->MAIN_INFO_SOCIETE_NOM.')"/i', $sessValues)) { // limit to company name - $tmp = explode('_', $file); - $idsess = $tmp[1]; - // We remove session if it's not ourself - if ($idsess != $mysessionid) { - $res = @unlink($fullpath); - if (!$res) { - $error++; + $dh = @opendir(dol_osencode($sessPath)); + if ($dh) { + while (($file = @readdir($dh)) !== false) { + if ($file != "." && $file != "..") { + $fullpath = $sessPath.$file; + if (!@is_dir($fullpath)) { + $sessValues = file_get_contents($fullpath); // get raw session data + + if (preg_match('/dol_login/i', $sessValues) && // limit to dolibarr session + preg_match('/dol_entity\|s:([0-9]+):"('.$conf->entity.')"/i', $sessValues) && // limit to current entity + preg_match('/dol_company\|s:([0-9]+):"('.$conf->global->MAIN_INFO_SOCIETE_NOM.')"/i', $sessValues)) { // limit to company name + $tmp = explode('_', $file); + $idsess = $tmp[1]; + // We remove session if it's not ourself + if ($idsess != $mysessionid) { + $res = @unlink($fullpath); + if (!$res) { + $error++; + } } } } } } + @closedir($dh); } - @closedir($dh); if (!$error) { return 1; diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php index b3151e15748..213cd14e9b0 100644 --- a/htdocs/core/menus/standard/empty.php +++ b/htdocs/core/menus/standard/empty.php @@ -348,14 +348,29 @@ class MenuManager // ***** END ***** + $menu_array_before = array(); + $menu_array_after = array(); + // do not change code after this + $menu_array = $this->menu->liste; + if (is_array($menu_array_before)) { + $menu_array = array_merge($menu_array_before, $menu_array); + } + if (is_array($menu_array_after)) { + $menu_array = array_merge($menu_array, $menu_array_after); + } + //var_dump($menu_array);exit; + if (!is_array($menu_array)) { + return 0; + } + if (empty($noout)) { $alt = 0; $altok = 0; $blockvmenuopened = false; - $num = count($this->menu->liste); + $num = count($menu_array); for ($i = 0; $i < $num; $i++) { $alt++; - if (empty($this->menu->liste[$i]['level'])) { + if (empty($menu_array[$i]['level'])) { $altok++; $blockvmenuopened = true; $lastopened = true; @@ -375,55 +390,55 @@ class MenuManager // Add tabulation $tabstring = ''; - $tabul = ($this->menu->liste[$i]['level'] - 1); + $tabul = ($menu_array[$i]['level'] - 1); if ($tabul > 0) { for ($j = 0; $j < $tabul; $j++) { $tabstring .= '   '; } } - if ($this->menu->liste[$i]['level'] == 0) { - if ($this->menu->liste[$i]['enabled']) { - print '
'.$tabstring.'menu->liste[$i]['target'] ? ' target="'.$this->menu->liste[$i]['target'].'"' : '').'>'.$this->menu->liste[$i]['titre'].'
'."\n"; + if ($menu_array[$i]['level'] == 0) { + if ($menu_array[$i]['enabled']) { + print '
'.$tabstring.''.$menu_array[$i]['titre'].'
'."\n"; } else { - print '
'.$tabstring.''.$this->menu->liste[$i]['titre'].'
'."\n"; + print '
'.$tabstring.''.$menu_array[$i]['titre'].'
'."\n"; } print '
'."\n"; } - if ($this->menu->liste[$i]['level'] > 0) { + if ($menu_array[$i]['level'] > 0) { $cssmenu = ''; - if ($this->menu->liste[$i]['url']) { - $cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/', '', $this->menu->liste[$i]['url'])); + if ($menu_array[$i]['url']) { + $cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/', '', $menu_array[$i]['url'])); } print '
'; - if ($this->menu->liste[$i]['enabled']) { + if ($menu_array[$i]['enabled']) { print $tabstring; - if ($this->menu->liste[$i]['url']) { - print 'menu->liste[$i]['target'] ? ' target="'.$this->menu->liste[$i]['target'].'"' : '').'>'; + if ($menu_array[$i]['url']) { + print ''; } else { - print ''; + print ''; } - if ($this->menu->liste[$i]['url']) { - print $this->menu->liste[$i]['titre'].''; + if ($menu_array[$i]['url']) { + print $menu_array[$i]['titre'].''; } else { print ''; } } else { - print $tabstring.''.$this->menu->liste[$i]['titre'].''; + print $tabstring.''.$menu_array[$i]['titre'].''; } // If title is not pure text and contains a table, no carriage return added - if (!strstr($this->menu->liste[$i]['titre'], ''; } print '
'."\n"; } // If next is a new block or end - if (empty($this->menu->liste[$i + 1]['level'])) { + if (empty($menu_array[$i + 1]['level'])) { print '
'."\n"; print "
\n"; } @@ -436,66 +451,9 @@ class MenuManager if ($mode == 'jmobile') { $this->leftmenu = clone $this->menu; - unset($this->menu->liste); + unset($menu_array); } } - /* - if ($mode == 'jmobile') - { - $substitarray = getCommonSubstitutionArray($langs, 0, null, null); - - foreach($this->menu->liste as $key => $val) // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu' - { - print '
    '; - print '
  • '; - - $val['url'] = make_substitutions($val['url'], $substitarray); - - if ($val['enabled'] == 1) - { - $relurl=dol_buildpath($val['url'],1); - - print ''.$val['titre'].''."\n"; - // Search submenu fot this entry - $tmpmainmenu=$val['mainmenu']; - $tmpleftmenu='all'; - //$submenu=new Menu(); - //$res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$submenu,1,$tmpmainmenu,$tmpleftmenu, null, $this->type_user); - //$nexturl=dol_buildpath($submenu->liste[0]['url'],1); - $submenu=$this->leftmenu; - - $canonrelurl=preg_replace('/\?.*$/','',$relurl); - $canonnexturl=preg_replace('/\?.*$/','',$nexturl); - //var_dump($canonrelurl); - //var_dump($canonnexturl); - print '
      '; - if ($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('home','tools'))) - { - // We add sub entry - print '
    • '.$langs->trans("MainArea").'-'.$val['titre'].'
      • '."\n"; - } - foreach($submenu->liste as $key2 => $val2) // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu' - { - $val2['url'] = make_substitutions($val2['url'], $substitarray); - - $relurl2=dol_buildpath($val2['url'],1); - //var_dump($val2); - print '
    • '.$val2['titre'].'
      • '."\n"; - } - //var_dump($submenu); - print '
    '; - } - if ($val['enabled'] == 2) - { - print ''.$val['titre'].''; - } - print '
    • '; - print '
'."\n"; - - break; // Only first menu entry (so home) - } - } - */ unset($this->menu); return $res; From ee0e8826076abd26aef3c7cd08878e9c6fe78894 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 7 Dec 2020 16:15:47 +0100 Subject: [PATCH 274/297] Clear code --- htdocs/core/menus/standard/empty.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php index 213cd14e9b0..1ab7778bb01 100644 --- a/htdocs/core/menus/standard/empty.php +++ b/htdocs/core/menus/standard/empty.php @@ -32,10 +32,13 @@ class MenuManager public $type_user = 0; // Put 0 for internal users, 1 for external users public $atarget = ""; // To store default target to use onto links + public $name = "empty"; public $menu; public $menu_array_after; + public $tabMenu; + /** * Constructor @@ -60,6 +63,7 @@ class MenuManager public function loadMenu($forcemainmenu = '', $forceleftmenu = '') { // Do nothing + $this->tabMenu = array(); } From 7ad5a89a16ba069f18169de57026d46e8587a211 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 7 Dec 2020 16:40:20 +0100 Subject: [PATCH 275/297] FIX A service email must always be sent using the service email --- htdocs/holiday/card.php | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php index 500d678d357..4c88cdf53b3 100644 --- a/htdocs/holiday/card.php +++ b/htdocs/holiday/card.php @@ -403,7 +403,7 @@ if (empty($reshook)) { $object->fetch($id); - // Si brouillon et créateur + // If draft and owner of leave if ($object->statut == Holiday::STATUS_DRAFT && $cancreate) { $object->oldcopy = dol_clone($object); @@ -430,7 +430,8 @@ if (empty($reshook)) // From $expediteur = new User($db); $expediteur->fetch($object->fk_user); - $emailFrom = $expediteur->email; + //$emailFrom = $expediteur->email; Email of user can be an email into another company. Sending will fails, we must use the generic email. + $emailFrom = $conf->global->MAIN_MAIL_EMAIL_FROM; // Subject $societeName = $conf->global->MAIN_INFO_SOCIETE_NOM; @@ -441,6 +442,7 @@ if (empty($reshook)) // Content $message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n"; $message .= "\n"; + $message .= $langs->transnoentities("HolidaysToValidateBody")."\n"; $delayForRequest = $object->getConfCP('delayForRequest'); @@ -525,7 +527,7 @@ if (empty($reshook)) { $object->fetch($id); - // Si statut en attente de validation et valideur = utilisateur + // If status is waiting approval and approver is also user if ($object->statut == Holiday::STATUS_VALIDATED && $user->id == $object->fk_validator) { $object->oldcopy = dol_clone($object); @@ -582,7 +584,8 @@ if (empty($reshook)) // From $expediteur = new User($db); $expediteur->fetch($object->fk_validator); - $emailFrom = $expediteur->email; + //$emailFrom = $expediteur->email; Email of user can be an email into another company. Sending will fails, we must use the generic email. + $emailFrom = $conf->global->MAIN_MAIL_EMAIL_FROM; // Subject $societeName = $conf->global->MAIN_INFO_SOCIETE_NOM; @@ -593,6 +596,7 @@ if (empty($reshook)) // Content $message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n"; $message .= "\n"; + $message .= $langs->transnoentities("HolidaysValidatedBody", dol_print_date($object->date_debut, 'day'), dol_print_date($object->date_fin, 'day'))."\n"; $message .= "- ".$langs->transnoentitiesnoconv("ValidatedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n"; @@ -666,7 +670,8 @@ if (empty($reshook)) // From $expediteur = new User($db); $expediteur->fetch($object->fk_validator); - $emailFrom = $expediteur->email; + //$emailFrom = $expediteur->email; Email of user can be an email into another company. Sending will fails, we must use the generic email. + $emailFrom = $conf->global->MAIN_MAIL_EMAIL_FROM; // Subject $societeName = $conf->global->MAIN_INFO_SOCIETE_NOM; @@ -677,6 +682,7 @@ if (empty($reshook)) // Content $message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n"; $message .= "\n"; + $message .= $langs->transnoentities("HolidaysRefusedBody", dol_print_date($object->date_debut, 'day'), dol_print_date($object->date_fin, 'day'))."\n"; $message .= GETPOST('detail_refuse', 'alpha')."\n\n"; @@ -813,7 +819,8 @@ if (empty($reshook)) // From $expediteur = new User($db); $expediteur->fetch($object->fk_user_cancel); - $emailFrom = $expediteur->email; + //$emailFrom = $expediteur->email; Email of user can be an email into another company. Sending will fails, we must use the generic email. + $emailFrom = $conf->global->MAIN_MAIL_EMAIL_FROM; // Subject $societeName = $conf->global->MAIN_INFO_SOCIETE_NOM; From 6e403e6ce0097af91ba420b2f679c6d55d3b5a52 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 7 Dec 2020 18:29:14 +0100 Subject: [PATCH 276/297] Fix warnings --- htdocs/comm/propal/class/propal.class.php | 12 ++++++++++-- htdocs/core/class/commonobject.class.php | 2 +- test/phpunit/PropalTest.php | 6 +++--- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index c761f8b3321..dfbae271881 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -1099,7 +1099,7 @@ class Propal extends CommonObject if ($this->id) { $this->ref = '(PROV'.$this->id.')'; - $sql = 'UPDATE '.MAIN_DB_PREFIX."propal SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id; + $sql = 'UPDATE '.MAIN_DB_PREFIX."propal SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".((int) $this->id); dol_syslog(get_class($this)."::create", LOG_DEBUG); $resql = $this->db->query($sql); @@ -1111,7 +1111,7 @@ class Propal extends CommonObject } // Add object linked - if (!$error && $this->id && is_array($this->linked_objects) && !empty($this->linked_objects)) + if (!$error && $this->id && !empty($this->linked_objects) && is_array($this->linked_objects)) { foreach ($this->linked_objects as $origin => $tmp_origin_id) { @@ -3753,7 +3753,10 @@ class PropaleLigne extends CommonObjectLine public $product_type = Product::TYPE_PRODUCT; public $qty; + public $tva_tx; + public $vat_src_code; + public $subprice; public $remise_percent; public $fk_remise_except; @@ -3805,6 +3808,11 @@ class PropaleLigne extends CommonObjectLine * @see $product_label */ public $libelle; + /** + * @deprecated + * @see $product_label + */ + public $label; /** * Product label * @var string diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 33ac1aba696..6ecdfb93bb5 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -3161,7 +3161,7 @@ abstract class CommonObject $this->multicurrency_total_ttc += isset($this->revenuestamp) ? ($this->revenuestamp * $multicurrency_tx) : 0; // Situations totals - if ($this->situation_cycle_ref && $this->situation_counter > 1 && method_exists($this, 'get_prev_sits') && $this->type != $this::TYPE_CREDIT_NOTE) + if (!empty($this->situation_cycle_ref) && $this->situation_counter > 1 && method_exists($this, 'get_prev_sits') && $this->type != $this::TYPE_CREDIT_NOTE) { $prev_sits = $this->get_prev_sits(); diff --git a/test/phpunit/PropalTest.php b/test/phpunit/PropalTest.php index 068fb53b052..ea678e8df34 100644 --- a/test/phpunit/PropalTest.php +++ b/test/phpunit/PropalTest.php @@ -190,11 +190,11 @@ class PropalTest extends PHPUnit\Framework\TestCase $langs=$this->savlangs; $db=$this->savdb; - $localobject->note_private='New note private after update'; - $result=$localobject->update($user); + $localobject->note_private = 'New note private after update'; + $result = $localobject->update($user); $this->assertLessThan($result, 0); - print __METHOD__." id=".$id." result=".$result."\n"; + print __METHOD__." id=".$localobject->id." result=".$result."\n"; return $localobject; } From 92b430495baaf679070c75a0fb772f514a58cab6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 7 Dec 2020 19:23:40 +0100 Subject: [PATCH 277/297] Stupid composer, the package that makes you lose your time. --- composer.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 9fede994525..dbc72b09bd1 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,7 @@ { "name" : "dolibarr/dolibarr", "type" : "project", + "version": "999.999.999", "description" : "Dolibarr ERP & CRM is a modern and easy to use web software to manage your business", "keywords" : [ "erp", @@ -35,7 +36,7 @@ "nnnick/chartjs" : "^2.9", "stripe/stripe-php" : "6.43.1", "maximebf/debugbar" : "1.15.1", - "symfony/var-dumper": "3" + "symfony/var-dumper" : "3" }, "require-dev" : { "php-parallel-lint/php-parallel-lint" : "^0", @@ -59,4 +60,4 @@ "ext-zip" : "ODT, Excel and file compression support", "ext-xml" : "Excel support" } -} +} \ No newline at end of file From d8d5524766d8c4c68e058d6fc2ed8af319503d24 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 7 Dec 2020 19:51:22 +0100 Subject: [PATCH 278/297] Update security file --- SECURITY.md | 3 +-- composer.json | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/SECURITY.md b/SECURITY.md index 56e1da679ed..77307516f73 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -12,8 +12,7 @@ This file contains some policies about the security reports on Dolibarr ERP CRM ## Reporting a Vulnerability -To report a vulnerability, please send an email to security@dolibarr.org -In most cases, after fixing the security, we make an answer by email to say the issue has been fixed. +To report a vulnerability, please use GitHub security advisory (alternatively send an email to security@dolibarr.org) ## Hunting vulnerabilities on Dolibarr diff --git a/composer.json b/composer.json index dbc72b09bd1..bd81e101cfc 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,6 @@ { "name" : "dolibarr/dolibarr", "type" : "project", - "version": "999.999.999", "description" : "Dolibarr ERP & CRM is a modern and easy to use web software to manage your business", "keywords" : [ "erp", From 078e395bfb91154e5f4481c4403c019c5117af81 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 7 Dec 2020 20:25:54 +0100 Subject: [PATCH 279/297] Fix gitignore --- htdocs/includes/mike42/escpos-php/.gitignore | 2 ++ htdocs/includes/mike42/escpos-php/autoload.php | 18 +++++++++--------- .../PrintConnectors/CupsPrintConnector.php | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/htdocs/includes/mike42/escpos-php/.gitignore b/htdocs/includes/mike42/escpos-php/.gitignore index 8632f891ad4..e7dd4b6263a 100644 --- a/htdocs/includes/mike42/escpos-php/.gitignore +++ b/htdocs/includes/mike42/escpos-php/.gitignore @@ -14,3 +14,5 @@ vendor/ # other build files build/* *.phar +/example/ +/test/ diff --git a/htdocs/includes/mike42/escpos-php/autoload.php b/htdocs/includes/mike42/escpos-php/autoload.php index 47ed7d9e9c3..7779486b824 100644 --- a/htdocs/includes/mike42/escpos-php/autoload.php +++ b/htdocs/includes/mike42/escpos-php/autoload.php @@ -1,26 +1,26 @@ Date: Mon, 7 Dec 2020 20:33:13 +0100 Subject: [PATCH 280/297] Update lib --- htdocs/includes/symfony/var-dumper/.gitignore | 3 + .../includes/symfony/var-dumper/composer.json | 83 +++++++++---------- .../symfony/var-dumper/phpunit.xml.dist | 29 +++++++ 3 files changed, 72 insertions(+), 43 deletions(-) create mode 100644 htdocs/includes/symfony/var-dumper/.gitignore create mode 100644 htdocs/includes/symfony/var-dumper/phpunit.xml.dist diff --git a/htdocs/includes/symfony/var-dumper/.gitignore b/htdocs/includes/symfony/var-dumper/.gitignore new file mode 100644 index 00000000000..5414c2c655e --- /dev/null +++ b/htdocs/includes/symfony/var-dumper/.gitignore @@ -0,0 +1,3 @@ +composer.lock +phpunit.xml +vendor/ diff --git a/htdocs/includes/symfony/var-dumper/composer.json b/htdocs/includes/symfony/var-dumper/composer.json index a90729b6bbe..05955f69430 100644 --- a/htdocs/includes/symfony/var-dumper/composer.json +++ b/htdocs/includes/symfony/var-dumper/composer.json @@ -1,44 +1,41 @@ { - "name" : "symfony/var-dumper", - "type" : "library", - "description" : "Symfony mechanism for exploring and dumping PHP variables", - "keywords" : [ - "dump", - "debug" - ], - "homepage" : "https://symfony.com", - "license" : "MIT", - "authors" : [{ - "name" : "Nicolas Grekas", - "email" : "p@tchwork.com" - }, { - "name" : "Symfony Community", - "homepage" : "https://symfony.com/contributors" - } - ], - "require" : { - "php" : ">=5.5.9", - "symfony/polyfill-mbstring" : "~1.0" - }, - "require-dev" : { - "twig/twig" : "~1.20|~2.0" - }, - "suggest" : {}, - "autoload" : { - "files" : [ - "Resources/functions/dump.php" - ], - "psr-4" : { - "Symfony\\Component\\VarDumper\\" : "" - }, - "exclude-from-classmap" : [ - "/Tests/" - ] - }, - "minimum-stability" : "dev", - "extra" : { - "branch-alias" : { - "dev-master" : "3.0-dev" - } - } -} \ No newline at end of file + "name": "symfony/var-dumper", + "type": "library", + "description": "Symfony mechanism for exploring and dumping PHP variables", + "keywords": ["dump", "debug"], + "homepage": "https://symfony.com", + "license": "MIT", + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "require": { + "php": ">=5.5.9", + "symfony/polyfill-mbstring": "~1.0" + }, + "require-dev": { + "twig/twig": "~1.20|~2.0" + }, + "suggest": { + "ext-symfony_debug": "" + }, + "autoload": { + "files": [ "Resources/functions/dump.php" ], + "psr-4": { "Symfony\\Component\\VarDumper\\": "" }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "minimum-stability": "dev", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + } +} diff --git a/htdocs/includes/symfony/var-dumper/phpunit.xml.dist b/htdocs/includes/symfony/var-dumper/phpunit.xml.dist new file mode 100644 index 00000000000..bb16a3a4ec0 --- /dev/null +++ b/htdocs/includes/symfony/var-dumper/phpunit.xml.dist @@ -0,0 +1,29 @@ + + + + + + + + + + ./Tests/ + + + + + + ./ + + ./Resources + ./Tests + ./vendor + + + + From d5b009a22a53303fced917cfaab81be5e0bb1d79 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 7 Dec 2020 20:36:42 +0100 Subject: [PATCH 281/297] Add .gitignore --- htdocs/includes/tecnickcom/tcpdf/.gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 htdocs/includes/tecnickcom/tcpdf/.gitignore diff --git a/htdocs/includes/tecnickcom/tcpdf/.gitignore b/htdocs/includes/tecnickcom/tcpdf/.gitignore new file mode 100644 index 00000000000..56fd659871f --- /dev/null +++ b/htdocs/includes/tecnickcom/tcpdf/.gitignore @@ -0,0 +1,2 @@ +/examples/ +/tools/ \ No newline at end of file From bb217db31e6b9abb3aa25825516943425122a0c2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 7 Dec 2020 20:38:15 +0100 Subject: [PATCH 282/297] Ad .gitignore --- htdocs/includes/restler/framework/Luracast/Restler/.gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 htdocs/includes/restler/framework/Luracast/Restler/.gitignore diff --git a/htdocs/includes/restler/framework/Luracast/Restler/.gitignore b/htdocs/includes/restler/framework/Luracast/Restler/.gitignore new file mode 100644 index 00000000000..5fe55bc3882 --- /dev/null +++ b/htdocs/includes/restler/framework/Luracast/Restler/.gitignore @@ -0,0 +1 @@ +/Explorer/ From 644bac0b808285ca9093924709157d2f6141725b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 7 Dec 2020 20:39:59 +0100 Subject: [PATCH 283/297] Removed gitignore --- htdocs/includes/restler/framework/Luracast/Restler/.gitignore | 1 - 1 file changed, 1 deletion(-) delete mode 100644 htdocs/includes/restler/framework/Luracast/Restler/.gitignore diff --git a/htdocs/includes/restler/framework/Luracast/Restler/.gitignore b/htdocs/includes/restler/framework/Luracast/Restler/.gitignore deleted file mode 100644 index 5fe55bc3882..00000000000 --- a/htdocs/includes/restler/framework/Luracast/Restler/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/Explorer/ From 6abf1b6ac2139fc781593d73cc92a6fa2bec0956 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 7 Dec 2020 20:59:07 +0100 Subject: [PATCH 284/297] Error message --- htdocs/api/admin/index.php | 3 ++- htdocs/langs/en_US/errors.lang | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/api/admin/index.php b/htdocs/api/admin/index.php index b4ebb6cb30e..1d15d5b9e75 100644 --- a/htdocs/api/admin/index.php +++ b/htdocs/api/admin/index.php @@ -160,7 +160,8 @@ if (dol_is_dir(DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/e $url = DOL_MAIN_URL_ROOT.'/api/index.php/explorer'; print img_picto('', 'globe').' '.$url."
\n"; } else { - print $langs->trans("NotAvailableWithThisDistribution"); + $langs->load("errors"); + print info_admin($langs->trans("ErrorNotAvailableWithThisDistribution"), 0, 0, 'error'); } llxFooter(); diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang index 2413e6d76ba..056c9240bd0 100644 --- a/htdocs/langs/en_US/errors.lang +++ b/htdocs/langs/en_US/errors.lang @@ -250,6 +250,7 @@ ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter %s must be ErrorLoginDateValidity=Error, this login is outside the validity date range ErrorValueLength=Length of field '%s' must be higher than '%s' ErrorReservedKeyword=The word '%s' is a reserved keyword +ErrorNotAvailableWithThisDistribution=Not available with this distribution # Warnings WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup. WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user. From f738c875d8257a63917c5cae9dc3062e6fa04973 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 7 Dec 2020 21:10:10 +0100 Subject: [PATCH 285/297] Update gitignore --- composer.lock | 4 +- htdocs/includes/nnnick/chartjs/.gitignore | 7 ++- htdocs/includes/nnnick/chartjs/composer.json | 49 ++++++++++---------- 3 files changed, 32 insertions(+), 28 deletions(-) diff --git a/composer.lock b/composer.lock index 5afe0ca34f2..93226d8f2c8 100644 --- a/composer.lock +++ b/composer.lock @@ -217,7 +217,7 @@ }, { "name": "nnnick/chartjs", - "version": "v2.9.3", + "version": "v2.9.4", "source": { "type": "git", "url": "https://github.com/chartjs/Chart.js.git", @@ -315,7 +315,7 @@ "time": "2015-05-01T07:00:55+00:00" }, { - "name": "psr/log", + "name": "Psr/log", "version": "1.1.3", "source": { "type": "git", diff --git a/htdocs/includes/nnnick/chartjs/.gitignore b/htdocs/includes/nnnick/chartjs/.gitignore index 6a066b92f38..8a4a4294d61 100644 --- a/htdocs/includes/nnnick/chartjs/.gitignore +++ b/htdocs/includes/nnnick/chartjs/.gitignore @@ -1,8 +1,13 @@ +.github /_book /coverage /custom /dist -/docs/index.md +/docs +/samples +/scripts +/src +/test /gh-pages /jsdoc /node_modules diff --git a/htdocs/includes/nnnick/chartjs/composer.json b/htdocs/includes/nnnick/chartjs/composer.json index b332bb0f595..9df2b22fc50 100644 --- a/htdocs/includes/nnnick/chartjs/composer.json +++ b/htdocs/includes/nnnick/chartjs/composer.json @@ -1,26 +1,25 @@ { - "name": "nnnick/chartjs", - "type": "library", - "description": "Simple HTML5 charts using the canvas element.", - "keywords": [ - "chart", - "js" - ], - "homepage": "https://www.chartjs.org/", - "license": "MIT", - "authors": [ - { - "name": "NICK DOWNIE", - "email": "hello@nickdownie.com" - } - ], - "require": { - "php": ">=5.3.3" - }, - "minimum-stability": "stable", - "extra": { - "branch-alias": { - "release/2.0": "v2.0-dev" - } - } -} + "name" : "nnnick/chartjs", + "type" : "library", + "description" : "Simple HTML5 charts using the canvas element.", + "keywords" : [ + "chart", + "js" + ], + "homepage" : "https://www.chartjs.org/", + "license" : "MIT", + "authors" : [{ + "name" : "NICK DOWNIE", + "email" : "hello@nickdownie.com" + } + ], + "require" : { + "php" : ">=5.3.3" + }, + "minimum-stability" : "stable", + "extra" : { + "branch-alias" : { + "release/2.0" : "v2.0-dev" + } + } +} \ No newline at end of file From 4bc2e791a8b29aa7ac858a479b316747db41953e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 7 Dec 2020 21:44:19 +0100 Subject: [PATCH 286/297] Update .gitignore --- htdocs/includes/mike42/escpos-php/.gitignore | 6 +----- package.json | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/htdocs/includes/mike42/escpos-php/.gitignore b/htdocs/includes/mike42/escpos-php/.gitignore index e7dd4b6263a..2b6e1a8d17c 100644 --- a/htdocs/includes/mike42/escpos-php/.gitignore +++ b/htdocs/includes/mike42/escpos-php/.gitignore @@ -4,9 +4,7 @@ .buildpath # doxygen files -doc/html -doc/latex -doc/doxygen_sqlite3.db +doc # composer files vendor/ @@ -14,5 +12,3 @@ vendor/ # other build files build/* *.phar -/example/ -/test/ diff --git a/package.json b/package.json index 01d3a4300ee..56f8ced1d4b 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "test:e2e": "node_modules/cucumber/bin/cucumber-js --require test/acceptance/index.js --require test/acceptance/setup.js --require test/acceptance/stepDefinitions -f node_modules/cucumber-pretty" }, "dependencies": { + "chart.js": "^2.9.4", "cucumber-pretty": "^6.0.0", "node-fetch": "^2.6.1" } From 796fe5cd8af0f23b9dc556ba92e5cd9d7c67cb0c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 7 Dec 2020 21:47:57 +0100 Subject: [PATCH 287/297] Update .gitignore --- htdocs/includes/mobiledetect/mobiledetectlib/.gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 htdocs/includes/mobiledetect/mobiledetectlib/.gitignore diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/.gitignore b/htdocs/includes/mobiledetect/mobiledetectlib/.gitignore new file mode 100644 index 00000000000..2f88269126d --- /dev/null +++ b/htdocs/includes/mobiledetect/mobiledetectlib/.gitignore @@ -0,0 +1 @@ +/docs From 85bb3fa909b4e18faecca48ce7d7f1e9c05c0aad Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 7 Dec 2020 21:57:29 +0100 Subject: [PATCH 288/297] Update chart.js to 2.9.4 --- COPYRIGHT | 2 +- build/makepack-dolibarr.pl | 31 +- composer.json | 2 +- composer.lock | 261 +- htdocs/includes/mike42/escpos-php/doc/FAQ.md | 142 - .../includes/mike42/escpos-php/doc/Makefile | 20 - .../mike42/escpos-php/doc/escpos.doxyfile | 2352 ----------------- .../mobiledetectlib/docs/CONTRIBUTING.md | 48 - .../mobiledetectlib/docs/HISTORY.md | 11 - .../mobiledetectlib/docs/ISSUE_TEMPLATE.md | 15 - .../mobiledetectlib/docs/KNOWN_LIMITATIONS.md | 12 - htdocs/includes/nnnick/chartjs/.travis.yml | 4 +- htdocs/includes/nnnick/chartjs/composer.json | 49 +- .../nnnick/chartjs/dist/Chart.bundle.js | 45 +- .../nnnick/chartjs/dist/Chart.bundle.min.js | 6 +- htdocs/includes/nnnick/chartjs/dist/Chart.js | 45 +- .../includes/nnnick/chartjs/dist/Chart.min.js | 6 +- .../includes/nnnick/chartjs/package-lock.json | 2 +- htdocs/includes/nnnick/chartjs/package.json | 2 +- 19 files changed, 180 insertions(+), 2875 deletions(-) delete mode 100644 htdocs/includes/mike42/escpos-php/doc/FAQ.md delete mode 100644 htdocs/includes/mike42/escpos-php/doc/Makefile delete mode 100644 htdocs/includes/mike42/escpos-php/doc/escpos.doxyfile delete mode 100644 htdocs/includes/mobiledetect/mobiledetectlib/docs/CONTRIBUTING.md delete mode 100644 htdocs/includes/mobiledetect/mobiledetectlib/docs/HISTORY.md delete mode 100644 htdocs/includes/mobiledetect/mobiledetectlib/docs/ISSUE_TEMPLATE.md delete mode 100644 htdocs/includes/mobiledetect/mobiledetectlib/docs/KNOWN_LIMITATIONS.md diff --git a/COPYRIGHT b/COPYRIGHT index d43f4d506f1..adf7d38c04b 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -39,7 +39,7 @@ TCPDI 1.0.0 LGPL-3+ / Apache 2.0 Yes JS libraries: Ace 1.4.8 BSD Yes JS library to get code syntaxique coloration in a textarea. -ChartJS 2.9.3 MIT License Yes JS library for graph +ChartJS 2.9.4 MIT License Yes JS library for graph jQuery 3.5.1 MIT License Yes JS library jQuery UI 1.12.1 GPL and MIT License Yes JS library plugin UI jQuery select2 4.0.13 GPL and Apache License Yes JS library plugin for sexier multiselect. Warning: 4.0.6+ create troubles without patching css diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 314aaff7177..17a935f6234 100755 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -581,23 +581,36 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/workstation*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/oblyon*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/allscreen*`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/theme/common/octicons/LICENSE`; + # Removed other test files $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/test`; $ret=`rm -fr $BUILDROOT/$PROJECT/test`; $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`; $ret=`rm -f $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`; $ret=`rm -f $BUILDROOT/$PROJECT/.gitignore $BUILDROOT/$PROJECT/*/.gitignore $BUILDROOT/$PROJECT/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/.gitignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.gitignore`; + + # Removed files installed by the awful composer $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/geoip/sample*.*`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/bin`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/ckeditor/adapters`; # Keep this removal in case we embed libraries $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/ckeditor/samples`; # Keep this removal in case we embed libraries $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/ckeditor/_source`; # _source must be kept into tarball for official debian, not for the rest - + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/composer`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/doctrine`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/multiselect/MIT-LICENSE.txt`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/select2/release.sh`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/doc`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/example`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/test`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/example`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/mike42/escpos-php/test`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mobiledetect/mobiledetectlib/.gitmodules`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/mobiledetect/mobiledetectlib/docs`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nnnick/chartjs/.github`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nnnick/chartjs/docs`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nnnick/chartjs/samples`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nnnick/chartjs/scripts`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nnnick/chartjs/src`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nnnick/chartjs/test`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/lib/Mail`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/samples`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/parsedown/LICENSE.txt`; @@ -612,21 +625,17 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/sabre/sabre/*/tests`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/stripe/tests`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/stripe/LICENSE`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-*`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-*`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/ae_fonts_*`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/examples`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/dejavu-fonts-ttf-*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/freefont-*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/ae_fonts_*`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/utils`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/tools`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/LICENSE.TXT`; - + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/tools`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/vendor`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/webmozart`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/autoload.php`; - - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/theme/common/octicons/LICENSE`; } # Build package for each target diff --git a/composer.json b/composer.json index bd81e101cfc..a943fbe0aa3 100644 --- a/composer.json +++ b/composer.json @@ -59,4 +59,4 @@ "ext-zip" : "ODT, Excel and file compression support", "ext-xml" : "Excel support" } -} \ No newline at end of file +} diff --git a/composer.lock b/composer.lock index 93226d8f2c8..e0462435f5e 100644 --- a/composer.lock +++ b/composer.lock @@ -6,6 +6,53 @@ ], "content-hash": "1dbd2d05cc0836acfca5988f29005cf2", "packages": [ + { + "name": "Psr/log", + "version": "1.1.3", + "source": { + "type": "git", + "url": "https://github.com/php-fig/log.git", + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc", + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Log\\": "Psr/Log/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for logging libraries", + "homepage": "https://github.com/php-fig/log", + "keywords": [ + "log", + "psr", + "psr-3" + ], + "time": "2020-03-23T09:12:05+00:00" + }, { "name": "ckeditor/ckeditor", "version": "4.12.1", @@ -221,12 +268,12 @@ "source": { "type": "git", "url": "https://github.com/chartjs/Chart.js.git", - "reference": "06f73dc3590084b2c464bf08189c7aee2b6b92d2" + "reference": "9bd4cf82fda9f50a5fb50b72843e06ab88124278" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/chartjs/Chart.js/zipball/06f73dc3590084b2c464bf08189c7aee2b6b92d2", - "reference": "06f73dc3590084b2c464bf08189c7aee2b6b92d2", + "url": "https://api.github.com/repos/chartjs/Chart.js/zipball/9bd4cf82fda9f50a5fb50b72843e06ab88124278", + "reference": "9bd4cf82fda9f50a5fb50b72843e06ab88124278", "shasum": "" }, "require": { @@ -254,7 +301,11 @@ "JS", "chart" ], - "time": "2019-11-14T18:37:30+00:00" + "support": { + "issues": "https://github.com/chartjs/Chart.js/issues", + "source": "https://github.com/chartjs/Chart.js/tree/v2.9.4" + }, + "time": "2020-10-19T12:22:11+00:00" }, { "name": "phpoffice/phpexcel", @@ -314,53 +365,6 @@ "abandoned": "phpoffice/phpspreadsheet", "time": "2015-05-01T07:00:55+00:00" }, - { - "name": "Psr/log", - "version": "1.1.3", - "source": { - "type": "git", - "url": "https://github.com/php-fig/log.git", - "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc", - "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Log\\": "Psr/Log/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common interface for logging libraries", - "homepage": "https://github.com/php-fig/log", - "keywords": [ - "log", - "psr", - "psr-3" - ], - "time": "2020-03-23T09:12:05+00:00" - }, { "name": "restler/framework", "version": "3.0.0-RC6", @@ -2037,159 +2041,6 @@ ], "time": "2019-08-06T08:03:45+00:00" }, - { - "name": "symfony/polyfill-php72", - "version": "v1.18.1", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "639447d008615574653fb3bc60d1986d7172eaae" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/639447d008615574653fb3bc60d1986d7172eaae", - "reference": "639447d008615574653fb3bc60d1986d7172eaae", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.18-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php72\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2020-07-14T12:35:20+00:00" - }, - { - "name": "symfony/polyfill-php80", - "version": "v1.18.1", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/d87d5766cbf48d72388a9f6b85f280c8ad51f981", - "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981", - "shasum": "" - }, - "require": { - "php": ">=7.0.8" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.18-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php80\\": "" - }, - "files": [ - "bootstrap.php" - ], - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Ion Bazan", - "email": "ion.bazan@gmail.com" - }, - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2020-07-14T12:35:20+00:00" - }, { "name": "symfony/yaml", "version": "v3.4.32", @@ -2312,5 +2163,5 @@ "ext-curl": "*" }, "platform-dev": [], - "plugin-api-version": "1.1.0" + "plugin-api-version": "2.0.0" } diff --git a/htdocs/includes/mike42/escpos-php/doc/FAQ.md b/htdocs/includes/mike42/escpos-php/doc/FAQ.md deleted file mode 100644 index 6b7a6247bca..00000000000 --- a/htdocs/includes/mike42/escpos-php/doc/FAQ.md +++ /dev/null @@ -1,142 +0,0 @@ -# Frequently Asked Questions (FAQ) - -## Can I print to File Format X with this? - -If you are trying to generate XPS, PDF or DOCX or HTML files from PHP, then you are most likely in the wrong place. - -The purpose of this driver it to generate binary ESC/POS code, which is understood by many embedded thermal receipt and impact printers. - -## I have Printer X. Can I use this driver? - -If the printer understands ESC/POS, and you know how to get raw binary data to it, then yes. Otherwise, no. - -The [list of printers that are known to work](https://github.com/mike42/escpos-php/blob/development/README.md#printers) is crowd-sourced. We appreciate it when developers try out the driver, then [file information on the bug tracker](https://github.com/mike42/escpos-php/issues/new) with some information about which features worked on their model of printer. - -To see how well your printer works, first check that it supports ESC/POS, then begin by attempting to send the text "Hello World" to your printer on the command-line, from the computer that will run PHP. - -Once you solve this, [try to do the same from PHP](https://github.com/mike42/escpos-php/blob/development/README.md#basic-usage) using the default profile. Further details are in the [README](https://github.com/mike42/escpos-php/blob/development/README.md) file. - -## Can you add support for Printer X? - -Features vary between printers, so we collaborate on an ESC/POS printer compatibility database to collect known differences: [receipt-print-hq/escpos-printer-db](https://github.com/receipt-print-hq/escpos-printer-db). - -If you encounter garbage output when you try to print images or special characters, then please submit a test page and a link to vendor documentation to the `escpos-printer-db` project, so that support can be improved for future versions. - -## I have a printer that does not understand ESC/POS. Can I use this driver? - -No. The purpose of this driver it to generate binary ESC/POS code. If your printer doesn't understand that, then this code wont be much use to you. - -Some printers do have an emulation mode for ESC/POS. The vendor docs will tell if this is the case, and how to enable it. - -## Why do I get this error when I try to print? - -Start by testing that you can send text to your printer outside of escpos-php. The examples linked to in the README are commented with some commands to get you started. - -Generally, initial setup problems seem to have one of these causes: - -1. You are writing to the wrong place. Writing to `LPT1` does not output to parallel port on Linux, and `/dev/ttyS0` is not a serial printer on Windows. -2. The printer has not been set up to accept printing the way you expect. This means permissions on Linux, network printers being configured, and shared printers having user accounts and firewalls set up correctly on the print server. -3. Your printer actually doesn't work (rare but possible). - -To be clear, these are not escpos-php issues: No amount of PHP code can set up your printer for you. Instead, the driver relies on developers determining how their setup is going to work before using a connector to transport data to their printer. - -Once you have a working command to send text to your printer (from the PHP server), you are ready to use escpos-php. You can try to use a PrintConnector now, based on your operating system and printer interface. A table is located in the README to help you select the right one. - -The connectors are- - -- `FilePrintConnector` and `NetworkPrintConnector` directly use files or network sockets. -- `WindowsPrintConnector` and `CupsPrintConnector` tie in with Windows and Unix system printing. -- `DummyPrintConnector` does not connect to a real printer, and can be used to save ESC/POS receipts to a database, for example. - -At this point, you might find that the way you would like to print is not supported by escpos-php. You can post your printing command as a feature request on the issue tracker. - -Lastly, you may run in to the final common trap: - -4. Your PHP is not running with the same sort of permissions as your login account. Again, no amount of PHP code can fix this. For example, on LAMP, your `www-data` user needs to be in the `lp` group, while on WAMP, `Local Service` account may run in to problems. SELinux and firewalls are also worth a look. - -When printing fails, you can expect a PHP Exception that explains what went wrong. They are all clues: - -- `Warning: copy(\\pc\printer): failed to open stream: Permission denied` -- `/dev/usb/lp0: Permission denied` -- `User name or password is incorrect` - -Ensure that while you are developing, you configure PHP to show error messages, so that you can see these problems. - -Please file a bug if you think that there is a specific situation which escpos-php could provide better error messages for. - -## Can I print over the network? - -Certainly, as long as your printer is available over the network. - -- `NetworkPrintConnector` will speak directly to an Ethernet-connected printer on port 9100. - -For USB or Serial printers, you need to install the printer on a computer and then share it, so that it becomes network-accessible. - -- `WindowsPrintConnector` will connect to Windows shared printers from Windows or Linux (Linux users will need Samba). -- `CupsPrintConnector` will connect to CUPS-shared printers from Linux or Mac. - -Always start by testing your shared printer setup outside of escpos-php. The examples linked to in the README are commented with some example commands to get you started. Typically, networks, firewalls and permissions need to be set up. - -Once you have a working command to send text to your printer (from the PHP server), you are ready to use escpos-php. - -If you have any issues at this stage, please ask on the issue tracker, and include the commands that you used to verify your setup. - -## Can I print from my server on the Internet? - -Since PHP is a server-side language, escpos-php is a server-side print library. The driver is able to transport data between a server and a printer in a few different ways, all of them server-side. For example, you may print to a USB printer *connected to the server running PHP*, or an Ethernet printer *on a network accessible to the server*. - -Many developers dream of having an application that is hosted on the public Internet, with POS terminals accessing it, and printing via a web browser. Because the webserver cannot see the printer in this sort of setup, a server-side print driver is not much use. - -Because of this, there are no cut-and-paste recipes available, but here are two top-level approaches you could take: - -1. Architect your application so that the server can see your printer -2. Use an application which runs client-side to deliver print data instead - -### Option 1: Allow the server to print - -Server-side printing is viable if the server can get to the printer. Here are some ways it could work: - -- Run your server on the LAN instead, and read the section above about printing over the network -- Set up a VPN so that your cloud-hosted server can also access the LAN -- Expose the printer via some other secure tunnel to the server, via SSH or TLS - -Please do your own research to determine how these may apply to your setup- the escpos-php issue tracker is not a place where you should be requesting network support. - -### Option 2: Use client software to print - -If you aren't able to set up some network infrastructure to implement the above, then you cannot use a server-side print driver. - -Here are some browser-based printing tools which you may like to consider instead. - -- Use system printing with a vendor driver, and some good `@media print` CSS -- [Chrome Raw Print](https://github.com/receipt-print-hq/chrome-raw-print) app -- [qz](https://qz.io/) -- [ePOS-Device SDK for JavaScript](https://reference.epson-biz.com/modules/ref_epos_device_js_en/index.php?content_id=139). Requires network interface card that supports ePOS (UB-E04/R04) - -Please direct queries about client-side printing products to the appropriate project. - -## Why is image printing slow? - -Three things tend to slow down the image processing: - -1. Slow PHP code -2. Data link -3. The printer itself - -First, ensure you have the Imagick plugin loaded. The driver will avoid a slower image processing implementation once you've got it. - -Next, connect over a faster interface. Serial printers have a low bit-rate, and the printer spends a lot of time waiting for data. If you have USB or Ethernet, then use it (note: storing graphics to the printer memory is not currently implemented). - -Lastly, the printer will go faster if you use less pixels. Since images are two-dimensional, scaling down by 50% removes 75% of the pixels. The driver can then print at a half the density, so that your lower resolution image appears the same size when printed. - -## How can I get the status of the printer? - -This feature is not implemented, but a solution for some Epson printers is planned. - -Only `FilePrintConnector` or `NetworkPrintConnector` will support reading from the printer, ensure that you migrate to those if you would like these features. - -## How do I produce this complex layout? - -ESC/POS "page mode" is not currently supported, which would allow some printers to render some more complex layouts natively - -Since the output is raster anyway, it is suggested that you render your output to an image and print that instead. The driver supports PDF printing via Imagick, and an example that uses `wkhtmltoimage` is available in the repository. diff --git a/htdocs/includes/mike42/escpos-php/doc/Makefile b/htdocs/includes/mike42/escpos-php/doc/Makefile deleted file mode 100644 index 4e01c2ac0a1..00000000000 --- a/htdocs/includes/mike42/escpos-php/doc/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -html: escpos.doxyfile - # Compile - doxygen escpos.doxyfile - # Filter out warnings on README.md- doxygen cannot handle image links that - # are used there: [![Caption](https://example.com/target)](https://example.com/image) - sed -i '/README.md\:/d' warnings.log - # Show warnings log - cat warnings.log - # Return failure if there were any doc warnings - [ ! -s warnings.log ] - -latex: html - # Do nothing - -xml: html - xsltproc xml/combine.xslt xml/index.xml > all.xml - -clean: - rm --preserve-root -Rf html latex xml doxygen_sqlite3.db all.xml warnings.log - diff --git a/htdocs/includes/mike42/escpos-php/doc/escpos.doxyfile b/htdocs/includes/mike42/escpos-php/doc/escpos.doxyfile deleted file mode 100644 index 0c48656e15b..00000000000 --- a/htdocs/includes/mike42/escpos-php/doc/escpos.doxyfile +++ /dev/null @@ -1,2352 +0,0 @@ -# Doxyfile 1.8.8 - -# This file describes the settings to be used by the documentation system -# doxygen (www.doxygen.org) for a project. -# -# All text after a double hash (##) is considered a comment and is placed in -# front of the TAG it is preceding. -# -# All text after a single hash (#) is considered a comment and will be ignored. -# The format is: -# TAG = value [value, ...] -# For lists, items can also be appended using: -# TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (\" \"). - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- - -# This tag specifies the encoding used for all characters in the config file -# that follow. The default is UTF-8 which is also the encoding used for all text -# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv -# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv -# for the list of possible encodings. -# The default value is: UTF-8. - -DOXYFILE_ENCODING = UTF-8 - -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by -# double-quotes, unless you are using Doxywizard) that should identify the -# project for which the documentation is generated. This name is used in the -# title of most generated pages and in a few other places. -# The default value is: My Project. - -PROJECT_NAME = "escpos-php" - -# The PROJECT_NUMBER tag can be used to enter a project or revision number. This -# could be handy for archiving the generated documentation or if some version -# control system is used. - -PROJECT_NUMBER = - -# Using the PROJECT_BRIEF tag one can provide an optional one line description -# for a project that appears at the top of each page and should give viewer a -# quick idea about the purpose of the project. Keep the description short. - -PROJECT_BRIEF = - -# With the PROJECT_LOGO tag one can specify an logo or icon that is included in -# the documentation. The maximum height of the logo should not exceed 55 pixels -# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo -# to the output directory. - -PROJECT_LOGO = ../example/resources/escpos-php-small.png - -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path -# into which the generated documentation will be written. If a relative path is -# entered, it will be relative to the location where doxygen was started. If -# left blank the current directory will be used. - -OUTPUT_DIRECTORY = - -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub- -# directories (in 2 levels) under the output directory of each output format and -# will distribute the generated files over these directories. Enabling this -# option can be useful when feeding doxygen a huge amount of source files, where -# putting all generated files in the same directory would otherwise causes -# performance problems for the file system. -# The default value is: NO. - -CREATE_SUBDIRS = NO - -# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII -# characters to appear in the names of generated files. If set to NO, non-ASCII -# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode -# U+3044. -# The default value is: NO. - -ALLOW_UNICODE_NAMES = NO - -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, -# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), -# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, -# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, -# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, -# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, -# Ukrainian and Vietnamese. -# The default value is: English. - -OUTPUT_LANGUAGE = English - -# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member -# descriptions after the members that are listed in the file and class -# documentation (similar to Javadoc). Set to NO to disable this. -# The default value is: YES. - -BRIEF_MEMBER_DESC = YES - -# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief -# description of a member or function before the detailed description -# -# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the -# brief descriptions will be completely suppressed. -# The default value is: YES. - -REPEAT_BRIEF = YES - -# This tag implements a quasi-intelligent brief description abbreviator that is -# used to form the text in various listings. Each string in this list, if found -# as the leading text of the brief description, will be stripped from the text -# and the result, after processing the whole list, is used as the annotated -# text. Otherwise, the brief description is used as-is. If left blank, the -# following values are used ($name is automatically replaced with the name of -# the entity):The $name class, The $name widget, The $name file, is, provides, -# specifies, contains, represents, a, an and the. - -ABBREVIATE_BRIEF = - -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# doxygen will generate a detailed section even if there is only a brief -# description. -# The default value is: NO. - -ALWAYS_DETAILED_SEC = NO - -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all -# inherited members of a class in the documentation of that class as if those -# members were ordinary class members. Constructors, destructors and assignment -# operators of the base classes will not be shown. -# The default value is: NO. - -INLINE_INHERITED_MEMB = NO - -# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path -# before files name in the file list and in the header files. If set to NO the -# shortest path that makes the file name unique will be used -# The default value is: YES. - -FULL_PATH_NAMES = YES - -# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path. -# Stripping is only done if one of the specified strings matches the left-hand -# part of the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the path to -# strip. -# -# Note that you can specify absolute paths here, but also relative paths, which -# will be relative from the directory where doxygen is started. -# This tag requires that the tag FULL_PATH_NAMES is set to YES. - -STRIP_FROM_PATH = - -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the -# path mentioned in the documentation of a class, which tells the reader which -# header file to include in order to use a class. If left blank only the name of -# the header file containing the class definition is used. Otherwise one should -# specify the list of include paths that are normally passed to the compiler -# using the -I flag. - -STRIP_FROM_INC_PATH = - -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but -# less readable) file names. This can be useful is your file systems doesn't -# support long names like on DOS, Mac, or CD-ROM. -# The default value is: NO. - -SHORT_NAMES = NO - -# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the -# first line (until the first dot) of a Javadoc-style comment as the brief -# description. If set to NO, the Javadoc-style will behave just like regular Qt- -# style comments (thus requiring an explicit @brief command for a brief -# description.) -# The default value is: NO. - -JAVADOC_AUTOBRIEF = NO - -# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first -# line (until the first dot) of a Qt-style comment as the brief description. If -# set to NO, the Qt-style will behave just like regular Qt-style comments (thus -# requiring an explicit \brief command for a brief description.) -# The default value is: NO. - -QT_AUTOBRIEF = NO - -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a -# multi-line C++ special comment block (i.e. a block of //! or /// comments) as -# a brief description. This used to be the default behavior. The new default is -# to treat a multi-line C++ comment block as a detailed description. Set this -# tag to YES if you prefer the old behavior instead. -# -# Note that setting this tag to YES also means that rational rose comments are -# not recognized any more. -# The default value is: NO. - -MULTILINE_CPP_IS_BRIEF = NO - -# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the -# documentation from any documented member that it re-implements. -# The default value is: YES. - -INHERIT_DOCS = YES - -# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a -# new page for each member. If set to NO, the documentation of a member will be -# part of the file/class/namespace that contains it. -# The default value is: NO. - -SEPARATE_MEMBER_PAGES = NO - -# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen -# uses this value to replace tabs by spaces in code fragments. -# Minimum value: 1, maximum value: 16, default value: 4. - -TAB_SIZE = 4 - -# This tag can be used to specify a number of aliases that act as commands in -# the documentation. An alias has the form: -# name=value -# For example adding -# "sideeffect=@par Side Effects:\n" -# will allow you to put the command \sideeffect (or @sideeffect) in the -# documentation, which will result in a user-defined paragraph with heading -# "Side Effects:". You can put \n's in the value part of an alias to insert -# newlines. - -ALIASES = - -# This tag can be used to specify a number of word-keyword mappings (TCL only). -# A mapping has the form "name=value". For example adding "class=itcl::class" -# will allow you to use the command class in the itcl::class meaning. - -TCL_SUBST = - -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources -# only. Doxygen will then generate output that is more tailored for C. For -# instance, some of the names that are used will be different. The list of all -# members will be omitted, etc. -# The default value is: NO. - -OPTIMIZE_OUTPUT_FOR_C = NO - -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or -# Python sources only. Doxygen will then generate output that is more tailored -# for that language. For instance, namespaces will be presented as packages, -# qualified scopes will look different, etc. -# The default value is: NO. - -OPTIMIZE_OUTPUT_JAVA = NO - -# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran -# sources. Doxygen will then generate output that is tailored for Fortran. -# The default value is: NO. - -OPTIMIZE_FOR_FORTRAN = NO - -# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL -# sources. Doxygen will then generate output that is tailored for VHDL. -# The default value is: NO. - -OPTIMIZE_OUTPUT_VHDL = NO - -# Doxygen selects the parser to use depending on the extension of the files it -# parses. With this tag you can assign which parser to use for a given -# extension. Doxygen has a built-in mapping, but you can override or extend it -# using this tag. The format is ext=language, where ext is a file extension, and -# language is one of the parsers supported by doxygen: IDL, Java, Javascript, -# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran: -# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran: -# Fortran. In the later case the parser tries to guess whether the code is fixed -# or free formatted code, this is the default for Fortran type files), VHDL. For -# instance to make doxygen treat .inc files as Fortran files (default is PHP), -# and .f files as C (default is Fortran), use: inc=Fortran f=C. -# -# Note For files without extension you can use no_extension as a placeholder. -# -# Note that for custom extensions you also need to set FILE_PATTERNS otherwise -# the files are not read by doxygen. - -EXTENSION_MAPPING = - -# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments -# according to the Markdown format, which allows for more readable -# documentation. See http://daringfireball.net/projects/markdown/ for details. -# The output of markdown processing is further processed by doxygen, so you can -# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in -# case of backward compatibilities issues. -# The default value is: YES. - -MARKDOWN_SUPPORT = YES - -# When enabled doxygen tries to link words that correspond to documented -# classes, or namespaces to their corresponding documentation. Such a link can -# be prevented in individual cases by by putting a % sign in front of the word -# or globally by setting AUTOLINK_SUPPORT to NO. -# The default value is: YES. - -AUTOLINK_SUPPORT = YES - -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want -# to include (a tag file for) the STL sources as input, then you should set this -# tag to YES in order to let doxygen match functions declarations and -# definitions whose arguments contain STL classes (e.g. func(std::string); -# versus func(std::string) {}). This also make the inheritance and collaboration -# diagrams that involve STL classes more complete and accurate. -# The default value is: NO. - -BUILTIN_STL_SUPPORT = NO - -# If you use Microsoft's C++/CLI language, you should set this option to YES to -# enable parsing support. -# The default value is: NO. - -CPP_CLI_SUPPORT = NO - -# Set the SIP_SUPPORT tag to YES if your project consists of sip (see: -# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen -# will parse them like normal C++ but will assume all classes use public instead -# of private inheritance when no explicit protection keyword is present. -# The default value is: NO. - -SIP_SUPPORT = NO - -# For Microsoft's IDL there are propget and propput attributes to indicate -# getter and setter methods for a property. Setting this option to YES will make -# doxygen to replace the get and set methods by a property in the documentation. -# This will only work if the methods are indeed getting or setting a simple -# type. If this is not the case, or you want to show the methods anyway, you -# should set this option to NO. -# The default value is: YES. - -IDL_PROPERTY_SUPPORT = YES - -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default -# all members of a group must be documented explicitly. -# The default value is: NO. - -DISTRIBUTE_GROUP_DOC = NO - -# Set the SUBGROUPING tag to YES to allow class member groups of the same type -# (for instance a group of public functions) to be put as a subgroup of that -# type (e.g. under the Public Functions section). Set it to NO to prevent -# subgrouping. Alternatively, this can be done per class using the -# \nosubgrouping command. -# The default value is: YES. - -SUBGROUPING = YES - -# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions -# are shown inside the group in which they are included (e.g. using \ingroup) -# instead of on a separate page (for HTML and Man pages) or section (for LaTeX -# and RTF). -# -# Note that this feature does not work in combination with -# SEPARATE_MEMBER_PAGES. -# The default value is: NO. - -INLINE_GROUPED_CLASSES = NO - -# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions -# with only public data fields or simple typedef fields will be shown inline in -# the documentation of the scope in which they are defined (i.e. file, -# namespace, or group documentation), provided this scope is documented. If set -# to NO, structs, classes, and unions are shown on a separate page (for HTML and -# Man pages) or section (for LaTeX and RTF). -# The default value is: NO. - -INLINE_SIMPLE_STRUCTS = NO - -# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or -# enum is documented as struct, union, or enum with the name of the typedef. So -# typedef struct TypeS {} TypeT, will appear in the documentation as a struct -# with name TypeT. When disabled the typedef will appear as a member of a file, -# namespace, or class. And the struct will be named TypeS. This can typically be -# useful for C code in case the coding convention dictates that all compound -# types are typedef'ed and only the typedef is referenced, never the tag name. -# The default value is: NO. - -TYPEDEF_HIDES_STRUCT = NO - -# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This -# cache is used to resolve symbols given their name and scope. Since this can be -# an expensive process and often the same symbol appears multiple times in the -# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small -# doxygen will become slower. If the cache is too large, memory is wasted. The -# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range -# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536 -# symbols. At the end of a run doxygen will report the cache usage and suggest -# the optimal cache size from a speed point of view. -# Minimum value: 0, maximum value: 9, default value: 0. - -LOOKUP_CACHE_SIZE = 0 - -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- - -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. Private -# class members and static file members will be hidden unless the -# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES. -# Note: This will also disable the warnings about undocumented members that are -# normally produced when WARNINGS is set to YES. -# The default value is: NO. - -EXTRACT_ALL = NO - -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will -# be included in the documentation. -# The default value is: NO. - -EXTRACT_PRIVATE = NO - -# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal -# scope will be included in the documentation. -# The default value is: NO. - -EXTRACT_PACKAGE = NO - -# If the EXTRACT_STATIC tag is set to YES all static members of a file will be -# included in the documentation. -# The default value is: NO. - -EXTRACT_STATIC = NO - -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined -# locally in source files will be included in the documentation. If set to NO -# only classes defined in header files are included. Does not have any effect -# for Java sources. -# The default value is: YES. - -EXTRACT_LOCAL_CLASSES = YES - -# This flag is only useful for Objective-C code. When set to YES local methods, -# which are defined in the implementation section but not in the interface are -# included in the documentation. If set to NO only methods in the interface are -# included. -# The default value is: NO. - -EXTRACT_LOCAL_METHODS = NO - -# If this flag is set to YES, the members of anonymous namespaces will be -# extracted and appear in the documentation as a namespace called -# 'anonymous_namespace{file}', where file will be replaced with the base name of -# the file that contains the anonymous namespace. By default anonymous namespace -# are hidden. -# The default value is: NO. - -EXTRACT_ANON_NSPACES = NO - -# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all -# undocumented members inside documented classes or files. If set to NO these -# members will be included in the various overviews, but no documentation -# section is generated. This option has no effect if EXTRACT_ALL is enabled. -# The default value is: NO. - -HIDE_UNDOC_MEMBERS = NO - -# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. If set -# to NO these classes will be included in the various overviews. This option has -# no effect if EXTRACT_ALL is enabled. -# The default value is: NO. - -HIDE_UNDOC_CLASSES = NO - -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend -# (class|struct|union) declarations. If set to NO these declarations will be -# included in the documentation. -# The default value is: NO. - -HIDE_FRIEND_COMPOUNDS = NO - -# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any -# documentation blocks found inside the body of a function. If set to NO these -# blocks will be appended to the function's detailed documentation block. -# The default value is: NO. - -HIDE_IN_BODY_DOCS = NO - -# The INTERNAL_DOCS tag determines if documentation that is typed after a -# \internal command is included. If the tag is set to NO then the documentation -# will be excluded. Set it to YES to include the internal documentation. -# The default value is: NO. - -INTERNAL_DOCS = NO - -# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file -# names in lower-case letters. If set to YES upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows -# and Mac users are advised to set this option to NO. -# The default value is: system dependent. - -CASE_SENSE_NAMES = YES - -# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with -# their full class and namespace scopes in the documentation. If set to YES the -# scope will be hidden. -# The default value is: NO. - -HIDE_SCOPE_NAMES = NO - -# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of -# the files that are included by a file in the documentation of that file. -# The default value is: YES. - -SHOW_INCLUDE_FILES = YES - -# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each -# grouped member an include statement to the documentation, telling the reader -# which file to include in order to use the member. -# The default value is: NO. - -SHOW_GROUPED_MEMB_INC = NO - -# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include -# files with double quotes in the documentation rather than with sharp brackets. -# The default value is: NO. - -FORCE_LOCAL_INCLUDES = NO - -# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the -# documentation for inline members. -# The default value is: YES. - -INLINE_INFO = YES - -# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the -# (detailed) documentation of file and class members alphabetically by member -# name. If set to NO the members will appear in declaration order. -# The default value is: YES. - -SORT_MEMBER_DOCS = YES - -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief -# descriptions of file, namespace and class members alphabetically by member -# name. If set to NO the members will appear in declaration order. Note that -# this will also influence the order of the classes in the class list. -# The default value is: NO. - -SORT_BRIEF_DOCS = NO - -# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the -# (brief and detailed) documentation of class members so that constructors and -# destructors are listed first. If set to NO the constructors will appear in the -# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS. -# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief -# member documentation. -# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting -# detailed member documentation. -# The default value is: NO. - -SORT_MEMBERS_CTORS_1ST = NO - -# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy -# of group names into alphabetical order. If set to NO the group names will -# appear in their defined order. -# The default value is: NO. - -SORT_GROUP_NAMES = NO - -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by -# fully-qualified names, including namespaces. If set to NO, the class list will -# be sorted only by class name, not including the namespace part. -# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the alphabetical -# list. -# The default value is: NO. - -SORT_BY_SCOPE_NAME = NO - -# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper -# type resolution of all parameters of a function it will reject a match between -# the prototype and the implementation of a member function even if there is -# only one candidate or it is obvious which candidate to choose by doing a -# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still -# accept a match between prototype and implementation in such cases. -# The default value is: NO. - -STRICT_PROTO_MATCHING = NO - -# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the -# todo list. This list is created by putting \todo commands in the -# documentation. -# The default value is: YES. - -GENERATE_TODOLIST = YES - -# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the -# test list. This list is created by putting \test commands in the -# documentation. -# The default value is: YES. - -GENERATE_TESTLIST = YES - -# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug -# list. This list is created by putting \bug commands in the documentation. -# The default value is: YES. - -GENERATE_BUGLIST = YES - -# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO) -# the deprecated list. This list is created by putting \deprecated commands in -# the documentation. -# The default value is: YES. - -GENERATE_DEPRECATEDLIST= YES - -# The ENABLED_SECTIONS tag can be used to enable conditional documentation -# sections, marked by \if ... \endif and \cond -# ... \endcond blocks. - -ENABLED_SECTIONS = - -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the -# initial value of a variable or macro / define can have for it to appear in the -# documentation. If the initializer consists of more lines than specified here -# it will be hidden. Use a value of 0 to hide initializers completely. The -# appearance of the value of individual variables and macros / defines can be -# controlled using \showinitializer or \hideinitializer command in the -# documentation regardless of this setting. -# Minimum value: 0, maximum value: 10000, default value: 30. - -MAX_INITIALIZER_LINES = 30 - -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at -# the bottom of the documentation of classes and structs. If set to YES the list -# will mention the files that were used to generate the documentation. -# The default value is: YES. - -SHOW_USED_FILES = YES - -# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This -# will remove the Files entry from the Quick Index and from the Folder Tree View -# (if specified). -# The default value is: YES. - -SHOW_FILES = YES - -# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces -# page. This will remove the Namespaces entry from the Quick Index and from the -# Folder Tree View (if specified). -# The default value is: YES. - -SHOW_NAMESPACES = YES - -# The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from -# the version control system). Doxygen will invoke the program by executing (via -# popen()) the command command input-file, where command is the value of the -# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided -# by doxygen. Whatever the program writes to standard output is used as the file -# version. For an example see the documentation. - -FILE_VERSION_FILTER = - -# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed -# by doxygen. The layout file controls the global structure of the generated -# output files in an output format independent way. To create the layout file -# that represents doxygen's defaults, run doxygen with the -l option. You can -# optionally specify a file name after the option, if omitted DoxygenLayout.xml -# will be used as the name of the layout file. -# -# Note that if you run doxygen from a directory containing a file called -# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE -# tag is left empty. - -LAYOUT_FILE = - -# The CITE_BIB_FILES tag can be used to specify one or more bib files containing -# the reference definitions. This must be a list of .bib files. The .bib -# extension is automatically appended if omitted. This requires the bibtex tool -# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. -# For LaTeX the style of the bibliography can be controlled using -# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the -# search path. See also \cite for info how to create references. - -CITE_BIB_FILES = - -#--------------------------------------------------------------------------- -# Configuration options related to warning and progress messages -#--------------------------------------------------------------------------- - -# The QUIET tag can be used to turn on/off the messages that are generated to -# standard output by doxygen. If QUIET is set to YES this implies that the -# messages are off. -# The default value is: NO. - -QUIET = NO - -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES -# this implies that the warnings are on. -# -# Tip: Turn warnings on while writing the documentation. -# The default value is: YES. - -WARNINGS = YES - -# If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate -# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag -# will automatically be disabled. -# The default value is: YES. - -WARN_IF_UNDOCUMENTED = YES - -# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some parameters -# in a documented function, or documenting parameters that don't exist or using -# markup commands wrongly. -# The default value is: YES. - -WARN_IF_DOC_ERROR = YES - -# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that -# are documented, but have no documentation for their parameters or return -# value. If set to NO doxygen will only warn about wrong or incomplete parameter -# documentation, but not about the absence of documentation. -# The default value is: NO. - -WARN_NO_PARAMDOC = NO - -# The WARN_FORMAT tag determines the format of the warning messages that doxygen -# can produce. The string should contain the $file, $line, and $text tags, which -# will be replaced by the file and line number from which the warning originated -# and the warning text. Optionally the format may contain $version, which will -# be replaced by the version of the file (if it could be obtained via -# FILE_VERSION_FILTER) -# The default value is: $file:$line: $text. - -WARN_FORMAT = "$file:$line: $text" - -# The WARN_LOGFILE tag can be used to specify a file to which warning and error -# messages should be written. If left blank the output is written to standard -# error (stderr). - -WARN_LOGFILE = warnings.log - -#--------------------------------------------------------------------------- -# Configuration options related to the input files -#--------------------------------------------------------------------------- - -# The INPUT tag is used to specify the files and/or directories that contain -# documented source files. You may enter file names like myfile.cpp or -# directories like /usr/src/myproject. Separate the files or directories with -# spaces. -# Note: If this tag is empty the current directory is searched. - -INPUT = ../src ../README.md ./ - -# This tag can be used to specify the character encoding of the source files -# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses -# libiconv (or the iconv built into libc) for the transcoding. See the libiconv -# documentation (see: http://www.gnu.org/software/libiconv) for the list of -# possible encodings. -# The default value is: UTF-8. - -INPUT_ENCODING = UTF-8 - -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and -# *.h) to filter out the source-files in the directories. If left blank the -# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii, -# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp, -# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown, -# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, -# *.qsf, *.as and *.js. - -FILE_PATTERNS = *.php *.md - -# The RECURSIVE tag can be used to specify whether or not subdirectories should -# be searched for input files as well. -# The default value is: NO. - -RECURSIVE = YES - -# The EXCLUDE tag can be used to specify files and/or directories that should be -# excluded from the INPUT source files. This way you can easily exclude a -# subdirectory from a directory tree whose root is specified with the INPUT tag. -# -# Note that relative paths are relative to the directory from which doxygen is -# run. - -EXCLUDE = - -# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or -# directories that are symbolic links (a Unix file system feature) are excluded -# from the input. -# The default value is: NO. - -EXCLUDE_SYMLINKS = NO - -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. -# -# Note that the wildcards are matched against the file with absolute path, so to -# exclude all test directories for example use the pattern */test/* - -EXCLUDE_PATTERNS = - -# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names -# (namespaces, classes, functions, etc.) that should be excluded from the -# output. The symbol name can be a fully qualified name, a word, or if the -# wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test -# -# Note that the wildcards are matched against the file with absolute path, so to -# exclude all test directories use the pattern */test/* - -EXCLUDE_SYMBOLS = - -# The EXAMPLE_PATH tag can be used to specify one or more files or directories -# that contain example code fragments that are included (see the \include -# command). - -EXAMPLE_PATH = - -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and -# *.h) to filter out the source-files in the directories. If left blank all -# files are included. - -EXAMPLE_PATTERNS = - -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude commands -# irrespective of the value of the RECURSIVE tag. -# The default value is: NO. - -EXAMPLE_RECURSIVE = NO - -# The IMAGE_PATH tag can be used to specify one or more files or directories -# that contain images that are to be included in the documentation (see the -# \image command). - -IMAGE_PATH = - -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command: -# -# -# -# where is the value of the INPUT_FILTER tag, and is the -# name of an input file. Doxygen will then use the output that the filter -# program writes to standard output. If FILTER_PATTERNS is specified, this tag -# will be ignored. -# -# Note that the filter must not add or remove lines; it is applied before the -# code is scanned, but not when the output code is generated. If lines are added -# or removed, the anchors will not be placed correctly. - -INPUT_FILTER = - -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. The filters are a list of the form: pattern=filter -# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how -# filters are used. If the FILTER_PATTERNS tag is empty or if none of the -# patterns match the file name, INPUT_FILTER is applied. - -FILTER_PATTERNS = - -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER ) will also be used to filter the input files that are used for -# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES). -# The default value is: NO. - -FILTER_SOURCE_FILES = NO - -# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file -# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and -# it is also possible to disable source filtering for a specific pattern using -# *.ext= (so without naming a filter). -# This tag requires that the tag FILTER_SOURCE_FILES is set to YES. - -FILTER_SOURCE_PATTERNS = - -# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that -# is part of the input, its contents will be placed on the main page -# (index.html). This can be useful if you have a project on for instance GitHub -# and want to reuse the introduction page also for the doxygen output. - -USE_MDFILE_AS_MAINPAGE = ../README.md - -#--------------------------------------------------------------------------- -# Configuration options related to source browsing -#--------------------------------------------------------------------------- - -# If the SOURCE_BROWSER tag is set to YES then a list of source files will be -# generated. Documented entities will be cross-referenced with these sources. -# -# Note: To get rid of all source code in the generated output, make sure that -# also VERBATIM_HEADERS is set to NO. -# The default value is: NO. - -SOURCE_BROWSER = NO - -# Setting the INLINE_SOURCES tag to YES will include the body of functions, -# classes and enums directly into the documentation. -# The default value is: NO. - -INLINE_SOURCES = NO - -# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any -# special comment blocks from generated source code fragments. Normal C, C++ and -# Fortran comments will always remain visible. -# The default value is: YES. - -STRIP_CODE_COMMENTS = YES - -# If the REFERENCED_BY_RELATION tag is set to YES then for each documented -# function all documented functions referencing it will be listed. -# The default value is: NO. - -REFERENCED_BY_RELATION = NO - -# If the REFERENCES_RELATION tag is set to YES then for each documented function -# all documented entities called/used by that function will be listed. -# The default value is: NO. - -REFERENCES_RELATION = NO - -# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set -# to YES, then the hyperlinks from functions in REFERENCES_RELATION and -# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will -# link to the documentation. -# The default value is: YES. - -REFERENCES_LINK_SOURCE = YES - -# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the -# source code will show a tooltip with additional information such as prototype, -# brief description and links to the definition and documentation. Since this -# will make the HTML file larger and loading of large files a bit slower, you -# can opt to disable this feature. -# The default value is: YES. -# This tag requires that the tag SOURCE_BROWSER is set to YES. - -SOURCE_TOOLTIPS = YES - -# If the USE_HTAGS tag is set to YES then the references to source code will -# point to the HTML generated by the htags(1) tool instead of doxygen built-in -# source browser. The htags tool is part of GNU's global source tagging system -# (see http://www.gnu.org/software/global/global.html). You will need version -# 4.8.6 or higher. -# -# To use it do the following: -# - Install the latest version of global -# - Enable SOURCE_BROWSER and USE_HTAGS in the config file -# - Make sure the INPUT points to the root of the source tree -# - Run doxygen as normal -# -# Doxygen will invoke htags (and that will in turn invoke gtags), so these -# tools must be available from the command line (i.e. in the search path). -# -# The result: instead of the source browser generated by doxygen, the links to -# source code will now point to the output of htags. -# The default value is: NO. -# This tag requires that the tag SOURCE_BROWSER is set to YES. - -USE_HTAGS = NO - -# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a -# verbatim copy of the header file for each class for which an include is -# specified. Set to NO to disable this. -# See also: Section \class. -# The default value is: YES. - -VERBATIM_HEADERS = YES - -# If the CLANG_ASSISTED_PARSING tag is set to YES, then doxygen will use the -# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the -# cost of reduced performance. This can be particularly helpful with template -# rich C++ code for which doxygen's built-in parser lacks the necessary type -# information. -# Note: The availability of this option depends on whether or not doxygen was -# compiled with the --with-libclang option. -# The default value is: NO. - -CLANG_ASSISTED_PARSING = NO - -# If clang assisted parsing is enabled you can provide the compiler with command -# line options that you would normally use when invoking the compiler. Note that -# the include paths will already be set by doxygen for the files and directories -# specified with INPUT and INCLUDE_PATH. -# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES. - -CLANG_OPTIONS = - -#--------------------------------------------------------------------------- -# Configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- - -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all -# compounds will be generated. Enable this if the project contains a lot of -# classes, structs, unions or interfaces. -# The default value is: YES. - -ALPHABETICAL_INDEX = YES - -# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in -# which the alphabetical index list will be split. -# Minimum value: 1, maximum value: 20, default value: 5. -# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. - -COLS_IN_ALPHA_INDEX = 5 - -# In case all classes in a project start with a common prefix, all classes will -# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag -# can be used to specify a prefix (or a list of prefixes) that should be ignored -# while generating the index headers. -# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. - -IGNORE_PREFIX = - -#--------------------------------------------------------------------------- -# Configuration options related to the HTML output -#--------------------------------------------------------------------------- - -# If the GENERATE_HTML tag is set to YES doxygen will generate HTML output -# The default value is: YES. - -GENERATE_HTML = YES - -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a -# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of -# it. -# The default directory is: html. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_OUTPUT = html - -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each -# generated HTML page (for example: .htm, .php, .asp). -# The default value is: .html. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_FILE_EXTENSION = .html - -# The HTML_HEADER tag can be used to specify a user-defined HTML header file for -# each generated HTML page. If the tag is left blank doxygen will generate a -# standard header. -# -# To get valid HTML the header file that includes any scripts and style sheets -# that doxygen needs, which is dependent on the configuration options used (e.g. -# the setting GENERATE_TREEVIEW). It is highly recommended to start with a -# default header using -# doxygen -w html new_header.html new_footer.html new_stylesheet.css -# YourConfigFile -# and then modify the file new_header.html. See also section "Doxygen usage" -# for information on how to generate the default header that doxygen normally -# uses. -# Note: The header is subject to change so you typically have to regenerate the -# default header when upgrading to a newer version of doxygen. For a description -# of the possible markers and block names see the documentation. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_HEADER = - -# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each -# generated HTML page. If the tag is left blank doxygen will generate a standard -# footer. See HTML_HEADER for more information on how to generate a default -# footer and what special commands can be used inside the footer. See also -# section "Doxygen usage" for information on how to generate the default footer -# that doxygen normally uses. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_FOOTER = - -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style -# sheet that is used by each HTML page. It can be used to fine-tune the look of -# the HTML output. If left blank doxygen will generate a default style sheet. -# See also section "Doxygen usage" for information on how to generate the style -# sheet that doxygen normally uses. -# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as -# it is more robust and this tag (HTML_STYLESHEET) will in the future become -# obsolete. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_STYLESHEET = - -# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined -# cascading style sheets that are included after the standard style sheets -# created by doxygen. Using this option one can overrule certain style aspects. -# This is preferred over using HTML_STYLESHEET since it does not replace the -# standard style sheet and is therefor more robust against future updates. -# Doxygen will copy the style sheet files to the output directory. -# Note: The order of the extra stylesheet files is of importance (e.g. the last -# stylesheet in the list overrules the setting of the previous ones in the -# list). For an example see the documentation. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_EXTRA_STYLESHEET = - -# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or -# other source files which should be copied to the HTML output directory. Note -# that these files will be copied to the base HTML output directory. Use the -# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these -# files. In the HTML_STYLESHEET file, use the file name only. Also note that the -# files will be copied as-is; there are no commands or markers available. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_EXTRA_FILES = - -# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen -# will adjust the colors in the stylesheet and background images according to -# this color. Hue is specified as an angle on a colorwheel, see -# http://en.wikipedia.org/wiki/Hue for more information. For instance the value -# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 -# purple, and 360 is red again. -# Minimum value: 0, maximum value: 359, default value: 220. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_COLORSTYLE_HUE = 220 - -# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors -# in the HTML output. For a value of 0 the output will use grayscales only. A -# value of 255 will produce the most vivid colors. -# Minimum value: 0, maximum value: 255, default value: 100. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_COLORSTYLE_SAT = 100 - -# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the -# luminance component of the colors in the HTML output. Values below 100 -# gradually make the output lighter, whereas values above 100 make the output -# darker. The value divided by 100 is the actual gamma applied, so 80 represents -# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not -# change the gamma. -# Minimum value: 40, maximum value: 240, default value: 80. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_COLORSTYLE_GAMMA = 80 - -# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML -# page will contain the date and time when the page was generated. Setting this -# to NO can help when comparing the output of multiple runs. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_TIMESTAMP = YES - -# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML -# documentation will contain sections that can be hidden and shown after the -# page has loaded. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_DYNAMIC_SECTIONS = NO - -# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries -# shown in the various tree structured indices initially; the user can expand -# and collapse entries dynamically later on. Doxygen will expand the tree to -# such a level that at most the specified number of entries are visible (unless -# a fully collapsed tree already exceeds this amount). So setting the number of -# entries 1 will produce a full collapsed tree by default. 0 is a special value -# representing an infinite number of entries and will result in a full expanded -# tree by default. -# Minimum value: 0, maximum value: 9999, default value: 100. -# This tag requires that the tag GENERATE_HTML is set to YES. - -HTML_INDEX_NUM_ENTRIES = 100 - -# If the GENERATE_DOCSET tag is set to YES, additional index files will be -# generated that can be used as input for Apple's Xcode 3 integrated development -# environment (see: http://developer.apple.com/tools/xcode/), introduced with -# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a -# Makefile in the HTML output directory. Running make will produce the docset in -# that directory and running make install will install the docset in -# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at -# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html -# for more information. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_DOCSET = NO - -# This tag determines the name of the docset feed. A documentation feed provides -# an umbrella under which multiple documentation sets from a single provider -# (such as a company or product suite) can be grouped. -# The default value is: Doxygen generated docs. -# This tag requires that the tag GENERATE_DOCSET is set to YES. - -DOCSET_FEEDNAME = "Doxygen generated docs" - -# This tag specifies a string that should uniquely identify the documentation -# set bundle. This should be a reverse domain-name style string, e.g. -# com.mycompany.MyDocSet. Doxygen will append .docset to the name. -# The default value is: org.doxygen.Project. -# This tag requires that the tag GENERATE_DOCSET is set to YES. - -DOCSET_BUNDLE_ID = org.doxygen.Project - -# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify -# the documentation publisher. This should be a reverse domain-name style -# string, e.g. com.mycompany.MyDocSet.documentation. -# The default value is: org.doxygen.Publisher. -# This tag requires that the tag GENERATE_DOCSET is set to YES. - -DOCSET_PUBLISHER_ID = org.doxygen.Publisher - -# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher. -# The default value is: Publisher. -# This tag requires that the tag GENERATE_DOCSET is set to YES. - -DOCSET_PUBLISHER_NAME = Publisher - -# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three -# additional HTML index files: index.hhp, index.hhc, and index.hhk. The -# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop -# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on -# Windows. -# -# The HTML Help Workshop contains a compiler that can convert all HTML output -# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML -# files are now used as the Windows 98 help format, and will replace the old -# Windows help format (.hlp) on all Windows platforms in the future. Compressed -# HTML files also contain an index, a table of contents, and you can search for -# words in the documentation. The HTML workshop also contains a viewer for -# compressed HTML files. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_HTMLHELP = NO - -# The CHM_FILE tag can be used to specify the file name of the resulting .chm -# file. You can add a path in front of the file if the result should not be -# written to the html output directory. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -CHM_FILE = - -# The HHC_LOCATION tag can be used to specify the location (absolute path -# including file name) of the HTML help compiler ( hhc.exe). If non-empty -# doxygen will try to run the HTML help compiler on the generated index.hhp. -# The file has to be specified with full path. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -HHC_LOCATION = - -# The GENERATE_CHI flag controls if a separate .chi index file is generated ( -# YES) or that it should be included in the master .chm file ( NO). -# The default value is: NO. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -GENERATE_CHI = NO - -# The CHM_INDEX_ENCODING is used to encode HtmlHelp index ( hhk), content ( hhc) -# and project file content. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -CHM_INDEX_ENCODING = - -# The BINARY_TOC flag controls whether a binary table of contents is generated ( -# YES) or a normal table of contents ( NO) in the .chm file. Furthermore it -# enables the Previous and Next buttons. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -BINARY_TOC = NO - -# The TOC_EXPAND flag can be set to YES to add extra items for group members to -# the table of contents of the HTML help documentation and to the tree view. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTMLHELP is set to YES. - -TOC_EXPAND = NO - -# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and -# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that -# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help -# (.qch) of the generated HTML documentation. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_QHP = NO - -# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify -# the file name of the resulting .qch file. The path specified is relative to -# the HTML output folder. -# This tag requires that the tag GENERATE_QHP is set to YES. - -QCH_FILE = - -# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help -# Project output. For more information please see Qt Help Project / Namespace -# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). -# The default value is: org.doxygen.Project. -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_NAMESPACE = org.doxygen.Project - -# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt -# Help Project output. For more information please see Qt Help Project / Virtual -# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- -# folders). -# The default value is: doc. -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_VIRTUAL_FOLDER = doc - -# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom -# filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_CUST_FILTER_NAME = - -# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the -# custom filter to add. For more information please see Qt Help Project / Custom -# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- -# filters). -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_CUST_FILTER_ATTRS = - -# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this -# project's filter section matches. Qt Help Project / Filter Attributes (see: -# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHP_SECT_FILTER_ATTRS = - -# The QHG_LOCATION tag can be used to specify the location of Qt's -# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the -# generated .qhp file. -# This tag requires that the tag GENERATE_QHP is set to YES. - -QHG_LOCATION = - -# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be -# generated, together with the HTML files, they form an Eclipse help plugin. To -# install this plugin and make it available under the help contents menu in -# Eclipse, the contents of the directory containing the HTML and XML files needs -# to be copied into the plugins directory of eclipse. The name of the directory -# within the plugins directory should be the same as the ECLIPSE_DOC_ID value. -# After copying Eclipse needs to be restarted before the help appears. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_ECLIPSEHELP = NO - -# A unique identifier for the Eclipse help plugin. When installing the plugin -# the directory name containing the HTML and XML files should also have this -# name. Each documentation set should have its own identifier. -# The default value is: org.doxygen.Project. -# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES. - -ECLIPSE_DOC_ID = org.doxygen.Project - -# If you want full control over the layout of the generated HTML pages it might -# be necessary to disable the index and replace it with your own. The -# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top -# of each HTML page. A value of NO enables the index and the value YES disables -# it. Since the tabs in the index contain the same information as the navigation -# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -DISABLE_INDEX = NO - -# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index -# structure should be generated to display hierarchical information. If the tag -# value is set to YES, a side panel will be generated containing a tree-like -# index structure (just like the one that is generated for HTML Help). For this -# to work a browser that supports JavaScript, DHTML, CSS and frames is required -# (i.e. any modern browser). Windows users are probably better off using the -# HTML help feature. Via custom stylesheets (see HTML_EXTRA_STYLESHEET) one can -# further fine-tune the look of the index. As an example, the default style -# sheet generated by doxygen has an example that shows how to put an image at -# the root of the tree instead of the PROJECT_NAME. Since the tree basically has -# the same information as the tab index, you could consider setting -# DISABLE_INDEX to YES when enabling this option. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -GENERATE_TREEVIEW = NO - -# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that -# doxygen will group on one line in the generated HTML documentation. -# -# Note that a value of 0 will completely suppress the enum values from appearing -# in the overview section. -# Minimum value: 0, maximum value: 20, default value: 4. -# This tag requires that the tag GENERATE_HTML is set to YES. - -ENUM_VALUES_PER_LINE = 4 - -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used -# to set the initial width (in pixels) of the frame in which the tree is shown. -# Minimum value: 0, maximum value: 1500, default value: 250. -# This tag requires that the tag GENERATE_HTML is set to YES. - -TREEVIEW_WIDTH = 250 - -# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open links to -# external symbols imported via tag files in a separate window. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -EXT_LINKS_IN_WINDOW = NO - -# Use this tag to change the font size of LaTeX formulas included as images in -# the HTML documentation. When you change the font size after a successful -# doxygen run you need to manually remove any form_*.png images from the HTML -# output directory to force them to be regenerated. -# Minimum value: 8, maximum value: 50, default value: 10. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_FONTSIZE = 10 - -# Use the FORMULA_TRANPARENT tag to determine whether or not the images -# generated for formulas are transparent PNGs. Transparent PNGs are not -# supported properly for IE 6.0, but are supported on all modern browsers. -# -# Note that when changing this option you need to delete any form_*.png files in -# the HTML output directory before the changes have effect. -# The default value is: YES. -# This tag requires that the tag GENERATE_HTML is set to YES. - -FORMULA_TRANSPARENT = YES - -# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering -# instead of using prerendered bitmaps. Use this if you do not have LaTeX -# installed or if you want to formulas look prettier in the HTML output. When -# enabled you may also need to install MathJax separately and configure the path -# to it using the MATHJAX_RELPATH option. -# The default value is: NO. -# This tag requires that the tag GENERATE_HTML is set to YES. - -USE_MATHJAX = NO - -# When MathJax is enabled you can set the default output format to be used for -# the MathJax output. See the MathJax site (see: -# http://docs.mathjax.org/en/latest/output.html) for more details. -# Possible values are: HTML-CSS (which is slower, but has the best -# compatibility), NativeMML (i.e. MathML) and SVG. -# The default value is: HTML-CSS. -# This tag requires that the tag USE_MATHJAX is set to YES. - -MATHJAX_FORMAT = HTML-CSS - -# When MathJax is enabled you need to specify the location relative to the HTML -# output directory using the MATHJAX_RELPATH option. The destination directory -# should contain the MathJax.js script. For instance, if the mathjax directory -# is located at the same level as the HTML output directory, then -# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax -# Content Delivery Network so you can quickly see the result without installing -# MathJax. However, it is strongly recommended to install a local copy of -# MathJax from http://www.mathjax.org before deployment. -# The default value is: http://cdn.mathjax.org/mathjax/latest. -# This tag requires that the tag USE_MATHJAX is set to YES. - -MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest - -# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax -# extension names that should be enabled during MathJax rendering. For example -# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols -# This tag requires that the tag USE_MATHJAX is set to YES. - -MATHJAX_EXTENSIONS = - -# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces -# of code that will be used on startup of the MathJax code. See the MathJax site -# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an -# example see the documentation. -# This tag requires that the tag USE_MATHJAX is set to YES. - -MATHJAX_CODEFILE = - -# When the SEARCHENGINE tag is enabled doxygen will generate a search box for -# the HTML output. The underlying search engine uses javascript and DHTML and -# should work on any modern browser. Note that when using HTML help -# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET) -# there is already a search function so this one should typically be disabled. -# For large projects the javascript based search engine can be slow, then -# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to -# search using the keyboard; to jump to the search box use + S -# (what the is depends on the OS and browser, but it is typically -# , /